diff --git a/src/WPFDevelopers.Net40/Themes/Generic.xaml b/src/WPFDevelopers.Net40/Themes/Generic.xaml
index 7816fb66..b072b455 100644
--- a/src/WPFDevelopers.Net40/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Generic.xaml
@@ -27,6 +27,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type wd:Window}">
                     <Border
+                        Name="PART_Border"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
@@ -161,7 +162,7 @@
                         <Trigger Property="WindowState" Value="Maximized">
                             <Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
                             <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="LayoutRoot" Property="Margin" Value="7" />
+                            <Setter TargetName="PART_Border" Property="Margin" Value="7" />
                         </Trigger>
                         <Trigger Property="WindowStyle" Value="ToolWindow">
                             <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
diff --git a/src/WPFDevelopers.Net40/Themes/Theme.xaml b/src/WPFDevelopers.Net40/Themes/Theme.xaml
index c744263d..7df9edca 100644
--- a/src/WPFDevelopers.Net40/Themes/Theme.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Theme.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" po:Freeze="True" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:WPFDevelopers.Controls" xmlns:convert="clr-namespace:WPFDevelopers.Converts" xmlns:helpers="clr-namespace:WPFDevelopers.Helpers" xmlns:shell="clr-namespace:Microsoft.Windows.Shell" xmlns:wd="clr-namespace:WPFDevelopers.Net40" xmlns:ec="clr-namespace:Microsoft.Expression.Controls" xmlns:drawingControls="clr-namespace:Microsoft.Expression.Drawing.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" po:Freeze="True" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:WPFDevelopers.Controls" xmlns:convert="clr-namespace:WPFDevelopers.Converts" xmlns:helpers="clr-namespace:WPFDevelopers.Helpers" xmlns:shell="clr-namespace:Microsoft.Windows.Shell" xmlns:wd="clr-namespace:WPFDevelopers.Net40" xmlns:ec="clr-namespace:Microsoft.Expression.Controls" xmlns:drawingControls="clr-namespace:Microsoft.Expression.Drawing.Controls" xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore">
 	<SolidColorBrush x:Key="WD.ButtonFocusVisualColor" po:Freeze="True" Color="#60000000" />
 	<Color x:Key="WD.ShadowDepthColor" po:Freeze="True">#AA000000</Color>
 	<Color x:Key="WD.PrimaryTextColor" po:Freeze="True">#909399</Color>
@@ -104,7 +104,7 @@
 	<Geometry x:Key="WD.AlarmClockGeometry" po:Freeze="True">M470 124.837l-98.443-81.78-27.814 32.931 98.442 81.769L470 124.837zM167.192 74.919L139.366 42 42 124.837l27.814 32.919 97.378-82.837zm99.509 97.709H234.6v127.446l101.649 60.539L352.3 334.06l-85.6-49.917V172.628zM256 87.665c-107 0-192.601 86.021-192.601 191.166C63.399 383.98 149 470 256 470c105.936 0 192.601-86.02 192.601-191.169 0-105.144-86.665-191.166-192.601-191.166zm0 339.855c-82.393 0-149.8-66.906-149.8-148.688 0-81.777 67.407-148.684 149.8-148.684 82.394 0 149.8 66.906 149.8 148.684 0 82.839-67.406 148.688-149.8 148.688z</Geometry>
 	<Geometry x:Key="WD.FlagGeometry" po:Freeze="True">M687.5 125C500 125 375 13.7 187.5 62.5V31.3C187.5 31.3 187.5 0 156.3 0C125 0 125 31.3 125 31.3V1000H187.5V625C375 562.5 500 687.5 687.5 687.5C875 687.5 937.5 625 937.5 625V62.5C937.5 62.5 875 125 687.5 125Z</Geometry>
 	<Geometry x:Key="WD.CircularGeometry" po:Freeze="True">M 200,200 0,200 A 200,200 0 0 1 58.6,58.6z</Geometry>
-	<Geometry x:Key="WD.AddGeometry" po:Freeze="True">M734.618 760.269c-24.013 24.013-62.925 24.013-86.886 0l-135.731-155.136-135.731 155.085c-24.013 24.013-62.925 24.013-86.886 0-24.013-24.013-24.013-62.925 0-86.886l141.21-161.28-141.261-161.382c-24.013-24.013-24.013-62.874 0-86.886s62.874-24.013 86.886 0l135.782 155.187 135.731-155.187c24.013-24.013 62.874-24.013 86.886 0s24.013 62.925 0 86.886l-141.21 161.382 141.21 161.28c24.013 24.013 24.013 62.925 0 86.938z</Geometry>
+	<Geometry x:Key="WD.AddGeometry" po:Freeze="True">M810 554h-256v256h-84v-256h-256v-84h256v-256h84v256h256v84z</Geometry>
 	<Geometry x:Key="WD.ChatLeftGeometry" po:Freeze="True">M365.714 256v512q0 14.857-10.857 25.714t-25.714 10.857-25.714-10.857l-256-256q-10.857-10.857-10.857-25.714t10.857-25.714l256-256q10.857-10.857 25.714-10.857t25.714 10.857 10.857 25.714z</Geometry>
 	<Geometry x:Key="WD.ChatRightGeometry" po:Freeze="True">M329.143 512q0 14.857-10.857 25.714l-256 256q-10.857 10.857-25.714 10.857t-25.714-10.857-10.857-25.714v-512q0-14.857 10.857-25.714t25.714-10.857 25.714 10.857l256 256q10.857 10.857 10.857 25.714z</Geometry>
 	<Geometry x:Key="WD.StarGeometry" po:Freeze="True">M649.714 573.714l174.857-169.714-241.143-35.429-108-218.286-108 218.286-241.143 35.429 174.857 169.714-41.714 240.571 216-113.714 215.429 113.714zM950.857 369.714q0 12.571-14.857 27.429l-207.429 202.286 49.143 285.714q0.571 4 0.571 11.429 0 28.571-23.429 28.571-10.857 0-22.857-6.857l-256.571-134.857-256.571 134.857q-12.571 6.857-22.857 6.857-12 0-18-8.286t-6-20.286q0-3.429 1.143-11.429l49.143-285.714-208-202.286q-14.286-15.429-14.286-27.429 0-21.143 32-26.286l286.857-41.714 128.571-260q10.857-23.429 28-23.429t28 23.429l128.571 260 286.857 41.714q32 5.143 32 26.286z</Geometry>
@@ -129,6 +129,7 @@
 	<Geometry x:Key="WD.ReturnGeometry" po:Freeze="True">M356.667 155q17.333 0 30 12.5t12.667 30.167-12.667 30.333l-198.667 198.667h409.333q78 0 149.167 30.333t122.5 81.833 81.833 122.5 30.5 149.333v42.667q0 17.667-12.5 30.167t-30.167 12.5q-17.333 0-30-12.667t-12.667-30v-42.667q0-60.667-23.667-116t-63.667-95.333-95.333-63.667-116-23.667h-409.333l198.667 199q12.667 12.667 12.667 30 0 17.667-12.5 30.333t-30.167 12.667-30.333-12.667l-271.333-271.667q-12.333-12.333-12.333-30.333 0-17.667 12.333-30l271.333-271.667q12.667-12.667 30.333-12.667z</Geometry>
 	<Geometry x:Key="WD.HomeGeometry" po:Freeze="True">M804.571 566.857v274.286q0 14.857-10.857 25.714t-25.714 10.857h-219.429v-219.429h-146.286v219.429h-219.429q-14.857 0-25.714-10.857t-10.857-25.714v-274.286q0-0.571 0.286-1.714t0.286-1.714l328.571-270.857 328.571 270.857q0.571 1.143 0.571 3.429zM932 527.429l-35.429 42.286q-4.571 5.143-12 6.286h-1.714q-7.429 0-12-4l-395.429-329.714-395.429 329.714q-6.857 4.571-13.714 4-7.429-1.143-12-6.286l-35.429-42.286q-4.571-5.714-4-13.429t6.286-12.286l410.857-342.286q18.286-14.857 43.429-14.857t43.429 14.857l139.429 116.571v-111.429q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143v233.143l125.143 104q5.714 4.571 6.286 12.286t-4 13.429z</Geometry>
 	<Geometry x:Key="WD.ChevronUpGeometry" po:Freeze="True">M336.998 621.619c-13.875 13.722-36.301 13.722-50.074 0s-13.926-35.891 0-49.613l200.090-196.096c13.824-13.722 36.198-13.722 50.125 0l200.090 196.096c13.824 13.67 13.824 35.891 0 49.613-13.875 13.722-36.301 13.722-50.125 0l-175.104-160.819-175.002 160.819z</Geometry>
+	<Geometry x:Key="WD.UnfoldMoreGeometry" po:Freeze="True">M512 776l136-136 60 60-196 196-196-196 60-60zM512 248l-136 136-60-60 196-196 196 196-60 60z</Geometry>
 	<CubicEase x:Key="WD.CubicEaseInOut" EasingMode="EaseInOut" />
 	<PowerEase x:Key="WD.PowerEaseInOut" EasingMode="EaseInOut" />
 	<ExponentialEase x:Key="WD.ExponentialEaseOut" EasingMode="EaseOut" />
@@ -136,8 +137,8 @@
 	<SineEase x:Key="WD.SineEaseInOut" EasingMode="EaseInOut" />
 	<BackEase x:Key="WD.BackEaseEaseInOut" EasingMode="EaseInOut" />
 	<sys:Double x:Key="WD.EnabledOpacity">0.7</sys:Double>
-	<sys:Double x:Key="WD.NormalCornerRadius">4</sys:Double>
-	<sys:Double x:Key="WD.MinHeight">40</sys:Double>
+	<sys:Double x:Key="WD.DefaultCornerRadius">4</sys:Double>
+	<sys:Double x:Key="WD.DefaultHeight">32</sys:Double>
 	<sys:Double x:Key="WD.ThumbWidth">16</sys:Double>
 	<sys:Double x:Key="WD.ThumbCornerRadius">8</sys:Double>
 	<sys:Double x:Key="WD.RepeatButtonSize">5</sys:Double>
@@ -367,6 +368,40 @@
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
 	</Style>
+	<convert:ColorToBrushConverter x:Key="WD.ColorToBrushConverter" />
+	<convert:ColorToRedConverter x:Key="WD.ColorToRedConverter" />
+	<convert:ColorToGreenConverter x:Key="WD.ColorToGreenConverter" />
+	<convert:ColorToBlueConverter x:Key="WD.ColorToBlueConverter" />
+	<convert:ColorTypeToVisibilityConverter x:Key="WD.ColorTypeToVisibilityConverter" />
+	<convert:ColorToStringConverter x:Key="WD.ColorToStringConverter" />
+	<convert:HToColorConverter x:Key="WD.HToColorConverter" />
+	<convert:SToColorConverter x:Key="WD.SToColorConverter" />
+	<convert:LToColorConverter x:Key="WD.LToColorConverter" />
+	<LinearGradientBrush x:Key="WD.ColorPickerRainbowBrush" po:Freeze="True">
+		<GradientStop Color="#FF0000" />
+		<GradientStop Offset="0.167" Color="#FF00FF" />
+		<GradientStop Offset="0.334" Color="#0000FF" />
+		<GradientStop Offset="0.501" Color="#00FFFF" />
+		<GradientStop Offset="0.668" Color="#00FF00" />
+		<GradientStop Offset="0.835" Color="#FFFF00" />
+		<GradientStop Offset="1" Color="#FF0000" />
+	</LinearGradientBrush>
+	<ControlTemplate x:Key="WD.ColorPickerSliderThumbTemplate" TargetType="Thumb">
+		<Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="Transparent" BorderBrush="White" BorderThickness="3" CornerRadius="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
+	</ControlTemplate>
+	<Style x:Key="WD.ColorPickerSliderRepeatButtonBaseStyle" TargetType="RepeatButton">
+		<Setter Property="OverridesDefaultStyle" Value="true" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Focusable" Value="false" />
+		<Setter Property="IsTabStop" Value="false" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="RepeatButton">
+					<Rectangle Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{TemplateBinding Background}" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
 	<SolidColorBrush x:Key="WD.SecondaryTextSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.PrimaryTextColor}" />
 	<SolidColorBrush x:Key="WD.PlaceholderTextSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.PlaceholderTextColor}" />
 	<SolidColorBrush x:Key="WD.NormalSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.NormalColor}" />
@@ -730,7 +765,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type wd:Window}">
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+					<Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
 						<Grid x:Name="LayoutRoot">
 							<Grid.RowDefinitions>
 								<RowDefinition Height="Auto" />
@@ -780,7 +815,7 @@
 						<Trigger Property="WindowState" Value="Maximized">
 							<Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
 							<Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="LayoutRoot" Property="Margin" Value="7" />
+							<Setter TargetName="PART_Border" Property="Margin" Value="7" />
 						</Trigger>
 						<Trigger Property="WindowStyle" Value="ToolWindow">
 							<Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
@@ -808,7 +843,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Menu}">
-					<Border Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+					<Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
 						<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 					</Border>
 				</ControlTemplate>
@@ -2976,7 +3011,7 @@
 				<ControlTemplate TargetType="{x:Type PasswordBox}">
 					<Border x:Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
 						<controls:SmallPanel>
-							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
+							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" FontSize="{TemplateBinding FontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
 							<ScrollViewer x:Name="PART_ContentHost" />
 						</controls:SmallPanel>
 					</Border>
@@ -3254,6 +3289,8 @@
 	<Style BasedOn="{StaticResource WD.DefaultExpander}" TargetType="{x:Type Expander}" />
 	<Style x:Key="WD.DefaultGroupBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type GroupBox}">
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+		<Setter Property="Background" Value="{DynamicResource WD.LighterSolidColorBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type GroupBox}">
@@ -3262,16 +3299,10 @@
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="*" />
 						</Grid.RowDefinitions>
-						<Border Grid.Row="0" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
-							<Border.Background>
-								<SolidColorBrush Color="{DynamicResource BackgroundColor}" />
-							</Border.Background>
-							<ContentPresenter Margin="{TemplateBinding Padding}" ContentSource="Header" RecognizesAccessKey="True" />
+						<Border Grid.Row="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1">
+							<ContentPresenter Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
 						</Border>
-						<Border Grid.Row="1" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1,0,1,1" SnapsToDevicePixels="True">
-							<Border.Background>
-								<SolidColorBrush Color="{DynamicResource BackgroundColor}" />
-							</Border.Background>
+						<Border Grid.Row="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,0,1,1" SnapsToDevicePixels="True">
 							<ContentPresenter Margin="{TemplateBinding Padding}" />
 						</Border>
 					</Grid>
@@ -3734,7 +3765,7 @@
 								</DockPanel>
 							</controls:SmallPanel>
 							<controls:SmallPanel Grid.Row="2" Margin="140,20,10,10">
-								<UniformGrid Height="38" HorizontalAlignment="Right" Rows="1">
+								<UniformGrid Height="38" Rows="1">
 									<Button x:Name="PART_ButtonCancel" Width="60" Content="取消" Visibility="Collapsed" />
 									<Button x:Name="PART_ButtonOK" Width="60" Margin="6,0,0,0" Content="确认" Style="{DynamicResource WD.PrimaryButton}" />
 								</UniformGrid>
@@ -3905,6 +3936,7 @@
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
 		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type RepeatButton}">
@@ -4030,16 +4062,16 @@
 				<ControlTemplate TargetType="{x:Type controls:AnimationAudio}">
 					<ControlTemplate.Resources>
 						<Storyboard x:Key="PlayStoryboard" RepeatBehavior="Forever">
-							<ObjectAnimationUsingKeyFrames Storyboard.TargetName="WD.AudioTwoGeometry" Storyboard.TargetProperty="(Path.Visibility)">
+							<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Path2" Storyboard.TargetProperty="(Path.Visibility)">
 								<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
 							</ObjectAnimationUsingKeyFrames>
-							<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PathAudioThree" Storyboard.TargetProperty="(Path.Visibility)">
+							<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Path3" Storyboard.TargetProperty="(Path.Visibility)">
 								<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
 							</ObjectAnimationUsingKeyFrames>
-							<ObjectAnimationUsingKeyFrames BeginTime="0:0:.3" Storyboard.TargetName="WD.AudioTwoGeometry" Storyboard.TargetProperty="(Path.Visibility)" Duration="0:0:.4">
+							<ObjectAnimationUsingKeyFrames BeginTime="0:0:.3" Storyboard.TargetName="PART_Path2" Storyboard.TargetProperty="(Path.Visibility)" Duration="0:0:.4">
 								<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
 							</ObjectAnimationUsingKeyFrames>
-							<ObjectAnimationUsingKeyFrames BeginTime="0:0:.7" Storyboard.TargetName="PathAudioThree" Storyboard.TargetProperty="(Path.Visibility)" Duration="0:0:.4">
+							<ObjectAnimationUsingKeyFrames BeginTime="0:0:.7" Storyboard.TargetName="PART_Path3" Storyboard.TargetProperty="(Path.Visibility)" Duration="0:0:.4">
 								<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
 							</ObjectAnimationUsingKeyFrames>
 						</Storyboard>
@@ -4052,8 +4084,8 @@
 							</Grid.ColumnDefinitions>
 							<StackPanel x:Name="PART_StackPanel" Width="20" Height="30" Margin="10,0" HorizontalAlignment="Left" Orientation="Horizontal" RenderTransformOrigin=".5,.5">
 								<Path Width="4" Height="6" Data="{StaticResource WD.AudioOneGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" />
-								<Path x:Name="PathAudioTwo" Width="6" Margin="0,7" Data="{StaticResource WD.AudioTwoGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" Stroke="Transparent" StrokeThickness="1.5" />
-								<Path x:Name="PathAudioThree" Width="8" Margin="-3,4" Data="{StaticResource WD.AudioThreeGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" Stroke="Transparent" StrokeThickness="2" />
+								<Path x:Name="PART_Path2" Width="6" Margin="0,7" Data="{StaticResource WD.AudioTwoGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" Stroke="Transparent" StrokeThickness="1.5" />
+								<Path x:Name="PART_Path3" Width="8" Margin="-3,4" Data="{StaticResource WD.AudioThreeGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" Stroke="Transparent" StrokeThickness="2" />
 							</StackPanel>
 							<TextBlock x:Name="PART_TextBlock" Grid.Column="1" VerticalAlignment="Center" FontSize="{DynamicResource WD.TitleFontSize}" Foreground="{TemplateBinding Foreground}">
 								<Run x:Name="PART_RunTimeLength" />
