diff --git a/HandyControl/Data/Enum/SkinType.cs b/HandyControl/Data/Enum/SkinType.cs
new file mode 100644
index 00000000..e329ecd4
--- /dev/null
+++ b/HandyControl/Data/Enum/SkinType.cs
@@ -0,0 +1,8 @@
+namespace HandyControl.Data.Enum
+{
+    public enum SkinType
+    {
+        Default = 0,
+        Dark
+    }
+}
\ No newline at end of file
diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj
index 02602a74..1840a0a5 100644
--- a/HandyControl/HandyControl.csproj
+++ b/HandyControl/HandyControl.csproj
@@ -60,6 +60,7 @@
     <Compile Include="Controls\Loading\LoadingCircle.cs" />
     <Compile Include="Controls\Loading\LoadingLine.cs" />
     <Compile Include="Data\Enum\InfoType.cs" />
+    <Compile Include="Data\Enum\SkinType.cs" />
     <Compile Include="Data\GrowlInfo.cs" />
     <Compile Include="Data\ResourceToken.cs">
       <AutoGen>True</AutoGen>
@@ -163,7 +164,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Themes\Basic\Colors.xaml">
+    <Page Include="Themes\Basic\Colors\Colors.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -175,6 +176,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Basic\Colors\ColorsDark.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Basic\Fonts.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -331,6 +336,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\Image.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\ListBox.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -367,7 +376,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Themes\Styles\Steps.xaml">
+    <Page Include="Themes\Styles\StepBar.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -415,7 +424,15 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Themes\ThemesDefault.xaml">
+    <Page Include="Themes\Theme.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\SkinDark.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\SkinDefault.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/HandyControl/Properties/AssemblyInfo.cs b/HandyControl/Properties/AssemblyInfo.cs
index f0bf5245..b3838732 100644
--- a/HandyControl/Properties/AssemblyInfo.cs
+++ b/HandyControl/Properties/AssemblyInfo.cs
@@ -10,4 +10,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("1.3.4.*")]
+[assembly: AssemblyVersion("1.4.0.*")]
diff --git a/HandyControl/Themes/Basic/Basic.xaml b/HandyControl/Themes/Basic/Basic.xaml
index 5d113db2..38b5f704 100644
--- a/HandyControl/Themes/Basic/Basic.xaml
+++ b/HandyControl/Themes/Basic/Basic.xaml
@@ -2,7 +2,6 @@
 
     <ResourceDictionary.MergedDictionaries>
 
-        <ResourceDictionary Source="../Basic/Colors.xaml"/>
         <ResourceDictionary Source="../Basic/Brushes.xaml"/>
         <ResourceDictionary Source="../Basic/Converters.xaml"/>
         <ResourceDictionary Source="../Basic/Effects.xaml"/>
diff --git a/HandyControl/Themes/Basic/Brushes.xaml b/HandyControl/Themes/Basic/Brushes.xaml
index de9e53ff..555392d9 100644
--- a/HandyControl/Themes/Basic/Brushes.xaml
+++ b/HandyControl/Themes/Basic/Brushes.xaml
@@ -10,11 +10,19 @@
     <SolidColorBrush x:Key="PrimaryTextBrush" Color="{DynamicResource PrimaryTextColor}"/>
     <SolidColorBrush x:Key="SecondaryTextBrush" Color="{DynamicResource SecondaryTextColor}"/>
     <SolidColorBrush x:Key="ThirdlyTextBrush" Color="{DynamicResource ThirdlyTextColor}"/>
+    <SolidColorBrush x:Key="ReverseTextBrush" Color="{DynamicResource ReverseTextColor}"/>
     <SolidColorBrush x:Key="TextIconBrush" Color="{DynamicResource TextIconColor}"/>
 
     <SolidColorBrush x:Key="BorderBrush" Color="{DynamicResource BorderColor}"/>
+    <SolidColorBrush x:Key="SecondaryBorderBrush" Color="{DynamicResource SecondaryBorderColor}"/>
     <SolidColorBrush x:Key="BackgroundBrush" Color="{DynamicResource BackgroundColor}"/>
     <SolidColorBrush x:Key="RegionBrush" Color="{DynamicResource RegionColor}"/>
+    <SolidColorBrush x:Key="SecondaryRegionBrush" Color="{DynamicResource SecondaryRegionColor}"/>
+    <SolidColorBrush x:Key="ThirdlyRegionBrush" Color="{DynamicResource ThirdlyRegionColor}"/>
+    <LinearGradientBrush x:Key="TitleBrush" EndPoint="1,0" StartPoint="0,0">
+        <GradientStop Color="{DynamicResource TitleColor}" Offset="0"/>
+        <GradientStop Color="{DynamicResource SecondaryTitleColor}" Offset="1"/>
+    </LinearGradientBrush>
 
     <SolidColorBrush x:Key="DefaultBrush" Color="{DynamicResource DefaultColor}"/>
     <SolidColorBrush x:Key="DarkDefaultBrush" Color="{DynamicResource DarkDefaultColor}"/>
diff --git a/HandyControl/Themes/Basic/Colors.xaml b/HandyControl/Themes/Basic/Colors/Colors.xaml
similarity index 77%
rename from HandyControl/Themes/Basic/Colors.xaml
rename to HandyControl/Themes/Basic/Colors/Colors.xaml
index 9693f28a..afa14852 100644
--- a/HandyControl/Themes/Basic/Colors.xaml
+++ b/HandyControl/Themes/Basic/Colors/Colors.xaml
@@ -19,11 +19,17 @@
     <Color x:Key="PrimaryTextColor">#212121</Color>
     <Color x:Key="SecondaryTextColor">#757575</Color>
     <Color x:Key="ThirdlyTextColor">#bdbdbd</Color>
+    <Color x:Key="ReverseTextColor">#212121</Color>
     <Color x:Key="TextIconColor">White</Color>
 
     <Color x:Key="BorderColor">#e0e0e0</Color>
+    <Color x:Key="SecondaryBorderColor">#a0a0a0</Color>
     <Color x:Key="BackgroundColor">#eeeeee</Color>
-    <Color x:Key="RegionColor">White</Color>
+    <Color x:Key="RegionColor">#ffffff</Color>
+    <Color x:Key="SecondaryRegionColor">#eeeeee</Color>
+    <Color x:Key="ThirdlyRegionColor">White</Color>
+    <Color x:Key="TitleColor">#73a5ff</Color>
+    <Color x:Key="SecondaryTitleColor">#5477f5</Color>
 
     <Color x:Key="DefaultColor">White</Color>
     <Color x:Key="DarkDefaultColor">#f4f4f4</Color>
@@ -33,4 +39,5 @@
 
     <Color x:Key="DarkMaskColor">#20000000</Color>
     <Color x:Key="DarkOpacityColor">#40000000</Color>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Basic/Colors/ColorsDark.xaml b/HandyControl/Themes/Basic/Colors/ColorsDark.xaml
new file mode 100644
index 00000000..764efce2
--- /dev/null
+++ b/HandyControl/Themes/Basic/Colors/ColorsDark.xaml
@@ -0,0 +1,43 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Color x:Key="PrimaryColor">#73a5ff</Color>
+    <Color x:Key="DarkPrimaryColor">#5477f5</Color>
+
+    <Color x:Key="DangerColor">#ff8792</Color>
+    <Color x:Key="DarkDangerColor">#ff4c9f</Color>
+
+    <Color x:Key="WarningColor">#ffd07a</Color>
+    <Color x:Key="DarkWarningColor">#ff9133</Color>
+
+    <Color x:Key="InfoColor">#4dd0e1</Color>
+    <Color x:Key="DarkInfoColor">#00bcd4</Color>
+
+    <Color x:Key="SuccessColor">#A5D6A7</Color>
+    <Color x:Key="DarkSuccessColor">#4CAF50</Color>
+
+    <Color x:Key="PrimaryTextColor">White</Color>
+    <Color x:Key="SecondaryTextColor">#757575</Color>
+    <Color x:Key="ThirdlyTextColor">#3f3f46</Color>
+    <Color x:Key="ReverseTextColor">#212121</Color>
+    <Color x:Key="TextIconColor">White</Color>
+
+    <Color x:Key="BorderColor">#3f3f46</Color>
+    <Color x:Key="SecondaryBorderColor">#555555</Color>
+    <Color x:Key="BackgroundColor">#eeeeee</Color>
+    <Color x:Key="RegionColor">#1c1c1c</Color>
+    <Color x:Key="SecondaryRegionColor">#2d2d30</Color>
+    <Color x:Key="ThirdlyRegionColor">#2d2d30</Color>
+    <Color x:Key="TitleColor">#3f3f46</Color>
+    <Color x:Key="SecondaryTitleColor">#2d2d30</Color>
+
+    <Color x:Key="DefaultColor">#686868</Color>
+    <Color x:Key="DarkDefaultColor">#686868</Color>
+
+    <Color x:Key="AccentColor">#ff5722</Color>
+    <Color x:Key="DarkAccentColor">#d43f3a</Color>
+
+    <Color x:Key="DarkMaskColor">#40000000</Color>
+    <Color x:Key="DarkOpacityColor">#40000000</Color>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/SkinDark.xaml b/HandyControl/Themes/SkinDark.xaml
new file mode 100644
index 00000000..32b78055
--- /dev/null
+++ b/HandyControl/Themes/SkinDark.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/Colors/ColorsDark.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/SkinDefault.xaml b/HandyControl/Themes/SkinDefault.xaml
new file mode 100644
index 00000000..825e8dbd
--- /dev/null
+++ b/HandyControl/Themes/SkinDefault.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/Colors/Colors.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Base/BaseStyle.xaml b/HandyControl/Themes/Styles/Base/BaseStyle.xaml
index 0c182c66..428a2e1e 100644
--- a/HandyControl/Themes/Styles/Base/BaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/BaseStyle.xaml
@@ -1,9 +1,13 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Basic/Fonts.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
     <Style x:Key="BaseStyle" TargetType="{x:Type Control}">
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="FontSize" Value="{DynamicResource TextFontSize}"/>
+        <Setter Property="FontSize" Value="{StaticResource TextFontSize}"/>
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml
index 86903ef0..60c0150b 100644
--- a/HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ButtonBaseBaseStyle.xaml
@@ -3,12 +3,13 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="BaseStyle.xaml"/>
+        <ResourceDictionary Source="../../Basic/Sizes.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="ButtonBaseBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="{x:Type ButtonBase}">
-        <Setter Property="Height" Value="{DynamicResource DefaultControlHeight}"/>
+        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="Padding" Value="{DynamicResource DefaultControlPadding}"/>
+        <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}"/>
         <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="HorizontalAlignment" Value="Center"/>
diff --git a/HandyControl/Themes/Styles/Base/ButtonBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ButtonBaseStyle.xaml
index c48a2b22..37b71a1e 100644
--- a/HandyControl/Themes/Styles/Base/ButtonBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ButtonBaseStyle.xaml
@@ -8,7 +8,6 @@
 
     <Style x:Key="ButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="{x:Type Button}">
         <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource DarkMaskBrush}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
diff --git a/HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml
index 75269a20..fe118f00 100644
--- a/HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/CheckBoxBaseStyle.xaml
@@ -43,7 +43,7 @@
                             <Setter Property="Visibility" TargetName="contentPresenter" Value="Visible"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
diff --git a/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml
index c0605a88..c85f2a7c 100644
--- a/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ComboBoxBaseStyle.xaml
@@ -18,7 +18,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
                     <Border x:Name="templateRoot" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                        <Border Margin="0,0,6,0" x:Name="splitBorder" BorderBrush="Transparent" BorderThickness="1" HorizontalAlignment="Right" SnapsToDevicePixels="true" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                        <Border Margin="0,0,6,0" x:Name="splitBorder" BorderBrush="Transparent" BorderThickness="1" HorizontalAlignment="Right" SnapsToDevicePixels="true" Width="{StaticResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
                             <Path x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5"/>
                         </Border>
                     </Border>
@@ -42,7 +42,7 @@
                 <ControlTemplate TargetType="ToggleButton">
                     <Grid>
                         <Border x:Name="templateRoot" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                            <Border Margin="0,0,6,0" x:Name="splitBorder" BorderBrush="Transparent" BorderThickness="1" HorizontalAlignment="Right" SnapsToDevicePixels="true" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                            <Border Margin="0,0,6,0" x:Name="splitBorder" BorderBrush="Transparent" BorderThickness="1" HorizontalAlignment="Right" SnapsToDevicePixels="true" Width="{StaticResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
                                 <Path x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5"/>
                             </Border>
                         </Border>
@@ -64,8 +64,8 @@
                 <ColumnDefinition/>
                 <ColumnDefinition Width="30"/>
             </Grid.ColumnDefinitions>
-            <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="White">
+            <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
                         <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
@@ -76,7 +76,7 @@
                     </ScrollViewer>
                 </Border>
             </Popup>
-            <ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/>
+            <ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{Binding Background,RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/>
             <ContentPresenter Margin="8,8,2,7" Grid.Column="0" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
         </Grid>
         <ControlTemplate.Triggers>
@@ -99,7 +99,7 @@
                     <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
                     <Condition Property="IsOpen" Value="false" SourceName="PART_Popup"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
@@ -128,8 +128,8 @@
                 <TextBlock Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
-            <Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="White">
+            <Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
                         <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
@@ -163,7 +163,7 @@
                     <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
                     <Condition Property="IsOpen" Value="false" SourceName="PART_Popup"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
@@ -189,8 +189,8 @@
                 <TextBlock Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
-            <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="White">
+            <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
                         <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
@@ -224,7 +224,7 @@
                     <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
                     <Condition Property="IsOpen" Value="false" SourceName="PART_Popup"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
@@ -263,8 +263,8 @@
                 <ColumnDefinition/>
                 <ColumnDefinition Width="30"/>
             </Grid.ColumnDefinitions>
-            <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="White">
+            <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
                         <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
@@ -277,7 +277,7 @@
             </Popup>
             <ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/>
             <Border Grid.Column="0" x:Name="border" Background="Transparent" Margin="3,1">
-                <TextBox x:Name="PART_EditableTextBox" Background="Transparent" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Margin="3,0" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                <TextBox x:Name="PART_EditableTextBox" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Margin="3,0" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
             </Border>
         </Grid>
         <ControlTemplate.Triggers>
@@ -300,14 +300,14 @@
                     <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
                     <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
                     <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
@@ -336,8 +336,8 @@
                 <TextBlock Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
-            <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="White">
+            <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
                         <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
@@ -351,7 +351,7 @@
             <ToggleButton Grid.Row="1" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/>
             <TextBlock Margin="8,7,8,8" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Column="0" Grid.Row="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
             <Border Grid.Row="1" Grid.Column="0" x:Name="border" Background="Transparent" Margin="4,1">
-                <TextBox Padding="2,6,2,7" x:Name="PART_EditableTextBox" Background="Transparent" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                <TextBox Padding="2,6,2,7" x:Name="PART_EditableTextBox" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
             </Border>
         </Grid>
         <ControlTemplate.Triggers>
@@ -374,14 +374,14 @@
                     <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
                     <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
                     <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
@@ -407,8 +407,8 @@
                 <TextBlock Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
-            <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="White">
+            <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
                     <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
                         <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
                             <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
@@ -422,7 +422,7 @@
             <ToggleButton Grid.Column="1" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/>
             <TextBlock Margin="8,7,8,8" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Column="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
             <Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="4,1">
-                <TextBox Padding="2,6,2,7" x:Name="PART_EditableTextBox" Background="Transparent" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                <TextBox Padding="2,6,2,7" x:Name="PART_EditableTextBox" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
             </Border>
         </Grid>
         <ControlTemplate.Triggers>
@@ -445,14 +445,14 @@
                     <Condition Property="IsMouseOver" Value="true" SourceName="border"/>
                     <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton"/>
                     <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
@@ -487,7 +487,7 @@
                                 <Condition Property="IsSelected" Value="False"/>
                                 <Condition Property="IsMouseOver" Value="True"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource BackgroundBrush}"/>
+                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryBorderBrush}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
@@ -504,7 +504,7 @@
 
     <Style x:Key="ComboBoxBaseStyle" TargetType="{x:Type ComboBox}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Background" Value="White"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="ItemContainerStyle" Value="{StaticResource ComboBoxItemBaseStyle}"/>
         <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
diff --git a/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
index 48e27fab..25839134 100644
--- a/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ContextMenuBaseStyle.xaml
@@ -64,14 +64,14 @@
                                         <Path x:Name="Glyph" Margin="2" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center" Data="F1 M 9.97498,1.22334L 4.6983,9.09834L 4.52164,9.09834L 0,5.19331L 1.27664,3.52165L 4.255,6.08833L 8.33331,1.52588e-005L 9.97498,1.22334 Z " Fill="White" FlowDirection="LeftToRight"/>
                                     </Border>
                                     <ContentPresenter x:Name="menuHeaderContainer" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                    <Popup Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=templateRoot}" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}" Placement="Bottom">
+                                    <Popup Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=templateRoot}" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.MenuPopupAnimationKey}}" Placement="Bottom">
                                         <Grid>
-                                            <Border CornerRadius="0,0,2,2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
+                                            <Border CornerRadius="0,0,2,2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
                                                 <controls:ScrollViewer VerticalScrollBarVisibility="Auto" x:Name="SubMenuScrollViewer" Margin="0,6">
                                                     <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle"/>
                                                 </controls:ScrollViewer>
                                             </Border>
-                                            <Border Height="1" Background="White" VerticalAlignment="Top" BorderThickness="1,0" BorderBrush="{DynamicResource BorderBrush}" HorizontalAlignment="Left" Width="{Binding ActualWidth,ElementName=templateRoot}"/>
+                                            <Border Height="1" Background="{DynamicResource RegionBrush}" VerticalAlignment="Top" BorderThickness="1,0" BorderBrush="{DynamicResource BorderBrush}" HorizontalAlignment="Left" Width="{Binding ActualWidth,ElementName=templateRoot}"/>
                                         </Grid>
                                     </Popup>
                                 </Grid>
@@ -88,12 +88,12 @@
                                     <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
                                 </Trigger>
                                 <Trigger Property="IsHighlighted" Value="True">
-                                    <Setter Property="Background" TargetName="templateRoot" Value="WhiteSmoke"/>
+                                    <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource SecondaryRegionBrush}"/>
                                     <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}"/>
                                 </Trigger>
                                 <Trigger Property="IsSubmenuOpen" Value="True">
                                     <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource BorderBrush}"/>
-                                    <Setter Property="Background" TargetName="templateRoot" Value="White"/>
+                                    <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource RegionBrush}"/>
                                     <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}"/>
                                 </Trigger>
                                 <Trigger Property="IsEnabled" Value="False">
@@ -180,8 +180,8 @@
                                     </Border>
                                     <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}"  x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" Grid.Column="1" ContentSource="Header" Margin="10" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Uid="ContentPresenter_39"/>
                                     <Path x:Name="Path" Grid.Column="4" Width="10" Height="10" HorizontalAlignment="Left" Data="{StaticResource RightGeometry}" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Uid="Path_16" VerticalAlignment="Center"/>
-                                    <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}" Placement="Right" VerticalOffset="-7">
-                                        <Border CornerRadius="2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
+                                    <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.MenuPopupAnimationKey}}" Placement="Right" VerticalOffset="-7">
+                                        <Border CornerRadius="2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
                                             <controls:ScrollViewer VerticalScrollBarVisibility="Auto" x:Name="SubMenuScrollViewer" Margin="0,6">
                                                 <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle"/>
                                             </controls:ScrollViewer>
@@ -210,10 +210,11 @@
     <!--普通菜单-->
     <Style x:Key="ContextMenuBaseStyle" TargetType="{x:Type ContextMenu}">
         <Setter Property="MaxHeight" Value="199"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ContextMenu}">
-                    <Border Background="White" CornerRadius="2" MaxHeight="{TemplateBinding MaxHeight}" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
+                    <Border Background="{TemplateBinding Background}" CornerRadius="2" MaxHeight="{TemplateBinding MaxHeight}" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
                         <controls:ScrollViewer  Margin="0,6" VerticalScrollBarVisibility="Auto">
                             <ItemsPresenter/>
                         </controls:ScrollViewer>
diff --git a/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml b/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml
index be2295c7..d36a7acc 100644
--- a/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/DatePickerBaseStyle.xaml
@@ -3,9 +3,7 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../../Basic/Geometries.xaml"/>
         <ResourceDictionary Source="../../Basic/Converters.xaml"/>
-        <ResourceDictionary Source="../Button.xaml"/>
         <ResourceDictionary Source="../Calendar.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
@@ -32,7 +30,7 @@
         <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
         <Setter Property="IsTodayHighlighted" Value="True"/>
         <Setter Property="SelectedDateFormat" Value="Short"/>
-        <Setter Property="Background" Value="{DynamicResource DefaultBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Height" Value="30"/>
         <Setter Property="Padding" Value="6"/>
@@ -48,7 +46,7 @@
                                 <ColumnDefinition Width="30"/>
                             </Grid.ColumnDefinitions>
                             <Button Style="{StaticResource ButtonIcon}" Padding="7" controls:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
-                            <DatePickerTextBox Padding="5,6" Margin="0,0,0,1" x:Name="PART_TextBox" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{DynamicResource DatePickerTextBoxStyle}"/>
+                            <DatePickerTextBox Foreground="{TemplateBinding Foreground}" Padding="5,6" Margin="0,0,0,1" x:Name="PART_TextBox" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}"/>
                             <Popup Grid.Column="0" VerticalOffset="1" x:Name="PART_Popup" PopupAnimation="Fade" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_TextBox}" StaysOpen="False"/>
                         </Grid>
                     </Border>
@@ -61,7 +59,7 @@
                                 <Condition Property="IsMouseOver" Value="true"/>
                                 <Condition Property="IsOpen" Value="false" SourceName="PART_Popup"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryTextBrush}"/>
