From f0b6c4ecf9c584d05222da3f22c5a608aaaa55fa Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Fri, 27 Sep 2024 23:56:26 +0800
Subject: [PATCH 1/8] feat: try to implement Aqua.

---
 demo/Ursa.Demo/App.axaml                      |   4 +-
 demo/Ursa.Demo/Ursa.Demo.csproj               |   8 ++
 src/Ursa.Themes.Semi/Controls/Banner.axaml    |   2 +-
 src/Ursa.Themes.Semi/Index.axaml              |   7 +-
 src/Ursa.Themes.Semi/Index.axaml.cs           |   5 +
 src/Ursa.Themes.Semi/Themes/Dark/Banner.axaml |   1 +
 .../Themes/HighContrast/Aquatic.axaml         |  15 +++
 .../Themes/HighContrast/Base.axaml            | 102 ++++++++++++++++++
 .../Themes/Light/Banner.axaml                 |   1 +
 9 files changed, 142 insertions(+), 3 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml

diff --git a/demo/Ursa.Demo/App.axaml b/demo/Ursa.Demo/App.axaml
index 418891c..49bdfce 100644
--- a/demo/Ursa.Demo/App.axaml
+++ b/demo/Ursa.Demo/App.axaml
@@ -3,7 +3,9 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
     xmlns:u-semi="https://irihi.tech/ursa/themes/semi"
-    xmlns:semi="https://irihi.tech/semi">
+    RequestedThemeVariant="{x:Static semi:SemiTheme.Aquatic}"
+    xmlns:semi="https://irihi.tech/semi"
+    xmlns:demo="clr-namespace:Ursa.Demo">
     <Application.Styles>
         <semi:SemiTheme Locale="zh-CN" />
         <u-semi:SemiTheme Locale="zh-CN" />
diff --git a/demo/Ursa.Demo/Ursa.Demo.csproj b/demo/Ursa.Demo/Ursa.Demo.csproj
index 5e0a1c4..bf8cd04 100644
--- a/demo/Ursa.Demo/Ursa.Demo.csproj
+++ b/demo/Ursa.Demo/Ursa.Demo.csproj
@@ -19,7 +19,9 @@
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
+        <!--
         <PackageReference Include="Semi.Avalonia" Version="11.1.0.2" />
+        -->
     </ItemGroup>
 
     <ItemGroup>
@@ -30,4 +32,10 @@
     <ItemGroup>
       <Folder Include="Models\" />
     </ItemGroup>
+
+    <ItemGroup>
+      <Reference Include="Semi.Avalonia">
+        <HintPath>Assets\Semi.Avalonia.dll</HintPath>
+      </Reference>
+    </ItemGroup>
 </Project>
diff --git a/src/Ursa.Themes.Semi/Controls/Banner.axaml b/src/Ursa.Themes.Semi/Controls/Banner.axaml
index 8624194..ff2767a 100644
--- a/src/Ursa.Themes.Semi/Controls/Banner.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Banner.axaml
@@ -5,7 +5,7 @@
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:Banner}" TargetType="u:Banner">
         <Setter Property="u:Banner.BorderThickness" Value="{DynamicResource BannerBorderThickness}" />
-        <Setter Property="u:Banner.BorderBrush" Value="Transparent" />
+        <Setter Property="u:Banner.BorderBrush" Value="{DynamicResource BannerBorderBrush}" />
         <Setter Property="u:Banner.HorizontalContentAlignment" Value="Center" />
         <Setter Property="u:Banner.Template">
             <ControlTemplate TargetType="u:Banner">
diff --git a/src/Ursa.Themes.Semi/Index.axaml b/src/Ursa.Themes.Semi/Index.axaml
index f22145c..2f45fea 100644
--- a/src/Ursa.Themes.Semi/Index.axaml
+++ b/src/Ursa.Themes.Semi/Index.axaml
@@ -1,9 +1,14 @@
-<Styles x:Class="Ursa.Themes.Semi.SemiTheme" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles x:Class="Ursa.Themes.Semi.SemiTheme" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:semi="https://irihi.tech/ursa/themes/semi">
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
                 <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" />
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="../Controls/_index.axaml" />
diff --git a/src/Ursa.Themes.Semi/Index.axaml.cs b/src/Ursa.Themes.Semi/Index.axaml.cs
index 603e65a..6a61fe7 100644
--- a/src/Ursa.Themes.Semi/Index.axaml.cs
+++ b/src/Ursa.Themes.Semi/Index.axaml.cs
@@ -11,6 +11,11 @@ namespace Ursa.Themes.Semi;
 /// </summary>
 public class SemiTheme: Styles
 {
+    public static ThemeVariant Aquatic => new ThemeVariant(nameof(Aquatic), ThemeVariant.Dark);
+    public static ThemeVariant Desert => new ThemeVariant(nameof(Desert), ThemeVariant.Light);
+    public static ThemeVariant Dust => new ThemeVariant(nameof(Dust), ThemeVariant.Dark);
+    public static ThemeVariant NightSky => new ThemeVariant(nameof(NightSky), ThemeVariant.Dark);
+    
     private static readonly Lazy<Dictionary<CultureInfo, ResourceDictionary>> _localeToResource = new Lazy<Dictionary<CultureInfo, ResourceDictionary>>(
         () => new Dictionary<CultureInfo, ResourceDictionary>
         {
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Banner.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Banner.axaml
index 77feaa4..39f624e 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Banner.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Banner.axaml
@@ -10,4 +10,5 @@
     <SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#FFFC725A" />
 
     <SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.6" Color="#FFF9F9F9" />
+    <SolidColorBrush x:Key="BannerBorderBrush" Color="Transparent" />
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml
new file mode 100644
index 0000000..a388435
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.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">#202020</Color>
+    <Color x:Key="WindowTextColor">#FFFFFF</Color>
+    <Color x:Key="HotlightColor">#75E9FC</Color>
+    <Color x:Key="GrayTextColor">#A6A6A6</Color>
+    <Color x:Key="HighlightTextColor">#263B50</Color>
+    <Color x:Key="HighlightColor">#8EE3F0</Color>
+    <Color x:Key="ButtonTextColor">#FFFFFF</Color>
+    <Color x:Key="ButtonFaceColor">#202020</Color>
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="Base.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
new file mode 100644
index 0000000..62ea19a
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
@@ -0,0 +1,102 @@
+<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>
+    <Color x:Key="GrayTextColor">#A6A6A6</Color>
+    <Color x:Key="HighlightTextColor">#263B50</Color>
+    <Color x:Key="HighlightColor">#8EE3F0</Color>
+    <Color x:Key="ButtonTextColor">#FFFFFF</Color>
+    <Color x:Key="ButtonFaceColor">#202020</Color>
+     -->
+    <!-- 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  -->
+    
+    <!--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}" />
+    
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Banner.axaml b/src/Ursa.Themes.Semi/Themes/Light/Banner.axaml
index e86efb3..f86be17 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Banner.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/Banner.axaml
@@ -10,4 +10,5 @@
     <SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#F93920" />
 
     <SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.62" Color="#1C1F23" />
+    <SolidColorBrush x:Key="BannerBorderBrush" Color="Transparent" />
 </ResourceDictionary>

From 318996812866416c1061d974041f28d592e5a785 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Wed, 2 Oct 2024 18:06:55 +0800
Subject: [PATCH 2/8] feat: more controls.

---
 demo/Ursa.Demo/Ursa.Demo.csproj               |  4 +-
 src/Ursa.Themes.Semi/Controls/IPv4Box.axaml   | 36 ++++++++++--------
 .../Controls/KeyGestureInput.axaml            | 23 ++++++-----
 .../Controls/MultiComboBox.axaml              |  2 +-
 src/Ursa.Themes.Semi/Controls/NavMenu.axaml   | 16 +++++---
 src/Ursa.Themes.Semi/Controls/PinCode.axaml   |  2 +
 .../Controls/TreeComboBox.axaml               |  1 +
 .../Themes/Dark/IPv4Box.axaml                 | 12 ------
 .../Themes/Dark/KeyGestureInput.axaml         |  9 -----
 .../Themes/Dark/NavigationMenu.axaml          |  5 ---
 src/Ursa.Themes.Semi/Themes/Dark/_index.axaml |  2 -
 .../Themes/HighContrast/Base.axaml            |  1 +
 .../Themes/Light/IPv4Box.axaml                | 12 ------
 .../Themes/Light/KeyGestureInput.axaml        |  9 -----
 .../Themes/Light/NavigationMenu.axaml         |  5 ---
 .../Themes/Light/_index.axaml                 | 38 +++++++++----------
 .../Themes/Shared/IPv4Box.axaml               |  8 ----
 .../Themes/Shared/KeyGestureInput.axaml       |  7 ----
 .../Themes/Shared/_index.axaml                |  2 -
 19 files changed, 66 insertions(+), 128 deletions(-)
 delete mode 100644 src/Ursa.Themes.Semi/Themes/Dark/IPv4Box.axaml
 delete mode 100644 src/Ursa.Themes.Semi/Themes/Dark/KeyGestureInput.axaml
 delete mode 100644 src/Ursa.Themes.Semi/Themes/Light/IPv4Box.axaml
 delete mode 100644 src/Ursa.Themes.Semi/Themes/Light/KeyGestureInput.axaml
 delete mode 100644 src/Ursa.Themes.Semi/Themes/Shared/IPv4Box.axaml
 delete mode 100644 src/Ursa.Themes.Semi/Themes/Shared/KeyGestureInput.axaml

diff --git a/demo/Ursa.Demo/Ursa.Demo.csproj b/demo/Ursa.Demo/Ursa.Demo.csproj
index bf8cd04..660a5d6 100644
--- a/demo/Ursa.Demo/Ursa.Demo.csproj
+++ b/demo/Ursa.Demo/Ursa.Demo.csproj
@@ -19,9 +19,7 @@
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
-        <!--
-        <PackageReference Include="Semi.Avalonia" Version="11.1.0.2" />
-        -->
+        <PackageReference Include="Semi.Avalonia" Version="11.1.0.5-beta1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml b/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml
index 1c9e18a..636a707 100644
--- a/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml
+++ b/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml
@@ -30,18 +30,19 @@
             Header="Clear" />
     </MenuFlyout>
     <ControlTheme x:Key="{x:Type u:IPv4Box}" TargetType="{x:Type u:IPv4Box}">
-        <Setter Property="u:IPv4Box.Focusable" Value="True" />
-        <Setter Property="u:IPv4Box.ShowLeadingZero" Value="True" />
-        <Setter Property="u:IPv4Box.TextAlignment" Value="Center" />
-        <Setter Property="u:IPv4Box.HorizontalAlignment" Value="Left" />
-        <Setter Property="u:IPv4Box.CornerRadius" Value="{DynamicResource IPv4BoxCornerRadius}" />
-        <Setter Property="u:IPv4Box.Background" Value="{DynamicResource IPv4BoxBackground}" />
-        <Setter Property="u:IPv4Box.MinHeight" Value="{DynamicResource IPv4BoxDefaultMinHeight}" />
-        <Setter Property="u:IPv4Box.BorderThickness" Value="{DynamicResource IPv4BoxBorderThickness}" />
-        <Setter Property="u:IPv4Box.SelectionBrush" Value="{DynamicResource IPv4BoxSelectionBrush}" />
-        <Setter Property="u:IPv4Box.SelectionForegroundBrush" Value="{DynamicResource IPv4BoxSelectionForeground}" />
-        <Setter Property="u:IPv4Box.CaretBrush" Value="{DynamicResource IPv4BoxCaretBrush}" />
-        <Setter Property="u:IPv4Box.ContextFlyout" Value="{DynamicResource IPv4BoxMenuFlyout}" />
+        <Setter Property="Focusable" Value="True" />
+        <Setter Property="ShowLeadingZero" Value="True" />
+        <Setter Property="TextAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
+        <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
+        <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
+        <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
+        <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
+        <Setter Property="ContextFlyout" Value="{DynamicResource IPv4BoxMenuFlyout}" />
         <Setter Property="FocusAdorner" Value="{x:Null}"></Setter>
         <Setter Property="u:IPv4Box.Template">
             <ControlTemplate TargetType="u:IPv4Box">
@@ -113,17 +114,20 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:pointerover /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource IPv4BoxPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:pressed /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource IPv4BoxPressedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource  TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:focus-within">
-            <Setter Property="Border.BorderBrush" Value="{DynamicResource IPv4BoxFocusBorderBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Background" Value="{DynamicResource IPv4BoxDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource SemiColorDisabledText}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml b/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
index 9548bd9..c8865d5 100644
--- a/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
+++ b/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
@@ -7,12 +7,11 @@
     <converters:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
 
     <ControlTheme x:Key="{x:Type u:KeyGestureInput}" TargetType="u:KeyGestureInput">
-        <Setter Property="MinWidth" Value="{DynamicResource KeyGestureInputWidth}" />
-        <Setter Property="MinHeight" Value="{DynamicResource KeyGestureInputHeight}" />
-        <Setter Property="Background" Value="{DynamicResource KeyGestureInputBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource KeyGestureInputBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource KeyGestureInputBorderThickness}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource KeyGestureInputCornerRadius}" />
+        <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
+        <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
         <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
         <Setter Property="Padding" Value="8 0" />
         <Setter Property="Template">
@@ -67,18 +66,18 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:pointerover /template/ Border#Background">
-            <Setter Property="Background" Value="{DynamicResource KeyGestureInputPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:pressed /template/ Border#Background">
-            <Setter Property="Background" Value="{DynamicResource KeyGestureInputPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxPressedBackground}" />
         </Style>
         <Style Selector="^:focus /template/ Border#Background">
-            <Setter Property="Background" Value="{DynamicResource KeyGestureInputPressedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource KeyGestureInputFocusBorderBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:focus-within /template/ Border#Background">
-            <Setter Property="Background" Value="{DynamicResource KeyGestureInputPressedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource KeyGestureInputFocusBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxPressedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:not(:empty).clearButton, ^:not(:empty).ClearButton">
             <Style Selector="^:focus /template/ Button#PART_ClearButton">
diff --git a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
index d1576d7..59bce8d 100644
--- a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
@@ -8,7 +8,7 @@
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
         <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
-        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="MaxDropdownHeight" Value="300" />
         <Setter Property="MaxSelectionBoxHeight" Value="270"></Setter>
diff --git a/src/Ursa.Themes.Semi/Controls/NavMenu.axaml b/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
index f192e2d..1d83c3d 100644
--- a/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
+++ b/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
@@ -55,7 +55,8 @@
                 Grid.Row="0"
                 MinHeight="32"
                 HorizontalAlignment="Stretch"
-                Background="{TemplateBinding u:NavMenuItem.Background}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
                 CornerRadius="4"
                 Cursor="Hand">
                 <Grid
@@ -149,9 +150,11 @@
         </Setter>
         <Setter Property="Template" Value="{StaticResource DefaultNavMenuItemTemplate}" />
         <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource NavigationMenuItemSelectedBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}"></Setter>
+            <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource NavigationMenuItemSelectedBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}"></Setter>
+                <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedPointeroverBackground}" />
             </Style>
         </Style>
         <Style Selector="^:vertical-collapsed /template/ ItemsPresenter#PART_ItemsPresenter">
@@ -165,7 +168,10 @@
             <Setter Property="IsVisible" Value="False" />
         </Style>
         <Style Selector="^ /template/ Border#PART_Border:pointerover">
-            <Setter Property="Background" Value="{DynamicResource NavigationMenuItemPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
+        </Style>
+        <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter:pointerover">
+            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemPointeroverForeground}" />
         </Style>
         <Style Selector="^:horizontal-collapsed:first-level">
             <Setter Property="HorizontalAlignment" Value="Stretch" />