@@ -4468,17 +4500,16 @@
 							<ToggleButton.Template>
 								<ControlTemplate TargetType="ToggleButton">
 									<controls:SmallPanel>
-										<Ellipse x:Name="PART_Ellipse" Width="100" Height="100" Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}" ToolTip="关闭" />
-										<Path x:Name="PART_Path" Width="20" Height="20" Data="{StaticResource WD.AddGeometry}" Fill="{StaticResource WD.BackgroundSolidColorBrush}" IsHitTestVisible="False" RenderTransformOrigin="0.5,0.5" Stretch="Fill" />
+										<Ellipse x:Name="PART_Ellipse" Width="100" Height="100" Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}" />
+										<controls:PathIcon x:Name="PART_Path" Width="20" Height="20" Foreground="{StaticResource WD.BackgroundSolidColorBrush}" Kind="Add" RenderTransformOrigin="0.5,0.5" />
 									</controls:SmallPanel>
 									<ControlTemplate.Triggers>
-										<Trigger Property="IsChecked" Value="false">
+										<Trigger Property="IsChecked" Value="True">
 											<Setter TargetName="PART_Path" Property="RenderTransform">
 												<Setter.Value>
 													<RotateTransform Angle="45" />
 												</Setter.Value>
 											</Setter>
-											<Setter TargetName="PART_Ellipse" Property="ToolTip" Value="展开" />
 										</Trigger>
 									</ControlTemplate.Triggers>
 								</ControlTemplate>
@@ -5537,15 +5568,11 @@
 							</Path.Data>
 						</Path>
 						<controls:SmallPanel x:Name="PART_Grid" Width="200" Height="200">
-							<Button x:Name="PART_ReplaceButton" Width="40" Height="40" HorizontalAlignment="Right" VerticalAlignment="Top" Style="{StaticResource WD.PathButton}" ToolTip="更换图片" Visibility="Collapsed">
+							<Button x:Name="PART_ReplaceButton" Width="40" Height="40" HorizontalAlignment="Right" VerticalAlignment="Top" Style="{StaticResource WD.PathButton}" Visibility="Collapsed">
 								<controls:PathIcon Width="15" Height="15" Foreground="{StaticResource WD.PrimaryNormalSolidColorBrush}" Kind="Replace" />
 							</Button>
-							<Button x:Name="PART_AddButton" Width="40" Height="40" Style="{StaticResource WD.PathButton}" ToolTip="选择图片">
-								<Path Width="20" Height="20" Data="{StaticResource WD.AddGeometry}" Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}" IsHitTestVisible="False" RenderTransformOrigin="0.5,0.5" Stretch="Fill">
-									<Path.RenderTransform>
-										<RotateTransform Angle="45" />
-									</Path.RenderTransform>
-								</Path>
+							<Button x:Name="PART_AddButton" Width="40" Height="40" Style="{StaticResource WD.PathButton}">
+								<controls:PathIcon Width="20" Height="20" Foreground="{StaticResource WD.PrimaryNormalSolidColorBrush}" Kind="Add" />
 							</Button>
 						</controls:SmallPanel>
 					</Canvas>
@@ -6041,8 +6068,8 @@
 									<Path x:Name="PART_Path" Width="15" Height="15" Data="{StaticResource WD.InformationGeometry}" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Stretch="Fill" />
 									<TextBlock Grid.Column="1" Margin="5,0,0,0" VerticalAlignment="Center" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Content}" TextWrapping="Wrap" />
 								</DockPanel>
-								<Button x:Name="PART_CloseButton" Grid.Column="2" Width="30" Height="28" Padding="0" HorizontalAlignment="Right" Style="{StaticResource WD.PathButton}">
-									<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.SecondaryTextSolidColorBrush}" Stretch="Fill" />
+								<Button x:Name="PART_CloseButton" Grid.Column="2" Width="25" Height="25" Margin="0,2,4,0" HorizontalAlignment="Right" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}" ToolTip="关闭">
+									<controls:PathIcon Width="10" Height="10" Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}" Kind="WindowClose" />
 								</Button>
 							</Grid>
 						</Border>
@@ -6097,7 +6124,7 @@
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Height" Value="16" />
 		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Stretch" />
+		<Setter Property="HorizontalAlignment" Value="Center" />
 		<Setter Property="Foreground">
 			<Setter.Value>
 				<Binding Path="Foreground" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType={x:Type Control}}" />
@@ -6107,7 +6134,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type controls:PathIcon}">
-					<Viewbox Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" UseLayoutRounding="True">
+					<Viewbox Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" UseLayoutRounding="True">
 						<Path x:Name="PART_Path" Data="{TemplateBinding Data}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Stretch="Uniform" UseLayoutRounding="False" />
 					</Viewbox>
 				</ControlTemplate>
@@ -6139,17 +6166,17 @@
 									<ColumnDefinition />
 									<ColumnDefinition Width="Auto" />
 								</Grid.ColumnDefinitions>
-								<TextBox x:Name="PART_TextBox" MinHeight="{TemplateBinding MinHeight}" Padding="{TemplateBinding Padding}" HorizontalAlignment="Stretch" VerticalAlignment="Center" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Background="{x:Null}" BorderThickness="0" FocusVisualStyle="{x:Null}" Focusable="{TemplateBinding Focusable}" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" InputMethod.IsInputMethodEnabled="False" IsReadOnly="{TemplateBinding IsReadOnly}" IsTabStop="{TemplateBinding IsTabStop}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Style="{x:Null}" TabIndex="{TemplateBinding TabIndex}" TextAlignment="{TemplateBinding TextAlignment}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
+								<TextBox x:Name="PART_TextBox" MinHeight="{TemplateBinding MinHeight}" Padding="{TemplateBinding Padding}" HorizontalAlignment="Stretch" VerticalAlignment="Center" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" helpers:TextBoxHelper.IsEnterUpdateEnabled="True" Background="{x:Null}" BorderThickness="0" FocusVisualStyle="{x:Null}" Focusable="{TemplateBinding Focusable}" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" InputMethod.IsInputMethodEnabled="False" IsReadOnly="{TemplateBinding IsReadOnly}" IsTabStop="{TemplateBinding IsTabStop}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Style="{x:Null}" TabIndex="{TemplateBinding TabIndex}" TextAlignment="{TemplateBinding TextAlignment}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
 								<Grid Grid.Column="1" Width="{TemplateBinding UpDownButtonsWidth}">
 									<Grid.RowDefinitions>
 										<RowDefinition />
 										<RowDefinition Height="1" />
 										<RowDefinition />
 									</Grid.RowDefinitions>
-									<RepeatButton x:Name="PART_NumericUp" Grid.Row="0" Margin="0,1,1,0" Command="{x:Static controls:NumericBox.IncreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
+									<RepeatButton x:Name="PART_NumericUp" Grid.Row="0" Margin="0,1,1,0" Padding="0" Command="{x:Static controls:NumericBox.IncreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
 										<controls:PathIcon Kind="ChevronUp" Style="{StaticResource WD.MiniPathIcon}" />
 									</RepeatButton>
-									<RepeatButton x:Name="PART_NumericDown" Grid.Row="2" Margin="0,0,1,1" Command="{x:Static controls:NumericBox.DecreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False">
+									<RepeatButton x:Name="PART_NumericDown" Grid.Row="2" Margin="0,0,1,1" Padding="0" Command="{x:Static controls:NumericBox.DecreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False">
 										<controls:PathIcon Kind="ChevronDown" Style="{StaticResource WD.MiniPathIcon}" />
 									</RepeatButton>
 								</Grid>
@@ -6175,6 +6202,182 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource WD.NumericBox}" TargetType="{x:Type controls:NumericBox}" />
+	<Style x:Key="WD.ColorPickerSlider" TargetType="{x:Type Slider}">
+		<Setter Property="Background" Value="{StaticResource WD.ColorPickerRainbowBrush}" />
+		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+		<Setter Property="Orientation" Value="Horizontal" />
+		<Setter Property="Height" Value="15" />
+		<Setter Property="Margin" Value="4,0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Slider}">
+					<controls:SmallPanel>
+						<Border MaxWidth="{TemplateBinding MaxWidth}" Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" CornerRadius="2" />
+						<Track x:Name="PART_Track" Orientation="{TemplateBinding Orientation}">
+							<Track.DecreaseRepeatButton>
+								<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource WD.ColorPickerSliderRepeatButtonBaseStyle}" />
+							</Track.DecreaseRepeatButton>
+							<Track.IncreaseRepeatButton>
+								<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource WD.ColorPickerSliderRepeatButtonBaseStyle}" />
+							</Track.IncreaseRepeatButton>
+							<Track.Thumb>
+								<Thumb x:Name="Thumb" Width="15" Height="15" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource WD.ColorPickerSliderThumbTemplate}">
+									<Thumb.Effect>
+										<DropShadowEffect Opacity=".6" ShadowDepth="0" />
+									</Thumb.Effect>
+								</Thumb>
+							</Track.Thumb>
+						</Track>
+					</controls:SmallPanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="WD.ColorPicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:ColorPicker}">
+		<Setter Property="Width" Value="260" />
+		<Setter Property="Height" Value="200" />
+		<Setter Property="Margin" Value="2" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type controls:ColorPicker}">
+					<Border Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<Grid>
+							<Grid.RowDefinitions>
+								<RowDefinition />
+								<RowDefinition Height="Auto" />
+								<RowDefinition Height="Auto" />
+							</Grid.RowDefinitions>
+							<Canvas x:Name="PART_Canvas" Margin="1,1,1,0" ClipToBounds="True">
+								<Canvas.Background>
+									<DrawingBrush>
+										<DrawingBrush.Drawing>
+											<DrawingGroup>
+												<GeometryDrawing>
+													<GeometryDrawing.Brush>
+														<LinearGradientBrush EndPoint="1,0">
+															<GradientStop Offset="0" Color="White" />
+															<GradientStop Offset="1" Color="{Binding HueColor, RelativeSource={RelativeSource TemplatedParent}}" />
+														</LinearGradientBrush>
+													</GeometryDrawing.Brush>
+													<GeometryDrawing.Geometry>
+														<RectangleGeometry Rect="0,0,5,5" />
+													</GeometryDrawing.Geometry>
+												</GeometryDrawing>
+												<GeometryDrawing>
+													<GeometryDrawing.Brush>
+														<LinearGradientBrush EndPoint="0,1">
+															<GradientStop Offset="0" Color="#00000000" />
+															<GradientStop Offset="1" Color="{StaticResource WD.BlackColor}" />
+														</LinearGradientBrush>
+													</GeometryDrawing.Brush>
+													<GeometryDrawing.Geometry>
+														<RectangleGeometry Rect="0,0,5,5" />
+													</GeometryDrawing.Geometry>
+												</GeometryDrawing>
+											</DrawingGroup>
+										</DrawingBrush.Drawing>
+									</DrawingBrush>
+								</Canvas.Background>
+								<Thumb x:Name="PART_Thumb" Width="15" Height="15" Background="Transparent" BorderBrush="White" BorderThickness="3">
+									<Thumb.Template>
+										<ControlTemplate TargetType="{x:Type Thumb}">
+											<controls:SmallPanel>
+												<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" SnapsToDevicePixels="True">
+													<Border.Effect>
+														<DropShadowEffect Opacity=".6" ShadowDepth="0" />
+													</Border.Effect>
+												</Border>
+											</controls:SmallPanel>
+										</ControlTemplate>
+									</Thumb.Template>
+								</Thumb>
+							</Canvas>
+							<Grid Grid.Row="1" Margin="6,5,6,0">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition />
+								</Grid.ColumnDefinitions>
+								<Ellipse Width="25" Height="25" Margin="0,0,4,0" Fill="{TemplateBinding SelectedColor,&#xD;&#xA;                                                           Converter={StaticResource WD.ColorToBrushConverter}}">
+									<Ellipse.Effect>
+										<DropShadowEffect Opacity=".6" ShadowDepth="0" />
+									</Ellipse.Effect>
+								</Ellipse>
+								<Slider Name="PART_HueSlider" Grid.Column="1" Width="Auto" IsMoveToPointEnabled="True" LargeChange="0.01" Maximum="1" SmallChange="0.01" Style="{StaticResource WD.ColorPickerSlider}" Value="1" />
+							</Grid>
+							<Grid Grid.Row="2" Margin="4" VerticalAlignment="Center">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition />
+								</Grid.ColumnDefinitions>
+								<Grid.Resources>
+									<Style TargetType="{x:Type StackPanel}">
+										<Setter Property="Margin" Value="4,0" />
+									</Style>
+									<Style x:Key="WD.TextBoxColorPicker" BasedOn="{StaticResource WD.DefaultTextBox}" TargetType="{x:Type TextBox}">
+										<Setter Property="VerticalContentAlignment" Value="Center" />
+										<Setter Property="TextAlignment" Value="Center" />
+										<Setter Property="Width" Value="50" />
+									</Style>
+									<Style BasedOn="{StaticResource WD.NumericBox}" TargetType="{x:Type controls:NumericBox}">
+										<Setter Property="VerticalContentAlignment" Value="Center" />
+										<Setter Property="TextAlignment" Value="Center" />
+										<Setter Property="Width" Value="50" />
+										<Setter Property="UpDownButtonsWidth" Value="0" />
+										<Setter Property="Maximum" Value="255" />
+										<Setter Property="Minimum" Value="0" />
+									</Style>
+									<Style TargetType="{x:Type TextBlock}">
+										<Setter Property="HorizontalAlignment" Value="Center" />
+										<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+										<Setter Property="FontSize" Value="10" />
+									</Style>
+								</Grid.Resources>
+								<Button Name="PART_Button" Grid.Column="0" Width="30" Height="30" Margin="0,0,4,0" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}">
+									<controls:PathIcon Kind="UnfoldMore" />
+								</Button>
+								<UniformGrid Grid.Column="1" Rows="1" Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.RGB}}">
+									<StackPanel>
+										<controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToRedConverter}}" />
+										<TextBlock Text="R" />
+									</StackPanel>
+									<StackPanel>
+										<controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToGreenConverter}}" />
+										<TextBlock Text="G" />
+									</StackPanel>
+									<StackPanel>
+										<controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToBlueConverter}}" />
+										<TextBlock Text="B" />
+									</StackPanel>
+								</UniformGrid>
+								<UniformGrid Grid.Column="1" Rows="1" Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.HSL}}">
+									<StackPanel>
+										<TextBox helpers:TextBoxHelper.AllowOnlyNumericInput="True" helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.HToColorConverter}}" />
+										<TextBlock Text="H" />
+									</StackPanel>
+									<StackPanel Grid.Column="1">
+										<TextBox helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.SToColorConverter}}" />
+										<TextBlock Text="S" />
+									</StackPanel>
+									<StackPanel Grid.Column="2">
+										<TextBox helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.LToColorConverter}}" />
+										<TextBlock Text="L" />
+									</StackPanel>
+								</UniformGrid>
+								<StackPanel Grid.Column="1" Margin="12,0" Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.HEX}}">
+									<TextBox helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" MaxLength="9" Text="{Binding SelectedColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToStringConverter}}" TextAlignment="Center" />
+									<TextBlock Text="HEX" />
+								</StackPanel>
+							</Grid>
+						</Grid>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource WD.ColorPicker}" TargetType="{x:Type controls:ColorPicker}" />
 	<Style x:Key="WD.DatePickerCalendarStyle" BasedOn="{StaticResource {x:Type Calendar}}" TargetType="{x:Type Calendar}" />
 	<Style x:Key="WD.DefaultDatePicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DatePicker}">
 		<Setter Property="IsTodayHighlighted" Value="True" />
diff --git a/src/WPFDevelopers.Net45x/Themes/Generic.xaml b/src/WPFDevelopers.Net45x/Themes/Generic.xaml
index 76b52fed..c6724e1d 100644
--- a/src/WPFDevelopers.Net45x/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net45x/Themes/Generic.xaml
@@ -33,6 +33,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type wd:Window}">
                     <Border
+                        Name="PART_Border"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
@@ -167,7 +168,7 @@
                         <Trigger Property="WindowState" Value="Maximized">
                             <Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
                             <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="LayoutRoot" Property="Margin" Value="7" />
+                            <Setter TargetName="PART_Border" Property="Margin" Value="7" />
                         </Trigger>
                         <Trigger Property="WindowStyle" Value="ToolWindow">
                             <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
diff --git a/src/WPFDevelopers.Net45x/Themes/Theme.xaml b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
index 8401b734..2e9ac7aa 100644
--- a/src/WPFDevelopers.Net45x/Themes/Theme.xaml
+++ b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" po:Freeze="True" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:WPFDevelopers.Controls" xmlns:convert="clr-namespace:WPFDevelopers.Converts" xmlns:helpers="clr-namespace:WPFDevelopers.Helpers" xmlns:wd="clr-namespace:WPFDevelopers.Net45x" xmlns:ec="clr-namespace:Microsoft.Expression.Controls" xmlns:drawingControls="clr-namespace:Microsoft.Expression.Drawing.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" po:Freeze="True" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:WPFDevelopers.Controls" xmlns:convert="clr-namespace:WPFDevelopers.Converts" xmlns:helpers="clr-namespace:WPFDevelopers.Helpers" xmlns:wd="clr-namespace:WPFDevelopers.Net45x" xmlns:ec="clr-namespace:Microsoft.Expression.Controls" xmlns:drawingControls="clr-namespace:Microsoft.Expression.Drawing.Controls" xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore">
 	<SolidColorBrush x:Key="WD.ButtonFocusVisualColor" po:Freeze="True" Color="#60000000" />
 	<Color x:Key="WD.ShadowDepthColor" po:Freeze="True">#AA000000</Color>
 	<Color x:Key="WD.PrimaryTextColor" po:Freeze="True">#909399</Color>
