diff --git a/demo/Ursa.Demo/App.axaml b/demo/Ursa.Demo/App.axaml
index 49bdfce..9efa394 100644
--- a/demo/Ursa.Demo/App.axaml
+++ b/demo/Ursa.Demo/App.axaml
@@ -3,7 +3,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
     xmlns:u-semi="https://irihi.tech/ursa/themes/semi"
-    RequestedThemeVariant="{x:Static semi:SemiTheme.Aquatic}"
+    RequestedThemeVariant="{x:Static semi:SemiTheme.Desert}"
     xmlns:semi="https://irihi.tech/semi"
     xmlns:demo="clr-namespace:Ursa.Demo">
     <Application.Styles>
diff --git a/src/Ursa.Themes.Semi/Controls/Calendar.axaml b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
index 8cc7683..7d809dd 100644
--- a/src/Ursa.Themes.Semi/Controls/Calendar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
@@ -14,6 +14,7 @@
         <Setter Property="MinWidth" Value="{DynamicResource CalenderDayMinWidth}" />
         <Setter Property="MinHeight" Value="{DynamicResource CalenderDayMinHeight}" />
         <Setter Property="Margin" Value="{DynamicResource CalenderDayMargin}" />
+        <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonForeground}" />
         <Setter Property="Background" Value="{DynamicResource CalenderDayBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayBorderBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayBorderThickness}" />
@@ -43,6 +44,7 @@
             <Setter Property="Background" Value="{DynamicResource CalenderDayInRangeBackground}" />
             <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayInRangeCornerRadius}" />
             <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayNoBorderThickness}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
         </Style>
 
         <Style Selector="^:today">
@@ -143,7 +145,7 @@
 
     <ControlTheme x:Key="{x:Type u:CalendarYearButton}" TargetType="u:CalendarYearButton">
         <Setter Property="MinWidth" Value="{DynamicResource CalenderYearMinWidth}" />
-        <Setter Property="MinHeight" Value="{DynamicResource CalenderYearMinHeight }" />
+        <Setter Property="MinHeight" Value="{DynamicResource CalenderYearMinHeight}" />
         <Setter Property="Margin" Value="{DynamicResource CalenderYearMargin}" />
         <Setter Property="Background" Value="{DynamicResource CalenderYearBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CalenderYearBorderBrush}" />
diff --git a/src/Ursa.Themes.Semi/Index.axaml b/src/Ursa.Themes.Semi/Index.axaml
index 2f45fea..5db88d3 100644
--- a/src/Ursa.Themes.Semi/Index.axaml
+++ b/src/Ursa.Themes.Semi/Index.axaml
@@ -6,9 +6,9 @@
                 <ResourceInclude x:Key="Dark" Source="./Themes/Dark/_index.axaml" />
                 <ResourceInclude x:Key="Light" Source="./Themes/Light/_index.axaml" />
                 <ResourceInclude x:Key="{x:Static semi:SemiTheme.Aquatic}" Source="./Themes/HighContrast/Aquatic.axaml" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Desert}" Source="./Themes/HighContrast/Aquatic.axaml" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Dust}" Source="./Themes/HighContrast/Aquatic.axaml" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="./Themes/HighContrast/Aquatic.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Desert}" Source="./Themes/HighContrast/Desert.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Dust}" Source="./Themes/HighContrast/Dusk.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="./Themes/HighContrast/NightSky.axaml" />
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="../Controls/_index.axaml" />
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Desert.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Desert.axaml
new file mode 100644
index 0000000..80dab10
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Desert.axaml
@@ -0,0 +1,15 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <Color x:Key="WindowColor">#FFFAEF</Color>
+    <Color x:Key="WindowTextColor">#3D3D3D</Color>
+    <Color x:Key="HotlightColor">#1C5E75</Color>
+    <Color x:Key="GrayTextColor">#676767</Color>
+    <Color x:Key="HighlightTextColor">#FFF5E3</Color>
+    <Color x:Key="HighlightColor">#903909</Color>
+    <Color x:Key="ButtonTextColor">#202020</Color>
+    <Color x:Key="ButtonFaceColor">#FFFAEF</Color>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="Base.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Dusk.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Dusk.axaml
new file mode 100644
index 0000000..15e8af5
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Dusk.axaml
@@ -0,0 +1,15 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <Color x:Key="WindowColor">#2D3236</Color>
+    <Color x:Key="WindowTextColor">#FFFFFF</Color>
+    <Color x:Key="HotlightColor">#70EBDE</Color>
+    <Color x:Key="GrayTextColor">#A6A6A6</Color>
+    <Color x:Key="HighlightTextColor">#212D3B</Color>
+    <Color x:Key="HighlightColor">#A1BFDE</Color>
+    <Color x:Key="ButtonTextColor">#B6F6F0</Color>
+    <Color x:Key="ButtonFaceColor">#2D3236</Color>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="Base.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/NightSky.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/NightSky.axaml
new file mode 100644
index 0000000..7709fb5
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/NightSky.axaml
@@ -0,0 +1,15 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <Color x:Key="WindowColor">#000000</Color>
+    <Color x:Key="WindowTextColor">#FFFFFF</Color>
+    <Color x:Key="HotlightColor">#8080FF</Color>
+    <Color x:Key="GrayTextColor">#A6A6A6</Color>
+    <Color x:Key="HighlightTextColor">#2B2B2B</Color>
+    <Color x:Key="HighlightColor">#D6B4FD</Color>
+    <Color x:Key="ButtonTextColor">#FFEE32</Color>
+    <Color x:Key="ButtonFaceColor">#000000</Color>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="Base.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>