diff --git a/src/Ursa.Themes.Semi/Controls/Calendar.axaml b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
index 4f17593..9ac66b4 100644
--- a/src/Ursa.Themes.Semi/Controls/Calendar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
@@ -14,8 +14,8 @@
         <Setter Property="MinWidth" Value="32" />
         <Setter Property="MinHeight" Value="32" />
         <Setter Property="Margin" Value="0 2" />
-        <Setter Property="Background" Value="{DynamicResource DatePickerDayBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource CalenderDayBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="CornerRadius" Value="3" />
@@ -40,103 +40,103 @@
         </Setter>
 
         <Style Selector="^:in-range">
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayInRangeBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayInRangeBackground}" />
             <Setter Property="CornerRadius" Value="0" />
             <Setter Property="BorderThickness" Value="0" />
         </Style>
 
         <Style Selector="^:today">
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayTodayBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerDayTodayForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayTodayBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDayTodayForeground}" />
             <Setter Property="Cursor" Value="Hand" />
             <Style Selector="^:in-range">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayInRangeBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayInRangeBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^:not-current-month">
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerDayNotCurrentMonthForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDayNotCurrentMonthForeground}" />
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayPointeroverBackground}" />
             <Setter Property="Cursor" Value="Hand" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayPressedBackground}" />
         </Style>
 
         <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource DatePickerDaySelectedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDaySelectedBackground}" />
             <Setter Property="CornerRadius" Value="3" />
             <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerDaySelectedForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDaySelectedPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDaySelectedPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDaySelectedPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDaySelectedPressedBackground}" />
             </Style>
         </Style>
 
 
         <Style Selector="^:start-date">
             <Setter Property="CornerRadius" Value="3 0 0 3" />
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDateBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateBorderBrush}" />
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerDaySelectedForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDateBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDatePointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDatePressedBackground}" />
             </Style>
             <Style Selector="^:in-range">
-                <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateInRangeBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateInRangeBackground}" />
                 <Setter Property="BorderThickness" Value="1" />
             </Style>
         </Style>
 
         <Style Selector="^:end-date">
             <Setter Property="CornerRadius" Value="0 3 3 0" />
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDateBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateBorderBrush}" />
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerDaySelectedForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDateBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDatePointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDatePressedBackground}" />
             </Style>
             <Style Selector="^:in-range">
-                <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateInRangeBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateInRangeBackground}" />
                 <Setter Property="BorderThickness" Value="1" />
             </Style>
         </Style>
 
         <Style Selector="^:preview-start-date">
             <Setter Property="CornerRadius" Value="3 0 0 3" />
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayPreviewStartEndDateBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDateBackground}" />
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayPreviewStartEndDatePressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDatePressedBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^:preview-end-date">
             <Setter Property="CornerRadius" Value="0 3 3 0" />
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayPreviewStartEndDateBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDateBackground}" />
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayPreviewStartEndDatePressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDatePressedBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^:blackout">
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerDayBlackoutForeground}" />
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayBlackoutBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDayBlackoutForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayBlackoutBackground}" />
             <Setter Property="Cursor" Value="No" />
             <Style Selector="^:today">
-                <Setter Property="Foreground" Value="{DynamicResource DatePickerDayBlackoutTodayBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource CalenderDayBlackoutTodayBackground}" />
             </Style>
         </Style>
     </ControlTheme>
@@ -145,8 +145,8 @@
         <Setter Property="MinWidth" Value="32" />
         <Setter Property="MinHeight" Value="32" />
         <Setter Property="Margin" Value="0 2" />
-        <Setter Property="Background" Value="{DynamicResource DatePickerYearBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource DatePickerYearBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource CalenderYearBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CalenderYearBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CornerRadius" Value="3" />
         <Setter Property="Template">
@@ -169,19 +169,19 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource DatePickerYearPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderYearPointeroverBackground}" />
             <Setter Property="Cursor" Value="Hand" />
         </Style>
         <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource DatePickerYearPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderYearPressedBackground}" />
         </Style>
         <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource DatePickerYearSelectedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderYearSelectedBackground}" />
             <Setter Property="CornerRadius" Value="3" />
             <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerYearSelectedForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderYearSelectedForeground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource DatePickerYearSelectedPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderYearSelectedPointeroverBackground}" />
             </Style>
         </Style>
     </ControlTheme>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
index 047db10..663edbd 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
@@ -1,41 +1,41 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--CalenderDayButton-->
-    <SolidColorBrush x:Key="DatePickerDayBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerDayBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerDayInRangeBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerDayTodayBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="DatePickerDayTodayForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerDayNotCurrentMonthForeground" Color="#555B61" />
-    <SolidColorBrush x:Key="DatePickerDayPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="DatePickerDayPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="CalenderDayBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderDayBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderDayInRangeBackground" Opacity="0.2" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDayTodayBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="CalenderDayTodayForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDayNotCurrentMonthForeground" Color="#555B61" />
+    <SolidColorBrush x:Key="CalenderDayPointeroverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="CalenderDayPressedBackground" Opacity="0.16" Color="White" />
 