@@ -104,7 +104,7 @@
 	<Geometry x:Key="WD.AlarmClockGeometry" po:Freeze="True">M470 124.837l-98.443-81.78-27.814 32.931 98.442 81.769L470 124.837zM167.192 74.919L139.366 42 42 124.837l27.814 32.919 97.378-82.837zm99.509 97.709H234.6v127.446l101.649 60.539L352.3 334.06l-85.6-49.917V172.628zM256 87.665c-107 0-192.601 86.021-192.601 191.166C63.399 383.98 149 470 256 470c105.936 0 192.601-86.02 192.601-191.169 0-105.144-86.665-191.166-192.601-191.166zm0 339.855c-82.393 0-149.8-66.906-149.8-148.688 0-81.777 67.407-148.684 149.8-148.684 82.394 0 149.8 66.906 149.8 148.684 0 82.839-67.406 148.688-149.8 148.688z</Geometry>
 	<Geometry x:Key="WD.FlagGeometry" po:Freeze="True">M687.5 125C500 125 375 13.7 187.5 62.5V31.3C187.5 31.3 187.5 0 156.3 0C125 0 125 31.3 125 31.3V1000H187.5V625C375 562.5 500 687.5 687.5 687.5C875 687.5 937.5 625 937.5 625V62.5C937.5 62.5 875 125 687.5 125Z</Geometry>
 	<Geometry x:Key="WD.CircularGeometry" po:Freeze="True">M 200,200 0,200 A 200,200 0 0 1 58.6,58.6z</Geometry>
-	<Geometry x:Key="WD.AddGeometry" po:Freeze="True">M734.618 760.269c-24.013 24.013-62.925 24.013-86.886 0l-135.731-155.136-135.731 155.085c-24.013 24.013-62.925 24.013-86.886 0-24.013-24.013-24.013-62.925 0-86.886l141.21-161.28-141.261-161.382c-24.013-24.013-24.013-62.874 0-86.886s62.874-24.013 86.886 0l135.782 155.187 135.731-155.187c24.013-24.013 62.874-24.013 86.886 0s24.013 62.925 0 86.886l-141.21 161.382 141.21 161.28c24.013 24.013 24.013 62.925 0 86.938z</Geometry>
+	<Geometry x:Key="WD.AddGeometry" po:Freeze="True">M810 554h-256v256h-84v-256h-256v-84h256v-256h84v256h256v84z</Geometry>
 	<Geometry x:Key="WD.ChatLeftGeometry" po:Freeze="True">M365.714 256v512q0 14.857-10.857 25.714t-25.714 10.857-25.714-10.857l-256-256q-10.857-10.857-10.857-25.714t10.857-25.714l256-256q10.857-10.857 25.714-10.857t25.714 10.857 10.857 25.714z</Geometry>
 	<Geometry x:Key="WD.ChatRightGeometry" po:Freeze="True">M329.143 512q0 14.857-10.857 25.714l-256 256q-10.857 10.857-25.714 10.857t-25.714-10.857-10.857-25.714v-512q0-14.857 10.857-25.714t25.714-10.857 25.714 10.857l256 256q10.857 10.857 10.857 25.714z</Geometry>
 	<Geometry x:Key="WD.StarGeometry" po:Freeze="True">M649.714 573.714l174.857-169.714-241.143-35.429-108-218.286-108 218.286-241.143 35.429 174.857 169.714-41.714 240.571 216-113.714 215.429 113.714zM950.857 369.714q0 12.571-14.857 27.429l-207.429 202.286 49.143 285.714q0.571 4 0.571 11.429 0 28.571-23.429 28.571-10.857 0-22.857-6.857l-256.571-134.857-256.571 134.857q-12.571 6.857-22.857 6.857-12 0-18-8.286t-6-20.286q0-3.429 1.143-11.429l49.143-285.714-208-202.286q-14.286-15.429-14.286-27.429 0-21.143 32-26.286l286.857-41.714 128.571-260q10.857-23.429 28-23.429t28 23.429l128.571 260 286.857 41.714q32 5.143 32 26.286z</Geometry>
@@ -129,6 +129,7 @@
 	<Geometry x:Key="WD.ReturnGeometry" po:Freeze="True">M356.667 155q17.333 0 30 12.5t12.667 30.167-12.667 30.333l-198.667 198.667h409.333q78 0 149.167 30.333t122.5 81.833 81.833 122.5 30.5 149.333v42.667q0 17.667-12.5 30.167t-30.167 12.5q-17.333 0-30-12.667t-12.667-30v-42.667q0-60.667-23.667-116t-63.667-95.333-95.333-63.667-116-23.667h-409.333l198.667 199q12.667 12.667 12.667 30 0 17.667-12.5 30.333t-30.167 12.667-30.333-12.667l-271.333-271.667q-12.333-12.333-12.333-30.333 0-17.667 12.333-30l271.333-271.667q12.667-12.667 30.333-12.667z</Geometry>
 	<Geometry x:Key="WD.HomeGeometry" po:Freeze="True">M804.571 566.857v274.286q0 14.857-10.857 25.714t-25.714 10.857h-219.429v-219.429h-146.286v219.429h-219.429q-14.857 0-25.714-10.857t-10.857-25.714v-274.286q0-0.571 0.286-1.714t0.286-1.714l328.571-270.857 328.571 270.857q0.571 1.143 0.571 3.429zM932 527.429l-35.429 42.286q-4.571 5.143-12 6.286h-1.714q-7.429 0-12-4l-395.429-329.714-395.429 329.714q-6.857 4.571-13.714 4-7.429-1.143-12-6.286l-35.429-42.286q-4.571-5.714-4-13.429t6.286-12.286l410.857-342.286q18.286-14.857 43.429-14.857t43.429 14.857l139.429 116.571v-111.429q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143v233.143l125.143 104q5.714 4.571 6.286 12.286t-4 13.429z</Geometry>
 	<Geometry x:Key="WD.ChevronUpGeometry" po:Freeze="True">M336.998 621.619c-13.875 13.722-36.301 13.722-50.074 0s-13.926-35.891 0-49.613l200.090-196.096c13.824-13.722 36.198-13.722 50.125 0l200.090 196.096c13.824 13.67 13.824 35.891 0 49.613-13.875 13.722-36.301 13.722-50.125 0l-175.104-160.819-175.002 160.819z</Geometry>
+	<Geometry x:Key="WD.UnfoldMoreGeometry" po:Freeze="True">M512 776l136-136 60 60-196 196-196-196 60-60zM512 248l-136 136-60-60 196-196 196 196-60 60z</Geometry>
 	<CubicEase x:Key="WD.CubicEaseInOut" EasingMode="EaseInOut" />
 	<PowerEase x:Key="WD.PowerEaseInOut" EasingMode="EaseInOut" />
 	<ExponentialEase x:Key="WD.ExponentialEaseOut" EasingMode="EaseOut" />
@@ -136,8 +137,8 @@
 	<SineEase x:Key="WD.SineEaseInOut" EasingMode="EaseInOut" />
 	<BackEase x:Key="WD.BackEaseEaseInOut" EasingMode="EaseInOut" />
 	<sys:Double x:Key="WD.EnabledOpacity">0.7</sys:Double>
-	<sys:Double x:Key="WD.NormalCornerRadius">4</sys:Double>
-	<sys:Double x:Key="WD.MinHeight">40</sys:Double>
+	<sys:Double x:Key="WD.DefaultCornerRadius">4</sys:Double>
+	<sys:Double x:Key="WD.DefaultHeight">32</sys:Double>
 	<sys:Double x:Key="WD.ThumbWidth">16</sys:Double>
 	<sys:Double x:Key="WD.ThumbCornerRadius">8</sys:Double>
 	<sys:Double x:Key="WD.RepeatButtonSize">5</sys:Double>
@@ -367,6 +368,40 @@
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
 	</Style>
+	<convert:ColorToBrushConverter x:Key="WD.ColorToBrushConverter" />
+	<convert:ColorToRedConverter x:Key="WD.ColorToRedConverter" />
+	<convert:ColorToGreenConverter x:Key="WD.ColorToGreenConverter" />
+	<convert:ColorToBlueConverter x:Key="WD.ColorToBlueConverter" />
+	<convert:ColorTypeToVisibilityConverter x:Key="WD.ColorTypeToVisibilityConverter" />
+	<convert:ColorToStringConverter x:Key="WD.ColorToStringConverter" />
+	<convert:HToColorConverter x:Key="WD.HToColorConverter" />
+	<convert:SToColorConverter x:Key="WD.SToColorConverter" />
+	<convert:LToColorConverter x:Key="WD.LToColorConverter" />
+	<LinearGradientBrush x:Key="WD.ColorPickerRainbowBrush" po:Freeze="True">
+		<GradientStop Color="#FF0000" />
+		<GradientStop Offset="0.167" Color="#FF00FF" />
+		<GradientStop Offset="0.334" Color="#0000FF" />
+		<GradientStop Offset="0.501" Color="#00FFFF" />
+		<GradientStop Offset="0.668" Color="#00FF00" />
+		<GradientStop Offset="0.835" Color="#FFFF00" />
+		<GradientStop Offset="1" Color="#FF0000" />
+	</LinearGradientBrush>
+	<ControlTemplate x:Key="WD.ColorPickerSliderThumbTemplate" TargetType="Thumb">
+		<Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="Transparent" BorderBrush="White" BorderThickness="3" CornerRadius="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
+	</ControlTemplate>
+	<Style x:Key="WD.ColorPickerSliderRepeatButtonBaseStyle" TargetType="RepeatButton">
+		<Setter Property="OverridesDefaultStyle" Value="true" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Focusable" Value="false" />
+		<Setter Property="IsTabStop" Value="false" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="RepeatButton">
+					<Rectangle Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{TemplateBinding Background}" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
 	<SolidColorBrush x:Key="WD.SecondaryTextSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.PrimaryTextColor}" />
 	<SolidColorBrush x:Key="WD.PlaceholderTextSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.PlaceholderTextColor}" />
 	<SolidColorBrush x:Key="WD.NormalSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.NormalColor}" />
@@ -731,7 +766,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type wd:Window}">
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+					<Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
 						<Grid x:Name="LayoutRoot">
 							<Grid.RowDefinitions>
 								<RowDefinition Height="Auto" />
@@ -781,7 +816,7 @@
 						<Trigger Property="WindowState" Value="Maximized">
 							<Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
 							<Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="LayoutRoot" Property="Margin" Value="7" />
+							<Setter TargetName="PART_Border" Property="Margin" Value="7" />
 						</Trigger>
 						<Trigger Property="WindowStyle" Value="ToolWindow">
 							<Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
@@ -809,7 +844,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Menu}">
-					<Border Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+					<Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
 						<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 					</Border>
 				</ControlTemplate>
@@ -2977,7 +3012,7 @@
 				<ControlTemplate TargetType="{x:Type PasswordBox}">
 					<Border x:Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
 						<controls:SmallPanel>
-							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
+							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" FontSize="{TemplateBinding FontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
 							<ScrollViewer x:Name="PART_ContentHost" />
 						</controls:SmallPanel>
 					</Border>
@@ -3255,6 +3290,8 @@
 	<Style BasedOn="{StaticResource WD.DefaultExpander}" TargetType="{x:Type Expander}" />
 	<Style x:Key="WD.DefaultGroupBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type GroupBox}">
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+		<Setter Property="Background" Value="{DynamicResource WD.LighterSolidColorBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type GroupBox}">
@@ -3263,16 +3300,10 @@
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="*" />
 						</Grid.RowDefinitions>
-						<Border Grid.Row="0" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
-							<Border.Background>
-								<SolidColorBrush Color="{DynamicResource BackgroundColor}" />
-							</Border.Background>
-							<ContentPresenter Margin="{TemplateBinding Padding}" ContentSource="Header" RecognizesAccessKey="True" />
+						<Border Grid.Row="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1">
+							<ContentPresenter Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
 						</Border>
-						<Border Grid.Row="1" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1,0,1,1" SnapsToDevicePixels="True">
-							<Border.Background>
-								<SolidColorBrush Color="{DynamicResource BackgroundColor}" />
-							</Border.Background>
+						<Border Grid.Row="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,0,1,1" SnapsToDevicePixels="True">
 							<ContentPresenter Margin="{TemplateBinding Padding}" />
 						</Border>
 					</Grid>
@@ -3735,7 +3766,7 @@
 								</DockPanel>
 							</controls:SmallPanel>
 							<controls:SmallPanel Grid.Row="2" Margin="140,20,10,10">
-								<UniformGrid Height="38" HorizontalAlignment="Right" Rows="1">
+								<UniformGrid Height="38" Rows="1">
 									<Button x:Name="PART_ButtonCancel" Width="60" Content="取消" Visibility="Collapsed" />
 									<Button x:Name="PART_ButtonOK" Width="60" Margin="6,0,0,0" Content="确认" Style="{DynamicResource WD.PrimaryButton}" />
 								</UniformGrid>
@@ -3906,6 +3937,7 @@
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
 		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type RepeatButton}">
@@ -4031,16 +4063,16 @@
 				<ControlTemplate TargetType="{x:Type controls:AnimationAudio}">
 					<ControlTemplate.Resources>
 						<Storyboard x:Key="PlayStoryboard" RepeatBehavior="Forever">
-							<ObjectAnimationUsingKeyFrames Storyboard.TargetName="WD.AudioTwoGeometry" Storyboard.TargetProperty="(Path.Visibility)">
+							<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Path2" Storyboard.TargetProperty="(Path.Visibility)">
 								<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
 							</ObjectAnimationUsingKeyFrames>
-							<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PathAudioThree" Storyboard.TargetProperty="(Path.Visibility)">
+							<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Path3" Storyboard.TargetProperty="(Path.Visibility)">
 								<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
 							</ObjectAnimationUsingKeyFrames>
-							<ObjectAnimationUsingKeyFrames BeginTime="0:0:.3" Storyboard.TargetName="WD.AudioTwoGeometry" Storyboard.TargetProperty="(Path.Visibility)" Duration="0:0:.4">
+							<ObjectAnimationUsingKeyFrames BeginTime="0:0:.3" Storyboard.TargetName="PART_Path2" Storyboard.TargetProperty="(Path.Visibility)" Duration="0:0:.4">
 								<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
 							</ObjectAnimationUsingKeyFrames>
-							<ObjectAnimationUsingKeyFrames BeginTime="0:0:.7" Storyboard.TargetName="PathAudioThree" Storyboard.TargetProperty="(Path.Visibility)" Duration="0:0:.4">
+							<ObjectAnimationUsingKeyFrames BeginTime="0:0:.7" Storyboard.TargetName="PART_Path3" Storyboard.TargetProperty="(Path.Visibility)" Duration="0:0:.4">
 								<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
 							</ObjectAnimationUsingKeyFrames>
 						</Storyboard>
@@ -4053,8 +4085,8 @@
 							</Grid.ColumnDefinitions>
 							<StackPanel x:Name="PART_StackPanel" Width="20" Height="30" Margin="10,0" HorizontalAlignment="Left" Orientation="Horizontal" RenderTransformOrigin=".5,.5">
 								<Path Width="4" Height="6" Data="{StaticResource WD.AudioOneGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" />
-								<Path x:Name="PathAudioTwo" Width="6" Margin="0,7" Data="{StaticResource WD.AudioTwoGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" Stroke="Transparent" StrokeThickness="1.5" />
-								<Path x:Name="PathAudioThree" Width="8" Margin="-3,4" Data="{StaticResource WD.AudioThreeGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" Stroke="Transparent" StrokeThickness="2" />
+								<Path x:Name="PART_Path2" Width="6" Margin="0,7" Data="{StaticResource WD.AudioTwoGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" Stroke="Transparent" StrokeThickness="1.5" />
+								<Path x:Name="PART_Path3" Width="8" Margin="-3,4" Data="{StaticResource WD.AudioThreeGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" Stroke="Transparent" StrokeThickness="2" />
 							</StackPanel>
 							<TextBlock x:Name="PART_TextBlock" Grid.Column="1" VerticalAlignment="Center" FontSize="{DynamicResource WD.TitleFontSize}" Foreground="{TemplateBinding Foreground}">
 								<Run x:Name="PART_RunTimeLength" />
@@ -4469,17 +4501,16 @@
 							<ToggleButton.Template>
 								<ControlTemplate TargetType="ToggleButton">
 									<controls:SmallPanel>
-										<Ellipse x:Name="PART_Ellipse" Width="100" Height="100" Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}" ToolTip="关闭" />
-										<Path x:Name="PART_Path" Width="20" Height="20" Data="{StaticResource WD.AddGeometry}" Fill="{StaticResource WD.BackgroundSolidColorBrush}" IsHitTestVisible="False" RenderTransformOrigin="0.5,0.5" Stretch="Fill" />
+										<Ellipse x:Name="PART_Ellipse" Width="100" Height="100" Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}" />
+										<controls:PathIcon x:Name="PART_Path" Width="20" Height="20" Foreground="{StaticResource WD.BackgroundSolidColorBrush}" Kind="Add" RenderTransformOrigin="0.5,0.5" />
 									</controls:SmallPanel>
 									<ControlTemplate.Triggers>
-										<Trigger Property="IsChecked" Value="false">
+										<Trigger Property="IsChecked" Value="True">
 											<Setter TargetName="PART_Path" Property="RenderTransform">
 												<Setter.Value>
 													<RotateTransform Angle="45" />
 												</Setter.Value>
 											</Setter>
-											<Setter TargetName="PART_Ellipse" Property="ToolTip" Value="展开" />
 										</Trigger>
 									</ControlTemplate.Triggers>
 								</ControlTemplate>
@@ -5538,15 +5569,11 @@
 							</Path.Data>
 						</Path>
 						<controls:SmallPanel x:Name="PART_Grid" Width="200" Height="200">
-							<Button x:Name="PART_ReplaceButton" Width="40" Height="40" HorizontalAlignment="Right" VerticalAlignment="Top" Style="{StaticResource WD.PathButton}" ToolTip="更换图片" Visibility="Collapsed">
+							<Button x:Name="PART_ReplaceButton" Width="40" Height="40" HorizontalAlignment="Right" VerticalAlignment="Top" Style="{StaticResource WD.PathButton}" Visibility="Collapsed">
 								<controls:PathIcon Width="15" Height="15" Foreground="{StaticResource WD.PrimaryNormalSolidColorBrush}" Kind="Replace" />
 							</Button>