@@ -179,7 +185,7 @@
                 <Setter Property="HorizontalAlignment" Value="Stretch" />
             </Style>
             <Style Selector="^ /template/ Border#PART_Border:pointerover">
-                <Setter Property="Background" Value="{DynamicResource NavigationMenuItemPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
                 <Setter Property="Grid.ColumnSpan" Value="3" />
diff --git a/src/Ursa.Themes.Semi/Controls/PinCode.axaml b/src/Ursa.Themes.Semi/Controls/PinCode.axaml
index 7eb1aef..5fcb719 100644
--- a/src/Ursa.Themes.Semi/Controls/PinCode.axaml
+++ b/src/Ursa.Themes.Semi/Controls/PinCode.axaml
@@ -11,6 +11,7 @@
         <Setter Property="Width" Value="{DynamicResource TextBoxDefaultHeight}" />
         <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
         <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}"></Setter>
         <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
         <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="Template">
@@ -20,6 +21,7 @@
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
                     Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}">
                     <TextPresenter
diff --git a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
index d3f5f71..bf8bfcd 100644
--- a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
@@ -18,6 +18,7 @@
         <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
         <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}"></Setter>
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="MinHeight" Value="{DynamicResource ComboBoxDefaultHeight}" />
         <Setter Property="Cursor" Value="Hand" />
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/IPv4Box.axaml b/src/Ursa.Themes.Semi/Themes/Dark/IPv4Box.axaml
deleted file mode 100644
index b567dd0..0000000
--- a/src/Ursa.Themes.Semi/Themes/Dark/IPv4Box.axaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="IPv4BoxBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="IPv4BoxPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="IPv4BoxPressedBackground" Opacity="0.2" Color="White" />
-    <SolidColorBrush x:Key="IPv4BoxBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="IPv4BoxDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="IPv4BoxFocusBorderBrush" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="IPv4BoxSelectionBrush" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="IPv4BoxSelectionForeground" Color="White" />
-    <SolidColorBrush x:Key="IPv4BoxCaretBrush" Color="White" />
-</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/KeyGestureInput.axaml b/src/Ursa.Themes.Semi/Themes/Dark/KeyGestureInput.axaml
deleted file mode 100644
index ed7c331..0000000
--- a/src/Ursa.Themes.Semi/Themes/Dark/KeyGestureInput.axaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="KeyGestureInputBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="KeyGestureInputPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="KeyGestureInputPressedBackground" Opacity="0.2" Color="White" />
-    <SolidColorBrush x:Key="KeyGestureInputBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="KeyGestureInputDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="KeyGestureInputFocusBorderBrush" Color="#FF54A9FF" />
-</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml b/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml
index 01aeffc..d20f8da 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml
@@ -1,9 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="NavigationMenuItemDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="NavigationMenuItemPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="NavigationMenuItemPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="NavigationMenuItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="NavigationMenuItemHighlightForeground" Color="#54A9FF" />
     <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Opacity="0.62" Color="#F9F9F9" />
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
index 91a84b5..b0a949e 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
@@ -8,8 +8,6 @@
         <MergeResourceInclude Source="Dialog.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="DualBadge.axaml" />
-        <MergeResourceInclude Source="IPv4Box.axaml" />
-        <MergeResourceInclude Source="KeyGestureInput.axaml" />
         <MergeResourceInclude Source="Loading.axaml" />
         <MergeResourceInclude Source="NavigationMenu.axaml" />
         <MergeResourceInclude Source="NotificationShared.axaml" />
diff --git a/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml b/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
index 62ea19a..9031c4e 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
@@ -99,4 +99,5 @@
     <!-- Divider -->
     <SolidColorBrush x:Key="DividerBorderBrush" Color="{StaticResource WindowTextColor}" />
     
+    <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Color="{StaticResource WindowTextColor}" />
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/IPv4Box.axaml b/src/Ursa.Themes.Semi/Themes/Light/IPv4Box.axaml
deleted file mode 100644
index 5c3fb6b..0000000
--- a/src/Ursa.Themes.Semi/Themes/Light/IPv4Box.axaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="IPv4BoxBackground" Opacity="0.05" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="IPv4BoxPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="IPv4BoxPressedBackground" Opacity="0.13" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="IPv4BoxBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="IPv4BoxDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="IPv4BoxFocusBorderBrush" Color="#FF0077FA" />
-    <SolidColorBrush x:Key="IPv4BoxSelectionBrush" Color="#FF0077FA" />
-    <SolidColorBrush x:Key="IPv4BoxSelectionForeground" Color="White" />
-    <SolidColorBrush x:Key="IPv4BoxCaretBrush" Color="Black" />
-</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/KeyGestureInput.axaml b/src/Ursa.Themes.Semi/Themes/Light/KeyGestureInput.axaml
deleted file mode 100644
index 490e1a4..0000000
--- a/src/Ursa.Themes.Semi/Themes/Light/KeyGestureInput.axaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="KeyGestureInputBackground" Opacity="0.05" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="KeyGestureInputPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="KeyGestureInputPressedBackground" Opacity="0.13" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="KeyGestureInputBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="KeyGestureInputDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="KeyGestureInputFocusBorderBrush" Color="#FF0077FA" />
-</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml b/src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml
index ef322d2..04e72e0 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml
@@ -1,9 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="NavigationMenuItemDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="NavigationMenuItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="NavigationMenuItemPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="NavigationMenuItemSelectedBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="NavigationMenuItemHighlightForeground" Color="#0077FA" />
     <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
index 91a84b5..647f0c4 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
@@ -1,24 +1,22 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <MergeResourceInclude Source="Avatar.axaml" />
-        <MergeResourceInclude Source="Badge.axaml" />
-        <MergeResourceInclude Source="Banner.axaml" />
-        <MergeResourceInclude Source="ButtonGroup.axaml" />
-        <MergeResourceInclude Source="DatePicker.axaml" />
-        <MergeResourceInclude Source="Dialog.axaml" />
-        <MergeResourceInclude Source="Divider.axaml" />
-        <MergeResourceInclude Source="DualBadge.axaml" />
-        <MergeResourceInclude Source="IPv4Box.axaml" />
-        <MergeResourceInclude Source="KeyGestureInput.axaml" />
-        <MergeResourceInclude Source="Loading.axaml" />
-        <MergeResourceInclude Source="NavigationMenu.axaml" />
-        <MergeResourceInclude Source="NotificationShared.axaml" />
-        <MergeResourceInclude Source="Pagination.axaml" />
-        <MergeResourceInclude Source="Rating.axaml" />
-        <MergeResourceInclude Source="TagInput.axaml" />
-        <MergeResourceInclude Source="Timeline.axaml" />
-        <MergeResourceInclude Source="Toast.axaml" />
-        <MergeResourceInclude Source="Skeleton.axaml" />
-        <MergeResourceInclude Source="TimeBox.axaml" />
+        <ResourceInclude Source="Avatar.axaml" />
+        <ResourceInclude Source="Badge.axaml" />
+        <ResourceInclude Source="Banner.axaml" />
+        <ResourceInclude Source="ButtonGroup.axaml" />
+        <ResourceInclude Source="DatePicker.axaml" />
+        <ResourceInclude Source="Dialog.axaml" />
+        <ResourceInclude Source="Divider.axaml" />
+        <ResourceInclude Source="DualBadge.axaml" />
+        <ResourceInclude Source="Loading.axaml" />
+        <ResourceInclude Source="NavigationMenu.axaml" />
+        <ResourceInclude Source="NotificationShared.axaml" />
+        <ResourceInclude Source="Pagination.axaml" />
+        <ResourceInclude Source="Rating.axaml" />
+        <ResourceInclude Source="TagInput.axaml" />
+        <ResourceInclude Source="Timeline.axaml" />
+        <ResourceInclude Source="Toast.axaml" />
+        <ResourceInclude Source="Skeleton.axaml" />
+        <ResourceInclude Source="TimeBox.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/IPv4Box.axaml b/src/Ursa.Themes.Semi/Themes/Shared/IPv4Box.axaml
deleted file mode 100644
index 3f808ba..0000000
--- a/src/Ursa.Themes.Semi/Themes/Shared/IPv4Box.axaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <x:Double x:Key="IPv4BoxDefaultMinHeight">32</x:Double>
-    <x:Double x:Key="IPv4BoxSmallMinHeight">24</x:Double>
-    <x:Double x:Key="IPv4BoxLargeMinHeight">40</x:Double>
-    <Thickness x:Key="IPv4BoxBorderThickness">1</Thickness>
-    <CornerRadius x:Key="IPv4BoxCornerRadius">3</CornerRadius>
-</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/KeyGestureInput.axaml b/src/Ursa.Themes.Semi/Themes/Shared/KeyGestureInput.axaml
deleted file mode 100644
index 19752fa..0000000
--- a/src/Ursa.Themes.Semi/Themes/Shared/KeyGestureInput.axaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <x:Double x:Key="KeyGestureInputWidth">80</x:Double>
-    <x:Double x:Key="KeyGestureInputHeight">32</x:Double>
-    <CornerRadius x:Key="KeyGestureInputCornerRadius">3</CornerRadius>
-    <Thickness x:Key="KeyGestureInputBorderThickness">1</Thickness>
-</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
index a47bb98..f735ed8 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
@@ -11,8 +11,6 @@
         <ResourceInclude Source="Divider.axaml" />
         <ResourceInclude Source="Drawer.axaml" />
         <ResourceInclude Source="DualBadge.axaml" />
-        <ResourceInclude Source="IPv4Box.axaml" />
-        <ResourceInclude Source="KeyGestureInput.axaml" />
         <ResourceInclude Source="MessageBox.axaml" />
         <ResourceInclude Source="NavigationMenu.axaml" />
         <ResourceInclude Source="Notification.axaml" />

From d52f97a058f6c2d090931ed653d5149e54ff19ad Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 3 Oct 2024 01:50:07 +0800
Subject: [PATCH 3/8] feat: finish.

---
 .../Controls/MultiComboBox.axaml              |   2 +
 .../Controls/SelectionList.axaml              |   2 +-
 src/Ursa.Themes.Semi/Controls/TagInput.axaml  |  29 +--
 src/Ursa.Themes.Semi/Controls/TextBox.axaml   |  79 -------
 src/Ursa.Themes.Semi/Controls/TimeBox.axaml   | 208 ++++++++++--------
 .../Controls/TreeComboBox.axaml               |  57 ++---
 src/Ursa.Themes.Semi/Controls/_index.axaml    |   1 -
 .../Themes/Dark/SelectionList.axaml           |   5 +
 .../Themes/Dark/TagInput.axaml                |   2 +
 .../Themes/Dark/TimeBox.axaml                 |  12 -
 src/Ursa.Themes.Semi/Themes/Dark/_index.axaml |  36 +--
 .../Themes/HighContrast/Base.axaml            |  17 ++
 .../Themes/Light/SelectionList.axaml          |   5 +
 .../Themes/Light/TagInput.axaml               |   2 +
 .../Themes/Light/TimeBox.axaml                |  12 -
 .../Themes/Light/_index.axaml                 |   2 +-
 .../Themes/Shared/TagInput.axaml              |   1 -
 .../Themes/Shared/TimeBox.axaml               |   8 -
 .../Themes/Shared/_index.axaml                |   1 -
 19 files changed, 211 insertions(+), 270 deletions(-)
 delete mode 100644 src/Ursa.Themes.Semi/Controls/TextBox.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Dark/SelectionList.axaml
 delete mode 100644 src/Ursa.Themes.Semi/Themes/Dark/TimeBox.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Light/SelectionList.axaml
 delete mode 100644 src/Ursa.Themes.Semi/Themes/Light/TimeBox.axaml
 delete mode 100644 src/Ursa.Themes.Semi/Themes/Shared/TimeBox.axaml

diff --git a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
index 59bce8d..d5ec4cd 100644
--- a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
@@ -267,11 +267,13 @@
 
         <!--  Pointerover State  -->
         <Style Selector="^:pointerover">
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPointeroverForeground}" />
             <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
         </Style>
 
         <!--  Pressed State  -->
         <Style Selector="^:pressed">
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPressedForeground}" />
             <Setter Property="Background" Value="{DynamicResource ListBoxItemPressedBackground}" />
         </Style>
 
diff --git a/src/Ursa.Themes.Semi/Controls/SelectionList.axaml b/src/Ursa.Themes.Semi/Controls/SelectionList.axaml
index 3a7138c..e41ca89 100644
--- a/src/Ursa.Themes.Semi/Controls/SelectionList.axaml
+++ b/src/Ursa.Themes.Semi/Controls/SelectionList.axaml
@@ -10,7 +10,7 @@
                     Margin="2"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
-                    Background="{DynamicResource SemiBlue1}"
+                    Background="{DynamicResource SelectionListIndicatorBackground}"
                     Theme="{DynamicResource CardBorder}" />
             </Template>
         </Setter>
diff --git a/src/Ursa.Themes.Semi/Controls/TagInput.axaml b/src/Ursa.Themes.Semi/Controls/TagInput.axaml
index 6357f4a..40ef851 100644
--- a/src/Ursa.Themes.Semi/Controls/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TagInput.axaml
@@ -6,7 +6,7 @@
     <ControlTheme x:Key="{x:Type u:TagInput}" TargetType="u:TagInput">
         <Setter Property="InputTheme" Value="{DynamicResource TagInputTextBoxTheme}" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="MinHeight" Value="{DynamicResource TagInputDefaultHeight}" />
+        <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="ItemTemplate">
             <DataTemplate>
@@ -22,8 +22,8 @@
                     VerticalAlignment="Stretch"
                     Background="{DynamicResource TextBoxDefaultBackground}"
                     BorderBrush="{DynamicResource TextBoxDefaultBorderBrush}"
-                    BorderThickness="1"
-                    CornerRadius="3">
+                    BorderThickness="{DynamicResource TextBoxBorderThickness}"
+                    CornerRadius="{DynamicResource TextBoxDefaultCornerRadius}">
                     <Panel HorizontalAlignment="Stretch">
                         <TextBlock
                             Name="{x:Static u:TagInput.PART_Watermark}"
@@ -53,6 +53,7 @@
         </Style>
         <Style Selector="^:pointerover /template/ Border#PART_BackgroundBorder">
             <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:focus-within /template/ Border#PART_BackgroundBorder">
             <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
@@ -60,13 +61,13 @@
     </ControlTheme>
 
     <ControlTheme x:Key="TagInputTextBoxTheme" TargetType="TextBox">
-        <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" />
-        <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxDefaultBackground}" />
-        <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
-        <Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
-        <Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
-        <Setter Property="TextBox.Cursor" Value="Ibeam" />
-        <Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBoxInnerForeground}" />
+        <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
+        <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
+        <Setter Property="Cursor" Value="Ibeam" />
+        <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
@@ -106,10 +107,10 @@
 
     <ControlTheme x:Key="{x:Type u:ClosableTag}" TargetType="u:ClosableTag">
         <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="u:ClosableTag.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
