diff --git a/README-zh.md b/README-zh.md
index 2c65d2d9..b05796ea 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -25,7 +25,7 @@
 
 ### [ Wiki→ 正在进行快速更新](https://gitee.com/WPFDevelopersOrg/WPFDevelopers/wikis/pages)   
 
-### 此项目包含了 微信公众号 《 WPF开发者》 日常开发分享，欢迎<kbd>Star</kbd>。   
+### 此项目包含了 微信公众号 《 WPF开发者》 日常开发分享，欢迎<kbd>Star🌟</kbd>。   
 
 ### 运行环境 Visual Studio 2022  
 
@@ -89,6 +89,11 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
 `xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"`  
 
 ***
+### IPEditBox
+
+<img src="https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/IPEditBox.gif"/>   
+
+----------
 ### ColorPicker
 
 <img src="https://gitee.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/ColorPicker.gif"/>   
diff --git a/README.md b/README.md
index 80cd46d9..cf46b403 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ If you think our open source software is helpful to you, please scan the QR code
 
 ### Contributors  
 <a href="https://github.com/yanjinhuagood" target="_blank"><img style="border-radius:50%!important" width="64px" alt="ChisterWu" src="https://avatars.githubusercontent.com/u/23089734?v=4"></a>
-<a href="https://github.com/ChisterWu" target="_blank"><img style="border-radius:50%!important" width="64px" alt="ChisterWu" src="https://avatars.githubusercontent.com/u/28770378?v=4"></a>  <a href="https://github.com/huangjia2107" target="_blank"><img style="border-radius:50%!important" width="64px" alt="huangjia2107" src="https://avatars.githubusercontent.com/u/13675358?v=4"></a>  <a href="https://github.com/liukaishuang" target="_blank"><img style="border-radius:50%!important" width="64px" alt="liukaishuang" src="https://avatars.githubusercontent.com/u/25221289?v=4"></a>   <a href="https://github.com/TwilightLemon" target="_blank"><img style="border-radius:50%!important" width="64px" alt="TwilightLemon" src="https://avatars.githubusercontent.com/u/25076044?v=4"></a>  <a href="https://github.com/githowe" target="_blank"><img style="border-radius:50%!important" width="64px" alt="githowe" src="https://avatars.githubusercontent.com/u/31241366?v=4"></a>  <a href="https://github.com/LuGuangguang" target="_blank"><img style="border-radius:50%!important" width="64px" alt="LuGuangguang" src="https://avatars.githubusercontent.com/u/34500722?v=4"></a> <a href="https://github.com/DinoChan" target="_blank"><img style="border-radius:50%!important" width="64px" alt="DinoChan" src="https://avatars.githubusercontent.com/u/6076257?v=4"></a> <a href="https://github.com/mingyaodagege" target="_blank"><img style="border-radius:50%!important" width="64px" alt="mingyaodagege" src="https://avatars.githubusercontent.com/u/48346030?v=4"></a>   <a href="https://github.com/SFlyers" target="_blank"><img style="border-radius:50%!important" width="64px" alt="PettyHandSome" src="https://avatars.githubusercontent.com/u/16127328?v=4"></a>  <a href="https://github.com/choumengqizhigou" target="_blank"><img style="border-radius:50%!important" width="64px" alt="丑萌气质狗" src="https://avatars.githubusercontent.com/u/19163316?v=4"></a>  <a href="https://github.com/ptddqr" target="_blank"><img style="border-radius:50%!important" width="64px" alt="李伟" src="https://avatars.githubusercontent.com/u/24642606?v=4"></a>  <a href="https://github.com/SwaggyMacro" target="_blank"><img style="border-radius:50%!important" width="64px" alt="SwaggyMacro" src="https://avatars.githubusercontent.com/u/38845682?v=4"></a>
+<a href="https://github.com/ChisterWu" target="_blank"><img style="border-radius:50%!important" width="64px" alt="ChisterWu" src="https://avatars.githubusercontent.com/u/28770378?v=4"></a>  <a href="https://github.com/huangjia2107" target="_blank"><img style="border-radius:50%!important" width="64px" alt="huangjia2107" src="https://avatars.githubusercontent.com/u/13675358?v=4"></a>  <a href="https://github.com/liukaishuang" target="_blank"><img style="border-radius:50%!important" width="64px" alt="liukaishuang" src="https://avatars.githubusercontent.com/u/25221289?v=4"></a>   <a href="https://github.com/TwilightLemon" target="_blank"><img style="border-radius:50%!important" width="64px" alt="TwilightLemon" src="https://avatars.githubusercontent.com/u/25076044?v=4"></a>  <a href="https://github.com/githowe" target="_blank"><img style="border-radius:50%!important" width="64px" alt="githowe" src="https://avatars.githubusercontent.com/u/31241366?v=4"></a>  <a href="https://github.com/LuGuangguang" target="_blank"><img style="border-radius:50%!important" width="64px" alt="LuGuangguang" src="https://avatars.githubusercontent.com/u/34500722?v=4"></a> <a href="https://github.com/DinoChan" target="_blank"><img style="border-radius:50%!important" width="64px" alt="DinoChan" src="https://avatars.githubusercontent.com/u/6076257?v=4"></a> <a href="https://github.com/mingyaodagege" target="_blank"><img style="border-radius:50%!important" width="64px" alt="mingyaodagege" src="https://avatars.githubusercontent.com/u/48346030?v=4"></a>   <a href="https://github.com/SFlyers" target="_blank"><img style="border-radius:50%!important" width="64px" alt="PettyHandSome" src="https://avatars.githubusercontent.com/u/16127328?v=4"></a>  <a href="https://github.com/choumengqizhigou" target="_blank"><img style="border-radius:50%!important" width="64px" alt="丑萌气质狗" src="https://avatars.githubusercontent.com/u/19163316?v=4"></a>  <a href="https://github.com/ptddqr" target="_blank"><img style="border-radius:50%!important" width="64px" alt="李伟" src="https://avatars.githubusercontent.com/u/24642606?v=4"></a>  <a href="https://github.com/SwaggyMacro" target="_blank"><img style="border-radius:50%!important" width="64px" alt="SwaggyMacro" src="https://avatars.githubusercontent.com/u/38845682?v=4"></a>  <a href="https://github.com/guanguanchuangyu" target="_blank"><img style="border-radius:50%!important" width="64px" alt="guanguanchuangyu" src="https://avatars.githubusercontent.com/u/25916858?v=4"></a>
 
 ###  This is a UI library for WPF developers based on WPF custom advanced controls. Welcome to use..
 
@@ -79,6 +79,11 @@ xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
 
 `xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"`
 
+----------
+### IPEditBox
+
+<img src="https://github.com/WPFDevelopersOrg/ResourcesCache/raw/main/resources/WPFDevelopersResource/IPEditBox.gif"/>   
+
 ----------
 ### ColorPicker
 
diff --git a/src/WPFDevelopers.Net40/Themes/Generic.xaml b/src/WPFDevelopers.Net40/Themes/Generic.xaml
index b072b455..33eab55c 100644
--- a/src/WPFDevelopers.Net40/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Generic.xaml
@@ -10,6 +10,7 @@
         <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="TitleBackground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
diff --git a/src/WPFDevelopers.Net40/Themes/Theme.xaml b/src/WPFDevelopers.Net40/Themes/Theme.xaml
index 7df9edca..c91dbe68 100644
--- a/src/WPFDevelopers.Net40/Themes/Theme.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Theme.xaml
@@ -130,6 +130,7 @@
 	<Geometry x:Key="WD.HomeGeometry" po:Freeze="True">M804.571 566.857v274.286q0 14.857-10.857 25.714t-25.714 10.857h-219.429v-219.429h-146.286v219.429h-219.429q-14.857 0-25.714-10.857t-10.857-25.714v-274.286q0-0.571 0.286-1.714t0.286-1.714l328.571-270.857 328.571 270.857q0.571 1.143 0.571 3.429zM932 527.429l-35.429 42.286q-4.571 5.143-12 6.286h-1.714q-7.429 0-12-4l-395.429-329.714-395.429 329.714q-6.857 4.571-13.714 4-7.429-1.143-12-6.286l-35.429-42.286q-4.571-5.714-4-13.429t6.286-12.286l410.857-342.286q18.286-14.857 43.429-14.857t43.429 14.857l139.429 116.571v-111.429q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143v233.143l125.143 104q5.714 4.571 6.286 12.286t-4 13.429z</Geometry>
 	<Geometry x:Key="WD.ChevronUpGeometry" po:Freeze="True">M336.998 621.619c-13.875 13.722-36.301 13.722-50.074 0s-13.926-35.891 0-49.613l200.090-196.096c13.824-13.722 36.198-13.722 50.125 0l200.090 196.096c13.824 13.67 13.824 35.891 0 49.613-13.875 13.722-36.301 13.722-50.125 0l-175.104-160.819-175.002 160.819z</Geometry>
 	<Geometry x:Key="WD.UnfoldMoreGeometry" po:Freeze="True">M512 776l136-136 60 60-196 196-196-196 60-60zM512 248l-136 136-60-60 196-196 196 196-60 60z</Geometry>
+	<Geometry x:Key="WD.TimeGeometry" po:Freeze="True">M512 112c-229.792 0-416 186.24-416 416s186.208 416 416 416c229.728 0 416-186.24 416-416s-186.24-416-416-416zM508.64 864.864c-185.568 0-336-150.432-336-336s150.432-336 336-336c185.536 0 336 150.432 336 336 0 185.568-150.464 336-336 336zM605.76 548.192h-95.36v-161.024c0-17.472-14.176-31.68-31.648-31.68-17.504 0-31.68 14.176-31.68 31.68v192.672c0 17.504 14.176 31.648 31.68 31.648h127.008c17.504 0 31.68-14.144 31.68-31.648 0-17.472-14.176-31.648-31.68-31.648z</Geometry>
 	<CubicEase x:Key="WD.CubicEaseInOut" EasingMode="EaseInOut" />
 	<PowerEase x:Key="WD.PowerEaseInOut" EasingMode="EaseInOut" />
 	<ExponentialEase x:Key="WD.ExponentialEaseOut" EasingMode="EaseOut" />
@@ -749,6 +750,7 @@
 		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+		<Setter Property="TitleBackground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
 		<Setter Property="IsTabStop" Value="False" />
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="SnapsToDevicePixels" Value="True" />
@@ -1814,10 +1816,10 @@
 					</ControlTemplate.Resources>
 					<Border x:Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
 						<controls:SmallPanel>
-							<ToggleButton x:Name="PART_ToggleButton" Background="{TemplateBinding Background}" ClickMode="Press" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxToggleButton}" />
 							<ContentPresenter x:Name="ContentSite" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" IsHitTestVisible="False" />
 							<TextBox x:Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" IsReadOnly="{TemplateBinding IsReadOnly}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" Visibility="Hidden" />
 							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
+							<ToggleButton x:Name="PART_ToggleButton" Background="{TemplateBinding Background}" ClickMode="Press" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxToggleButton}" />
 							<Popup x:Name="PART_Popup" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding ComboBox.MaxDropDownHeight}" AllowsTransparency="True" Focusable="False" IsOpen="{TemplateBinding IsDropDownOpen}" Placement="Bottom" StaysOpen="False">
 								<controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding ComboBox.MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
 									<controls:SmallPanel.RenderTransform>
@@ -1961,12 +1963,13 @@
 	<Style x:Key="WD.DefaultToggleButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Padding" Value="4,0" />
+		<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ToggleButton}">
 					<BulletDecorator Background="Transparent">
 						<BulletDecorator.Bullet>
-							<Border x:Name="PART_Border" Width="40" Height="20" Background="{DynamicResource WD.BaseSolidColorBrush}" CornerRadius="10">
+							<Border x:Name="PART_Border" Width="40" Height="20" Background="{TemplateBinding Background}" CornerRadius="10">
 								<Ellipse x:Name="PART_Ellipse" Width="16" Height="16" Margin="2,0" HorizontalAlignment="Left" VerticalAlignment="Center" Fill="{DynamicResource WD.WindowForegroundColorBrush}">
 									<Ellipse.RenderTransform>
 										<TranslateTransform />
@@ -1993,7 +1996,7 @@
 					</BulletDecorator>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsChecked" Value="True">
-							<Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+							<Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
 						</Trigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -5302,23 +5305,23 @@
 							<Border x:Name="PART_EditBar" Panel.ZIndex="99" Background="{DynamicResource WD.BackgroundSolidColorBrush}" Effect="{StaticResource WD.PopupShadowDepth}" Visibility="Hidden">
 								<WrapPanel Margin="10,5" VerticalAlignment="Center">
 									<RadioButton x:Name="PART_RadioButtonRectangle" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="方框">
-										<controls:PathIcon Width="18" Height="18" Foreground="{StaticResource WD.RegularTextSolidColorBrush}" Kind="Rectangle" />
+										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Rectangle" />
 									</RadioButton>
 									<RadioButton x:Name="PART_RadioButtonEllipse" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="椭圆">
 										<Ellipse Width="19" Height="19" SnapsToDevicePixels="True" Stroke="{DynamicResource WD.RegularTextSolidColorBrush}" StrokeThickness="1.5" UseLayoutRounding="True" />
 									</RadioButton>
 									<RadioButton x:Name="PART_RadioButtonArrow" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="箭头">
-										<controls:PathIcon Width="18" Height="18" Foreground="{StaticResource WD.RegularTextSolidColorBrush}" Kind="ArrowRightTop" />
+										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="ArrowRightTop" />
 									</RadioButton>
 									<RadioButton x:Name="PART_RadioButtonInk" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="画笔">
-										<controls:PathIcon Width="18" Height="18" Foreground="{StaticResource WD.RegularTextSolidColorBrush}" Kind="Ink" />
+										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Ink" />
 									</RadioButton>
 									<RadioButton x:Name="PART_RadioButtonText" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="文字">
-										<controls:PathIcon Width="18" Height="18" Foreground="{StaticResource WD.RegularTextSolidColorBrush}" Kind="Text" />
+										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Text" />
 									</RadioButton>
 									<Rectangle Width="1" Height="18" Margin="4,0" Stroke="{DynamicResource WD.SecondaryTextSolidColorBrush}" />
 									<Button x:Name="PART_ButtonSave" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="保存">
-										<controls:PathIcon Width="18" Height="18" Foreground="{StaticResource WD.RegularTextSolidColorBrush}" Kind="Save" />
+										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Save" />
 									</Button>
 									<Button x:Name="PART_ButtonCancel" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="取消">
 										<controls:PathIcon Width="14" Height="14" Foreground="{StaticResource WD.DangerSolidColorBrush}" Kind="Cancel" />
@@ -6176,7 +6179,7 @@
 									<RepeatButton x:Name="PART_NumericUp" Grid.Row="0" Margin="0,1,1,0" Padding="0" Command="{x:Static controls:NumericBox.IncreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
 										<controls:PathIcon Kind="ChevronUp" Style="{StaticResource WD.MiniPathIcon}" />
 									</RepeatButton>
-									<RepeatButton x:Name="PART_NumericDown" Grid.Row="2" Margin="0,0,1,1" Padding="0" Command="{x:Static controls:NumericBox.DecreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False">
+									<RepeatButton x:Name="PART_NumericDown" Grid.Row="2" Margin="0,0,1,1" Padding="0" Command="{x:Static controls:NumericBox.DecreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
 										<controls:PathIcon Kind="ChevronDown" Style="{StaticResource WD.MiniPathIcon}" />
 									</RepeatButton>
 								</Grid>
@@ -6354,7 +6357,7 @@
 								</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}}" />
+										<TextBox helpers:TextBoxHelper.AllowOnlyNumericInput="True" helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.MaxValue="360" helpers:TextBoxHelper.MinValue="0" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.HToColorConverter}}" />
 										<TextBlock Text="H" />
 									</StackPanel>
 									<StackPanel Grid.Column="1">