-							<Button x:Name="PART_AddButton" Width="40" Height="40" Style="{StaticResource WD.PathButton}" ToolTip="选择图片">
-								<Path Width="20" Height="20" Data="{StaticResource WD.AddGeometry}" Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}" IsHitTestVisible="False" RenderTransformOrigin="0.5,0.5" Stretch="Fill">
-									<Path.RenderTransform>
-										<RotateTransform Angle="45" />
-									</Path.RenderTransform>
-								</Path>
+							<Button x:Name="PART_AddButton" Width="40" Height="40" Style="{StaticResource WD.PathButton}">
+								<controls:PathIcon Width="20" Height="20" Foreground="{StaticResource WD.PrimaryNormalSolidColorBrush}" Kind="Add" />
 							</Button>
 						</controls:SmallPanel>
 					</Canvas>
@@ -6042,8 +6069,8 @@
 									<Path x:Name="PART_Path" Width="15" Height="15" Data="{StaticResource WD.InformationGeometry}" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Stretch="Fill" />
 									<TextBlock Grid.Column="1" Margin="5,0,0,0" VerticalAlignment="Center" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Content}" TextWrapping="Wrap" />
 								</DockPanel>
-								<Button x:Name="PART_CloseButton" Grid.Column="2" Width="30" Height="28" Padding="0" HorizontalAlignment="Right" Style="{StaticResource WD.PathButton}">
-									<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.SecondaryTextSolidColorBrush}" Stretch="Fill" />
+								<Button x:Name="PART_CloseButton" Grid.Column="2" Width="25" Height="25" Margin="0,2,4,0" HorizontalAlignment="Right" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}" ToolTip="关闭">
+									<controls:PathIcon Width="10" Height="10" Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}" Kind="WindowClose" />
 								</Button>
 							</Grid>
 						</Border>
@@ -6098,7 +6125,7 @@
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Height" Value="16" />
 		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Stretch" />
+		<Setter Property="HorizontalAlignment" Value="Center" />
 		<Setter Property="Foreground">
 			<Setter.Value>
 				<Binding Path="Foreground" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType={x:Type Control}}" />
@@ -6108,7 +6135,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type controls:PathIcon}">
-					<Viewbox Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" UseLayoutRounding="True">
+					<Viewbox Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" UseLayoutRounding="True">
 						<Path x:Name="PART_Path" Data="{TemplateBinding Data}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Stretch="Uniform" UseLayoutRounding="False" />
 					</Viewbox>
 				</ControlTemplate>
@@ -6140,17 +6167,17 @@
 									<ColumnDefinition />
 									<ColumnDefinition Width="Auto" />
 								</Grid.ColumnDefinitions>
-								<TextBox x:Name="PART_TextBox" MinHeight="{TemplateBinding MinHeight}" Padding="{TemplateBinding Padding}" HorizontalAlignment="Stretch" VerticalAlignment="Center" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Background="{x:Null}" BorderThickness="0" FocusVisualStyle="{x:Null}" Focusable="{TemplateBinding Focusable}" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" InputMethod.IsInputMethodEnabled="False" IsReadOnly="{TemplateBinding IsReadOnly}" IsTabStop="{TemplateBinding IsTabStop}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Style="{x:Null}" TabIndex="{TemplateBinding TabIndex}" TextAlignment="{TemplateBinding TextAlignment}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
+								<TextBox x:Name="PART_TextBox" MinHeight="{TemplateBinding MinHeight}" Padding="{TemplateBinding Padding}" HorizontalAlignment="Stretch" VerticalAlignment="Center" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" helpers:TextBoxHelper.IsEnterUpdateEnabled="True" Background="{x:Null}" BorderThickness="0" FocusVisualStyle="{x:Null}" Focusable="{TemplateBinding Focusable}" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" InputMethod.IsInputMethodEnabled="False" IsReadOnly="{TemplateBinding IsReadOnly}" IsTabStop="{TemplateBinding IsTabStop}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Style="{x:Null}" TabIndex="{TemplateBinding TabIndex}" TextAlignment="{TemplateBinding TextAlignment}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
 								<Grid Grid.Column="1" Width="{TemplateBinding UpDownButtonsWidth}">
 									<Grid.RowDefinitions>
 										<RowDefinition />
 										<RowDefinition Height="1" />
 										<RowDefinition />
 									</Grid.RowDefinitions>
-									<RepeatButton x:Name="PART_NumericUp" Grid.Row="0" Margin="0,1,1,0" Command="{x:Static controls:NumericBox.IncreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
+									<RepeatButton x:Name="PART_NumericUp" Grid.Row="0" Margin="0,1,1,0" Padding="0" Command="{x:Static controls:NumericBox.IncreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
 										<controls:PathIcon Kind="ChevronUp" Style="{StaticResource WD.MiniPathIcon}" />
 									</RepeatButton>
-									<RepeatButton x:Name="PART_NumericDown" Grid.Row="2" Margin="0,0,1,1" Command="{x:Static controls:NumericBox.DecreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False">
+									<RepeatButton x:Name="PART_NumericDown" Grid.Row="2" Margin="0,0,1,1" Padding="0" Command="{x:Static controls:NumericBox.DecreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False">
 										<controls:PathIcon Kind="ChevronDown" Style="{StaticResource WD.MiniPathIcon}" />
 									</RepeatButton>
 								</Grid>
@@ -6176,6 +6203,182 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource WD.NumericBox}" TargetType="{x:Type controls:NumericBox}" />
+	<Style x:Key="WD.ColorPickerSlider" TargetType="{x:Type Slider}">
+		<Setter Property="Background" Value="{StaticResource WD.ColorPickerRainbowBrush}" />
+		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+		<Setter Property="Orientation" Value="Horizontal" />
+		<Setter Property="Height" Value="15" />
+		<Setter Property="Margin" Value="4,0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type Slider}">
+					<controls:SmallPanel>
+						<Border MaxWidth="{TemplateBinding MaxWidth}" Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" CornerRadius="2" />
+						<Track x:Name="PART_Track" Orientation="{TemplateBinding Orientation}">
+							<Track.DecreaseRepeatButton>
+								<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource WD.ColorPickerSliderRepeatButtonBaseStyle}" />
+							</Track.DecreaseRepeatButton>
+							<Track.IncreaseRepeatButton>
+								<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource WD.ColorPickerSliderRepeatButtonBaseStyle}" />
+							</Track.IncreaseRepeatButton>
+							<Track.Thumb>
+								<Thumb x:Name="Thumb" Width="15" Height="15" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource WD.ColorPickerSliderThumbTemplate}">
+									<Thumb.Effect>
+										<DropShadowEffect Opacity=".6" ShadowDepth="0" />
+									</Thumb.Effect>
+								</Thumb>
+							</Track.Thumb>
+						</Track>
+					</controls:SmallPanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="WD.ColorPicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:ColorPicker}">
+		<Setter Property="Width" Value="260" />
+		<Setter Property="Height" Value="200" />
+		<Setter Property="Margin" Value="2" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type controls:ColorPicker}">
+					<Border Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<Grid>
+							<Grid.RowDefinitions>
+								<RowDefinition />
+								<RowDefinition Height="Auto" />
+								<RowDefinition Height="Auto" />
+							</Grid.RowDefinitions>
+							<Canvas x:Name="PART_Canvas" Margin="1,1,1,0" ClipToBounds="True">
+								<Canvas.Background>
+									<DrawingBrush>
+										<DrawingBrush.Drawing>
+											<DrawingGroup>
+												<GeometryDrawing>
+													<GeometryDrawing.Brush>
+														<LinearGradientBrush EndPoint="1,0">
+															<GradientStop Offset="0" Color="White" />
+															<GradientStop Offset="1" Color="{Binding HueColor, RelativeSource={RelativeSource TemplatedParent}}" />
+														</LinearGradientBrush>
+													</GeometryDrawing.Brush>
+													<GeometryDrawing.Geometry>
+														<RectangleGeometry Rect="0,0,5,5" />
+													</GeometryDrawing.Geometry>
+												</GeometryDrawing>
+												<GeometryDrawing>
+													<GeometryDrawing.Brush>
+														<LinearGradientBrush EndPoint="0,1">
+															<GradientStop Offset="0" Color="#00000000" />
+															<GradientStop Offset="1" Color="{StaticResource WD.BlackColor}" />
+														</LinearGradientBrush>
+													</GeometryDrawing.Brush>
+													<GeometryDrawing.Geometry>
+														<RectangleGeometry Rect="0,0,5,5" />
+													</GeometryDrawing.Geometry>
+												</GeometryDrawing>
+											</DrawingGroup>
+										</DrawingBrush.Drawing>
+									</DrawingBrush>
+								</Canvas.Background>
+								<Thumb x:Name="PART_Thumb" Width="15" Height="15" Background="Transparent" BorderBrush="White" BorderThickness="3">
+									<Thumb.Template>
+										<ControlTemplate TargetType="{x:Type Thumb}">
+											<controls:SmallPanel>
+												<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" SnapsToDevicePixels="True">
+													<Border.Effect>
+														<DropShadowEffect Opacity=".6" ShadowDepth="0" />
+													</Border.Effect>
+												</Border>
+											</controls:SmallPanel>
+										</ControlTemplate>
+									</Thumb.Template>
+								</Thumb>
+							</Canvas>
+							<Grid Grid.Row="1" Margin="6,5,6,0">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition />
+								</Grid.ColumnDefinitions>
+								<Ellipse Width="25" Height="25" Margin="0,0,4,0" Fill="{TemplateBinding SelectedColor,&#xD;&#xA;                                                           Converter={StaticResource WD.ColorToBrushConverter}}">
+									<Ellipse.Effect>
+										<DropShadowEffect Opacity=".6" ShadowDepth="0" />
+									</Ellipse.Effect>
+								</Ellipse>
+								<Slider Name="PART_HueSlider" Grid.Column="1" Width="Auto" IsMoveToPointEnabled="True" LargeChange="0.01" Maximum="1" SmallChange="0.01" Style="{StaticResource WD.ColorPickerSlider}" Value="1" />
+							</Grid>
+							<Grid Grid.Row="2" Margin="4" VerticalAlignment="Center">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition />
+								</Grid.ColumnDefinitions>
+								<Grid.Resources>
+									<Style TargetType="{x:Type StackPanel}">
+										<Setter Property="Margin" Value="4,0" />
+									</Style>
+									<Style x:Key="WD.TextBoxColorPicker" BasedOn="{StaticResource WD.DefaultTextBox}" TargetType="{x:Type TextBox}">
+										<Setter Property="VerticalContentAlignment" Value="Center" />
+										<Setter Property="TextAlignment" Value="Center" />
+										<Setter Property="Width" Value="50" />
+									</Style>
+									<Style BasedOn="{StaticResource WD.NumericBox}" TargetType="{x:Type controls:NumericBox}">
+										<Setter Property="VerticalContentAlignment" Value="Center" />
+										<Setter Property="TextAlignment" Value="Center" />
+										<Setter Property="Width" Value="50" />
+										<Setter Property="UpDownButtonsWidth" Value="0" />
+										<Setter Property="Maximum" Value="255" />
+										<Setter Property="Minimum" Value="0" />
+									</Style>
+									<Style TargetType="{x:Type TextBlock}">
+										<Setter Property="HorizontalAlignment" Value="Center" />
+										<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+										<Setter Property="FontSize" Value="10" />
+									</Style>
+								</Grid.Resources>
+								<Button Name="PART_Button" Grid.Column="0" Width="30" Height="30" Margin="0,0,4,0" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}">
+									<controls:PathIcon Kind="UnfoldMore" />
+								</Button>
+								<UniformGrid Grid.Column="1" Rows="1" Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.RGB}}">
+									<StackPanel>
+										<controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToRedConverter}}" />
+										<TextBlock Text="R" />
+									</StackPanel>
+									<StackPanel>
+										<controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToGreenConverter}}" />
+										<TextBlock Text="G" />
+									</StackPanel>
+									<StackPanel>
+										<controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToBlueConverter}}" />
+										<TextBlock Text="B" />
+									</StackPanel>
+								</UniformGrid>
+								<UniformGrid Grid.Column="1" Rows="1" Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.HSL}}">
+									<StackPanel>
+										<TextBox helpers:TextBoxHelper.AllowOnlyNumericInput="True" helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.HToColorConverter}}" />
+										<TextBlock Text="H" />
+									</StackPanel>
+									<StackPanel Grid.Column="1">
+										<TextBox helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.SToColorConverter}}" />
+										<TextBlock Text="S" />
+									</StackPanel>
+									<StackPanel Grid.Column="2">
+										<TextBox helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.LToColorConverter}}" />
+										<TextBlock Text="L" />
+									</StackPanel>
+								</UniformGrid>
+								<StackPanel Grid.Column="1" Margin="12,0" Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.HEX}}">
+									<TextBox helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" MaxLength="9" Text="{Binding SelectedColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToStringConverter}}" TextAlignment="Center" />
+									<TextBlock Text="HEX" />
+								</StackPanel>
+							</Grid>
+						</Grid>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource WD.ColorPicker}" TargetType="{x:Type controls:ColorPicker}" />
 	<Style x:Key="WD.DatePickerCalendarStyle" BasedOn="{StaticResource {x:Type Calendar}}" TargetType="{x:Type Calendar}" />
 	<Style x:Key="WD.DefaultDatePicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DatePicker}">
 		<Setter Property="IsTodayHighlighted" Value="True" />