-        <Setter Property="u:ClosableTag.Background" Value="{DynamicResource ClosableTagBackground}" />
-        <Setter Property="u:ClosableTag.BorderBrush" Value="{DynamicResource SemiColorBorder}" />
-        <Setter Property="u:ClosableTag.BorderThickness" Value="1" />
+        <Setter Property="Foreground" Value="{DynamicResource ClosableTagForeground}" />
+        <Setter Property="Background" Value="{DynamicResource ClosableTagBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ClosableTagBorder}" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ClosableTag">
diff --git a/src/Ursa.Themes.Semi/Controls/TextBox.axaml b/src/Ursa.Themes.Semi/Controls/TextBox.axaml
deleted file mode 100644
index 806a0e5..0000000
--- a/src/Ursa.Themes.Semi/Controls/TextBox.axaml
+++ /dev/null
@@ -1,79 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <ControlTheme x:Key="LooklessTextBox" TargetType="TextBox">
-        <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" />
-        <Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
-        <Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
-        <Setter Property="TextBox.FontSize" Value="14" />
-        <Setter Property="TextBox.Cursor" Value="Ibeam" />
-        <Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
-        <Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
-        <Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
-        <Setter Property="TextBox.VerticalAlignment" Value="Center" />
-        <Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
-        <Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
-        <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
-        <Setter Property="TextBox.Template">
-            <ControlTemplate TargetType="TextBox">
-                <Border Name="PART_ContentPresenterBorder" MinHeight="{TemplateBinding MinHeight}">
-                    <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
-                        <ContentPresenter
-                            Grid.Column="0"
-                            Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding InnerLeftContent}"
-                            Foreground="{DynamicResource TextBoxInnerForeground}"
-                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerLeftContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
-                        <ScrollViewer
-                            Grid.Column="1"
-                            AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
-                            HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
-                            IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
-                            VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
-                            <Panel>
-                                <TextBlock
-                                    Name="PART_Watermark"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    IsVisible="{TemplateBinding Text,
-                                                                Converter={x:Static StringConverters.IsNullOrEmpty}}"
-                                    Opacity="0.5"
-                                    Text="{TemplateBinding Watermark}"
-                                    TextAlignment="{TemplateBinding TextAlignment}"
-                                    TextWrapping="{TemplateBinding TextWrapping}" />
-                                <TextPresenter
-                                    Name="PART_TextPresenter"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    CaretBrush="{TemplateBinding CaretBrush}"
-                                    CaretIndex="{TemplateBinding CaretIndex}"
-                                    LineHeight="{TemplateBinding LineHeight}"
-                                    PasswordChar="{TemplateBinding PasswordChar}"
-                                    RevealPassword="{TemplateBinding RevealPassword}"
-                                    SelectionBrush="{TemplateBinding SelectionBrush}"
-                                    SelectionEnd="{TemplateBinding SelectionEnd}"
-                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                                    SelectionStart="{TemplateBinding SelectionStart}"
-                                    Text="{TemplateBinding Text,
-                                                           Mode=TwoWay}"
-                                    TextAlignment="{TemplateBinding TextAlignment}"
-                                    TextWrapping="{TemplateBinding TextWrapping}" />
-                            </Panel>
-                        </ScrollViewer>
-                        <ContentPresenter
-                            Grid.Column="2"
-                            Padding="{DynamicResource TextBoxInnerRightContentPadding}"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding InnerRightContent}"
-                            Foreground="{DynamicResource TextBoxInnerForeground}"
-                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
-                    </Grid>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-        
-        <Style Selector="^:disabled">
-            <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
-        </Style>
-    </ControlTheme>
-</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/TimeBox.axaml b/src/Ursa.Themes.Semi/Controls/TimeBox.axaml
index 479b100..0eed466 100644
--- a/src/Ursa.Themes.Semi/Controls/TimeBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TimeBox.axaml
@@ -1,52 +1,58 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:u="https://irihi.tech/ursa">
-    <!-- Add Resources Here -->
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:u="https://irihi.tech/ursa">
+    <!--  Add Resources Here  -->
     <Design.PreviewWith>
         <StackPanel Margin="20">
-            <TextBlock Text="Hello World"/>
+            <TextBlock Text="Hello World" />
         </StackPanel>
     </Design.PreviewWith>
-    
+
     <ControlTheme x:Key="{x:Type u:TimeBox}" TargetType="{x:Type u:TimeBox}">
-        <Setter Property="u:TimeBox.Focusable" Value="True"/>
-        <Setter Property="u:TimeBox.ShowLeadingZero" Value="True"/>
-        <Setter Property="u:TimeBox.TextAlignment" Value="Center"/>
-        <Setter Property="u:TimeBox.HorizontalAlignment" Value="Left"/>
-        <Setter Property="u:TimeBox.CornerRadius" Value="{DynamicResource TimeBoxCornerRadius}" />
-        <Setter Property="u:TimeBox.Background" Value="{DynamicResource TimeBoxBackground}" />
-        <Setter Property="u:TimeBox.MinHeight" Value="{DynamicResource TimeBoxDefaultMinHeight}" />
-        <Setter Property="u:TimeBox.BorderThickness" Value="{DynamicResource TimeBoxBorderThickness}" />
-        <Setter Property="u:TimeBox.SelectionBrush" Value="{DynamicResource TimeBoxSelectionBrush}" />
-        <Setter Property="u:TimeBox.SelectionForegroundBrush" Value="{DynamicResource TimeBoxSelectionForeground}" />
-        <Setter Property="u:TimeBox.CaretBrush" Value="{DynamicResource TimeBoxCaretBrush}" />
-        <Setter Property="u:TimeBox.Template">
+        <Setter Property="Focusable" Value="True" />
+        <Setter Property="ShowLeadingZero" Value="True" />
+        <Setter Property="TextAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
+        <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
+        <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
+        <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
+        <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:TimeBox">
-                <Border Name="PART_Border"
+                <Border
+                    Name="PART_Border"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}">
                     <Grid Width="{TemplateBinding Width}" ColumnDefinitions="1*, Auto, 1*, Auto, 1*, Auto, 1*">
-                        <Border Name="{x:Static u:TimeBox.PART_HourBorder}" 
-                                Grid.Column="0"
-                                Background="Transparent"
-                                BorderBrush="Transparent"
-                                BorderThickness="0"
-                                CornerRadius="{TemplateBinding CornerRadius}">
+                        <Border
+                            Name="{x:Static u:TimeBox.PART_HourBorder}"
+                            Grid.Column="0"
+                            Background="Transparent"
+                            BorderBrush="Transparent"
+                            BorderThickness="0"
+                            CornerRadius="{TemplateBinding CornerRadius}">
                             <Grid>
-                                <TextPresenter Name="{x:Static u:TimeBox.PART_HoursTextPresenter}"
-                                               MinWidth="8"
-                                               VerticalAlignment="Center"
-                                               CaretBrush="{TemplateBinding CaretBrush}"
-                                               Cursor="IBeam"
-                                               SelectionBrush="{TemplateBinding SelectionBrush}"
-                                               SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                                               TextAlignment="{TemplateBinding TextAlignment}"/>
-                                <Panel Name="{x:Static u:TimeBox.PART_HourDragPanel}"
-                                       HorizontalAlignment="Stretch"
-                                       VerticalAlignment="Stretch"
-                                       Background="Transparent"/>
+                                <TextPresenter
+                                    Name="{x:Static u:TimeBox.PART_HoursTextPresenter}"
+                                    MinWidth="8"
+                                    VerticalAlignment="Center"
+                                    CaretBrush="{TemplateBinding CaretBrush}"
+                                    Cursor="IBeam"
+                                    SelectionBrush="{TemplateBinding SelectionBrush}"
+                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                    TextAlignment="{TemplateBinding TextAlignment}" />
+                                <Panel
+                                    Name="{x:Static u:TimeBox.PART_HourDragPanel}"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch"
+                                    Background="Transparent" />
                             </Grid>
                         </Border>
                         <TextBlock
@@ -55,25 +61,28 @@
                             VerticalAlignment="Center"
                             Focusable="False"
                             Text=":" />
-                        <Border Name="{x:Static u:TimeBox.PART_MinuteBorder}" 
-                                Grid.Column="2"
-                                Background="Transparent"
-                                BorderBrush="Transparent"
-                                BorderThickness="0"
-                                CornerRadius="{TemplateBinding CornerRadius}">
+                        <Border
+                            Name="{x:Static u:TimeBox.PART_MinuteBorder}"
+                            Grid.Column="2"
+                            Background="Transparent"
+                            BorderBrush="Transparent"
+                            BorderThickness="0"
+                            CornerRadius="{TemplateBinding CornerRadius}">
                             <Grid>
-                                <TextPresenter Name="{x:Static u:TimeBox.PART_MinuteTextPresenter}"
-                                               MinWidth="8"
-                                               VerticalAlignment="Center"
-                                               CaretBrush="{TemplateBinding CaretBrush}"
-                                               Cursor="IBeam"
-                                               SelectionBrush="{TemplateBinding SelectionBrush}"
-                                               SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                                               TextAlignment="{TemplateBinding TextAlignment}"/>
-                                <Panel Name="{x:Static u:TimeBox.PART_MinuteDragPanel}"
-                                       HorizontalAlignment="Stretch"
-                                       VerticalAlignment="Stretch"
-                                       Background="Transparent"/>
+                                <TextPresenter
+                                    Name="{x:Static u:TimeBox.PART_MinuteTextPresenter}"
+                                    MinWidth="8"
+                                    VerticalAlignment="Center"
+                                    CaretBrush="{TemplateBinding CaretBrush}"
+                                    Cursor="IBeam"
+                                    SelectionBrush="{TemplateBinding SelectionBrush}"
+                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                    TextAlignment="{TemplateBinding TextAlignment}" />
+                                <Panel
+                                    Name="{x:Static u:TimeBox.PART_MinuteDragPanel}"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch"
+                                    Background="Transparent" />
                             </Grid>
                         </Border>
                         <TextBlock
@@ -82,25 +91,28 @@
                             VerticalAlignment="Center"
                             Focusable="False"
                             Text=":" />
-                        <Border Name="{x:Static u:TimeBox.PART_SecondBorder}" 
-                                Grid.Column="4"
-                                Background="Transparent"
-                                BorderBrush="Transparent"
-                                BorderThickness="0"
-                                CornerRadius="{TemplateBinding CornerRadius}">
+                        <Border
+                            Name="{x:Static u:TimeBox.PART_SecondBorder}"
+                            Grid.Column="4"
+                            Background="Transparent"
+                            BorderBrush="Transparent"
+                            BorderThickness="0"
+                            CornerRadius="{TemplateBinding CornerRadius}">
                             <Grid>
-                                <TextPresenter Name="{x:Static u:TimeBox.PART_SecondTextPresenter}"
-                                               MinWidth="8"
-                                               VerticalAlignment="Center"
-                                               CaretBrush="{TemplateBinding CaretBrush}"
-                                               Cursor="IBeam"
-                                               SelectionBrush="{TemplateBinding SelectionBrush}"
-                                               SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                                               TextAlignment="{TemplateBinding TextAlignment}"/>
-                                <Panel Name="{x:Static u:TimeBox.PART_SecondDragPanel}"
-                                       HorizontalAlignment="Stretch"
-                                       VerticalAlignment="Stretch"
-                                       Background="Transparent"/>
+                                <TextPresenter
+                                    Name="{x:Static u:TimeBox.PART_SecondTextPresenter}"
+                                    MinWidth="8"
+                                    VerticalAlignment="Center"
+                                    CaretBrush="{TemplateBinding CaretBrush}"
+                                    Cursor="IBeam"
+                                    SelectionBrush="{TemplateBinding SelectionBrush}"
+                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                    TextAlignment="{TemplateBinding TextAlignment}" />
+                                <Panel
+                                    Name="{x:Static u:TimeBox.PART_SecondDragPanel}"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch"
+                                    Background="Transparent" />
                             </Grid>
                         </Border>
                         <TextBlock
@@ -109,25 +121,28 @@
                             VerticalAlignment="Center"
                             Focusable="False"
                             Text="." />
-                        <Border Name="{x:Static u:TimeBox.PART_MilliSecondBorder}" 
-                                Grid.Column="6"
-                                Background="Transparent"
-                                BorderBrush="Transparent"
-                                BorderThickness="0"
-                                CornerRadius="{TemplateBinding CornerRadius}">
+                        <Border
+                            Name="{x:Static u:TimeBox.PART_MilliSecondBorder}"
+                            Grid.Column="6"
+                            Background="Transparent"
+                            BorderBrush="Transparent"
+                            BorderThickness="0"
+                            CornerRadius="{TemplateBinding CornerRadius}">
                             <Grid>
-                                <TextPresenter Name="{x:Static u:TimeBox.PART_MillisecondTextPresenter}"
-                                               MinWidth="8"
-                                               VerticalAlignment="Center"
-                                               CaretBrush="{TemplateBinding CaretBrush}"
-                                               Cursor="IBeam"
-                                               SelectionBrush="{TemplateBinding SelectionBrush}"
-                                               SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
-                                               TextAlignment="{TemplateBinding TextAlignment}"/>
-                                <Panel Name="{x:Static u:TimeBox.PART_MilliSecondDragPanel}"
-                                       HorizontalAlignment="Stretch"
-                                       VerticalAlignment="Stretch"
-                                       Background="Transparent"/>
+                                <TextPresenter
+                                    Name="{x:Static u:TimeBox.PART_MillisecondTextPresenter}"
+                                    MinWidth="8"
+                                    VerticalAlignment="Center"
+                                    CaretBrush="{TemplateBinding CaretBrush}"
+                                    Cursor="IBeam"
+                                    SelectionBrush="{TemplateBinding SelectionBrush}"
+                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                    TextAlignment="{TemplateBinding TextAlignment}" />
+                                <Panel
+                                    Name="{x:Static u:TimeBox.PART_MilliSecondDragPanel}"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch"
+                                    Background="Transparent" />
                             </Grid>
                         </Border>
                     </Grid>
@@ -135,20 +150,21 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:focus-within">
-            <Setter Property="Border.BorderBrush" Value="{DynamicResource TimeBoxFocusBorderBrush}" />
+            <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Background" Value="{DynamicResource TimeBoxDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource SemiColorDisabledText}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
         </Style>
         <Style Selector="^[DragOrientation=Horizontal]">
             <Style Selector="^/template/ Panel">
-                <Setter Property="Cursor" Value="SizeWestEast"/>
+                <Setter Property="Cursor" Value="SizeWestEast" />
             </Style>
         </Style>
         <Style Selector="^[DragOrientation=Vertical]">
             <Style Selector="^/template/ Panel">
-                <Setter Property="Cursor" Value="SizeNorthSouth"/>
+                <Setter Property="Cursor" Value="SizeNorthSouth" />
             </Style>
         </Style>
     </ControlTheme>
diff --git a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
index bf8bfcd..e5211dc 100644
--- a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
@@ -18,7 +18,7 @@
         <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
         <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}"></Setter>
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="MinHeight" Value="{DynamicResource ComboBoxDefaultHeight}" />
         <Setter Property="Cursor" Value="Hand" />
@@ -69,7 +69,7 @@
                     </ContentPresenter>
                     <ContentPresenter
                         Grid.Column="2"
-                        Margin="0 0 8 0"
+                        Margin="0,0,8,0"
                         VerticalAlignment="Center"
                         VerticalContentAlignment="Center"
                         Content="{TemplateBinding InnerRightContent}"
@@ -79,11 +79,11 @@
                     <Button
                         Name="PART_ClearButton"
                         Grid.Column="3"
-                        Command="{Binding $parent[u:TreeComboBox].Clear}"
                         Margin="0,0,8,0"
+                        Command="{Binding $parent[u:TreeComboBox].Clear}"
+                        Content="{DynamicResource IconButtonClearData}"
                         IsVisible="False"
-                        Theme="{DynamicResource InnerIconButton}"
-                        Content="{DynamicResource IconButtonClearData}" />
+                        Theme="{DynamicResource InnerIconButton}" />
 
                     <PathIcon
                         x:Name="DropDownGlyph"
@@ -95,8 +95,8 @@
                         VerticalAlignment="Center"
                         Data="{DynamicResource ComboBoxIcon}"
                         Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
-                        UseLayoutRounding="False"
-                        IsHitTestVisible="True" />
+                        IsHitTestVisible="True"
+                        UseLayoutRounding="False" />
 
                     <Popup
                         Name="{x:Static iri:PartNames.PART_Popup}"