+                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
diff --git a/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml
index cd53bdae..4ec69915 100644
--- a/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ListBoxBaseStyle.xaml
@@ -7,10 +7,11 @@
         <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="Padding" Value="10,0"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="Height" Value="32"/>
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Background" Value="White"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Template">
@@ -35,8 +36,8 @@
                     <Condition Property="IsSelected" Value="true"/>
                     <Condition Property="Selector.IsSelectionActive" Value="false"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}"/>
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightTextBrushKey}}"/>
+                <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
+                <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
             </MultiTrigger>
             <Trigger Property="IsEnabled" Value="false">
                 <Setter Property="Opacity" Value=".4"/>
@@ -59,7 +60,7 @@
     </Style>
 
     <Style x:Key="ListBoxBaseStyle" TargetType="{x:Type ListBox}">
-        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
diff --git a/HandyControl/Themes/Styles/Base/NumericUpDownBaseStyle.xaml b/HandyControl/Themes/Styles/Base/NumericUpDownBaseStyle.xaml
index 3ac5aeb3..3426a70b 100644
--- a/HandyControl/Themes/Styles/Base/NumericUpDownBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/NumericUpDownBaseStyle.xaml
@@ -10,7 +10,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="NumericUpDownBaseStyle" TargetType="controls:NumericUpDown">
-        <Setter Property="Background" Value="White"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
@@ -19,7 +19,7 @@
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="AllowDrop" Value="true"/>
-        <Setter Property="Padding" Value="5,6"/>
+        <Setter Property="Padding" Value="4,6,5,6"/>
         <Setter Property="Height" Value="30"/>
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
@@ -33,7 +33,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <Border Grid.ColumnSpan="2" x:Name="border" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                            <TextBox Focusable="True" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Background="Transparent" x:Name="PART_TextBox" BorderThickness="0" Style="{x:Null}" Padding="{TemplateBinding Padding}" Margin="0,0,30,1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                            <TextBox Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Background="{TemplateBinding Background}" x:Name="PART_TextBox" BorderThickness="0" Style="{x:Null}" Padding="{TemplateBinding Padding}" Margin="2,0,30,1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                         </Border>
                         <Button Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,16" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=border}" controls:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
                         <Button Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,16,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=border}" controls:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
@@ -43,13 +43,13 @@
                             <Setter Property="Opacity" TargetName="border" Value="0.4"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryTextBrush}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
                         </Trigger>
                         <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
                             <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}"/>
                         </Trigger>
                         <Trigger Property="ShowUpDownButton" Value="False">
-                            <Setter Property="Margin" TargetName="PART_TextBox" Value="0,0,0,1"/>
+                            <Setter Property="Margin" TargetName="PART_TextBox" Value="2,0,2,1"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/HandyControl/Themes/Styles/Base/PasswordBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/PasswordBoxBaseStyle.xaml
index 7e9841f8..8aa8a938 100644
--- a/HandyControl/Themes/Styles/Base/PasswordBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/PasswordBoxBaseStyle.xaml
@@ -3,7 +3,7 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <Style x:Key="PasswordBoxBaseStyle" TargetType="{x:Type PasswordBox}">
-        <Setter Property="Background" Value="White"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
@@ -29,7 +29,7 @@
                             <Setter Property="Opacity" TargetName="border" Value="0.4"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryTextBrush}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}"/>
                         </Trigger>
                         <Trigger Property="IsFocused" Value="true">
                             <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}"/>
diff --git a/HandyControl/Themes/Styles/Base/ProgressBarBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ProgressBarBaseStyle.xaml
index 0d607653..1b7a0f6d 100644
--- a/HandyControl/Themes/Styles/Base/ProgressBarBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ProgressBarBaseStyle.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <LinearGradientBrush x:Key="ProgressBarIndicatorAnimatedFill" StartPoint="0,0" EndPoint="1,0">
         <GradientStop Color="#00FFFFFF" Offset="0"/>
@@ -10,38 +11,57 @@
 
     <Style x:Key="ProgressBarBaseStyle" TargetType="{x:Type ProgressBar}">
         <Setter Property="Height" Value="20"/>
-        <Setter Property="Background" Value="#f5f5f5"/>
-        <Setter Property="BorderBrush" Value="#19000000"/>
-        <Setter Property="BorderThickness" Value="1,1,1,0"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ProgressBar}">
                     <Grid>
-                        <Border x:Name="TemplateRoot" CornerRadius="4" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                            <Border.Effect>
-                                <BlurEffect Radius="2"/>
-                            </Border.Effect>
-                        </Border>
+                        <Border x:Name="TemplateRoot" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
                         <Grid Margin="{TemplateBinding BorderThickness}">
                             <Rectangle x:Name="PART_Track"/>
                             <Grid HorizontalAlignment="Left">
-                                <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left" Margin="0,-1,0,0">
-                                    <Border CornerRadius="4" x:Name="Animation" ClipToBounds="true" Background="{TemplateBinding Foreground}">
+                                <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
+                                    <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="Animation" ClipToBounds="true" Background="{TemplateBinding Foreground}">
                                         <Rectangle x:Name="PART_GlowRect" Fill="{StaticResource ProgressBarIndicatorAnimatedFill}" HorizontalAlignment="Left" Margin="-100,0,0,0" Width="100"/>
                                     </Border>
                                 </Decorator>
-                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Value,RelativeSource={RelativeSource FindAncestor,AncestorType=ProgressBar},StringFormat={}{0} %}"/>
+                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Value,RelativeSource={RelativeSource TemplatedParent},StringFormat={}{0} %}"/>
                             </Grid>
                         </Grid>
                     </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ProgressBarStripeBaseStyle" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ProgressBar">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="OnLoaded">
+                            <DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(Border.Background).(Brush.Transform).(TransformGroup.Children)[1].(TranslateTransform.X)" Storyboard.TargetName="Indicator">
+                                <LinearDoubleKeyFrame KeyTime="0" Value="0"/>
+                                <LinearDoubleKeyFrame KeyTime="0:0:.25" Value="21"/>
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Grid x:Name="TemplateRoot" SnapsToDevicePixels="true">
+                        <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
+                        <Rectangle x:Name="PART_Track" Margin="1"/>
+                        <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left" Margin="1">
+                            <Grid x:Name="Foreground">
+                                <Border x:Name="Indicator" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Foreground}"/>
+                            </Grid>
+                        </Decorator>
+                    </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="Orientation" Value="Vertical">
-                            <Setter Property="LayoutTransform" TargetName="TemplateRoot">
-                                <Setter.Value>
-                                    <RotateTransform Angle="-90"/>
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
+                        <EventTrigger RoutedEvent="FrameworkElement.Loaded" SourceName="Indicator">
+                            <BeginStoryboard Storyboard="{StaticResource OnLoaded}"/>
+                        </EventTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/HandyControl/Themes/Styles/Base/RadioButtonBaseStyle.xaml b/HandyControl/Themes/Styles/Base/RadioButtonBaseStyle.xaml
index 369d8dab..b90c8d32 100644
--- a/HandyControl/Themes/Styles/Base/RadioButtonBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/RadioButtonBaseStyle.xaml
@@ -3,7 +3,7 @@
 
     <Style x:Key="RadioButtonBaseStyle" TargetType="RadioButton">
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Background" Value="White"/>
+        <Setter Property="Background" Value="{DynamicResource DefaultBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
@@ -53,7 +53,7 @@
                             <Setter Property="Visibility" TargetName="contentPresenter" Value="Visible"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
diff --git a/HandyControl/Themes/Styles/Base/TabControlBaseStyle.xaml b/HandyControl/Themes/Styles/Base/TabControlBaseStyle.xaml
index 495a1448..5e26bf07 100644
--- a/HandyControl/Themes/Styles/Base/TabControlBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/TabControlBaseStyle.xaml
@@ -4,7 +4,7 @@
     <Style x:Key="TabItemStyle" TargetType="{x:Type TabItem}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="Background" Value="White"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
         <Setter Property="Margin" Value="0"/>
         <Setter Property="Padding" Value="10,6"/>
@@ -42,6 +42,7 @@
     </Style>
 
     <Style x:Key="TabControlBaseStyle" TargetType="{x:Type TabControl}">
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Foreground" Value="White"/>
         <Setter Property="ItemContainerStyle" Value="{StaticResource TabItemStyle}"/>
@@ -49,7 +50,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
                     <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-                        <Grid x:Name="templateRoot" Background="White" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+                        <Grid x:Name="templateRoot" Background="{DynamicResource RegionBrush}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition x:Name="ColumnDefinition0"/>
                                 <ColumnDefinition x:Name="ColumnDefinition1" Width="0"/>
diff --git a/HandyControl/Themes/Styles/Base/TextBlockBaseStyle.xaml b/HandyControl/Themes/Styles/Base/TextBlockBaseStyle.xaml
index 8f2b109d..fec5fae8 100644
--- a/HandyControl/Themes/Styles/Base/TextBlockBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/TextBlockBaseStyle.xaml
@@ -1,11 +1,15 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Basic/Fonts.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
     <Style x:Key="TextBlockBaseStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="FontSize" Value="{DynamicResource TextFontSize}"/>
+        <Setter Property="FontSize" Value="{StaticResource TextFontSize}"/>
     </Style>
 
     <Style x:Key="TextBlockBoldBaseStyle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="{x:Type TextBlock}">
diff --git a/HandyControl/Themes/Styles/Base/TextBoxBaseStyle.xaml b/HandyControl/Themes/Styles/Base/TextBoxBaseStyle.xaml
index 15c14f88..5c9b4981 100644
--- a/HandyControl/Themes/Styles/Base/TextBoxBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/TextBoxBaseStyle.xaml
@@ -10,12 +10,12 @@
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="Padding" Value="6"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:WatermarkTextBox">
                     <Grid x:Name="WatermarkContent">
-                        <Border x:Name="ContentElement"/>
                         <Border x:Name="watermark_decorator">
                             <ContentControl VerticalAlignment="{TemplateBinding VerticalContentAlignment}" TextElement.Foreground="{DynamicResource ThirdlyTextBrush}" Margin="7,6" x:Name="PART_Watermark" Focusable="False" IsHitTestVisible="False" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" Padding="0"/>
                         </Border>
@@ -27,10 +27,11 @@
     </Style>
 
     <Style x:Key="TextBoxBaseStyle" TargetType="TextBox">
-        <Setter Property="Background" Value="White"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
         <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
@@ -52,7 +53,7 @@
                             <Setter Property="Opacity" TargetName="border" Value="0.4"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryTextBrush}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}"/>
                         </Trigger>
                         <Trigger Property="IsFocused" Value="true">
                             <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}"/>
diff --git a/HandyControl/Themes/Styles/Base/TimePickerBaseStyle.xaml b/HandyControl/Themes/Styles/Base/TimePickerBaseStyle.xaml
index d98952de..c37a79ed 100644
--- a/HandyControl/Themes/Styles/Base/TimePickerBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/TimePickerBaseStyle.xaml
@@ -10,7 +10,7 @@
     <Style x:Key="TimePickerBaseStyle" TargetType="controls:TimePicker">
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
-        <Setter Property="Background" Value="{DynamicResource DefaultBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Height" Value="30"/>
         <Setter Property="BorderThickness" Value="1"/>
@@ -25,7 +25,7 @@
                                 <ColumnDefinition Width="30"/>
                             </Grid.ColumnDefinitions>
                             <Button Style="{StaticResource ButtonIcon}" Padding="7" controls:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
-                            <controls:WatermarkTextBox Padding="5,6" Margin="0,0,0,1" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                            <controls:WatermarkTextBox CaretBrush="{TemplateBinding Foreground}" Padding="5,6" Margin="0,0,0,1" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                             <Popup Grid.Column="0" VerticalOffset="1" x:Name="PART_Popup" PopupAnimation="Fade" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_TextBox}" StaysOpen="False">
                                 <controls:Clock x:Name="PART_Clock" ShowConfirmButton="True"/>
                             </Popup>
@@ -40,7 +40,7 @@
                                 <Condition Property="IsMouseOver" Value="true"/>
                                 <Condition Property="IsOpen" Value="false" SourceName="PART_Popup"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
diff --git a/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml b/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
index 0b7c4c2f..be7bdfdb 100644
--- a/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
+++ b/HandyControl/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
@@ -53,7 +53,7 @@
 
     <Style x:Key="ToggleButtonSwitchBaseStyle" TargetType="ToggleButton">
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Background" Value="White"/>
+        <Setter Property="Background" Value="{DynamicResource DefaultBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="0"/>
@@ -123,7 +123,7 @@
                         </Grid.ColumnDefinitions>
                         <Border Height="22" Width="36" x:Name="backBorder" Background="{DynamicResource BorderBrush}" CornerRadius="11"/>
                         <Border Grid.Column="0" Height="22" Width="36" x:Name="lightBorder" Background="{DynamicResource PrimaryBrush}" CornerRadius="11" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
-                        <Border Grid.Column="0" Margin="1" Background="White" CornerRadius="11" Name="innerBorder" RenderTransformOrigin=".8,0.5">
+                        <Border Grid.Column="0" Margin="1" Background="{TemplateBinding Background}" CornerRadius="11" Name="innerBorder" RenderTransformOrigin=".8,0.5">
                             <Border.RenderTransform>
                                 <TransformGroup>
                                     <ScaleTransform/>
@@ -164,8 +164,8 @@
 
     <Style x:Key="ToggleButtonIconBaseStyle" TargetType="{x:Type ToggleButton}">
         <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
-        <Setter Property="Width" Value="{DynamicResource DefaultControlHeight}"/>
-        <Setter Property="Height" Value="{DynamicResource DefaultControlHeight}"/>
+        <Setter Property="Width" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="Padding" Value="8"/>
         <Setter Property="controls:IconSwitchElement.Geometry" Value="{x:Null}"/>
         <Setter Property="controls:IconSwitchElement.GeometrySelected" Value="{x:Null}"/>
diff --git a/HandyControl/Themes/Styles/Button.xaml b/HandyControl/Themes/Styles/Button.xaml
index 32eb0aba..80178b09 100644
--- a/HandyControl/Themes/Styles/Button.xaml
+++ b/HandyControl/Themes/Styles/Button.xaml
@@ -7,7 +7,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style BasedOn="{StaticResource ButtonBaseStyle}" TargetType="{x:Type Button}">
-        <Setter Property="Background" Value="{DynamicResource DefaultBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Style.Triggers>
diff --git a/HandyControl/Themes/Styles/Calendar.xaml b/HandyControl/Themes/Styles/Calendar.xaml
index e78d8265..5415cd71 100644
--- a/HandyControl/Themes/Styles/Calendar.xaml
+++ b/HandyControl/Themes/Styles/Calendar.xaml
@@ -29,7 +29,7 @@
                                 <VisualState x:Name="Selected">
                                     <Storyboard>
                                         <DoubleAnimation Duration="0:0:.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SelectedBackground"/>
-                                        <ColorAnimation Duration="0" To="#FFFFFFFF" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText"/>
+                                        <ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText"/>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -47,7 +47,11 @@
                         </VisualStateManager.VisualStateGroups>
                         <Rectangle x:Name="SelectedBackground" Fill="{DynamicResource DangerBrush}" Opacity="0" RadiusY="16" RadiusX="16"/>
                         <Rectangle x:Name="Background" Fill="{TemplateBinding Background}" Opacity="0" RadiusY="16" RadiusX="16"/>
-                        <ContentPresenter x:Name="NormalText" TextElement.Foreground="#212121" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <ContentPresenter x:Name="NormalText" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <TextElement.Foreground>
+                                <SolidColorBrush Color="{DynamicResource PrimaryTextColor}"/>
+                            </TextElement.Foreground>
+                        </ContentPresenter>
                         <Rectangle x:Name="CalendarButtonFocusVisual" IsHitTestVisible="false" RadiusY="16" RadiusX="16" Stroke="{DynamicResource PrimaryBrush}" Visibility="Collapsed"/>
                     </Grid>
                     <ControlTemplate.Triggers>
@@ -92,7 +96,7 @@
                                 <VisualState x:Name="Selected">
                                     <Storyboard>
                                         <DoubleAnimation Duration="0:0:.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SelectedBackground"/>
-                                        <ColorAnimation Duration="0" To="#FFFFFFFF" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText"/>
+                                        <ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText"/>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -115,14 +119,18 @@
                                 <VisualState x:Name="Today">
                                     <Storyboard>
                                         <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="TodayBackground"/>
-                                        <ColorAnimation Duration="0" To="#FFFFFFFF" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText"/>
+                                        <ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText"/>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                         <Rectangle RadiusX="16" RadiusY="16" x:Name="TodayBackground" Fill="{DynamicResource DangerBrush}" Opacity="0"/>
                         <Rectangle x:Name="SelectedBackground" Fill="{DynamicResource PrimaryBrush}" Opacity="0" RadiusY="16" RadiusX="16"/>
-                        <ContentPresenter x:Name="NormalText" TextElement.Foreground="#212121" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <ContentPresenter x:Name="NormalText" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <TextElement.Foreground>
+                                <SolidColorBrush Color="{DynamicResource PrimaryTextColor}"/>
+                            </TextElement.Foreground>
+                        </ContentPresenter>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -162,7 +170,7 @@
                                         <RowDefinition Height="Auto"/>
                                         <RowDefinition Height="*"/>
                                     </Grid.RowDefinitions>
-                                    <Border Background="{DynamicResource PrimaryBrush}" Grid.ColumnSpan="3"/>
+                                    <Border Background="{DynamicResource TitleBrush}" Grid.ColumnSpan="3"/>
                                     <Button x:Name="PART_PreviousButton" Width="50" HorizontalAlignment="Left" Grid.Column="0" Height="50" Padding="16" Focusable="False" Grid.Row="0" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource LeftGeometry}"/>
                                     <Button x:Name="PART_HeaderButton" Foreground="White" Grid.Column="1" FontWeight="Bold" FontSize="16" HorizontalAlignment="Center" Grid.Row="0" Style="{StaticResource ButtonCustom}"/>
                                     <Button x:Name="PART_NextButton" Width="50" HorizontalAlignment="Right" Height="50" Padding="16" Grid.Column="2" Focusable="False" Grid.Row="0" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource RightGeometry}"/>
@@ -219,8 +227,8 @@
     </Style>
 
     <Style x:Key="CalendarBaseStyle" TargetType="{x:Type Calendar}">
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="Background" Value="White"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="CalendarDayButtonStyle" Value="{StaticResource CalendarDayButtonStyle}"/>
diff --git a/HandyControl/Themes/Styles/Clock.xaml b/HandyControl/Themes/Styles/Clock.xaml
index 74452dd3..ff03faa5 100644
--- a/HandyControl/Themes/Styles/Clock.xaml
+++ b/HandyControl/Themes/Styles/Clock.xaml
@@ -4,7 +4,6 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Basic/Effects.xaml"/>
         <ResourceDictionary Source="../Basic/Converters.xaml"/>
         <ResourceDictionary Source="Button.xaml"/>
     </ResourceDictionary.MergedDictionaries>
@@ -65,6 +64,7 @@
         <Setter Property="Height" Value="290"/>
         <Setter Property="VerticalAlignment" Value="Top"/>
         <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="ClockRadioButtonStyle" Value="{StaticResource ClockRadioButtonStyle}"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -75,10 +75,10 @@
                                 <RowDefinition Height="40"/>
                                 <RowDefinition/>
                             </Grid.RowDefinitions>
-                            <Border Background="{DynamicResource PrimaryBrush}" Name="PART_BorderTitle">
+                            <Border Background="{DynamicResource TitleBrush}" Name="PART_BorderTitle">
                                 <TextBlock x:Name="PART_TimeStr" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Foreground="White"/>
                             </Border>
-                            <Border Grid.Row="1" Background="White">
+                            <Border Grid.Row="1" Background="{TemplateBinding Background}">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition/>
@@ -86,13 +86,13 @@
                                         <ColumnDefinition/>
                                     </Grid.ColumnDefinitions>
                                     <Canvas Grid.ColumnSpan="3" Margin="0,16,0,0" VerticalAlignment="Top" Name="PART_Canvas" Width="178" Height="178">
-                                        <Border Background="{DynamicResource DarkDefaultBrush}" Width="178" Height="178" CornerRadius="89"/>
+                                        <Border Background="{DynamicResource SecondaryRegionBrush}" Width="178" Height="178" CornerRadius="89"/>
                                         <controls:CirclePanel Diameter="130" x:Name="PART_PanelNum" KeepVertical="True" Margin="24,24,0,0" OffsetAngle="-60"/>
                                         <Border Focusable="False" Name="PART_BorderClock"  Background="{DynamicResource PrimaryBrush}" RenderTransformOrigin="0.5,1" Height="63" Width="2" Canvas.Left="88" Canvas.Top="26"/>
                                         <Ellipse Fill="White" Width="8" Height="8" StrokeThickness="2" Stroke="{DynamicResource PrimaryBrush}" Canvas.Top="85" Canvas.Left="85"/>
                                     </Canvas>
                                     <controls:ClockRadioButton Background="{DynamicResource PrimaryBrush}" Grid.Column="0" x:Name="PART_ButtonAm" IsChecked="True" Height="30" Width="30" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="16,0,0,16" Content="{x:Static langs:Lang.Am}" Style="{StaticResource ClockRadioButtonStyle}"/>
-                                    <controls:ClockRadioButton Background="{DynamicResource PrimaryBrush}" Grid.Column="2" x:Name="PART_ButtonPm" Height="30" Width="30" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,16" Content="{x:Static langs:Lang.Pm}" Style="{DynamicResource ClockRadioButtonStyle}"/>
+                                    <controls:ClockRadioButton Background="{DynamicResource PrimaryBrush}" Grid.Column="2" x:Name="PART_ButtonPm" Height="30" Width="30" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,16" Content="{x:Static langs:Lang.Pm}" Style="{StaticResource ClockRadioButtonStyle}"/>
                                     <Button Grid.Column="1" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm"  Content="{x:Static langs:Lang.Confirm}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" Margin="0,0,0,19" Height="24" Width="60" VerticalAlignment="Bottom" Background="Transparent" Style="{StaticResource ButtonCustom}"/>
                                 </Grid>
                             </Border>