diff --git a/src/WPFDevelopers.Samples.Shared/App.xaml b/src/WPFDevelopers.Samples.Shared/App.xaml
index a246bc3c..0dc3616d 100644
--- a/src/WPFDevelopers.Samples.Shared/App.xaml
+++ b/src/WPFDevelopers.Samples.Shared/App.xaml
@@ -13,6 +13,7 @@
                 <!--  需要注意ws:Resources 必须再配色主题后，Theme="Dark" 为黑色皮肤  -->
                 <wd:Resources Theme="Light" />
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers;component/Themes/Theme.xaml" />
+                <!--  下方不用拷贝  -->
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/ExampleViews/LoginWindow/Generic.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/CodeViewer/CodeViewer.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/TimeLine/TimeLine.xaml" />
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ColorPickerExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ColorPickerExample.xaml
new file mode 100644
index 00000000..fd60d85f
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ColorPickerExample.xaml
@@ -0,0 +1,20 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.ColorPickerExample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <controls:CodeViewer>
+        <wd:ColorPicker />
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ColorPickerExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ColorPickerExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ColorPickerExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ColorPickerExample.xaml.cs
new file mode 100644
index 00000000..4fed7f77
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ColorPickerExample.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// BarrageExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class ColorPickerExample : UserControl
+    {
+        public ColorPickerExample()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NumericBoxExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/NumericBoxExample.xaml
index 11a2db5c..bc9d8342 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/NumericBoxExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/NumericBoxExample.xaml
@@ -17,10 +17,12 @@
             Rows="1">
             <wd:NumericBox
                 Width="100"
+                Height="30"
                 Maximum="100"
                 Minimum="0" />
             <wd:NumericBox
                 Width="100"
+                Height="40"
                 Margin="10,0"
                 Maximum="1000"
                 Minimum="100"
diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index e20d9ec0..851fa925 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -76,6 +76,7 @@ public enum MenuEnum
         Message,
         PathIcon,
         NumericBox,
+        ColorPicker,
         VirtualizingWrapPanel,
         AcrylicBlur,
         TaskbarInfo
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index bb9b2e68..09cd2d7d 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -306,6 +306,9 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.NumericBox:
                     ControlPanel = new NumericBoxExample();
                     break;
+                case MenuEnum.ColorPicker:
+                    ControlPanel = new ColorPickerExample();
+                    break;
                 case MenuEnum.VirtualizingWrapPanel:
                     ControlPanel = new VirtualizingWrapPanel();
                     new VirtualizingWrapPanelExample().MaskShowDialog();
diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 7f11fa71..6f64919b 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -114,6 +114,9 @@
       <SubType>Code</SubType>
       <DependentUpon>CircularProgressBarExample.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ColorPickerExample.xaml.cs">
+      <DependentUpon>ColorPickerExample.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\CountdownTimerExample.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>CountdownTimerExample.xaml</DependentUpon>
@@ -556,6 +559,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\ColorPickerExample.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\CountdownTimerExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj b/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
index be412c10..7734d0f6 100644
--- a/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
+++ b/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
@@ -32,7 +32,7 @@
 		</BootstrapperPackage>
 	</ItemGroup>
 	<ItemGroup>
-	  <PackageReference Include="WPFDevelopers" Version="1.1.0.2-preview1" />
+	  <PackageReference Include="WPFDevelopers" Version="1.1.0.2-preview2" />
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\WPFDevelopers.ico">
diff --git a/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj b/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
index 583680c8..bac8f4b1 100644
--- a/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
+++ b/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
@@ -13,7 +13,7 @@
 		<ApplicationIcon>..\WPFDevelopers.Samples.Shared\WPFDevelopers.ico</ApplicationIcon>
 	</PropertyGroup>
 	<ItemGroup>
-	  <PackageReference Include="WPFDevelopers" Version="1.1.0.2-preview1" />
+	  <PackageReference Include="WPFDevelopers" Version="1.1.0.2-preview2" />
 	</ItemGroup>
 	
 	<ItemGroup>
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index b8fcc22e..019b1b5b 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -127,6 +127,7 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\ScrollViewer\ScrollViewerAnimation.cs" Link="Controls\ScrollViewer\ScrollViewerAnimation.cs" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\ScrollViewer\ScrollViewerBehavior.cs" Link="Controls\ScrollViewer\ScrollViewerBehavior.cs" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\SongWords\SongWords.cs" Link="Controls\SongWords\SongWords.cs" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\CountdownTimer\CountdownTimer.cs" Link="Controls\CountdownTimer\CountdownTimer.cs" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\ElementAdorner\ElementAdorner.cs" Link="Controls\ElementAdorner\ElementAdorner.cs" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\ElementAdorner\ThumbAngle.cs" Link="Controls\ElementAdorner\ThumbAngle.cs" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\CropControl\CropControl.cs" Link="Controls\CropControl\CropControl.cs" />
@@ -137,6 +138,7 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NoneNoChromeWindow.xaml.cs" Link="ExampleViews\NoneNoChromeWindow.xaml.cs" DependentUpon="NoneNoChromeWindow.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\PathIconExample.xaml.cs" Link="ExampleViews\PathIconExample.xaml.cs" DependentUpon="PathIconExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NumericBoxExample.xaml.cs" Link="ExampleViews\NumericBoxExample.xaml.cs" DependentUpon="NumericBoxExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ColorPickerExample.xaml.cs" Link="ExampleViews\ColorPickerExample.xaml.cs" DependentUpon="ColorPickerExample.xaml" />
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\AboutWindow.xaml">
@@ -463,5 +465,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NumericBoxExample.xaml">
 			<Link>ExampleViews\NumericBoxExample.xaml</Link>
 		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ColorPickerExample.xaml">
+			<Link>ExampleViews\ColorPickerExample.xaml</Link>
+		</Resource>
 	</ItemGroup>
 </Project>
diff --git a/src/WPFDevelopers.Shared/Controls/ColorPicker/ColorPicker.cs b/src/WPFDevelopers.Shared/Controls/ColorPicker/ColorPicker.cs
new file mode 100644
index 00000000..75066b00
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/ColorPicker/ColorPicker.cs
@@ -0,0 +1,223 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using System.Windows.Media;
+using WPFDevelopers.Utilities;
+
+namespace WPFDevelopers.Controls
+{
+    [TemplatePart(Name = HueSliderColorTemplateName, Type = typeof(Slider))]
+    [TemplatePart(Name = CanvasTemplateName, Type = typeof(Canvas))]
+    [TemplatePart(Name = ThumbTemplateName, Type = typeof(Thumb))]
+    [TemplatePart(Name = ButtonTemplateName, Type = typeof(Button))]
+    public class ColorPicker : Control
+    {
+        private const string HueSliderColorTemplateName = "PART_HueSlider";
+
+        private const string CanvasTemplateName = "PART_Canvas";
+
+        private const string ThumbTemplateName = "PART_Thumb";
+
+        private const string ButtonTemplateName = "PART_Button";
+
+        private static readonly DependencyPropertyKey HueColorPropertyKey =
+            DependencyProperty.RegisterReadOnly("HueColor", typeof(Color), typeof(ColorPicker),
+                new PropertyMetadata(Colors.Red));
+
+        public static readonly DependencyProperty HueColorProperty = HueColorPropertyKey.DependencyProperty;
+
+        public static readonly DependencyProperty SelectedColorProperty =
+            DependencyProperty.Register("SelectedColor", typeof(Color), typeof(ColorPicker),
+                new FrameworkPropertyMetadata(Colors.Red, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+                    OnSelectedColorChanged));
+
+        private static readonly DependencyPropertyKey HSBPropertyKey =
+            DependencyProperty.RegisterReadOnly("HSB", typeof(HSB), typeof(ColorPicker),
+                new PropertyMetadata(new HSB()));
+
+        public static readonly DependencyProperty HSBHProperty = HSBPropertyKey.DependencyProperty;
+
+        public static readonly DependencyProperty ColorTypeProperty =
+            DependencyProperty.Register("ColorType", typeof(ColorTypeEnum), typeof(ColorPicker),
+                new PropertyMetadata(ColorTypeEnum.RGB));
+
+        private Button _button;
+
+        private Canvas _canvas;
+
+        private Slider _hueSliderColor;
+
+        private bool _isInnerUpdateSelectedColor;
+
+        private Thumb _thumb;
+
+        private ColorTypeEnum[] colorTypeEnums;
+
+        private int currentGridStateIndex;
+
+
+        static ColorPicker()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(ColorPicker),
+                new FrameworkPropertyMetadata(typeof(ColorPicker)));
+        }
+
+        public Color HueColor => (Color) GetValue(HueColorProperty);
+
+        public Color SelectedColor
+        {
+            get => (Color) GetValue(SelectedColorProperty);
+            set => SetValue(SelectedColorProperty, value);
+        }
+
+        public HSB HSB => (HSB) GetValue(HSBHProperty);
+
+
+        public ColorTypeEnum ColorType
+        {
+            get => (ColorTypeEnum) GetValue(ColorTypeProperty);
+            set => SetValue(ColorTypeProperty, value);
+        }
+
+        private static void OnSelectedColorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctrl = d as ColorPicker;
+            if (ctrl._isInnerUpdateSelectedColor)
+            {
+                ctrl._isInnerUpdateSelectedColor = false;
+                return;
+            }
+
+            var color = (Color) e.NewValue;
+            double h = 0, s = 0, b = 0;
+            ColorUtil.HsbFromColor(color, ref h, ref s, ref b);
+            var hsb = new HSB {H = h, S = s, B = b};
+            ctrl.SetValue(HueColorPropertyKey, ColorUtil.ColorFromHsb(hsb.H, 1, 1));
+            ctrl.SetValue(HSBPropertyKey, hsb);
+            Canvas.SetLeft(ctrl._thumb, s * ctrl._canvas.ActualWidth - ctrl._thumb.ActualWidth / 2);
+            Canvas.SetTop(ctrl._thumb, (1 - b) * ctrl._canvas.ActualHeight - ctrl._thumb.ActualHeight / 2);
+            ctrl._hueSliderColor.Value = 1 - h;
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            if (_hueSliderColor != null)
+                _hueSliderColor.ValueChanged -= HueSliderColor_OnValueChanged;
+            _canvas = GetTemplateChild(CanvasTemplateName) as Canvas;
+            if (_canvas != null)
+            {
+                _canvas.Loaded += Canvas_Loaded;
+                _canvas.MouseUp += Canvas_MouseUp;
+            }
+
+            _thumb = GetTemplateChild(ThumbTemplateName) as Thumb;
+            if (_thumb != null)
+                _thumb.DragDelta += Thumb_DragDelta;
+            _hueSliderColor = GetTemplateChild(HueSliderColorTemplateName) as Slider;
+            if (_hueSliderColor != null)
+                _hueSliderColor.ValueChanged += HueSliderColor_OnValueChanged;
+
+            _button = GetTemplateChild(ButtonTemplateName) as Button;
+            currentGridStateIndex = 0;
+            colorTypeEnums = (ColorTypeEnum[]) Enum.GetValues(typeof(ColorTypeEnum));
+            if (_button != null)
+                _button.Click += Button_Click;
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            currentGridStateIndex = (currentGridStateIndex + 1) % colorTypeEnums.Length;
+            ColorType = colorTypeEnums[currentGridStateIndex];
+        }
+
+        private void Canvas_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            var canvasPosition = e.GetPosition(_canvas);
+            GetHSB(canvasPosition);
+        }
+
+        private void Canvas_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            var canvasPosition = e.GetPosition(_canvas);
+            GetHSB(canvasPosition);
+        }
+
+        private void GetHSB(Point point, bool isMove = true)
+        {
+            var newLeft = point.X - _thumb.ActualWidth / 2;
+            var newTop = point.Y - _thumb.ActualHeight / 2;
+            var thumbW = _thumb.ActualWidth / 2;
+            var thumbH = _thumb.ActualHeight / 2;
+            var canvasRight = _canvas.ActualWidth - thumbW;
+            var canvasBottom = _canvas.ActualHeight - thumbH;
+            if (newLeft < -thumbW)
+                newLeft = -thumbW;
+            else if (newLeft > canvasRight)
+                newLeft = canvasRight;
+            if (newTop < -thumbH)
+                newTop = -thumbH;
+            else if (newTop > canvasBottom)
+                newTop = canvasBottom;
+
+            if (isMove)
+            {
+                Canvas.SetLeft(_thumb, newLeft);
+                Canvas.SetTop(_thumb, newTop);
+            }
+
+            var hsb = new HSB
+            {
+                H = HSB.H, S = (newLeft + thumbW) / _canvas.ActualWidth,
+                B = 1 - (newTop + thumbH) / _canvas.ActualHeight
+            };
+            SetValue(HSBPropertyKey, hsb);
+            var currentColor = ColorUtil.ColorFromAhsb(1, HSB.H, HSB.S, HSB.B);
+            if (SelectedColor != currentColor)
+            {
+                _isInnerUpdateSelectedColor = true;
+                SelectedColor = currentColor;
+            }
+        }
+
+        private void Thumb_DragDelta(object sender, DragDeltaEventArgs e)
+        {
+            var point = Mouse.GetPosition(_canvas);
+            GetHSB(point);
+        }
+
+        private void Canvas_Loaded(object sender, RoutedEventArgs e)
+        {
+            var width = (int) _canvas.ActualWidth;
+            var height = (int) _canvas.ActualHeight;
+            var point = new Point(width - _thumb.ActualWidth / 2, -_thumb.ActualHeight / 2);
+            Canvas.SetLeft(_thumb, point.X);
+            Canvas.SetTop(_thumb, point.Y);
+            var hsb = new HSB {H = _hueSliderColor.Value, S = HSB.S, B = HSB.B};
+            SetValue(HSBPropertyKey, hsb);
+        }
+
+        private void HueSliderColor_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            if (DoubleUtil.AreClose(HSB.H, e.NewValue))
+                return;
+            var hsb = new HSB {H = 1 - e.NewValue, S = HSB.S, B = HSB.B};
+            SetValue(HSBPropertyKey, hsb);
+            SetValue(HueColorPropertyKey, ColorUtil.ColorFromHsb(HSB.H, 1, 1));
+
+            var newLeft = Canvas.GetLeft(_thumb);
+            var newTop = Canvas.GetTop(_thumb);
+            var point = new Point(newLeft, newTop);
+            GetHSB(point, false);
+        }
+    }
+
+    public enum ColorTypeEnum
+    {
+        RGB,
+        HSL,
+        HEX
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/ColorPicker/HSB.cs b/src/WPFDevelopers.Shared/Controls/ColorPicker/HSB.cs
new file mode 100644
index 00000000..b4c9618a
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/ColorPicker/HSB.cs
@@ -0,0 +1,9 @@
+namespace WPFDevelopers.Controls
+{
+    public struct HSB
+    {
+        public double H { get; set; }
+        public double S { get; set; }
+        public double B { get; set; }
+    }
+}
diff --git a/src/WPFDevelopers.Shared/Controls/ColorPicker/HSL.cs b/src/WPFDevelopers.Shared/Controls/ColorPicker/HSL.cs
new file mode 100644
index 00000000..a7fb3cfd
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/ColorPicker/HSL.cs
@@ -0,0 +1,10 @@
+namespace WPFDevelopers.Controls
+{
+    public struct HSL
+    {
+        public double A;
+        public double H;
+        public double L;
+        public double S;
+    }
+}
diff --git a/src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs b/src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs
index f9bc1abc..0cb1e911 100644
--- a/src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs
@@ -102,19 +102,19 @@ public override void OnApplyTemplate()
 
             _closeButton = GetTemplateChild(CloseButtonTemplateName) as Button;
             if (_closeButton != null)
-                _closeButton.Click += _closeButton_Click;
+                _closeButton.Click += CloseButton_Click;
             _buttonCancel = GetTemplateChild(ButtonCancelTemplateName) as Button;
             if (_buttonCancel != null)
             {
                 _buttonCancel.Visibility = _cancelVisibility;
-                _buttonCancel.Click += _buttonCancel_Click;
+                _buttonCancel.Click += ButtonCancel_Click;
             }
 
             _buttonOK = GetTemplateChild(ButtonOKTemplateName) as Button;
             if (_buttonOK != null)
             {
                 _buttonOK.Visibility = _okVisibility;
-                _buttonOK.Click += _buttonOK_Click;
+                _buttonOK.Click += ButtonOK_Click;
             }
 
             if (Owner == null)
@@ -143,19 +143,19 @@ public override void OnApplyTemplate()
 #endif
         }
 
-        private void _buttonOK_Click(object sender, RoutedEventArgs e)
+        private void ButtonOK_Click(object sender, RoutedEventArgs e)
         {
             Result = MessageBoxResult.OK;
             Close();
         }
 
-        private void _buttonCancel_Click(object sender, RoutedEventArgs e)
+        private void ButtonCancel_Click(object sender, RoutedEventArgs e)
         {
             Result = MessageBoxResult.Cancel;
             Close();
         }
 
-        private void _closeButton_Click(object sender, RoutedEventArgs e)
+        private void CloseButton_Click(object sender, RoutedEventArgs e)
         {
             Close();
         }
diff --git a/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs b/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs
index 8f95359f..3d8f7708 100644
--- a/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs
+++ b/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs
@@ -51,5 +51,6 @@ public enum PackIconKind
         [Description("WD.ReturnGeometry")] Return,
         [Description("WD.HomeGeometry")] Home,
         [Description("WD.BreadCrumbBarGeometry")] BreadCrumbBar,
+        [Description("WD.UnfoldMoreGeometry")] UnfoldMore,
     }
 }
diff --git a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
index 568664f4..f81f65f7 100644
--- a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
+++ b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
@@ -216,33 +216,33 @@ public override void OnApplyTemplate()
             _rectangleRight = GetTemplateChild(RectangleRightTemplateName) as Rectangle;
             _rectangleBottom = GetTemplateChild(RectangleBottomTemplateName) as Rectangle;
             _border = GetTemplateChild(BorderTemplateName) as Border;
-            _border.MouseLeftButtonDown += _border_MouseLeftButtonDown;
+            _border.MouseLeftButtonDown += Border_MouseLeftButtonDown;
 
             _editBar = GetTemplateChild(EditBarTemplateName) as Border;
             _buttonSave = GetTemplateChild(ButtonSaveTemplateName) as Button;
             if (_buttonSave != null)
-                _buttonSave.Click += _buttonSave_Click;
+                _buttonSave.Click += ButtonSave_Click;
             _buttonCancel = GetTemplateChild(ButtonCancelTemplateName) as Button;
             if (_buttonCancel != null)
-                _buttonCancel.Click += _buttonCancel_Click;
+                _buttonCancel.Click += ButtonCancel_Click;
             _buttonComplete = GetTemplateChild(ButtonCompleteTemplateName) as Button;
             if (_buttonComplete != null)
-                _buttonComplete.Click += _buttonComplete_Click;
+                _buttonComplete.Click += ButtonComplete_Click;
             _radioButtonRectangle = GetTemplateChild(RadioButtonRectangleTemplateName) as RadioButton;
             if (_radioButtonRectangle != null)
-                _radioButtonRectangle.Click += _radioButtonRectangle_Click;
+                _radioButtonRectangle.Click += RadioButtonRectangle_Click;
             _radioButtonEllipse = GetTemplateChild(RadioButtonEllipseTemplateName) as RadioButton;
             if (_radioButtonEllipse != null)
-                _radioButtonEllipse.Click += _radioButtonEllipse_Click;
+                _radioButtonEllipse.Click += RadioButtonEllipse_Click;
             _radioButtonArrow = GetTemplateChild(RadioButtonArrowTemplateName) as RadioButton;
             if (_radioButtonArrow != null)
-                _radioButtonArrow.Click += _radioButtonArrow_Click;
+                _radioButtonArrow.Click += RadioButtonArrow_Click;
             _radioButtonInk = GetTemplateChild(RadioButtonInkTemplateName) as RadioButton;
             if (_radioButtonInk != null)
-                _radioButtonInk.Click += _radioButtonInk_Click;
+                _radioButtonInk.Click += RadioButtonInk_Click;
             _radioButtonText = GetTemplateChild(RadioButtonTextTemplateName) as RadioButton;
             if (_radioButtonText != null)
-                _radioButtonText.Click += _radioButtonText_Click;
+                _radioButtonText.Click += RadioButtonText_Click;
             _canvas.Width = Screen.AllScreens[ScreenIndex].Bounds.Width;
             _canvas.Height = Screen.AllScreens[ScreenIndex].Bounds.Height;
             //_canvas.Background = new ImageBrush(ControlsHelper.Capture());
@@ -254,7 +254,7 @@ public override void OnApplyTemplate()
             _popupBorder = GetTemplateChild(PopupBorderTemplateName) as Border;
             _popupBorder.Loaded += (s, e) => { _popup.HorizontalOffset = -_popupBorder.ActualWidth / 3; };
             _wrapPanel = GetTemplateChild(WrapPanelColorTemplateName) as WrapPanel;
-            _wrapPanel.PreviewMouseDown += _wrapPanel_PreviewMouseDown;
+            _wrapPanel.PreviewMouseDown += WrapPanel_PreviewMouseDown;
             Loaded += ScreenCut_Loaded;
             controlTemplate = (ControlTemplate)FindResource("WD.PART_DrawArrow");
         }
@@ -322,22 +322,22 @@ protected override void OnPreviewMouseRightButtonDown(MouseButtonEventArgs e)
             OnCanceled();
         }
 
-        private void _radioButtonInk_Click(object sender, RoutedEventArgs e)
+        private void RadioButtonInk_Click(object sender, RoutedEventArgs e)
         {
             RadioButtonChecked(_radioButtonInk, ScreenCutMouseType.DrawInk);
         }
 
-        private void _radioButtonText_Click(object sender, RoutedEventArgs e)
+        private void RadioButtonText_Click(object sender, RoutedEventArgs e)
         {
             RadioButtonChecked(_radioButtonText, ScreenCutMouseType.DrawText);
         }
 
-        private void _radioButtonArrow_Click(object sender, RoutedEventArgs e)
+        private void RadioButtonArrow_Click(object sender, RoutedEventArgs e)
         {
             RadioButtonChecked(_radioButtonArrow, ScreenCutMouseType.DrawArrow);
         }
 
-        private void _wrapPanel_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+        private void WrapPanel_PreviewMouseDown(object sender, MouseButtonEventArgs e)
         {
             if (e.Source is RadioButton)
             {
@@ -346,12 +346,12 @@ private void _wrapPanel_PreviewMouseDown(object sender, MouseButtonEventArgs e)
             }
         }
 
-        private void _radioButtonRectangle_Click(object sender, RoutedEventArgs e)
+        private void RadioButtonRectangle_Click(object sender, RoutedEventArgs e)
         {
             RadioButtonChecked(_radioButtonRectangle, ScreenCutMouseType.DrawRectangle);
         }
 
-        private void _radioButtonEllipse_Click(object sender, RoutedEventArgs e)
+        private void RadioButtonEllipse_Click(object sender, RoutedEventArgs e)
         {
             RadioButtonChecked(_radioButtonEllipse, ScreenCutMouseType.DrawEllipse);
         }
@@ -405,13 +405,13 @@ private void _border_SizeChanged(object sender, SizeChangedEventArgs e)
             EditBarPosition();
         }
         
-        private void _border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             if (screenCutMouseType == ScreenCutMouseType.Default)
                 screenCutMouseType = ScreenCutMouseType.MoveMouse;
         }
         