@@ -6378,6 +6381,223 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource WD.ColorPicker}" TargetType="{x:Type controls:ColorPicker}" />
+	<Style x:Key="WD.IPEditBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:IPEditBox}">
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type controls:IPEditBox}">
+					<ControlTemplate.Resources>
+						<Style BasedOn="{StaticResource WD.DefaultTextBox}" TargetType="{x:Type TextBox}">
+							<Setter Property="BorderThickness" Value="0" />
+							<Setter Property="helpers:TextBoxHelper.AllowOnlyNumericInput" Value="True" />
+							<Setter Property="helpers:TextBoxHelper.MaxValue" Value="255" />
+							<Setter Property="helpers:TextBoxHelper.MinValue" Value="0" />
+							<Setter Property="VerticalContentAlignment" Value="Center" />
+							<Setter Property="HorizontalContentAlignment" Value="Center" />
+						</Style>
+						<Style TargetType="TextBlock">
+							<Setter Property="Text" Value="." />
+							<Setter Property="VerticalAlignment" Value="Center" />
+						</Style>
+					</ControlTemplate.Resources>
+					<Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
+						<ScrollViewer HorizontalScrollBarVisibility="Auto">
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition />
+								</Grid.ColumnDefinitions>
+								<TextBox x:Name="PART_TextBox1" />
+								<TextBlock Grid.Column="1" />
+								<TextBox x:Name="PART_TextBox2" Grid.Column="2" />
+								<TextBlock Grid.Column="3" />
+								<TextBox x:Name="PART_TextBox3" Grid.Column="4" />
+								<TextBlock Grid.Column="5" />
+								<TextBox x:Name="PART_TextBox4" Grid.Column="6" />
+							</Grid>
+						</ScrollViewer>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsKeyboardFocused" Value="True">
+							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsKeyboardFocused" Value="True" />
+								<Condition Property="IsMouseOver" Value="False" />
+							</MultiTrigger.Conditions>
+							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+						</MultiTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource WD.IPEditBox}" TargetType="{x:Type controls:IPEditBox}" />
+	<ControlTemplate x:Key="WD.TimePickerToggleButton" TargetType="{x:Type ToggleButton}">
+		<Border x:Name="PART_Border" Padding="6,0" Background="Transparent" BorderThickness="0" SnapsToDevicePixels="true">
+			<controls:PathIcon x:Name="PART_PathIcon" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource WD.PlaceholderTextSolidColorBrush}" IsHitTestVisible="False" Kind="Time" />
+		</Border>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter TargetName="PART_PathIcon" Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+			</Trigger>
+			<Trigger Property="IsChecked" Value="True">
+				<Setter TargetName="PART_PathIcon" Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="WD.TimeSelectorItem" BasedOn="{StaticResource WD.DefaultListBoxItem}" TargetType="{x:Type controls:TimeSelectorItem}">
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type controls:TimeSelectorItem}">
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsSelected" Value="True">
+							<Setter Property="FontWeight" Value="Bold" />
+							<Setter Property="Background" Value="Transparent" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+						</Trigger>
+						<DataTrigger Binding="{Binding}" Value="">
+							<Setter Property="IsEnabled" Value="False" />
+						</DataTrigger>
+					</ControlTemplate.Triggers>
+					<controls:SmallPanel>
+						<Border Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						</Border>
+					</controls:SmallPanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="WD.TimeListStyle" BasedOn="{StaticResource WD.DefaultListBox}" TargetType="{x:Type controls:TimeSelectorListBox}">
+		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="False" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource WD.TimeSelectorItem}" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+				<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="WD.TimeSelector" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:TimeSelector}">
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type controls:TimeSelector}">
+					<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
+						<controls:SmallPanel SnapsToDevicePixels="True">
+							<UniformGrid Rows="1">
+								<controls:TimeSelectorListBox x:Name="PART_ListBoxHour" Style="{StaticResource WD.TimeListStyle}" />
+								<controls:TimeSelectorListBox x:Name="PART_ListBoxMinute" Style="{StaticResource WD.TimeListStyle}" />
+								<controls:TimeSelectorListBox x:Name="PART_ListBoxSecond" Style="{StaticResource WD.TimeListStyle}" />
+							</UniformGrid>
+							<Line />
+							<Path />
+							<Border Height="{TemplateBinding ItemHeight}" Margin="{TemplateBinding SelectorMargin}" VerticalAlignment="Top" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="0,1" IsHitTestVisible="False" />
+						</controls:SmallPanel>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="WD.TimePicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:TimePicker}">
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type controls:TimePicker}">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="OpenStoryboard">
+							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
+						</Storyboard>
+						<Storyboard x:Key="CloseStoryboard">
+							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="0" Duration="00:00:.2" />
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<controls:SmallPanel SnapsToDevicePixels="True">
+						<Grid Background="Transparent">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition />
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+							<Border Name="PART_Border" Grid.ColumnSpan="2" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True" />
+							<TextBox x:Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" />
+							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" IsHitTestVisible="False" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
+							<ToggleButton x:Name="PART_ToggleButton" Grid.Column="1" Background="{TemplateBinding Background}" ClickMode="Release" Focusable="False" Style="{x:Null}" Template="{StaticResource WD.TimePickerToggleButton}" />
+							<Popup x:Name="PART_Popup" AllowsTransparency="True" IsOpen="{Binding Path=IsChecked, ElementName=PART_ToggleButton}" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_Border}" StaysOpen="False">
+								<controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
+									<controls:SmallPanel.RenderTransform>
+										<ScaleTransform ScaleY="0" />
+									</controls:SmallPanel.RenderTransform>
+									<Border Name="PART_DropDownBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
+									<controls:TimeSelector x:Name="PART_TimeSelector" />
+								</controls:SmallPanel>
+							</Popup>
+						</Grid>
+					</controls:SmallPanel>
+					<ControlTemplate.Triggers>
+						<Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
+							<Trigger.EnterActions>
+								<BeginStoryboard x:Name="BeginStoryboardOpenStoryboard" Storyboard="{StaticResource OpenStoryboard}" />
+							</Trigger.EnterActions>
+							<Trigger.ExitActions>
+								<StopStoryboard BeginStoryboardName="BeginStoryboardOpenStoryboard" />
+							</Trigger.ExitActions>
+						</Trigger>
+						<Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="False">
+							<Trigger.EnterActions>
+								<BeginStoryboard x:Name="BeginStoryboardCloseStoryboard" Storyboard="{StaticResource CloseStoryboard}" />
+							</Trigger.EnterActions>
+							<Trigger.ExitActions>
+								<StopStoryboard BeginStoryboardName="BeginStoryboardCloseStoryboard" />
+							</Trigger.ExitActions>
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+						</Trigger>
+						<Trigger SourceName="PART_Popup" Property="AllowsTransparency" Value="True">
+							<Setter TargetName="PART_DropDownBorder" Property="Margin" Value="0,2,0,0" />
+						</Trigger>
+						<Trigger Property="SelectedTime" Value="">
+							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+						</Trigger>
+						<Trigger Property="SelectedTime" Value="{x:Null}">
+							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource WD.TimeSelector}" TargetType="{x:Type controls:TimeSelector}" />
+	<Style BasedOn="{StaticResource WD.TimePicker}" TargetType="{x:Type controls:TimePicker}" />
 	<Style x:Key="WD.DatePickerCalendarStyle" BasedOn="{StaticResource {x:Type Calendar}}" TargetType="{x:Type Calendar}" />
 	<Style x:Key="WD.DefaultDatePicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DatePicker}">
 		<Setter Property="IsTodayHighlighted" Value="True" />
diff --git a/src/WPFDevelopers.Net40/Window.cs b/src/WPFDevelopers.Net40/Window.cs
index b64d249c..cb792f54 100644
--- a/src/WPFDevelopers.Net40/Window.cs
+++ b/src/WPFDevelopers.Net40/Window.cs
@@ -23,7 +23,7 @@ public class Window : System.Windows.Window
             DependencyProperty.Register("TitleBar", typeof(object), typeof(Window), new PropertyMetadata(null));
 
         public static readonly DependencyProperty TitleBackgroundProperty =
-           DependencyProperty.Register("TitleBackground", typeof(Brush), typeof(Window), new PropertyMetadata(ControlsHelper.PrimaryNormalBrush));
+           DependencyProperty.Register("TitleBackground", typeof(Brush), typeof(Window), new PropertyMetadata(null));
 
         static Window()
         {
@@ -67,8 +67,8 @@ public object TitleBar
 
         public Brush TitleBackground
         {
-            get => (Brush)GetValue(TitleBarProperty);
-            set => SetValue(TitleBarProperty, value);
+            get => (Brush)GetValue(TitleBackgroundProperty);
+            set => SetValue(TitleBackgroundProperty, value);
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
diff --git a/src/WPFDevelopers.Net45x/Themes/Generic.xaml b/src/WPFDevelopers.Net45x/Themes/Generic.xaml
index c6724e1d..9127d0ec 100644
--- a/src/WPFDevelopers.Net45x/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net45x/Themes/Generic.xaml
@@ -12,6 +12,7 @@
         <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="TitleBackground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
diff --git a/src/WPFDevelopers.Net45x/Themes/Theme.xaml b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
index 2e9ac7aa..b7de62da 100644
--- a/src/WPFDevelopers.Net45x/Themes/Theme.xaml
+++ b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
@@ -130,6 +130,7 @@
 	<Geometry x:Key="WD.HomeGeometry" po:Freeze="True">M804.571 566.857v274.286q0 14.857-10.857 25.714t-25.714 10.857h-219.429v-219.429h-146.286v219.429h-219.429q-14.857 0-25.714-10.857t-10.857-25.714v-274.286q0-0.571 0.286-1.714t0.286-1.714l328.571-270.857 328.571 270.857q0.571 1.143 0.571 3.429zM932 527.429l-35.429 42.286q-4.571 5.143-12 6.286h-1.714q-7.429 0-12-4l-395.429-329.714-395.429 329.714q-6.857 4.571-13.714 4-7.429-1.143-12-6.286l-35.429-42.286q-4.571-5.714-4-13.429t6.286-12.286l410.857-342.286q18.286-14.857 43.429-14.857t43.429 14.857l139.429 116.571v-111.429q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143v233.143l125.143 104q5.714 4.571 6.286 12.286t-4 13.429z</Geometry>
 	<Geometry x:Key="WD.ChevronUpGeometry" po:Freeze="True">M336.998 621.619c-13.875 13.722-36.301 13.722-50.074 0s-13.926-35.891 0-49.613l200.090-196.096c13.824-13.722 36.198-13.722 50.125 0l200.090 196.096c13.824 13.67 13.824 35.891 0 49.613-13.875 13.722-36.301 13.722-50.125 0l-175.104-160.819-175.002 160.819z</Geometry>
 	<Geometry x:Key="WD.UnfoldMoreGeometry" po:Freeze="True">M512 776l136-136 60 60-196 196-196-196 60-60zM512 248l-136 136-60-60 196-196 196 196-60 60z</Geometry>
+	<Geometry x:Key="WD.TimeGeometry" po:Freeze="True">M512 112c-229.792 0-416 186.24-416 416s186.208 416 416 416c229.728 0 416-186.24 416-416s-186.24-416-416-416zM508.64 864.864c-185.568 0-336-150.432-336-336s150.432-336 336-336c185.536 0 336 150.432 336 336 0 185.568-150.464 336-336 336zM605.76 548.192h-95.36v-161.024c0-17.472-14.176-31.68-31.648-31.68-17.504 0-31.68 14.176-31.68 31.68v192.672c0 17.504 14.176 31.648 31.68 31.648h127.008c17.504 0 31.68-14.144 31.68-31.648 0-17.472-14.176-31.648-31.68-31.648z</Geometry>
 	<CubicEase x:Key="WD.CubicEaseInOut" EasingMode="EaseInOut" />
 	<PowerEase x:Key="WD.PowerEaseInOut" EasingMode="EaseInOut" />
 	<ExponentialEase x:Key="WD.ExponentialEaseOut" EasingMode="EaseOut" />
@@ -749,6 +750,7 @@
 		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+		<Setter Property="TitleBackground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="IsTabStop" Value="False" />
 		<Setter Property="SnapsToDevicePixels" Value="True" />
@@ -1815,10 +1817,10 @@
 					</ControlTemplate.Resources>
 					<Border x:Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
 						<controls:SmallPanel>
-							<ToggleButton x:Name="PART_ToggleButton" Background="{TemplateBinding Background}" ClickMode="Press" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxToggleButton}" />
 							<ContentPresenter x:Name="ContentSite" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" IsHitTestVisible="False" />
 							<TextBox x:Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" IsReadOnly="{TemplateBinding IsReadOnly}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" Visibility="Hidden" />
 							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
+							<ToggleButton x:Name="PART_ToggleButton" Background="{TemplateBinding Background}" ClickMode="Press" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxToggleButton}" />
 							<Popup x:Name="PART_Popup" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding ComboBox.MaxDropDownHeight}" AllowsTransparency="True" Focusable="False" IsOpen="{TemplateBinding IsDropDownOpen}" Placement="Bottom" StaysOpen="False">
 								<controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding ComboBox.MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
 									<controls:SmallPanel.RenderTransform>
@@ -1962,12 +1964,13 @@
 	<Style x:Key="WD.DefaultToggleButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Padding" Value="4,0" />
+		<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ToggleButton}">
 					<BulletDecorator Background="Transparent">
 						<BulletDecorator.Bullet>
-							<Border x:Name="PART_Border" Width="40" Height="20" Background="{DynamicResource WD.BaseSolidColorBrush}" CornerRadius="10">
+							<Border x:Name="PART_Border" Width="40" Height="20" Background="{TemplateBinding Background}" CornerRadius="10">
 								<Ellipse x:Name="PART_Ellipse" Width="16" Height="16" Margin="2,0" HorizontalAlignment="Left" VerticalAlignment="Center" Fill="{DynamicResource WD.WindowForegroundColorBrush}">
 									<Ellipse.RenderTransform>
 										<TranslateTransform />
@@ -1994,7 +1997,7 @@
 					</BulletDecorator>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsChecked" Value="True">
-							<Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+							<Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
 						</Trigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -5303,23 +5306,23 @@
 							<Border x:Name="PART_EditBar" Panel.ZIndex="99" Background="{DynamicResource WD.BackgroundSolidColorBrush}" Effect="{StaticResource WD.PopupShadowDepth}" Visibility="Hidden">
 								<WrapPanel Margin="10,5" VerticalAlignment="Center">
 									<RadioButton x:Name="PART_RadioButtonRectangle" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="方框">
-										<controls:PathIcon Width="18" Height="18" Foreground="{StaticResource WD.RegularTextSolidColorBrush}" Kind="Rectangle" />
+										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Rectangle" />
 									</RadioButton>
 									<RadioButton x:Name="PART_RadioButtonEllipse" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="椭圆">
 										<Ellipse Width="19" Height="19" SnapsToDevicePixels="True" Stroke="{DynamicResource WD.RegularTextSolidColorBrush}" StrokeThickness="1.5" UseLayoutRounding="True" />
 									</RadioButton>
 									<RadioButton x:Name="PART_RadioButtonArrow" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="箭头">
-										<controls:PathIcon Width="18" Height="18" Foreground="{StaticResource WD.RegularTextSolidColorBrush}" Kind="ArrowRightTop" />
+										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="ArrowRightTop" />
 									</RadioButton>
 									<RadioButton x:Name="PART_RadioButtonInk" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="画笔">
-										<controls:PathIcon Width="18" Height="18" Foreground="{StaticResource WD.RegularTextSolidColorBrush}" Kind="Ink" />
+										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Ink" />
 									</RadioButton>
 									<RadioButton x:Name="PART_RadioButtonText" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="文字">
-										<controls:PathIcon Width="18" Height="18" Foreground="{StaticResource WD.RegularTextSolidColorBrush}" Kind="Text" />
+										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Text" />
 									</RadioButton>
 									<Rectangle Width="1" Height="18" Margin="4,0" Stroke="{DynamicResource WD.SecondaryTextSolidColorBrush}" />
 									<Button x:Name="PART_ButtonSave" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="保存">
-										<controls:PathIcon Width="18" Height="18" Foreground="{StaticResource WD.RegularTextSolidColorBrush}" Kind="Save" />
+										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Save" />
 									</Button>
 									<Button x:Name="PART_ButtonCancel" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="取消">
 										<controls:PathIcon Width="14" Height="14" Foreground="{StaticResource WD.DangerSolidColorBrush}" Kind="Cancel" />
@@ -6177,7 +6180,7 @@
 									<RepeatButton x:Name="PART_NumericUp" Grid.Row="0" Margin="0,1,1,0" Padding="0" Command="{x:Static controls:NumericBox.IncreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
 										<controls:PathIcon Kind="ChevronUp" Style="{StaticResource WD.MiniPathIcon}" />
 									</RepeatButton>
-									<RepeatButton x:Name="PART_NumericDown" Grid.Row="2" Margin="0,0,1,1" Padding="0" Command="{x:Static controls:NumericBox.DecreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False">
+									<RepeatButton x:Name="PART_NumericDown" Grid.Row="2" Margin="0,0,1,1" Padding="0" Command="{x:Static controls:NumericBox.DecreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
 										<controls:PathIcon Kind="ChevronDown" Style="{StaticResource WD.MiniPathIcon}" />
 									</RepeatButton>
 								</Grid>
@@ -6355,7 +6358,7 @@
 								</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}}" />
+										<TextBox helpers:TextBoxHelper.AllowOnlyNumericInput="True" helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.MaxValue="360" helpers:TextBoxHelper.MinValue="0" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.HToColorConverter}}" />
 										<TextBlock Text="H" />
 									</StackPanel>
 									<StackPanel Grid.Column="1">
