diff --git a/src/Ursa.Themes.Semi/Controls/Calendar.axaml b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
index 9ac66b4..8cc7683 100644
--- a/src/Ursa.Themes.Semi/Controls/Calendar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
@@ -11,14 +11,14 @@
         </ThemeVariantScope>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type u:CalendarDayButton}" TargetType="u:CalendarDayButton">
-        <Setter Property="MinWidth" Value="32" />
-        <Setter Property="MinHeight" Value="32" />
-        <Setter Property="Margin" Value="0 2" />
+        <Setter Property="MinWidth" Value="{DynamicResource CalenderDayMinWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource CalenderDayMinHeight}" />
+        <Setter Property="Margin" Value="{DynamicResource CalenderDayMargin}" />
         <Setter Property="Background" Value="{DynamicResource CalenderDayBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayBorderThickness}" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="CornerRadius" Value="3" />
+        <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayCornerRadius}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:CalendarDayButton">
                 <Panel>
@@ -41,8 +41,8 @@
 
         <Style Selector="^:in-range">
             <Setter Property="Background" Value="{DynamicResource CalenderDayInRangeBackground}" />
-            <Setter Property="CornerRadius" Value="0" />
-            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayInRangeCornerRadius}" />
+            <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayNoBorderThickness}" />
         </Style>
 
         <Style Selector="^:today">
@@ -69,8 +69,8 @@
 
         <Style Selector="^:selected">
             <Setter Property="Background" Value="{DynamicResource CalenderDaySelectedBackground}" />
-            <Setter Property="CornerRadius" Value="3" />
-            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayCornerRadius}" />
+            <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayNoBorderThickness}" />
             <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
             <Style Selector="^:pointerover">
                 <Setter Property="Background" Value="{DynamicResource CalenderDaySelectedPointeroverBackground}" />
@@ -82,7 +82,7 @@
 
 
         <Style Selector="^:start-date">
-            <Setter Property="CornerRadius" Value="3 0 0 3" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayStartDateCornerRadius}" />
             <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDateBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateBorderBrush}" />
             <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
@@ -94,12 +94,12 @@
             </Style>
             <Style Selector="^:in-range">
                 <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateInRangeBackground}" />
-                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayBorderThickness}" />
             </Style>
         </Style>
 
         <Style Selector="^:end-date">
-            <Setter Property="CornerRadius" Value="0 3 3 0" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayEndDateCornerRadius}" />
             <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDateBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateBorderBrush}" />
             <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
@@ -111,12 +111,12 @@
             </Style>
             <Style Selector="^:in-range">
                 <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateInRangeBackground}" />
-                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayBorderThickness}" />
             </Style>
         </Style>
 
         <Style Selector="^:preview-start-date">
-            <Setter Property="CornerRadius" Value="3 0 0 3" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayStartDateCornerRadius}" />
             <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDateBackground}" />
             <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDatePressedBackground}" />
@@ -124,7 +124,7 @@
         </Style>
 
         <Style Selector="^:preview-end-date">
-            <Setter Property="CornerRadius" Value="0 3 3 0" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayEndDateCornerRadius}" />
             <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDateBackground}" />
             <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDatePressedBackground}" />
@@ -142,13 +142,13 @@
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type u:CalendarYearButton}" TargetType="u:CalendarYearButton">
-        <Setter Property="MinWidth" Value="32" />
-        <Setter Property="MinHeight" Value="32" />
-        <Setter Property="Margin" Value="0 2" />
+        <Setter Property="MinWidth" Value="{DynamicResource CalenderYearMinWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource CalenderYearMinHeight }" />
+        <Setter Property="Margin" Value="{DynamicResource CalenderYearMargin}" />
         <Setter Property="Background" Value="{DynamicResource CalenderYearBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CalenderYearBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CornerRadius" Value="3" />
+        <Setter Property="BorderThickness" Value="{DynamicResource CalenderYearBorderThickness}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource CalenderYearCornerRadius}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:CalendarDayButton">
                 <Panel>
@@ -177,8 +177,8 @@
         </Style>
         <Style Selector="^:selected">
             <Setter Property="Background" Value="{DynamicResource CalenderYearSelectedBackground}" />
-            <Setter Property="CornerRadius" Value="3" />
-            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderYearCornerRadius}" />
+            <Setter Property="BorderThickness" Value="{DynamicResource CalenderYearSelectedBorderThickness}" />
             <Setter Property="Foreground" Value="{DynamicResource CalenderYearSelectedForeground}" />
             <Style Selector="^:pointerover">
                 <Setter Property="Background" Value="{DynamicResource CalenderYearSelectedPointeroverBackground}" />
@@ -187,8 +187,8 @@
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type u:CalendarView}" TargetType="u:CalendarView">
-        <Setter Property="MinHeight" Value="260" />
-        <Setter Property="MinWidth" Value="260" />
+        <Setter Property="MinHeight" Value="{DynamicResource CalenderViewMinWidth}" />
+        <Setter Property="MinWidth" Value="{DynamicResource CalenderViewMinHeight}" />
         <Setter Property="Background" Value="{DynamicResource DatePickerViewBackground}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:CalendarView">
@@ -204,8 +204,8 @@
                             Foreground="{TemplateBinding Foreground}"
                             Theme="{DynamicResource BorderlessButton}">
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Width="{DynamicResource CalenderViewPathIconWidth}"
+                                Height="{DynamicResource CalenderViewPathIconHeight}"
                                 Data="{DynamicResource CalendarViewFastForwardGlyph}"
                                 Foreground="{DynamicResource CalendarItemIconForeground}" />
                         </Button>