diff --git a/HandyControl/Themes/Styles/ColorPicker.xaml b/HandyControl/Themes/Styles/ColorPicker.xaml
index 0f3e5c0f..8a482e07 100644
--- a/HandyControl/Themes/Styles/ColorPicker.xaml
+++ b/HandyControl/Themes/Styles/ColorPicker.xaml
@@ -13,6 +13,7 @@
 
     <Style TargetType="controls:ColorPicker">
         <Setter Property="Width" Value="230"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -24,7 +25,7 @@
                             <RowDefinition Height="62"/>
                             <RowDefinition Height="62"/>
                         </Grid.RowDefinitions>
-                        <Border BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Grid.RowSpan="4" Background="White"/>
+                        <Border BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Grid.RowSpan="4" Background="{TemplateBinding Background}"/>
                         <Grid Margin="1" Grid.Row="0">
                             <Border Background="{TemplateBinding BackColor}"/>
                             <Border>
@@ -76,7 +77,7 @@
                             </StackPanel>
                             <UniformGrid Name="PART_PanelRgb" Visibility="{Binding ShowList[1],RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" Rows="1" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="-2,14,-2,0" VerticalAlignment="Top">
                                 <StackPanel Margin="2,0">
-                                    <controls:NumericUpDown HorizontalContentAlignment="Center" Padding="0" Tag="R" Value="{Binding ChannelR,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
+                                    <controls:NumericUpDown HorizontalContentAlignment="Center" Padding="2,0" Tag="R" Value="{Binding ChannelR,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
                                     <TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,6,0,0" FontSize="10" Text="R" HorizontalAlignment="Center"/>
                                 </StackPanel>
                                 <StackPanel Margin="2,0">
@@ -92,16 +93,16 @@
                                     <TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,6,0,0" FontSize="10" Text="A" HorizontalAlignment="Center"/>
                                 </StackPanel>
                             </UniformGrid>
-                            <Button Command="interactivity:ControlCommands.Switch" Padding="6" FontSize="8" BorderThickness="0" Foreground="#323534" HorizontalAlignment="Right" Height="24" Width="20" Grid.Column="2" Grid.Row="1">
+                            <Button Command="interactivity:ControlCommands.Switch" Padding="6" FontSize="8" BorderThickness="0" HorizontalAlignment="Right" Height="24" Width="20" Grid.Column="2" Grid.Row="1">
                                 <Button.Content>
                                     <Path Fill="#323534" Style="{StaticResource UpDownPathStyle}"/>
                                 </Button.Content>
                             </Button>
                         </Grid>
-                        <Border Grid.Row="2" BorderThickness="0,1,0,0" BorderBrush="{StaticResource BorderBrush}">
+                        <Border Grid.Row="2" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}">
                             <WrapPanel Name="PART_PanelColor" Margin="12,12,0,12" HorizontalAlignment="Center"/>
                         </Border>
-                        <Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="{StaticResource BorderBrush}">
+                        <Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}">
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                                 <Button Command="interactivity:ControlCommands.Cancel" Content="{x:Static langs:Lang.Cancel}" Width="80" Margin="0,0,16,0"/>
                                 <Button Command="interactivity:ControlCommands.Confirm" Content="{x:Static langs:Lang.Confirm}" Width="80" Style="{StaticResource ButtonPrimary}"/>
diff --git a/HandyControl/Themes/Styles/ComboBox.xaml b/HandyControl/Themes/Styles/ComboBox.xaml
index 1abac22b..c69e3a70 100644
--- a/HandyControl/Themes/Styles/ComboBox.xaml
+++ b/HandyControl/Themes/Styles/ComboBox.xaml
@@ -2,9 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Basic/Converters.xaml"/>
         <ResourceDictionary Source="Base/ComboBoxBaseStyle.xaml"/>
-        <ResourceDictionary Source="TextBlock.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox"/>
diff --git a/HandyControl/Themes/Styles/DataGrid.xaml b/HandyControl/Themes/Styles/DataGrid.xaml
index a8c453b3..75e7192b 100644
--- a/HandyControl/Themes/Styles/DataGrid.xaml
+++ b/HandyControl/Themes/Styles/DataGrid.xaml
@@ -3,8 +3,6 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Basic/Converters.xaml"/>
-        <ResourceDictionary Source="../Basic/Geometries.xaml"/>
         <ResourceDictionary Source="Base/ScrollViewerBaseStyle.xaml"/>
         <ResourceDictionary Source="Button.xaml"/>
         <ResourceDictionary Source="ToggleButton.xaml"/>
@@ -53,7 +51,8 @@
         </Style.Triggers>
     </Style>
     <Style x:Key="DataGridRowStyle" TargetType="{x:Type DataGridRow}">
-        <Setter Property="Background" Value="White"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="SnapsToDevicePixels" Value="true"/>
         <Setter Property="Margin" Value="0,0,0,4"/>
         <Setter Property="Padding" Value="0,6"/>
@@ -106,6 +105,7 @@
     </Style>
     <Style x:Key="DataGridColumnHeaderStyle" TargetType="{x:Type DataGridColumnHeader}">
         <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="Padding" Value="12,6,12,12"/>
         <Setter Property="MinHeight" Value="44"/>
         <Setter Property="Template">
@@ -176,7 +176,7 @@
         <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
     </Style>
     <Style TargetType="{x:Type DataGrid}">
-        <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="GridLinesVisibility" Value="None"/>
diff --git a/HandyControl/Themes/Styles/DatePicker.xaml b/HandyControl/Themes/Styles/DatePicker.xaml
index 5afd9864..a62bd2a5 100644
--- a/HandyControl/Themes/Styles/DatePicker.xaml
+++ b/HandyControl/Themes/Styles/DatePicker.xaml
@@ -27,7 +27,7 @@
                     </Grid.ColumnDefinitions>
 
                     <Button Style="{StaticResource ButtonIcon}" Padding="7" controls:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
-                    <DatePickerTextBox x:Name="PART_TextBox" Grid.Column="0" Padding="5,6" Margin="0,0,0,1" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{DynamicResource DatePickerTextBoxStyle}"/>
+                    <DatePickerTextBox x:Name="PART_TextBox" Foreground="{TemplateBinding Foreground}" Grid.Column="0" Padding="5,6" Margin="0,0,0,1" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}"/>
                     <Popup Grid.Column="0" VerticalOffset="1" x:Name="PART_Popup" PopupAnimation="Fade" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_TextBox}" StaysOpen="False"/>
                 </Grid>
             </Border>
@@ -41,7 +41,7 @@
                     <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot"/>
                     <Condition Property="IsOpen" Value="false" SourceName="PART_Popup"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
@@ -77,7 +77,7 @@
                     </Grid.ColumnDefinitions>
 
                     <Button Style="{StaticResource ButtonIcon}" Padding="7" controls:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
-                    <DatePickerTextBox x:Name="PART_TextBox" Padding="5,6" Margin="0,0,0,1" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{DynamicResource DatePickerTextBoxStyle}"/>
+                    <DatePickerTextBox x:Name="PART_TextBox" Foreground="{TemplateBinding Foreground}" Padding="5,6" Margin="0,0,0,1" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}"/>
                     <Popup Grid.Column="0" VerticalOffset="1" x:Name="PART_Popup" PopupAnimation="Fade" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_TextBox}" StaysOpen="False"/>
                 </Grid>
             </Border>
@@ -91,7 +91,7 @@
                     <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot"/>
                     <Condition Property="IsOpen" Value="false" SourceName="PART_Popup"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
diff --git a/HandyControl/Themes/Styles/Expander.xaml b/HandyControl/Themes/Styles/Expander.xaml
index 8b928dc0..860e297b 100644
--- a/HandyControl/Themes/Styles/Expander.xaml
+++ b/HandyControl/Themes/Styles/Expander.xaml
@@ -5,17 +5,16 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Basic/Geometries.xaml"/>
         <ResourceDictionary Source="ToggleButton.xaml"/>
-        <ResourceDictionary Source="TextBlock.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="{x:Type Expander}">
         <Setter Property="Foreground" Value="White"/>
-        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource TitleBrush}"/>
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
         <Setter Property="VerticalContentAlignment" Value="Stretch"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="MinHeight" Value="40"/>
+        <Setter Property="MinHeight" Value="32"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Expander}">
diff --git a/HandyControl/Themes/Styles/Growl.xaml b/HandyControl/Themes/Styles/Growl.xaml
index fee2aaff..75b56874 100644
--- a/HandyControl/Themes/Styles/Growl.xaml
+++ b/HandyControl/Themes/Styles/Growl.xaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:HandyControl.Controls"
-                    xmlns:langs="clr-namespace:HandyControl.Properties.Langs"
                     xmlns:interactivity="clr-namespace:HandyControl.Interactivity">
 
     <ResourceDictionary.MergedDictionaries>
@@ -17,6 +15,7 @@
         <Setter Property="Width" Value="320"/>
         <Setter Property="Margin" Value="10,0,0,10"/>
         <Setter Property="MaxWidth" Value="320"/>
+        <Setter Property="Background" Value="{DynamicResource ThirdlyRegionBrush}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:Growl">
@@ -35,7 +34,7 @@
                             <RowDefinition/>
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="White" CornerRadius="8" Width="320"/>
+                        <Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="8" Width="320"/>
                         <Path Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="0,15,0,0" Width="30" Height="30" Data="{TemplateBinding Icon}" Stretch="Uniform" Fill="{TemplateBinding IconBrush}"/>
                         <StackPanel VerticalAlignment="Center" Grid.Row="0" Grid.Column="1" Margin="0,10,10,10">
                             <TextBlock Text="{TemplateBinding Message}" Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Left" TextWrapping="Wrap"/>
diff --git a/HandyControl/Themes/Styles/Image.xaml b/HandyControl/Themes/Styles/Image.xaml
new file mode 100644
index 00000000..5fd888c7
--- /dev/null
+++ b/HandyControl/Themes/Styles/Image.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <Style TargetType="Image">
+        <Setter Property="Stretch" Value="Uniform" />
+        <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/NumericUpDown.xaml b/HandyControl/Themes/Styles/NumericUpDown.xaml
index 98090d0d..d562f20b 100644
--- a/HandyControl/Themes/Styles/NumericUpDown.xaml
+++ b/HandyControl/Themes/Styles/NumericUpDown.xaml
@@ -5,9 +5,7 @@
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Basic/Converters.xaml"/>
         <ResourceDictionary Source="Base/NumericUpDownBaseStyle.xaml"/>
-        <ResourceDictionary Source="TextBlock.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="controls:NumericUpDown"/>
@@ -19,7 +17,7 @@
                 <RowDefinition Height="{Binding Path=(controls:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}"/>
             </Grid.RowDefinitions>
             <StackPanel Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" Margin="7,4">
-                <TextBlock Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock Foreground="{TemplateBinding Foreground}" Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
             <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
@@ -28,7 +26,7 @@
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="30"/>
                     </Grid.ColumnDefinitions>
-                    <controls:WatermarkTextBox x:Name="PART_TextBox" Padding="5,6" Margin="0,0,0,1" Watermark="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    <controls:WatermarkTextBox CaretBrush="{TemplateBinding Foreground}" x:Name="PART_TextBox" Padding="5,6" Margin="0,0,0,1" Watermark="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     <Button Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,16" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" controls:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
                     <Button Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,16,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" controls:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
                 </Grid>
@@ -39,7 +37,7 @@
                 <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
                 <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}"/>
@@ -54,7 +52,7 @@
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <StackPanel Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,7,6,8">
-                <TextBlock Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock Foreground="{TemplateBinding Foreground}" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
             <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
@@ -63,7 +61,7 @@
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="30"/>
                     </Grid.ColumnDefinitions>
-                    <controls:WatermarkTextBox x:Name="PART_TextBox" Padding="5,6" Margin="0,0,0,1" Watermark="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    <controls:WatermarkTextBox CaretBrush="{TemplateBinding Foreground}" x:Name="PART_TextBox" Padding="5,6" Margin="0,0,0,1" Watermark="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     <Button Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,16" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" controls:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
                     <Button Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,16,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" controls:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
                 </Grid>
@@ -74,7 +72,7 @@
                 <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
                 <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}"/>
diff --git a/HandyControl/Themes/Styles/Pagination.xaml b/HandyControl/Themes/Styles/Pagination.xaml
index 73503683..857b2511 100644
--- a/HandyControl/Themes/Styles/Pagination.xaml
+++ b/HandyControl/Themes/Styles/Pagination.xaml
@@ -20,7 +20,7 @@
         <Setter Property="Margin" Value="5,0"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="RenderTransformOrigin" Value=".5,.5"/>
-        <Setter Property="Background" Value="White"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Tag" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -70,7 +70,7 @@
                         </Grid.ColumnDefinitions>
                         <!--向左切换-->
                         <Button x:Name="PART_ButtonLeft" Command="interactivity:ControlCommands.Prev" Margin="5,0" VerticalAlignment="Center" Style="{StaticResource ButtonCustom}">
-                            <Border CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Width="30" Height="30" Background="White">
+                            <Border CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Width="30" Height="30" Background="{DynamicResource RegionBrush}">
                                 <Path Margin="10" Fill="{DynamicResource PrimaryTextBrush}" Style="{StaticResource LeftPathStyle}"/>
                             </Border>
                         </Button>
@@ -90,7 +90,7 @@
                         </StackPanel>
                         <!--向右切换-->
                         <Button x:Name="PART_ButtonRight" Grid.Column="2" Command="interactivity:ControlCommands.Next" Margin="5,0" VerticalAlignment="Center" Style="{StaticResource ButtonCustom}">
-                            <Border BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" CornerRadius="2" Width="30" Height="30" Background="White">
+                            <Border BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" CornerRadius="2" Width="30" Height="30" Background="{DynamicResource RegionBrush}">
                                 <Path Margin="10" Fill="{DynamicResource PrimaryTextBrush}" Style="{StaticResource RightPathStyle}" RenderTransformOrigin="0.5,0.5"/>
                             </Border>
                         </Button>
diff --git a/HandyControl/Themes/Styles/PasswordBox.xaml b/HandyControl/Themes/Styles/PasswordBox.xaml
index f4409870..2039e0c2 100644
--- a/HandyControl/Themes/Styles/PasswordBox.xaml
+++ b/HandyControl/Themes/Styles/PasswordBox.xaml
@@ -33,7 +33,7 @@
                 <Setter Property="Opacity" TargetName="border" Value="0.4"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <Trigger Property="IsFocused" Value="true">
                 <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}"/>
@@ -63,7 +63,7 @@
                 <Setter Property="Opacity" TargetName="border" Value="0.4"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <Trigger Property="IsFocused" Value="true">
                 <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}"/>
diff --git a/HandyControl/Themes/Styles/ProgressBar.xaml b/HandyControl/Themes/Styles/ProgressBar.xaml
index 9c0f9594..223be237 100644
--- a/HandyControl/Themes/Styles/ProgressBar.xaml
+++ b/HandyControl/Themes/Styles/ProgressBar.xaml
@@ -25,7 +25,7 @@
         <Setter Property="Foreground" Value="{DynamicResource DangerBrush}"/>
     </Style>
 
-    <Style x:Key="ProgressBarPrimaryStripe" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="{x:Type ProgressBar}">
+    <Style x:Key="ProgressBarPrimaryStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="{x:Type ProgressBar}">
         <Setter Property="Foreground">
             <Setter.Value>
                 <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
@@ -53,41 +53,9 @@
                 </DrawingBrush>
             </Setter.Value>
         </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ProgressBar}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="OnLoaded">
-                            <DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(Border.Background).(Brush.Transform).(TransformGroup.Children)[1].(TranslateTransform.X)" Storyboard.TargetName="Indicator">
-                                <LinearDoubleKeyFrame KeyTime="0" Value="0"/>
-                                <LinearDoubleKeyFrame KeyTime="0:0:.25" Value="21"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <Grid x:Name="TemplateRoot" SnapsToDevicePixels="true">
-                        <Border CornerRadius="4" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                            <Border.Effect>
-                                <BlurEffect Radius="2"/>
-                            </Border.Effect>
-                        </Border>
-                        <Rectangle x:Name="PART_Track" Margin="1"/>
-                        <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left" Margin="1">
-                            <Grid x:Name="Foreground">
-                                <Border x:Name="Indicator" CornerRadius="4" Background="{TemplateBinding Foreground}"/>
-                            </Grid>
-                        </Decorator>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <EventTrigger RoutedEvent="FrameworkElement.Loaded" SourceName="Indicator">
-                            <BeginStoryboard Storyboard="{StaticResource OnLoaded}"/>
-                        </EventTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
     </Style>
 
-    <Style x:Key="ProgressBarSuccessStripe" BasedOn="{StaticResource ProgressBarPrimaryStripe}" TargetType="{x:Type ProgressBar}">
+    <Style x:Key="ProgressBarSuccessStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="{x:Type ProgressBar}">
         <Setter Property="Foreground">
             <Setter.Value>
                 <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
@@ -117,7 +85,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ProgressBarInfoStripe" BasedOn="{StaticResource ProgressBarPrimaryStripe}" TargetType="{x:Type ProgressBar}">
+    <Style x:Key="ProgressBarInfoStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="{x:Type ProgressBar}">
         <Setter Property="Foreground">
             <Setter.Value>
                 <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
@@ -147,7 +115,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ProgressBarWarningStripe" BasedOn="{StaticResource ProgressBarPrimaryStripe}" TargetType="{x:Type ProgressBar}">
+    <Style x:Key="ProgressBarWarningStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="{x:Type ProgressBar}">
         <Setter Property="Foreground">
             <Setter.Value>
                 <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
@@ -177,7 +145,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ProgressBarDangerStripe" BasedOn="{StaticResource ProgressBarPrimaryStripe}" TargetType="{x:Type ProgressBar}">
+    <Style x:Key="ProgressBarDangerStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="{x:Type ProgressBar}">
         <Setter Property="Foreground">
             <Setter.Value>
                 <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
@@ -209,7 +177,7 @@
 
     <Style x:Key="ProgressBarFlat" TargetType="{x:Type ProgressBar}">
         <Setter Property="Height" Value="4"/>
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}"/>
         <Setter Property="Template">
             <Setter.Value>
diff --git a/HandyControl/Themes/Styles/Slider.xaml b/HandyControl/Themes/Styles/Slider.xaml
index c546b47b..0a69c498 100644
--- a/HandyControl/Themes/Styles/Slider.xaml
+++ b/HandyControl/Themes/Styles/Slider.xaml
@@ -4,7 +4,6 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Basic/Geometries.xaml"/>
-        <ResourceDictionary Source="../Basic/Brushes.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="ColorPickerRepeatButton" TargetType="{x:Type RepeatButton}">
@@ -166,7 +165,7 @@
                     <DrawingBrush RenderOptions.CachingHint="Cache" Viewport="0,0,1,8" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
                         <DrawingBrush.Drawing>
                             <DrawingGroup>
-                                <GeometryDrawing Brush="{StaticResource BorderBrush}">
+                                <GeometryDrawing Brush="{DynamicResource BorderBrush}">
                                     <GeometryDrawing.Geometry>
                                         <GeometryGroup>
                                             <RectangleGeometry Rect="0,0,1,4" />
@@ -178,16 +177,16 @@
                     </DrawingBrush>
                 </Border.Background>
             </Border>
-            <Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{StaticResource BorderBrush}" Background="White">
+            <Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
                 <Grid Width="30" Height="30" Margin="-1,-1,0,0">
-                    <Path x:Name="PathLeft" Data="{StaticResource LeftGeometry}" StrokeThickness="1" Stroke="{StaticResource PrimaryBrush}" Margin="6,8" HorizontalAlignment="Left" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
+                    <Path x:Name="PathLeft" Data="{StaticResource LeftGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="6,8" HorizontalAlignment="Left" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
                         <Path.RenderTransform>
                             <TransformGroup>
                                 <TranslateTransform/>
                             </TransformGroup>
                         </Path.RenderTransform>
                     </Path>
-                    <Path x:Name="PathRight" Data="{StaticResource RightGeometry}" StrokeThickness="1" Stroke="{StaticResource PrimaryBrush}" Margin="6,8" HorizontalAlignment="Right" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
+                    <Path x:Name="PathRight" Data="{StaticResource RightGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="6,8" HorizontalAlignment="Right" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
                         <Path.RenderTransform>
                             <TransformGroup>
                                 <TranslateTransform/>
@@ -199,7 +198,7 @@
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="true">
-                <Setter Property="Background" TargetName="grip" Value="{StaticResource PrimaryBrush}"/>
+                <Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}"/>
                 <Setter Property="Stroke" TargetName="PathLeft" Value="White"/>
                 <Setter Property="Stroke" TargetName="PathRight" Value="White"/>
             </Trigger>
@@ -267,7 +266,7 @@
                     <DrawingBrush RenderOptions.CachingHint="Cache" Viewport="0,0,8,1" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
                         <DrawingBrush.Drawing>
                             <DrawingGroup>
-                                <GeometryDrawing Brush="{StaticResource BorderBrush}">
+                                <GeometryDrawing Brush="{DynamicResource BorderBrush}">
                                     <GeometryDrawing.Geometry>
                                         <GeometryGroup>
                                             <RectangleGeometry Rect="0,0,4,1" />
@@ -279,16 +278,16 @@
                     </DrawingBrush>
                 </Border.Background>
             </Border>
-            <Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{StaticResource BorderBrush}" Background="White">
+            <Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
                 <Grid Width="30" Height="30" Margin="-1,-1,0,0">
-                    <Path x:Name="PathUp" Data="{StaticResource UpGeometry}" StrokeThickness="1" Stroke="{StaticResource PrimaryBrush}" Margin="9,6" VerticalAlignment="Top" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
+                    <Path x:Name="PathUp" Data="{StaticResource UpGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="9,6" VerticalAlignment="Top" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
                         <Path.RenderTransform>
                             <TransformGroup>
                                 <TranslateTransform/>
                             </TransformGroup>
                         </Path.RenderTransform>
                     </Path>