-        private void _buttonSave_Click(object sender, RoutedEventArgs e)
+        private void ButtonSave_Click(object sender, RoutedEventArgs e)
         {
             var dlg = new SaveFileDialog();
             dlg.FileName = $"WPFDevelopers{DateTime.Now.ToString("yyyyMMddHHmmss")}.jpg";
@@ -432,7 +432,7 @@ private void _buttonSave_Click(object sender, RoutedEventArgs e)
             }
         }
         
-        private void _buttonComplete_Click(object sender, RoutedEventArgs e)
+        private void ButtonComplete_Click(object sender, RoutedEventArgs e)
         {
             var bitmap = CutBitmap();
             if (CutCompleted != null)
@@ -455,7 +455,7 @@ private CroppedBitmap CutBitmap()
                 new Int32Rect((int)rect.X, (int)rect.Y, (int)rect.Width, (int)rect.Height));
         }
         
-        private void _buttonCancel_Click(object sender, RoutedEventArgs e)
+        private void ButtonCancel_Click(object sender, RoutedEventArgs e)
         {
             OnCanceled();
         }
@@ -593,7 +593,7 @@ private void DrawText()
                     textBorder.PreviewMouseLeftButtonDown += (s, e) =>
                     {
                         _radioButtonText.IsChecked = true;
-                        _radioButtonText_Click(null, null);
+                        RadioButtonText_Click(null, null);
                         SelectElement();
                         var border = s as Border;
                         frameworkElement = border;
@@ -679,7 +679,7 @@ private void DrwaInkControl(Point current)
                     polyLine.MouseLeftButtonDown += (s, e) =>
                     {
                         _radioButtonInk.IsChecked = true;
-                        _radioButtonInk_Click(null, null);
+                        RadioButtonInk_Click(null, null);
                         SelectElement();
                         frameworkElement = s as Polyline;
                         frameworkElement.Opacity = .7;
@@ -713,7 +713,7 @@ private void DrawArrowControl(Point current)
                 controlArrow.MouseLeftButtonDown += (s, e) =>
                 {
                     _radioButtonArrow.IsChecked = true;
-                    _radioButtonArrow_Click(null, null);
+                    RadioButtonArrow_Click(null, null);
                     SelectElement();
                     frameworkElement = s as Control;
                     frameworkElement.Opacity = .7;
@@ -841,7 +841,7 @@ private void DrawMultipleControl(Point current)
                         borderRectangle.MouseLeftButtonDown += (s, e) =>
                         {
                             _radioButtonRectangle.IsChecked = true;
-                            _radioButtonRectangle_Click(null, null);
+                            RadioButtonRectangle_Click(null, null);
                             SelectElement();
                             frameworkElement = s as Border;
                             frameworkElement.Opacity = .7;
@@ -863,7 +863,7 @@ private void DrawMultipleControl(Point current)
                         drawEllipse.MouseLeftButtonDown += (s, e) =>
                         {
                             _radioButtonEllipse.IsChecked = true;
-                            _radioButtonEllipse_Click(null, null);
+                            RadioButtonEllipse_Click(null, null);
                             SelectElement();
                             frameworkElement = s as Ellipse;
                             frameworkElement.Opacity = .7;
diff --git a/src/WPFDevelopers.Shared/Core/Converts/ColorConverter.cs b/src/WPFDevelopers.Shared/Core/Converts/ColorConverter.cs
new file mode 100644
index 00000000..72f101df
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Core/Converts/ColorConverter.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.Windows.Data;
+using System.Windows.Media;
+using WPFDevelopers.Utilities;
+
+namespace WPFDevelopers.Converts
+{
+    public class ColorToRedConverter : IValueConverter
+    {
+        private Color? _curColor;
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            _curColor = (Color) value;
+
+            return _curColor.Value.R;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return Color.FromArgb(_curColor.Value.A, (byte) double.Parse(value.ToString()), _curColor.Value.G,
+                _curColor.Value.B);
+        }
+    }
+
+    public class ColorToGreenConverter : IValueConverter
+    {
+        private Color? _curColor;
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            _curColor = (Color) value;
+
+            return _curColor.Value.G;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return Color.FromArgb(_curColor.Value.A, _curColor.Value.R, (byte) double.Parse(value.ToString()),
+                _curColor.Value.B);
+        }
+    }
+
+    public class ColorToBlueConverter : IValueConverter
+    {
+        private Color? _curColor;
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            _curColor = (Color) value;
+
+            return _curColor.Value.B;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return Color.FromArgb(_curColor.Value.A, _curColor.Value.R, _curColor.Value.G,
+                (byte) double.Parse(value.ToString()));
+        }
+    }
+
+    public class ColorToBrushConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return new SolidColorBrush((Color) value);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public class ColorToStringConverter : IValueConverter
+    {
+        private Color? _curColor;
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            _curColor = (Color) value;
+
+            return _curColor.ToString();
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var colorStr = (string) value;
+
+            if (!string.IsNullOrWhiteSpace(colorStr) && Regex.IsMatch(colorStr, @"^#[\da-fA-F]{6,8}$"))
+                return ColorConverter.ConvertFromString(colorStr);
+
+            return _curColor.Value;
+        }
+    }
+
+    public class HToColorConverter : IValueConverter
+    {
+        private Color? _curColor;
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            _curColor = (Color) value;
+            return $"{(int) ColorUtil.RgbToHSL(_curColor.Value).H}";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var colorStr = (string) value;
+            if (!string.IsNullOrWhiteSpace(colorStr) && double.TryParse(colorStr, out var hValue))
+                _curColor = ColorUtil.ConvertHSLToColor(_curColor.Value, hValue % 360);
+            return _curColor;
+        }
+    }
+
+    public class SToColorConverter : IValueConverter
+    {
+        private Color? _curColor;
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            _curColor = (Color) value;
+            return $"{Math.Round(ColorUtil.RgbToHSL(_curColor.Value).S * 100)}%";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var colorStr = (string) value;
+            if (!string.IsNullOrWhiteSpace(colorStr) && double.TryParse(colorStr, out var sValue))
+                _curColor = ColorUtil.ConvertHSLToColor(_curColor.Value, sl: sValue / 100);
+            return _curColor;
+        }
+    }
+
+    public class LToColorConverter : IValueConverter
+    {
+        private Color? _curColor;
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            _curColor = (Color) value;
+            return $"{Math.Round(ColorUtil.RgbToHSL(_curColor.Value).L * 100)}%";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var colorStr = (string) value;
+            if (!string.IsNullOrWhiteSpace(colorStr) && double.TryParse(colorStr, out var lValue))
+                _curColor = ColorUtil.ConvertHSLToColor(_curColor.Value, l: lValue / 100);
+            return _curColor;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Core/Converts/ColorTypeToVisibilityConverter.cs b/src/WPFDevelopers.Shared/Core/Converts/ColorTypeToVisibilityConverter.cs
new file mode 100644
index 00000000..15a9e226
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Core/Converts/ColorTypeToVisibilityConverter.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace WPFDevelopers.Converts
+{
+    public class ColorTypeToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is Enum enumValue && parameter is Enum targetEnumValue)
+                if (enumValue.Equals(targetEnumValue))
+                    return Visibility.Visible;
+            return Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Core/Converts/WidthHeightEqualValueConverter.cs b/src/WPFDevelopers.Shared/Core/Converts/WidthHeightEqualValueConverter.cs
index f5627b09..35077d7c 100644
--- a/src/WPFDevelopers.Shared/Core/Converts/WidthHeightEqualValueConverter.cs
+++ b/src/WPFDevelopers.Shared/Core/Converts/WidthHeightEqualValueConverter.cs
@@ -1,17 +1,15 @@
 using System;
 using System.Globalization;
-using System.Windows;
 using System.Windows.Data;
-using System.Windows.Media.Media3D;
 
 namespace WPFDevelopers.Converts
 {
-    class WidthHeightEqualValueConverter : IMultiValueConverter
+    internal class WidthHeightEqualValueConverter : IMultiValueConverter
     {
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
-            var width = (double)values[0];
-            var height = (double)values[1];
+            var width = (double) values[0];
+            var height = (double) values[1];
             if (width == 0 && height == 0)
                 return 0;
             var min = Math.Min(width, height);
@@ -23,4 +21,4 @@ public object[] ConvertBack(object value, Type[] targetTypes, object parameter,
             throw new NotImplementedException();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/ListBoxItemExtensions.cs b/src/WPFDevelopers.Shared/Core/Helpers/ListBoxItemExtensions.cs
index 868000d9..da41d337 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/ListBoxItemExtensions.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/ListBoxItemExtensions.cs
@@ -8,11 +8,12 @@ namespace WPFDevelopers.Helpers
     public static class ListBoxItemExtensions
     {
         public static readonly DependencyProperty AutoRemoveOnOpacityZeroProperty =
-        DependencyProperty.RegisterAttached("AutoRemoveOnOpacityZero", typeof(bool), typeof(ListBoxItemExtensions), new PropertyMetadata(false, OnAutoRemoveOnOpacityZeroChanged));
+            DependencyProperty.RegisterAttached("AutoRemoveOnOpacityZero", typeof(bool), typeof(ListBoxItemExtensions),
+                new PropertyMetadata(false, OnAutoRemoveOnOpacityZeroChanged));
 
         public static bool GetAutoRemoveOnOpacityZero(DependencyObject obj)
         {
-            return (bool)obj.GetValue(AutoRemoveOnOpacityZeroProperty);
+            return (bool) obj.GetValue(AutoRemoveOnOpacityZeroProperty);
         }
 
         public static void SetAutoRemoveOnOpacityZero(DependencyObject obj, bool value)
@@ -22,10 +23,10 @@ public static void SetAutoRemoveOnOpacityZero(DependencyObject obj, bool value)
 
         private static void OnAutoRemoveOnOpacityZeroChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e)
         {
-            ListBoxItem item = obj as ListBoxItem;
+            var item = obj as ListBoxItem;
             if (item != null)
             {
-                if ((bool)e.NewValue)
+                if ((bool) e.NewValue)
                     item.Loaded += Item_Loaded;
                 else
                     item.Loaded -= Item_Loaded;
@@ -49,7 +50,7 @@ private static void Item_Loaded(object sender, RoutedEventArgs e)
                         var parent = ItemsControl.ItemsControlFromItemContainer(item);
                         if (parent != null)
                         {
-                            object selectedItem = parent.ItemContainerGenerator.ItemFromContainer(item);
+                            var selectedItem = parent.ItemContainerGenerator.ItemFromContainer(item);
                             parent.Items.Remove(selectedItem);
                             parent.Items.Refresh();
                         }
@@ -58,4 +59,4 @@ private static void Item_Loaded(object sender, RoutedEventArgs e)
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/TextBoxHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/TextBoxHelper.cs
new file mode 100644
index 00000000..3555636e
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Core/Helpers/TextBoxHelper.cs
@@ -0,0 +1,148 @@
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace WPFDevelopers.Helpers
+{
+    public static class TextBoxHelper
+    {
+        public static readonly DependencyProperty SelectAllOnClickProperty =
+            DependencyProperty.RegisterAttached("SelectAllOnClick", typeof(bool), typeof(TextBoxHelper),
+                new PropertyMetadata(false, OnSelectAllOnClickChanged));
+
+
+        public static readonly DependencyProperty AllowOnlyNumericInputProperty =
+            DependencyProperty.RegisterAttached("AllowOnlyNumericInput", typeof(bool), typeof(TextBoxHelper),
+                new PropertyMetadata(false, OnAllowOnlyNumericInputChanged));
+
+        public static readonly DependencyProperty IsEnterUpdateEnabledProperty =
+            DependencyProperty.RegisterAttached("IsEnterUpdateEnabled", typeof(bool), typeof(TextBoxHelper),
+                new PropertyMetadata(false, OnIsEnterUpdateEnabledChanged));
+
+        private static void OnSelectAllOnClickChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is TextBox textBox)
+            {
+                if ((bool) e.NewValue)
+                    textBox.PreviewMouseLeftButtonDown += TextBox_PreviewMouseLeftButtonDown;
+                else
+                    textBox.PreviewMouseLeftButtonDown -= TextBox_PreviewMouseLeftButtonDown;
+            }
+        }
+
+        private static void OnAllowOnlyNumericInputChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is TextBox textBox)
+            {
+                if ((bool) e.NewValue)
+                {
+                    DataObject.AddPastingHandler(textBox, TextBox_Pasting);
+                    textBox.PreviewTextInput += TextBox_PreviewTextInput;
+                    InputMethod.SetIsInputMethodEnabled(textBox, false);
+                }
+                else
+                {
+                    DataObject.RemovePastingHandler(textBox, TextBox_Pasting);
+                    textBox.PreviewTextInput -= TextBox_PreviewTextInput;
+                    InputMethod.SetIsInputMethodEnabled(textBox, true);
+                }
+            }
+        }
+
+        private static void OnIsEnterUpdateEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is TextBox textBox)
+            {
+                if ((bool) e.NewValue)
+                    textBox.PreviewKeyDown += TextBox_PreviewKeyDown;
+                else
+                    textBox.PreviewKeyDown -= TextBox_PreviewKeyDown;
+            }
+        }
+
+        public static bool GetSelectAllOnClick(TextBox textBox)
+        {
+            return (bool) textBox.GetValue(SelectAllOnClickProperty);
+        }
+
+        public static void SetSelectAllOnClick(TextBox textBox, bool value)
+        {
+            textBox.SetValue(SelectAllOnClickProperty, value);
+        }
+
+        public static bool GetAllowOnlyNumericInput(DependencyObject obj)
+        {
+            return (bool) obj.GetValue(AllowOnlyNumericInputProperty);
+        }
+
+        public static void SetAllowOnlyNumericInput(DependencyObject obj, bool value)
+        {
+            obj.SetValue(AllowOnlyNumericInputProperty, value);
+        }
+
+        public static bool GetIsEnterUpdateEnabled(DependencyObject obj)
+        {
+            return (bool) obj.GetValue(IsEnterUpdateEnabledProperty);
+        }
+
+        public static void SetIsEnterUpdateEnabled(DependencyObject obj, bool value)
+        {
+            obj.SetValue(IsEnterUpdateEnabledProperty, value);
+        }
+
+        private static void TextBox_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (sender is TextBox textBox && !textBox.IsKeyboardFocusWithin)
+            {
+                textBox.Focus();
+                textBox.SelectAll();
+                e.Handled = true;
+            }
+        }
+
+
+        private static void TextBox_Pasting(object sender, DataObjectPastingEventArgs e)
+        {
+            if (e.DataObject.GetDataPresent(typeof(string)))
+            {
+                var text = (string) e.DataObject.GetData(typeof(string));
+
+                if (!IsNumeric(text)) e.CancelCommand();
+            }
+            else
+            {
+                e.CancelCommand();
+            }
+        }
+
+
+        private static void TextBox_PreviewTextInput(object sender, TextCompositionEventArgs e)
+        {
+            if (!IsNumeric(e.Text) || ContainsChineseCharacters(e.Text)) e.Handled = true;
+        }
+
+        private static bool IsNumeric(string text)
+        {
+            return !string.IsNullOrEmpty(text) && text.All(char.IsDigit);
+        }
+
+        private static bool ContainsChineseCharacters(string text)
+        {
+            foreach (var c in text)
+                if (c >= 0x4E00 && c <= 0x9FFF)
+                    return true;
+            return false;
+        }
+
+        private static void TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter && !e.IsRepeat)
+            {
+                var textBox = (TextBox) sender;
+                var expression = textBox.GetBindingExpression(TextBox.TextProperty);
+                expression?.UpdateSource();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Core/Utilities/ColorUtil.cs b/src/WPFDevelopers.Shared/Core/Utilities/ColorUtil.cs
new file mode 100644
index 00000000..8fdd23a0
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Core/Utilities/ColorUtil.cs
@@ -0,0 +1,217 @@
+using System;
+using System.Windows.Media;
+using WPFDevelopers.Controls;
+
+namespace WPFDevelopers.Utilities
+{
+    public static class ColorUtil
+    {
+        public static Color ConvertHSLToColor(Color color, double h = double.NaN, double sl = double.NaN,
+            double l = double.NaN)
+        {
+            var hsl = RgbToHSL(color);
+            if (!double.IsNaN(h))
+                hsl.H = h;
+            if (!double.IsNaN(sl))
+                hsl.S = sl;
+            if (!double.IsNaN(l))
+                hsl.L = l;
+            var rgb = HSLToRgb(hsl);
+            return rgb;
+        }
+
+        private static Color HSLToRgb(HSL hslColor)
+        {
+            var rgbColor = new Color();
+            if (hslColor.S == 0)
+            {
+                rgbColor.R = (byte) (hslColor.L * 255);
+                rgbColor.G = (byte) (hslColor.L * 255);
+                rgbColor.B = (byte) (hslColor.L * 255);
+                rgbColor.A = (byte) (hslColor.A * 255);
+                return rgbColor;
+            }
+
+            double t1;
+            if (hslColor.L < 0.5)
+                t1 = hslColor.L * (1.0 + hslColor.S);
+            else
+                t1 = hslColor.L + hslColor.S - hslColor.L * hslColor.S;
+
+            var t2 = 2.0 * hslColor.L - t1;
+
+            var h = hslColor.H / 360;
+
+            var tR = h + 1.0 / 3.0;
+            var r = SetColor(t1, t2, tR);
+
+            var tG = h;
+            var g = SetColor(t1, t2, tG);
+
+            var tB = h - 1.0 / 3.0;
+            var b = SetColor(t1, t2, tB);
+
+            rgbColor.R = (byte) (r * 255);
+            rgbColor.G = (byte) (g * 255);
+            rgbColor.B = (byte) (b * 255);
+            rgbColor.A = (byte) (hslColor.A * 255);
+
+            return rgbColor;
+        }
+
+        private static double SetColor(double t1, double t2, double t3)
+        {
+            if (t3 < 0) t3 += 1.0;
+            if (t3 > 1) t3 -= 1.0;
+
+            double color;
+            if (6.0 * t3 < 1)
+                color = t2 + (t1 - t2) * 6.0 * t3;
+            else if (2.0 * t3 < 1)
+                color = t1;
+            else if (3.0 * t3 < 2)
+                color = t2 + (t1 - t2) * (2.0 / 3.0 - t3) * 6.0;
+            else
+                color = t2;
+            return color;
+        }
+
+        public static HSL RgbToHSL(Color rgbColor)
+        {
+            var hslColor = new HSL();
+            var r = (double) rgbColor.R / 255;
+            var g = (double) rgbColor.G / 255;
+            var b = (double) rgbColor.B / 255;
+            var a = (double) rgbColor.A / 255;
+
+            var min = Math.Min(r, Math.Min(g, b));
+            var max = Math.Max(r, Math.Max(g, b));
+            var delta = max - min;
+
+
+            if (max == min)
+            {
+                hslColor.H = 0;
+                hslColor.S = 0;
+                hslColor.L = max;
+                return hslColor;
+            }
+
+            hslColor.L = (min + max) / 2;
+
+            if (hslColor.L < 0.5)
+                hslColor.S = delta / (max + min);
+            else
+                hslColor.S = delta / (2.0 - max - min);
+
+            if (r == max) hslColor.H = (g - b) / delta;
+            if (g == max) hslColor.H = 2.0 + (b - r) / delta;
+            if (b == max) hslColor.H = 4.0 + (r - g) / delta;
+            hslColor.H *= 60;
+            if (hslColor.H < 0) hslColor.H += 360;
+
+            hslColor.A = a;
+
+            return hslColor;
+        }
+       
+        public static void HsbFromColor(Color C, ref double H, ref double S, ref double B)
+        {
+            var r = C.R / 255d;
+            var g = C.G / 255d;
+            var b = C.B / 255d;
+
+            var max = Math.Max(Math.Max(r, g), b);
+            var min = Math.Min(Math.Min(r, g), b);
+            var delta = max - min;
+
+            var hue = 0d;
+            var saturation = DoubleUtil.GreaterThan(max, 0) ? delta / max : 0.0;
+            var brightness = max;
+
+            if (!DoubleUtil.IsZero(delta))
+            {
+                if (DoubleUtil.AreClose(r, max))
+                    hue = (g - b) / delta;
+                else if (DoubleUtil.AreClose(g, max))
+                    hue = 2 + (b - r) / delta;
+                else if (DoubleUtil.AreClose(b, max))
+                    hue = 4 + (r - g) / delta;
+
+                hue = hue * 60;
+                if (DoubleUtil.LessThan(hue, 0d))
+                    hue += 360;
+            }
+
+            H = hue / 360d;
+            S = saturation;
+            B = brightness;
+        }
+
+        public static Color ColorFromAhsb(double a, double h, double s, double b)
+        {
+            var r = ColorFromHsb(h, s, b);
+            r.A = (byte) Math.Round(a * 255d);
+
+            return r;
+        }
+
+        public static Color ColorFromHsb(double H, double S, double B)
+        {
+            double red = 0.0, green = 0.0, blue = 0.0;
+
+            if (DoubleUtil.IsZero(S))
+            {
+                red = green = blue = B;
+            }
+            else
+            {
+                var h = DoubleUtil.IsOne(H) ? 0d : H * 6.0;
+                var i = (int) Math.Floor(h);
+
+                var f = h - i;
+                var r = B * (1.0 - S);
+                var s = B * (1.0 - S * f);
+                var t = B * (1.0 - S * (1.0 - f));
+
+                switch (i)
+                {
+                    case 0:
+                        red = B;
+                        green = t;
+                        blue = r;
+                        break;
+                    case 1:
+                        red = s;
+                        green = B;
+                        blue = r;
+                        break;
+                    case 2:
+                        red = r;
+                        green = B;
+                        blue = t;
+                        break;
+                    case 3:
+                        red = r;
+                        green = s;
+                        blue = B;
+                        break;
+                    case 4:
+                        red = t;
+                        green = r;
+                        blue = B;
+                        break;
+                    case 5:
+                        red = B;
+                        green = r;
+                        blue = s;
+                        break;
+                }
+            }
+
+            return Color.FromRgb((byte) Math.Round(red * 255.0), (byte) Math.Round(green * 255.0),
+                (byte) Math.Round(blue * 255.0));
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Core/Utilities/DoubleUtil.cs b/src/WPFDevelopers.Shared/Core/Utilities/DoubleUtil.cs
index f7c89f25..baad7e9d 100644
--- a/src/WPFDevelopers.Shared/Core/Utilities/DoubleUtil.cs
+++ b/src/WPFDevelopers.Shared/Core/Utilities/DoubleUtil.cs
@@ -26,6 +26,7 @@ public static bool AreClose(double value1, double value2)
         public static bool LessThanOrClose(double value1, double value2) => (value1 < value2) || AreClose(value1, value2);
 
         public static bool GreaterThanOrClose(double value1, double value2) => (value1 > value2) || AreClose(value1, value2);
+
         [StructLayout(LayoutKind.Explicit)]
         private struct NanUnion
         {
@@ -34,6 +35,7 @@ private struct NanUnion
             [FieldOffset(0)]
             internal UInt64 UintValue;
         }
+
         public static bool IsNaN(double value)
         {
             NanUnion t = new NanUnion();
@@ -44,5 +46,10 @@ public static bool IsNaN(double value)
 
             return (exp == 0x7ff0000000000000 || exp == 0xfff0000000000000) && (man != 0);
         }
+
+        public static bool IsOne(double value)
+        {
+            return Math.Abs(value - 1.0) < 10.0 * DBL_EPSILON;
+        }
     }
 }
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml
index 84d8afa7..49ea28d7 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml
@@ -11,6 +11,8 @@
         BasedOn="{StaticResource WD.ControlBasicStyle}"
         TargetType="{x:Type GroupBox}">
         <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Background" Value="{DynamicResource WD.LighterSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GroupBox}">
@@ -21,24 +23,20 @@
                         </Grid.RowDefinitions>
                         <Border
                             Grid.Row="0"
-                            BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="1">
-                            <Border.Background>
-                                <SolidColorBrush Color="{DynamicResource BackgroundColor}" />
-                            </Border.Background>
                             <ContentPresenter
                                 Margin="{TemplateBinding Padding}"
+                                VerticalAlignment="Center"
                                 ContentSource="Header"
                                 RecognizesAccessKey="True" />
                         </Border>
                         <Border
                             Grid.Row="1"
-                            BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="1,0,1,1"
                             SnapsToDevicePixels="True">
-                            <Border.Background>
-                                <SolidColorBrush Color="{DynamicResource BackgroundColor}" />
-                            </Border.Background>
                             <ContentPresenter Margin="{TemplateBinding Padding}" />
                         </Border>
                     </Grid>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.Menu.xaml b/src/WPFDevelopers.Shared/Styles/Styles.Menu.xaml
index 3d6d25c3..cc127e55 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.Menu.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.Menu.xaml
@@ -21,7 +21,11 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Menu}">
-                    <Border Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                    <Border
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        Background="{TemplateBinding Background}"
+                        SnapsToDevicePixels="True">
                         <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                 </ControlTemplate>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml
index 6095c3ce..110c217b 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml
@@ -82,10 +82,7 @@
                                 </DockPanel>
                             </controls:SmallPanel>
                             <controls:SmallPanel Grid.Row="2" Margin="140,20,10,10">
-                                <UniformGrid
-                                    Height="38"
-                                    HorizontalAlignment="Right"
-                                    Rows="1">
+                                <UniformGrid Height="38" Rows="1">
                                     <Button
                                         x:Name="PART_ButtonCancel"
                                         Width="60"
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.PasswordBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.PasswordBox.xaml
index a8748a4e..ecacf83e 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.PasswordBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.PasswordBox.xaml
@@ -43,7 +43,7 @@
                                 Padding="1,0"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                FontSize="{StaticResource WD.NormalFontSize}"
+                                FontSize="{TemplateBinding FontSize}"
                                 Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
                                 Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}"
                                 TextTrimming="CharacterEllipsis"
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.RepeatButton.xaml b/src/WPFDevelopers.Shared/Styles/Styles.RepeatButton.xaml
index 3a641aa7..3fa4368a 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.RepeatButton.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.RepeatButton.xaml
@@ -19,6 +19,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
         <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