@@ -112,27 +112,27 @@
                         <Border
                             Name="PopupBorder"
                             Margin="0,4"
-                            BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
                             Background="{DynamicResource ComboBoxPopupBackground}"
                             BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
+                            BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
                             BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
                             ClipToBounds="True"
                             CornerRadius="6">
                             <DockPanel LastChildFill="True">
                                 <ContentPresenter
                                     Name="PART_PopupHeader"
-                                    Margin="8,8 8 0"
-                                    IsVisible="{TemplateBinding PopupInnerTopContent,
-                                                                Converter={x:Static ObjectConverters.IsNotNull}}"
+                                    Margin="8,8,8,0"
                                     Content="{TemplateBinding PopupInnerTopContent}"
-                                    DockPanel.Dock="Top" />
+                                    DockPanel.Dock="Top"
+                                    IsVisible="{TemplateBinding PopupInnerTopContent,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}" />
                                 <ContentPresenter
                                     Name="PART_PopupFooter"
-                                    Margin="8 0 8 8"
-                                    IsVisible="{TemplateBinding PopupInnerBottomContent,
-                                                                Converter={x:Static ObjectConverters.IsNotNull}}"
+                                    Margin="8,0,8,8"
                                     Content="{TemplateBinding PopupInnerBottomContent}"
-                                    DockPanel.Dock="Bottom" />
+                                    DockPanel.Dock="Bottom"
+                                    IsVisible="{TemplateBinding PopupInnerBottomContent,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}" />
                                 <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}">
                                     <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
                                 </ScrollViewer>
@@ -142,23 +142,23 @@
                 </Grid>
             </ControlTemplate>
         </Setter>
-        
+
         <Style Selector="^.clearButton, ^.ClearButton">
             <Style Selector="^:pointerover /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNotNull}}"/>
+                <Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNotNull}}" />
             </Style>
             <Style Selector="^:pointerover /template/ PathIcon#DropDownGlyph">
-                <Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}"/>
+                <Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" />
             </Style>
         </Style>
-        
+
         <Style Selector="^.Large">
-            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}"/>
+            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}"/>
+            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
         </Style>
-        
+
         <!--  Pointerover State  -->
         <Style Selector="^:pointerover">
             <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPointeroverBackground}" />
@@ -218,7 +218,7 @@
         <Setter Property="Background" Value="{DynamicResource TreeViewItemDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource TreeViewItemDefaultForeground}" />
         <Setter Property="CornerRadius" Value="3" />
-        <Setter Property="MinHeight" Value="32"></Setter>
+        <Setter Property="MinHeight" Value="32" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:TreeComboBoxItem">
@@ -266,11 +266,10 @@
             </ControlTemplate>
         </Setter>
 
-        <!--  Pointerover state  -->
         <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover">
             <Setter Property="Background" Value="{DynamicResource TreeViewItemPointeroverBackground}" />
         </Style>
-
+        
         <!--  Pressed state  -->
         <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover">
             <Setter Property="Background" Value="{DynamicResource TreeViewItemPressedBackground}" />
@@ -288,6 +287,12 @@
         <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
             <Setter Property="Background" Value="{DynamicResource TreeViewItemSelectedBackground}" />
         </Style>
+        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource TreeViewItemSelectedForeground}" />
+        </Style>
+        <Style Selector="^:selected /template/ ToggleButton#PART_ExpandCollapseChevron">
+            <Setter Property="Foreground" Value="{DynamicResource TreeViewItemSelectedForeground}" />
+        </Style>
 
         <!--  Disabled Selected state  -->
         <Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot">
diff --git a/src/Ursa.Themes.Semi/Controls/_index.axaml b/src/Ursa.Themes.Semi/Controls/_index.axaml
index 4ad1527..4129232 100644
--- a/src/Ursa.Themes.Semi/Controls/_index.axaml
+++ b/src/Ursa.Themes.Semi/Controls/_index.axaml
@@ -41,7 +41,6 @@
         <ResourceInclude Source="ScrollToButton.axaml" />
         <ResourceInclude Source="SelectionList.axaml" />
         <ResourceInclude Source="TagInput.axaml" />
-        <ResourceInclude Source="TextBox.axaml" />
         <ResourceInclude Source="ThemeSelector.axaml" />
         <ResourceInclude Source="TimePicker.axaml" />
         <ResourceInclude Source="TimeRangePicker.axaml" />
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/SelectionList.axaml b/src/Ursa.Themes.Semi/Themes/Dark/SelectionList.axaml
new file mode 100644
index 0000000..e6e712b
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Dark/SelectionList.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="#FF0A4694"></SolidColorBrush>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml b/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
index c32a707..f5ac324 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
@@ -1,4 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="ClosableTagBackground" Opacity="0.15" Color="#888D92" />
+    <SolidColorBrush x:Key="ClosableTagForeground" Color="#E6E8EA"/>
+    <SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.08" Color="White"/>
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/TimeBox.axaml b/src/Ursa.Themes.Semi/Themes/Dark/TimeBox.axaml
deleted file mode 100644
index 7caba95..0000000
--- a/src/Ursa.Themes.Semi/Themes/Dark/TimeBox.axaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="TimeBoxBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="TimeBoxPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="TimeBoxPressedBackground" Opacity="0.2" Color="White" />
-    <SolidColorBrush x:Key="TimeBoxBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TimeBoxDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="TimeBoxFocusBorderBrush" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="TimeBoxSelectionBrush" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="TimeBoxSelectionForeground" Color="White" />
-    <SolidColorBrush x:Key="TimeBoxCaretBrush" Color="White" />
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
index b0a949e..a3f9373 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
@@ -1,22 +1,22 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <MergeResourceInclude Source="Avatar.axaml" />
-        <MergeResourceInclude Source="Badge.axaml" />
-        <MergeResourceInclude Source="Banner.axaml" />
-        <MergeResourceInclude Source="ButtonGroup.axaml" />
-        <MergeResourceInclude Source="DatePicker.axaml" />
-        <MergeResourceInclude Source="Dialog.axaml" />
-        <MergeResourceInclude Source="Divider.axaml" />
-        <MergeResourceInclude Source="DualBadge.axaml" />
-        <MergeResourceInclude Source="Loading.axaml" />
-        <MergeResourceInclude Source="NavigationMenu.axaml" />
-        <MergeResourceInclude Source="NotificationShared.axaml" />
-        <MergeResourceInclude Source="Pagination.axaml" />
-        <MergeResourceInclude Source="Rating.axaml" />
-        <MergeResourceInclude Source="TagInput.axaml" />
-        <MergeResourceInclude Source="Timeline.axaml" />
-        <MergeResourceInclude Source="Toast.axaml" />
-        <MergeResourceInclude Source="Skeleton.axaml" />
-        <MergeResourceInclude Source="TimeBox.axaml" />
+        <ResourceInclude Source="Avatar.axaml" />
+        <ResourceInclude Source="Badge.axaml" />
+        <ResourceInclude Source="Banner.axaml" />
+        <ResourceInclude Source="ButtonGroup.axaml" />
+        <ResourceInclude Source="DatePicker.axaml" />
+        <ResourceInclude Source="Dialog.axaml" />
+        <ResourceInclude Source="Divider.axaml" />
+        <ResourceInclude Source="DualBadge.axaml" />
+        <ResourceInclude Source="Loading.axaml" />
+        <ResourceInclude Source="NavigationMenu.axaml" />
+        <ResourceInclude Source="NotificationShared.axaml" />
+        <ResourceInclude Source="Pagination.axaml" />
+        <ResourceInclude Source="Rating.axaml" />
+        <ResourceInclude Source="SelectionList.axaml" />
+        <ResourceInclude Source="TagInput.axaml" />
+        <ResourceInclude Source="Timeline.axaml" />
+        <ResourceInclude Source="Toast.axaml" />
+        <ResourceInclude Source="Skeleton.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </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
index 9031c4e..d4fd665 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
@@ -100,4 +100,21 @@
     <SolidColorBrush x:Key="DividerBorderBrush" Color="{StaticResource WindowTextColor}" />
     
     <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Color="{StaticResource WindowTextColor}" />
+    
+    <!-- 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}" />
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/SelectionList.axaml b/src/Ursa.Themes.Semi/Themes/Light/SelectionList.axaml
new file mode 100644
index 0000000..29352a5
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Light/SelectionList.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="#FFCBE7FE"></SolidColorBrush>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/TagInput.axaml b/src/Ursa.Themes.Semi/Themes/Light/TagInput.axaml
index c3b76e1..82f6160 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/TagInput.axaml
@@ -1,4 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="ClosableTagBackground" Color="White" />
+    <SolidColorBrush x:Key="ClosableTagForeground" Color="#2E3238"/>
+    <SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.08" Color="#1C1F23"/>
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/TimeBox.axaml b/src/Ursa.Themes.Semi/Themes/Light/TimeBox.axaml
deleted file mode 100644
index ed69375..0000000
--- a/src/Ursa.Themes.Semi/Themes/Light/TimeBox.axaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="TimeBoxBackground" Opacity="0.05" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="TimeBoxPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="TimeBoxPressedBackground" Opacity="0.13" Color="#FF2E3238" />
-    <SolidColorBrush x:Key="TimeBoxBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="TimeBoxDisabledBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="TimeBoxFocusBorderBrush" Color="#FF0077FA" />
-    <SolidColorBrush x:Key="TimeBoxSelectionBrush" Color="#FF0077FA" />
-    <SolidColorBrush x:Key="TimeBoxSelectionForeground" Color="White" />
-    <SolidColorBrush x:Key="TimeBoxCaretBrush" Color="Black" />
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
index 647f0c4..a3f9373 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
@@ -13,10 +13,10 @@
         <ResourceInclude Source="NotificationShared.axaml" />
         <ResourceInclude Source="Pagination.axaml" />
         <ResourceInclude Source="Rating.axaml" />
+        <ResourceInclude Source="SelectionList.axaml" />
         <ResourceInclude Source="TagInput.axaml" />
         <ResourceInclude Source="Timeline.axaml" />
         <ResourceInclude Source="Toast.axaml" />
         <ResourceInclude Source="Skeleton.axaml" />
-        <ResourceInclude Source="TimeBox.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/TagInput.axaml b/src/Ursa.Themes.Semi/Themes/Shared/TagInput.axaml
index bfc8451..c1a6071 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/TagInput.axaml
@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
     <StreamGeometry x:Key="ClosableTagCloseIconGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</StreamGeometry>
-    <x:Double x:Key="TagInputDefaultHeight">32</x:Double>
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/TimeBox.axaml b/src/Ursa.Themes.Semi/Themes/Shared/TimeBox.axaml
deleted file mode 100644
index fa6e5d9..0000000
--- a/src/Ursa.Themes.Semi/Themes/Shared/TimeBox.axaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <x:Double x:Key="TimeBoxDefaultMinHeight">32</x:Double>
-    <x:Double x:Key="TimeBoxSmallMinHeight">24</x:Double>
-    <x:Double x:Key="TimeBoxLargeMinHeight">40</x:Double>
-    <Thickness x:Key="TimeBoxBorderThickness">1</Thickness>
-    <CornerRadius x:Key="TimeBoxCornerRadius">3</CornerRadius>
-</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
index f735ed8..e6a449c 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
@@ -23,6 +23,5 @@
         <ResourceInclude Source="ThemeSelector.axaml" />
         <ResourceInclude Source="Toast.axaml" />
         <ResourceInclude Source="ToolBar.axaml" />
-        <ResourceInclude Source="TimeBox.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file

From 39be4fd1cd643bea60448d8b508694a29225c92d Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 3 Oct 2024 02:01:19 +0800
Subject: [PATCH 4/8] feat: improve date picker calendar view. add three more
 themes.

---
 demo/Ursa.Demo/App.axaml                          |  2 +-
 src/Ursa.Themes.Semi/Controls/Calendar.axaml      |  4 +++-
 src/Ursa.Themes.Semi/Index.axaml                  |  6 +++---
 .../Themes/HighContrast/Desert.axaml              | 15 +++++++++++++++
 .../Themes/HighContrast/Dusk.axaml                | 15 +++++++++++++++
 .../Themes/HighContrast/NightSky.axaml            | 15 +++++++++++++++
 6 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Desert.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Dusk.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/NightSky.axaml

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>

From dc200070394e8b0b0bad728fb930aa80aed79470 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 15 Oct 2024 16:03:42 +0800
Subject: [PATCH 5/8] misc: format codes.

---
 demo/Ursa.Demo/Ursa.Demo.csproj               |  6 ----
 src/Ursa.Themes.Semi/Controls/Banner.axaml    |  8 ++---
 .../Controls/Breadcrumb.axaml                 |  6 ++--
 .../Controls/ButtonGroup.axaml                |  8 ++---
 .../Controls/DisableContainer.axaml           |  2 +-
 src/Ursa.Themes.Semi/Controls/Divider.axaml   | 30 +++++++++----------
 src/Ursa.Themes.Semi/Controls/DualBadge.axaml | 26 ++++++++--------
 .../Controls/EnumSelector.axaml               |  4 +--
 src/Ursa.Themes.Semi/Controls/IPv4Box.axaml   |  4 +--
 .../Controls/IconButton.axaml                 |  2 +-
 .../Controls/KeyGestureInput.axaml            |  2 +-
 src/Ursa.Themes.Semi/Controls/Loading.axaml   |  2 +-
 .../Controls/MessageBox.axaml                 |  2 +-
 .../Controls/MultiComboBox.axaml              |  2 +-
 src/Ursa.Themes.Semi/Controls/NavMenu.axaml   | 26 ++++++++--------
 .../Controls/Pagination.axaml                 |  2 +-
 src/Ursa.Themes.Semi/Controls/PinCode.axaml   |  2 +-
 .../Controls/ScrollToButton.axaml             | 16 +++++-----
 .../Controls/SelectionList.axaml              |  2 +-
 src/Ursa.Themes.Semi/Controls/Skeleton.axaml  |  7 ++---
 src/Ursa.Themes.Semi/Controls/TagInput.axaml  |  2 +-
 .../Controls/ThemeSelector.axaml              | 12 ++++----
 src/Ursa.Themes.Semi/Controls/TimeBox.axaml   |  2 +-
 .../Controls/TimePicker.axaml                 |  3 +-
 src/Ursa.Themes.Semi/Controls/Timeline.axaml  |  8 ++---
 .../Controls/TreeComboBox.axaml               |  2 +-
 .../Themes/Dark/TagInput.axaml                |  6 ++--
 27 files changed, 92 insertions(+), 102 deletions(-)

diff --git a/demo/Ursa.Demo/Ursa.Demo.csproj b/demo/Ursa.Demo/Ursa.Demo.csproj
index 660a5d6..7bbad0a 100644
--- a/demo/Ursa.Demo/Ursa.Demo.csproj
+++ b/demo/Ursa.Demo/Ursa.Demo.csproj
@@ -30,10 +30,4 @@
     <ItemGroup>
       <Folder Include="Models\" />
     </ItemGroup>
-
-    <ItemGroup>
-      <Reference Include="Semi.Avalonia">
-        <HintPath>Assets\Semi.Avalonia.dll</HintPath>
-      </Reference>
-    </ItemGroup>
 </Project>
diff --git a/src/Ursa.Themes.Semi/Controls/Banner.axaml b/src/Ursa.Themes.Semi/Controls/Banner.axaml
index ff2767a..e69fc97 100644
--- a/src/Ursa.Themes.Semi/Controls/Banner.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Banner.axaml
@@ -4,10 +4,10 @@
     xmlns:u="https://irihi.tech/ursa">
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:Banner}" TargetType="u:Banner">
-        <Setter Property="u:Banner.BorderThickness" Value="{DynamicResource BannerBorderThickness}" />
-        <Setter Property="u:Banner.BorderBrush" Value="{DynamicResource BannerBorderBrush}" />
-        <Setter Property="u:Banner.HorizontalContentAlignment" Value="Center" />
-        <Setter Property="u:Banner.Template">
+        <Setter Property="BorderThickness" Value="{DynamicResource BannerBorderThickness}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource BannerBorderBrush}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:Banner">
                 <Border
                     Name="PART_Container"