@@ -217,8 +217,8 @@
                             Foreground="{TemplateBinding Foreground}"
                             Theme="{DynamicResource BorderlessButton}">
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Width="{DynamicResource CalenderViewPathIconWidth}"
+                                Height="{DynamicResource CalenderViewPathIconHeight}"
                                 Data="{DynamicResource CalendarItemPreviousIconGlyph}"
                                 Foreground="{DynamicResource CalendarItemIconForeground}" />
                         </Button>
@@ -251,8 +251,8 @@
                             Foreground="{TemplateBinding Foreground}"
                             Theme="{DynamicResource BorderlessButton}">
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Width="{DynamicResource CalenderViewPathIconWidth}"
+                                Height="{DynamicResource CalenderViewPathIconHeight}"
                                 Data="{DynamicResource CalendarItemNextIconGlyph}"
                                 Foreground="{DynamicResource CalendarItemIconForeground}" />
                         </Button>
@@ -263,8 +263,8 @@
                             Foreground="{TemplateBinding Foreground}"
                             Theme="{DynamicResource BorderlessButton}">
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Width="{DynamicResource CalenderViewPathIconWidth}"
+                                Height="{DynamicResource CalenderViewPathIconHeight}"
                                 Data="{DynamicResource CalendarViewFastBackwardGlyph}"
                                 Foreground="{DynamicResource CalendarItemIconForeground}" />
                         </Button>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Shared/DatePicker.axaml
index fe185a3..0cfcfe6 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/DatePicker.axaml
@@ -1,4 +1,30 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--CalenderDayButton-->
+    <x:Double x:Key="CalenderDayMinWidth">32</x:Double>
+    <x:Double x:Key="CalenderDayMinHeight">32</x:Double>
+    <Thickness x:Key="CalenderDayMargin">0 2</Thickness>
+    <Thickness x:Key="CalenderDayBorderThickness">1</Thickness>
+    <CornerRadius x:Key="CalenderDayCornerRadius">3</CornerRadius>
+
+    <CornerRadius x:Key="CalenderDayInRangeCornerRadius">0</CornerRadius>
+    <Thickness x:Key="CalenderDayNoBorderThickness">0</Thickness>
+
+    <CornerRadius x:Key="CalenderDayStartDateCornerRadius">3 0 0 3</CornerRadius>
+    <CornerRadius x:Key="CalenderDayEndDateCornerRadius">0 3 3 0</CornerRadius>
+
+    <!--CalenderYearButton-->
+    <x:Double x:Key="CalenderYearMinWidth">32</x:Double>
+    <x:Double x:Key="CalenderYearMinHeight">32</x:Double>
+    <Thickness x:Key="CalenderYearMargin">0 2</Thickness>
+    <Thickness x:Key="CalenderYearBorderThickness">1</Thickness>
+    <CornerRadius x:Key="CalenderYearCornerRadius">3</CornerRadius>
+    <Thickness x:Key="CalenderYearSelectedBorderThickness">0</Thickness>
+
+    <!--CalenderView-->
+    <x:Double x:Key="CalenderViewMinWidth">260</x:Double>
+    <x:Double x:Key="CalenderViewMinHeight">260</x:Double>
+    <x:Double x:Key="CalenderViewPathIconWidth">12</x:Double>
+    <x:Double x:Key="CalenderViewPathIconHeight">12</x:Double>
     <StreamGeometry x:Key="CalendarViewFastForwardGlyph">M12.6185 4.39653C13.1272 4.92524 13.1272 5.78245 12.6185 6.31116L7.14483 12L12.6185 17.6888C13.1272 18.2176 13.1272 19.0748 12.6185 19.6035C12.1098 20.1322 11.285 20.1322 10.7763 19.6035L4.38153 12.9573C3.87282 12.4286 3.87282 11.5714 4.38153 11.0427L10.7763 4.39653C11.285 3.86782 12.1098 3.86782 12.6185 4.39653Z M19.6185 4.39653C20.1272 4.92524 20.1272 5.78245 19.6185 6.31116L14.1448 12L19.6185 17.6888C20.1272 18.2176 20.1272 19.0748 19.6185 19.6035C19.1098 20.1322 18.285 20.1322 17.7763 19.6035L11.3815 12.9573C10.8728 12.4286 10.8728 11.5714 11.3815 11.0427L17.7763 4.39653C18.285 3.86782 19.1098 3.86782 19.6185 4.39653Z</StreamGeometry>
     <StreamGeometry x:Key="CalendarViewFastBackwardGlyph">M4.38153 4.39653C4.89024 3.86782 5.71502 3.86782 6.22373 4.39653L12.6185 11.0427C13.1272 11.5714 13.1272 12.4286 12.6185 12.9573L6.22373 19.6035C5.71502 20.1322 4.89024 20.1322 4.38153 19.6035C3.87282 19.0748 3.87282 18.2176 4.38153 17.6888L9.85517 12L4.38153 6.31116C3.87282 5.78245 3.87282 4.92524 4.38153 4.39653Z M11.3815 4.39653C11.8902 3.86782 12.715 3.86782 13.2237 4.39653L19.6185 11.0427C20.1272 11.5714 20.1272 12.4286 19.6185 12.9573L13.2237 19.6035C12.715 20.1322 11.8902 20.1322 11.3815 19.6035C10.8728 19.0748 10.8728 18.2176 11.3815 17.6888L16.8552 12L11.3815 6.31116C10.8728 5.78245 10.8728 4.92524 11.3815 4.39653Z</StreamGeometry>
 </ResourceDictionary>
\ No newline at end of file