diff --git a/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml b/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml
index 5e4d8bf0..ba09f065 100644
--- a/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml
+++ b/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml
@@ -20,22 +20,22 @@
                 <ControlTemplate TargetType="{x:Type controls:AnimationAudio}">
                     <ControlTemplate.Resources>
                         <Storyboard x:Key="PlayStoryboard" RepeatBehavior="Forever">
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="WD.AudioTwoGeometry" Storyboard.TargetProperty="(Path.Visibility)">
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Path2" Storyboard.TargetProperty="(Path.Visibility)">
                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
                             </ObjectAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PathAudioThree" Storyboard.TargetProperty="(Path.Visibility)">
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Path3" Storyboard.TargetProperty="(Path.Visibility)">
                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
                             </ObjectAnimationUsingKeyFrames>
                             <ObjectAnimationUsingKeyFrames
                                 BeginTime="0:0:.3"
-                                Storyboard.TargetName="WD.AudioTwoGeometry"
+                                Storyboard.TargetName="PART_Path2"
                                 Storyboard.TargetProperty="(Path.Visibility)"
                                 Duration="0:0:.4">
                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
                             </ObjectAnimationUsingKeyFrames>
                             <ObjectAnimationUsingKeyFrames
                                 BeginTime="0:0:.7"
-                                Storyboard.TargetName="PathAudioThree"
+                                Storyboard.TargetName="PART_Path3"
                                 Storyboard.TargetProperty="(Path.Visibility)"
                                 Duration="0:0:.4">
                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
@@ -68,7 +68,7 @@
                                     Fill="{TemplateBinding Foreground}"
                                     Stretch="Fill" />
                                 <Path
-                                    x:Name="PathAudioTwo"
+                                    x:Name="PART_Path2"
                                     Width="6"
                                     Margin="0,7"
                                     Data="{StaticResource WD.AudioTwoGeometry}"
@@ -77,7 +77,7 @@
                                     Stroke="Transparent"
                                     StrokeThickness="1.5" />
                                 <Path
-                                    x:Name="PathAudioThree"
+                                    x:Name="PART_Path3"
                                     Width="8"
                                     Margin="-3,4"
                                     Data="{StaticResource WD.AudioThreeGeometry}"
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml b/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
index c5ed05b0..72fd1ba9 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
@@ -35,8 +35,8 @@
         </Style.Triggers>
     </Style>
     <sys:Double x:Key="WD.EnabledOpacity">0.7</sys:Double>
-    <sys:Double x:Key="WD.NormalCornerRadius">4</sys:Double>
-    <sys:Double x:Key="WD.MinHeight">40</sys:Double>
+    <sys:Double x:Key="WD.DefaultCornerRadius">4</sys:Double>
+    <sys:Double x:Key="WD.DefaultHeight">32</sys:Double>
     <sys:Double x:Key="WD.ThumbWidth">16</sys:Double>
     <sys:Double x:Key="WD.ThumbCornerRadius">8</sys:Double>
     <sys:Double x:Key="WD.RepeatButtonSize">5</sys:Double>
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml b/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml
index 7cddf559..c0a322e2 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml
@@ -64,7 +64,7 @@
     <Geometry x:Key="WD.AlarmClockGeometry" po:Freeze="True">M470 124.837l-98.443-81.78-27.814 32.931 98.442 81.769L470 124.837zM167.192 74.919L139.366 42 42 124.837l27.814 32.919 97.378-82.837zm99.509 97.709H234.6v127.446l101.649 60.539L352.3 334.06l-85.6-49.917V172.628zM256 87.665c-107 0-192.601 86.021-192.601 191.166C63.399 383.98 149 470 256 470c105.936 0 192.601-86.02 192.601-191.169 0-105.144-86.665-191.166-192.601-191.166zm0 339.855c-82.393 0-149.8-66.906-149.8-148.688 0-81.777 67.407-148.684 149.8-148.684 82.394 0 149.8 66.906 149.8 148.684 0 82.839-67.406 148.688-149.8 148.688z</Geometry>
     <Geometry x:Key="WD.FlagGeometry" po:Freeze="True">M687.5 125C500 125 375 13.7 187.5 62.5V31.3C187.5 31.3 187.5 0 156.3 0C125 0 125 31.3 125 31.3V1000H187.5V625C375 562.5 500 687.5 687.5 687.5C875 687.5 937.5 625 937.5 625V62.5C937.5 62.5 875 125 687.5 125Z</Geometry>
     <Geometry x:Key="WD.CircularGeometry" po:Freeze="True">M 200,200 0,200 A 200,200 0 0 1 58.6,58.6z</Geometry>
-    <Geometry x:Key="WD.AddGeometry" po:Freeze="True">M734.618 760.269c-24.013 24.013-62.925 24.013-86.886 0l-135.731-155.136-135.731 155.085c-24.013 24.013-62.925 24.013-86.886 0-24.013-24.013-24.013-62.925 0-86.886l141.21-161.28-141.261-161.382c-24.013-24.013-24.013-62.874 0-86.886s62.874-24.013 86.886 0l135.782 155.187 135.731-155.187c24.013-24.013 62.874-24.013 86.886 0s24.013 62.925 0 86.886l-141.21 161.382 141.21 161.28c24.013 24.013 24.013 62.925 0 86.938z</Geometry>
+    <Geometry x:Key="WD.AddGeometry" po:Freeze="True">M810 554h-256v256h-84v-256h-256v-84h256v-256h84v256h256v84z</Geometry>
     <Geometry x:Key="WD.ChatLeftGeometry" po:Freeze="True">M365.714 256v512q0 14.857-10.857 25.714t-25.714 10.857-25.714-10.857l-256-256q-10.857-10.857-10.857-25.714t10.857-25.714l256-256q10.857-10.857 25.714-10.857t25.714 10.857 10.857 25.714z</Geometry>
     <Geometry x:Key="WD.ChatRightGeometry" po:Freeze="True">M329.143 512q0 14.857-10.857 25.714l-256 256q-10.857 10.857-25.714 10.857t-25.714-10.857-10.857-25.714v-512q0-14.857 10.857-25.714t25.714-10.857 25.714 10.857l256 256q10.857 10.857 10.857 25.714z</Geometry>
     <Geometry x:Key="WD.StarGeometry" po:Freeze="True">M649.714 573.714l174.857-169.714-241.143-35.429-108-218.286-108 218.286-241.143 35.429 174.857 169.714-41.714 240.571 216-113.714 215.429 113.714zM950.857 369.714q0 12.571-14.857 27.429l-207.429 202.286 49.143 285.714q0.571 4 0.571 11.429 0 28.571-23.429 28.571-10.857 0-22.857-6.857l-256.571-134.857-256.571 134.857q-12.571 6.857-22.857 6.857-12 0-18-8.286t-6-20.286q0-3.429 1.143-11.429l49.143-285.714-208-202.286q-14.286-15.429-14.286-27.429 0-21.143 32-26.286l286.857-41.714 128.571-260q10.857-23.429 28-23.429t28 23.429l128.571 260 286.857 41.714q32 5.143 32 26.286z</Geometry>
@@ -96,4 +96,6 @@
     <Geometry x:Key="WD.HomeGeometry" po:Freeze="True">M804.571 566.857v274.286q0 14.857-10.857 25.714t-25.714 10.857h-219.429v-219.429h-146.286v219.429h-219.429q-14.857 0-25.714-10.857t-10.857-25.714v-274.286q0-0.571 0.286-1.714t0.286-1.714l328.571-270.857 328.571 270.857q0.571 1.143 0.571 3.429zM932 527.429l-35.429 42.286q-4.571 5.143-12 6.286h-1.714q-7.429 0-12-4l-395.429-329.714-395.429 329.714q-6.857 4.571-13.714 4-7.429-1.143-12-6.286l-35.429-42.286q-4.571-5.714-4-13.429t6.286-12.286l410.857-342.286q18.286-14.857 43.429-14.857t43.429 14.857l139.429 116.571v-111.429q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143v233.143l125.143 104q5.714 4.571 6.286 12.286t-4 13.429z</Geometry>
 
     <Geometry x:Key="WD.ChevronUpGeometry" po:Freeze="True">M336.998 621.619c-13.875 13.722-36.301 13.722-50.074 0s-13.926-35.891 0-49.613l200.090-196.096c13.824-13.722 36.198-13.722 50.125 0l200.090 196.096c13.824 13.67 13.824 35.891 0 49.613-13.875 13.722-36.301 13.722-50.125 0l-175.104-160.819-175.002 160.819z</Geometry>
+
+    <Geometry x:Key="WD.UnfoldMoreGeometry" po:Freeze="True">M512 776l136-136 60 60-196 196-196-196 60-60zM512 248l-136 136-60-60 196-196 196 196-60 60z</Geometry>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/CircularMenu.xaml b/src/WPFDevelopers.Shared/Themes/CircularMenu.xaml
index d59bc491..33631a28 100644
--- a/src/WPFDevelopers.Shared/Themes/CircularMenu.xaml
+++ b/src/WPFDevelopers.Shared/Themes/CircularMenu.xaml
@@ -91,26 +91,22 @@
                                             x:Name="PART_Ellipse"
                                             Width="100"
                                             Height="100"
-                                            Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}"
-                                            ToolTip="关闭" />
-                                        <Path
+                                            Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}" />
+                                        <controls:PathIcon
                                             x:Name="PART_Path"
                                             Width="20"
                                             Height="20"
-                                            Data="{StaticResource WD.AddGeometry}"
-                                            Fill="{StaticResource WD.BackgroundSolidColorBrush}"
-                                            IsHitTestVisible="False"
-                                            RenderTransformOrigin="0.5,0.5"
-                                            Stretch="Fill" />
+                                            Foreground="{StaticResource WD.BackgroundSolidColorBrush}"
+                                            Kind="Add"
+                                            RenderTransformOrigin="0.5,0.5" />
                                     </controls:SmallPanel>
                                     <ControlTemplate.Triggers>
-                                        <Trigger Property="IsChecked" Value="false">
+                                        <Trigger Property="IsChecked" Value="True">
                                             <Setter TargetName="PART_Path" Property="RenderTransform">
                                                 <Setter.Value>
                                                     <RotateTransform Angle="45" />
                                                 </Setter.Value>
                                             </Setter>
-                                            <Setter TargetName="PART_Ellipse" Property="ToolTip" Value="展开" />
                                         </Trigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>