@@ -6379,6 +6382,223 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource WD.ColorPicker}" TargetType="{x:Type controls:ColorPicker}" />
+	<Style x:Key="WD.IPEditBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:IPEditBox}">
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type controls:IPEditBox}">
+					<ControlTemplate.Resources>
+						<Style BasedOn="{StaticResource WD.DefaultTextBox}" TargetType="{x:Type TextBox}">
+							<Setter Property="BorderThickness" Value="0" />
+							<Setter Property="helpers:TextBoxHelper.AllowOnlyNumericInput" Value="True" />
+							<Setter Property="helpers:TextBoxHelper.MaxValue" Value="255" />
+							<Setter Property="helpers:TextBoxHelper.MinValue" Value="0" />
+							<Setter Property="VerticalContentAlignment" Value="Center" />
+							<Setter Property="HorizontalContentAlignment" Value="Center" />
+						</Style>
+						<Style TargetType="TextBlock">
+							<Setter Property="Text" Value="." />
+							<Setter Property="VerticalAlignment" Value="Center" />
+						</Style>
+					</ControlTemplate.Resources>
+					<Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
+						<ScrollViewer HorizontalScrollBarVisibility="Auto">
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition />
+								</Grid.ColumnDefinitions>
+								<TextBox x:Name="PART_TextBox1" />
+								<TextBlock Grid.Column="1" />
+								<TextBox x:Name="PART_TextBox2" Grid.Column="2" />
+								<TextBlock Grid.Column="3" />
+								<TextBox x:Name="PART_TextBox3" Grid.Column="4" />
+								<TextBlock Grid.Column="5" />
+								<TextBox x:Name="PART_TextBox4" Grid.Column="6" />
+							</Grid>
+						</ScrollViewer>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsKeyboardFocused" Value="True">
+							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsKeyboardFocused" Value="True" />
+								<Condition Property="IsMouseOver" Value="False" />
+							</MultiTrigger.Conditions>
+							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+						</MultiTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource WD.IPEditBox}" TargetType="{x:Type controls:IPEditBox}" />
+	<ControlTemplate x:Key="WD.TimePickerToggleButton" TargetType="{x:Type ToggleButton}">
+		<Border x:Name="PART_Border" Padding="6,0" Background="Transparent" BorderThickness="0" SnapsToDevicePixels="true">
+			<controls:PathIcon x:Name="PART_PathIcon" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource WD.PlaceholderTextSolidColorBrush}" IsHitTestVisible="False" Kind="Time" />
+		</Border>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter TargetName="PART_PathIcon" Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+			</Trigger>
+			<Trigger Property="IsChecked" Value="True">
+				<Setter TargetName="PART_PathIcon" Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="WD.TimeSelectorItem" BasedOn="{StaticResource WD.DefaultListBoxItem}" TargetType="{x:Type controls:TimeSelectorItem}">
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type controls:TimeSelectorItem}">
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsSelected" Value="True">
+							<Setter Property="FontWeight" Value="Bold" />
+							<Setter Property="Background" Value="Transparent" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+						</Trigger>
+						<DataTrigger Binding="{Binding}" Value="">
+							<Setter Property="IsEnabled" Value="False" />
+						</DataTrigger>
+					</ControlTemplate.Triggers>
+					<controls:SmallPanel>
+						<Border Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						</Border>
+					</controls:SmallPanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="WD.TimeListStyle" BasedOn="{StaticResource WD.DefaultListBox}" TargetType="{x:Type controls:TimeSelectorListBox}">
+		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="False" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource WD.TimeSelectorItem}" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+				<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="WD.TimeSelector" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:TimeSelector}">
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type controls:TimeSelector}">
+					<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
+						<controls:SmallPanel SnapsToDevicePixels="True">
+							<UniformGrid Rows="1">
+								<controls:TimeSelectorListBox x:Name="PART_ListBoxHour" Style="{StaticResource WD.TimeListStyle}" />
+								<controls:TimeSelectorListBox x:Name="PART_ListBoxMinute" Style="{StaticResource WD.TimeListStyle}" />
+								<controls:TimeSelectorListBox x:Name="PART_ListBoxSecond" Style="{StaticResource WD.TimeListStyle}" />
+							</UniformGrid>
+							<Line />
+							<Path />
+							<Border Height="{TemplateBinding ItemHeight}" Margin="{TemplateBinding SelectorMargin}" VerticalAlignment="Top" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="0,1" IsHitTestVisible="False" />
+						</controls:SmallPanel>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="WD.TimePicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:TimePicker}">
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type controls:TimePicker}">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="OpenStoryboard">
+							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
+						</Storyboard>
+						<Storyboard x:Key="CloseStoryboard">
+							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="0" Duration="00:00:.2" />
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<controls:SmallPanel SnapsToDevicePixels="True">
+						<Grid Background="Transparent">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition />
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+							<Border Name="PART_Border" Grid.ColumnSpan="2" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True" />
+							<TextBox x:Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" />
+							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" IsHitTestVisible="False" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
+							<ToggleButton x:Name="PART_ToggleButton" Grid.Column="1" Background="{TemplateBinding Background}" ClickMode="Release" Focusable="False" Style="{x:Null}" Template="{StaticResource WD.TimePickerToggleButton}" />
+							<Popup x:Name="PART_Popup" AllowsTransparency="True" IsOpen="{Binding Path=IsChecked, ElementName=PART_ToggleButton}" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_Border}" StaysOpen="False">
+								<controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
+									<controls:SmallPanel.RenderTransform>
+										<ScaleTransform ScaleY="0" />
+									</controls:SmallPanel.RenderTransform>
+									<Border Name="PART_DropDownBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
+									<controls:TimeSelector x:Name="PART_TimeSelector" />
+								</controls:SmallPanel>
+							</Popup>
+						</Grid>
+					</controls:SmallPanel>
+					<ControlTemplate.Triggers>
+						<Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
+							<Trigger.EnterActions>
+								<BeginStoryboard x:Name="BeginStoryboardOpenStoryboard" Storyboard="{StaticResource OpenStoryboard}" />
+							</Trigger.EnterActions>
+							<Trigger.ExitActions>
+								<StopStoryboard BeginStoryboardName="BeginStoryboardOpenStoryboard" />
+							</Trigger.ExitActions>
+						</Trigger>
+						<Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="False">
+							<Trigger.EnterActions>
+								<BeginStoryboard x:Name="BeginStoryboardCloseStoryboard" Storyboard="{StaticResource CloseStoryboard}" />
+							</Trigger.EnterActions>
+							<Trigger.ExitActions>
+								<StopStoryboard BeginStoryboardName="BeginStoryboardCloseStoryboard" />
+							</Trigger.ExitActions>
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+						</Trigger>
+						<Trigger SourceName="PART_Popup" Property="AllowsTransparency" Value="True">
+							<Setter TargetName="PART_DropDownBorder" Property="Margin" Value="0,2,0,0" />
+						</Trigger>
+						<Trigger Property="SelectedTime" Value="">
+							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+						</Trigger>
+						<Trigger Property="SelectedTime" Value="{x:Null}">
+							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource WD.TimeSelector}" TargetType="{x:Type controls:TimeSelector}" />
+	<Style BasedOn="{StaticResource WD.TimePicker}" TargetType="{x:Type controls:TimePicker}" />
 	<Style x:Key="WD.DatePickerCalendarStyle" BasedOn="{StaticResource {x:Type Calendar}}" TargetType="{x:Type Calendar}" />
 	<Style x:Key="WD.DefaultDatePicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DatePicker}">
 		<Setter Property="IsTodayHighlighted" Value="True" />
diff --git a/src/WPFDevelopers.Net45x/Window.cs b/src/WPFDevelopers.Net45x/Window.cs
index 6d27bcc2..3e0b7ca4 100644
--- a/src/WPFDevelopers.Net45x/Window.cs
+++ b/src/WPFDevelopers.Net45x/Window.cs
@@ -22,7 +22,7 @@ public class Window : System.Windows.Window
             DependencyProperty.Register("TitleBar", typeof(object), typeof(Window), new PropertyMetadata(null));
 
         public static readonly DependencyProperty TitleBackgroundProperty =
-          DependencyProperty.Register("TitleBackground", typeof(Brush), typeof(Window), new PropertyMetadata(ControlsHelper.PrimaryNormalBrush));
+          DependencyProperty.Register("TitleBackground", typeof(Brush), typeof(Window), new PropertyMetadata(null));
 
         static Window()
         {
@@ -63,8 +63,8 @@ public object TitleBar
         }
         public Brush TitleBackground
         {
-            get => (Brush)GetValue(TitleBarProperty);
-            set => SetValue(TitleBarProperty, value);
+            get => (Brush)GetValue(TitleBackgroundProperty);
+            set => SetValue(TitleBackgroundProperty, value);
         }
 
         private static T GetResourceKey<T>(string key)
diff --git a/src/WPFDevelopers.Samples.Shared/App.xaml b/src/WPFDevelopers.Samples.Shared/App.xaml
index 0dc3616d..a8a341b3 100644
--- a/src/WPFDevelopers.Samples.Shared/App.xaml
+++ b/src/WPFDevelopers.Samples.Shared/App.xaml
@@ -28,6 +28,7 @@
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/RainbowButtons/RainbowButtons.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/SnowCanvas/SnowCanvas.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/CropControl/CropControl.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/ElementAdorner/TransformThumb.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="avalonedit:TextEditor">
                 <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
diff --git a/src/WPFDevelopers.Samples.Shared/Controls/ElementAdorner/ElementAdorner.cs b/src/WPFDevelopers.Samples.Shared/Controls/ElementAdorner/ElementAdorner.cs
index 1f0c71ea..59ab606f 100644
--- a/src/WPFDevelopers.Samples.Shared/Controls/ElementAdorner/ElementAdorner.cs
+++ b/src/WPFDevelopers.Samples.Shared/Controls/ElementAdorner/ElementAdorner.cs
@@ -1,23 +1,35 @@
-using System.Windows;
+using System;
+using System.ComponentModel;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Media.Media3D;
 using System.Windows.Shapes;
+using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Samples.Controls
 {
     public class ElementAdorner : Adorner
     {
         private const double ThumbSize = 16, ElementMiniSize = 20;
+        private const double RotateThumbSize = 20;
         private readonly Thumb tLeft;
         private readonly Thumb tRight;
         private readonly Thumb bLeftBottom;
         private readonly Thumb bRightBottom;
         private readonly Thumb tMove;
         private readonly VisualCollection visualCollection;
+        private readonly Thumb tRotate;
 
+        private Canvas canvas;
+        private Point centerPoint;
+        private FrameworkElement designerItem;
+        private double initialAngle;
+        private RotateTransform rotateTransform;
+        private Vector startVector;
         public ElementAdorner(UIElement adornedElement) : base(adornedElement)
         {
             visualCollection = new VisualCollection(this);
@@ -30,6 +42,7 @@ public ElementAdorner(UIElement adornedElement) : base(adornedElement)
                 CreateThumb(Cursors.SizeNESW, HorizontalAlignment.Left, VerticalAlignment.Bottom));
             visualCollection.Add(bRightBottom =
                 CreateThumb(Cursors.SizeNWSE, HorizontalAlignment.Right, VerticalAlignment.Bottom));
+            visualCollection.Add(tRotate = CreateRotateThumb());
         }
 
         protected override int VisualChildrenCount => visualCollection.Count;
@@ -38,7 +51,7 @@ protected override void OnRender(DrawingContext drawingContext)
         {
             var offset = ThumbSize / 2;
             var sz = new Size(ThumbSize, ThumbSize);
-            var renderPen = new Pen(new SolidColorBrush(Colors.White), 2.0);
+            var renderPen = new Pen(ControlsHelper.Brush, 2.0);
             var startPoint = new Point(AdornedElement.RenderSize.Width / 2,
                 AdornedElement.RenderSize.Height - AdornedElement.RenderSize.Height);
             var endPoint = new Point(AdornedElement.RenderSize.Width / 2,
@@ -50,6 +63,11 @@ protected override void OnRender(DrawingContext drawingContext)
             bLeftBottom.Arrange(new Rect(new Point(-offset, AdornedElement.RenderSize.Height - offset), sz));
             bRightBottom.Arrange(new Rect(
                 new Point(AdornedElement.RenderSize.Width - offset, AdornedElement.RenderSize.Height - offset), sz));
+            tRotate.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width / 2 - 10, -(RotateThumbSize - 5)), new Size(20, 20)));
+
+            var adornedElementRect = new Rect(AdornedElement.RenderSize);
+            var pen = new Pen(ControlsHelper.Brush, 2);
+            drawingContext.DrawRectangle(null, pen, adornedElementRect);
         }
 
         private Thumb CreateMoveThumb()
@@ -112,7 +130,7 @@ private Thumb CreateThumb(Cursor cursor, HorizontalAlignment horizontal, Vertica
                 VerticalAlignment = vertical,
                 Template = new ControlTemplate(typeof(Thumb))
                 {
-                    VisualTree = GetFactory(new SolidColorBrush(Colors.White))
+                    VisualTree = GetFactory(ControlsHelper.Brush)
                 }
             };
 
@@ -203,5 +221,82 @@ private void SetPositon(FrameworkElement element,double left, double top)
             Canvas.SetLeft(element, left);
             Canvas.SetTop(element, top);
         }
+        /// <summary>
+        /// 旋转
+        /// </summary>
+        /// <returns></returns>
+        private Thumb CreateRotateThumb()
+        {
+            Thumb thumb = new Thumb()
+            {
+                Cursor = Cursors.Hand,
+                Width = RotateThumbSize,
+                Height = RotateThumbSize,
+                VerticalAlignment = VerticalAlignment.Top,
+                Margin = new Thickness(0, -RotateThumbSize, 0, 0),
+                Template = new ControlTemplate(typeof(Thumb))
+                {
+                    VisualTree = GetFactory(GetFactoryRotate()),
+                },
+            };
+            thumb.DragDelta += Thumb_DragDelta;
+            thumb.DragStarted += Thumb_DragStarted;
+            return thumb;
+        }
+
+       
+        private Brush GetFactoryRotate()
+        {
+            var lan =
+                "M242 842l60-60c48 36 106 60 168 68v86c-86-8-164-42-228-94zM554 850c62-8 120-32 166-68l62 60c-64 52-142 86-228 94v-86zM782 722c36-48 60-104 68-166h86c-8 86-42 162-94 226zM640 512c0 70-58 128-128 128s-128-58-128-128 58-128 128-128 128 58 128 128zM174 554c8 62 32 120 68 166l-60 62c-52-64-86-142-94-228h86zM242 302c-36 48-60 106-68 168h-86c8-86 42-164 94-228zM850 470c-8-62-32-120-68-168l60-60c52 64 86 142 94 228h-86zM782 182l-60 60c-48-36-106-60-168-68v-86c86 8 164 42 228 94zM470 174c-62 8-120 32-168 68l-60-60c64-52 142-86 228-94v86z";
+            var converter = TypeDescriptor.GetConverter(typeof(Geometry));
+            var geometry = (Geometry)converter.ConvertFrom(lan);
+            TileBrush bsh =
+                new DrawingBrush(new GeometryDrawing(ControlsHelper.Brush, new Pen(Brushes.Transparent, 2), geometry));
+            bsh.Stretch = Stretch.Fill;
+            return bsh;
+        }
+        private void Thumb_DragDelta(object sender, DragDeltaEventArgs e)
+        {
+            if (designerItem != null && canvas != null)
+            {
+                var currentPoint = Mouse.GetPosition(canvas);
+                var deltaVector = Point.Subtract(currentPoint, centerPoint);
+
+                var angle = Vector.AngleBetween(startVector, deltaVector);
+
+                var rotateTransform = designerItem.RenderTransform as RotateTransform;
+                rotateTransform.Angle = initialAngle + Math.Round(angle, 0);
+                designerItem.InvalidateMeasure();
+            }
+        }
+
+        private void Thumb_DragStarted(object sender, DragStartedEventArgs e)
+        {
+            var thumb = sender as Thumb;
+            designerItem = AdornedElement as FrameworkElement;
+            canvas = VisualTreeHelper.GetParent(designerItem) as Canvas;
+            if (canvas != null)
+            {
+                centerPoint = designerItem.TranslatePoint(
+                    new Point(designerItem.Width * designerItem.RenderTransformOrigin.X,
+                        designerItem.Height * designerItem.RenderTransformOrigin.Y),
+                    canvas);
+
+                var startPoint = Mouse.GetPosition(canvas);
+                startVector = Point.Subtract(startPoint, centerPoint);
+
+                rotateTransform = designerItem.RenderTransform as RotateTransform;
+                if (rotateTransform == null)
+                {
+                    designerItem.RenderTransform = new RotateTransform(0);
+                    initialAngle = 0;
+                }
+                else
+                {
+                    initialAngle = rotateTransform.Angle;
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/Controls/ElementAdorner/TransformThumb.cs b/src/WPFDevelopers.Samples.Shared/Controls/ElementAdorner/TransformThumb.cs
new file mode 100644
index 00000000..34ae92ea
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/Controls/ElementAdorner/TransformThumb.cs
@@ -0,0 +1,40 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPFDevelopers.Samples.Controls
+{
+    public class TransformThumb : ContentControl
+    {
+        static TransformThumb()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(TransformThumb), new FrameworkPropertyMetadata(typeof(TransformThumb)));
+        }
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            IsVisibleChanged += TransformThumb_IsVisibleChanged;
+            CreateAdorner();
+        }
+        void CreateAdorner()
+        {
+            var adornerLayer = AdornerLayer.GetAdornerLayer(this);
+            if (adornerLayer != null)
+            {
+                var adorner = new ElementAdorner(this);
+                adornerLayer.Add(adorner);
+            }
+        }
+        private void TransformThumb_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (e.NewValue is bool isVisible)
+            {
+                if(isVisible)
+                {
+                    CreateAdorner();
+                }
+                
+            }
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/Controls/ElementAdorner/TransformThumb.xaml b/src/WPFDevelopers.Samples.Shared/Controls/ElementAdorner/TransformThumb.xaml
new file mode 100644
index 00000000..d9d5d735
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/Controls/ElementAdorner/TransformThumb.xaml
@@ -0,0 +1,26 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers">
+
+    <Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:TransformThumb}">
+        <Setter Property="MinHeight" Value="20" />
+        <Setter Property="MinWidth" Value="30" />
+        <Setter Property="Height" Value="100" />
+        <Setter Property="Width" Value="50" />
+        <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:TransformThumb}">
+                    <ContentPresenter
+                        x:Name="PART_ContentPresenter"
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        Content="{TemplateBinding Content}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml
index 48c0cf76..926b8970 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml
@@ -36,8 +36,9 @@
                     Margin="10,0"
                     wd:Badge.FontSize="12"
                     wd:Badge.IsShow="{Binding ElementName=MyBadgeToggleButton, Path=IsChecked}"
-                    wd:Badge.Text="3"
+                    wd:Badge.Text="{Binding Text,RelativeSource={RelativeSource AncestorType=UserControl}}"
                     Content="Success"
+                    Click="myButton_Click" 
                     Style="{DynamicResource WD.SuccessDefaultButton}" />
                 <Button
                     Width="100"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml.cs