diff --git a/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml b/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml
index 1851c5d..049157d 100644
--- a/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml
@@ -56,13 +56,13 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-            <Setter Property="Margin" Value="0 0 4 0"></Setter>
+            <Setter Property="Margin" Value="0 0 4 0" />
         </Style>
         <Style Selector="^ /template/ ContentPresenter#Separator">
-            <Setter Property="Margin" Value="4 0"></Setter>
+            <Setter Property="Margin" Value="4 0" />
         </Style>
         <Style Selector="^[IsReadOnly=False]">
-            <Setter Property="Cursor" Value="Hand"></Setter>
+            <Setter Property="Cursor" Value="Hand" />
         </Style>
         <Style Selector="^:last">
             <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
diff --git a/src/Ursa.Themes.Semi/Controls/ButtonGroup.axaml b/src/Ursa.Themes.Semi/Controls/ButtonGroup.axaml
index 06136d4..f2c197f 100644
--- a/src/Ursa.Themes.Semi/Controls/ButtonGroup.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ButtonGroup.axaml
@@ -16,13 +16,13 @@
         <Setter Property="Background" Value="{DynamicResource ButtonGroupDefaultBackground}" />
         <Setter Property="CornerRadius" Value="3" />
         <Setter Property="ClipToBounds" Value="True" />
-        <Setter Property="u:ButtonGroup.ItemContainerTheme" Value="{DynamicResource ButtonGroupItemTheme}" />
-        <Setter Property="u:ButtonGroup.ItemsPanel">
+        <Setter Property="ItemContainerTheme" Value="{DynamicResource ButtonGroupItemTheme}" />
+        <Setter Property="ItemsPanel">
             <ItemsPanelTemplate>
                 <StackPanel Orientation="Horizontal" />
             </ItemsPanelTemplate>
         </Setter>
-        <Setter Property="u:ButtonGroup.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:ButtonGroup">
                 <Border
                     Background="{TemplateBinding Background}"
@@ -43,7 +43,7 @@
         <Setter Property="Padding" Value="{DynamicResource ButtonGroupDefaultPadding}" />
         <Setter Property="FontWeight" Value="{DynamicResource ButtonGroupDefaultFontWeight}" />
         <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Button.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="Button">
                 <DockPanel LastChildFill="True">
                     <Rectangle
diff --git a/src/Ursa.Themes.Semi/Controls/DisableContainer.axaml b/src/Ursa.Themes.Semi/Controls/DisableContainer.axaml
index f6bccba..c84f36e 100644
--- a/src/Ursa.Themes.Semi/Controls/DisableContainer.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DisableContainer.axaml
@@ -7,7 +7,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DisableContainer">
                 <Panel>
-                    <ContentPresenter Content="{TemplateBinding Content}"></ContentPresenter>
+                    <ContentPresenter Content="{TemplateBinding Content}" />
                     <iri:PureRectangle Background="Transparent" IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.IsEnabled, Converter={x:Static BoolConverters.Not}}" Cursor="No" ToolTip.Tip="{TemplateBinding DisabledTip}"/>
                 </Panel>
             </ControlTemplate>
diff --git a/src/Ursa.Themes.Semi/Controls/Divider.axaml b/src/Ursa.Themes.Semi/Controls/Divider.axaml
index 2469b3b..9a8eda6 100644
--- a/src/Ursa.Themes.Semi/Controls/Divider.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Divider.axaml
@@ -9,28 +9,28 @@
     </Design.PreviewWith>
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="DividerLeftLine" TargetType="{x:Type Rectangle}">
-        <Setter Property="Rectangle.Fill" Value="{DynamicResource DividerBorderBrush}" />
-        <Setter Property="Rectangle.Height" Value="{DynamicResource SizeDividerWidth}" />
-        <Setter Property="Rectangle.MinWidth" Value="{DynamicResource SizeDividerLeftMinWidth}" />
+        <Setter Property="Fill" Value="{DynamicResource DividerBorderBrush}" />
+        <Setter Property="Height" Value="{DynamicResource SizeDividerWidth}" />
+        <Setter Property="MinWidth" Value="{DynamicResource SizeDividerLeftMinWidth}" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </ControlTheme>
 
     <ControlTheme x:Key="DividerRightLine" TargetType="{x:Type Rectangle}">
-        <Setter Property="Rectangle.Fill" Value="{DynamicResource DividerBorderBrush}" />
-        <Setter Property="Rectangle.Height" Value="{DynamicResource SizeDividerWidth}" />
-        <Setter Property="Rectangle.MinWidth" Value="{DynamicResource SizeDividerRightMinWidth}" />
+        <Setter Property="Fill" Value="{DynamicResource DividerBorderBrush}" />
+        <Setter Property="Height" Value="{DynamicResource SizeDividerWidth}" />
+        <Setter Property="MinWidth" Value="{DynamicResource SizeDividerRightMinWidth}" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </ControlTheme>
 
     <ControlTheme x:Key="DividerContentPresenter" TargetType="{x:Type ContentPresenter}">
-        <Setter Property="ContentPresenter.Content" Value="{TemplateBinding Content}" />
-        <Setter Property="ContentPresenter.Background" Value="{TemplateBinding Background}" />
-        <Setter Property="TextElement.Foreground" Value="{TemplateBinding Foreground}" />
-        <Setter Property="ContentPresenter.ContentTemplate" Value="{TemplateBinding ContentTemplate}" />
-        <Setter Property="TextElement.FontFamily" Value="{TemplateBinding FontFamily}" />
-        <Setter Property="TextElement.FontWeight" Value="{TemplateBinding FontWeight}" />
-        <Setter Property="TextElement.FontSize" Value="{TemplateBinding FontSize}" />
-        <Setter Property="ContentPresenter.Margin" Value="{DynamicResource ThicknessDividerTextMargin}" />
+        <Setter Property="Content" Value="{TemplateBinding Content}" />
+        <Setter Property="Background" Value="{TemplateBinding Background}" />
+        <Setter Property="Foreground" Value="{TemplateBinding Foreground}" />
+        <Setter Property="ContentTemplate" Value="{TemplateBinding ContentTemplate}" />
+        <Setter Property="FontFamily" Value="{TemplateBinding FontFamily}" />
+        <Setter Property="FontWeight" Value="{TemplateBinding FontWeight}" />
+        <Setter Property="FontSize" Value="{TemplateBinding FontSize}" />
+        <Setter Property="Margin" Value="{DynamicResource ThicknessDividerTextMargin}" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </ControlTheme>
 
@@ -123,4 +123,4 @@
             </Setter>
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
index 9a9e949..79859b1 100644
--- a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
@@ -4,19 +4,19 @@
     xmlns:u="https://irihi.tech/ursa"
     xmlns:converters="clr-namespace:Ursa.Converters;assembly=Ursa">
     <ControlTheme x:Key="{x:Type u:DualBadge}" TargetType="u:DualBadge">
-        <Setter Property="u:DualBadge.CornerRadius" Value="{DynamicResource DualBadgeDefaultCornerRadius}" />
-        <Setter Property="u:DualBadge.FontSize" Value="{DynamicResource DualBadgeDefaultFontSize}" />
-        <Setter Property="u:DualBadge.IconForeground" Value="{DynamicResource DualBadgeDefaultIconForeground}" />
-        <Setter Property="u:DualBadge.HeaderForeground" Value="{DynamicResource DualBadgeDefaultHeaderForeground}" />
-        <Setter Property="u:DualBadge.HeaderBackground" Value="{DynamicResource DualBadgeDefaultHeaderBackground}" />
-        <Setter Property="u:DualBadge.Foreground" Value="{DynamicResource DualBadgeDefaultForeground}" />
-        <Setter Property="u:DualBadge.Background" Value="{DynamicResource DualBadgeFlatGreenBackground}" />
-        <Setter Property="u:DualBadge.ClipToBounds" Value="{DynamicResource DualBadgeDefaultClipToBounds}" />
-        <Setter Property="u:DualBadge.HorizontalAlignment" Value="{DynamicResource DualBadgeDefaultHorizontalAlignment}" />
-        <Setter Property="u:DualBadge.VerticalAlignment" Value="{DynamicResource DualBadgeDefaultVerticalAlignment}" />
-        <Setter Property="u:DualBadge.UseLayoutRounding" Value="{DynamicResource DualBadgeDefaultUseLayoutRounding}" />
-        <Setter Property="u:DualBadge.Padding" Value="{DynamicResource DualBadgeDefaultPadding}" />
-        <Setter Property="u:DualBadge.Template">
+        <Setter Property="CornerRadius" Value="{DynamicResource DualBadgeDefaultCornerRadius}" />
+        <Setter Property="FontSize" Value="{DynamicResource DualBadgeDefaultFontSize}" />
+        <Setter Property="IconForeground" Value="{DynamicResource DualBadgeDefaultIconForeground}" />
+        <Setter Property="HeaderForeground" Value="{DynamicResource DualBadgeDefaultHeaderForeground}" />
+        <Setter Property="HeaderBackground" Value="{DynamicResource DualBadgeDefaultHeaderBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource DualBadgeDefaultForeground}" />
+        <Setter Property="Background" Value="{DynamicResource DualBadgeFlatGreenBackground}" />
+        <Setter Property="ClipToBounds" Value="{DynamicResource DualBadgeDefaultClipToBounds}" />
+        <Setter Property="HorizontalAlignment" Value="{DynamicResource DualBadgeDefaultHorizontalAlignment}" />
+        <Setter Property="VerticalAlignment" Value="{DynamicResource DualBadgeDefaultVerticalAlignment}" />
+        <Setter Property="UseLayoutRounding" Value="{DynamicResource DualBadgeDefaultUseLayoutRounding}" />
+        <Setter Property="Padding" Value="{DynamicResource DualBadgeDefaultPadding}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="{x:Type u:DualBadge}">
                 <Border
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
diff --git a/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml b/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml
index 163b6ee..c7f4153 100644
--- a/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml
+++ b/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml
@@ -19,14 +19,14 @@
         <Style Selector="^[DisplayDescription=True] /template/ ComboBox">
             <Setter Property="ItemTemplate">
                 <DataTemplate x:DataType="u:EnumItemTuple">
-                    <TextBlock Text="{Binding DisplayName}"></TextBlock>
+                    <TextBlock Text="{Binding DisplayName}" />
                 </DataTemplate>
             </Setter>
         </Style>
         <Style Selector="^[DisplayDescription=False] /template/ ComboBox">
             <Setter Property="ItemTemplate">
                 <DataTemplate x:DataType="u:EnumItemTuple">
-                    <TextBlock Text="{Binding Value}"></TextBlock>
+                    <TextBlock Text="{Binding Value}" />
                 </DataTemplate>
             </Setter>
         </Style>
diff --git a/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml b/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml
index 636a707..3dfbe75 100644
--- a/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml
+++ b/src/Ursa.Themes.Semi/Controls/IPv4Box.axaml
@@ -43,8 +43,8 @@
         <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
         <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
         <Setter Property="ContextFlyout" Value="{DynamicResource IPv4BoxMenuFlyout}" />
-        <Setter Property="FocusAdorner" Value="{x:Null}"></Setter>
-        <Setter Property="u:IPv4Box.Template">
+        <Setter Property="FocusAdorner" Value="{x:Null}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:IPv4Box">
                 <Border
                     Name="PART_Border"
diff --git a/src/Ursa.Themes.Semi/Controls/IconButton.axaml b/src/Ursa.Themes.Semi/Controls/IconButton.axaml
index e2706ab..42ea23a 100644
--- a/src/Ursa.Themes.Semi/Controls/IconButton.axaml
+++ b/src/Ursa.Themes.Semi/Controls/IconButton.axaml
@@ -109,7 +109,7 @@
         </Style>
         
         <Style Selector="^:empty[IsLoading=False] /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Margin" Value="0"></Setter>
+            <Setter Property="Margin" Value="0" />
         </Style>
 
         <Style Selector="^:right">
diff --git a/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml b/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
index c8865d5..62d013d 100644
--- a/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
+++ b/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
@@ -12,7 +12,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
         <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
-        <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="8 0" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:KeyGestureInput">
diff --git a/src/Ursa.Themes.Semi/Controls/Loading.axaml b/src/Ursa.Themes.Semi/Controls/Loading.axaml
index be8337c..db54627 100644
--- a/src/Ursa.Themes.Semi/Controls/Loading.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Loading.axaml
@@ -7,7 +7,7 @@
     <!--  Add Resources Here  -->
     <converters:BrushToColorConverter x:Key="BrushToColorConverter" />
     <ControlTheme x:Key="{x:Type u:LoadingIcon}" TargetType="u:LoadingIcon">
-        <Setter Property="IsLoading" Value="True"></Setter>
+        <Setter Property="IsLoading" Value="True" />
         <Setter Property="Foreground" Value="{DynamicResource LoadingIconForeground}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:LoadingIcon">
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index 481096a..a9cf981 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -155,7 +155,7 @@
     <ControlTheme x:Key="{x:Type u:MessageBoxControl}" TargetType="u:MessageBoxControl">
         <Setter Property="CornerRadius" Value="12" />
         <Setter Property="Padding" Value="48 24" />
-        <Setter Property="u:DialogControlBase.CanDragMove" Value="True"></Setter>
+        <Setter Property="u:DialogControlBase.CanDragMove" Value="True" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:MessageBoxControl">
                 <Border
diff --git a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
index d5ec4cd..aacc0c7 100644
--- a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml
@@ -11,7 +11,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="MaxDropdownHeight" Value="300" />
-        <Setter Property="MaxSelectionBoxHeight" Value="270"></Setter>
+        <Setter Property="MaxSelectionBoxHeight" Value="270" />
         <Setter Property="MinHeight" Value="32" />
         <Setter Property="Padding" Value="12 4" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/Ursa.Themes.Semi/Controls/NavMenu.axaml b/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
index 1d83c3d..273c5f3 100644
--- a/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
+++ b/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
@@ -19,11 +19,10 @@
                         HorizontalAlignment="Stretch"
                         HorizontalScrollBarVisibility="Disabled"
                         AllowAutoHide="True"
-                        
                         VerticalScrollBarVisibility="Auto">
                         <ScrollViewer.Styles>
                             <Style Selector="ScrollViewer /template/ ScrollBar">
-                                <Setter Property="Opacity" Value="0"></Setter>
+                                <Setter Property="Opacity" Value="0" />
                             </Style>
                             <Style Selector="ScrollViewer:pointerover">
                                 <Style Selector="^ /template/ ScrollBar#PART_HorizontalScrollBar">
@@ -40,11 +39,11 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:not(:horizontal-collapsed)">
-            <Setter Property="Width" Value="{Binding $self.ExpandWidth}"></Setter>
+            <Setter Property="Width" Value="{Binding $self.ExpandWidth}" />
         </Style>
         <Style Selector="^:horizontal-collapsed">
             <Setter Property="Width" Value="{Binding $self.CollapseWidth}" />
-            <Setter Property="Grid.IsSharedSizeScope" Value="False"></Setter>
+            <Setter Property="Grid.IsSharedSizeScope" Value="False" />
         </Style>
     </ControlTheme>
 
@@ -150,10 +149,10 @@
         </Setter>
         <Setter Property="Template" Value="{StaticResource DefaultNavMenuItemTemplate}" />
         <Style Selector="^:selected">