-                    <Path x:Name="PathDown" Data="{StaticResource DownGeometry}" StrokeThickness="1" Stroke="{StaticResource PrimaryBrush}" Margin="9,6" VerticalAlignment="Bottom" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
+                    <Path x:Name="PathDown" Data="{StaticResource DownGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="9,6" VerticalAlignment="Bottom" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
                         <Path.RenderTransform>
                             <TransformGroup>
                                 <TranslateTransform/>
@@ -300,12 +299,12 @@
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="true" SourceName="grip">
-                <Setter Property="Background" TargetName="grip" Value="{StaticResource PrimaryBrush}"/>
+                <Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}"/>
                 <Setter Property="Stroke" TargetName="PathUp" Value="White"/>
                 <Setter Property="Stroke" TargetName="PathDown" Value="White"/>
             </Trigger>
             <Trigger Property="IsDragging" Value="true">
-                <Setter Property="Background" TargetName="grip" Value="{StaticResource PrimaryBrush}"/>
+                <Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}"/>
                 <Setter Property="Stroke" TargetName="PathUp" Value="White"/>
                 <Setter Property="Stroke" TargetName="PathDown" Value="White"/>
                 <Trigger.EnterActions>
@@ -350,7 +349,7 @@
         <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="MinWidth" Value="30"/>
         <Setter Property="MinHeight" Value="30"/>
         <Setter Property="Template" Value="{StaticResource CompareSliderHorizontal}"/>
diff --git a/HandyControl/Themes/Styles/Steps.xaml b/HandyControl/Themes/Styles/StepBar.xaml
similarity index 90%
rename from HandyControl/Themes/Styles/Steps.xaml
rename to HandyControl/Themes/Styles/StepBar.xaml
index 1c469536..898f8e22 100644
--- a/HandyControl/Themes/Styles/Steps.xaml
+++ b/HandyControl/Themes/Styles/StepBar.xaml
@@ -13,7 +13,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="controls:StepItem">
                     <StackPanel>
-                        <Border Background="White" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
+                        <Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
                             <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource FindAncestor,AncestorType=controls:StepItem}}"/>
                         </Border>
                         <TextBlock Margin="0,10,0,0" Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockSubTitleBold}" Text="{TemplateBinding IndexStr}"/>
diff --git a/HandyControl/Themes/Styles/Style.xaml b/HandyControl/Themes/Styles/Style.xaml
index 556ce3cc..749ca064 100644
--- a/HandyControl/Themes/Styles/Style.xaml
+++ b/HandyControl/Themes/Styles/Style.xaml
@@ -29,12 +29,13 @@
         <ResourceDictionary Source="TimePicker.xaml"/>
         <ResourceDictionary Source="ContentControl.xaml"/>
         <ResourceDictionary Source="Growl.xaml"/>
-        <ResourceDictionary Source="Steps.xaml"/>
+        <ResourceDictionary Source="StepBar.xaml"/>
         <ResourceDictionary Source="Carousel.xaml"/>
         <ResourceDictionary Source="TimeBar.xaml"/>
         <ResourceDictionary Source="ColorPicker.xaml"/>
         <ResourceDictionary Source="DataGrid.xaml"/>
         <ResourceDictionary Source="TransitioningContentControl.xaml"/>
+        <ResourceDictionary Source="Image.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControl/Themes/Styles/TabControl.xaml b/HandyControl/Themes/Styles/TabControl.xaml
index e409f7dc..7591b4a7 100644
--- a/HandyControl/Themes/Styles/TabControl.xaml
+++ b/HandyControl/Themes/Styles/TabControl.xaml
@@ -15,7 +15,7 @@
     <Style TargetType="{x:Type controls:TabItem}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
         <Setter Property="BorderThickness" Value="1,0,1,1"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Margin" Value="0"/>
@@ -45,7 +45,7 @@
                             </ContextMenu>
                         </Grid.ContextMenu>
                         <Border Grid.ColumnSpan="2" BorderThickness="{TemplateBinding BorderThickness}" x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" Margin="0">
-                            <Border Margin="0,0,0,-1" x:Name="innerBorder" Background="White" Opacity="0"/>
+                            <Border Margin="0,0,0,-1" x:Name="innerBorder" Background="{DynamicResource RegionBrush}" Opacity="0"/>
                         </Border>
                         <ContentPresenter Grid.Column="0" x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="Stretch" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center">
                             <ContentPresenter.OpacityMask>
@@ -89,7 +89,7 @@
                                 <RowDefinition x:Name="RowDefinition0" Height="Auto"/>
                                 <RowDefinition x:Name="RowDefinition1" Height="*"/>
                             </Grid.RowDefinitions>
-                            <Border Background="White" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}">
+                            <Border Background="{DynamicResource RegionBrush}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}">
                                 <controls:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsEnableTabFill="{TemplateBinding IsEnableTabFill}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
                                     <interactivity:Interaction.Behaviors>
                                         <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
@@ -100,10 +100,10 @@
                                     </interactivity:Interaction.Behaviors>
                                 </controls:TabPanel>
                             </Border>
-                            <Border x:Name="contentPanel" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+                            <Border x:Name="contentPanel" Background="{DynamicResource SecondaryRegionBrush}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
                                 <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                             </Border>
-                            <Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="1,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="White" HorizontalAlignment="Right">
+                            <Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="1,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Right">
                                 <controls:ContextMenuToggleButton x:Name="PART_OverflowButton" Visibility="Collapsed" Style="{StaticResource ToggleButtonIconTransparent}" controls:IconSwitchElement.Geometry="{StaticResource DownGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}"/>
                             </Border>
                         </Grid>
@@ -125,7 +125,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
                     <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-                        <Grid x:Name="templateRoot" Background="White" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+                        <Grid x:Name="templateRoot" Background="{DynamicResource RegionBrush}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition x:Name="ColumnDefinition0"/>
                                 <ColumnDefinition x:Name="ColumnDefinition1" Width="0"/>
diff --git a/HandyControl/Themes/Styles/TextBlock.xaml b/HandyControl/Themes/Styles/TextBlock.xaml
index b6edd255..948e1c9b 100644
--- a/HandyControl/Themes/Styles/TextBlock.xaml
+++ b/HandyControl/Themes/Styles/TextBlock.xaml
@@ -33,23 +33,23 @@
     </Style>
 
     <Style x:Key="TextBlockLarge" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="{DynamicResource LargeFontSize}"/>
+        <Setter Property="FontSize" Value="{StaticResource LargeFontSize}"/>
     </Style>
     <Style x:Key="TextBlockTitle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="{DynamicResource HeadFontSize}"/>
+        <Setter Property="FontSize" Value="{StaticResource HeadFontSize}"/>
     </Style>
     <Style x:Key="TextBlockSubTitle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="{DynamicResource SubHeadFontSize}"/>
+        <Setter Property="FontSize" Value="{StaticResource SubHeadFontSize}"/>
     </Style>
 
     <Style x:Key="TextBlockLargeBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="{DynamicResource LargeFontSize}"/>
+        <Setter Property="FontSize" Value="{StaticResource LargeFontSize}"/>
     </Style>
     <Style x:Key="TextBlockTitleBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="{DynamicResource HeadFontSize}"/>
+        <Setter Property="FontSize" Value="{StaticResource HeadFontSize}"/>
     </Style>
     <Style x:Key="TextBlockSubTitleBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="{DynamicResource SubHeadFontSize}"/>
+        <Setter Property="FontSize" Value="{StaticResource SubHeadFontSize}"/>
     </Style>
     <Style x:Key="TextBlockDefaultBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="{x:Type TextBlock}"/>
 
diff --git a/HandyControl/Themes/Styles/TextBox.xaml b/HandyControl/Themes/Styles/TextBox.xaml
index 9dd31eb8..4e1ade6f 100644
--- a/HandyControl/Themes/Styles/TextBox.xaml
+++ b/HandyControl/Themes/Styles/TextBox.xaml
@@ -4,7 +4,6 @@
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Basic/Converters.xaml"/>
         <ResourceDictionary Source="Base/TextBoxBaseStyle.xaml"/>
         <ResourceDictionary Source="TextBlock.xaml"/>
     </ResourceDictionary.MergedDictionaries>
@@ -20,7 +19,7 @@
                 <RowDefinition Height="{Binding Path=(controls:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}"/>
             </Grid.RowDefinitions>
             <StackPanel Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" Margin="7,4">
-                <TextBlock Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock Foreground="{DynamicResource PrimaryTextBrush}" Margin="1,0,0,0" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
             <Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
@@ -32,7 +31,7 @@
                 <Setter Property="Opacity" TargetName="border" Value="0.4"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <Trigger Property="IsFocused" Value="true">
                 <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}"/>
@@ -47,7 +46,7 @@
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <StackPanel Visibility="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" Orientation="Horizontal" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,7,6,8">
-                <TextBlock Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock Foreground="{DynamicResource PrimaryTextBrush}" Text="{Binding Path=(controls:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(controls:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(controls:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
             </StackPanel>
             <Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
@@ -59,7 +58,7 @@
                 <Setter Property="Opacity" TargetName="border" Value="0.4"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <Trigger Property="IsFocused" Value="true">
                 <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}"/>
diff --git a/HandyControl/Themes/Styles/TimeBar.xaml b/HandyControl/Themes/Styles/TimeBar.xaml
index 475ba5a8..2845bf2a 100644
--- a/HandyControl/Themes/Styles/TimeBar.xaml
+++ b/HandyControl/Themes/Styles/TimeBar.xaml
@@ -3,7 +3,6 @@
                     xmlns:controls="clr-namespace:HandyControl.Controls">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Basic/Paths.xaml"/>
         <ResourceDictionary Source="../Basic/Converters.xaml"/>
         <ResourceDictionary Source="Button.xaml"/>
     </ResourceDictionary.MergedDictionaries>
@@ -12,7 +11,7 @@
         <Setter Property="UseLayoutRounding" Value="True"/>
         <Setter Property="BorderThickness" Value="0,1,0,0"/>
         <Setter Property="Foreground" Value="White"/>
-        <Setter Property="Background" Value="Black"/>
+        <Setter Property="Background" Value="{DynamicResource TitleBrush}"/>
         <Setter Property="Height" Value="60"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Template">
@@ -39,7 +38,7 @@
                         </EventTrigger>
                     </ControlTemplate.Triggers>
                     <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-                        <Grid>
+                        <Grid ClipToBounds="True">
                             <Border BorderThickness="0,0,0,4" BorderBrush="White" VerticalAlignment="Top" Height="52">
                                 <TextBlock FontSize="16" Name="PART_TextBlockSelected" VerticalAlignment="Top" Margin="0,14,0,0" HorizontalAlignment="Center"/>
                             </Border>
diff --git a/HandyControl/Themes/Styles/TimePicker.xaml b/HandyControl/Themes/Styles/TimePicker.xaml
index a91037a0..b7a7eefd 100644
--- a/HandyControl/Themes/Styles/TimePicker.xaml
+++ b/HandyControl/Themes/Styles/TimePicker.xaml
@@ -6,7 +6,6 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Basic/Converters.xaml"/>
         <ResourceDictionary Source="Base/TimePickerBaseStyle.xaml"/>
-        <ResourceDictionary Source="TextBlock.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <Style BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="controls:TimePicker"/>
@@ -28,7 +27,7 @@
                         <ColumnDefinition Width="30"/>
                     </Grid.ColumnDefinitions>
                     <Button Style="{StaticResource ButtonIcon}" Padding="7" controls:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
-                    <controls:WatermarkTextBox x:Name="PART_TextBox" Padding="5,6" Margin="0,0,0,1" Watermark="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    <controls:WatermarkTextBox CaretBrush="{TemplateBinding Foreground}" x:Name="PART_TextBox" Padding="5,6" Margin="0,0,0,1" Watermark="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     <Popup Grid.Column="0" VerticalOffset="1" x:Name="PART_Popup" PopupAnimation="Fade" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_TextBox}" StaysOpen="False">
                         <controls:Clock x:Name="PART_Clock" ShowConfirmButton="True"/>
                     </Popup>
@@ -44,7 +43,7 @@
                     <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot"/>
                     <Condition Property="IsOpen" Value="false" SourceName="PART_Popup"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
@@ -79,7 +78,7 @@
                         <ColumnDefinition Width="30"/>
                     </Grid.ColumnDefinitions>
                     <Button Style="{StaticResource ButtonIcon}" Padding="7" controls:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
-                    <controls:WatermarkTextBox x:Name="PART_TextBox" Padding="5,6" Margin="0,0,0,1" Watermark="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    <controls:WatermarkTextBox CaretBrush="{TemplateBinding Foreground}" x:Name="PART_TextBox" Padding="5,6" Margin="0,0,0,1" Watermark="{Binding Path=(controls:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     <Popup Grid.Column="0" VerticalOffset="1" x:Name="PART_Popup" PopupAnimation="Fade" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_TextBox}" StaysOpen="False">
                         <controls:Clock x:Name="PART_Clock" ShowConfirmButton="True"/>
                     </Popup>
@@ -95,7 +94,7 @@
                     <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot"/>
                     <Condition Property="IsOpen" Value="false" SourceName="PART_Popup"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
diff --git a/HandyControl/Themes/Styles/ToggleButton.xaml b/HandyControl/Themes/Styles/ToggleButton.xaml
index 58670e6f..ec6b6a7b 100644
--- a/HandyControl/Themes/Styles/ToggleButton.xaml
+++ b/HandyControl/Themes/Styles/ToggleButton.xaml
@@ -8,7 +8,7 @@
 
     <!--普通-->
     <Style BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Background" Value="{DynamicResource DefaultBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Style.Triggers>
@@ -44,7 +44,7 @@
     <!--图标-->
     <Style x:Key="ToggleButtonIcon" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="{DynamicResource DefaultBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource ReverseTextBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
diff --git a/HandyControl/Themes/Styles/TreeView.xaml b/HandyControl/Themes/Styles/TreeView.xaml
index a4f59301..51e561b8 100644
--- a/HandyControl/Themes/Styles/TreeView.xaml
+++ b/HandyControl/Themes/Styles/TreeView.xaml
@@ -83,11 +83,11 @@
                                 <Condition Property="IsSelected" Value="true"/>
                                 <Condition Property="IsSelectionActive" Value="false"/>
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightTextBrushKey}}"/>
+                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource DarkDefaultBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                            <Setter Property="Foreground" Value="{StaticResource {x:Static SystemColors.GrayTextBrushKey}}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -96,11 +96,10 @@
     </Style>
 
     <Style TargetType="{x:Type TreeView}" BasedOn="{StaticResource BaseStyle}">
-        <Setter Property="Background" Value="{DynamicResource TextIconBrush}"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Padding" Value="0"/>
-        <Setter Property="Foreground" Value="Black"/>
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
         <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
@@ -118,7 +117,7 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource {x:Static SystemColors.ControlBrushKey}}"/>
                         </Trigger>
                         <Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
                             <Setter Property="CanContentScroll" TargetName="_tv_scrollviewer_" Value="true"/>
diff --git a/HandyControl/Themes/Styles/Window.xaml b/HandyControl/Themes/Styles/Window.xaml
index 64f54dac..34a3fb66 100644
--- a/HandyControl/Themes/Styles/Window.xaml
+++ b/HandyControl/Themes/Styles/Window.xaml
@@ -19,10 +19,10 @@
     </Style>
 
     <Style x:Key="CustomWindowStyle" BasedOn="{x:Null}" TargetType="controls:WindowBorderless">
-        <Setter Property="Background" Value="White"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
-        <Setter Property="NonClientAreaBackground" Value="{DynamicResource PrimaryBrush}"/>
+        <Setter Property="NonClientAreaBackground" Value="{DynamicResource TitleBrush}"/>
         <Setter Property="NonClientAreaForeground" Value="White"/>
         <Setter Property="CloseButtonHoverBrush" Value="Red"/>
         <Setter Property="CloseButtonHoverForeground" Value="White"/>
@@ -133,7 +133,7 @@
         <Setter Property="ShowInTaskbar" Value="False"/>
         <Setter Property="MinWidth" Value="300"/>
         <Setter Property="ResizeMode" Value="NoResize"/>
-        <Setter Property="Background" Value="White"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="SizeToContent" Value="WidthAndHeight"/>
         <Setter Property="Effect">
             <Setter.Value>
@@ -150,30 +150,22 @@
                                 <RowDefinition/>
                                 <RowDefinition Height="Auto"/>
                             </Grid.RowDefinitions>
-                            <Grid Name="TitleGrid" Height="30" Background="{DynamicResource PrimaryBrush}">
+                            <Grid Name="TitleGrid" Height="30" Background="{DynamicResource TitleBrush}">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition/>
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-                                <TextBlock Name="PART_TitleBlock" Background="Transparent" Padding="10,6" FontSize="14" Foreground="White" Text="{TemplateBinding Title}" VerticalAlignment="Center" TextWrapping="Wrap" TextTrimming="WordEllipsis"/>
+                                <TextBlock Name="PART_TitleBlock" Background="Transparent" Padding="10,6" Foreground="White" Text="{TemplateBinding Title}" VerticalAlignment="Center" TextWrapping="Wrap" TextTrimming="WordEllipsis"/>
                                 <Button Margin="0,0,1,0" Background="Transparent" Name="CloseButton" Foreground="White" Grid.Column="1" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="Red" Command="interactivity:ControlCommands.Close" IsCancel="True" Height="28" Style="{StaticResource ButtonCustom}" Width="44" controls:IconElement.Geometry="{StaticResource CloseGeometry}" Padding="9">
                                     <Path Fill="{Binding ElementName=CloseButton,Path=Foreground}" Style="{StaticResource ClosePathStyle}"/>
                                 </Button>
                             </Grid>
-                            <Border BorderBrush="{DynamicResource PrimaryBrush}" Name="PART_MainBorder" Grid.Row="1">
+                            <Border BorderBrush="{DynamicResource TitleBrush}" Name="PART_MainBorder" Grid.Row="1">
                                 <StackPanel>
-                                    <TextBlock Text="{TemplateBinding ContentStr}" MinHeight="110" Name="MyTextBlock" TextAlignment="Center" FontSize="16" Padding="32" Foreground="#252525" MaxWidth="300" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" Background="White"/>
-                                    <StackPanel Margin="0,0,0,32" Orientation="Horizontal" Background="White" HorizontalAlignment="Center">
-                                        <Button Command="interactivity:ControlCommands.Cancel" Visibility="{TemplateBinding ShowCancel,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,0,16,0" Background="Transparent" Style="{StaticResource ButtonCustom}">
-                                            <Border BorderThickness="1" BorderBrush="{DynamicResource PrimaryBrush}" MinWidth="80" Height="30" CornerRadius="4" Background="White">
-                                                <TextBlock Text="{x:Static langs:Lang.Cancel}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                            </Border>
-                                        </Button>
-                                        <Button IsDefault="True" Command="interactivity:ControlCommands.Confirm" Background="Transparent" Style="{StaticResource ButtonCustom}">
-                                            <Border MinWidth="80" Height="30" CornerRadius="4" Background="{DynamicResource PrimaryBrush}">
-                                                <TextBlock Text="{x:Static langs:Lang.Confirm}" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                            </Border>
-                                        </Button>
+                                    <TextBlock Text="{TemplateBinding ContentStr}" MinHeight="110" Name="MyTextBlock" TextAlignment="Center" Padding="32" Foreground="{DynamicResource PrimaryTextBrush}" MaxWidth="300" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" Background="{TemplateBinding Background}"/>
+                                    <StackPanel Margin="0,0,0,32" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
+                                        <Button IsCancel="True" MinWidth="80" Command="interactivity:ControlCommands.Cancel" Content="{x:Static langs:Lang.Cancel}" Visibility="{TemplateBinding ShowCancel,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,0,16,0"/>
+                                        <Button IsDefault="True" MinWidth="80" Command="interactivity:ControlCommands.Confirm" Content="{x:Static langs:Lang.Confirm}" Style="{StaticResource ButtonPrimary}"/>
                                     </StackPanel>
                                 </StackPanel>
                             </Border>
diff --git a/HandyControl/Themes/ThemesDefault.xaml b/HandyControl/Themes/Theme.xaml
similarity index 100%
rename from HandyControl/Themes/ThemesDefault.xaml
rename to HandyControl/Themes/Theme.xaml
diff --git a/HandyControl/Tools/ResourceHelper.cs b/HandyControl/Tools/ResourceHelper.cs
index 2e4ae160..5087d5f1 100644
--- a/HandyControl/Tools/ResourceHelper.cs
+++ b/HandyControl/Tools/ResourceHelper.cs
@@ -1,6 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Windows;
+using HandyControl.Data.Enum;
 
 namespace HandyControl.Tools
 {
@@ -38,5 +41,27 @@ namespace HandyControl.Tools
         /// <param name="key"></param>
         /// <returns></returns>
         public static T GetResource<T>(string key) where T : class => Application.Current.TryFindResource(key) as T;
+
+        /// <summary>
+        ///     获取HandyControl皮肤
+        /// </summary>
+        /// <param name="skin"></param>
+        /// <returns></returns>
+        public static ResourceDictionary GetSkin(SkinType skin) => new ResourceDictionary
+        {
+            Source = new Uri($"pack://application:,,,/HandyControl;component/Themes/Skin{skin.ToString()}.xaml")
+        };
+
+        /// <summary>
+        ///     获取皮肤
+        /// </summary>
+        /// <param name="assembly"></param>
+        /// <param name="themePath"></param>
+        /// <param name="skin"></param>
+        /// <returns></returns>
+        public static ResourceDictionary GetSkin(Assembly assembly, string themePath, SkinType skin) => new ResourceDictionary
+        {
+            Source = new Uri($"pack://application:,,,/{assembly.GetName().Name};component/{themePath}/Skin{skin.ToString()}.xaml")
+        };
     }
 }