index bd32c9d3..4612fc67 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows.Controls;
+using System.Windows;
+using System.Windows.Controls;
 
 namespace WPFDevelopers.Samples.ExampleViews
 {
@@ -7,9 +8,23 @@ namespace WPFDevelopers.Samples.ExampleViews
     /// </summary>
     public partial class BadgeExample : UserControl
     {
+        public string Text
+        {
+            get { return (string)GetValue(TextProperty); }
+            set { SetValue(TextProperty, value); }
+        }
+
+        public static readonly DependencyProperty TextProperty =
+            DependencyProperty.Register("Text", typeof(string), typeof(BadgeExample), new PropertyMetadata("3"));
+
         public BadgeExample()
         {
             InitializeComponent();
         }
+
+        private void myButton_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            Text = "10";
+        }
     }
 }
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/IPEditBoxExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/IPEditBoxExample.xaml
new file mode 100644
index 00000000..3be14a28
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/IPEditBoxExample.xaml
@@ -0,0 +1,40 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.IPEditBoxExample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <controls:CodeViewer>
+        <Grid Width="200" Margin="10">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="10" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="10" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="10" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <wd:IPEditBox x:Name="myIPEditBox" Text="{Binding ElementName=MyIp, Path=Text, Mode=TwoWay}" />
+            <TextBox
+                Name="MyIp"
+                Grid.Row="2"
+                wd:ElementHelper.Watermark="请输入IP地址" />
+            <Button
+                Grid.Row="4"
+                Click="Button_Click"
+                Content="获取IP地址" />
+            <TextBox Grid.Row="6" />
+        </Grid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/BadgeExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/BadgeExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/IPEditBoxExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/IPEditBoxExample.xaml.cs
new file mode 100644
index 00000000..70eb50c5
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/IPEditBoxExample.xaml.cs
@@ -0,0 +1,23 @@
+using System.Windows;
+using System.Windows.Controls;
+using WPFDevelopers.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// BarrageExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class IPEditBoxExample : UserControl
+    {
+        public IPEditBoxExample()
+        {
+            InitializeComponent();
+        }
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            var text = myIPEditBox.Text;
+            if (!string.IsNullOrWhiteSpace(text))
+                Message.Push(text, MessageBoxImage.Information);
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Map/AMapTitleLayer.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/Map/AMapTitleLayer.cs
index d30cb641..2734543a 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Map/AMapTitleLayer.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Map/AMapTitleLayer.cs
@@ -5,9 +5,11 @@ namespace WPFDevelopers.Samples.ExampleViews
 {
     public class AMapTitleLayer : MapTileLayer
     {
+        private AMapTileSource tileSource;
         public AMapTitleLayer()
         {
-            TileSource = new AMapTileSource();
+            tileSource = new AMapTileSource();
+            TileSource = tileSource;
         }
 
         public string UriFormat
@@ -15,13 +17,23 @@ public string UriFormat
             get { return TileSource.UriFormat; }
             set { TileSource.UriFormat = value; }
         }
+        public void UpdateTileSourceStyle(int style)
+        {
+            tileSource.UpdateStyle(style);
+        }
     }
     public class AMapTileSource : TileSource
     {
+        private int style = 7;
         public override Uri GetUri(int x, int y, int zoomLevel)
         {
-            string url = string.Format("http://wprd01.is.autonavi.com/appmaptile?x={0}&y={1}&z={2}&lang=zh_cn&size=1&scl=1&style=7", x, y, zoomLevel);
+            string url = string.Format("http://wprd01.is.autonavi.com/appmaptile?x={0}&y={1}&z={2}&lang=zh_cn&size=1&scl=1&style={3}", x, y, zoomLevel, style);
             return new Uri(url, UriKind.Absolute);
         }
+        public void UpdateStyle(int newStyle)
+        {
+            if (newStyle == style) return;
+            style = newStyle;
+        }
     }
 }
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Map/BingAMapExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Map/BingAMapExample.xaml
index 3ab54fd1..87f35deb 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Map/BingAMapExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Map/BingAMapExample.xaml
@@ -1,24 +1,35 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.BingAMapExample"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:map="clr-namespace:Microsoft.Maps.MapControl.WPF;assembly=Microsoft.Maps.MapControl.WPF"
-             xmlns:mapOverlays="clr-namespace:Microsoft.Maps.MapControl.WPF.Overlays;assembly=Microsoft.Maps.MapControl.WPF"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.BingAMapExample"
+    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:map="clr-namespace:Microsoft.Maps.MapControl.WPF;assembly=Microsoft.Maps.MapControl.WPF"
+    xmlns:mapOverlays="clr-namespace:Microsoft.Maps.MapControl.WPF.Overlays;assembly=Microsoft.Maps.MapControl.WPF"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:sys="clr-namespace:System;assembly=System"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <UserControl.Resources>
-        <LinearGradientBrush x:Key="MainColor" EndPoint="0.5,1" StartPoint="0.5,0">
-            <GradientStop Color="#FF020621" Offset="0"/>
-            <GradientStop Color="#FF364BD8" Offset="1"/>
-            <GradientStop Color="#FF5A6BD8" Offset="0.499"/>
+        <LinearGradientBrush x:Key="MainColor" StartPoint="0.5,0" EndPoint="0.5,1">
+            <GradientStop Offset="0" Color="#FF020621" />
+            <GradientStop Offset="1" Color="#FF364BD8" />
+            <GradientStop Offset="0.499" Color="#FF5A6BD8" />
         </LinearGradientBrush>
         <ControlTemplate x:Key="CarTemplate" TargetType="map:Pushpin">
             <Grid ToolTip="物资车辆">
-                <Ellipse Width="35" Height="35" Fill="White" StrokeThickness="3" Stroke="Red"/>
-                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/AMap/Car2.png" Width="25" Height="25"/>
+                <Ellipse
+                    Width="35"
+                    Height="35"
+                    Fill="White"
+                    Stroke="Red"
+                    StrokeThickness="3" />
+                <Image
+                    Width="25"
+                    Height="25"
+                    Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/AMap/Car2.png" />
             </Grid>
 
         </ControlTemplate>
@@ -26,25 +37,38 @@
         <SineEase x:Key="SineOut" EasingMode="EaseOut" />
 
         <Storyboard x:Key="AnimateRound" RepeatBehavior="Forever">
-            <DoubleAnimation Storyboard.TargetProperty="ScaleX" Storyboard.TargetName="Scale"
-                             Duration="0:0:01" To="2" 
-                             EasingFunction="{StaticResource WD.SineEaseOut}" />
-            <DoubleAnimation Storyboard.TargetProperty="ScaleY" Storyboard.TargetName="Scale"
-                             Duration="0:0:01" To="2" 
-                             EasingFunction="{StaticResource WD.SineEaseOut}" />
-            <DoubleAnimation Storyboard.TargetProperty="Opacity"  
-                             Duration="0:0:01" To="0" 
-                             EasingFunction="{StaticResource WD.SineEaseOut}" />
+            <DoubleAnimation
+                EasingFunction="{StaticResource WD.SineEaseOut}"
+                Storyboard.TargetName="Scale"
+                Storyboard.TargetProperty="ScaleX"
+                To="2"
+                Duration="0:0:01" />
+            <DoubleAnimation
+                EasingFunction="{StaticResource WD.SineEaseOut}"
+                Storyboard.TargetName="Scale"
+                Storyboard.TargetProperty="ScaleY"
+                To="2"
+                Duration="0:0:01" />
+            <DoubleAnimation
+                EasingFunction="{StaticResource WD.SineEaseOut}"
+                Storyboard.TargetProperty="Opacity"
+                To="0"
+                Duration="0:0:01" />
         </Storyboard>
         <Style x:Key="alarmStyle" TargetType="map:Pushpin">
-            <Setter Property="PositionOrigin" Value="Center"/>
-            <Setter Property="Width" Value="60"/>
-            <Setter Property="Height" Value="60"/>
+            <Setter Property="PositionOrigin" Value="Center" />
+            <Setter Property="Width" Value="60" />
+            <Setter Property="Height" Value="60" />
+            <Setter Property="ToolTip" Value="青州市" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="map:Pushpin">
                         <Grid>
-                            <Ellipse Height="40" Width="40" Fill="Red" RenderTransformOrigin="0.5,0.5">
+                            <Ellipse
+                                Width="40"
+                                Height="40"
+                                Fill="Red"
+                                RenderTransformOrigin="0.5,0.5">
                                 <Ellipse.OpacityMask>
                                     <RadialGradientBrush>
                                         <GradientStop Offset="0" Color="Transparent" />
@@ -52,20 +76,21 @@
                                     </RadialGradientBrush>
                                 </Ellipse.OpacityMask>
                                 <Ellipse.RenderTransform>
-                                    <ScaleTransform x:Name="Scale"/>
+                                    <ScaleTransform x:Name="Scale" />
                                 </Ellipse.RenderTransform>
                                 <Ellipse.Triggers>
                                     <EventTrigger RoutedEvent="Loaded">
-                                        <BeginStoryboard Storyboard="{StaticResource AnimateRound}">
-                                        </BeginStoryboard>
+                                        <BeginStoryboard Storyboard="{StaticResource AnimateRound}" />
                                     </EventTrigger>
                                 </Ellipse.Triggers>
                             </Ellipse>
-                            <Viewbox Width="30" Height="30" 
-                                     VerticalAlignment="Top" 
-                                     HorizontalAlignment="Center"
-                                     Margin="20,0,0,0">
-                                <Path Data="{StaticResource WD.FlagGeometry}" Fill="Orange"/>
+                            <Viewbox
+                                Width="30"
+                                Height="30"
+                                Margin="20,0,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Top">
+                                <Path Data="{StaticResource WD.FlagGeometry}" Fill="Orange" />
                             </Viewbox>
                         </Grid>
                     </ControlTemplate>
@@ -75,105 +100,165 @@
     </UserControl.Resources>
     <controls:CodeViewer>
         <Grid>
-            <map:Map x:Name="map" ZoomLevel="5" Center="39.9132801985722,116.392009995601"
-                  CredentialsProvider="AgXB7m7fVYxKpjEZV9rGdrRPvLgawYhi4Wvw99kk4RDspoalC3B_vQ8GKJAoxrve">
-            <map:Map.Mode>
-                <map:MercatorMode/>
-            </map:Map.Mode>
-            <local:AMapTitleLayer/>
-            <map:MapItemsControl ItemsSource="{Binding PushpinArray,RelativeSource={RelativeSource AncestorType=local:BingAMapExample}}">
-                <map:MapItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <map:Pushpin Location="{Binding Location}" Cursor="Hand" 
-                                     MouseDown="Pushpin_MouseDown"
-                                     ToolTip="{Binding Title}"
-                                         Background="Red">
-                            <TextBlock Text="{Binding ID}"/>
-                        </map:Pushpin>
-                    </DataTemplate>
-                </map:MapItemsControl.ItemTemplate>
-            </map:MapItemsControl>
-            <map:Pushpin Location="36.6797276003243,118.495410536117" Style="{StaticResource alarmStyle}"/>
-            <Canvas Width="50" Height="80" 
-              map:MapLayer.Position="31.9121578992881,107.233555852083" 
-              map:MapLayer.PositionOrigin="BottomCenter" Opacity="0.7">
-                <Path Data="M 0,0 L 50,0 50,50 25,80 0,50 0,0" Fill="ForestGreen" Stroke="Wheat" StrokeThickness="2" />
-                <TextBlock FontSize="10" Foreground="White" Padding="10" TextAlignment="Center">
-                        这里是 <LineBreak />
-                        四川 <LineBreak />
-                        通江县 <LineBreak />
-                </TextBlock>
-            </Canvas>
-            <map:MapLayer x:Name="CarLayer"/>
-        </map:Map>
-
-        <DockPanel>
-            <Grid DockPanel.Dock="Top">
-                <Path Data="M75.811064,0 L275.81107,0 275.81107,39.999999 267.12714,39.999999 267.12798,40.000499 67.127973,40.000499 0,0.00050140842 75.811064,0.00050140842 z"
-              Width="200" Height="30" Stretch="Fill" Opacity=".8" Stroke="#FFCCFEFF" StrokeThickness="1.5" Fill="{StaticResource MainColor}">
-                    <Path.RenderTransform>
-                        <SkewTransform AngleX="-40"/>
-                    </Path.RenderTransform>
-                </Path>
-                <TextBlock Text="预警指挥平台" Foreground="White" 
-                           VerticalAlignment="Center" HorizontalAlignment="Center"
-                           FontSize="16" FontWeight="Black"/>
-            </Grid>
-            <Grid DockPanel.Dock="Left" Width="200"
-                  HorizontalAlignment="Left" >
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition/>
-                    <RowDefinition Height="Auto"/>
-                </Grid.RowDefinitions>
-                <Rectangle Grid.RowSpan="3" Fill="#FF364BD8" Opacity=".8" Stroke="#FFCCFEFF" StrokeThickness="1.5"/>
-                <TextBlock Text="数据信息" FontSize="16" Foreground="White" Margin="10,10,0,0"/>
-                <ItemsControl ItemsSource="{Binding PushpinArray,RelativeSource={RelativeSource AncestorType=local:BingAMapExample}}"
-                              Margin="4,10" Grid.Row="1">
-                    <ItemsControl.ItemTemplate>
+            <map:Map
+                x:Name="map"
+                Center="39.9132801985722,116.392009995601"
+                CredentialsProvider="AgXB7m7fVYxKpjEZV9rGdrRPvLgawYhi4Wvw99kk4RDspoalC3B_vQ8GKJAoxrve"
+                ZoomLevel="5">
+                <map:Map.Mode>
+                    <map:MercatorMode />
+                </map:Map.Mode>
+                <map:MapItemsControl ItemsSource="{Binding PushpinArray, RelativeSource={RelativeSource AncestorType=local:BingAMapExample}}">
+                    <map:MapItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Grid Margin="4" x:Name="PART_Grid"
-                                  MouseLeftButtonDown="PART_Grid_MouseLeftButtonDown"
-                                  Tag="{Binding ID}">
-                                <Grid.Resources>
-                                    <Style TargetType="TextBlock">
-                                        <Setter Property="Foreground" Value="White"/>
-                                        <Setter Property="FontSize" Value="16"/>
-                                    </Style>
-                                </Grid.Resources>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <Ellipse Width="20" Height="20" Fill="OrangeRed"/>
-                                <TextBlock Text="{Binding ID}" HorizontalAlignment="Center"/>
-                                <TextBlock Margin="4,0" Grid.Column="1" Text="{Binding Title}"/>
-                            </Grid>
-                            <DataTemplate.Triggers>
-                                <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Background" TargetName="PART_Grid" Value="#FF020621"/>
-                                </Trigger>
-                            </DataTemplate.Triggers>
+                            <map:Pushpin
+                                Background="Red"
+                                Cursor="Hand"
+                                Location="{Binding Location}"
+                                MouseDown="Pushpin_MouseDown"
+                                ToolTip="{Binding Title}">
+                                <TextBlock Text="{Binding ID}" />
+                            </map:Pushpin>
                         </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
-                <Button Content="物资轨迹" Click="BtnCar_Click" Grid.Row="2" Height="40" Style="{StaticResource WD.PrimaryButton}"/>
-            </Grid>
-        </DockPanel>
+                    </map:MapItemsControl.ItemTemplate>
+                </map:MapItemsControl>
+                <map:Pushpin Location="36.6797276003243,118.495410536117" Style="{StaticResource alarmStyle}" />
+                <Canvas
+                    Width="50"
+                    Height="80"
+                    map:MapLayer.Position="31.9121578992881,107.233555852083"
+                    map:MapLayer.PositionOrigin="BottomCenter"
+                    Opacity="0.7">
+                    <Path
+                        Data="M 0,0 L 50,0 50,50 25,80 0,50 0,0"
+                        Fill="ForestGreen"
+                        Stroke="Wheat"
+                        StrokeThickness="2" />
+                    <TextBlock
+                        Padding="10"
+                        FontSize="10"
+                        Foreground="White"
+                        TextAlignment="Center">
+                        这里是<LineBreak />
+                        四川<LineBreak />
+                        通江县<LineBreak />
+                    </TextBlock>
+                </Canvas>
+                <map:MapLayer x:Name="CarLayer" />
+            </map:Map>
+
+            <DockPanel>
+                <Grid DockPanel.Dock="Top">
+                    <Path
+                        Width="200"
+                        Height="30"
+                        Data="M75.811064,0 L275.81107,0 275.81107,39.999999 267.12714,39.999999 267.12798,40.000499 67.127973,40.000499 0,0.00050140842 75.811064,0.00050140842 z"
+                        Fill="{StaticResource MainColor}"
+                        Opacity=".8"
+                        Stretch="Fill"
+                        Stroke="#FFCCFEFF"
+                        StrokeThickness="1.5">
+                        <Path.RenderTransform>
+                            <SkewTransform AngleX="-40" />
+                        </Path.RenderTransform>
+                    </Path>
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        FontWeight="Black"
+                        Foreground="White"
+                        Text="预警信息平台" />
+                </Grid>
+                <Grid
+                    Width="200"
+                    HorizontalAlignment="Left"
+                    DockPanel.Dock="Left">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Rectangle
+                        Grid.RowSpan="3"
+                        Fill="#FF364BD8"
+                        Opacity=".8"
+                        Stroke="#FFCCFEFF"
+                        StrokeThickness="1.5" />
+                    <TextBlock
+                        Margin="10,10,0,0"
+                        FontSize="16"
+                        Foreground="White"
+                        Text="数据信息" />
+                    <ItemsControl
+                        Grid.Row="1"
+                        Margin="4,10"
+                        ItemsSource="{Binding PushpinArray, RelativeSource={RelativeSource AncestorType=local:BingAMapExample}}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Grid
+                                    x:Name="PART_Grid"
+                                    Margin="4"
+                                    MouseLeftButtonDown="PART_Grid_MouseLeftButtonDown"
+                                    Tag="{Binding ID}">
+                                    <Grid.Resources>
+                                        <Style TargetType="TextBlock">
+                                            <Setter Property="Foreground" Value="White" />
+                                            <Setter Property="FontSize" Value="16" />
+                                        </Style>
+                                    </Grid.Resources>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+                                    <Ellipse
+                                        Width="20"
+                                        Height="20"
+                                        Fill="OrangeRed" />
+                                    <TextBlock HorizontalAlignment="Center" Text="{Binding ID}" />
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        Margin="4,0"
+                                        Text="{Binding Title}" />
+                                </Grid>
+                                <DataTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter TargetName="PART_Grid" Property="Background" Value="#FF020621" />
+                                    </Trigger>
+                                </DataTemplate.Triggers>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                    <Button
+                        Grid.Row="2"
+                        Height="40"
+                        Click="BtnCar_Click"
+                        Content="物资轨迹"
+                        Style="{StaticResource WD.PrimaryButton}" />
+                </Grid>
+
+            </DockPanel>
+            <ComboBox
+                Width="120"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                DisplayMemberPath="Value"
+                ItemsSource="{Binding MapStyleDic, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                SelectedIndex="1"
+                SelectedValuePath="Key"
+                SelectionChanged="StyleComboBox_SelectionChanged" />
         </Grid>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Map/BingAMapExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Map/BingAMapExample.xaml.cs" 