-            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}"></Setter>
+            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}" />
             <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}"></Setter>
+                <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}" />
                 <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedPointeroverBackground}" />
             </Style>
         </Style>
@@ -176,9 +175,10 @@
         <Style Selector="^:horizontal-collapsed:first-level">
             <Setter Property="HorizontalAlignment" Value="Stretch" />
             <Style Selector="^ /template/ Border#PART_Border">
-                <Setter Property="ToolTip.Tip" >
+                <Setter Property="ToolTip.Tip">
                     <Template>
-                        <ContentPresenter Content="{TemplateBinding u:NavMenuItem.Header}" ContentTemplate="{TemplateBinding u:NavMenuItem.HeaderTemplate}"></ContentPresenter>
+                        <ContentPresenter Content="{TemplateBinding u:NavMenuItem.Header}"
+                                          ContentTemplate="{TemplateBinding u:NavMenuItem.HeaderTemplate}" />
                     </Template>
                 </Setter>
                 <Setter Property="ToolTip.ShowDelay" Value="0" />
@@ -208,7 +208,7 @@
             </Style>
         </Style>
         <Style Selector="^:horizontal-collapsed:first-level">
-            <Setter Property="Grid.IsSharedSizeScope" Value="True"></Setter>
+            <Setter Property="Grid.IsSharedSizeScope" Value="True" />
         </Style>
         <Style Selector="^[IsSeparator=True]">
             <Setter Property="Template">
@@ -224,11 +224,11 @@
                             Content="{TemplateBinding Header}"
                             ContentTemplate="{TemplateBinding HeaderTemplate}"
                             Foreground="{DynamicResource TextBlockQuaternaryForeground}"
-                            IsVisible="{TemplateBinding Header,
-                                                        Converter={x:Static ObjectConverters.IsNotNull}}">
+                            IsVisible="{TemplateBinding Header, Converter={x:Static ObjectConverters.IsNotNull}}">
                             <ContentPresenter.Styles>
                                 <Style Selector="TextBlock">
-                                    <Setter Property="FontSize" Value="{DynamicResource NavigationMenuSeparatorHeaderFontSize}" />
+                                    <Setter Property="FontSize"
+                                            Value="{DynamicResource NavigationMenuSeparatorHeaderFontSize}" />
                                 </Style>
                             </ContentPresenter.Styles>
                         </ContentPresenter>
@@ -254,4 +254,4 @@
         </Style>
     </ControlTheme>
 
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/Pagination.axaml b/src/Ursa.Themes.Semi/Controls/Pagination.axaml
index 6b2eeca..558bede 100644
--- a/src/Ursa.Themes.Semi/Controls/Pagination.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Pagination.axaml
@@ -52,7 +52,7 @@
     </ControlTheme>
 
     <ControlTheme x:Key="TinyPagination" TargetType="{x:Type u:Pagination}">
-        <Setter Property="DisplayCurrentPageInQuickJumper" Value="True"></Setter>
+        <Setter Property="DisplayCurrentPageInQuickJumper" Value="True" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:Pagination">
                 <StackPanel Orientation="Horizontal">
diff --git a/src/Ursa.Themes.Semi/Controls/PinCode.axaml b/src/Ursa.Themes.Semi/Controls/PinCode.axaml
index 5fcb719..e7b0066 100644
--- a/src/Ursa.Themes.Semi/Controls/PinCode.axaml
+++ b/src/Ursa.Themes.Semi/Controls/PinCode.axaml
@@ -11,7 +11,7 @@
         <Setter Property="Width" Value="{DynamicResource TextBoxDefaultHeight}" />
         <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
         <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}"></Setter>
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
         <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
         <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="Template">
diff --git a/src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml b/src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml
index dc205d0..e0859d3 100644
--- a/src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml
@@ -6,7 +6,7 @@
     <ControlTheme x:Key="{x:Type u:ScrollToButton}" TargetType="u:ScrollToButton">
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Bottom" />
-        <Setter Property="Cursor" Value="Hand"></Setter>
+        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Margin" Value="0, 0, 16, 16" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ScrollToButton">
@@ -36,13 +36,13 @@
             <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
         <Style Selector="^[Direction=Right] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(90deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(90deg)" />
         </Style>
         <Style Selector="^[Direction=Bottom] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(180deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(180deg)" />
         </Style>
         <Style Selector="^[Direction=Left] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(270deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(270deg)" />
         </Style>
     </ControlTheme>
     
@@ -50,7 +50,7 @@
     <ControlTheme x:Key="PrimaryScrollToButton" TargetType="u:ScrollToButton">
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Bottom" />
-        <Setter Property="Cursor" Value="Hand"></Setter>
+        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Margin" Value="0, 0, 16, 16" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ScrollToButton">
@@ -80,13 +80,13 @@
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
         </Style>
         <Style Selector="^[Direction=Right] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(90deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(90deg)" />
         </Style>
         <Style Selector="^[Direction=Bottom] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(180deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(180deg)" />
         </Style>
         <Style Selector="^[Direction=Left] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(270deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(270deg)" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/SelectionList.axaml b/src/Ursa.Themes.Semi/Controls/SelectionList.axaml
index e41ca89..b647d58 100644
--- a/src/Ursa.Themes.Semi/Controls/SelectionList.axaml
+++ b/src/Ursa.Themes.Semi/Controls/SelectionList.axaml
@@ -14,7 +14,7 @@
                     Theme="{DynamicResource CardBorder}" />
             </Template>
         </Setter>
-        <Setter Property="ListBox.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:SelectionList">
                 <Border
                     Name="border"
diff --git a/src/Ursa.Themes.Semi/Controls/Skeleton.axaml b/src/Ursa.Themes.Semi/Controls/Skeleton.axaml
index f515183..e36451d 100644
--- a/src/Ursa.Themes.Semi/Controls/Skeleton.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Skeleton.axaml
@@ -30,14 +30,11 @@
                             Classes.Active="{Binding Path= IsActive, RelativeSource={RelativeSource TemplatedParent}}"
                             IsHitTestVisible="{TemplateBinding IsLoading}"
                             Background="{DynamicResource SkeletonDefaultBackground}"
-                            IsVisible="{TemplateBinding IsLoading}">
-                        </iri:PureRectangle>
+                            IsVisible="{TemplateBinding IsLoading}" />
                         <iri:PureRectangle
                             x:Name="PART_ActiveBorder"
                             IsHitTestVisible="{TemplateBinding IsLoading}"
-                            IsVisible="{TemplateBinding IsLoading}"
-                            >
-                        </iri:PureRectangle>
+                            IsVisible="{TemplateBinding IsLoading}" />
                     </Panel>
                 </Border>
             </ControlTemplate>
diff --git a/src/Ursa.Themes.Semi/Controls/TagInput.axaml b/src/Ursa.Themes.Semi/Controls/TagInput.axaml
index 40ef851..e3a8732 100644
--- a/src/Ursa.Themes.Semi/Controls/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TagInput.axaml
@@ -49,7 +49,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:empty /template/ TextBlock#PART_Watermark">
-            <Setter Property="IsVisible" Value="True"></Setter>
+            <Setter Property="IsVisible" Value="True" />
         </Style>
         <Style Selector="^:pointerover /template/ Border#PART_BackgroundBorder">
             <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
diff --git a/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml b/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
index 228b4cb..7968a38 100644
--- a/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
@@ -20,16 +20,16 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:dark /template/ PathIcon#PART_Icon">
-            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDarkGlyph}"></Setter>
-            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_DARK}"></Setter>
+            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDarkGlyph}" />
+            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_DARK}" />
         </Style>
         <Style Selector="^:light /template/ PathIcon#PART_Icon">
-            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonLightGlyph}"></Setter>
-            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_LIGHT}"></Setter>
+            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonLightGlyph}" />
+            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_LIGHT}" />
         </Style>
         <Style Selector="^ /template/ PathIcon#PART_Icon">
-            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDefaultGlyph}"></Setter>
-            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_SYSTEM}"></Setter>
+            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDefaultGlyph}" />
+            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_SYSTEM}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/TimeBox.axaml b/src/Ursa.Themes.Semi/Controls/TimeBox.axaml
index 0eed466..d19e56e 100644
--- a/src/Ursa.Themes.Semi/Controls/TimeBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TimeBox.axaml
@@ -150,7 +150,7 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:focus-within">
-            <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:disabled">
             <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
diff --git a/src/Ursa.Themes.Semi/Controls/TimePicker.axaml b/src/Ursa.Themes.Semi/Controls/TimePicker.axaml
index 61661c2..411df8e 100644
--- a/src/Ursa.Themes.Semi/Controls/TimePicker.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TimePicker.axaml
@@ -133,8 +133,7 @@
                                 InnerRightContent="{TemplateBinding InnerRightContent}"
                                 IsReadOnly="{TemplateBinding IsReadonly}"
                                 Theme="{DynamicResource LooklessTextBox}"
-                                Watermark="{TemplateBinding Watermark}">
-                            </TextBox>
+                                Watermark="{TemplateBinding Watermark}" />
                             <Button
                                 Name="ClearButton"
                                 Grid.Column="1"
diff --git a/src/Ursa.Themes.Semi/Controls/Timeline.axaml b/src/Ursa.Themes.Semi/Controls/Timeline.axaml
index b82087f..0d68e5c 100644
--- a/src/Ursa.Themes.Semi/Controls/Timeline.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Timeline.axaml
@@ -34,7 +34,7 @@
     <ControlTheme x:Key="{x:Type u:TimelineItem}" TargetType="u:TimelineItem">
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="u:TimelineItem.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:TimelineItem">
                 <Grid
                     Name="PART_RootGrid"
@@ -148,7 +148,7 @@
                 <Setter Property="Grid.Column" Value="2" />
                 <Setter Property="TextAlignment" Value="Left" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="Margin" Value="8 2 8 12"></Setter>
+                <Setter Property="Margin" Value="8 2 8 12" />
             </Style>
         </Style>
         <Style Selector="^:all-right">
@@ -169,7 +169,7 @@
                 <Setter Property="Grid.Column" Value="0" />
                 <Setter Property="TextAlignment" Value="Right" />
                 <Setter Property="HorizontalAlignment" Value="Right" />
-                <Setter Property="Margin" Value="8 2 8 12"></Setter>
+                <Setter Property="Margin" Value="8 2 8 12" />
             </Style>
         </Style>
         <Style Selector="^:separate">
@@ -184,7 +184,7 @@
                 <Setter Property="Grid.Column" Value="2" />
                 <Setter Property="HorizontalContentAlignment" Value="Left" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="Margin" Value="8 2 8 12"></Setter>
+                <Setter Property="Margin" Value="8 2 8 12" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_Time">
                 <Setter Property="Grid.Row" Value="0" />
diff --git a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
index e5211dc..f690e66 100644
--- a/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TreeComboBox.axaml
@@ -269,7 +269,7 @@
         <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover">
             <Setter Property="Background" Value="{DynamicResource TreeViewItemPointeroverBackground}" />
         </Style>
-        
+
         <!--  Pressed state  -->
         <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover">
             <Setter Property="Background" Value="{DynamicResource TreeViewItemPressedBackground}" />
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml b/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
index f5ac324..a6ba2d4 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="ClosableTagBackground" Opacity="0.15" Color="#888D92" />
-    <SolidColorBrush x:Key="ClosableTagForeground" Color="#E6E8EA"/>
-    <SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.08" Color="White"/>
-</ResourceDictionary>
+    <SolidColorBrush x:Key="ClosableTagForeground" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.08" Color="White" />
+</ResourceDictionary>
\ No newline at end of file

From ec1028fcc80af55d5f3452269d77dc82feb92214 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 16 Oct 2024 20:36:13 +0800
Subject: [PATCH 6/8] feat: add Theme Selector.

---
 demo/Ursa.Demo/App.axaml                      |  6 ++--
 .../Converters/IconNameToPathConverter.cs     |  6 ++--
 .../Ursa.Demo/ViewModels/MainViewViewModel.cs | 36 ++++++++++++++++++-
 demo/Ursa.Demo/Views/MainView.axaml           | 36 +++++++++++++++++--
 4 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/demo/Ursa.Demo/App.axaml b/demo/Ursa.Demo/App.axaml
index 9efa394..ed45456 100644
--- a/demo/Ursa.Demo/App.axaml
+++ b/demo/Ursa.Demo/App.axaml
@@ -1,11 +1,9 @@
 <Application
     x:Class="Ursa.Demo.App"
     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.Desert}"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:semi="https://irihi.tech/semi"
-    xmlns:demo="clr-namespace:Ursa.Demo">
+    xmlns:u-semi="https://irihi.tech/ursa/themes/semi">
     <Application.Styles>
         <semi:SemiTheme Locale="zh-CN" />
         <u-semi:SemiTheme Locale="zh-CN" />
diff --git a/demo/Ursa.Demo/Converters/IconNameToPathConverter.cs b/demo/Ursa.Demo/Converters/IconNameToPathConverter.cs
index d9e2a08..20fb94b 100644
--- a/demo/Ursa.Demo/Converters/IconNameToPathConverter.cs
+++ b/demo/Ursa.Demo/Converters/IconNameToPathConverter.cs
@@ -8,8 +8,8 @@ namespace Ursa.Demo.Converters;
 
 public class IconNameToPathConverter: IValueConverter
 {
-    private readonly string[] _paths = new[]
-    {
+    private readonly string[] _paths =
+    [
         "M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z",
         "M16 12L9 2L2 12H3.86L0 18H7V22H11V18H18L14.14 12H16M20.14 12H22L15 2L12.61 5.41L17.92 13H15.97L19.19 18H24L20.14 12M13 19H17V22H13V19Z",
         "M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z",
@@ -17,7 +17,7 @@ public class IconNameToPathConverter: IValueConverter
         "M16,9V7H12V12.5C11.58,12.19 11.07,12 10.5,12A2.5,2.5 0 0,0 8,14.5A2.5,2.5 0 0,0 10.5,17A2.5,2.5 0 0,0 13,14.5V9H16M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2Z",
         "M16.67,4H15V2H9V4H7.33A1.33,1.33 0 0,0 6,5.33V20.67C6,21.4 6.6,22 7.33,22H16.67A1.33,1.33 0 0,0 18,20.67V5.33C18,4.6 17.4,4 16.67,4Z",
         "M12 2C6.5 2 2 6.5 2 12C2 17.5 6.5 22 12 22C17.5 22 22 17.5 22 12S17.5 2 12 2M12.5 13H11V7H12.5V11.3L16.2 9.2L17 10.5L12.5 13Z"
-    };
+    ];
     public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
         if (value is int i)
diff --git a/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs b/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
index 5470207..24a21a6 100644
--- a/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
@@ -1,9 +1,14 @@
 using System;
+using System.Collections.ObjectModel;
+using Avalonia;
+using Avalonia.Styling;
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
+using Semi.Avalonia;
 
 namespace Ursa.Demo.ViewModels;
 
-public class MainViewViewModel : ViewModelBase
+public partial class MainViewViewModel : ViewModelBase
 {
     public MenuViewModel Menus { get; set; } = new MenuViewModel();
 
@@ -75,4 +80,33 @@ public class MainViewViewModel : ViewModelBase
             _ => throw new ArgumentOutOfRangeException(nameof(s), s, null)
         };
     }