\ No newline at end of file
diff --git a/HandyControlDemo/App.xaml b/HandyControlDemo/App.xaml
index c46c95fa..dea6f894 100644
--- a/HandyControlDemo/App.xaml
+++ b/HandyControlDemo/App.xaml
@@ -12,8 +12,18 @@
 
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/ThemesDefault.xaml"/>
-                <ResourceDictionary Source="Resources/Themes/Styles/Style.xaml"/>
+                <ResourceDictionary>
+                    <ResourceDictionary.MergedDictionaries>
+                        <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
+                        <ResourceDictionary Source="Resources/Themes/SkinDefault.xaml"/>
+                    </ResourceDictionary.MergedDictionaries>
+                </ResourceDictionary>
+                <ResourceDictionary>
+                    <ResourceDictionary.MergedDictionaries>
+                        <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
+                        <ResourceDictionary Source="Resources/Themes/Theme.xaml"/>
+                    </ResourceDictionary.MergedDictionaries>
+                </ResourceDictionary>
                 <ResourceDictionary>
                     <viewModel:ViewModelLocator x:Key="Locator" d:IsDataSource="True"/>
                 </ResourceDictionary>
diff --git a/HandyControlDemo/App.xaml.cs b/HandyControlDemo/App.xaml.cs
index 83fac9e5..9e9ebb21 100644
--- a/HandyControlDemo/App.xaml.cs
+++ b/HandyControlDemo/App.xaml.cs
@@ -1,6 +1,9 @@
-using System.Globalization;
+using System;
+using System.Globalization;
 using System.Threading;
 using System.Windows;
+using HandyControl.Data.Enum;
+using HandyControl.Tools;
 using HandyControlDemo.Data;
 
 namespace HandyControlDemo
@@ -16,6 +19,11 @@ namespace HandyControlDemo
 
             GlobalData.Init();
             Thread.CurrentThread.CurrentUICulture = new CultureInfo(GlobalData.Config.Lang);
+
+            if (GlobalData.Config.Skin != SkinType.Default)
+            {
+                UpdateSkin(GlobalData.Config.Skin);
+            }
         }
 
         protected override void OnExit(ExitEventArgs e)
@@ -23,5 +31,24 @@ namespace HandyControlDemo
             base.OnExit(e);
             GlobalData.Save();
         }
+
+        internal void UpdateSkin(SkinType skin)
+        {
+            var skins0 = Resources.MergedDictionaries[0];
+            skins0.MergedDictionaries.Clear();
+            skins0.MergedDictionaries.Add(ResourceHelper.GetSkin(skin));
+            skins0.MergedDictionaries.Add(ResourceHelper.GetSkin(typeof(App).Assembly, "Resources/Themes", skin));
+
+            var skins1 = Resources.MergedDictionaries[1];
+            skins1.MergedDictionaries.Clear();
+            skins1.MergedDictionaries.Add(new ResourceDictionary
+            {
+                Source = new Uri("pack://application:,,,/HandyControl;component/Themes/Theme.xaml")
+            });
+            skins1.MergedDictionaries.Add(new ResourceDictionary
+            {
+                Source = new Uri("pack://application:,,,/HandyControlDemo;component/Resources/Themes/Theme.xaml")
+            });
+        }
     }
 }
diff --git a/HandyControlDemo/Data/AppConfig.cs b/HandyControlDemo/Data/AppConfig.cs
index 5ebf2226..f6843693 100644
--- a/HandyControlDemo/Data/AppConfig.cs
+++ b/HandyControlDemo/Data/AppConfig.cs
@@ -1,4 +1,5 @@
 using System;
+using HandyControl.Data.Enum;
 
 namespace HandyControlDemo.Data
 {
@@ -7,5 +8,7 @@ namespace HandyControlDemo.Data
         public static string SavePath = $"{AppDomain.CurrentDomain.BaseDirectory}AppConfig.json";
 
         public string Lang { get; set; } = "cn";
+
+        public SkinType Skin { get; set; }
     }
 }
\ No newline at end of file
diff --git a/HandyControlDemo/Data/GlobalData.cs b/HandyControlDemo/Data/GlobalData.cs
index a32bedb8..0846ca13 100644
--- a/HandyControlDemo/Data/GlobalData.cs
+++ b/HandyControlDemo/Data/GlobalData.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using Newtonsoft.Json;
 
 namespace HandyControlDemo.Data
@@ -9,8 +10,15 @@ namespace HandyControlDemo.Data
         {
             if (File.Exists(AppConfig.SavePath))
             {
-                var json = File.ReadAllText(AppConfig.SavePath);
-                Config = JsonConvert.DeserializeObject<AppConfig>(json);
+                try
+                {
+                    var json = File.ReadAllText(AppConfig.SavePath);
+                    Config = JsonConvert.DeserializeObject<AppConfig>(json);
+                }
+                catch
+                {
+                    Config = new AppConfig();
+                }
             }
             else
             {
diff --git a/HandyControlDemo/Data/Model/DemoDataModel.cs b/HandyControlDemo/Data/Model/DemoDataModel.cs
index 27cd2659..e547c85e 100644
--- a/HandyControlDemo/Data/Model/DemoDataModel.cs
+++ b/HandyControlDemo/Data/Model/DemoDataModel.cs
@@ -15,6 +15,8 @@ namespace HandyControlDemo.Data
 
         public DemoType Type { get; set; }
 
+        public string ImgPath { get; set; }
+
         public List<DemoDataModel> DataList { get; set; }
     }
 }
\ No newline at end of file
diff --git a/HandyControlDemo/HandyControlDemo.csproj b/HandyControlDemo/HandyControlDemo.csproj
index 47698e5a..93b8a8ad 100644
--- a/HandyControlDemo/HandyControlDemo.csproj
+++ b/HandyControlDemo/HandyControlDemo.csproj
@@ -208,6 +208,7 @@
     <Compile Include="ViewModel\GrowlDemoViewModel.cs" />
     <Compile Include="ViewModel\ImageBrowserDemoViewModel.cs" />
     <Compile Include="ViewModel\MainViewModel.cs" />
+    <Compile Include="ViewModel\NoUserContentViewModel.cs" />
     <Compile Include="ViewModel\ViewModelLocator.cs" />
     <Compile Include="ViewModel\WindowDemoViewModel.cs" />
     <Compile Include="Window\CommonWindow.xaml.cs">
@@ -228,11 +229,15 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="Resources\Themes\Basic\Basic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Resources\Themes\Basic\Brushes.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Resources\Themes\Basic\Colors.xaml">
+    <Page Include="Resources\Themes\Basic\Colors\Colors.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -240,10 +245,18 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Resources\Themes\Basic\Colors\ColorsDark.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Resources\Themes\Basic\Geometries.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Resources\Themes\SkinDefault.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Resources\Themes\Styles\Button.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -260,6 +273,18 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Resources\Themes\Styles\StyleDark.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\Themes\SkinDark.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\Themes\Theme.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UserControl\Controls\AnimationPathDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -452,6 +477,12 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>MessageToken.cs</LastGenOutput>
     </Content>
+    <Resource Include="Resources\Img\Avatar\avatar1.png" />
+    <Resource Include="Resources\Img\Avatar\avatar2.png" />
+    <Resource Include="Resources\Img\Avatar\avatar3.png" />
+    <Resource Include="Resources\Img\Avatar\avatar4.png" />
+    <Resource Include="Resources\Img\Avatar\avatar5.png" />
+    <Resource Include="Resources\Img\Avatar\avatar6.png" />
     <Resource Include="Resources\Img\Flag\cn.png" />
     <Resource Include="Resources\Img\Flag\en.png" />
     <Resource Include="Resources\Img\LeftMainContent\RadioButton_16x.png" />
diff --git a/HandyControlDemo/MainWindow.xaml b/HandyControlDemo/MainWindow.xaml
index 1af5f213..74744777 100644
--- a/HandyControlDemo/MainWindow.xaml
+++ b/HandyControlDemo/MainWindow.xaml
@@ -28,7 +28,7 @@
         </Grid.ColumnDefinitions>
         <userControl:LeftMainContent/>
         <userControl:MainContent Grid.Column="1"/>
-        <GridSplitter Grid.Column="1" HorizontalAlignment="Left" Width="4" Background="Transparent" BorderThickness="1,0,0,0" BorderBrush="{StaticResource BorderBrush}"/>
+        <GridSplitter Grid.Column="1" HorizontalAlignment="Left" Width="4" Background="Transparent" BorderThickness="1,0,0,0" BorderBrush="{DynamicResource BorderBrush}"/>
         <controls:ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Hidden" HorizontalAlignment="Right" IsEnableInertia="True" IsPenetrating="True">
             <StackPanel IsHitTestVisible="True" VerticalAlignment="Top" Background="Transparent" Name="PanelMessage" Margin="0,10,10,10"/>
         </controls:ScrollViewer>
