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] 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