+
+    public ObservableCollection<ThemeItem> Themes { get; } =
+    [
+        new("Default", ThemeVariant.Default),
+        new("Light", ThemeVariant.Light),
+        new("Dark", ThemeVariant.Dark),
+        new("Aquatic", SemiTheme.Aquatic),
+        new("Desert", SemiTheme.Desert),
+        new("Dust", SemiTheme.Dust),
+        new("NightSky", SemiTheme.NightSky)
+    ];
+
+    [ObservableProperty] private ThemeItem? _selectedTheme;
+
+    partial void OnSelectedThemeChanged(ThemeItem? oldValue, ThemeItem? newValue)
+    {
+        if (newValue is null) return;
+        var app = Application.Current;
+        if (app is not null)
+        {
+            app.RequestedThemeVariant = newValue.Theme;
+        }
+    }
+}
+
+public class ThemeItem(string name, ThemeVariant theme)
+{
+    public string Name { get; set; } = name;
+    public ThemeVariant Theme { get; set; } = theme;
 }
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Views/MainView.axaml b/demo/Ursa.Demo/Views/MainView.axaml
index 65a654a..9aea83a 100644
--- a/demo/Ursa.Demo/Views/MainView.axaml
+++ b/demo/Ursa.Demo/Views/MainView.axaml
@@ -18,6 +18,7 @@
     </Design.DataContext>
     <UserControl.Resources>
         <converters:IconNameToPathConverter x:Key="IconConverter" />
+        <StreamGeometry x:Key="SettingIcon">M7.99973 5.07197C7.19713 5.53535 6.20729 5.53113 5.40866 5.06092L5.1637 4.91669C4.55751 4.55978 3.77662 4.65563 3.34264 5.20927C2.69567 6.03462 2.17585 6.94251 1.79166 7.90124C1.53027 8.55354 1.83733 9.27693 2.449 9.62286L2.69407 9.76145C3.50107 10.2178 4.00002 11.0732 4.00002 12.0003C4.00002 12.9271 3.50145 13.7822 2.69492 14.2387L2.44842 14.3783C1.83596 14.725 1.52888 15.4497 1.79213 16.1024C1.98358 16.577 2.21048 17.044 2.47374 17.5C2.73723 17.9564 3.0285 18.3868 3.34416 18.7902C3.77773 19.3443 4.5588 19.4406 5.16498 19.0834L5.40839 18.9399C6.20714 18.4692 7.19739 18.4648 8.0003 18.9284C8.80291 19.3918 9.29417 20.2511 9.28627 21.1778L9.28386 21.4601C9.27787 22.1629 9.75107 22.7906 10.4468 22.8903C11.4692 23.0368 12.5154 23.0404 13.5537 22.8927C14.2499 22.7936 14.7231 22.1653 14.7169 21.462L14.7143 21.1785C14.7061 20.2514 15.1974 19.3916 16.0003 18.928C16.8029 18.4647 17.7927 18.4689 18.5914 18.9391L18.8363 19.0833C19.4425 19.4402 20.2234 19.3444 20.6574 18.7907C21.3044 17.9654 21.8242 17.0575 22.2084 16.0988C22.4698 15.4465 22.1627 14.7231 21.551 14.3772L21.306 14.2386C20.499 13.7822 20 12.9268 20 11.9997C20 11.0729 20.4986 10.2178 21.3051 9.76126L21.5516 9.62174C22.1641 9.27506 22.4712 8.55029 22.2079 7.89761C22.0165 7.42297 21.7896 6.95598 21.5263 6.50001C21.2628 6.04362 20.9715 5.61325 20.6559 5.20982C20.2223 4.65568 19.4412 4.55944 18.8351 4.91665L18.5916 5.06009C17.7929 5.53078 16.8026 5.53519 15.9997 5.07163C15.1971 4.60825 14.7059 3.74891 14.7138 2.82218L14.7162 2.53994C14.7222 1.83708 14.249 1.20945 13.5532 1.10973C12.5308 0.963214 11.4846 0.959581 10.4464 1.10733C9.75011 1.20641 9.27691 1.83473 9.28317 2.53798L9.28569 2.82154C9.29395 3.74862 8.80264 4.60841 7.99973 5.07197ZM14 15.4641C15.9132 14.3595 16.5687 11.9132 15.4641 9.99999C14.3595 8.08682 11.9132 7.43132 10 8.53589C8.08684 9.64046 7.43134 12.0868 8.53591 14C9.64048 15.9132 12.0868 16.5687 14 15.4641Z</StreamGeometry>
     </UserControl.Resources>
     <Panel>
         <Panel.Styles>
@@ -27,7 +28,7 @@
         </Panel.Styles>
         <Grid
             Classes.Blur="{Binding $parent[u:UrsaWindow].(u:OverlayDialogHost.IsInModalStatus)}"
-            ColumnDefinitions="Auto, *" >
+            ColumnDefinitions="Auto, *">
             <Border
                 Padding="8 4"
                 VerticalAlignment="Stretch"
@@ -63,7 +64,7 @@
                                     Margin="8,0,0,0"
                                     HorizontalAlignment="Left"
                                     IsVisible="{Binding Status, Converter={x:Static ObjectConverters.IsNotNull}}"
-                                    Header="{Binding Status}"/>
+                                    Header="{Binding Status}" />
                             </StackPanel>
                         </DataTemplate>
                     </u:NavMenu.HeaderTemplate>
@@ -85,6 +86,35 @@
                                 Theme="{DynamicResource TitleTextBlock}" />
                         </DockPanel>
                     </u:NavMenu.Header>
+                    <u:NavMenu.Footer>
+                        <u:IconButton
+                            Theme="{DynamicResource BorderlessIconButton}"
+                            Classes="Tertiary"
+                            HorizontalAlignment="Stretch">
+                            <TextBlock
+                                Text="Settings"
+                                IsVisible="{Binding !#menu.IsHorizontalCollapsed}" />
+                            <u:IconButton.Icon>
+                                <PathIcon
+                                    Width="16"
+                                    Height="16"
+                                    Data="{StaticResource SettingIcon}" />
+                            </u:IconButton.Icon>
+                            <Button.Flyout>
+                                <Flyout Placement="RightEdgeAlignedBottom">
+                                    <u:Form LabelPosition="Left">
+                                        <ComboBox
+                                            u:FormItem.Label="ThemeVariant"
+                                            MinWidth="100"
+                                            PlaceholderText="Select a theme"
+                                            DisplayMemberBinding="{Binding Name}"
+                                            ItemsSource="{Binding Themes}"
+                                            SelectedItem="{Binding SelectedTheme}" />
+                                    </u:Form>
+                                </Flyout>
+                            </Button.Flyout>
+                        </u:IconButton>
+                    </u:NavMenu.Footer>
                 </u:NavMenu>
             </Border>
             <ContentControl
@@ -97,4 +127,4 @@
             </ContentControl>
         </Grid>
     </Panel>
-</UserControl>
+</UserControl>
\ No newline at end of file

From 41b11bba441fe61ac3ee5fb6e0750a690414033f Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 16 Oct 2024 20:39:51 +0800
Subject: [PATCH 7/8] feat: extract Semi Resources.

---
 demo/Ursa.Demo/Pages/FormDemo.axaml           |  2 +-
 .../Controls/Breadcrumb.axaml                 | 18 +++---
 src/Ursa.Themes.Semi/Controls/Clock.axaml     | 10 ++--
 src/Ursa.Themes.Semi/Controls/Form.axaml      |  6 +-
 src/Ursa.Themes.Semi/Controls/NavMenu.axaml   |  2 +-
 src/Ursa.Themes.Semi/Controls/Timeline.axaml  |  2 +-
 src/Ursa.Themes.Semi/Controls/ToolBar.axaml   |  6 +-
 .../Controls/TwoTonePathIcon.axaml            |  8 +--
 .../Themes/Dark/Breadcrumb.axaml              |  6 ++
 src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml  |  7 +++
 src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml |  8 +--
 src/Ursa.Themes.Semi/Themes/Dark/Form.axaml   |  4 ++
 .../Themes/Dark/NavigationMenu.axaml          |  2 +-
 .../Themes/Dark/Timeline.axaml                |  4 +-
 .../Themes/Dark/ToolBar.axaml                 |  4 ++
 .../Themes/Dark/TwoTonePathIcon.axaml         |  6 ++
 src/Ursa.Themes.Semi/Themes/Dark/_index.axaml |  7 ++-
 .../Themes/HighContrast/Base.axaml            | 60 +++++++++++++------
 .../Themes/Light/Breadcrumb.axaml             |  6 ++
 src/Ursa.Themes.Semi/Themes/Light/Clock.axaml |  7 +++
 .../Themes/Light/Dialog.axaml                 |  8 +--
 src/Ursa.Themes.Semi/Themes/Light/Form.axaml  |  4 ++
 .../Themes/Light/NavigationMenu.axaml         |  2 +-
 .../Themes/Light/Timeline.axaml               |  4 +-
 .../Themes/Light/ToolBar.axaml                |  4 ++
 .../Themes/Light/TwoTonePathIcon.axaml        |  6 ++
 .../Themes/Light/_index.axaml                 |  7 ++-
 27 files changed, 146 insertions(+), 64 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Themes/Dark/Breadcrumb.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Dark/Form.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Dark/ToolBar.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Dark/TwoTonePathIcon.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Light/Breadcrumb.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Light/Clock.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Light/Form.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Light/ToolBar.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Light/TwoTonePathIcon.axaml

diff --git a/demo/Ursa.Demo/Pages/FormDemo.axaml b/demo/Ursa.Demo/Pages/FormDemo.axaml
index a6752e5..a4a4c8d 100644
--- a/demo/Ursa.Demo/Pages/FormDemo.axaml
+++ b/demo/Ursa.Demo/Pages/FormDemo.axaml
@@ -16,7 +16,7 @@
         <StackPanel HorizontalAlignment="Left" Margin="24  0 0 0 ">
             <u:Divider Content="Simple Form"/>
             <u:Form LabelPosition="Left" LabelWidth="*">
-                <TextBox Width="300" u:FormItem.Label="Name" />
+                <TextBox Width="300" u:FormItem.Label="Name" u:FormItem.IsRequired="True" />
                 <TextBox Width="300" u:FormItem.Label="Email" />
                 <TextBox Width="300" u:FormItem.Label="Message" Classes="TextArea"/>
             </u:Form>
diff --git a/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml b/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml
index 049157d..bb1141f 100644
--- a/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml
@@ -31,7 +31,7 @@
                             VerticalAlignment="Center"
                             Content="{TemplateBinding Icon}"
                             ContentTemplate="{TemplateBinding IconTemplate}"
-                            Foreground="{DynamicResource SemiColorText2}"
+                            Foreground="{DynamicResource BreadcrumbItemForeground}"
                             IsVisible="{TemplateBinding Icon,
                                                         Converter={x:Static ObjectConverters.IsNotNull}}" />
                         <ContentPresenter
@@ -39,14 +39,14 @@
                             VerticalAlignment="Center"
                             Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Foreground="{DynamicResource SemiColorText2}"
+                            Foreground="{DynamicResource BreadcrumbItemForeground}"
                             IsVisible="{TemplateBinding Content,
                                                         Converter={x:Static ObjectConverters.IsNotNull}}" />
                         <ContentPresenter
                             Name="Separator"
                             VerticalAlignment="Center"
                             Content="{TemplateBinding Separator}"
-                            Foreground="{DynamicResource SemiColorText3}">
+                            Foreground="{DynamicResource BreadcrumbItemSeparatorForeground}">
                             <ContentPresenter.IsVisible>
                                 <TemplateBinding Converter="{x:Static ObjectConverters.IsNotNull}" Property="Separator" />
                             </ContentPresenter.IsVisible>
@@ -66,10 +66,10 @@
         </Style>
         <Style Selector="^:last">
             <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource SemiColorText0}" />
+                <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemLastForeground}" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource SemiColorText0}" />
+                <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemLastForeground}" />
                 <Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#Separator">
@@ -77,19 +77,19 @@
             </Style>
             <Style Selector="^[IsReadOnly=False]:pointerover">
                 <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-                    <Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" />
+                    <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemPointeroverForeground}" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                    <Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" />
+                    <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemPointeroverForeground}" />
                 </Style>
             </Style>
         </Style>
         <Style Selector="^[IsReadOnly=False]:pointerover">
             <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" />
+                <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemPointeroverForeground}" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" />
+                <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemPointeroverForeground}" />
             </Style>
         </Style>
     </ControlTheme>
diff --git a/src/Ursa.Themes.Semi/Controls/Clock.axaml b/src/Ursa.Themes.Semi/Controls/Clock.axaml
index 58809b8..dd62fb7 100644
--- a/src/Ursa.Themes.Semi/Controls/Clock.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Clock.axaml
@@ -5,7 +5,7 @@
     xmlns:u="https://irihi.tech/ursa">
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:Clock}" TargetType="u:Clock">
-        <Setter Property="HandBrush" Value="{DynamicResource SemiGrey6}"/>
+        <Setter Property="HandBrush" Value="{DynamicResource ClockHandBrush}"/>
         <Setter Property="Template">
             <ControlTemplate TargetType="u:Clock">
                 <Grid>
@@ -13,8 +13,8 @@
                         ShowHourTicks="{TemplateBinding ShowHourTicks}"
                         ShowMinuteTicks="{TemplateBinding ShowMinuteTicks}"
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        HourTickForeground="{DynamicResource SemiGrey6}"
-                        MinuteTickForeground="{DynamicResource SemiGrey4}" />
+                        HourTickForeground="{DynamicResource ClockHourTickForeground}"
+                        MinuteTickForeground="{DynamicResource ClockMinuteTickForeground}" />
                     <UniformGrid Rows="2" IsVisible="{TemplateBinding ShowHourHand}">
                         <Border
                             Width="16"
@@ -51,8 +51,8 @@
                     <Ellipse
                         Width="20"
                         Height="20"
-                        Fill="White"
-                        Stroke="{DynamicResource SemiBlue5}"
+                        Fill="{DynamicResource ClockArborFill}"
+                        Stroke="{DynamicResource ClockArborStroke}"
                         StrokeThickness="3" />
                 </Grid>
             </ControlTemplate>
diff --git a/src/Ursa.Themes.Semi/Controls/Form.axaml b/src/Ursa.Themes.Semi/Controls/Form.axaml
index 6b424d1..4a987bd 100644
--- a/src/Ursa.Themes.Semi/Controls/Form.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Form.axaml
@@ -38,7 +38,7 @@
                         Height="1"
                         Margin="0,8"
                         HorizontalAlignment="Stretch"
-                        Fill="{DynamicResource SemiColorBorder}"
+                        Fill="{DynamicResource FormGroupForeground}"
                         IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Header, Converter={x:Static ObjectConverters.IsNotNull}}" />
                     <ItemsPresenter
                         ItemsPanel="{TemplateBinding ItemsPanel}" />
@@ -64,7 +64,7 @@
                             FontWeight="{DynamicResource TextBlockTitleFontWeight}"
                             Target="{Binding #PART_ContentPresenter.Content}" />
                         <TextBlock
-                            Foreground="{DynamicResource SemiRed6}"
+                            Foreground="{DynamicResource FormAsteriskForeground}"
                             IsVisible="{TemplateBinding IsRequired}"
                             Text="*" />
                     </StackPanel>
@@ -100,7 +100,7 @@
                                     FontWeight="{DynamicResource TextBlockTitleFontWeight}"
                                     Target="{Binding #PART_ContentPresenter.Content}" />
                                 <TextBlock
-                                    Foreground="{DynamicResource SemiRed6}"
+                                    Foreground="{DynamicResource FormAsteriskForeground}"
                                     IsVisible="{TemplateBinding IsRequired}"
                                     Text="*" />
                             </StackPanel>
diff --git a/src/Ursa.Themes.Semi/Controls/NavMenu.axaml b/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
index 273c5f3..d0eea3e 100644
--- a/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
+++ b/src/Ursa.Themes.Semi/Controls/NavMenu.axaml
@@ -237,7 +237,7 @@
                             Height="{DynamicResource NavigationMenuSeparatorBorderHeight}"
                             Margin="{DynamicResource NavigationMenuSeparatorBorderMargin}"
                             HorizontalAlignment="Stretch"