diff --git a/HandyControlDemo/Properties/AssemblyInfo.cs b/HandyControlDemo/Properties/AssemblyInfo.cs
index 1c7aa48b..bb7c9ee1 100644
--- a/HandyControlDemo/Properties/AssemblyInfo.cs
+++ b/HandyControlDemo/Properties/AssemblyInfo.cs
@@ -12,4 +12,4 @@ using System.Windows;
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
-[assembly: AssemblyVersion("1.3.4.*")]
+[assembly: AssemblyVersion("1.4.0.*")]
diff --git a/HandyControlDemo/Properties/Langs/Lang.Designer.cs b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
index db1e9799..be057c72 100644
--- a/HandyControlDemo/Properties/Langs/Lang.Designer.cs
+++ b/HandyControlDemo/Properties/Langs/Lang.Designer.cs
@@ -60,6 +60,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 关于 的本地化字符串。
+        /// </summary>
+        public static string About {
+            get {
+                return ResourceManager.GetString("About", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 动画路径 的本地化字符串。
         /// </summary>
@@ -87,6 +96,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 博客 的本地化字符串。
+        /// </summary>
+        public static string Blog {
+            get {
+                return ResourceManager.GetString("Blog", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 边框 的本地化字符串。
         /// </summary>
@@ -141,6 +159,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 讨论室 的本地化字符串。
+        /// </summary>
+        public static string Chatroom {
+            get {
+                return ResourceManager.GetString("Chatroom", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 复选框 的本地化字符串。
         /// </summary>
@@ -267,6 +294,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 邮箱 的本地化字符串。
+        /// </summary>
+        public static string Email {
+            get {
+                return ResourceManager.GetString("Email", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 错误 的本地化字符串。
         /// </summary>
@@ -582,6 +618,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 代码仓库 的本地化字符串。
+        /// </summary>
+        public static string Repository {
+            get {
+                return ResourceManager.GetString("Repository", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 在这里右击 的本地化字符串。
         /// </summary>
diff --git a/HandyControlDemo/Properties/Langs/Lang.en.resx b/HandyControlDemo/Properties/Langs/Lang.en.resx
index eab48829..ea6efc40 100644
--- a/HandyControlDemo/Properties/Langs/Lang.en.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.en.resx
@@ -360,4 +360,19 @@
   <data name="ChangeLangAsk" xml:space="preserve">
     <value>Whether to restart to change the language?</value>
   </data>
+  <data name="About" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="Repository" xml:space="preserve">
+    <value>Repository</value>
+  </data>
+  <data name="Email" xml:space="preserve">
+    <value>Email</value>
+  </data>
+  <data name="Chatroom" xml:space="preserve">
+    <value>Chatroom</value>
+  </data>
+  <data name="Blog" xml:space="preserve">
+    <value>Blog</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControlDemo/Properties/Langs/Lang.resx b/HandyControlDemo/Properties/Langs/Lang.resx
index a2df44a9..447ef853 100644
--- a/HandyControlDemo/Properties/Langs/Lang.resx
+++ b/HandyControlDemo/Properties/Langs/Lang.resx
@@ -340,4 +340,19 @@
   <data name="ChangeLangAsk" xml:space="preserve">
     <value>是否重启以更改语言？</value>
   </data>
+  <data name="About" xml:space="preserve">
+    <value>关于</value>
+  </data>
+  <data name="Repository" xml:space="preserve">
+    <value>代码仓库</value>
+  </data>
+  <data name="Email" xml:space="preserve">
+    <value>邮箱</value>
+  </data>
+  <data name="Chatroom" xml:space="preserve">
+    <value>讨论室</value>
+  </data>
+  <data name="Blog" xml:space="preserve">
+    <value>博客</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Img/Avatar/avatar1.png b/HandyControlDemo/Resources/Img/Avatar/avatar1.png
new file mode 100644
index 00000000..444207f7
Binary files /dev/null and b/HandyControlDemo/Resources/Img/Avatar/avatar1.png differ
diff --git a/HandyControlDemo/Resources/Img/Avatar/avatar2.png b/HandyControlDemo/Resources/Img/Avatar/avatar2.png
new file mode 100644
index 00000000..69f3002d
Binary files /dev/null and b/HandyControlDemo/Resources/Img/Avatar/avatar2.png differ
diff --git a/HandyControlDemo/Resources/Img/Avatar/avatar3.png b/HandyControlDemo/Resources/Img/Avatar/avatar3.png
new file mode 100644
index 00000000..8fbe9fc2
Binary files /dev/null and b/HandyControlDemo/Resources/Img/Avatar/avatar3.png differ
diff --git a/HandyControlDemo/Resources/Img/Avatar/avatar4.png b/HandyControlDemo/Resources/Img/Avatar/avatar4.png
new file mode 100644
index 00000000..aae79101
Binary files /dev/null and b/HandyControlDemo/Resources/Img/Avatar/avatar4.png differ
diff --git a/HandyControlDemo/Resources/Img/Avatar/avatar5.png b/HandyControlDemo/Resources/Img/Avatar/avatar5.png
new file mode 100644
index 00000000..1ed49ed7
Binary files /dev/null and b/HandyControlDemo/Resources/Img/Avatar/avatar5.png differ
diff --git a/HandyControlDemo/Resources/Img/Avatar/avatar6.png b/HandyControlDemo/Resources/Img/Avatar/avatar6.png
new file mode 100644
index 00000000..d0c9f90e
Binary files /dev/null and b/HandyControlDemo/Resources/Img/Avatar/avatar6.png differ
diff --git a/HandyControlDemo/Resources/Themes/Basic/Basic.xaml b/HandyControlDemo/Resources/Themes/Basic/Basic.xaml
new file mode 100644
index 00000000..6b2fbe74
--- /dev/null
+++ b/HandyControlDemo/Resources/Themes/Basic/Basic.xaml
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Brushes.xaml"/>
+        <ResourceDictionary Source="Geometries.xaml"/>
+        <ResourceDictionary Source="Converters.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Themes/Basic/Brushes.xaml b/HandyControlDemo/Resources/Themes/Basic/Brushes.xaml
index e1161b96..ce6aceef 100644
--- a/HandyControlDemo/Resources/Themes/Basic/Brushes.xaml
+++ b/HandyControlDemo/Resources/Themes/Basic/Brushes.xaml
@@ -1,14 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Colors.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-
-    <DrawingBrush x:Key="MainContentBackground" RenderOptions.CachingHint="Cache" Viewport="0,0,16,16" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
+    <DrawingBrush x:Key="MainContentForegroundDrawingBrush" RenderOptions.CachingHint="Cache" Viewport="0,0,16,16" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
         <DrawingBrush.Drawing>
             <DrawingGroup>
-                <GeometryDrawing Brush="#f5f5f5">
+                <GeometryDrawing Brush="{DynamicResource MainContentForegroundBrush}">
                     <GeometryDrawing.Geometry>
                         <GeometryGroup>
                             <RectangleGeometry Rect="0,0,8,8" />
@@ -30,6 +26,8 @@
         <GradientStop Color="#D1CFD1" Offset="1"/>
     </LinearGradientBrush>
 
-    <SolidColorBrush x:Key="MainBackgroundBrush" Color="{StaticResource MainBackgroundColor}"/>
+    <SolidColorBrush x:Key="MainBackgroundBrush" Color="{DynamicResource MainBackgroundColor}"/>
+    <SolidColorBrush x:Key="MainContentForegroundBrush" Color="{DynamicResource MainContentForegroundColor}"/>
+    <SolidColorBrush x:Key="MainContentBackgroundBrush" Color="{DynamicResource MainContentBackgroundColor}"/>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Themes/Basic/Colors.xaml b/HandyControlDemo/Resources/Themes/Basic/Colors/Colors.xaml
similarity index 65%
rename from HandyControlDemo/Resources/Themes/Basic/Colors.xaml
rename to HandyControlDemo/Resources/Themes/Basic/Colors/Colors.xaml
index 9b749667..d6b46dbc 100644
--- a/HandyControlDemo/Resources/Themes/Basic/Colors.xaml
+++ b/HandyControlDemo/Resources/Themes/Basic/Colors/Colors.xaml
@@ -2,5 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Color x:Key="MainBackgroundColor">#262e2f</Color>
+    <Color x:Key="MainContentForegroundColor">#FFF0F0F0</Color>
+    <Color x:Key="MainContentBackgroundColor">#FFF5F5F5</Color>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Themes/Basic/Colors/ColorsDark.xaml b/HandyControlDemo/Resources/Themes/Basic/Colors/ColorsDark.xaml
new file mode 100644
index 00000000..512e444d
--- /dev/null
+++ b/HandyControlDemo/Resources/Themes/Basic/Colors/ColorsDark.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Color x:Key="MainBackgroundColor">#262e2f</Color>
+    <Color x:Key="MainContentForegroundColor">#FF1A1A1A</Color>
+    <Color x:Key="MainContentBackgroundColor">#FF1C1C1C</Color>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Themes/Basic/Geometries.xaml b/HandyControlDemo/Resources/Themes/Basic/Geometries.xaml
index 265bebc3..6b3f3906 100644
--- a/HandyControlDemo/Resources/Themes/Basic/Geometries.xaml
+++ b/HandyControlDemo/Resources/Themes/Basic/Geometries.xaml
@@ -5,5 +5,11 @@
     <Geometry x:Key="LogoGeometry">M40.493382,19.001303 C36.637875,19.06448 33.938568,21.421986 33.948524,25.271919 L34.068279,71.56765 34.066906,71.598007 34.068745,71.747833 34.18895,118.21758 C34.202225,123.35083 39.026951,129.19344 44.965271,131.2674 50.903587,133.34137 55.706783,130.86133 55.693504,125.72808 L55.589508,85.524513 93.866371,85.524513 93.950943,118.21758 C93.964218,123.35083 98.788948,129.19344 104.72726,131.2674 110.66558,133.34137 115.46878,130.86133 115.4555,125.72808 L115.33575,79.432381 115.33712,79.401993 115.33528,79.252007 115.21507,32.782413 C115.2018,27.64917 110.37708,21.806566 104.43876,19.732603 98.500435,17.658638 93.697243,20.138674 93.710518,25.271919 L93.814514,65.475487 55.537647,65.475487 55.453079,32.782413 C55.439804,27.64917 50.615082,21.806566 44.676762,19.732603 43.192181,19.214111 41.778549,18.980244 40.493382,19.001303 z M9.999999,0 L140,0 C145.52284,0 150,4.4771523 150,9.999999 L150,140 C150,145.52284 145.52284,150 140,150 L9.999999,150 C4.4771523,150 0,145.52284 0,140 L0,9.999999 C0,4.4771523 4.4771523,0 9.999999,0 z</Geometry>
     <Geometry x:Key="CirclePanelDemoGeometry">M28.677037,-2.2499313E-22 C38.75065,24.740243 38.50705,52.437974 27.999852,77.000001 L-1.7053028E-13,65.206651 C7.3550318,48.013234 7.5255431,28.624822 0.4740567,11.306663 z</Geometry>
     <Geometry x:Key="CirclePanelRightGeometry">M267.287478 892.162257c0 45.149912 59.597884 71.336861 93.008818 37.925926L740.458554 549.925926c21.671958-21.671958 21.671958-54.179894 0-75.851852L360.296296 93.911817c-33.410935-33.410935-93.008818-5.417989-93.008818 38.828924v759.421516z m0 0</Geometry>
+    <Geometry x:Key="GithubGeometry">M512 0C229.12 0 0 229.12 0 512c0 226.56 146.56 417.92 350.08 485.76 25.6 4.48 35.2-10.88 35.2-24.32 0-12.16-0.64-52.48-0.64-95.36-128.64 23.68-161.92-31.36-172.16-60.16-5.76-14.72-30.72-60.16-52.48-72.32-17.92-9.6-43.52-33.28-0.64-33.92 40.32-0.64 69.12 37.12 78.72 52.48 46.08 77.44 119.68 55.68 149.12 42.24 4.48-33.28 17.92-55.68 32.64-68.48-113.92-12.8-232.96-56.96-232.96-252.8 0-55.68 19.84-101.76 52.48-137.6-5.12-12.8-23.04-65.28 5.12-135.68 0 0 42.88-13.44 140.8 52.48 40.96-11.52 84.48-17.28 128-17.28 43.52 0 87.04 5.76 128 17.28 97.92-66.56 140.8-52.48 140.8-52.48 28.16 70.4 10.24 122.88 5.12 135.68 32.64 35.84 52.48 81.28 52.48 137.6 0 196.48-119.68 240-233.6 252.8 18.56 16 34.56 46.72 34.56 94.72 0 68.48-0.64 123.52-0.64 140.8 0 13.44 9.6 29.44 35.2 24.32A512.832 512.832 0 0 0 1024 512c0-282.88-229.12-512-512-512z</Geometry>
+    <Geometry x:Key="NugetGeometry">M449.722947 199.412211H706.021053c130.967579 0 237.136842 106.169263 237.136842 237.136842v256.298105c0 130.967579-106.169263 237.136842-237.136842 237.136842H449.722947c-130.965895 0-237.136842-106.169263-237.136842-237.136842V436.549053c0-130.967579 106.170947-237.136842 237.136842-237.136842z m-201.205894-21.557895c0-64.299789-70.085053-104.704-125.850948-72.55579s-55.764211 112.96 0 145.111579 125.850947-8.257684 125.850948-72.555789z m239.528421 234.74021c0-68.003368-74.088421-110.736842-133.037474-76.734315s-58.950737 119.467789 0 153.470315 133.039158-8.730947 133.039158-76.736zM835.368421 692.847158c0-117.596632-128.154947-191.494737-230.123789-132.695579s-101.970526 206.593684 0 265.391158S835.368421 810.443789 835.368421 692.847158z</Geometry>
+    <Geometry x:Key="EmailGeometry">M430.079734 481.464543c45.196365 45.596478 118.486578 45.596478 163.68499 0l360.684736-324.939627c0.547469 3.751441 1.13894 7.490601 1.13894 11.401678l0 404.753417 0 116.754121c0 42.995233-34.547841 77.838809-77.145008 77.838809L145.397996 767.272941c-42.597167 0-77.145008-34.844599-77.145008-77.838809L68.252988 494.839155 68.252988 167.926594c0-3.911076 0.593518-7.65126 1.139963-11.401678L430.079734 481.464543zM910.960992 74.226538 562.044278 387.28558c-38.470173 38.811957-62.276369 38.811957-100.770078 0L112.538611 74.408687c10.011005-4.789073 21.069875-7.673773 32.859385-7.673773l733.044372 0C890.095779 66.735937 901.065622 69.539796 910.960992 74.226538z</Geometry>
+    <Geometry x:Key="GitterGeometry">M260.8 645H160V0h100.8v645zM461.8 152.2h-100.8V1024h100.8V152.2z m201.2 0h-100.8V1024h100.8V152.2zM864 152h-100.8v494H864V152z</Geometry>
+    <Geometry x:Key="CnblogsGeometry">M512 0C229.234472 0 0 229.226146 0 512 0 794.765528 229.234472 1024 512 1024S1024 794.765528 1024 512C1024 229.226146 794.765528 0 512 0zM228.776585 836.066862c-63.163317 0-114.371642-51.208325-114.371642-114.371642S165.613268 607.323577 228.776585 607.323577s114.371642 51.208325 114.371643 114.371643c0 63.171642-51.208325 114.371642-114.371643 114.371642z m420.555968-89.612488a391.867317 391.867317 0 0 1-1.989724 16.975089c-7.259577 30.203837-33.950179 52.898341-66.376845 52.898342-38.104455 0-68.990959-34.158309-68.99096-72.204488 0-5.877593 0.81587-11.463805 2.206179-16.775284-1.756618-131.096976-103.981789-237.867707-233.205593-246.883903l-6.343805-0.740943-1.015675-0.041626c-5.453008-0.216455-10.930992-0.732618-16.142569-2.331057a67.958634 67.958634 0 0 1-47.91987-65.078114c0-37.604943 30.245463-68.091837 67.550699-68.091837 0.299707 0 0.591089 0.041626 0.890797 0.049951l0.124878-0.049951c205.707447 2.139577 371.836878 169.484488 371.836878 375.699772 0 7.717463-0.341333 15.34335-0.824195 22.94426 0.066602 1.207154 0.19148 2.397659 0.199805 3.629789z m254.085203-63.329821c-10.856065 45.172553-25.80813 104.114992-74.310764 104.114992-56.994341 0-48.236228-66.085463-48.236228-122.996553 0-8.791415 1.223805-17.149919 3.296781-25.100488-2.639089-196.108488-169.834146-387.812943-363.137041-401.291447l-35.806699-5.827642c-42.117203-7.492683-111.715902-3.255154-111.715903-49.193626 0-56.253398 50.234276-81.861724 106.038114-81.861724 0.449561 0 0.882472 0.058276 1.332033 0.066602l0.183154-0.066602c307.724488 3.180228 526.252748 208.546341 526.252748 517.028423a538.474146 538.474146 0 0 1-1.23213 34.316488c0.108228 1.806569 0.291382 3.596488 0.308033 5.428032a542.72 542.72 0 0 1-2.972098 25.383545z</Geometry>
+    <Geometry x:Key="ConfigGeometry">M827.904 541.184a278.592 278.592 0 0 0 0-58.368l73.728-58.368c15.872-13.056 20.224-35.584 9.728-53.504l-78.592-137.728c-9.984-17.408-31.232-25.856-51.712-18.176l-86.528 35.072c-15.872-11.52-32.512-21.248-49.664-29.184l-12.8-92.928c-3.072-20.224-20.736-35.584-41.216-35.584h-157.44c-20.736 0-38.144 14.848-41.216 35.84L378.88 221.44c-17.152 7.936-33.792 17.92-49.664 29.184L242.688 215.296c-18.688-7.168-41.216 0.768-51.2 18.176L112.64 371.2c-10.24 17.92-6.144 40.448 10.24 53.76l73.472 58.112c-1.024 9.472-1.536 19.2-1.536 29.184 0 9.728 0.512 19.456 1.536 29.184l-73.984 58.368c-15.872 13.056-19.968 35.584-9.728 53.248l78.848 137.728c9.984 17.408 32 25.856 51.456 17.92l86.528-35.072c15.872 11.52 32.512 21.248 49.664 29.184l13.056 93.696c3.328 20.48 20.48 35.328 41.216 35.328h157.44c20.48 0 38.144-15.36 41.216-35.84l13.056-93.184c17.152-7.936 33.792-17.664 49.664-29.184l86.784 35.328c4.864 1.792 9.984 2.816 15.104 2.816 14.848 0 28.672-7.936 36.096-20.992l78.592-137.728c10.24-17.664 6.4-40.192-9.984-53.76l-73.472-58.112z m-25.344 231.168l-99.584-40.448c-7.424-3.072-15.872-1.792-22.272 3.072-19.712 15.36-40.704 27.648-62.464 36.608-7.424 3.072-12.544 9.728-13.568 17.664l-14.592 104.96-155.392 2.304-15.104-107.264c-1.024-7.936-6.4-14.592-13.568-17.664-21.76-8.96-42.752-21.504-62.464-36.608-4.096-3.072-8.96-4.608-13.824-4.608-2.816 0-5.888 0.512-8.448 1.536l-96.256 41.472-80.896-137.216 84.48-66.816c6.144-4.864 9.472-12.8 8.448-20.48-1.536-12.032-2.56-24.32-2.56-36.608 0-12.288 1.024-24.576 2.56-36.608 1.024-7.936-2.048-15.616-8.448-20.48l-83.712-64 76.544-139.264 99.584 40.448c7.424 3.072 15.872 1.792 22.272-3.072 19.712-15.36 40.96-27.648 62.72-36.864 7.424-3.072 12.544-9.728 13.568-17.664l12.544-104.704 157.696-2.304 15.104 107.264c1.024 7.936 6.4 14.592 13.568 17.664 21.76 8.96 42.752 21.504 62.464 36.864 6.4 4.864 14.848 6.144 22.272 3.072l96.256-41.472 80.896 137.216-84.48 66.816c-6.144 4.864-9.472 12.544-8.448 20.48 1.536 12.032 2.56 24.32 2.56 36.608 0 12.288-1.024 24.576-2.56 36.608-1.024 7.936 2.304 15.616 8.448 20.48l83.712 63.744-77.056 139.264zM512 345.6c-91.136 0-165.12 74.752-165.12 166.4s73.984 166.4 165.12 166.4 165.12-74.752 165.12-166.4-73.984-166.4-165.12-166.4z m0 297.216c-71.168 0-129.28-58.624-129.28-130.816 0-72.192 58.112-130.816 129.28-130.816s129.28 58.624 129.28 130.816c0 72.192-57.856 130.816-129.28 130.816z</Geometry>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Themes/SkinDark.xaml b/HandyControlDemo/Resources/Themes/SkinDark.xaml
new file mode 100644
index 00000000..32b78055
--- /dev/null
+++ b/HandyControlDemo/Resources/Themes/SkinDark.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/Colors/ColorsDark.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Themes/SkinDefault.xaml b/HandyControlDemo/Resources/Themes/SkinDefault.xaml
new file mode 100644
index 00000000..825e8dbd
--- /dev/null
+++ b/HandyControlDemo/Resources/Themes/SkinDefault.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/Colors/Colors.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Themes/Styles/Style.xaml b/HandyControlDemo/Resources/Themes/Styles/Style.xaml
index cd3f55cd..3365c817 100644
--- a/HandyControlDemo/Resources/Themes/Styles/Style.xaml
+++ b/HandyControlDemo/Resources/Themes/Styles/Style.xaml
@@ -1,9 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../Basic/Brushes.xaml"/>
-        <ResourceDictionary Source="../Basic/Geometries.xaml"/>
-        <ResourceDictionary Source="../Basic/Converters.xaml"/>
         <ResourceDictionary Source="ListBoxItem.xaml"/>
         <ResourceDictionary Source="Label.xaml"/>
         <ResourceDictionary Source="Button.xaml"/>
diff --git a/HandyControlDemo/Resources/Themes/Styles/StyleDark.xaml b/HandyControlDemo/Resources/Themes/Styles/StyleDark.xaml
new file mode 100644
index 00000000..cd3f55cd
--- /dev/null
+++ b/HandyControlDemo/Resources/Themes/Styles/StyleDark.xaml
@@ -0,0 +1,12 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../Basic/Brushes.xaml"/>
+        <ResourceDictionary Source="../Basic/Geometries.xaml"/>
+        <ResourceDictionary Source="../Basic/Converters.xaml"/>
+        <ResourceDictionary Source="ListBoxItem.xaml"/>
+        <ResourceDictionary Source="Label.xaml"/>
+        <ResourceDictionary Source="Button.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControlDemo/Resources/Themes/Theme.xaml b/HandyControlDemo/Resources/Themes/Theme.xaml
new file mode 100644
index 00000000..93d641b3
--- /dev/null
+++ b/HandyControlDemo/Resources/Themes/Theme.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/Basic.xaml"/>
+        <ResourceDictionary Source="Styles/Style.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/HandyControlDemo/Service/DataService.cs b/HandyControlDemo/Service/DataService.cs
index c71807ee..26147359 100644
--- a/HandyControlDemo/Service/DataService.cs
+++ b/HandyControlDemo/Service/DataService.cs
@@ -29,7 +29,9 @@ namespace HandyControlDemo.Service
                     IsSelected = i % 2 == 0,
                     Name = $"Name{i}",
                     Type = (DemoType)i,
-                    DataList = dataList
+                    DataList = dataList,
+                    ImgPath = $"/HandyControlDemo;component/Resources/Img/Avatar/avatar{i}.png",
+                    Remark = new string(i.ToString()[0], 10)
                 };
                 list.Add(model);
             }
diff --git a/HandyControlDemo/UserControl/Controls/AnimationPathDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/AnimationPathDemoCtl.xaml
index 442d5285..378c4c43 100644
--- a/HandyControlDemo/UserControl/Controls/AnimationPathDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/AnimationPathDemoCtl.xaml
@@ -1,9 +1,9 @@
 <UserControl x:Class="HandyControlDemo.UserControl.AnimationPathDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             Background="White"
+             Background="{DynamicResource RegionBrush}"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
     <controls:TransitioningContentControl>
-        <controls:AnimationPath  VerticalAlignment="Center" Margin="32" PathLength="400" Duration="0:0:4" Stretch="Uniform" Width="200" Height="200" StrokeThickness="2" Stroke="{StaticResource PrimaryBrush}" Data="M40.493382,19.001303 C36.637875,19.06448 33.938568,21.421986 33.948524,25.271919 L34.068279,71.56765 34.066906,71.598007 34.068745,71.747833 34.18895,118.21758 C34.202225,123.35083 39.026951,129.19344 44.965271,131.2674 50.903587,133.34137 55.706783,130.86133 55.693504,125.72808 L55.589508,85.524513 93.866371,85.524513 93.950943,118.21758 C93.964218,123.35083 98.788948,129.19344 104.72726,131.2674 110.66558,133.34137 115.46878,130.86133 115.4555,125.72808 L115.33575,79.432381 115.33712,79.401993 115.33528,79.252007 115.21507,32.782413 C115.2018,27.64917 110.37708,21.806566 104.43876,19.732603 98.500435,17.658638 93.697243,20.138674 93.710518,25.271919 L93.814514,65.475487 55.537647,65.475487 55.453079,32.782413 C55.439804,27.64917 50.615082,21.806566 44.676762,19.732603 43.192181,19.214111 41.778549,18.980244 40.493382,19.001303 z M9.999999,0 L140,0 C145.52284,0 150,4.4771523 150,9.999999 L150,140 C150,145.52284 145.52284,150 140,150 L9.999999,150 C4.4771523,150 0,145.52284 0,140 L0,9.999999 C0,4.4771523 4.4771523,0 9.999999,0 z"/>
+        <controls:AnimationPath  VerticalAlignment="Center" Margin="32" PathLength="400" Duration="0:0:4" Stretch="Uniform" Width="200" Height="200" StrokeThickness="2" Stroke="{DynamicResource PrimaryBrush}" Data="M40.493382,19.001303 C36.637875,19.06448 33.938568,21.421986 33.948524,25.271919 L34.068279,71.56765 34.066906,71.598007 34.068745,71.747833 34.18895,118.21758 C34.202225,123.35083 39.026951,129.19344 44.965271,131.2674 50.903587,133.34137 55.706783,130.86133 55.693504,125.72808 L55.589508,85.524513 93.866371,85.524513 93.950943,118.21758 C93.964218,123.35083 98.788948,129.19344 104.72726,131.2674 110.66558,133.34137 115.46878,130.86133 115.4555,125.72808 L115.33575,79.432381 115.33712,79.401993 115.33528,79.252007 115.21507,32.782413 C115.2018,27.64917 110.37708,21.806566 104.43876,19.732603 98.500435,17.658638 93.697243,20.138674 93.710518,25.271919 L93.814514,65.475487 55.537647,65.475487 55.453079,32.782413 C55.439804,27.64917 50.615082,21.806566 44.676762,19.732603 43.192181,19.214111 41.778549,18.980244 40.493382,19.001303 z M9.999999,0 L140,0 C145.52284,0 150,4.4771523 150,9.999999 L150,140 C150,145.52284 145.52284,150 140,150 L9.999999,150 C4.4771523,150 0,145.52284 0,140 L0,9.999999 C0,4.4771523 4.4771523,0 9.999999,0 z"/>
     </controls:TransitioningContentControl>
 </UserControl>
diff --git a/HandyControlDemo/UserControl/Controls/CarouselDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/CarouselDemoCtl.xaml
index bdb6e863..e78b2e07 100644
--- a/HandyControlDemo/UserControl/Controls/CarouselDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/CarouselDemoCtl.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="HandyControlDemo.UserControl.CarouselDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Background="White"
+             Background="{DynamicResource RegionBrush}"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
     <controls:TransitioningContentControl>
         <controls:Carousel Margin="32" IsCenter="True" AutoRun="True" Width="600" Height="330" VerticalAlignment="Center">
diff --git a/HandyControlDemo/UserControl/Controls/CirclePanelDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/CirclePanelDemoCtl.xaml
index 4b9b84c5..84eae51d 100644
--- a/HandyControlDemo/UserControl/Controls/CirclePanelDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/CirclePanelDemoCtl.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <controls:CirclePanel Margin="64" Diameter="170">
             <Button Style="{StaticResource CirclePanelButton}"/>
diff --git a/HandyControlDemo/UserControl/Controls/ClockDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/ClockDemoCtl.xaml
index 797a5f0a..43122db0 100644
--- a/HandyControlDemo/UserControl/Controls/ClockDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/ClockDemoCtl.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <controls:Clock Margin="32"/>
     </controls:TransitioningContentControl>
diff --git a/HandyControlDemo/UserControl/Controls/ColorPickerDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/ColorPickerDemoCtl.xaml
index 86639a18..9d253efe 100644
--- a/HandyControlDemo/UserControl/Controls/ColorPickerDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/ColorPickerDemoCtl.xaml
@@ -1,7 +1,6 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ColorPickerDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Background="{Binding SelectedBrush,ElementName=ColorPicker}"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
     <controls:TransitioningContentControl>
         <controls:ColorPicker Name="ColorPicker" Margin="32"/>
diff --git a/HandyControlDemo/UserControl/Controls/CompareSliderDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/CompareSliderDemoCtl.xaml
index 57cafbce..c375b4bc 100644
--- a/HandyControlDemo/UserControl/Controls/CompareSliderDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/CompareSliderDemoCtl.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <controls:ScrollViewer VerticalAlignment="Center">
             <WrapPanel ItemHeight="384" ItemWidth="632">
diff --git a/HandyControlDemo/UserControl/Controls/GrowlDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/GrowlDemoCtl.xaml
index 0f813ec7..7f5b6932 100644
--- a/HandyControlDemo/UserControl/Controls/GrowlDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/GrowlDemoCtl.xaml
@@ -4,7 +4,7 @@
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              DataContext="{Binding GrowlDemo,Source={StaticResource Locator}}"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <WrapPanel Margin="32" VerticalAlignment="Center">
             <Button Command="{Binding InfoCmd}" Content="{x:Static langs:Lang.Info}" Margin="0,5,5,5" Style="{StaticResource ButtonInfo}"/>
diff --git a/HandyControlDemo/UserControl/Controls/ImageBrowserDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/ImageBrowserDemoCtl.xaml
index 4cf6c15b..7b3733e2 100644
--- a/HandyControlDemo/UserControl/Controls/ImageBrowserDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/ImageBrowserDemoCtl.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ImageBrowserDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Background="White"
+             Background="{DynamicResource RegionBrush}"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              DataContext="{Binding ImageBrowserDemo,Source={StaticResource Locator}}"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
diff --git a/HandyControlDemo/UserControl/Controls/LoadingDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/LoadingDemoCtl.xaml
index ee0185d2..ee2c5dc0 100644
--- a/HandyControlDemo/UserControl/Controls/LoadingDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/LoadingDemoCtl.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="HandyControlDemo.UserControl.LoadingDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Background="White"
+             Background="{DynamicResource RegionBrush}"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
     <controls:TransitioningContentControl>
         <StackPanel Width="600" Margin="32" VerticalAlignment="Center">
diff --git a/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml
index a0a6ade4..7a50561e 100644
--- a/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/NumericUpDownDemoCtl.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <StackPanel Margin="32">
             <controls:NumericUpDown x:Name="NumericUpDown"/>
diff --git a/HandyControlDemo/UserControl/Controls/PaginationDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/PaginationDemoCtl.xaml
index 32662a72..bd510cf9 100644
--- a/HandyControlDemo/UserControl/Controls/PaginationDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/PaginationDemoCtl.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="HandyControlDemo.UserControl.PaginationDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Background="White"
+             Background="{DynamicResource RegionBrush}"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
     <controls:TransitioningContentControl>
         <controls:Pagination Margin="32" Width="600" MaxPageCount="10" VerticalAlignment="Center"/>
diff --git a/HandyControlDemo/UserControl/Controls/ScrollViewerDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/ScrollViewerDemoCtl.xaml
index cbff61d0..12abfc01 100644
--- a/HandyControlDemo/UserControl/Controls/ScrollViewerDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/ScrollViewerDemoCtl.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White"
+             Background="{DynamicResource RegionBrush}"
              Width="550"
              Height="600">
     <controls:TransitioningContentControl>
@@ -16,27 +16,27 @@
                 <controls:ScrollViewer Orientation="Horizontal" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden" IsEnableInertia="True">
                     <StackPanel Orientation="Horizontal">
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
@@ -47,27 +47,27 @@
                 <controls:ScrollViewer IsEnableInertia="True">
                     <WrapPanel Orientation="Horizontal">
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
diff --git a/HandyControlDemo/UserControl/Controls/StepBarDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/StepBarDemoCtl.xaml
index f9b94f21..1dcee539 100644
--- a/HandyControlDemo/UserControl/Controls/StepBarDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/StepBarDemoCtl.xaml
@@ -5,7 +5,7 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
              FocusManager.FocusedElement="{Binding RelativeSource={x:Static RelativeSource.Self}, Mode=OneTime}"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <StackPanel Margin="32" VerticalAlignment="Center" MaxWidth="800">
             <controls:StepBar x:Name="StepBarMain">
diff --git a/HandyControlDemo/UserControl/Controls/TabControlDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/TabControlDemoCtl.xaml
index 8e897d20..4a32488a 100644
--- a/HandyControlDemo/UserControl/Controls/TabControlDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/TabControlDemoCtl.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="HandyControlDemo.UserControl.TabControlDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Background="White"
+             Background="{DynamicResource RegionBrush}"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
     <controls:TransitioningContentControl>
         <controls:ScrollViewer HorizontalScrollBarVisibility="Auto">
@@ -12,22 +12,22 @@
                         <Grid Background="White"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem2">
-                        <Grid Background="{StaticResource DarkDangerBrush}"/>
+                        <Grid Background="{DynamicResource DarkDangerBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem3" IsSelected="True">
-                        <Grid Background="{StaticResource PrimaryBrush}"/>
+                        <Grid Background="{DynamicResource PrimaryBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem4">
-                        <Grid Background="{StaticResource DarkInfoBrush}"/>
+                        <Grid Background="{DynamicResource DarkInfoBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem5">
-                        <Grid Background="{StaticResource DarkSuccessBrush}"/>
+                        <Grid Background="{DynamicResource DarkSuccessBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem6">
-                        <Grid Background="{StaticResource DarkWarningBrush}"/>
+                        <Grid Background="{DynamicResource DarkWarningBrush}"/>
                     </controls:TabItem>
                     <controls:TabItem Header="TabItem7">
-                        <Grid Background="{StaticResource DarkAccentBrush}"/>
+                        <Grid Background="{DynamicResource DarkAccentBrush}"/>
                     </controls:TabItem>
                 </controls:TabControl>
                 <StackPanel Orientation="Horizontal" Margin="32,32,32,16">
diff --git a/HandyControlDemo/UserControl/Controls/TimeBarDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/TimeBarDemoCtl.xaml
index 751b7e39..af1a3915 100644
--- a/HandyControlDemo/UserControl/Controls/TimeBarDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/TimeBarDemoCtl.xaml
@@ -2,8 +2,8 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
-        <controls:TimeBar BorderThickness="0" Margin="32" Background="{StaticResource PrimaryBrush}" Width="600"  VerticalAlignment="Center"/>
+        <controls:TimeBar BorderThickness="0" Margin="32" Width="600"  VerticalAlignment="Center"/>
     </controls:TransitioningContentControl>
 </UserControl>
diff --git a/HandyControlDemo/UserControl/Controls/TimePickerDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/TimePickerDemoCtl.xaml
index 44f8eef8..4ed73e65 100644
--- a/HandyControlDemo/UserControl/Controls/TimePickerDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/TimePickerDemoCtl.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <StackPanel Margin="32">
             <controls:TimePicker/>
diff --git a/HandyControlDemo/UserControl/Controls/WindowDemoCtl.xaml b/HandyControlDemo/UserControl/Controls/WindowDemoCtl.xaml
index 2627c8df..d719209c 100644
--- a/HandyControlDemo/UserControl/Controls/WindowDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Controls/WindowDemoCtl.xaml
@@ -5,7 +5,7 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:data="clr-namespace:HandyControlDemo.Data"
              DataContext="{Binding WindowDemo,Source={StaticResource Locator}}"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <UniformGrid Margin="32" Columns="3" Rows="2" Height="200">
             <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CommonWindow}" Content="{x:Static langs:Lang.OpenCommonWindow}"/>
diff --git a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
index 677fa899..4ff56b14 100644
--- a/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
+++ b/HandyControlDemo/UserControl/Main/LeftMainContent.xaml
@@ -17,97 +17,97 @@
             <ListBox BorderThickness="0" SelectionMode="Single">
                 <ListBoxItem Tag="{x:Static data:MessageToken.ButtonDemoCtl}" Content="{x:Static langs:Lang.Button}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/ButtonClick_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/ButtonClick_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.ToggleButtonDemoCtl}" Content="{x:Static langs:Lang.ToggleButton}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/Toggle_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/Toggle_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.RadioButtonDemoCtl}" Content="{x:Static langs:Lang.RadioButton}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/RadioButton_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/RadioButton_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.CheckBoxDemoCtl}" Content="{x:Static langs:Lang.CheckBox}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/CheckBox_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/CheckBox_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.NaiveScrollViewerDemoCtl}" Content="{x:Static langs:Lang.ScrollViewer}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.TextBlockDemoCtl}" Content="{x:Static langs:Lang.TextBlock}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/TextBlock_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/TextBlock_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.TextBoxDemoCtl}" Content="{x:Static langs:Lang.TextBox}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/TextBox_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/TextBox_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.ComboBoxDemoCtl}" Content="{x:Static langs:Lang.ComboBox}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/ComboBox_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/ComboBox_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.PasswordBoxDemoCtl}" Content="{x:Static langs:Lang.PasswordBox}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/PasswordBox_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/PasswordBox_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.ExpanderDemoCtl}" Content="{x:Static langs:Lang.Expander}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/Expander_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/Expander_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.ProgressBarDemoCtl}" Content="{x:Static langs:Lang.ProgressBar}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/ProgressBar_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/ProgressBar_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.CalendarDemoCtl}" Content="{x:Static langs:Lang.Calendar}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/Calendar_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/Calendar_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.DatePickerDemoCtl}" Content="{x:Static langs:Lang.DatePicker}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/DatePicker_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.NaiveTabControlDemoCtl}" Content="{x:Static langs:Lang.TabControl}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/TabPage_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/TabPage_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.DataGridDemoCtl}" Content="{x:Static langs:Lang.DataGrid}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/DataGrid_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/DataGrid_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.TreeViewDemoCtl}" Content="{x:Static langs:Lang.TreeView}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/TreeView_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/TreeView_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.ListBoxDemoCtl}" Content="{x:Static langs:Lang.ListBox}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/ListBox_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/ListBox_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.MenuDemoCtl}" Content="{x:Static langs:Lang.Menu}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/ContextMenu_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/ContextMenu_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.BorderDemoCtl}" Content="{x:Static langs:Lang.Border1}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/BorderElement_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/BorderElement_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
             </ListBox>
@@ -116,87 +116,87 @@
             <ListBox BorderThickness="0" SelectionMode="Single">
                 <ListBoxItem Tag="{x:Static data:MessageToken.NumericUpDownDemoCtl}" Content="{x:Static langs:Lang.NumericUpDown}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/NumericListBox_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/NumericListBox_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.CirclePanelDemoCtl}" Content="{x:Static langs:Lang.CirclePanel}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/ShapeArcRing_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/ShapeArcRing_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.ClockDemoCtl}" Content="{x:Static langs:Lang.Clock}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/Time_color_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/Time_color_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.TimePickerDemoCtl}" Content="{x:Static langs:Lang.TimePicker}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/TimePicker_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/TimePicker_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.StepBarDemoCtl}" Content="{x:Static langs:Lang.StepBar}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/Flow_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/Flow_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.GrowlDemoCtl}" Content="{x:Static langs:Lang.Growl}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/Message_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/Message_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.LoadingDemoCtl}" Content="{x:Static langs:Lang.Loading}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/Loading_Blue_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/Loading_Blue_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.ImageBrowserDemoCtl}" Content="{x:Static langs:Lang.ImageBrowser}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/ImageBrowser_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/ImageBrowser_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.ColorPickerDemoCtl}" Content="{x:Static langs:Lang.ColorPicker}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/ColorPalette_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/ColorPalette_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.CarouselDemoCtl}" Content="{x:Static langs:Lang.Carousel}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/Carousel_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/Carousel_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.CompareSliderDemoCtl}" Content="{x:Static langs:Lang.CompareSlider}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/SplitterControl_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/SplitterControl_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.TimeBarDemoCtl}" Content="{x:Static langs:Lang.TimeBar}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/Timeline_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/Timeline_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.PaginationDemoCtl}" Content="{x:Static langs:Lang.Pagination}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/Paginator_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/Paginator_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.AnimationPathDemoCtl}" Content="{x:Static langs:Lang.AnimationPath}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/Path_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/Path_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Tag="{x:Static data:MessageToken.TabControlDemoCtl}" Content="{x:Static langs:Lang.TabControl}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/TabPage_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/TabPage_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.ScrollViewerDemoCtl}" Content="{x:Static langs:Lang.ScrollViewer}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/ScrollBox_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
                 <ListBoxItem Style="{StaticResource ListBoxItemNew}" Tag="{x:Static data:MessageToken.WindowDemoCtl}" Content="{x:Static langs:Lang.Window}">
                     <controls:EdgeElement.LeftContent>
-                        <Image Source="../../Resources/Img/LeftMainContent/WindowsForm_16x.png" Stretch="Uniform"/>
+                        <Image Source="../../Resources/Img/LeftMainContent/WindowsForm_16x.png"/>
                     </controls:EdgeElement.LeftContent>
                 </ListBoxItem>
             </ListBox>
diff --git a/HandyControlDemo/UserControl/Main/MainContent.xaml b/HandyControlDemo/UserControl/Main/MainContent.xaml
index 18acee22..efe7f50e 100644
--- a/HandyControlDemo/UserControl/Main/MainContent.xaml
+++ b/HandyControlDemo/UserControl/Main/MainContent.xaml
@@ -1,15 +1,15 @@
 <Border xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="HandyControlDemo.UserControl.MainContent"
-        Background="#f0f0f0">
-    <Border Background="{StaticResource MainContentBackground}">
+        Background="{DynamicResource MainContentBackgroundBrush}">
+    <Border Background="{DynamicResource MainContentForegroundDrawingBrush}">
         <Grid Name="GridMain" MinHeight="300" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="16">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <Border Name="BorderEffect" Grid.RowSpan="2" Background="White" CornerRadius="10" Effect="{StaticResource EffectShadow4}"/>
-            <Border Height="32" Name="BorderTitle" Grid.Row="0" CornerRadius="10,10,0,0" Background="{StaticResource PrimaryBrush}">
+            <Border Name="BorderEffect" Grid.RowSpan="2" Background="{DynamicResource RegionBrush}" CornerRadius="10" Effect="{StaticResource EffectShadow4}"/>
+            <Border Height="32" Name="BorderTitle" Grid.Row="0" CornerRadius="10,10,0,0" Background="{DynamicResource TitleBrush}">
                 <TextBlock Style="{StaticResource TextBlockDefault}" Foreground="White" Text="{Binding ContentTitle}"/>
             </Border>
             <Border Grid.Row="1" ClipToBounds="True">
diff --git a/HandyControlDemo/UserControl/Main/NoUserContent.xaml b/HandyControlDemo/UserControl/Main/NoUserContent.xaml
index aee5a4ce..beef992a 100644
--- a/HandyControlDemo/UserControl/Main/NoUserContent.xaml
+++ b/HandyControlDemo/UserControl/Main/NoUserContent.xaml
@@ -2,13 +2,17 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
-      xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
+      DataContext="{Binding NoUserContent,Source={StaticResource Locator}}"
+      xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+      Height="28"
+      xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+      xmlns:enum="clr-namespace:HandyControl.Data.Enum;assembly=HandyControl">
     <Grid.ColumnDefinitions>
         <ColumnDefinition/>
         <ColumnDefinition Width="Auto"/>
     </Grid.ColumnDefinitions>
     <StackPanel VerticalAlignment="Stretch" Orientation="Horizontal">
-        <Button WindowChrome.IsHitTestVisibleInChrome="True" Margin="4,0,0,0" Width="28" Height="28" Style="{StaticResource ButtonCustom}">
+        <Button Margin="4,0,0,0" Width="28" Height="28" Style="{StaticResource ButtonCustom}">
             <interactivity:Interaction.Triggers>
                 <interactivity:EventTrigger EventName="Click">
                     <interactivity:InvokeCommandAction Command="{x:Static SystemCommands.ShowSystemMenuCommand}" />
@@ -19,32 +23,58 @@
             </interactivity:Interaction.Triggers>
             <Path Height="16" Fill="White" Stretch="Uniform" Data="{StaticResource LogoGeometry}"/>
         </Button>
-        <Menu Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Background="Transparent">
-            <MenuItem Foreground="White" Header="File">
-                <MenuItem Header="New repository" InputGestureText="Ctrl+N"/>
-                <Separator/>
-                <MenuItem Header="Add local repository"/>
-                <MenuItem Header="Clone repository"/>
+        <Menu MenuItem.Click="MenuItemLinks_OnClick"  Margin="10,0,0,0" Background="Transparent">
+            <MenuItem Foreground="White" Header="{x:Static langs:Lang.Repository}">
+                <MenuItem Tag="https://github.com/NaBian/HandyControl" Header="GitHub">
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource GithubGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Tag="https://www.nuget.org/packages/HandyControl" Header="NuGet">
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource NugetGeometry}" Fill="#224880"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
+            <MenuItem Foreground="White" Header="{x:Static langs:Lang.About}">
+                <MenuItem Tag="mailto:836904362@qq.com" Header="{x:Static langs:Lang.Email}">
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource EmailGeometry}" Fill="{DynamicResource PrimaryBrush}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Tag="https://gitter.im/HandyControl/Lobby" Header="{x:Static langs:Lang.Chatroom}">
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource GitterGeometry}" Fill="#e52e64"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Tag="https://www.cnblogs.com/nabian" Header="{x:Static langs:Lang.Blog}">
+                    <MenuItem.Icon>
+                        <Path Data="{StaticResource CnblogsGeometry}" Fill="{DynamicResource PrimaryTextBrush}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
             </MenuItem>
-            <MenuItem Foreground="White" Header="Edit"/>
-            <MenuItem Foreground="White" Header="View"/>
-            <MenuItem Foreground="White" Header="Repository"/>
-            <MenuItem Foreground="White" Header="Branch"/>
-            <MenuItem Foreground="White" Header="Help"/>
         </Menu>
     </StackPanel>
-    <Button Grid.Column="1" Click="ButtonLang_OnClick" Name="ButtonLang" Width="44" Style="{StaticResource ButtonCustom}" Background="Transparent">
-        <Image Name="ImageLang" Width="24" Stretch="Uniform"/>
-    </Button>
-    <Popup AllowsTransparency="True" Grid.Column="1" PlacementTarget="{Binding ElementName=ButtonLang}" HorizontalOffset="-4" Name="PopupLang" VerticalOffset="6" StaysOpen="False">
-        <Border Background="White" CornerRadius="4" Margin="16" Effect="{StaticResource EffectShadow2}">
-            <StackPanel Button.Click="ButtonLangs_OnClick"  Margin="10">
-                <Button Tag="cn" Style="{StaticResource ButtonCustom}">
-                    <Image Width="32" Stretch="Uniform" Source="/HandyControlDemo;component/Resources/Img/Flag/cn.png"/>
-                </Button>
-                <Button Tag="en" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
-                    <Image Width="32" Stretch="Uniform" Source="/HandyControlDemo;component/Resources/Img/Flag/en.png"/>
-                </Button>
+    <Button Grid.Column="1" Click="ButtonConfig_OnClick" Name="ButtonConfig" Style="{StaticResource ButtonIcon}" controls:IconElement.Geometry="{StaticResource ConfigGeometry}"/>
+    <Popup AllowsTransparency="True" Grid.Column="1" PlacementTarget="{Binding ElementName=ButtonConfig}" HorizontalOffset="-25" Name="PopupConfig" VerticalOffset="6" StaysOpen="False">
+        <Border Background="{DynamicResource SecondaryRegionBrush}" CornerRadius="4" Margin="16" Effect="{StaticResource EffectShadow2}">
+            <StackPanel Orientation="Horizontal">
+                <StackPanel Button.Click="ButtonLangs_OnClick" Margin="10,10,0,10">
+                    <Button Tag="cn" Style="{StaticResource ButtonCustom}">
+                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/cn.png"/>
+                    </Button>
+                    <Button Tag="en" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
+                        <Image Width="32" Source="/HandyControlDemo;component/Resources/Img/Flag/en.png"/>
+                    </Button>
+                </StackPanel>
+                <StackPanel Button.Click="ButtonSkins_OnClick"  Margin="10,10,10,10">
+                    <Button Tag="{x:Static enum:SkinType.Default}" Style="{StaticResource ButtonCustom}">
+                        <Border Background="White" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
+                    </Button>
+                    <Button Tag="{x:Static enum:SkinType.Dark}" Style="{StaticResource ButtonCustom}" Margin="0,10,0,0">
+                        <Border Background="Black" Width="32" Height="21" CornerRadius="2" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}"/>
+                    </Button>
+                </StackPanel>
             </StackPanel>
         </Border>
     </Popup>
diff --git a/HandyControlDemo/UserControl/Main/NoUserContent.xaml.cs b/HandyControlDemo/UserControl/Main/NoUserContent.xaml.cs
index d6efb4c9..bd9a8d82 100644
--- a/HandyControlDemo/UserControl/Main/NoUserContent.xaml.cs
+++ b/HandyControlDemo/UserControl/Main/NoUserContent.xaml.cs
@@ -3,9 +3,8 @@ using System.Diagnostics;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using HandyControl.Controls;
+using HandyControl.Data.Enum;
 using HandyControlDemo.Data;
 
 // ReSharper disable once CheckNamespace
@@ -16,17 +15,13 @@ namespace HandyControlDemo.UserControl
         public NoUserContent()
         {
             InitializeComponent();
-
-            ImageLang.Source = BitmapFrame.Create(new Uri($"pack://application:,,,/HandyControlDemo;component/Resources/Img/Flag/{GlobalData.Config.Lang}.png"));
         }
 
-        private void ButtonLang_OnClick(object sender, RoutedEventArgs e) => PopupLang.IsOpen = true;
-
         private void ButtonLangs_OnClick(object sender, RoutedEventArgs e)
         {
             if (e.OriginalSource is Button button && button.Tag is string tag)
             {
-                PopupLang.IsOpen = false;
+                PopupConfig.IsOpen = false;
                 if (tag.Equals(GlobalData.Config.Lang)) return;
                 Growl.Ask(Properties.Langs.Lang.ChangeLangAsk, b =>
                 {
@@ -39,5 +34,27 @@ namespace HandyControlDemo.UserControl
                 });
             }
         }
+
+        private void ButtonConfig_OnClick(object sender, RoutedEventArgs e) => PopupConfig.IsOpen = true;
+
+        private void ButtonSkins_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (e.OriginalSource is Button button && button.Tag is SkinType tag)
+            {
+                PopupConfig.IsOpen = false;
+                if (tag.Equals(GlobalData.Config.Skin)) return;
+                GlobalData.Config.Skin = tag;
+                GlobalData.Save();
+                ((App)Application.Current).UpdateSkin(tag);
+            }
+        }
+
+        private void MenuItemLinks_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (e.OriginalSource is MenuItem menuItem && menuItem.Tag is string tag)
+            {
+                Process.Start(tag);
+            }
+        }
     }
 }
diff --git a/HandyControlDemo/UserControl/Styles/BorderDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/BorderDemoCtl.xaml
index 9caaa940..8b12d40b 100644
--- a/HandyControlDemo/UserControl/Styles/BorderDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/BorderDemoCtl.xaml
@@ -3,36 +3,36 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <UniformGrid Margin="32,32,0,0" Columns="3" Rows="2">
             <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="0,0,32,32">
-                <Border Background="{StaticResource PrimaryBrush}">
+                <Border Background="{DynamicResource PrimaryBrush}">
                     <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                 </Border>
             </Border>
             <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="0,0,32,32" Effect="{StaticResource EffectShadow1}">
-                <Border Background="{StaticResource InfoBrush}">
+                <Border Background="{DynamicResource InfoBrush}">
                     <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                 </Border>
             </Border>
             <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="0,0,32,32" Effect="{StaticResource EffectShadow2}">
-                <Border Background="{StaticResource WarningBrush}">
+                <Border Background="{DynamicResource WarningBrush}">
                     <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                 </Border>
             </Border>
             <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200"  Margin="0,0,32,32" Effect="{StaticResource EffectShadow3}">
-                <Border Background="{StaticResource DangerBrush}">
+                <Border Background="{DynamicResource DangerBrush}">
                     <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                 </Border>
             </Border>
             <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200"  Margin="0,0,32,32" Effect="{StaticResource EffectShadow4}">
-                <Border Background="{StaticResource AccentBrush}">
+                <Border Background="{DynamicResource AccentBrush}">
                     <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                 </Border>
             </Border>
             <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200"  Margin="0,0,32,32" Effect="{StaticResource EffectShadow5}">
-                <Border Background="{StaticResource BorderBrush}">
+                <Border Background="{DynamicResource BorderBrush}">
                     <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                 </Border>
             </Border>
diff --git a/HandyControlDemo/UserControl/Styles/ButtonDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/ButtonDemoCtl.xaml
index f384bba3..9de81c9e 100644
--- a/HandyControlDemo/UserControl/Styles/ButtonDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/ButtonDemoCtl.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <controls:ScrollViewer IsEnableInertia="True">
             <StackPanel Margin="32">
@@ -77,8 +77,8 @@
                         <TextBlock TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ButtonCustom"/>
                     </StackPanel>
                     <StackPanel>
-                        <Button Width="50" Padding="16,8" Margin="5" Style="{StaticResource ButtonIcon}" Foreground="{StaticResource PrimaryTextBrush}" controls:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
-                        <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource ButtonIcon}" Foreground="{StaticResource PrimaryTextBrush}"  controls:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                        <Button Width="50" Padding="16,8" Margin="5" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}" controls:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                        <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryTextBrush}"  controls:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
                         <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ButtonIcon（UpDownGeometry）"/>
                     </StackPanel>
                 </WrapPanel>
diff --git a/HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml
index f8fb6e88..c5550a21 100644
--- a/HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/CalendarDemoCtl.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <Calendar Margin="32" SelectionMode="MultipleRange"/>
     </controls:TransitioningContentControl>
diff --git a/HandyControlDemo/UserControl/Styles/CheckBoxDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/CheckBoxDemoCtl.xaml
index 9ba015b5..f68c6e74 100644
--- a/HandyControlDemo/UserControl/Styles/CheckBoxDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/CheckBoxDemoCtl.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White"
+             Background="{DynamicResource RegionBrush}"
              Width="400">
     <controls:TransitioningContentControl>
         <StackPanel Margin="32" HorizontalAlignment="Center" VerticalAlignment="Center">
diff --git a/HandyControlDemo/UserControl/Styles/ComboBoxDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/ComboBoxDemoCtl.xaml
index 752b0eca..a7c191ee 100644
--- a/HandyControlDemo/UserControl/Styles/ComboBoxDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/ComboBoxDemoCtl.xaml
@@ -4,7 +4,7 @@
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              DataContext="{Binding ComboBoxDemo,Source={StaticResource Locator}}"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <ScrollViewer>
             <StackPanel Margin="32">
diff --git a/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml
index d64897f5..dc98495a 100644
--- a/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/DataGridDemoCtl.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="HandyControlDemo.UserControl.DataGridDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Background="White"
+             Background="{DynamicResource RegionBrush}"
              MaxWidth="800"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
@@ -13,10 +13,17 @@
                 </DataTemplate>
             </DataGrid.RowHeaderTemplate>
             <DataGrid.Columns>
-                <DataGridTextColumn IsReadOnly="True" Width="1*" Binding="{Binding Index}" Header="{x:Static langs:Lang.Index}"/>
+                <DataGridTextColumn IsReadOnly="True" Width="80" CanUserResize="False" Binding="{Binding Index}" Header="{x:Static langs:Lang.Index}"/>
+                <DataGridTemplateColumn Width="50" CanUserResize="False">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Image Source="{Binding ImgPath}" Width="32" Height="32" Stretch="Uniform"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
                 <DataGridTextColumn Width="1*" Binding="{Binding Name}" Header="{x:Static langs:Lang.Name}"/>
-                <DataGridCheckBoxColumn Width="1*" Binding="{Binding IsSelected}" Header="{x:Static langs:Lang.Selected}"/>
-                <DataGridComboBoxColumn ItemsSource="{Binding Source={StaticResource DemoTypes}}" Width="1*" SelectedValueBinding="{Binding Type}" Header="{x:Static langs:Lang.Type}"/>
+                <DataGridCheckBoxColumn Width="100" CanUserResize="False" Binding="{Binding IsSelected}" Header="{x:Static langs:Lang.Selected}"/>
+                <DataGridComboBoxColumn ItemsSource="{Binding Source={StaticResource DemoTypes}}" Width="100" CanUserResize="False" SelectedValueBinding="{Binding Type}" Header="{x:Static langs:Lang.Type}"/>
                 <DataGridTextColumn Width="1*" Binding="{Binding Remark}" Header="{x:Static langs:Lang.Remark}"/>
             </DataGrid.Columns>
         </DataGrid>
diff --git a/HandyControlDemo/UserControl/Styles/DatePickerDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/DatePickerDemoCtl.xaml
index f3f72689..d3207e3d 100644
--- a/HandyControlDemo/UserControl/Styles/DatePickerDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/DatePickerDemoCtl.xaml
@@ -4,7 +4,7 @@
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <StackPanel Margin="32">
             <DatePicker SelectedDate="{x:Static system:DateTime.Now}"/>
diff --git a/HandyControlDemo/UserControl/Styles/ExpanderDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/ExpanderDemoCtl.xaml
index 79026010..934beb22 100644
--- a/HandyControlDemo/UserControl/Styles/ExpanderDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/ExpanderDemoCtl.xaml
@@ -1,22 +1,22 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ExpanderDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Background="White"
+             Background="{DynamicResource RegionBrush}"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
     <controls:TransitioningContentControl>
-        <StackPanel Margin="32">
-            <Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1,1,1,0" BorderBrush="{StaticResource BorderBrush}" Width="240" HorizontalAlignment="Left">
-                <Border Height="100" Background="{StaticResource BackgroundBrush}"/>
+        <StackPanel Margin="32" VerticalAlignment="Center">
+            <Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Width="240" HorizontalAlignment="Left">
+                <Border Height="100" Background="{DynamicResource SecondaryRegionBrush}"/>
             </Expander>
-            <Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1,1,1,0" BorderBrush="{StaticResource BorderBrush}" Width="240" HorizontalAlignment="Left">
-                <Border Height="100" Background="{StaticResource BackgroundBrush}"/>
+            <Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Width="240" HorizontalAlignment="Left">
+                <Border Height="100" Background="{DynamicResource SecondaryRegionBrush}"/>
             </Expander>
-            <Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1,1,1,0" BorderBrush="{StaticResource BorderBrush}" Width="240" HorizontalAlignment="Left">
-                <Border Height="100" Background="{StaticResource BackgroundBrush}"/>
+            <Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Width="240" HorizontalAlignment="Left">
+                <Border Height="100" Background="{DynamicResource SecondaryRegionBrush}"/>
             </Expander>
-            <Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1" BorderBrush="{StaticResource BorderBrush}" Width="240" HorizontalAlignment="Left">
-                <Border Height="100" Background="{StaticResource BackgroundBrush}"/>
+            <Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Width="240" HorizontalAlignment="Left">
+                <Border Height="100" Background="{DynamicResource SecondaryRegionBrush}"/>
             </Expander>
         </StackPanel>
     </controls:TransitioningContentControl>
diff --git a/HandyControlDemo/UserControl/Styles/ListBoxDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/ListBoxDemoCtl.xaml
index 24bb0235..4ed7e5fc 100644
--- a/HandyControlDemo/UserControl/Styles/ListBoxDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/ListBoxDemoCtl.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
           <ListBox Width="200" Margin="32" ItemsSource="{Binding DataList}">
               <ListBox.ItemTemplate>
diff --git a/HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml
index e6eda7d4..827ad0e3 100644
--- a/HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/MenuDemoCtl.xaml
@@ -3,11 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
          <Grid Margin="32">
-             <TextBlock Text="{x:Static langs:Lang.RightClickHere}" Foreground="{StaticResource BorderBrush}" Style="{StaticResource TextBlockTitle}"/>
-             <Rectangle Width="200" Height="112" RadiusX="4" RadiusY="4" Stroke="{StaticResource BorderBrush}" StrokeDashArray="2,2"/>
+             <TextBlock Text="{x:Static langs:Lang.RightClickHere}" Foreground="{DynamicResource BorderBrush}" Style="{StaticResource TextBlockTitle}"/>
+             <Rectangle Width="200" Height="112" RadiusX="4" RadiusY="4" Stroke="{DynamicResource BorderBrush}" StrokeDashArray="2,2"/>
              <Border Width="200" Height="112" Background="Transparent">
                  <Border.ContextMenu>
                      <ContextMenu ItemsSource="{Binding DataList}">
diff --git a/HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml
index 52f50a11..2249c71d 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/NaiveScrollViewerDemoCtl.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White" 
+             Background="{DynamicResource RegionBrush}" 
              Width="550"
              Height="600">
     <controls:TransitioningContentControl>
@@ -16,27 +16,27 @@
                 <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden">
                     <StackPanel Orientation="Horizontal">
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
@@ -47,27 +47,27 @@
                 <ScrollViewer>
                     <WrapPanel Orientation="Horizontal">
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
                         <Border Style="{StaticResource BorderRegionStyle}" Width="200" Height="200" Margin="10,10,32,10">
-                            <Border Background="{StaticResource PrimaryBrush}">
+                            <Border Background="{DynamicResource PrimaryBrush}">
                                 <TextBlock Text="{x:Static langs:Lang.ContentDemoStr}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
                             </Border>
                         </Border>
diff --git a/HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml
index 3119fab9..53907455 100644
--- a/HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/NaiveTabControlDemoCtl.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <ScrollViewer>
             <StackPanel>
diff --git a/HandyControlDemo/UserControl/Styles/PasswordBoxDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/PasswordBoxDemoCtl.xaml
index 3b1141cc..7ec8b7c3 100644
--- a/HandyControlDemo/UserControl/Styles/PasswordBoxDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/PasswordBoxDemoCtl.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <StackPanel Margin="32">
             <PasswordBox Password="123456"/>
diff --git a/HandyControlDemo/UserControl/Styles/ProgressBarDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/ProgressBarDemoCtl.xaml
index f4d27659..ae81491f 100644
--- a/HandyControlDemo/UserControl/Styles/ProgressBarDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/ProgressBarDemoCtl.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ProgressBarDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Background="White"
+             Background="{DynamicResource RegionBrush}"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
     <controls:TransitioningContentControl>
         <WrapPanel Margin="32" ItemWidth="600">
diff --git a/HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml
index 0e372f1b..011e72f3 100644
--- a/HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/RadioButtonDemoCtl.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White"
+             Background="{DynamicResource RegionBrush}"
              Width="400">
     <controls:TransitioningContentControl>
         <StackPanel Margin="32" HorizontalAlignment="Center" VerticalAlignment="Center">
diff --git a/HandyControlDemo/UserControl/Styles/TextBlockDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/TextBlockDemoCtl.xaml
index 63003fd7..37a0ad6a 100644
--- a/HandyControlDemo/UserControl/Styles/TextBlockDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/TextBlockDemoCtl.xaml
@@ -3,46 +3,46 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <StackPanel Margin="32" Orientation="Horizontal">
             <StackPanel>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockLargeBold" Style="{DynamicResource TextBlockLargeBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockLarge" Style="{DynamicResource TextBlockLarge}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockHeaderBold" Style="{DynamicResource TextBlockTitleBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockHeader" Style="{DynamicResource TextBlockTitle}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockSubHeaderBold" Style="{DynamicResource TextBlockSubTitleBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockSubHeader" Style="{DynamicResource TextBlockSubTitle}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockLargeBold" Style="{StaticResource TextBlockLargeBold}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockLarge" Style="{StaticResource TextBlockLarge}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockHeaderBold" Style="{StaticResource TextBlockTitleBold}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockHeader" Style="{StaticResource TextBlockTitle}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockSubHeaderBold" Style="{StaticResource TextBlockSubTitleBold}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockSubHeader" Style="{StaticResource TextBlockSubTitle}"/>
 
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultBold" Style="{DynamicResource TextBlockDefaultBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefault" Style="{DynamicResource TextBlockDefault}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultAccent" Style="{DynamicResource TextBlockDefaultAccent}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultSecLight" Style="{DynamicResource TextBlockDefaultSecLight}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultThiLight" Style="{DynamicResource TextBlockDefaultThiLight}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultPrimary" Style="{DynamicResource TextBlockDefaultPrimary}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultDanger" Style="{DynamicResource TextBlockDefaultDanger}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultWarning" Style="{DynamicResource TextBlockDefaultWarning}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultInfo" Style="{DynamicResource TextBlockDefaultInfo}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultSuccess" Style="{DynamicResource TextBlockDefaultSuccess}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultBold" Style="{StaticResource TextBlockDefaultBold}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefault" Style="{StaticResource TextBlockDefault}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultAccent" Style="{StaticResource TextBlockDefaultAccent}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultSecLight" Style="{StaticResource TextBlockDefaultSecLight}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultThiLight" Style="{StaticResource TextBlockDefaultThiLight}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultPrimary" Style="{StaticResource TextBlockDefaultPrimary}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultDanger" Style="{StaticResource TextBlockDefaultDanger}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultWarning" Style="{StaticResource TextBlockDefaultWarning}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultInfo" Style="{StaticResource TextBlockDefaultInfo}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultSuccess" Style="{StaticResource TextBlockDefaultSuccess}"/>
             </StackPanel>
             <StackPanel Margin="10,0,0,0">
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{DynamicResource TextBlockLargeBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{DynamicResource TextBlockLarge}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=12}" Style="{DynamicResource TextBlockTitleBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=12}" Style="{DynamicResource TextBlockTitle}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.SubTitle},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{DynamicResource TextBlockSubTitleBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.SubTitle},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{DynamicResource TextBlockSubTitle}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource TextBlockLargeBold}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource TextBlockLarge}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=12}" Style="{StaticResource TextBlockTitleBold}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=12}" Style="{StaticResource TextBlockTitle}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.SubTitle},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource TextBlockSubTitleBold}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.SubTitle},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource TextBlockSubTitle}"/>
 
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{DynamicResource TextBlockDefaultBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{DynamicResource TextBlockDefault}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{DynamicResource TextBlockDefaultAccent}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{DynamicResource TextBlockDefaultSecLight}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{DynamicResource TextBlockDefaultThiLight}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{DynamicResource TextBlockDefaultPrimary}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{DynamicResource TextBlockDefaultDanger}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{DynamicResource TextBlockDefaultWarning}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{DynamicResource TextBlockDefaultInfo}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{DynamicResource TextBlockDefaultSuccess}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultBold}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefault}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultAccent}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultSecLight}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultThiLight}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultPrimary}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultDanger}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultWarning}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultInfo}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{Binding Source={x:Static langs:Lang.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultSuccess}"/>
             </StackPanel>
         </StackPanel>
     </controls:TransitioningContentControl>
diff --git a/HandyControlDemo/UserControl/Styles/TextBoxDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/TextBoxDemoCtl.xaml
index 3146f81a..e63e4bd4 100644
--- a/HandyControlDemo/UserControl/Styles/TextBoxDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/TextBoxDemoCtl.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
         <StackPanel Margin="32">
             <TextBox Text="{x:Static langs:Lang.ContentDemoStr}"/>
diff --git a/HandyControlDemo/UserControl/Styles/ToggleButtonDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/ToggleButtonDemoCtl.xaml
index bff21140..f5680d6d 100644
--- a/HandyControlDemo/UserControl/Styles/ToggleButtonDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/ToggleButtonDemoCtl.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ToggleButtonDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             Background="White"
+             Background="{DynamicResource RegionBrush}"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
     <controls:TransitioningContentControl>
@@ -79,22 +79,22 @@
                     <StackPanel>
                         <ToggleButton IsChecked="True" Style="{StaticResource ToggleButtonCustom}" controls:StatusSwitchElement.HiddenElement="True">
                             <controls:StatusSwitchElement.CheckedElement>
-                                <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{StaticResource BorderBrush}" Margin="5">
-                                    <Ellipse Width="20" Height="20" Fill="{StaticResource PrimaryBrush}" StrokeThickness="1" Stroke="{StaticResource BorderBrush}"/>
+                                <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="5">
+                                    <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                                 </Border>
                             </controls:StatusSwitchElement.CheckedElement>
-                            <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{StaticResource BorderBrush}" Margin="5">
-                                <Ellipse Width="20" Height="20" Fill="{StaticResource BorderBrush}" StrokeThickness="1" Stroke="{StaticResource BorderBrush}"/>
+                            <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="5">
+                                <Ellipse Width="20" Height="20" Fill="{DynamicResource BorderBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                             </Border>
                         </ToggleButton>
                         <ToggleButton IsEnabled="False" IsChecked="True" Style="{StaticResource ToggleButtonCustom}" controls:StatusSwitchElement.HiddenElement="True">
                             <controls:StatusSwitchElement.CheckedElement>
-                                <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{StaticResource BorderBrush}" Margin="5">
-                                    <Ellipse Width="20" Height="20" Fill="{StaticResource PrimaryBrush}" StrokeThickness="1" Stroke="{StaticResource BorderBrush}"/>
+                                <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="5">
+                                    <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                                 </Border>
                             </controls:StatusSwitchElement.CheckedElement>
-                            <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{StaticResource BorderBrush}" Margin="5">
-                                <Ellipse Width="20" Height="20" Fill="{StaticResource BorderBrush}" StrokeThickness="1" Stroke="{StaticResource BorderBrush}"/>
+                            <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Margin="5">
+                                <Ellipse Width="20" Height="20" Fill="{DynamicResource BorderBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                             </Border>
                         </ToggleButton>
                         <TextBlock TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonCustom"/>
diff --git a/HandyControlDemo/UserControl/Styles/TreeViewDemoCtl.xaml b/HandyControlDemo/UserControl/Styles/TreeViewDemoCtl.xaml
index 5ea5c2a5..f5d020e8 100644
--- a/HandyControlDemo/UserControl/Styles/TreeViewDemoCtl.xaml
+++ b/HandyControlDemo/UserControl/Styles/TreeViewDemoCtl.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-             Background="White">
+             Background="{DynamicResource RegionBrush}">
     <controls:TransitioningContentControl>
           <TreeView Width="200" Margin="32" ItemsSource="{Binding DataList}">
               <TreeView.ItemTemplate>
diff --git a/HandyControlDemo/ViewModel/NoUserContentViewModel.cs b/HandyControlDemo/ViewModel/NoUserContentViewModel.cs
new file mode 100644
index 00000000..cc94559c
--- /dev/null
+++ b/HandyControlDemo/ViewModel/NoUserContentViewModel.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Windows.Media.Imaging;
+using GalaSoft.MvvmLight;
+
+namespace HandyControlDemo.ViewModel
+{
+    public class NoUserContentViewModel : ViewModelBase
+    {
+        public NoUserContentViewModel()
+        {
+            NugetDownloadCount = 11111;
+        }
+
+        private int _nugetDownloadCount;
+
+        public int NugetDownloadCount
+        {
+            get => _nugetDownloadCount;
+            set => Set(ref _nugetDownloadCount, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/HandyControlDemo/ViewModel/ViewModelLocator.cs b/HandyControlDemo/ViewModel/ViewModelLocator.cs
index 397cae6c..4fbb5963 100644
--- a/HandyControlDemo/ViewModel/ViewModelLocator.cs
+++ b/HandyControlDemo/ViewModel/ViewModelLocator.cs
@@ -19,6 +19,7 @@ namespace HandyControlDemo.ViewModel
             SimpleIoc.Default.Register<ImageBrowserDemoViewModel>();
             SimpleIoc.Default.Register<ComboBoxDemoViewModel>();
             SimpleIoc.Default.Register<WindowDemoViewModel>();
+            SimpleIoc.Default.Register<NoUserContentViewModel>();
         }
 
         public static ViewModelLocator Instance => new Lazy<ViewModelLocator>(() =>
@@ -36,6 +37,8 @@ namespace HandyControlDemo.ViewModel
 
         public WindowDemoViewModel WindowDemo => ServiceLocator.Current.GetInstance<WindowDemoViewModel>();
 
+        public NoUserContentViewModel NoUserContent => ServiceLocator.Current.GetInstance<NoUserContentViewModel>();
+
         #endregion
     }
 }
\ No newline at end of file
diff --git a/HandyControlDemo/Window/CommonWindow.xaml b/HandyControlDemo/Window/CommonWindow.xaml
index 91f86587..5dd9ebbe 100644
--- a/HandyControlDemo/Window/CommonWindow.xaml
+++ b/HandyControlDemo/Window/CommonWindow.xaml
@@ -7,11 +7,11 @@
                            xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
                            mc:Ignorable="d"
                            ShowTitle="True"
-                           Background="#f0f0f0"
+                           Background="{DynamicResource MainContentBackgroundBrush}"
                            WindowStartupLocation="CenterScreen"
                            Style="{StaticResource CustomWindowStyle}"
                            Title="{x:Static langs:Lang.Title}" 
                            Height="450" 
                            Width="800">
-    <Border Background="{StaticResource MainContentBackground}"/>
+    <Border Background="{DynamicResource MainContentForegroundDrawingBrush}"/>
 </controls:WindowBorderless>
\ No newline at end of file
diff --git a/HandyControlDemo/Window/CustomNonClientAreaWindow.xaml b/HandyControlDemo/Window/CustomNonClientAreaWindow.xaml
index dbf48624..602b391c 100644
--- a/HandyControlDemo/Window/CustomNonClientAreaWindow.xaml
+++ b/HandyControlDemo/Window/CustomNonClientAreaWindow.xaml
@@ -6,12 +6,12 @@
                            xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
                            xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
                            mc:Ignorable="d"
-                           OtherButtonForeground="{StaticResource PrimaryTextBrush}"
-                           CloseButtonForeground="{StaticResource PrimaryTextBrush}"
-                           OtherButtonHoverBrush="{StaticResource PrimaryTextBrush}"
-                           NonClientAreaBackground="{StaticResource ToolBarBackground}"
+                           OtherButtonForeground="{DynamicResource ReverseTextBrush}"
+                           CloseButtonForeground="{DynamicResource ReverseTextBrush}"
+                           OtherButtonHoverBrush="{DynamicResource ReverseTextBrush}"
+                           NonClientAreaBackground="{DynamicResource ToolBarBackground}"
                            NonClientAreaHeight="69"
-                           Background="#f0f0f0"
+                           Background="{DynamicResource MainContentBackgroundBrush}"
                            WindowStartupLocation="CenterScreen"
                            Style="{StaticResource CustomWindowStyle}"
                            Title="{x:Static langs:Lang.Title}" 
@@ -26,36 +26,36 @@
                 </Border>
             </Button>
             <Button  Style="{StaticResource ButtonCustom}" Margin="10,0,0,0">
-                <Border Width="30" Height="30" BorderThickness="1" CornerRadius="6" BorderBrush="#B7B5B7" Background="{StaticResource MenuButtonBorderBrush}">
+                <Border Width="30" Height="30" BorderThickness="1" CornerRadius="6" BorderBrush="#B7B5B7" Background="{DynamicResource MenuButtonBorderBrush}">
                     <Path Margin="6" Fill="#ED41FF" Stretch="Uniform" Data="{StaticResource AskGeometry}"></Path>
                 </Border>
             </Button>
             <Button Style="{StaticResource ButtonCustom}" Margin="10,0,0,0">
-                <Border Width="30" Height="30" BorderThickness="1" CornerRadius="6" BorderBrush="#B7B5B7" Background="{StaticResource MenuButtonBorderBrush}">
+                <Border Width="30" Height="30" BorderThickness="1" CornerRadius="6" BorderBrush="#B7B5B7" Background="{DynamicResource MenuButtonBorderBrush}">
                     <Path Margin="6" Fill="#ED41FF" Stretch="Uniform" Data="{StaticResource InfoGeometry}"></Path>
                 </Border>
             </Button>
             <Button Style="{StaticResource ButtonCustom}" Margin="32,0,0,0">
-                <Border Width="30" Height="30" BorderThickness="1" CornerRadius="6" BorderBrush="#B7B5B7" Background="{StaticResource MenuButtonBorderBrush}">
+                <Border Width="30" Height="30" BorderThickness="1" CornerRadius="6" BorderBrush="#B7B5B7" Background="{DynamicResource MenuButtonBorderBrush}">
                     <Path Margin="5" Fill="#8EC915" Stretch="Uniform" Data="{StaticResource ErrorGeometry}"></Path>
                 </Border>
             </Button>
             <Button  Style="{StaticResource ButtonCustom}" Margin="10,0,0,0">
-                <Border Width="30" Height="30" BorderThickness="1" CornerRadius="6" BorderBrush="#B7B5B7" Background="{StaticResource MenuButtonBorderBrush}">
+                <Border Width="30" Height="30" BorderThickness="1" CornerRadius="6" BorderBrush="#B7B5B7" Background="{DynamicResource MenuButtonBorderBrush}">
                     <Path Margin="6" Fill="#8EC915" Stretch="Uniform" Data="{StaticResource AskGeometry}"></Path>
                 </Border>
             </Button>
             <Button Style="{StaticResource ButtonCustom}" Margin="10,0,0,0">
-                <Border Width="30" Height="30" BorderThickness="1" CornerRadius="6" BorderBrush="#B7B5B7" Background="{StaticResource MenuButtonBorderBrush}">
+                <Border Width="30" Height="30" BorderThickness="1" CornerRadius="6" BorderBrush="#B7B5B7" Background="{DynamicResource MenuButtonBorderBrush}">
                     <Path Margin="6" Fill="#8EC915" Stretch="Uniform" Data="{StaticResource AllGeometry}"></Path>
                 </Border>
             </Button>
             <Button Style="{StaticResource ButtonCustom}" Margin="10,0,0,0">
-                <Border Width="30" Height="30" BorderThickness="1" CornerRadius="6" BorderBrush="#B7B5B7" Background="{StaticResource MenuButtonBorderBrush}">
+                <Border Width="30" Height="30" BorderThickness="1" CornerRadius="6" BorderBrush="#B7B5B7" Background="{DynamicResource MenuButtonBorderBrush}">
                     <Path Margin="6" Fill="#8EC915" Stretch="Uniform" Data="{StaticResource InfoGeometry}"></Path>
                 </Border>
             </Button>
         </StackPanel>
     </controls:WindowBorderless.NonClientAreaContent>
-    <Border Background="{StaticResource MainContentBackground}"/>
+    <Border Background="{DynamicResource MainContentForegroundDrawingBrush}"/>
 </controls:WindowBorderless>
\ No newline at end of file