diff --git a/src/WPFDevelopers.Shared/Themes/ColorPicker.xaml b/src/WPFDevelopers.Shared/Themes/ColorPicker.xaml
new file mode 100644
index 00000000..c6b9e95f
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Themes/ColorPicker.xaml
@@ -0,0 +1,327 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
+    xmlns:convert="clr-namespace:WPFDevelopers.Converts"
+    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
+    xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore"
+    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <convert:ColorToBrushConverter x:Key="WD.ColorToBrushConverter" />
+    <convert:ColorToRedConverter x:Key="WD.ColorToRedConverter" />
+    <convert:ColorToGreenConverter x:Key="WD.ColorToGreenConverter" />
+    <convert:ColorToBlueConverter x:Key="WD.ColorToBlueConverter" />
+    <convert:ColorTypeToVisibilityConverter x:Key="WD.ColorTypeToVisibilityConverter" />
+    <convert:ColorToStringConverter x:Key="WD.ColorToStringConverter" />
+    <convert:HToColorConverter x:Key="WD.HToColorConverter" />
+    <convert:SToColorConverter x:Key="WD.SToColorConverter" />
+    <convert:LToColorConverter x:Key="WD.LToColorConverter" />
+
+    <LinearGradientBrush x:Key="WD.ColorPickerRainbowBrush" po:Freeze="True">
+        <GradientStop Color="#FF0000" />
+        <GradientStop Offset="0.167" Color="#FF00FF" />
+        <GradientStop Offset="0.334" Color="#0000FF" />
+        <GradientStop Offset="0.501" Color="#00FFFF" />
+        <GradientStop Offset="0.668" Color="#00FF00" />
+        <GradientStop Offset="0.835" Color="#FFFF00" />
+        <GradientStop Offset="1" Color="#FF0000" />
+    </LinearGradientBrush>
+
+    <ControlTemplate x:Key="WD.ColorPickerSliderThumbTemplate" TargetType="Thumb">
+        <Border
+            Width="{TemplateBinding Width}"
+            Height="{TemplateBinding Height}"
+            Background="Transparent"
+            BorderBrush="White"
+            BorderThickness="3"
+            CornerRadius="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
+    </ControlTemplate>
+
+
+    <Style x:Key="WD.ColorPickerSliderRepeatButtonBaseStyle" TargetType="RepeatButton">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RepeatButton">
+                    <Rectangle
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        Fill="{TemplateBinding Background}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="WD.ColorPickerSlider" TargetType="{x:Type Slider}">
+        <Setter Property="Background" Value="{StaticResource WD.ColorPickerRainbowBrush}" />
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+        <Setter Property="Orientation" Value="Horizontal" />
+        <Setter Property="Height" Value="15" />
+        <Setter Property="Margin" Value="4,0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Slider}">
+                    <controls:SmallPanel>
+                        <Border
+                            MaxWidth="{TemplateBinding MaxWidth}"
+                            Margin="{TemplateBinding Margin}"
+                            Background="{TemplateBinding Background}"
+                            CornerRadius="2" />
+                        <Track x:Name="PART_Track" Orientation="{TemplateBinding Orientation}">
+                            <Track.DecreaseRepeatButton>
+                                <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource WD.ColorPickerSliderRepeatButtonBaseStyle}" />
+                            </Track.DecreaseRepeatButton>
+                            <Track.IncreaseRepeatButton>
+                                <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource WD.ColorPickerSliderRepeatButtonBaseStyle}" />
+                            </Track.IncreaseRepeatButton>
+                            <Track.Thumb>
+                                <Thumb
+                                    x:Name="Thumb"
+                                    Width="15"
+                                    Height="15"
+                                    Focusable="False"
+                                    OverridesDefaultStyle="True"
+                                    Template="{StaticResource WD.ColorPickerSliderThumbTemplate}">
+                                    <Thumb.Effect>
+                                        <DropShadowEffect Opacity=".6" ShadowDepth="0" />
+                                    </Thumb.Effect>
+                                </Thumb>
+                            </Track.Thumb>
+                        </Track>
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <Style
+        x:Key="WD.ColorPicker"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:ColorPicker}">
+        <Setter Property="Width" Value="260" />
+        <Setter Property="Height" Value="200" />
+        <Setter Property="Margin" Value="2" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:ColorPicker}">
+                    <Border
+                        Margin="{TemplateBinding Margin}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <Canvas
+                                x:Name="PART_Canvas"
+                                Margin="1,1,1,0"
+                                ClipToBounds="True">
+                                <Canvas.Background>
+                                    <DrawingBrush>
+                                        <DrawingBrush.Drawing>
+                                            <DrawingGroup>
+                                                <GeometryDrawing>
+                                                    <GeometryDrawing.Brush>
+                                                        <LinearGradientBrush EndPoint="1,0">
+                                                            <GradientStop Offset="0" Color="White" />
+                                                            <GradientStop Offset="1" Color="{Binding HueColor, RelativeSource={RelativeSource TemplatedParent}}" />
+                                                        </LinearGradientBrush>
+                                                    </GeometryDrawing.Brush>
+                                                    <GeometryDrawing.Geometry>
+                                                        <RectangleGeometry Rect="0,0,5,5" />
+                                                    </GeometryDrawing.Geometry>
+                                                </GeometryDrawing>
+                                                <GeometryDrawing>
+                                                    <GeometryDrawing.Brush>
+                                                        <LinearGradientBrush EndPoint="0,1">
+                                                            <GradientStop Offset="0" Color="#00000000" />
+                                                            <GradientStop Offset="1" Color="{StaticResource WD.BlackColor}" />
+                                                        </LinearGradientBrush>
+                                                    </GeometryDrawing.Brush>
+                                                    <GeometryDrawing.Geometry>
+                                                        <RectangleGeometry Rect="0,0,5,5" />
+                                                    </GeometryDrawing.Geometry>
+                                                </GeometryDrawing>
+                                            </DrawingGroup>
+                                        </DrawingBrush.Drawing>
+                                    </DrawingBrush>
+                                </Canvas.Background>
+                                <Thumb
+                                    x:Name="PART_Thumb"
+                                    Width="15"
+                                    Height="15"
+                                    Background="Transparent"
+                                    BorderBrush="White"
+                                    BorderThickness="3">
+                                    <Thumb.Template>
+                                        <ControlTemplate TargetType="{x:Type Thumb}">
+                                            <controls:SmallPanel>
+                                                <Border
+                                                    Background="{TemplateBinding Background}"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                                    CornerRadius="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}"
+                                                    SnapsToDevicePixels="True">
+                                                    <Border.Effect>
+                                                        <DropShadowEffect Opacity=".6" ShadowDepth="0" />
+                                                    </Border.Effect>
+                                                </Border>
+                                            </controls:SmallPanel>
+                                        </ControlTemplate>
+                                    </Thumb.Template>
+                                </Thumb>
+                            </Canvas>
+                            <Grid Grid.Row="1" Margin="6,5,6,0">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Ellipse
+                                    Width="25"
+                                    Height="25"
+                                    Margin="0,0,4,0"
+                                    Fill="{TemplateBinding SelectedColor,
+                                                           Converter={StaticResource WD.ColorToBrushConverter}}">
+                                    <Ellipse.Effect>
+                                        <DropShadowEffect Opacity=".6" ShadowDepth="0" />
+                                    </Ellipse.Effect>
+                                </Ellipse>
+                                <Slider
+                                    Name="PART_HueSlider"
+                                    Grid.Column="1"
+                                    Width="Auto"
+                                    IsMoveToPointEnabled="True"
+                                    LargeChange="0.01"
+                                    Maximum="1"
+                                    SmallChange="0.01"
+                                    Style="{StaticResource WD.ColorPickerSlider}"
+                                    Value="1" />
+                            </Grid>
+                            <Grid
+                                Grid.Row="2"
+                                Margin="4"
+                                VerticalAlignment="Center">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Grid.Resources>
+                                    <Style TargetType="{x:Type StackPanel}">
+                                        <Setter Property="Margin" Value="4,0" />
+                                    </Style>
+                                    <Style
+                                        x:Key="WD.TextBoxColorPicker"
+                                        BasedOn="{StaticResource WD.DefaultTextBox}"
+                                        TargetType="{x:Type TextBox}">
+                                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                                        <Setter Property="TextAlignment" Value="Center" />
+                                        <Setter Property="Width" Value="50" />
+                                    </Style>
+                                    <Style BasedOn="{StaticResource WD.NumericBox}" TargetType="{x:Type controls:NumericBox}">
+                                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                                        <Setter Property="TextAlignment" Value="Center" />
+                                        <Setter Property="Width" Value="50" />
+                                        <Setter Property="UpDownButtonsWidth" Value="0" />
+                                        <Setter Property="Maximum" Value="255" />
+                                        <Setter Property="Minimum" Value="0" />
+                                    </Style>
+                                    <Style TargetType="{x:Type TextBlock}">
+                                        <Setter Property="HorizontalAlignment" Value="Center" />
+                                        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+                                        <Setter Property="FontSize" Value="10" />
+                                    </Style>
+                                </Grid.Resources>
+
+                                <Button
+                                    Name="PART_Button"
+                                    Grid.Column="0"
+                                    Width="30"
+                                    Height="30"
+                                    Margin="0,0,4,0"
+                                    helpers:ElementHelper.IsRound="True"
+                                    Style="{StaticResource WD.NormalButton}">
+                                    <controls:PathIcon Kind="UnfoldMore" />
+                                </Button>
+
+                                <UniformGrid
+                                    Grid.Column="1"
+                                    Rows="1"
+                                    Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.RGB}}">
+                                    <StackPanel>
+                                        <controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToRedConverter}}" />
+                                        <TextBlock Text="R" />
+                                    </StackPanel>
+                                    <StackPanel>
+                                        <controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToGreenConverter}}" />
+                                        <TextBlock Text="G" />
+                                    </StackPanel>
+                                    <StackPanel>
+                                        <controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToBlueConverter}}" />
+                                        <TextBlock Text="B" />
+                                    </StackPanel>
+                                </UniformGrid>
+
+                                <UniformGrid
+                                    Grid.Column="1"
+                                    Rows="1"
+                                    Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.HSL}}">
+                                    <StackPanel>
+                                        <TextBox
+                                            helpers:TextBoxHelper.AllowOnlyNumericInput="True"
+                                            helpers:TextBoxHelper.IsEnterUpdateEnabled="True"
+                                            helpers:TextBoxHelper.SelectAllOnClick="True"
+                                            Style="{StaticResource WD.TextBoxColorPicker}"
+                                            Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.HToColorConverter}}" />
+                                        <TextBlock Text="H" />
+                                    </StackPanel>
+                                    <StackPanel Grid.Column="1">
+                                        <TextBox
+                                            helpers:TextBoxHelper.IsEnterUpdateEnabled="True"
+                                            helpers:TextBoxHelper.SelectAllOnClick="True"
+                                            Style="{StaticResource WD.TextBoxColorPicker}"
+                                            Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.SToColorConverter}}" />
+                                        <TextBlock Text="S" />
+                                    </StackPanel>
+                                    <StackPanel Grid.Column="2">
+                                        <TextBox
+                                            helpers:TextBoxHelper.IsEnterUpdateEnabled="True"
+                                            helpers:TextBoxHelper.SelectAllOnClick="True"
+                                            Style="{StaticResource WD.TextBoxColorPicker}"
+                                            Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.LToColorConverter}}" />
+                                        <TextBlock Text="L" />
+                                    </StackPanel>
+                                </UniformGrid>
+                                <StackPanel
+                                    Grid.Column="1"
+                                    Margin="12,0"
+                                    Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.HEX}}">
+                                    <TextBox
+                                        helpers:TextBoxHelper.IsEnterUpdateEnabled="True"
+                                        helpers:TextBoxHelper.SelectAllOnClick="True"
+                                        MaxLength="9"
+                                        Text="{Binding SelectedColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToStringConverter}}"
+                                        TextAlignment="Center" />
+                                    <TextBlock Text="HEX" />
+                                </StackPanel>
+                            </Grid>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.ColorPicker}" TargetType="{x:Type controls:ColorPicker}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml b/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml
index 5ec93dd9..2774bb5c 100644
--- a/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml
+++ b/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml
@@ -45,7 +45,6 @@
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Top"
                                 Style="{StaticResource WD.PathButton}"
-                                ToolTip="更换图片"
                                 Visibility="Collapsed">
                                 <controls:PathIcon
                                     Width="15"
@@ -57,20 +56,12 @@
                                 x:Name="PART_AddButton"
                                 Width="40"
                                 Height="40"
-                                Style="{StaticResource WD.PathButton}"
-                                ToolTip="选择图片">
-                                <Path
+                                Style="{StaticResource WD.PathButton}">
+                                <controls:PathIcon
                                     Width="20"
                                     Height="20"
-                                    Data="{StaticResource WD.AddGeometry}"
-                                    Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}"
-                                    IsHitTestVisible="False"
-                                    RenderTransformOrigin="0.5,0.5"
-                                    Stretch="Fill">
-                                    <Path.RenderTransform>
-                                        <RotateTransform Angle="45" />
-                                    </Path.RenderTransform>
-                                </Path>
+                                    Foreground="{StaticResource WD.PrimaryNormalSolidColorBrush}"
+                                    Kind="Add" />
                             </Button>
                         </controls:SmallPanel>
                     </Canvas>
diff --git a/src/WPFDevelopers.Shared/Themes/Message.xaml b/src/WPFDevelopers.Shared/Themes/Message.xaml
index 3e9b56f8..4a86b04b 100644
--- a/src/WPFDevelopers.Shared/Themes/Message.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Message.xaml
@@ -106,19 +106,18 @@
                                 <Button
                                     x:Name="PART_CloseButton"
                                     Grid.Column="2"
-                                    Width="30"
-                                    Height="28"
-                                    Padding="0"
+                                    Width="25"
+                                    Height="25"
+                                    Margin="0,2,4,0"
                                     HorizontalAlignment="Right"
-                                    Style="{StaticResource WD.PathButton}">
-                                    <Path
+                                    helpers:ElementHelper.IsRound="True"
+                                    Style="{StaticResource WD.NormalButton}"
+                                    ToolTip="关闭">
+                                    <controls:PathIcon
                                         Width="10"
                                         Height="10"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Data="{DynamicResource WD.WindowCloseGeometry}"
-                                        Fill="{DynamicResource WD.SecondaryTextSolidColorBrush}"
-                                        Stretch="Fill" />
+                                        Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}"
+                                        Kind="WindowClose" />
                                 </Button>
                             </Grid>
                         </Border>
diff --git a/src/WPFDevelopers.Shared/Themes/NumericBox.xaml b/src/WPFDevelopers.Shared/Themes/NumericBox.xaml
index d7f98150..d3e825f6 100644
--- a/src/WPFDevelopers.Shared/Themes/NumericBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/NumericBox.xaml
@@ -1,7 +1,8 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Controls">
+    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
+    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Basic/ControlBasic.xaml" />
     </ResourceDictionary.MergedDictionaries>
@@ -42,6 +43,7 @@
                                     VerticalAlignment="Center"
                                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    helpers:TextBoxHelper.IsEnterUpdateEnabled="True"
                                     Background="{x:Null}"
                                     BorderThickness="0"
                                     FocusVisualStyle="{x:Null}"
@@ -70,6 +72,7 @@
                                         x:Name="PART_NumericUp"
                                         Grid.Row="0"
                                         Margin="0,1,1,0"
+                                        Padding="0"
                                         Command="{x:Static controls:NumericBox.IncreaseCommand}"
                                         Delay="{TemplateBinding Delay}"
                                         IsTabStop="False"
@@ -80,6 +83,7 @@
                                         x:Name="PART_NumericDown"
                                         Grid.Row="2"
                                         Margin="0,0,1,1"
+                                        Padding="0"
                                         Command="{x:Static controls:NumericBox.DecreaseCommand}"
                                         Delay="{TemplateBinding Delay}"
                                         IsTabStop="False">
diff --git a/src/WPFDevelopers.Shared/Themes/PathIcon.xaml b/src/WPFDevelopers.Shared/Themes/PathIcon.xaml
index 33a813c9..0d908d0a 100644
--- a/src/WPFDevelopers.Shared/Themes/PathIcon.xaml
+++ b/src/WPFDevelopers.Shared/Themes/PathIcon.xaml
@@ -15,7 +15,7 @@
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Height" Value="16" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="Foreground">
             <Setter.Value>
                 <Binding Path="Foreground" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType={x:Type Control}}" />
@@ -27,8 +27,8 @@
                 <ControlTemplate TargetType="{x:Type controls:PathIcon}">
                     <Viewbox
                         Margin="{TemplateBinding Padding}"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
                         UseLayoutRounding="True">
                         <Path
                             x:Name="PART_Path"
diff --git a/src/WPFDevelopers.Shared/Themes/Theme40.txt b/src/WPFDevelopers.Shared/Themes/Theme40.txt
index d14a27ad..182f11ff 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme40.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme40.txt
@@ -66,3 +66,4 @@ CropImage.xaml
 Message.xaml
 PathIcon.xaml
 NumericBox.xaml
+ColorPicker.xaml
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Theme45x.txt b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
index 2760eab6..72698657 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme45x.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
@@ -67,3 +67,4 @@ CropImage.xaml
 Message.xaml
 PathIcon.xaml
 NumericBox.xaml
+ColorPicker.xaml
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 9ee973c8..3a2ea469 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -9,6 +9,9 @@
     <Import_RootNamespace>WPFDevelopers</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\ColorPicker.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSB.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSL.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Assists\ThincknessAssert.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Badge\Badge.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BreadCrumbBar\BreadCrumbBar.cs" />
@@ -24,9 +27,12 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\PathIcon\PackIconKind.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\PathIcon\PathIcon.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\BreadCrumbBarConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\ColorConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\ColorTypeToVisibilityConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\DatePickerToCurrentConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\HalfValueConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\WidthHeightEqualValueConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\TextBoxHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\TextBoxValueChangedEventArgs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\DatePickerHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\ListBoxItemExtensions.cs" />
@@ -119,6 +125,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\StepIndexConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\IndexToColor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\ObjectNullToVisibilityConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Core\Utilities\ColorUtil.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Effects\GrayscaleEffect.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\AudioPlayer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\ControlsHelper.cs" />
@@ -425,6 +432,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\ColorPicker.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\CropImage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>