-                CodeType="CSharp"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Map/AMapTitleLayer.cs" 
-                CodeType="CSharp" Haader="TitleLayer"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Map/PushpinModel.cs" 
-                CodeType="CSharp" Haader="Pushpin"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Map/BingAMapExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Map/BingAMapExample.xaml.cs" CodeType="CSharp" />
+            <controls:SourceCodeModel
+                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Map/AMapTitleLayer.cs"
+                CodeType="CSharp"
+                Haader="TitleLayer" />
+            <controls:SourceCodeModel
+                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Map/PushpinModel.cs"
+                CodeType="CSharp"
+                Haader="Pushpin" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Map/BingAMapExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/Map/BingAMapExample.xaml.cs
index e8aa5e32..8ec6b7ab 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Map/BingAMapExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Map/BingAMapExample.xaml.cs
@@ -21,6 +21,7 @@ public partial class BingAMapExample : UserControl
         private Pushpin carPushpin;
         private DispatcherTimer dispatcherTimer;
         private List<Location> locations;
+        private AMapTitleLayer aMapTitleLayer;
 
         public IEnumerable PushpinArray
         {
@@ -31,9 +32,27 @@ public IEnumerable PushpinArray
         public static readonly DependencyProperty PushpinArrayProperty =
             DependencyProperty.Register("PushpinArray", typeof(IEnumerable), typeof(BingAMapExample), new PropertyMetadata(null));
 
+
+
+        public Dictionary<int,string> MapStyleDic
+        {
+            get { return (Dictionary<int,string>)GetValue(MapStyleDicProperty); }
+            set { SetValue(MapStyleDicProperty, value); }
+        }
+
+        public static readonly DependencyProperty MapStyleDicProperty =
+            DependencyProperty.Register("MapStyleDic", typeof(Dictionary<int,string>), typeof(BingAMapExample), new PropertyMetadata());
+
+
+
         public BingAMapExample()
         {
             InitializeComponent();
+            MapStyleDic = new Dictionary<int, string>();
+            MapStyleDic.Add(6, "卫星地图");
+            MapStyleDic.Add(7, "标准地图");
+            MapStyleDic.Add(8, "主道路名称");
+
             var pushpins = new List<PushpinModel>();
             pushpins.Add(new PushpinModel { ID = 1, Location = new Location(39.8151940395589, 116.411970893135), Title = "和义东里社区" });
             pushpins.Add(new PushpinModel { ID = 2, Location = new Location(39.9094878843105, 116.33299936282), Title = "中国水科院南小区" });
@@ -106,9 +125,8 @@ private void BtnCar_Click(object sender, RoutedEventArgs e)
         }
         private void Map_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            Point mousePosition = e.GetPosition(this);
-            Location pinLocation = this.map.ViewportPointToLocation(mousePosition);
-
+            var mousePosition = e.GetPosition(this);
+            var pinLocation = this.map.ViewportPointToLocation(mousePosition);
             //Console.WriteLine(pinLocation);
 
         }
@@ -127,5 +145,18 @@ private void PART_Grid_MouseLeftButtonDown(object sender, MouseButtonEventArgs e
             map.Center = model.Location;
             map.ZoomLevel = 16;
         }
+
+        private void StyleComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var combobox = sender as ComboBox;
+            if (combobox == null) return;
+            var select = (int)combobox.SelectedValue;
+            if(aMapTitleLayer != null)
+                map.Children.Remove(aMapTitleLayer);
+            aMapTitleLayer = new AMapTitleLayer();
+            aMapTitleLayer.UpdateTileSourceStyle(select);
+            map.Children.Insert(0, aMapTitleLayer);
+        }
+
     }
 }
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ScreenCutExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ScreenCutExample.xaml.cs
index 456e784d..e492a0f7 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ScreenCutExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ScreenCutExample.xaml.cs
@@ -38,6 +38,15 @@ private void Button_Click(object sender, RoutedEventArgs e)
                     App.CurrentMainWindow.WindowState = WindowState.Minimized;
                     //Thread.Sleep(1000);
                 }
+
+                #region 无App.xaml情况，需引入资源文件
+                //如没有App.xaml文件需要使用截图控件需要按照以下方式传入资源文件，具体查看
+                //https://github.com/WPFDevelopersOrg/WPFDevelopers/issues/68
+                //ResourceDictionary resources = new ResourceDictionary();
+                //resources.Source = new Uri("pack://application:,,,/MyResources.xaml");
+                //screenCapturer = new ScreenCapture(resources: resources);
+
+                #endregion
                 screenCapturer = new ScreenCapture();
                 screenCapturer.SnapCompleted += ScreenCapturer_SnapCompleted;
                 screenCapturer.SnapCanceled += ScreenCapturer_SnapCanceled;
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ThumbDragAndAngleExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ThumbDragAndAngleExample.xaml.cs
deleted file mode 100644
index c067a22e..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ThumbDragAndAngleExample.xaml.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Windows.Controls;
-using System.Windows.Documents;
-using WPFDevelopers.Samples.Controls;
-
-namespace WPFDevelopers.Samples.ExampleViews
-{
-    /// <summary>
-    /// ThumbDragAndAngleExample.xaml 的交互逻辑
-    /// </summary>
-    public partial class ThumbDragAndAngleExample : UserControl
-    {
-        public ThumbDragAndAngleExample()
-        {
-            InitializeComponent();
-            Loaded += delegate
-            {
-                var al = AdornerLayer.GetAdornerLayer(_border);
-                al.Add(new ElementAdorner(_border));
-            };
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml
new file mode 100644
index 00000000..e769c22b
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml
@@ -0,0 +1,33 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.TimePickerExample"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <controls:CodeViewer>
+        <UniformGrid>
+            <wd:TimePicker
+                Width="200"
+                VerticalAlignment="Center"
+                wd:ElementHelper.Watermark="请选择任意时间" />
+            <wd:TimePicker
+                Width="200"
+                VerticalAlignment="Center"
+                IsCurrentTime="True" />
+            <wd:TimePicker
+                Width="200"
+                VerticalAlignment="Center"
+                SelectedTime="2023-05-06 23:59:59" />
+        </UniformGrid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/TimePickerExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/TimePickerExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml.cs
new file mode 100644
index 00000000..35be815c
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// TimePickerExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class TimePickerExample : UserControl
+    {
+        public TimePickerExample()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ThumbDragAndAngleExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/TransformThumbExample.xaml
similarity index 59%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/ThumbDragAndAngleExample.xaml
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/TransformThumbExample.xaml
index bfb3f19c..0b6dd36b 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ThumbDragAndAngleExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/TransformThumbExample.xaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="WPFDevelopers.Samples.ExampleViews.ThumbDragAndAngleExample"
+    x:Class="WPFDevelopers.Samples.ExampleViews.TransformThumbExample"
     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"
@@ -10,8 +10,7 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <controls:CodeViewer>
-        <Canvas x:Name="_CanvasMain" Background="ForestGreen">
-
+        <Canvas x:Name="CanvasMain" Background="ForestGreen">
             <TextBlock
                 Canvas.Left="296"
                 Canvas.Top="48"
@@ -24,26 +23,25 @@
                 FontSize="20"
                 Foreground="White"
                 Text="QQ群：458041663" />
-            <Border
-                x:Name="_border"
+            <controls:TransformThumb
                 Canvas.Left="305"
                 Canvas.Top="205"
                 Width="280"
-                Height="100"
-                BorderBrush="White"
-                BorderThickness="2"
-                RenderTransformOrigin="0.5,0.5">
-                <Grid>
-                    <controls:ThumbAngle DataContext="{Binding ElementName=_border}" />
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontSize="40"
-                        Foreground="White"
-                        Text="WPF开发者" />
-
-                </Grid>
-            </Border>
+                Height="100">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="40"
+                    Foreground="White"
+                    Text="WPF开发者" />
+            </controls:TransformThumb>
+            <controls:TransformThumb
+                Canvas.Left="100"
+                Canvas.Top="200"
+                Width="50"
+                Height="50">
+                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Chat/UserImages/yanjinhua.png" />
+            </controls:TransformThumb>
             <TextBlock
                 Canvas.Left="295"
                 Canvas.Top="368"
@@ -54,16 +52,20 @@
                 Text="微信公众号：WPFDevelopers" />
         </Canvas>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ThumbDragAndAngleExample.xaml" CodeType="Xaml" />
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ThumbDragAndAngleExample.xaml.cs" CodeType="CSharp" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/TransformThumbExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/TransformThumbExample.xaml.cs" CodeType="CSharp" />
             <controls:SourceCodeModel
                 CodeSource="/WPFDevelopers.SamplesCode;component/Controls/ElementAdorner/ElementAdorner.cs"
                 CodeType="CSharp"
                 Haader="ElementAdorner" />
             <controls:SourceCodeModel
-                CodeSource="/WPFDevelopers.SamplesCode;component/Controls/ElementAdorner/ThumbAngle.cs"
+                CodeSource="/WPFDevelopers.SamplesCode;component/Controls/ElementAdorner/TransformThumb.cs"
                 CodeType="CSharp"
-                Haader="ThumbAngle" />
+                Haader="TransformThumb" />
+            <controls:SourceCodeModel
+                CodeSource="/WPFDevelopers.SamplesCode;component/Controls/ElementAdorner/TransformThumb.xaml"
+                CodeType="Xaml"
+                Haader="TransformThumb.xaml" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/TransformThumbExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/TransformThumbExample.xaml.cs
new file mode 100644
index 00000000..82a762eb
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/TransformThumbExample.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// TransformThumbExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class TransformThumbExample : UserControl
+    {
+        public TransformThumbExample()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index 851fa925..457063ab 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -19,7 +19,7 @@ public enum MenuEnum
         CropAvatar,
         AnimationAudio,
         AMap,
-        ThumbAngle,
+        TransformThumb,
         VerifyCode,
         CircularMenu,
         ChatEmoji,
@@ -77,6 +77,8 @@ public enum MenuEnum
         PathIcon,
         NumericBox,
         ColorPicker,
+        IPEditBox,
+        TimePicker,
         VirtualizingWrapPanel,
         AcrylicBlur,
         TaskbarInfo
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index 09cd2d7d..95e5ceaf 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -126,8 +126,8 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.AMap:
                     ControlPanel = new BingAMapExample();
                     break;
-                case MenuEnum.ThumbAngle:
-                    ControlPanel = new ThumbDragAndAngleExample();
+                case MenuEnum.TransformThumb:
+                    ControlPanel = new TransformThumbExample();
                     break;
                 case MenuEnum.VerifyCode:
                     ControlPanel = new VerifyCodeExample();
@@ -309,6 +309,12 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.ColorPicker:
                     ControlPanel = new ColorPickerExample();
                     break;
+                case MenuEnum.IPEditBox:
+                    ControlPanel = new IPEditBoxExample();
+                    break;
+                case MenuEnum.TimePicker:
+                    ControlPanel = new TimePickerExample();
+                    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 6f64919b..8739ef24 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -27,6 +27,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Drawing\DrawingPanel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ElementAdorner\ElementAdorner.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ElementAdorner\ThumbAngle.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\ElementAdorner\TransformThumb.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Others\FireControl.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\PieControl\PieControl.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\PieControl\PieSegmentModel.cs" />
@@ -181,6 +182,9 @@
       <SubType>Code</SubType>
       <DependentUpon>EdgeLightExample.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\IPEditBoxExample.xaml.cs">
+      <DependentUpon>IPEditBoxExample.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\LineChartExample.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>LineChartExample.xaml</DependentUpon>
@@ -390,9 +394,12 @@
       <SubType>Code</SubType>
       <DependentUpon>ThermometerExample.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ThumbDragAndAngleExample.xaml.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\TimePickerExample.xaml.cs">
+      <DependentUpon>TimePickerExample.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\TransformThumbExample.xaml.cs">
       <SubType>Code</SubType>
-      <DependentUpon>ThumbDragAndAngleExample.xaml</DependentUpon>
+      <DependentUpon>TransformThumbExample.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\TimeLineExample.xaml.cs">
       <SubType>Code</SubType>
@@ -463,6 +470,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\ElementAdorner\TransformThumb.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Controls\Others\OtherControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -627,6 +638,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\IPEditBoxExample.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\LineChartExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -856,7 +871,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\ThumbDragAndAngleExample.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\TimePickerExample.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\TransformThumbExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj b/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
index 7734d0f6..938f05b2 100644
--- a/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
+++ b/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
@@ -31,9 +31,6 @@
 			<Install>false</Install>
 		</BootstrapperPackage>
 	</ItemGroup>
-	<ItemGroup>
-	  <PackageReference Include="WPFDevelopers" Version="1.1.0.2-preview2" />
-	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\WPFDevelopers.ico">
 			<Link>WPFDevelopers.ico</Link>
@@ -175,6 +172,7 @@
 		</Resource>
 	</ItemGroup>
 	<ItemGroup>
+		<ProjectReference Include="..\WPFDevelopers.Net40\WPFDevelopers.Net40.csproj" />
 		<ProjectReference Include="..\WPFDevelopers.SamplesCode\WPFDevelopers.SamplesCode.csproj" />
 	</ItemGroup>
 	<PropertyGroup>
diff --git a/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj b/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
index bac8f4b1..ddff65be 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-preview2" />
+	  <PackageReference Include="WPFDevelopers" Version="1.1.0.2-preview3" />
 	</ItemGroup>
 	
 	<ItemGroup>
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index 019b1b5b..eaf45a4c 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -83,7 +83,6 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\StarrySkyExample.xaml.cs" Link="ExampleViews\StarrySkyExample.xaml.cs" DependentUpon="StarrySkyExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\TaskbarItemInfoExample.xaml.cs" Link="ExampleViews\TaskbarItemInfoExample.xaml.cs" DependentUpon="TaskbarItemInfoExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ThermometerExample.xaml.cs" Link="ExampleViews\ThermometerExample.xaml.cs" DependentUpon="ThermometerExample.xaml" />
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ThumbDragAndAngleExample.xaml.cs" Link="ExampleViews\ThumbDragAndAngleExample.xaml.cs" DependentUpon="ThumbDragAndAngleExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\TimeLineExample.xaml.cs" Link="ExampleViews\TimeLineExample.xaml.cs" DependentUpon="TimeLineExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\TransitionPanelExample.xaml.cs" Link="ExampleViews\TransitionPanelExample.xaml.cs" DependentUpon="TransitionPanelExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\VerifyCodeExample.xaml.cs" Link="ExampleViews\VerifyCodeExample.xaml.cs" DependentUpon="VerifyCodeExample.xaml" />
@@ -130,6 +129,7 @@
 		<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\ElementAdorner\TransformThumb.cs" Link="Controls\ElementAdorner\TransformThumb.cs" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\CropControl\CropControl.cs" Link="Controls\CropControl\CropControl.cs" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\CropImageExample.xaml.cs" Link="ExampleViews\CropImageExample.xaml.cs" DependentUpon="CropImageExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BadgeExample.xaml.cs" Link="ExampleViews\BadgeExample.xaml.cs" DependentUpon="BadgeExample.xaml" />
@@ -139,6 +139,9 @@
 		<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" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\IPEditBoxExample.xaml.cs" Link="ExampleViews\IPEditBoxExample.xaml.cs" DependentUpon="IPEditBoxExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\IPEditBoxExample.xaml.cs" Link="ExampleViews\TransformThumbExample.xaml.cs" DependentUpon="TransformThumbExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\TimePickerExample.xaml.cs" Link="ExampleViews\TimePickerExample.xaml.cs" DependentUpon="TimePickerExample.xaml" />
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\AboutWindow.xaml">
@@ -358,8 +361,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ThermometerExample.xaml">
 			<Link>ExampleViews\ThermometerExample.xaml</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ThumbDragAndAngleExample.xaml">
-			<Link>ExampleViews\ThumbDragAndAngleExample.xaml</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\TransformThumbExample.xaml">
+			<Link>ExampleViews\TransformThumbExample.xaml</Link>
 		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\TimeLineExample.xaml">
 			<Link>ExampleViews\TimeLineExample.xaml</Link>
@@ -417,6 +420,9 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\Others\OtherControl.xaml">
 			<Link>Controls\Others\OtherControl.xaml</Link>
 		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\ElementAdorner\TransformThumb.xaml">
+			<Link>Controls\ElementAdorner\TransformThumb.xaml</Link>
+		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\ChatEmoji\ChatEmoji.xaml">
 			<Link>Controls\ChatEmoji\ChatEmoji.xaml</Link>
 		</Resource>
@@ -468,5 +474,11 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ColorPickerExample.xaml">
 			<Link>ExampleViews\ColorPickerExample.xaml</Link>
 		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\IPEditBoxExample.xaml">
+			<Link>ExampleViews\IPEditBoxExample.xaml</Link>
+		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\TimePickerExample.xaml">
+			<Link>ExampleViews\TimePickerExample.xaml</Link>
+		</Resource>
 	</ItemGroup>
 </Project>
diff --git a/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs b/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs
index 1a51dadf..631abf17 100644
--- a/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs
+++ b/src/WPFDevelopers.Shared/Controls/Badge/Badge.cs
@@ -1,7 +1,11 @@
 using System;
+using System.ComponentModel;
+using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Documents;
 using System.Windows.Media;
+using System.Xml.Linq;
 using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Controls
@@ -9,12 +13,11 @@ namespace WPFDevelopers.Controls
     public class Badge : Adorner
     {
         public static readonly DependencyProperty TextProperty =
-            DependencyProperty.Register("Text", typeof(string), typeof(Badge), new PropertyMetadata(string.Empty));
+            DependencyProperty.RegisterAttached("Text", typeof(string), typeof(Badge), new PropertyMetadata(string.Empty, OnTextChanged));
 
         public static readonly DependencyProperty FontSizeProperty =
             DependencyProperty.Register("FontSize", typeof(double), typeof(Badge), new PropertyMetadata(10.0d));
 
-
         public static readonly DependencyProperty IsShowProperty =
             DependencyProperty.RegisterAttached("IsShow", typeof(bool), typeof(Badge),
                 new PropertyMetadata(false, OnIsBadgeChanged));
@@ -118,6 +121,21 @@ public static void SetHorizontalOffset(UIElement element, string horizontalOffse
             element.SetValue(HorizontalOffsetProperty, horizontalOffset);
         }
 
+        private static void OnTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is FrameworkElement parent)
+            {
+                var isShow = GetIsShow(parent);
+                if (!isShow) return;
+                var newEventArgs = new DependencyPropertyChangedEventArgs(
+               e.Property,
+               false,
+               isShow);
+                OnIsBadgeChanged(d, newEventArgs);
+            }
+
+        }
+
         private static void OnIsBadgeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             if (e.NewValue is bool isShow && d is FrameworkElement parent)
@@ -140,7 +158,6 @@ private static void OnIsBadgeChanged(DependencyObject d, DependencyPropertyChang
         }
         private static void Parent_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-
             if (e.NewValue is bool isVisible && sender is FrameworkElement parent)
             {
                 var isShow = GetIsShow(parent);
diff --git a/src/WPFDevelopers.Shared/Controls/IPEditBox/IPEditBox.cs b/src/WPFDevelopers.Shared/Controls/IPEditBox/IPEditBox.cs
new file mode 100644
index 00000000..a3f81977
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/IPEditBox/IPEditBox.cs
@@ -0,0 +1,197 @@
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace WPFDevelopers.Controls
+{
+    [TemplatePart(Name = TextBox1TemplateName, Type = typeof(TextBox))]
+    [TemplatePart(Name = TextBox2TemplateName, Type = typeof(TextBox))]
+    [TemplatePart(Name = TextBox3TemplateName, Type = typeof(TextBox))]
+    [TemplatePart(Name = TextBox4TemplateName, Type = typeof(TextBox))]
+    public class IPEditBox : Control
+    {
+        private const string TextBox1TemplateName = "PART_TextBox1";
+        private const string TextBox2TemplateName = "PART_TextBox2";
+        private const string TextBox3TemplateName = "PART_TextBox3";
+        private const string TextBox4TemplateName = "PART_TextBox4";
+        public string Text
+        {
+            get { return (string)GetValue(TextProperty); }
+            set { SetValue(TextProperty, value); }
+        }
+
+        public static readonly DependencyProperty TextProperty =
+            DependencyProperty.Register("Text", typeof(string), typeof(IPEditBox), new PropertyMetadata(string.Empty, OnTextChanged));
+
+        private static void OnTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctrl = d as IPEditBox;
+            if (e.NewValue is string text && !ctrl._isChangingText)
+                ctrl.PasteTextIPTextBox(text);
+        }
+
+        private TextBox _textBox1, _textBox2, _textBox3, _textBox4;
+        private bool _isChangingText = false;
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            _textBox1 = GetTemplateChild(TextBox1TemplateName) as TextBox;
+            if (_textBox1 != null)
+            {
+                _textBox1.TextChanged -= TextBox1_TextChanged;
+                _textBox1.TextChanged += TextBox1_TextChanged;
+                _textBox1.PreviewKeyDown -= TextBox_PreviewKeyDown;
+                _textBox1.PreviewKeyDown += TextBox_PreviewKeyDown;
+                _textBox1.Loaded -= TextBox_Loaded;
+                _textBox1.Loaded += TextBox_Loaded;
+            }
+            _textBox2 = GetTemplateChild(TextBox2TemplateName) as TextBox;
+            if (_textBox2 != null)
+            {
+                _textBox2.TextChanged -= TextBox2_TextChanged;
+                _textBox2.TextChanged += TextBox2_TextChanged;
+                _textBox2.PreviewKeyDown -= TextBox_PreviewKeyDown;
+                _textBox2.PreviewKeyDown += TextBox_PreviewKeyDown;
+                _textBox2.Loaded -= TextBox_Loaded; ;
+                _textBox2.Loaded += TextBox_Loaded;
+            }
+            _textBox3 = GetTemplateChild(TextBox3TemplateName) as TextBox;
+            if (_textBox3 != null)
+            {
+                _textBox3.TextChanged -= TextBox3_TextChanged;
+                _textBox3.TextChanged += TextBox3_TextChanged;
+                _textBox3.PreviewKeyDown -= TextBox_PreviewKeyDown;
+                _textBox3.PreviewKeyDown += TextBox_PreviewKeyDown;
+                _textBox3.Loaded -= TextBox_Loaded;
+                _textBox3.Loaded += TextBox_Loaded;
+            }
+            _textBox4 = GetTemplateChild(TextBox4TemplateName) as TextBox;
+            _textBox4.TextChanged -= TextBox4_TextChanged;
+            _textBox4.TextChanged += TextBox4_TextChanged;
+            _textBox4.PreviewKeyDown -= TextBox_PreviewKeyDown;
+            _textBox4.PreviewKeyDown += TextBox_PreviewKeyDown;
+            _textBox4.Loaded -= TextBox_Loaded;
+            _textBox4.Loaded += TextBox_Loaded;
+
+        }
+
+        private void TextBox1_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (_textBox1.Text.ToString().Length >= 3) _textBox2.Focus();
+            UpdateText();
+        }
+        private void TextBox2_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (_textBox2.Text.ToString().Length >= 3) _textBox3.Focus();
+            UpdateText();
+        }
+
+        private void TextBox3_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (_textBox3.Text.ToString().Length >= 3) _textBox4.Focus();
+            UpdateText();
+        }
+
+        private void TextBox4_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            UpdateText();
+        }
+        void TextBox_Loaded(object sender, RoutedEventArgs e)
+        {
+            CommandManager.AddPreviewExecutedHandler((sender as TextBox), TextBox_PreviewExecuted);
+        }
+        void TextBox_PreviewExecuted(object sender, ExecutedRoutedEventArgs e)
+        {
+            if (e.Command == ApplicationCommands.Paste)
+            {
+                ClipboardHandle();
+                UpdateText();
+                e.Handled = true;
+            }
+            else if (e.Command == ApplicationCommands.Copy)
+            {
+                var ip = $"{_textBox1.Text}.{_textBox2.Text}.{_textBox3.Text}.{_textBox4.Text}";
+                Clipboard.SetText(ip);
+                e.Handled = true;
+            }
+        }
+
+        void ClipboardHandle()
+        {
+            var data = Clipboard.GetDataObject();
+            if (data.GetDataPresent(DataFormats.Text))
+            {
+                var text = (string)data.GetData(DataFormats.UnicodeText);
+                PasteTextIPTextBox(text);
+            }
+        }
+
+        void TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyboardDevice.Modifiers.HasFlag(ModifierKeys.Control) && e.Key == Key.V)
+            {
+                ClipboardHandle();
+                _isChangingText = false;
+                e.Handled = true;
+            }
+            else if (e.Key == Key.Delete || e.Key == Key.Back)
+            {
+                _isChangingText = true;
+            }
+            else
+                _isChangingText = false;
+        }
+
+        void PasteTextIPTextBox(string text)
+        {
+            _textBox1.TextChanged -= TextBox1_TextChanged;
+            _textBox2.TextChanged -= TextBox2_TextChanged;
+            _textBox3.TextChanged -= TextBox3_TextChanged;
+            _textBox4.TextChanged -= TextBox4_TextChanged;
+            if (string.IsNullOrWhiteSpace(text))
+            {
+                _textBox1.Text = string.Empty;
+                _textBox2.Text = string.Empty;
+                _textBox3.Text = string.Empty;
+                _textBox4.Text = string.Empty;
+            }
+            else
+            {
+                var strs = text.Split('.');
+                var _textboxBoxes = new TextBox[] { _textBox1, _textBox2, _textBox3, _textBox4 };
+                for (short i = 0; i < _textboxBoxes.Length; i++)
+                {
+                    var str = i < strs.Length ? strs[i] : string.Empty;
+                    _textboxBoxes[i].Text = str;
+                }
+            }
+            _textBox1.TextChanged += TextBox1_TextChanged;
+            _textBox2.TextChanged += TextBox2_TextChanged;
+            _textBox3.TextChanged += TextBox3_TextChanged;
+            _textBox4.TextChanged += TextBox4_TextChanged;
+        }
+        void UpdateText()
+        {
+            var segments = new string[4]
+            {
+                _textBox1.Text.Trim(),
+                _textBox2.Text.Trim(),
+                _textBox3.Text.Trim(),
+                _textBox4.Text.Trim()
+            };
+            var allEmpty = segments.All(string.IsNullOrEmpty);
+            if (allEmpty)
+            {
+                SetValue(TextProperty, string.Empty);
+                return;
+            }
+            var noEmpty = segments.Where(s => !string.IsNullOrWhiteSpace(s));
+            if (noEmpty.Count() != 4) return;
+            var ip = string.Join(".", noEmpty);
+            if (ip != Text)
+                SetValue(TextProperty, ip);
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs b/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs
index 3d8f7708..55c20085 100644
--- a/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs
+++ b/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs
@@ -52,5 +52,6 @@ public enum PackIconKind
         [Description("WD.HomeGeometry")] Home,
         [Description("WD.BreadCrumbBarGeometry")] BreadCrumbBar,
         [Description("WD.UnfoldMoreGeometry")] UnfoldMore,
+        [Description("WD.TimeGeometry")] Time,
     }
 }
