diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml
index a388435..a4c3928 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml
@@ -1,6 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Color x:Key="WindowColor">#202020</Color>
     <Color x:Key="WindowTextColor">#FFFFFF</Color>
     <Color x:Key="HotlightColor">#75E9FC</Color>
@@ -10,6 +8,6 @@
     <Color x:Key="ButtonTextColor">#FFFFFF</Color>
     <Color x:Key="ButtonFaceColor">#202020</Color>
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="Base.axaml" />
+        <ResourceInclude Source="_index.axaml" />
     </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Badge.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Badge.axaml
new file mode 100644
index 0000000..e86884f
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Badge.axaml
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="BadgeBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="BadgeForeground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="BadgeContentForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="BadgeInvertedBadgeBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Banner.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Banner.axaml
new file mode 100644
index 0000000..4a2fb13
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Banner.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="BannerInformationBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="BannerBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="BannerInformationBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="BannerCloseButtonForeground" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
deleted file mode 100644
index b44d8d3..0000000
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
+++ /dev/null
@@ -1,142 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Badge -->
-    <SolidColorBrush x:Key="BadgeBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="BadgeForeground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="BadgeContentForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="BadgeInvertedBadgeBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="{StaticResource WindowTextColor}" />
-
-    <!-- Banner -->
-    <SolidColorBrush x:Key="BannerInformationBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="BannerBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="BannerInformationBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="BannerCloseButtonForeground" Color="{StaticResource WindowTextColor}" />
-
-    <SolidColorBrush x:Key="ButtonGroupSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
-    <!--  Light  -->
-    <SolidColorBrush x:Key="ButtonGroupDefaultPrimaryForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledForeground" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="ButtonGroupDefaultBackground" Color="{StaticResource ButtonFaceColor}" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPressedBackground" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="ButtonGroupDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPressedBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
-
-    <!--  end Light  -->
-
-    <!--  Solid  -->
-    <SolidColorBrush x:Key="ButtonGroupSolidForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledForeground" Color="{StaticResource GrayTextColor}" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBackground" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
-    <!--  end Solid  -->
-
-    <!--  BreadCrumb  -->
-    <SolidColorBrush x:Key="BreadcrumbItemForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="BreadcrumbItemSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="BreadcrumbItemLastForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="BreadcrumbItemPointeroverForeground" Color="{StaticResource HighlightColor}" />
-
-    <!-- Clock -->
-    <SolidColorBrush x:Key="ClockHandBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ClockHourTickForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="ClockMinuteTickForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="ClockArborFill" Color="{StaticResource ButtonFaceColor}" />
-    <SolidColorBrush x:Key="ClockArborStroke" Color="{StaticResource ButtonTextColor}" />
-
-    <!--CalenderDayButton-->
-    <SolidColorBrush x:Key="CalenderDayBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="CalenderDayBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalenderDayInRangeBackground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayTodayBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayTodayForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="CalenderDayNotCurrentMonthForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="CalenderDayPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayPressedBackground" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="CalenderDaySelectedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDaySelectedForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="CalenderDaySelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDaySelectedPressedBackground" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="CalenderDayStartEndDateBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDateBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDatePointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDatePressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDateInRangeBackground" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDateBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDatePressedBackground" Color="{StaticResource HighlightColor}" />
-
-    <SolidColorBrush x:Key="CalenderDayBlackoutForeground" Color="{StaticResource GrayTextColor}" />
-    <SolidColorBrush x:Key="CalenderDayBlackoutBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="CalenderDayBlackoutTodayBackground" Color="Transparent" />
-
-    <!--CalenderYearButton-->
-    <SolidColorBrush x:Key="CalenderYearBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="CalenderYearBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalenderYearPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderYearPressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderYearSelectedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderYearSelectedForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="CalenderYearSelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
-
-    <!--CalenderView-->
-    <SolidColorBrush x:Key="CalenderViewBackground" Color="Transparent" />
-
-    <!-- Divider -->
-    <SolidColorBrush x:Key="DividerBorderBrush" Color="{StaticResource WindowTextColor}" />
-
-    <!--NavigationMenu-->
-    <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="NavigationMenuItemSeparatorBorderForeground" Color="{StaticResource WindowTextColor}" />
-
-    <!-- Form -->
-    <SolidColorBrush x:Key="FormGroupForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="FormAsteriskForeground" Color="{StaticResource HighlightColor}" />
-
-    <!-- Pagination -->
-    <SolidColorBrush x:Key="PaginationButtonDefaultForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="PaginationButtonSelectedForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="PaginationButtonIconForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="PaginationButtonDefaultBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="PaginationButtonPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="PaginationButtonPressedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="PaginationButtonSelectedBackground" Color="{DynamicResource HighlightColor}" />
-
-    <!-- SelectionList -->
-    <SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="{StaticResource WindowColor}" />
-
-    <!-- Tag -->
-    <SolidColorBrush x:Key="ClosableTagBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ClosableTagForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="ClosableTagBorder" Color="{StaticResource WindowTextColor}" />
-
-    <!-- Timeline -->
-    <SolidColorBrush x:Key="TimelineHeaderForeground" Color="{StaticResource WindowTextColor}" />
-
-    <!-- ToolBar -->
-    <SolidColorBrush x:Key="ToolBarHeaderForeground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ToolBarSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
-
-    <!-- TwoTonePathIcon -->
-    <SolidColorBrush x:Key="TwoTonePathIconForeground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="TwoTonePathIconStrokeBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="TwoTonePathIconActiveForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="TwoTonePathIconActiveStrokeBrush" Color="{StaticResource ButtonTextColor}" />
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Breadcrumb.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Breadcrumb.axaml
new file mode 100644
index 0000000..a502c70
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Breadcrumb.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="BreadcrumbItemForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="BreadcrumbItemSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="BreadcrumbItemLastForeground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="BreadcrumbItemPointeroverForeground" Color="{StaticResource HighlightColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/ButtonGroup.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/ButtonGroup.axaml
new file mode 100644
index 0000000..b067d2b
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/ButtonGroup.axaml
@@ -0,0 +1,32 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ButtonGroupSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
+    <!--  Light  -->
+    <SolidColorBrush x:Key="ButtonGroupDefaultPrimaryForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledForeground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="ButtonGroupDefaultBackground" Color="{StaticResource ButtonFaceColor}" />
+    <SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ButtonGroupDefaultPressedBackground" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="ButtonGroupDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ButtonGroupDefaultPressedBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+
+    <!--  end Light  -->
+
+    <!--  Solid  -->
+    <SolidColorBrush x:Key="ButtonGroupSolidForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ButtonGroupSolidDisabledForeground" Color="{StaticResource GrayTextColor}" />
+
+    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBackground" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="ButtonGroupSolidDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <!--  end Solid  -->
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Clock.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Clock.axaml
new file mode 100644
index 0000000..9964dec
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Clock.axaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ClockHandBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ClockHourTickForeground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="ClockMinuteTickForeground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="ClockArborFill" Color="{StaticResource ButtonFaceColor}" />
+    <SolidColorBrush x:Key="ClockArborStroke" Color="{StaticResource ButtonTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/DatePicker.axaml
new file mode 100644
index 0000000..72c8879
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/DatePicker.axaml
@@ -0,0 +1,41 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--CalenderDayButton-->
+    <SolidColorBrush x:Key="CalenderDayBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderDayBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderDayInRangeBackground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="CalenderDayTodayBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalenderDayTodayForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="CalenderDayNotCurrentMonthForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="CalenderDayPointeroverBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalenderDayPressedBackground" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="CalenderDaySelectedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalenderDaySelectedForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="CalenderDaySelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalenderDaySelectedPressedBackground" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="CalenderDayStartEndDateBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateBorderBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDatePointeroverBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDatePressedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateInRangeBackground" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDateBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDatePressedBackground" Color="{StaticResource HighlightColor}" />
+
+    <SolidColorBrush x:Key="CalenderDayBlackoutForeground" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutTodayBackground" Color="Transparent" />
+
+    <!--CalenderYearButton-->
+    <SolidColorBrush x:Key="CalenderYearBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderYearBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderYearPointeroverBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalenderYearPressedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalenderYearSelectedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="CalenderYearSelectedForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="CalenderYearSelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
+
+    <!--CalenderView-->
+    <SolidColorBrush x:Key="CalenderViewBackground" Color="Transparent" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Desert.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Desert.axaml
index 80dab10..3a662fa 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Desert.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Desert.axaml
@@ -1,6 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Color x:Key="WindowColor">#FFFAEF</Color>
     <Color x:Key="WindowTextColor">#3D3D3D</Color>
     <Color x:Key="HotlightColor">#1C5E75</Color>
@@ -10,6 +8,6 @@
     <Color x:Key="ButtonTextColor">#202020</Color>
     <Color x:Key="ButtonFaceColor">#FFFAEF</Color>
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="Base.axaml" />
+        <ResourceInclude Source="_index.axaml" />
     </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Divider.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Divider.axaml
new file mode 100644
index 0000000..91f95aa
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Divider.axaml
@@ -0,0 +1,3 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="DividerBorderBrush" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Dusk.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Dusk.axaml
index 15e8af5..f37ecc6 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Dusk.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Dusk.axaml
@@ -1,6 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Color x:Key="WindowColor">#2D3236</Color>
     <Color x:Key="WindowTextColor">#FFFFFF</Color>
     <Color x:Key="HotlightColor">#70EBDE</Color>
@@ -10,6 +8,6 @@
     <Color x:Key="ButtonTextColor">#B6F6F0</Color>
     <Color x:Key="ButtonFaceColor">#2D3236</Color>
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="Base.axaml" />
+        <ResourceInclude Source="_index.axaml" />
     </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Form.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Form.axaml
new file mode 100644
index 0000000..9387701
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Form.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="FormGroupForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="FormAsteriskForeground" Color="{StaticResource HighlightColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/NavigationMenu.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/NavigationMenu.axaml
new file mode 100644
index 0000000..4fc4b82
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/NavigationMenu.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="NavigationMenuItemSeparatorBorderForeground" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/NightSky.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/NightSky.axaml
index 7709fb5..5af4c67 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/NightSky.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/NightSky.axaml
@@ -1,6 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Color x:Key="WindowColor">#000000</Color>
     <Color x:Key="WindowTextColor">#FFFFFF</Color>
     <Color x:Key="HotlightColor">#8080FF</Color>
@@ -10,6 +8,6 @@
     <Color x:Key="ButtonTextColor">#FFEE32</Color>
     <Color x:Key="ButtonFaceColor">#000000</Color>
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="Base.axaml" />
+        <ResourceInclude Source="_index.axaml" />
     </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Pagination.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Pagination.axaml
new file mode 100644
index 0000000..c6433f5
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Pagination.axaml
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="PaginationButtonDefaultForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="PaginationButtonSelectedForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="PaginationButtonIconForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="PaginationButtonDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="PaginationButtonPointeroverBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="PaginationButtonPressedBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="PaginationButtonSelectedBackground" Color="{StaticResource HighlightColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Rating.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Rating.axaml
new file mode 100644
index 0000000..f0cc810
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Rating.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="RatingCharacterForeground" Color="#FDDE43" />
+    <SolidColorBrush x:Key="RatingCharacterBackground" Opacity="0.12" Color="White" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/SelectionList.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/SelectionList.axaml
new file mode 100644
index 0000000..7cd2633
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/SelectionList.axaml
@@ -0,0 +1,3 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="{StaticResource WindowColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/TagInput.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/TagInput.axaml
new file mode 100644
index 0000000..eeb5026
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/TagInput.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ClosableTagBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ClosableTagForeground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="ClosableTagBorder" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Timeline.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Timeline.axaml
new file mode 100644
index 0000000..c0b97ab
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Timeline.axaml
@@ -0,0 +1,3 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="TimelineHeaderForeground" Color="{StaticResource WindowTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Toast.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Toast.axaml
new file mode 100644
index 0000000..ef28a3c
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Toast.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ToastCardContentForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ToastCardBackground" Color="#43444A" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/ToolBar.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/ToolBar.axaml
new file mode 100644
index 0000000..b45e564
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/ToolBar.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ToolBarHeaderForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ToolBarSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/TwoTonePathIcon.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/TwoTonePathIcon.axaml
new file mode 100644
index 0000000..2bf0a45
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/TwoTonePathIcon.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="TwoTonePathIconForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="TwoTonePathIconStrokeBrush" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="TwoTonePathIconActiveForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="TwoTonePathIconActiveStrokeBrush" Color="{StaticResource ButtonTextColor}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/_index.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/_index.axaml
new file mode 100644
index 0000000..63b3df6
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/_index.axaml
@@ -0,0 +1,20 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="Badge.axaml" />
+        <ResourceInclude Source="Banner.axaml" />
+        <ResourceInclude Source="Breadcrumb.axaml" />
+        <ResourceInclude Source="ButtonGroup.axaml" />
+        <ResourceInclude Source="Clock.axaml" />
+        <ResourceInclude Source="DatePicker.axaml" />
+        <ResourceInclude Source="Divider.axaml" />
+        <ResourceInclude Source="Form.axaml" />
+        <ResourceInclude Source="NavigationMenu.axaml" />
+        <ResourceInclude Source="Pagination.axaml" />
+        <ResourceInclude Source="SelectionList.axaml" />
+        <ResourceInclude Source="TagInput.axaml" />
+        <ResourceInclude Source="Timeline.axaml" />
+        <ResourceInclude Source="Toast.axaml" />
+        <ResourceInclude Source="ToolBar.axaml" />
+        <ResourceInclude Source="TwoTonePathIcon.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file