-                            Fill="{DynamicResource SemiColorBorder}" />
+                            Fill="{DynamicResource NavigationMenuItemSeparatorBorderForeground}" />
                     </StackPanel>
                 </ControlTemplate>
             </Setter>
diff --git a/src/Ursa.Themes.Semi/Controls/Timeline.axaml b/src/Ursa.Themes.Semi/Controls/Timeline.axaml
index 0d68e5c..926ee02 100644
--- a/src/Ursa.Themes.Semi/Controls/Timeline.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Timeline.axaml
@@ -79,7 +79,7 @@
                         Content="{TemplateBinding Header}"
                         ContentTemplate="{TemplateBinding HeaderTemplate}"
                         FontSize="14"
-                        Foreground="{DynamicResource SemiGrey9}" />
+                        Foreground="{DynamicResource TimelineHeaderForeground}" />
                     <ContentPresenter
                         Name="{x:Static u:TimelineItem.PART_Content}"
                         Grid.Row="1"
diff --git a/src/Ursa.Themes.Semi/Controls/ToolBar.axaml b/src/Ursa.Themes.Semi/Controls/ToolBar.axaml
index 90746f1..c3cf35a 100644
--- a/src/Ursa.Themes.Semi/Controls/ToolBar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ToolBar.axaml
@@ -54,7 +54,7 @@
                             Content="{TemplateBinding Header}"
                             ContentTemplate="{TemplateBinding HeaderTemplate}"
                             DockPanel.Dock="Left"
-                            Foreground="{DynamicResource SemiColorText2}"
+                            Foreground="{DynamicResource ToolBarHeaderForeground}"
                             IsVisible="{TemplateBinding Header,
                                                         Converter={x:Static ObjectConverters.IsNotNull}}" />
                         <Panel Name="PART_PopupButtonPanel" DockPanel.Dock="Right">
@@ -67,7 +67,7 @@
                                 <PathIcon
                                     Name="PART_Icon"
                                     Height="12"
-                                    Foreground="{DynamicResource SemiColorText2}"
+                                    Foreground="{DynamicResource ToolBarHeaderForeground}"
                                     Data="{DynamicResource ToolBarHorizontalMoreGlyph}" />
                             </ToggleButton>
                             <Popup
@@ -122,7 +122,7 @@
                 <Rectangle
                     Name="PART_Rect"
                     Margin="4"
-                    Fill="{DynamicResource SemiColorBorder}" />
+                    Fill="{DynamicResource ToolBarSeparatorForeground}" />
             </ControlTemplate>
         </Setter>
         <Style Selector="^ /template/ Rectangle#PART_Rect">
diff --git a/src/Ursa.Themes.Semi/Controls/TwoTonePathIcon.axaml b/src/Ursa.Themes.Semi/Controls/TwoTonePathIcon.axaml
index 1fe4731..a344100 100644
--- a/src/Ursa.Themes.Semi/Controls/TwoTonePathIcon.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TwoTonePathIcon.axaml
@@ -8,10 +8,10 @@
         <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
         <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
         <Setter Property="StrokeThickness" Value="0.4" />
-        <Setter Property="Foreground" Value="{DynamicResource SemiBlue2}" />
-        <Setter Property="StrokeBrush" Value="{DynamicResource SemiBlue6}" />
-        <Setter Property="ActiveForeground" Value="{DynamicResource SemiBlue6}" />
-        <Setter Property="ActiveStrokeBrush" Value="{DynamicResource SemiBlue6}" />
+        <Setter Property="Foreground" Value="{DynamicResource TwoTonePathIconForeground}" />
+        <Setter Property="StrokeBrush" Value="{DynamicResource TwoTonePathIconStrokeBrush}" />
+        <Setter Property="ActiveForeground" Value="{DynamicResource TwoTonePathIconActiveForeground}" />
+        <Setter Property="ActiveStrokeBrush" Value="{DynamicResource TwoTonePathIconActiveStrokeBrush}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:TwoTonePathIcon">
                 <Border Background="{TemplateBinding Background}">
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Breadcrumb.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Breadcrumb.axaml
new file mode 100644
index 0000000..a2fc941
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Dark/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" Opacity="0.6" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="BreadcrumbItemSeparatorForeground" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="BreadcrumbItemLastForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="BreadcrumbItemPointeroverForeground" Color="#54A9FF" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml
new file mode 100644
index 0000000..d081ae9
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Dark/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="#A7ABB0" />
+    <SolidColorBrush x:Key="ClockHourTickForeground" Color="#A7ABB0" />
+    <SolidColorBrush x:Key="ClockMinuteTickForeground" Color="#6B7075" />
+    <SolidColorBrush x:Key="ClockArborFill" Color="White" />
+    <SolidColorBrush x:Key="ClockArborStroke" Color="#54A9FF" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml
index 4fa7dc4..733792a 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml
@@ -1,5 +1,3 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
-    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FFA7ABB0" Opacity="0.2"></SolidColorBrush>
-</ResourceDictionary>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FFA7ABB0" Opacity="0.2" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Form.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Form.axaml
new file mode 100644
index 0000000..d623760
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Dark/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" Opacity="0.08" Color="White" />
+    <SolidColorBrush x:Key="FormAsteriskForeground" Color="#FD9983" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml b/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml
index d20f8da..c54695e 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Opacity="0.62" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="NavigationMenuItemSeparatorBorderForeground" Opacity="0.08" Color="White" />
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Timeline.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Timeline.axaml
index 47b44c7..b0e958d 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Timeline.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Timeline.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="TimelineHeaderForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DefaultTimelineIconForeground" Opacity="0.2" Color="White" />
     <SolidColorBrush x:Key="OngoingTimelineIconForeground" Color="#FF54A9FF" />
     <SolidColorBrush x:Key="SuccessTimelineIconForeground" Color="#FF5DC264" />
     <SolidColorBrush x:Key="WarningTimelineIconForeground" Color="#FFFFAE43" />
     <SolidColorBrush x:Key="ErrorTimelineIconForeground" Color="#FFFC725A" />
     <SolidColorBrush x:Key="TimelineLineBrush" Opacity="0.2" Color="White" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/ToolBar.axaml b/src/Ursa.Themes.Semi/Themes/Dark/ToolBar.axaml
new file mode 100644
index 0000000..b2dce3c
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Dark/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" Opacity="0.6" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ToolBarSeparatorForeground" Opacity="0.08" Color="White" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/TwoTonePathIcon.axaml b/src/Ursa.Themes.Semi/Themes/Dark/TwoTonePathIcon.axaml
new file mode 100644
index 0000000..11c574b
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Dark/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="#135CB8"/>
+    <SolidColorBrush x:Key="TwoTonePathIconStrokeBrush" Color="#7FC1FF"/>
+    <SolidColorBrush x:Key="TwoTonePathIconActiveForeground" Color="#7FC1FF"/>
+    <SolidColorBrush x:Key="TwoTonePathIconActiveStrokeBrush" Color="#7FC1FF"/>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
index a3f9373..723f977 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
@@ -3,20 +3,25 @@
         <ResourceInclude Source="Avatar.axaml" />
         <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="Dialog.axaml" />
         <ResourceInclude Source="Divider.axaml" />
         <ResourceInclude Source="DualBadge.axaml" />
+        <ResourceInclude Source="Form.axaml" />
         <ResourceInclude Source="Loading.axaml" />
         <ResourceInclude Source="NavigationMenu.axaml" />
         <ResourceInclude Source="NotificationShared.axaml" />
         <ResourceInclude Source="Pagination.axaml" />
         <ResourceInclude Source="Rating.axaml" />
         <ResourceInclude Source="SelectionList.axaml" />
+        <ResourceInclude Source="Skeleton.axaml" />
         <ResourceInclude Source="TagInput.axaml" />
         <ResourceInclude Source="Timeline.axaml" />
         <ResourceInclude Source="Toast.axaml" />
-        <ResourceInclude Source="Skeleton.axaml" />
+        <ResourceInclude Source="ToolBar.axaml" />
+        <ResourceInclude Source="TwoTonePathIcon.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </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
index d4fd665..b44d8d3 100644
--- a/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
+++ b/src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
@@ -1,15 +1,5 @@
 <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>
-    <Color x:Key="GrayTextColor">#A6A6A6</Color>
-    <Color x:Key="HighlightTextColor">#263B50</Color>
-    <Color x:Key="HighlightColor">#8EE3F0</Color>
-    <Color x:Key="ButtonTextColor">#FFFFFF</Color>
-    <Color x:Key="ButtonFaceColor">#202020</Color>
-     -->
     <!-- Badge -->
     <SolidColorBrush x:Key="BadgeBorderBrush" Color="{StaticResource WindowTextColor}" />
     <SolidColorBrush x:Key="BadgeForeground" Color="{StaticResource WindowColor}" />
@@ -18,13 +8,13 @@
     <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}" />
@@ -55,7 +45,20 @@
 
     <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" />
@@ -95,12 +98,18 @@
 
     <!--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}" />
@@ -109,12 +118,25 @@
     <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}" />
-</ResourceDictionary>
+
+    <!-- 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/Light/Breadcrumb.axaml b/src/Ursa.Themes.Semi/Themes/Light/Breadcrumb.axaml
new file mode 100644
index 0000000..8a519e3
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Light/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" Opacity="0.62" Color="#1C1F23" />
+    <SolidColorBrush x:Key="BreadcrumbItemSeparatorForeground" Opacity="0.35" Color="#1C1F23" />
+    <SolidColorBrush x:Key="BreadcrumbItemLastForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="BreadcrumbItemPointeroverForeground" Color="#0077FA" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Clock.axaml b/src/Ursa.Themes.Semi/Themes/Light/Clock.axaml
new file mode 100644
index 0000000..583fd26
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Light/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="#555B61" />
+    <SolidColorBrush x:Key="ClockHourTickForeground" Color="#555B61" />
+    <SolidColorBrush x:Key="ClockMinuteTickForeground" Color="#888D92" />
+    <SolidColorBrush x:Key="ClockArborFill" Color="White" />
+    <SolidColorBrush x:Key="ClockArborStroke" Color="#0077FA" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml b/src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml
index 28110a2..a981986 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/Dialog.axaml
@@ -1,5 +1,3 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
-    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FF555B61" Opacity="0.2"></SolidColorBrush>
-</ResourceDictionary>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FF555B61" Opacity="0.2" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Form.axaml b/src/Ursa.Themes.Semi/Themes/Light/Form.axaml
new file mode 100644
index 0000000..efe5ae8
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Light/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" Opacity="0.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="FormAsteriskForeground" Color="#D52515" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml b/src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml
index 04e72e0..35df500 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
+    <SolidColorBrush x:Key="NavigationMenuItemSeparatorBorderForeground" Opacity="0.08" Color="#1C1F23" />
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Timeline.axaml b/src/Ursa.Themes.Semi/Themes/Light/Timeline.axaml
index b5549db..8bd76cb 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Timeline.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/Timeline.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="TimelineHeaderForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="DefaultTimelineIconForeground" Opacity="0.13" Color="#FF2E3238" />
     <SolidColorBrush x:Key="OngoingTimelineIconForeground" Color="#FF0077FA" />
     <SolidColorBrush x:Key="SuccessTimelineIconForeground" Color="#FF3BB346" />
     <SolidColorBrush x:Key="WarningTimelineIconForeground" Color="#FFFC8800" />
     <SolidColorBrush x:Key="ErrorTimelineIconForeground" Color="#FFF93920" />
     <SolidColorBrush x:Key="TimelineLineBrush" Opacity="0.13" Color="#FF2E3238" />
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/ToolBar.axaml b/src/Ursa.Themes.Semi/Themes/Light/ToolBar.axaml
new file mode 100644
index 0000000..e8953ed
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Light/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" Opacity="0.62" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ToolBarSeparatorForeground" Opacity="0.08" Color="#1C1F23" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/TwoTonePathIcon.axaml b/src/Ursa.Themes.Semi/Themes/Light/TwoTonePathIcon.axaml
new file mode 100644
index 0000000..3f78dfb
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Light/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="#98CDFD"/>
+    <SolidColorBrush x:Key="TwoTonePathIconStrokeBrush" Color="#0062D6"/>
+    <SolidColorBrush x:Key="TwoTonePathIconActiveForeground" Color="#0062D6"/>
+    <SolidColorBrush x:Key="TwoTonePathIconActiveStrokeBrush" Color="#0062D6"/>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
index a3f9373..723f977 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
@@ -3,20 +3,25 @@
         <ResourceInclude Source="Avatar.axaml" />
         <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="Dialog.axaml" />
         <ResourceInclude Source="Divider.axaml" />
         <ResourceInclude Source="DualBadge.axaml" />
+        <ResourceInclude Source="Form.axaml" />
         <ResourceInclude Source="Loading.axaml" />
         <ResourceInclude Source="NavigationMenu.axaml" />
         <ResourceInclude Source="NotificationShared.axaml" />
         <ResourceInclude Source="Pagination.axaml" />
         <ResourceInclude Source="Rating.axaml" />
         <ResourceInclude Source="SelectionList.axaml" />
+        <ResourceInclude Source="Skeleton.axaml" />
         <ResourceInclude Source="TagInput.axaml" />
         <ResourceInclude Source="Timeline.axaml" />
         <ResourceInclude Source="Toast.axaml" />
-        <ResourceInclude Source="Skeleton.axaml" />
+        <ResourceInclude Source="ToolBar.axaml" />
+        <ResourceInclude Source="TwoTonePathIcon.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file

From e3d1f40b4ac9c1ceb12fa6c35ae70e1c48e6a192 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 17 Oct 2024 19:06:55 +0800
Subject: [PATCH 8/8] misc: separate files.

---
 .../Themes/HighContrast/Aquatic.axaml         |   8 +-
 .../Themes/HighContrast/Badge.axaml           |   9 ++
 .../Themes/HighContrast/Banner.axaml          |   6 +
 .../Themes/HighContrast/Base.axaml            | 142 ------------------
 .../Themes/HighContrast/Breadcrumb.axaml      |   6 +
 .../Themes/HighContrast/ButtonGroup.axaml     |  32 ++++
 .../Themes/HighContrast/Clock.axaml           |   7 +
 .../Themes/HighContrast/DatePicker.axaml      |  41 +++++
 .../Themes/HighContrast/Desert.axaml          |   8 +-
 .../Themes/HighContrast/Divider.axaml         |   3 +
 .../Themes/HighContrast/Dusk.axaml            |   8 +-
 .../Themes/HighContrast/Form.axaml            |   4 +
 .../Themes/HighContrast/NavigationMenu.axaml  |   4 +
 .../Themes/HighContrast/NightSky.axaml        |   8 +-
 .../Themes/HighContrast/Pagination.axaml      |   9 ++
 .../Themes/HighContrast/Rating.axaml          |   4 +
 .../Themes/HighContrast/SelectionList.axaml   |   3 +
 .../Themes/HighContrast/TagInput.axaml        |   5 +
 .../Themes/HighContrast/Timeline.axaml        |   3 +
 .../Themes/HighContrast/Toast.axaml           |   5 +
 .../Themes/HighContrast/ToolBar.axaml         |   4 +
 .../Themes/HighContrast/TwoTonePathIcon.axaml |   6 +
 .../Themes/HighContrast/_index.axaml          |  20 +++
 23 files changed, 183 insertions(+), 162 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Badge.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Banner.axaml
 delete mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Breadcrumb.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/ButtonGroup.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Clock.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/DatePicker.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Divider.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Form.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/NavigationMenu.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Pagination.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Rating.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/SelectionList.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/TagInput.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Timeline.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/Toast.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/ToolBar.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/TwoTonePathIcon.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/HighContrast/_index.axaml

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