diff --git a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCapture.cs b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCapture.cs
index 5eb2a186..b59a6433 100644
--- a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCapture.cs
+++ b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCapture.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
+using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Media.Imaging;
 
 namespace WPFDevelopers.Controls.ScreenCapturer
 {
     public class ScreenCapture
-
     {
         /// <summary>
         /// 截图完成委托
@@ -30,12 +29,19 @@ public class ScreenCapture
         /// </summary>
         private bool copyToClipboard;
         List<ScreenCut> ScreenCuts = new List<ScreenCut>();
-        public ScreenCapture(bool copyToClipboard = true)
+        /// <summary>
+        /// 资源
+        /// </summary>
+        private ResourceDictionary _resources;
+        public ScreenCapture(bool copyToClipboard = true, ResourceDictionary resources = null)
         {
             this.copyToClipboard = copyToClipboard;
             for (var i = 0; i < Screen.AllScreens.Length; i++)
             {
-                ScreenCuts.Add(CaptureScreen(i));
+                var screen = CaptureScreen(i);
+                if(resources != null)
+                    screen.Resources = resources;
+                ScreenCuts.Add(screen);
             }
         }
         private ScreenCut CaptureScreen(int index)
diff --git a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
index f81f65f7..34aaec91 100644
--- a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
+++ b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
@@ -448,11 +448,19 @@ private CroppedBitmap CutBitmap()
             _rectangleTop.Visibility = Visibility.Collapsed;
             _rectangleRight.Visibility = Visibility.Collapsed;
             _rectangleBottom.Visibility = Visibility.Collapsed;
-            var renderTargetBitmap = new RenderTargetBitmap((int)_canvas.Width,
-                (int)_canvas.Height, 96d, 96d, PixelFormats.Default);
+            // 屏幕等比截图需要考虑缩放率进行等比放大canvas
+            var renderTargetBitmap = new RenderTargetBitmap((int)(_canvas.Width * screenDPI.scaleX),
+                (int)(_canvas.Height * screenDPI.scaleY), screenDPI.dpiX, screenDPI.dpiY, PixelFormats.Default);
             renderTargetBitmap.Render(_canvas);
-            return new CroppedBitmap(renderTargetBitmap,
-                new Int32Rect((int)rect.X, (int)rect.Y, (int)rect.Width, (int)rect.Height));
+            // 屏幕等比截图需要考虑缩放率进行等比放大截图区域
+            var realrect = new Int32Rect(
+                (int)(rect.X * screenDPI.scaleX),
+                (int)(rect.Y * screenDPI.scaleY),
+                (int)(rect.Width * screenDPI.scaleX),
+                (int)(rect.Height * screenDPI.scaleY));
+            //return new CroppedBitmap(renderTargetBitmap,
+            //    new Int32Rect((int)rect.X, (int)rect.Y, (int)rect.Width, (int)rect.Height));
+            return new CroppedBitmap(renderTargetBitmap, realrect);
         }
         
         private void ButtonCancel_Click(object sender, RoutedEventArgs e)
diff --git a/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs b/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
new file mode 100644
index 00000000..79e14fb3
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Threading;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+
+namespace WPFDevelopers.Controls
+{
+    [TemplatePart(Name = TimeSelectorTemplateName, Type = typeof(ListBox))]
+    [TemplatePart(Name = EditableTextBoxTemplateName, Type = typeof(TextBox))]
+    [TemplatePart(Name = PopupTemplateName, Type = typeof(Popup))]
+    public class TimePicker : Control
+    {
+        private const string TimeSelectorTemplateName = "PART_TimeSelector";
+        private const string EditableTextBoxTemplateName = "PART_EditableTextBox";
+        private const string PopupTemplateName = "PART_Popup";
+
+        public static readonly DependencyProperty SelectedTimeFormatProperty =
+            DependencyProperty.Register("SelectedTimeFormat", typeof(string), typeof(TimePicker),
+                new PropertyMetadata("HH:mm:ss"));
+
+        public static readonly DependencyProperty MaxDropDownHeightProperty =
+            DependencyProperty.Register("MaxDropDownHeight", typeof(double), typeof(TimePicker),
+                new UIPropertyMetadata(SystemParameters.PrimaryScreenHeight / 3.0, OnMaxDropDownHeightChanged));
+
+        public static readonly DependencyProperty SelectedTimeProperty =
+            DependencyProperty.Register("SelectedTime", typeof(DateTime?), typeof(TimePicker),
+                new PropertyMetadata(null, OnSelectedTimeChanged));
+
+        public static readonly DependencyProperty IsCurrentTimeProperty =
+            DependencyProperty.Register("IsCurrentTime", typeof(bool), typeof(TimePicker), new PropertyMetadata(false));
+
+        private DateTime _date;
+        private Popup _popup;
+        private TextBox _textBox;
+        private TimeSelector _timeSelector;
+
+        static TimePicker()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(TimePicker),
+                new FrameworkPropertyMetadata(typeof(TimePicker)));
+        }
+
+        public string SelectedTimeFormat
+        {
+            get => (string) GetValue(SelectedTimeFormatProperty);
+            set => SetValue(SelectedTimeFormatProperty, value);
+        }
+
+        public DateTime? SelectedTime
+        {
+            get => (DateTime?) GetValue(SelectedTimeProperty);
+            set => SetValue(SelectedTimeProperty, value);
+        }
+
+        public bool IsCurrentTime
+        {
+            get => (bool) GetValue(IsCurrentTimeProperty);
+            set => SetValue(IsCurrentTimeProperty, value);
+        }
+
+        private static void OnMaxDropDownHeightChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctrl = d as TimePicker;
+            if (ctrl != null)
+                ctrl.OnMaxDropDownHeightChanged((double) e.OldValue, (double) e.NewValue);
+        }
+
+        protected virtual void OnMaxDropDownHeightChanged(double oldValue, double newValue)
+        {
+        }
+
+        private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctrl = d as TimePicker;
+            if (ctrl != null && e.NewValue != null)
+            {
+                var dateTime = (DateTime) e.NewValue;
+                if (ctrl._timeSelector != null && dateTime > DateTime.MinValue)
+                    ctrl._timeSelector.SelectedTime = dateTime;
+                else
+                    ctrl._date = dateTime;
+            }
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            _textBox = GetTemplateChild(EditableTextBoxTemplateName) as TextBox;
+            _timeSelector = GetTemplateChild(TimeSelectorTemplateName) as TimeSelector;
+            if (_timeSelector != null)
+            {
+                _timeSelector.SelectedTimeChanged -= TimeSelector_SelectedTimeChanged;
+                _timeSelector.SelectedTimeChanged += TimeSelector_SelectedTimeChanged;
+                if (!SelectedTime.HasValue && IsCurrentTime)
+                {
+                    SelectedTime = DateTime.Now;
+                }
+                else
+                {
+                    SelectedTime = null;
+                    SelectedTime = _date;
+                }
+            }
+
+            _popup = GetTemplateChild(PopupTemplateName) as Popup;
+            if (_popup != null)
+            {
+                _popup.Opened -= Popup_Opened;
+                _popup.Opened += Popup_Opened;
+            }
+        }
+
+        private void Popup_Opened(object sender, EventArgs e)
+        {
+            if (_timeSelector != null)
+            {
+                _timeSelector.SetTime();
+            }
+        }
+
+        private void TimeSelector_SelectedTimeChanged(object sender, RoutedPropertyChangedEventArgs<DateTime?> e)
+        {
+            if (_textBox != null && e.NewValue != null)
+            {
+                _textBox.Text = e.NewValue.Value.ToString(SelectedTimeFormat);
+                SelectedTime = e.NewValue;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelector.cs b/src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelector.cs
new file mode 100644
index 00000000..cc88bed2
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelector.cs
@@ -0,0 +1,208 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Controls
+{
+    [TemplatePart(Name = ListBoxHourTemplateName, Type = typeof(ListBox))]
+    [TemplatePart(Name = ListBoxMinuteTemplateName, Type = typeof(ListBox))]
+    [TemplatePart(Name = ListBoxSecondTemplateName, Type = typeof(ListBox))]
+    public class TimeSelector : Control
+    {
+        private const string ListBoxHourTemplateName = "PART_ListBoxHour";
+        private const string ListBoxMinuteTemplateName = "PART_ListBoxMinute";
+        private const string ListBoxSecondTemplateName = "PART_ListBoxSecond";
+
+        public static readonly RoutedEvent SelectedTimeChangedEvent =
+            EventManager.RegisterRoutedEvent("SelectedTimeChanged", RoutingStrategy.Bubble,
+                typeof(RoutedPropertyChangedEventHandler<DateTime?>), typeof(TimeSelector));
+
+        public static readonly DependencyProperty SelectedTimeProperty =
+            DependencyProperty.Register("SelectedTime", typeof(DateTime?), typeof(TimeSelector),
+                new PropertyMetadata(null, OnSelectedTimeChanged));
+
+        public static readonly DependencyProperty ItemHeightProperty =
+            DependencyProperty.Register("ItemHeight", typeof(double), typeof(TimeSelector), new PropertyMetadata(0d));
+
+        public static readonly DependencyProperty SelectorMarginProperty =
+            DependencyProperty.Register("SelectorMargin", typeof(Thickness), typeof(TimeSelector),
+                new PropertyMetadata(new Thickness(0)));
+
+        private int _hour, _minute, _second;
+
+        private ListBox _listBoxHour, _listBoxMinute, _listBoxSecond;
+
+        static TimeSelector()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(TimeSelector),
+                new FrameworkPropertyMetadata(typeof(TimeSelector)));
+        }
+
+
+        public DateTime? SelectedTime
+        {
+            get => (DateTime?)GetValue(SelectedTimeProperty);
+            set => SetValue(SelectedTimeProperty, value);
+        }
+
+
+        public double ItemHeight
+        {
+            get => (double)GetValue(ItemHeightProperty);
+            set => SetValue(ItemHeightProperty, value);
+        }
+
+
+        public Thickness SelectorMargin
+        {
+            get => (Thickness)GetValue(SelectorMarginProperty);
+            set => SetValue(SelectorMarginProperty, value);
+        }
+
+
+        public event RoutedPropertyChangedEventHandler<DateTime?> SelectedTimeChanged
+        {
+            add => AddHandler(SelectedTimeChangedEvent, value);
+            remove => RemoveHandler(SelectedTimeChangedEvent, value);
+        }
+
+        public virtual void OnSelectedTimeChanged(DateTime? oldValue, DateTime? newValue)
+        {
+            var args = new RoutedPropertyChangedEventArgs<DateTime?>(oldValue, newValue, SelectedTimeChangedEvent);
+            RaiseEvent(args);
+        }
+
+        private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctrl = d as TimeSelector;
+            if (ctrl != null)
+                ctrl.OnSelectedTimeChanged((DateTime?)e.OldValue, (DateTime?)e.NewValue);
+        }
+
+
+        private double GetItemHeight(ListBox listBox)
+        {
+            if (listBox.Items.Count > 0)
+            {
+                var listBoxItem = listBox.ItemContainerGenerator.ContainerFromIndex(0) as ListBoxItem;
+                if (listBoxItem != null) return listBoxItem.ActualHeight;
+            }
+
+            return 0;
+        }
+
+        private int GetFirstNonEmptyItemIndex(ListBox listBox)
+        {
+            for (var i = 0; i < listBox.Items.Count; i++)
+            {
+                var item = listBox.Items[i] as string;
+                if (!string.IsNullOrWhiteSpace(item))
+                    return i;
+            }
+
+            return -1;
+        }
+
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            var minuteSecondList = Enumerable.Range(0, 60).Select(num => num.ToString("D2"));
+            var emptyData = Enumerable.Repeat(string.Empty, 4);
+            var result = emptyData.Concat(minuteSecondList).Concat(emptyData);
+            _listBoxHour = GetTemplateChild(ListBoxHourTemplateName) as ListBox;
+            if (_listBoxHour != null)
+            {
+                var hours = Enumerable.Range(0, 24).Select(num => num.ToString("D2"));
+                _listBoxHour.SelectionChanged -= ListBoxHour_SelectionChanged;
+                _listBoxHour.SelectionChanged += ListBoxHour_SelectionChanged;
+                _listBoxHour.ItemsSource = emptyData.Concat(hours).Concat(emptyData);
+                _listBoxHour.Loaded += (sender, args) =>
+                {
+                    var h = GetItemHeight(_listBoxHour);
+                    if (h <= 0) return;
+                    ItemHeight = h;
+                    Height = h * 10;
+                    var YAxis = GetFirstNonEmptyItemIndex(_listBoxHour) * h;
+                    SelectorMargin = new Thickness(0, YAxis, 0, 0);
+                };
+            }
+
+            _listBoxMinute = GetTemplateChild(ListBoxMinuteTemplateName) as ListBox;
+            if (_listBoxMinute != null)
+            {
+                _listBoxMinute.SelectionChanged -= ListBoxMinute_SelectionChanged;
+                _listBoxMinute.SelectionChanged += ListBoxMinute_SelectionChanged;
+                _listBoxMinute.ItemsSource = result;
+            }
+
+            _listBoxSecond = GetTemplateChild(ListBoxSecondTemplateName) as ListBox;
+            if (_listBoxSecond != null)
+            {
+                _listBoxSecond.SelectionChanged -= ListBoxSecond_SelectionChanged;
+                _listBoxSecond.SelectionChanged += ListBoxSecond_SelectionChanged;
+                _listBoxSecond.ItemsSource = result;
+            }
+        }
+
+        private void ListBoxSecond_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(_listBoxSecond.SelectedValue.ToString())) return;
+            _second = Convert.ToInt32(_listBoxSecond.SelectedValue.ToString());
+            SetSelectedTime();
+        }
+
+        private void ListBoxMinute_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(_listBoxMinute.SelectedValue.ToString())) return;
+            _minute = Convert.ToInt32(_listBoxMinute.SelectedValue.ToString());
+            SetSelectedTime();
+        }
+
+        private void ListBoxHour_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(_listBoxHour.SelectedValue.ToString())) return;
+            _hour = Convert.ToInt32(_listBoxHour.SelectedValue.ToString());
+            SetSelectedTime();
+        }
+
+        private void SetSelectedTime()
+        {
+            var dt = new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, _hour, _minute,
+                _second);
+            SelectedTime = dt;
+        }
+
+        public void SetTime()
+        {
+            if (!SelectedTime.HasValue)
+                return;
+            _hour = SelectedTime.Value.Hour;
+            _minute = SelectedTime.Value.Minute;
+            _second = SelectedTime.Value.Second;
+
+            _listBoxHour.SelectionChanged -= ListBoxHour_SelectionChanged;
+            var hour = _hour.ToString("D2");
+            _listBoxHour.SelectedItem = hour;
+            //(_listBoxHour as TimeSelectorListBox).Positioning();
+            _listBoxHour.SelectionChanged += ListBoxHour_SelectionChanged;
+
+
+            _listBoxMinute.SelectionChanged -= ListBoxMinute_SelectionChanged;
+            var minute = _minute.ToString("D2");
+            _listBoxMinute.SelectedItem = minute;
+            //(_listBoxMinute as TimeSelectorListBox).Positioning();
+            _listBoxMinute.SelectionChanged += ListBoxMinute_SelectionChanged;
+
+            _listBoxSecond.SelectionChanged -= ListBoxSecond_SelectionChanged;
+            var second = _second.ToString("D2");
+            _listBoxSecond.SelectedItem = second;
+            //(_listBoxSecond as TimeSelectorListBox).Positioning();
+            _listBoxSecond.SelectionChanged += ListBoxSecond_SelectionChanged;
+
+            SetSelectedTime();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelectorItem.cs b/src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelectorItem.cs
new file mode 100644
index 00000000..3f89d364
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelectorItem.cs
@@ -0,0 +1,8 @@
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Controls
+{
+    public class TimeSelectorItem : ListBoxItem
+    {
+    }
+}
diff --git a/src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelectorListBox.cs b/src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelectorListBox.cs
new file mode 100644
index 00000000..9ce3cf8c
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelectorListBox.cs
@@ -0,0 +1,90 @@
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using WPFDevelopers.Helpers;
+
+namespace WPFDevelopers.Controls
+{
+    public class TimeSelectorListBox : ListBox
+    {
+        private bool isFirst = true;
+        private double lastIndex = 4;
+        private ScrollViewer scrollViewer;
+
+        public TimeSelectorListBox()
+        {
+            Loaded += TimeSelectorListBox_Loaded;
+            PreviewMouseWheel -= ScrollListBox_PreviewMouseWheel;
+            PreviewMouseWheel += ScrollListBox_PreviewMouseWheel;
+        }
+        protected override bool IsItemItsOwnContainerOverride(object item)
+        {
+            return item is TimeSelectorItem;
+        }
+
+        protected override DependencyObject GetContainerForItemOverride()
+        {
+            return new TimeSelectorItem();
+        }
+
+        private void ScrollListBox_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            if (Items != null && Items.Count > 0)
+            {
+                var delta = e.Delta;
+                var scrollCount = delta > 0 ? -1 : 1;
+                ItemPositioning(scrollCount);
+                e.Handled = true;
+            }
+        }
+        void ItemPositioning(int scrollCount)
+        {
+            var itemCount = Items.Count;
+            var newIndex = SelectedIndex + scrollCount;
+            if (newIndex < 4)
+                newIndex = 5;
+            else if (newIndex >= itemCount - 4)
+                newIndex = itemCount;
+            SelectedIndex = newIndex;
+        }
+        void Positioning()
+        {
+            if (SelectedIndex <= 0 || scrollViewer == null) return;
+            var index = SelectedIndex - (int)lastIndex;
+            var offset = scrollViewer.VerticalOffset + index;
+            scrollViewer.ScrollToVerticalOffset(offset);
+        }
+        private void TimeSelectorListBox_Loaded(object sender, RoutedEventArgs e)
+        {
+            scrollViewer = ControlsHelper.FindVisualChild<ScrollViewer>(this);
+            if (scrollViewer != null)
+            {
+                scrollViewer.ScrollChanged -= ScrollViewer_ScrollChanged;
+                scrollViewer.ScrollChanged += ScrollViewer_ScrollChanged;
+            }
+        }
+
+        private void ScrollViewer_ScrollChanged(object sender, ScrollChangedEventArgs e)
+        {
+            var offset = e.VerticalOffset;
+            if (isFirst == false)
+                lastIndex = offset + 4;
+            else
+            {
+                lastIndex = offset == 0 ? 4 : offset + 4;
+                isFirst = false;
+            }
+        }
+
+        protected override void OnSelectionChanged(SelectionChangedEventArgs e)
+        {
+            base.OnSelectionChanged(e);
+            if (SelectedIndex != -1 && lastIndex != -1)
+            {
+                if (SelectedIndex <= 0) return;
+                Positioning();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
index 81cc7d96..23f83e51 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
@@ -12,8 +12,6 @@
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
-using WPFDevelopers.Controls;
-using WPFDevelopers.Utilities;
 
 namespace WPFDevelopers.Helpers
 {
@@ -254,6 +252,21 @@ public static Thickness GetPadding(FrameworkElement element)
             return new Thickness();
         }
 
+        public static T FindVisualChild<T>(DependencyObject parent) where T : DependencyObject
+        {
+            int childCount = VisualTreeHelper.GetChildrenCount(parent);
+            for (int i = 0; i < childCount; i++)
+            {
+                var child = VisualTreeHelper.GetChild(parent, i);
+                if (child is T typedChild)
+                    return typedChild;
+                var result = FindVisualChild<T>(child);
+                if (result != null)
+                    return result;
+            }
+            return null;
+        }
+
 
     }
 
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/TextBoxHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/TextBoxHelper.cs
index 3555636e..ba430a18 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/TextBoxHelper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/TextBoxHelper.cs
@@ -20,11 +20,19 @@ public static class TextBoxHelper
             DependencyProperty.RegisterAttached("IsEnterUpdateEnabled", typeof(bool), typeof(TextBoxHelper),
                 new PropertyMetadata(false, OnIsEnterUpdateEnabledChanged));
 
+        public static readonly DependencyProperty MinValueProperty =
+       DependencyProperty.RegisterAttached("MinValue", typeof(int), typeof(TextBoxHelper),
+           new PropertyMetadata(int.MinValue, OnMinMaxValueChanged));
+
+        public static readonly DependencyProperty MaxValueProperty =
+            DependencyProperty.RegisterAttached("MaxValue", typeof(int), typeof(TextBoxHelper),
+                new PropertyMetadata(int.MaxValue, OnMinMaxValueChanged));
+
         private static void OnSelectAllOnClickChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             if (d is TextBox textBox)
             {
-                if ((bool) e.NewValue)
+                if ((bool)e.NewValue)
                     textBox.PreviewMouseLeftButtonDown += TextBox_PreviewMouseLeftButtonDown;
                 else
                     textBox.PreviewMouseLeftButtonDown -= TextBox_PreviewMouseLeftButtonDown;
@@ -35,7 +43,7 @@ private static void OnAllowOnlyNumericInputChanged(DependencyObject d, Dependenc
         {
             if (d is TextBox textBox)
             {
-                if ((bool) e.NewValue)
+                if ((bool)e.NewValue)
                 {
                     DataObject.AddPastingHandler(textBox, TextBox_Pasting);
                     textBox.PreviewTextInput += TextBox_PreviewTextInput;
@@ -54,7 +62,7 @@ private static void OnIsEnterUpdateEnabledChanged(DependencyObject d, Dependency
         {
             if (d is TextBox textBox)
             {
-                if ((bool) e.NewValue)
+                if ((bool)e.NewValue)
                     textBox.PreviewKeyDown += TextBox_PreviewKeyDown;
                 else
                     textBox.PreviewKeyDown -= TextBox_PreviewKeyDown;
@@ -63,7 +71,7 @@ private static void OnIsEnterUpdateEnabledChanged(DependencyObject d, Dependency
 
         public static bool GetSelectAllOnClick(TextBox textBox)
         {
-            return (bool) textBox.GetValue(SelectAllOnClickProperty);
+            return (bool)textBox.GetValue(SelectAllOnClickProperty);
         }
 
         public static void SetSelectAllOnClick(TextBox textBox, bool value)
@@ -73,7 +81,7 @@ public static void SetSelectAllOnClick(TextBox textBox, bool value)
 
         public static bool GetAllowOnlyNumericInput(DependencyObject obj)
         {
-            return (bool) obj.GetValue(AllowOnlyNumericInputProperty);
+            return (bool)obj.GetValue(AllowOnlyNumericInputProperty);
         }
 
         public static void SetAllowOnlyNumericInput(DependencyObject obj, bool value)
@@ -83,7 +91,7 @@ public static void SetAllowOnlyNumericInput(DependencyObject obj, bool value)
 
         public static bool GetIsEnterUpdateEnabled(DependencyObject obj)
         {
-            return (bool) obj.GetValue(IsEnterUpdateEnabledProperty);
+            return (bool)obj.GetValue(IsEnterUpdateEnabledProperty);
         }
 
         public static void SetIsEnterUpdateEnabled(DependencyObject obj, bool value)
@@ -91,6 +99,75 @@ public static void SetIsEnterUpdateEnabled(DependencyObject obj, bool value)
             obj.SetValue(IsEnterUpdateEnabledProperty, value);
         }
 
+        public static int GetMinValue(DependencyObject obj)
+        {
+            return (int)obj.GetValue(MinValueProperty);
+        }
+
+        public static void SetMinValue(DependencyObject obj, int value)
+        {
+            obj.SetValue(MinValueProperty, value);
+        }
+
+        public static int GetMaxValue(DependencyObject obj)
+        {
+            return (int)obj.GetValue(MaxValueProperty);
+        }
+
+        public static void SetMaxValue(DependencyObject obj, int value)
+        {
+            obj.SetValue(MaxValueProperty, value);
+        }
+
+        private static void OnMinMaxValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is TextBox textBox)
+            {
+                textBox.TextChanged -= TextBox_TextChanged;
+                textBox.TextChanged += TextBox_TextChanged;
+                textBox.PreviewTextInput -= TextBoxMinMaxValue_PreviewTextInput;
+                textBox.PreviewTextInput += TextBoxMinMaxValue_PreviewTextInput;
+            }
+        }
+
+        private static void TextBoxMinMaxValue_PreviewTextInput(object sender, TextCompositionEventArgs e)
+        {
+            if (sender is TextBox textBox)
+            {
+                int minValue = GetMinValue(textBox);
+                int maxValue = GetMaxValue(textBox);
+                if (textBox.SelectionLength == textBox.Text.Length) return;
+                if (!int.TryParse(textBox.Text + e.Text, out int value))
+                {
+                    e.Handled = true;
+                }
+                else
+                {
+                    if (value < minValue || value > maxValue)
+                    {
+                        e.Handled = true;
+                    }
+                }
+            }
+        }
+        private static void TextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (sender is TextBox textBox)
+            {
+                var minValue = GetMinValue(textBox);
+                var maxValue = GetMaxValue(textBox);
+                if (!int.TryParse(textBox.Text, out int value))
+                    textBox.Text = "";
+                else
+                {
+                    if (value < minValue)
+                        textBox.Text = minValue.ToString();
+                    else if (value > maxValue)
+                        textBox.Text = maxValue.ToString();
+                }
+            }
+        }
+
         private static void TextBox_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             if (sender is TextBox textBox && !textBox.IsKeyboardFocusWithin)
@@ -106,7 +183,7 @@ private static void TextBox_Pasting(object sender, DataObjectPastingEventArgs e)
         {
             if (e.DataObject.GetDataPresent(typeof(string)))
             {
-                var text = (string) e.DataObject.GetData(typeof(string));
+                var text = (string)e.DataObject.GetData(typeof(string));
 
                 if (!IsNumeric(text)) e.CancelCommand();
             }
@@ -139,7 +216,7 @@ private static void TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Enter && !e.IsRepeat)
             {
-                var textBox = (TextBox) sender;
+                var textBox = (TextBox)sender;
                 var expression = textBox.GetBindingExpression(TextBox.TextProperty);
                 expression?.UpdateSource();
             }
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
index 5e851f8f..7fc0ddd6 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
@@ -132,14 +132,6 @@
                         CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                         SnapsToDevicePixels="True">
                         <controls:SmallPanel>
-                            <ToggleButton
-                                x:Name="PART_ToggleButton"
-                                Background="{TemplateBinding Background}"
-                                ClickMode="Press"
-                                Focusable="False"
-                                IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                Style="{x:Null}"
-                                Template="{StaticResource WD.ComboBoxToggleButton}" />
                             <ContentPresenter
                                 x:Name="ContentSite"
                                 Margin="{TemplateBinding Padding}"
@@ -174,6 +166,14 @@
                                 Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}"
                                 TextTrimming="CharacterEllipsis"
                                 Visibility="Collapsed" />
+                            <ToggleButton
+                                x:Name="PART_ToggleButton"
+                                Background="{TemplateBinding Background}"
+                                ClickMode="Press"
+                                Focusable="False"
+                                IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                Style="{x:Null}"
+                                Template="{StaticResource WD.ComboBoxToggleButton}" />
                             <Popup
                                 x:Name="PART_Popup"
                                 MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.ToggleButton.xaml b/src/WPFDevelopers.Shared/Styles/Styles.ToggleButton.xaml
index e27b926b..4f9cd01f 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.ToggleButton.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.ToggleButton.xaml
@@ -14,6 +14,7 @@
         TargetType="{x:Type ToggleButton}">
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Padding" Value="4,0" />
+        <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
@@ -23,7 +24,7 @@
                                 x:Name="PART_Border"
                                 Width="40"
                                 Height="20"
-                                Background="{DynamicResource WD.BaseSolidColorBrush}"
+                                Background="{TemplateBinding Background}"
                                 CornerRadius="10">
                                 <Ellipse
                                     x:Name="PART_Ellipse"
@@ -77,7 +78,7 @@
                     </BulletDecorator>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml b/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml
index c0a322e2..3b94e702 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml
@@ -98,4 +98,6 @@
     <Geometry x:Key="WD.ChevronUpGeometry" po:Freeze="True">M336.998 621.619c-13.875 13.722-36.301 13.722-50.074 0s-13.926-35.891 0-49.613l200.090-196.096c13.824-13.722 36.198-13.722 50.125 0l200.090 196.096c13.824 13.67 13.824 35.891 0 49.613-13.875 13.722-36.301 13.722-50.125 0l-175.104-160.819-175.002 160.819z</Geometry>
 
     <Geometry x:Key="WD.UnfoldMoreGeometry" po:Freeze="True">M512 776l136-136 60 60-196 196-196-196 60-60zM512 248l-136 136-60-60 196-196 196 196-60 60z</Geometry>
+
+    <Geometry x:Key="WD.TimeGeometry" po:Freeze="True">M512 112c-229.792 0-416 186.24-416 416s186.208 416 416 416c229.728 0 416-186.24 416-416s-186.24-416-416-416zM508.64 864.864c-185.568 0-336-150.432-336-336s150.432-336 336-336c185.536 0 336 150.432 336 336 0 185.568-150.464 336-336 336zM605.76 548.192h-95.36v-161.024c0-17.472-14.176-31.68-31.648-31.68-17.504 0-31.68 14.176-31.68 31.68v192.672c0 17.504 14.176 31.648 31.68 31.648h127.008c17.504 0 31.68-14.144 31.68-31.648 0-17.472-14.176-31.648-31.68-31.648z</Geometry>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml b/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml
index 6c3ec13c..81e510a4 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml
@@ -35,7 +35,7 @@
 
     <Color x:Key="WD.BaseMoveColor" po:Freeze="True">#F5F7FA</Color>
     <SolidColorBrush
-        x:Key=" WD.BaseMoveSolidColorBrush"
+        x:Key="WD.BaseMoveSolidColorBrush"
         po:Freeze="True"
         Color="{StaticResource WD.BaseMoveColor}" />
 
diff --git a/src/WPFDevelopers.Shared/Themes/ColorPicker.xaml b/src/WPFDevelopers.Shared/Themes/ColorPicker.xaml
index c6b9e95f..d655736c 100644
--- a/src/WPFDevelopers.Shared/Themes/ColorPicker.xaml
+++ b/src/WPFDevelopers.Shared/Themes/ColorPicker.xaml
@@ -282,6 +282,8 @@
                                         <TextBox
                                             helpers:TextBoxHelper.AllowOnlyNumericInput="True"
                                             helpers:TextBoxHelper.IsEnterUpdateEnabled="True"
+                                            helpers:TextBoxHelper.MaxValue="360"
+                                            helpers:TextBoxHelper.MinValue="0"
                                             helpers:TextBoxHelper.SelectAllOnClick="True"
                                             Style="{StaticResource WD.TextBoxColorPicker}"
                                             Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.HToColorConverter}}" />
diff --git a/src/WPFDevelopers.Shared/Themes/IPEditBox.xaml b/src/WPFDevelopers.Shared/Themes/IPEditBox.xaml
new file mode 100644
index 00000000..d721465e
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Themes/IPEditBox.xaml
@@ -0,0 +1,88 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
+    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <Style
+        x:Key="WD.IPEditBox"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:IPEditBox}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:IPEditBox}">
+                    <ControlTemplate.Resources>
+                        <Style BasedOn="{StaticResource WD.DefaultTextBox}" TargetType="{x:Type TextBox}">
+                            <Setter Property="BorderThickness" Value="0" />
+                            <Setter Property="helpers:TextBoxHelper.AllowOnlyNumericInput" Value="True" />
+                            <Setter Property="helpers:TextBoxHelper.MaxValue" Value="255" />
+                            <Setter Property="helpers:TextBoxHelper.MinValue" Value="0" />
+                            <Setter Property="VerticalContentAlignment" Value="Center" />
+                            <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        </Style>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="Text" Value="." />
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                    </ControlTemplate.Resources>
+                    <Border
+                        x:Name="PART_Border"
+                        
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                        UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
+                        <ScrollViewer HorizontalScrollBarVisibility="Auto">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <TextBox x:Name="PART_TextBox1" />
+                                <TextBlock Grid.Column="1" />
+
+                                <TextBox x:Name="PART_TextBox2" Grid.Column="2" />
+                                <TextBlock Grid.Column="3" />
+
+                                <TextBox x:Name="PART_TextBox3" Grid.Column="4" />
+                                <TextBlock Grid.Column="5" />
+                                <TextBox x:Name="PART_TextBox4" Grid.Column="6" />
+                            </Grid>
+                        </ScrollViewer>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsKeyboardFocused" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsKeyboardFocused" Value="True" />
+                                <Condition Property="IsMouseOver" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.IPEditBox}" TargetType="{x:Type controls:IPEditBox}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/NumericBox.xaml b/src/WPFDevelopers.Shared/Themes/NumericBox.xaml
index d3e825f6..be3e5677 100644
--- a/src/WPFDevelopers.Shared/Themes/NumericBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/NumericBox.xaml
@@ -86,7 +86,8 @@
                                         Padding="0"
                                         Command="{x:Static controls:NumericBox.DecreaseCommand}"
                                         Delay="{TemplateBinding Delay}"
-                                        IsTabStop="False">
+                                        IsTabStop="False"
+                                        Style="{StaticResource WD.DefaultRepeatButton}">
                                         <controls:PathIcon Kind="ChevronDown" Style="{StaticResource WD.MiniPathIcon}" />
                                     </RepeatButton>
                                 </Grid>
diff --git a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
index b4290ab6..56619401 100644
--- a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
+++ b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
@@ -81,7 +81,7 @@
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
-                                            Foreground="{StaticResource WD.RegularTextSolidColorBrush}"
+                                            Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
                                             Kind="Rectangle" />
                                     </RadioButton>
                                     <RadioButton
@@ -105,7 +105,7 @@
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
-                                            Foreground="{StaticResource WD.RegularTextSolidColorBrush}"
+                                            Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
                                             Kind="ArrowRightTop" />
                                     </RadioButton>
                                     <RadioButton
@@ -116,7 +116,7 @@
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
-                                            Foreground="{StaticResource WD.RegularTextSolidColorBrush}"
+                                            Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
                                             Kind="Ink" />
                                     </RadioButton>
                                     <RadioButton
@@ -127,7 +127,7 @@
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
-                                            Foreground="{StaticResource WD.RegularTextSolidColorBrush}"
+                                            Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
                                             Kind="Text" />
                                     </RadioButton>
                                     <Rectangle
@@ -143,7 +143,7 @@
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
-                                            Foreground="{StaticResource WD.RegularTextSolidColorBrush}"
+                                            Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
                                             Kind="Save" />
                                     </Button>
                                     <Button
diff --git a/src/WPFDevelopers.Shared/Themes/Theme40.txt b/src/WPFDevelopers.Shared/Themes/Theme40.txt
index 182f11ff..25acc0ee 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme40.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme40.txt
@@ -66,4 +66,6 @@ CropImage.xaml
 Message.xaml
 PathIcon.xaml
 NumericBox.xaml
-ColorPicker.xaml
\ No newline at end of file
+ColorPicker.xaml
+IPEditBox.xaml
+TimePicker.xaml
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Theme45x.txt b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
index 72698657..0b6b5bc7 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme45x.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
@@ -67,4 +67,6 @@ CropImage.xaml
 Message.xaml
 PathIcon.xaml
 NumericBox.xaml
-ColorPicker.xaml
\ No newline at end of file
+ColorPicker.xaml
+IPEditBox.xaml
+TimePicker.xaml
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/TimePicker.xaml b/src/WPFDevelopers.Shared/Themes/TimePicker.xaml
new file mode 100644
index 00000000..c82e6c92
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Themes/TimePicker.xaml
@@ -0,0 +1,274 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
+    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <ControlTemplate x:Key="WD.TimePickerToggleButton" TargetType="{x:Type ToggleButton}">
+        <Border
+            x:Name="PART_Border"
+            Padding="6,0"
+            Background="Transparent"
+            BorderThickness="0"
+            SnapsToDevicePixels="true">
+            <controls:PathIcon
+                x:Name="PART_PathIcon"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Foreground="{DynamicResource WD.PlaceholderTextSolidColorBrush}"
+                IsHitTestVisible="False"
+                Kind="Time" />
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="PART_PathIcon" Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+                <Setter TargetName="PART_PathIcon" Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <Style
+        x:Key="WD.TimeSelectorItem"
+        BasedOn="{StaticResource WD.DefaultListBoxItem}"
+        TargetType="{x:Type controls:TimeSelectorItem}">
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:TimeSelectorItem}">
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="FontWeight" Value="Bold" />
+                            <Setter Property="Background" Value="Transparent" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+                        </Trigger>
+                        <DataTrigger Binding="{Binding}" Value="">
+                            <Setter Property="IsEnabled" Value="False" />
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                    <controls:SmallPanel>
+                        <Border
+                            Name="PART_Border"
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="True">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Border>
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style
+        x:Key="WD.TimeListStyle"
+        BasedOn="{StaticResource WD.DefaultListBox}"
+        TargetType="{x:Type controls:TimeSelectorListBox}">
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="False" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource WD.TimeSelectorItem}" />
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+                <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+
+    <Style
+        x:Key="WD.TimeSelector"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:TimeSelector}">
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:TimeSelector}">
+                    <Border
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                        UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
+                        <controls:SmallPanel SnapsToDevicePixels="True">
+                            <UniformGrid Rows="1">
+                                <controls:TimeSelectorListBox x:Name="PART_ListBoxHour" Style="{StaticResource WD.TimeListStyle}" />
+                                <controls:TimeSelectorListBox x:Name="PART_ListBoxMinute" Style="{StaticResource WD.TimeListStyle}" />
+                                <controls:TimeSelectorListBox x:Name="PART_ListBoxSecond" Style="{StaticResource WD.TimeListStyle}" />
+                            </UniformGrid>
+                            <Line />
+                            <Path />
+                            <Border
+                                Height="{TemplateBinding ItemHeight}"
+                                Margin="{TemplateBinding SelectorMargin}"
+                                VerticalAlignment="Top"
+                                BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
+                                BorderThickness="0,1"
+                                IsHitTestVisible="False" />
+                        </controls:SmallPanel>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style
+        x:Key="WD.TimePicker"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:TimePicker}">
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:TimePicker}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="OpenStoryboard">
+                            <DoubleAnimation
+                                EasingFunction="{StaticResource WD.ExponentialEaseOut}"
+                                Storyboard.TargetName="PART_DropDown"
+                                Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)"
+                                To="1"
+                                Duration="00:00:.2" />
+                        </Storyboard>
+                        <Storyboard x:Key="CloseStoryboard">
+                            <DoubleAnimation
+                                EasingFunction="{StaticResource WD.ExponentialEaseOut}"
+                                Storyboard.TargetName="PART_DropDown"
+                                Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)"
+                                To="0"
+                                Duration="00:00:.2" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <controls:SmallPanel SnapsToDevicePixels="True">
+                        <Grid Background="Transparent">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Border
+                                Name="PART_Border"
+                                Grid.ColumnSpan="2"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                SnapsToDevicePixels="True" />
+                            <TextBox
+                                x:Name="PART_EditableTextBox"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Background="{TemplateBinding Background}"
+                                Focusable="True"
+                                Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}"
+                                SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}"
+                                Style="{x:Null}"
+                                Template="{StaticResource WD.ComboBoxTextBox}" />
+                            <TextBlock
+                                x:Name="PART_Watermark"
+                                Margin="{TemplateBinding Padding}"
+                                Padding="1,0"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Background="Transparent"
+                                FontSize="{StaticResource WD.NormalFontSize}"
+                                Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
+                                IsHitTestVisible="False"
+                                Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}"
+                                TextTrimming="CharacterEllipsis"
+                                Visibility="Collapsed" />
+                            <ToggleButton
+                                x:Name="PART_ToggleButton"
+                                Grid.Column="1"
+                                Background="{TemplateBinding Background}"
+                                ClickMode="Release"
+                                Focusable="False"
+                                Style="{x:Null}"
+                                Template="{StaticResource WD.TimePickerToggleButton}" />
+                            <Popup
+                                x:Name="PART_Popup"
+                                AllowsTransparency="True"
+                                IsOpen="{Binding Path=IsChecked, ElementName=PART_ToggleButton}"
+                                Placement="Bottom"
+                                PlacementTarget="{Binding ElementName=PART_Border}"
+                                StaysOpen="False">
+                                <controls:SmallPanel
+                                    x:Name="PART_DropDown"
+                                    MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
+                                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                    Margin="24,2,24,24"
+                                    RenderTransformOrigin=".5,0"
+                                    SnapsToDevicePixels="True">
+                                    <controls:SmallPanel.RenderTransform>
+                                        <ScaleTransform ScaleY="0" />
+                                    </controls:SmallPanel.RenderTransform>
+                                    <Border
+                                        Name="PART_DropDownBorder"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                        Effect="{StaticResource WD.PopupShadowDepth}"
+                                        SnapsToDevicePixels="True"
+                                        UseLayoutRounding="True" />
+                                    <controls:TimeSelector x:Name="PART_TimeSelector" />
+                                </controls:SmallPanel>
+                            </Popup>
+                        </Grid>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="BeginStoryboardOpenStoryboard" Storyboard="{StaticResource OpenStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="BeginStoryboardOpenStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="False">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="BeginStoryboardCloseStoryboard" Storyboard="{StaticResource CloseStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="BeginStoryboardCloseStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_Popup" Property="AllowsTransparency" Value="True">
+                            <Setter TargetName="PART_DropDownBorder" Property="Margin" Value="0,2,0,0" />
+                        </Trigger>
+                        <Trigger Property="SelectedTime" Value="">
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="SelectedTime" Value="{x:Null}">
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style BasedOn="{StaticResource WD.TimeSelector}" TargetType="{x:Type controls:TimeSelector}" />
+    <Style BasedOn="{StaticResource WD.TimePicker}" TargetType="{x:Type controls:TimePicker}" />
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 3a2ea469..190cc5cf 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -12,6 +12,11 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\ColorPicker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSB.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSL.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\IPEditBox\IPEditBox.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\TimePicker\TimePicker.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\TimePicker\TimeSelector.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\TimePicker\TimeSelectorItem.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\TimePicker\TimeSelectorListBox.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Assists\ThincknessAssert.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Badge\Badge.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BreadCrumbBar\BreadCrumbBar.cs" />
@@ -448,6 +453,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\IPEditBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Mask.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -536,6 +545,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\TimePicker.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\VerifyCode.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>