-    <SolidColorBrush x:Key="DatePickerDaySelectedBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerDaySelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="DatePickerDaySelectedPointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="DatePickerDaySelectedPressedBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="CalenderDaySelectedBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDaySelectedForeground" Color="White" />
+    <SolidColorBrush x:Key="CalenderDaySelectedPointeroverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="CalenderDaySelectedPressedBackground" Color="#A9D7FF" />
 
-    <SolidColorBrush x:Key="DatePickerDayStartEndDateBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDateBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDatePointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDatePressedBackground" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDateInRangeBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateBorderBrush" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDatePointeroverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDatePressedBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateInRangeBackground" Color="#A9D7FF" />
 
-    <SolidColorBrush x:Key="DatePickerDayPreviewStartEndDateBackground" Opacity="0.3" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerDayPreviewStartEndDatePressedBackground" Opacity="0.4" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDateBackground" Opacity="0.3" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDatePressedBackground" Opacity="0.4" Color="#54A9FF" />
 
-    <SolidColorBrush x:Key="DatePickerDayBlackoutForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="DatePickerDayBlackoutBackground" Opacity="0.04" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="DatePickerDayBlackoutTodayBackground" Color="#135CB8" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutForeground" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutBackground" Opacity="0.04" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutTodayBackground" Color="#135CB8" />
 
     <!--CalenderYearButton-->
-    <SolidColorBrush x:Key="DatePickerYearBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerYearBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerYearPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="DatePickerYearPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="DatePickerYearSelectedBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerYearSelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="DatePickerYearSelectedPointeroverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="CalenderYearBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderYearBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderYearPointeroverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="CalenderYearPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="CalenderYearSelectedBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderYearSelectedForeground" Color="White" />
+    <SolidColorBrush x:Key="CalenderYearSelectedPointeroverBackground" Color="#7FC1FF" />
 
     <!--CalenderView-->
-    <SolidColorBrush x:Key="DatePickerViewBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderViewBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
index 6c309f6..23fad7a 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
@@ -1,41 +1,41 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--CalenderDayButton-->
-    <SolidColorBrush x:Key="DatePickerDayBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerDayBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerDayInRangeBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="DatePickerDayTodayBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="DatePickerDayTodayForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="DatePickerDayNotCurrentMonthForeground" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="DatePickerDayPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="DatePickerDayPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalenderDayBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderDayBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderDayInRangeBackground" Color="#EAF5FF" />
+    <SolidColorBrush x:Key="CalenderDayTodayBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalenderDayTodayForeground" Color="#0077FA" />
+    <SolidColorBrush x:Key="CalenderDayNotCurrentMonthForeground" Color="#A7ABB0" />
+    <SolidColorBrush x:Key="CalenderDayPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalenderDayPressedBackground" Opacity="0.09" Color="#2E3238" />
 
-    <SolidColorBrush x:Key="DatePickerDaySelectedBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="DatePickerDaySelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="DatePickerDaySelectedPointeroverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="DatePickerDaySelectedPressedBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="CalenderDaySelectedBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="CalenderDaySelectedForeground" Color="White" />
+    <SolidColorBrush x:Key="CalenderDaySelectedPointeroverBackground" Color="#0062D6" />
+    <SolidColorBrush x:Key="CalenderDaySelectedPressedBackground" Color="#004FB3" />
 
-    <SolidColorBrush x:Key="DatePickerDayStartEndDateBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDateBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDatePointeroverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDatePressedBackground" Color="#004FB3" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDateInRangeBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateBorderBrush" Color="#0077FA" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDatePointeroverBackground" Color="#0062D6" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDatePressedBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateInRangeBackground" Color="#004FB3" />
 
-    <SolidColorBrush x:Key="DatePickerDayPreviewStartEndDateBackground" Color="#CBE7FE" />
-    <SolidColorBrush x:Key="DatePickerDayPreviewStartEndDatePressedBackground" Color="#98CDFD" />
+    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDateBackground" Color="#CBE7FE" />
+    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDatePressedBackground" Color="#98CDFD" />
 
-    <SolidColorBrush x:Key="DatePickerDayBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="DatePickerDayBlackoutBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="DatePickerDayBlackoutTodayBackground" Color="#98CDFD" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutBackground" Opacity="0.02" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutTodayBackground" Color="#98CDFD" />
 
     <!--CalenderYearButton-->
-    <SolidColorBrush x:Key="DatePickerYearBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerYearBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerYearPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="DatePickerYearPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="DatePickerYearSelectedBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="DatePickerYearSelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="DatePickerYearSelectedPointeroverBackground" Color="#0062D6" />
+    <SolidColorBrush x:Key="CalenderYearBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderYearBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderYearPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalenderYearPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalenderYearSelectedBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="CalenderYearSelectedForeground" Color="White" />
+    <SolidColorBrush x:Key="CalenderYearSelectedPointeroverBackground" Color="#0062D6" />
 
     <!--CalenderView-->
-    <SolidColorBrush x:Key="DatePickerViewBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderViewBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file