Merge pull request #673 from irihitech/resource

replace Color Resources

src/Ursa.Themes.Semi/Controls/AutoCompleteBox.axaml

@@ -2,8 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa"
-    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
-    <!--  Add Resources Here  -->
+    xmlns:iri="https://irihi.tech/shared">
     <ControlTheme x:Key="{x:Type u:AutoCompleteBox}" TargetType="u:AutoCompleteBox">
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" />
@@ -15,7 +14,7 @@
                         Name="PART_TextBox"
                         MinHeight="{TemplateBinding MinHeight}"
                         VerticalAlignment="Stretch"
-                        helpers:ClassHelper.ClassSource="{TemplateBinding}"
+                        iri:ClassHelper.ClassSource="{TemplateBinding}"
                         DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                         InnerLeftContent="{TemplateBinding InnerLeftContent}"
                         InnerRightContent="{TemplateBinding InnerRightContent}"

src/Ursa.Themes.Semi/Controls/ButtonGroup.axaml

@@ -2,7 +2,6 @@
     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">
             <u:ButtonGroup Classes="Primary">

src/Ursa.Themes.Semi/Controls/Clock.axaml

@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converter="clr-namespace:Ursa.Themes.Semi.Converters"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:Clock}" TargetType="u:Clock">
         <Setter Property="HandBrush" Value="{DynamicResource ClockHandBrush}"/>
         <Setter Property="Template">

src/Ursa.Themes.Semi/Controls/ControlClassesInput.axaml

@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:ControlClassesInput}" TargetType="u:ControlClassesInput">
         <Setter Property="Width" Value="200" />
         <Setter Property="Template">

src/Ursa.Themes.Semi/Controls/DatePicker.axaml

@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:DatePicker}" TargetType="u:DatePicker">
         <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}" />

src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml

@@ -1,10 +1,9 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:contracts="https://irihi.tech/shared"
     xmlns:u="https://irihi.tech/ursa"
+    xmlns:iri="https://irihi.tech/shared"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:DateRangePicker}" TargetType="u:DateRangePicker">
         <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource TextBoxForeground}" />
@@ -74,7 +73,7 @@
                                 Theme="{DynamicResource InnerIconButton}" />
                         </Grid>
                         <Popup
-                            Name="{x:Static contracts:PartNames.PART_Popup}"
+                            Name="{x:Static iri:PartNames.PART_Popup}"
                             OverlayInputPassThroughElement="{Binding #PART_PassThroughElement}"
                             HorizontalOffset="-4"
                             IsLightDismissEnabled="True"

src/Ursa.Themes.Semi/Controls/DateTimePicker.axaml

@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:u="https://irihi.tech/ursa">
-    <!-- Add Resources Here -->
     <ControlTheme x:Key="{x:Type u:DateTimePicker}" TargetType="u:DateTimePicker">
         <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerForeground}" />

src/Ursa.Themes.Semi/Controls/Dialog.axaml

@@ -1,8 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared"
-    xmlns:u="https://irihi.tech/ursa">
+    xmlns:u="https://irihi.tech/ursa"
+    xmlns:iri="https://irihi.tech/shared">
 
     <ControlTheme x:Key="{x:Type u:OverlayDialogHost}" TargetType="u:OverlayDialogHost">
         <Setter Property="OverlayMaskBrush" Value="{DynamicResource OverlayDialogMaskBrush}" />
@@ -230,24 +230,24 @@
         </Style>
         <Style Selector="^ /template/ Button#PART_CancelButton">
             <Setter Property="Grid.Column" Value="0" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_NoButton">
             <Setter Property="Grid.Column" Value="1" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_NO}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_YesButton">
             <Setter Property="Grid.Column" Value="2" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_YES}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_OKButton">
             <Setter Property="Grid.Column" Value="3" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_OK}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
@@ -259,16 +259,16 @@
                 <Setter Property="Margin" Value="24 24 0 0" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Info]">
@@ -278,16 +278,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Warning]">
@@ -297,19 +297,19 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Warning" />
                 <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Warning" />
                 <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
                 <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Error]">
@@ -319,16 +319,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Question]">
@@ -338,16 +338,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Success]">
@@ -357,16 +357,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Success" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Success" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^ /template/ Panel#PART_TitleArea">
@@ -595,24 +595,24 @@
         </Setter>
         <Style Selector="^ /template/ Button#PART_CancelButton">
             <Setter Property="Grid.Column" Value="0" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_NoButton">
             <Setter Property="Grid.Column" Value="1" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_NO}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_YesButton">
             <Setter Property="Grid.Column" Value="2" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_YES}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_OKButton">
             <Setter Property="Grid.Column" Value="3" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_OK}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
@@ -624,16 +624,16 @@
                 <Setter Property="Margin" Value="24 24 0 0" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Info]">
@@ -643,16 +643,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Warning]">
@@ -662,19 +662,19 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Warning" />
                 <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Warning" />
                 <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
                 <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Error]">
@@ -684,16 +684,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Question]">
@@ -703,16 +703,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Success]">
@@ -722,16 +722,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Success" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Success" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
     </ControlTheme>

src/Ursa.Themes.Semi/Controls/DisableContainer.axaml

@@ -2,7 +2,6 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:u="https://irihi.tech/ursa"
                     xmlns:iri="https://irihi.tech/shared">
-    <!-- Add Resources Here -->
     <ControlTheme TargetType="u:DisableContainer" x:Key="{x:Type u:DisableContainer}">
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DisableContainer">

src/Ursa.Themes.Semi/Controls/Divider.axaml

@@ -7,7 +7,6 @@
             <u:Divider Content="Hello" />
         </StackPanel>
     </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}" />

src/Ursa.Themes.Semi/Controls/Drawer.axaml

@@ -2,8 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:c="clr-namespace:Ursa.Themes.Semi.Converters"
-    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared"
-    xmlns:u="https://irihi.tech/ursa">
+    xmlns:u="https://irihi.tech/ursa"
+    xmlns:iri="https://irihi.tech/shared">
     <ControlTheme x:Key="{x:Type u:CustomDrawerControl}" TargetType="u:CustomDrawerControl">
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
@@ -181,24 +181,24 @@
         </Setter>
         <Style Selector="^ /template/ Button#PART_CancelButton">
             <Setter Property="Grid.Column" Value="0" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_NoButton">
             <Setter Property="Grid.Column" Value="1" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_NO}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_YesButton">
             <Setter Property="Grid.Column" Value="2" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_YES}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_OKButton">
             <Setter Property="Grid.Column" Value="3" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_OK}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>

src/Ursa.Themes.Semi/Controls/DualBadge.axaml

@@ -2,7 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa"
-    xmlns:converters="clr-namespace:Ursa.Converters;assembly=Ursa">
+    xmlns:iri="https://irihi.tech/shared">
     <ControlTheme x:Key="{x:Type u:DualBadge}" TargetType="u:DualBadge">
         <Setter Property="CornerRadius" Value="{DynamicResource DualBadgeDefaultCornerRadius}" />
         <Setter Property="FontSize" Value="{DynamicResource DualBadgeDefaultFontSize}" />
@@ -33,7 +33,7 @@
                                 Height="{DynamicResource DualBadgeIconHeight}"
                                 IsVisible="{TemplateBinding Icon,Converter={x:Static ObjectConverters.IsNotNull}}"
                                 Foreground="{TemplateBinding IconForeground}"
-                                Margin="{TemplateBinding Padding, Converter={x:Static converters:ThicknessExcludeConverter.Right}}"
+                                Margin="{TemplateBinding Padding, Converter={iri:ThicknessMixerConverter 'Vertical,Left'}}"
                                 Content="{TemplateBinding Icon}"
                                 ContentTemplate="{TemplateBinding IconTemplate}" />
                             <ContentPresenter

src/Ursa.Themes.Semi/Controls/EnumSelector.axaml

@@ -2,15 +2,14 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa"
-    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
-    <!--  Add Resources Here  -->
+    xmlns:iri="https://irihi.tech/shared">
     <ControlTheme x:Key="{x:Type u:EnumSelector}" TargetType="u:EnumSelector">
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:EnumSelector">
                 <ComboBox
                     Width="{TemplateBinding Width}"
-                    helpers:ClassHelper.ClassSource="{TemplateBinding}"
+                    iri:ClassHelper.ClassSource="{TemplateBinding}"
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalAlignment}"
                     Name="PART_ComboBox"

src/Ursa.Themes.Semi/Controls/Form.axaml

@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa"
     xmlns:converters="clr-namespace:Ursa.Themes.Semi.Converters">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:Form}"
                   TargetType="u:Form">
         <Setter Property="Grid.IsSharedSizeScope"

src/Ursa.Themes.Semi/Controls/IPv4Box.axaml

@@ -2,7 +2,6 @@
     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" />

src/Ursa.Themes.Semi/Controls/ImageViewer.axaml

@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:ImageViewer}" TargetType="u:ImageViewer">
         <Setter Property="Background" Value="LightGray" />
         <Setter Property="Template">

src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml

@@ -2,8 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converters="using:Avalonia.Controls.Converters"
-    xmlns:ursaConverters="using:Ursa.Converters"
-    xmlns:u="https://irihi.tech/ursa">
+    xmlns:u="https://irihi.tech/ursa"
+    xmlns:iri="https://irihi.tech/shared">
     <converters:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
 
     <ControlTheme x:Key="{x:Type u:KeyGestureInput}" TargetType="u:KeyGestureInput">
@@ -28,7 +28,7 @@
                         <Grid ColumnDefinitions="Auto, *, Auto" >
                             <ContentPresenter Grid.Column="0"
                                 Content="{TemplateBinding InnerLeftContent}"
-                                Padding="{TemplateBinding Padding, Converter={x:Static ursaConverters:ThicknessIncludeConverter.Right}}"
+                                Padding="{TemplateBinding Padding, Converter={iri:ThicknessMixerConverter Right}}"
                                 DockPanel.Dock="Left"
                                 VerticalAlignment="Stretch"
                                 VerticalContentAlignment="Center"
@@ -39,7 +39,7 @@
                                 Grid.Column="2"
                                 Content="{TemplateBinding InnerRightContent}"
                                 DockPanel.Dock="Right"
-                                Padding="{TemplateBinding Padding, Converter={x:Static ursaConverters:ThicknessIncludeConverter.Left}}"
+                                Padding="{TemplateBinding Padding, Converter={iri:ThicknessMixerConverter Left}}"
                                 VerticalAlignment="Stretch"
                                 VerticalContentAlignment="Center"
                                 Foreground="{DynamicResource TextBoxInnerForeground}"

src/Ursa.Themes.Semi/Controls/Loading.axaml

@@ -4,7 +4,6 @@
     xmlns:converters="clr-namespace:Ursa.Themes.Semi.Converters"
     xmlns:iri="https://irihi.tech/shared"
     xmlns:u="clr-namespace:Ursa.Controls;assembly=Ursa">
-    <!--  Add Resources Here  -->
     <Design.PreviewWith>
         <StackPanel Margin="20">
             <u:LoadingIcon Classes="Large"/>

src/Ursa.Themes.Semi/Controls/Marquee.axaml

@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:iri="https://irihi.tech/shared"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:Marquee}" TargetType="u:Marquee">
         <Setter Property="Template">
             <ControlTemplate>

src/Ursa.Themes.Semi/Controls/MessageBox.axaml

@@ -2,7 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa"
-    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
+    xmlns:iri="https://irihi.tech/shared">
     <Design.PreviewWith>
         <StackPanel Margin="20">
             <u:MessageBoxControl
@@ -128,24 +128,24 @@
         </Setter>
         <Style Selector="^ /template/ Button#PART_CancelButton">
             <Setter Property="Grid.Column" Value="0" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_NoButton">
             <Setter Property="Grid.Column" Value="1" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_NO}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_YesButton">
             <Setter Property="Grid.Column" Value="2" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_YES}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_OKButton">
             <Setter Property="Grid.Column" Value="3" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_OK}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
@@ -282,24 +282,24 @@
         </Style>
         <Style Selector="^ /template/ Button#PART_CancelButton">
             <Setter Property="Grid.Column" Value="0" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_NoButton">
             <Setter Property="Grid.Column" Value="1" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_NO}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_YesButton">
             <Setter Property="Grid.Column" Value="2" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_YES}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_OKButton">
             <Setter Property="Grid.Column" Value="3" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_OK}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>

src/Ursa.Themes.Semi/Controls/NavMenu.axaml

@@ -3,8 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converters="clr-namespace:Ursa.Themes.Semi.Converters"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
-
     <converters:NavMenuMarginConverter x:Key="NavMarginConverter" />
 
     <ControlTheme x:Key="{x:Type u:NavMenu}" TargetType="u:NavMenu">

src/Ursa.Themes.Semi/Controls/NumPad.axaml

@@ -2,7 +2,6 @@
     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>
         <u:NumPad />
     </Design.PreviewWith>

src/Ursa.Themes.Semi/Controls/NumberDisplayer.axaml

@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:NumberDisplayerBase}" TargetType="u:NumberDisplayerBase">
         <Setter Property="Duration" Value="0:0:0.2" />
         <Setter Property="Template">

src/Ursa.Themes.Semi/Controls/NumericUpDown.axaml

@@ -2,8 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
-
     <ControlTheme x:Key="{x:Type u:NumericUpDown}" TargetType="{x:Type u:NumericUpDown}">
         <Setter Property="CornerRadius" Value="{DynamicResource NumericUpDownCornerRadius}" />
         <Setter Property="MinHeight" Value="{DynamicResource NumericUpDownDefaultHeight}" />

src/Ursa.Themes.Semi/Controls/Pagination.axaml

@@ -7,7 +7,6 @@
             <u:PaginationButton Page="3" />
         </StackPanel>
     </Design.PreviewWith>
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:Pagination}" TargetType="u:Pagination">
         <Setter Property="Template">
             <ControlTemplate TargetType="u:Pagination">

src/Ursa.Themes.Semi/Controls/PopConfirm.axaml

@@ -1,8 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:u="https://irihi.tech/ursa"
-                    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
-    <!-- Add Resources Here -->
+                    xmlns:iri="https://irihi.tech/shared">
     <ControlTheme x:Key="{x:Type u:PopConfirm}"
                   TargetType="u:PopConfirm">
         <Setter Property="Placement" Value="BottomEdgeAlignedLeft" />
@@ -100,11 +99,11 @@
         </Setter>
 
         <Style Selector="^ /template/ Button#PART_CancelButton">
-            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
         </Style>
 
         <Style Selector="^ /template/ Button#PART_ConfirmButton">
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
         </Style>
 
         <Style Selector="^.Information">

src/Ursa.Themes.Semi/Controls/RangeSlider.axaml

@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:RangeSlider}" TargetType="u:RangeSlider">
         <Setter Property="Background" Value="{DynamicResource SliderTrackBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource SliderTrackForeground}" />

src/Ursa.Themes.Semi/Controls/Resizer.axaml

@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:iri="https://irihi.tech/shared"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:WindowResizerThumb}" TargetType="u:WindowResizerThumb">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Template">

src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml

@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:ScrollToButton}" TargetType="u:ScrollToButton">
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Bottom" />

src/Ursa.Themes.Semi/Controls/Skeleton.axaml

@@ -3,11 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa"
     xmlns:iri="https://irihi.tech/shared">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <!--  Add Controls for Previewer Here  -->
-        </Border>
-    </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type u:Skeleton}" TargetType="u:Skeleton">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Template">
@@ -40,5 +35,4 @@
             </ControlTemplate>
         </Setter>
     </ControlTheme>
-    <!--  Add Styles Here  -->
 </ResourceDictionary>

src/Ursa.Themes.Semi/Controls/TagInput.axaml

@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:TagInput}" TargetType="u:TagInput">
         <Setter Property="InputTheme" Value="{DynamicResource TagInputTextBoxTheme}" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />

src/Ursa.Themes.Semi/Controls/TimeBox.axaml

@@ -2,7 +2,6 @@
     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" />

src/Ursa.Themes.Semi/Controls/TimePicker.axaml

@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:iri="https://irihi.tech/shared"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <Design.PreviewWith>
         <u:TimePickerPresenter Height="300" />
     </Design.PreviewWith>

src/Ursa.Themes.Semi/Controls/TimeRangePicker.axaml

@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:iri="https://irihi.tech/shared"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:TimeRangePicker}" TargetType="u:TimeRangePicker">
         <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource TextBoxForeground}" />

src/Ursa.Themes.Semi/Controls/Timeline.axaml

@@ -14,7 +14,6 @@
             </u:Timeline>
         </StackPanel>
     </Design.PreviewWith>
-    <!--  Add Resources Here  -->
     <u:TimelineFormatConverter x:Key="FormatConverter" />
     <ControlTheme x:Key="{x:Type u:Timeline}" TargetType="u:Timeline">
         <Setter Property="Template">

src/Ursa.Themes.Semi/Controls/ToolBar.axaml

@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="ToolBarExpandToggleButton" TargetType="ToggleButton">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Template">

src/Ursa.Themes.Semi/Controls/TwoTonePathIcon.axaml

@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:TwoTonePathIcon}" TargetType="u:TwoTonePathIcon">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />

src/Ursa.Themes.Semi/Controls/UrsaView.axaml

@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:UrsaView}" TargetType="{x:Type u:UrsaView}">
         <Setter Property="Background" Value="{DynamicResource WindowDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />

src/Ursa.Themes.Semi/Controls/_index.axaml

@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="AutoCompleteBox.axaml" />
         <ResourceInclude Source="Avatar.axaml" />

src/Ursa.Themes.Semi/Index.axaml

@@ -1,17 +1,19 @@
-<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 x:Class="Ursa.Themes.Semi.SemiTheme"
+        xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:u-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/Desert.axaml" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Dusk}" Source="./Themes/HighContrast/Dusk.axaml" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="./Themes/HighContrast/NightSky.axaml" />
+                <ResourceInclude x:Key="Dark" Source="Themes/Dark/_index.axaml" />
+                <ResourceInclude x:Key="Light" Source="Themes/Light/_index.axaml" />
+                <ResourceInclude x:Key="{x:Static u-semi:SemiTheme.Aquatic}" Source="Themes/HighContrast/Aquatic.axaml" />
+                <ResourceInclude x:Key="{x:Static u-semi:SemiTheme.Desert}" Source="Themes/HighContrast/Desert.axaml" />
+                <ResourceInclude x:Key="{x:Static u-semi:SemiTheme.Dusk}" Source="Themes/HighContrast/Dusk.axaml" />
+                <ResourceInclude x:Key="{x:Static u-semi:SemiTheme.NightSky}" Source="Themes/HighContrast/NightSky.axaml" />
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="../Controls/_index.axaml" />
+                <ResourceInclude Source="Controls/_index.axaml" />
                 <ResourceInclude Source="Themes/Shared/_index.axaml" />
                 <ResourceInclude Source="Locale/zh-cn.axaml" />
                 <ResourceInclude Source="Compatibles/_index.axaml" />
@@ -19,6 +21,5 @@
         </ResourceDictionary>
     </Styles.Resources>
 
-    <StyleInclude Source="../Styles/_index.axaml" />
-    <!--  Add Styles Here  -->
+    <StyleInclude Source="Styles/_index.axaml" />
 </Styles>

src/Ursa.Themes.Semi/Locale/en-us.axaml

@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     x:Class="Ursa.Themes.Semi.Locale.en_us"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
     <x:String x:Key="STRING_MENU_BRING_TO_FRONT">Bring to Front</x:String>
     <x:String x:Key="STRING_MENU_BRING_FORWARD">Bring Forward</x:String>
     <x:String x:Key="STRING_MENU_SEND_BACKWARD">Send Backward</x:String>

src/Ursa.Themes.Semi/Locale/zh-cn.axaml

@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     x:Class="Ursa.Themes.Semi.Locale.zh_cn"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
     <x:String x:Key="STRING_MENU_BRING_TO_FRONT">置于顶层</x:String>
     <x:String x:Key="STRING_MENU_BRING_FORWARD">上移一层</x:String>
     <x:String x:Key="STRING_MENU_SEND_BACKWARD">下移一层</x:String>

src/Ursa.Themes.Semi/Styles/Breadcrumb.axaml

@@ -1,20 +1,13 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:u="https://irihi.tech/ursa">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <!-- Add Controls for Previewer Here -->
-        </Border>
-    </Design.PreviewWith>
-
-    <!-- Add Styles Here -->
     <Style Selector="u|Breadcrumb.Small u|BreadcrumbItem /template/ ContentPresenter">
-        <Setter Property="FontSize" Value="12"></Setter>
+        <Setter Property="FontSize" Value="12" />
         <Style Selector="^#PART_IconPresenter">
-            <Setter Property="Margin" Value="0 0 2 0"></Setter>
+            <Setter Property="Margin" Value="0 0 2 0" />
         </Style>
         <Style Selector="^#Separator">
-            <Setter Property="Margin" Value="2 0"></Setter>
+            <Setter Property="Margin" Value="2 0" />
         </Style>
     </Style>
 </Styles>

src/Ursa.Themes.Semi/Styles/ButtonGroup.axaml

@@ -1,10 +1,8 @@
-<Styles
-    xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:u="https://irihi.tech/ursa">
     <Design.PreviewWith>
         <Border Padding="20">
-            <!--  Add Controls for Previewer Here  -->
             <u:ButtonGroup Classes="Primary Solid">
                 <Button Content="Hello" />
                 <Button Content="Avalonia" />
@@ -14,7 +12,6 @@
         </Border>
     </Design.PreviewWith>
 
-    <!--  Add Styles Here  -->
     <Style Selector="u|ButtonGroup Button:nth-last-child(1) /template/ Rectangle#PART_Separator">
         <Setter Property="IsVisible" Value="False" />
     </Style>
@@ -126,5 +123,4 @@
             <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidDangerPressedBackground}" />
         </Style>
     </Style>
-
 </Styles>

src/Ursa.Themes.Semi/Styles/PinCode.axaml

@@ -1,33 +1,25 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:u="https://irihi.tech/ursa"
-        xmlns:theme="https://irihi.tech/ursa/themes/semi"
-        xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <!-- Add Controls for Previewer Here -->
-        </Border>
-    </Design.PreviewWith>
-
-    <!-- Add Styles Here -->
+        xmlns:iri="https://irihi.tech/shared">
     <Style Selector="u|PinCode">
         <Style Selector="^ u|PinCodeItem:nth-last-child(n+2)">
-            <Setter Property="Margin" Value="0 0 8 0"></Setter>
+            <Setter Property="Margin" Value="0 0 8 0" />
         </Style>
     </Style>
     <Style Selector="u|PinCode.Small">
         <Style Selector="^ u|PinCodeItem">
-            <Setter Property="helpers:ClassHelper.Classes" Value="Small"></Setter>
+            <Setter Property="iri:ClassHelper.Classes" Value="Small" />
             <Style Selector="^:nth-last-child(n+2)">
-                <Setter Property="Margin" Value="0 0 6 0"></Setter>
+                <Setter Property="Margin" Value="0 0 6 0" />
             </Style>
         </Style>
     </Style>
     <Style Selector="u|PinCode.Large">
         <Style Selector="^ u|PinCodeItem">
-            <Setter Property="helpers:ClassHelper.Classes" Value="Large"></Setter>
+            <Setter Property="iri:ClassHelper.Classes" Value="Large" />
             <Style Selector="^:nth-last-child(n+2)">
-                <Setter Property="Margin" Value="0 0 12 0"></Setter>
+                <Setter Property="Margin" Value="0 0 12 0" />
             </Style>
         </Style>
     </Style>

src/Ursa.Themes.Semi/Styles/Skeleton.axaml

@@ -2,13 +2,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:u="https://irihi.tech/ursa"
         xmlns:iri="https://irihi.tech/shared">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <!-- Add Controls for Previewer Here -->
-        </Border>
-    </Design.PreviewWith>
-
-    <!-- Add Styles Here -->
     <Style Selector="u|Skeleton[IsActive=True][IsLoading=True] /template/ iri|PureRectangle#PART_ActiveBorder">
         <Style.Animations>
             <Animation

src/Ursa.Themes.Semi/Styles/TimeBox.axaml

@@ -1,11 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:u="https://irihi.tech/ursa">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <!-- Add Controls for Previewer Here -->
-        </Border>
-    </Design.PreviewWith>
     <Style Selector="u|TimeBox /template/ Border#PART_HourBorder:pointerover">
         <Setter Property="Background" Value="{DynamicResource TimeBoxPointeroverBackground}" />
     </Style>

src/Ursa.Themes.Semi/Styles/ToolBar.axaml

@@ -1,15 +1,10 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:u="https://irihi.tech/ursa">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <!-- Add Controls for Previewer Here -->
-        </Border>
-    </Design.PreviewWith>
     <Style Selector="u|ToolBar Button">
-        <Setter Property="Theme" Value="{DynamicResource BorderlessButton}"></Setter>
+        <Setter Property="Theme" Value="{DynamicResource BorderlessButton}" />
         <Setter Property="FontWeight" Value="Regular" />
-        <Setter Property="Foreground" Value="{DynamicResource SemiColorText0}"></Setter>
+        <Setter Property="Foreground" Value="{DynamicResource SemiColorText0}" />
     </Style>
     <Style Selector="u|ToolBar CheckBox">
         <Setter Property="Margin" Value="8 0" />
@@ -22,5 +17,4 @@
     <Style Selector="u|ToolBar ComboBox">
         <Setter Property="HorizontalAlignment" Value="Stretch" />
     </Style>
-    <!-- Add Styles Here -->
 </Styles>

src/Ursa.Themes.Semi/Styles/UrsaView.axaml

@@ -1,13 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:u="https://irihi.tech/ursa">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <!-- Add Controls for Previewer Here -->
-        </Border>
-    </Design.PreviewWith>
-
-    <!-- Add Styles Here -->
     <Style Selector=":is(u|UrsaView)">
         <Setter Property="Theme" Value="{DynamicResource {x:Type u:UrsaView}}" />
     </Style>

src/Ursa.Themes.Semi/Styles/UrsaWindow.axaml

@@ -1,18 +1,12 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:u="https://irihi.tech/ursa">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <!-- Add Controls for Previewer Here -->
-        </Border>
-    </Design.PreviewWith>
-
     <Style Selector=":is(u|UrsaWindow)[ExtendClientAreaToDecorationsHint=True] u|WindowNotificationManager">
         <Style Selector="^:topright">
-            <Setter Property="Margin" Value="0 36 0 0"></Setter>
+            <Setter Property="Margin" Value="0 36 0 0" />
         </Style>
     </Style>
     <Style Selector=":is(u|UrsaWindow)[ExtendClientAreaToDecorationsHint=True] u|WindowToastManager">
-        <Setter Property="Margin" Value="0 36 0 0"></Setter>
+        <Setter Property="Margin" Value="0 36 0 0" />
     </Style>
 </Styles>

src/Ursa.Themes.Semi/Styles/_index.axaml

@@ -1,9 +1,4 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-        <Border Padding="20">
-            <!--  Add Controls for Previewer Here  -->
-        </Border>
-    </Design.PreviewWith>
     <StyleInclude Source="Breadcrumb.axaml" />
     <StyleInclude Source="ButtonGroup.axaml" />
     <StyleInclude Source="PinCode.axaml" />
@@ -12,5 +7,4 @@
     <StyleInclude Source="TimeBox.axaml" />
     <StyleInclude Source="UrsaView.axaml" />
     <StyleInclude Source="UrsaWindow.axaml" />
-    <!--  Add Styles Here  -->
 </Styles>

src/Ursa.Themes.Semi/Themes/Dark/Avatar.axaml

@@ -1,19 +1,19 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AvatarForeground" Color="White" />
-    <SolidColorBrush x:Key="AvatarRedBackground" Color="#D73324" />
-    <SolidColorBrush x:Key="AvatarPinkBackground" Color="#C72261" />
-    <SolidColorBrush x:Key="AvatarPurpleBackground" Color="#89289F" />
-    <SolidColorBrush x:Key="AvatarVioletBackground" Color="#6439B5" />
-    <SolidColorBrush x:Key="AvatarIndigoBackground" Color="#3444A3" />
-    <SolidColorBrush x:Key="AvatarBlueBackground" Color="#1D75DB" />
-    <SolidColorBrush x:Key="AvatarLightBlueBackground" Color="#0A81CC" />
-    <SolidColorBrush x:Key="AvatarCyanBackground" Color="#0E8999" />
-    <SolidColorBrush x:Key="AvatarTealBackground" Color="#0A9588" />
-    <SolidColorBrush x:Key="AvatarGreenBackground" Color="#32953D" />
-    <SolidColorBrush x:Key="AvatarLightGreenBackground" Color="#679934" />
-    <SolidColorBrush x:Key="AvatarLimeBackground" Color="#84B00C" />
-    <SolidColorBrush x:Key="AvatarYellowBackground" Color="#D2AF0F" />
-    <SolidColorBrush x:Key="AvatarAmberBackground" Color="#CA8F1E" />
-    <SolidColorBrush x:Key="AvatarOrangeBackground" Color="#D56F0F" />
-    <SolidColorBrush x:Key="AvatarGreyBackground" Color="#555B61" />
+    <StaticResource x:Key="AvatarForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="AvatarRedBackground" ResourceKey="SemiRed3" />
+    <StaticResource x:Key="AvatarPinkBackground" ResourceKey="SemiPink3" />
+    <StaticResource x:Key="AvatarPurpleBackground" ResourceKey="SemiPurple3" />
+    <StaticResource x:Key="AvatarVioletBackground" ResourceKey="SemiViolet3" />
+    <StaticResource x:Key="AvatarIndigoBackground" ResourceKey="SemiIndigo3" />
+    <StaticResource x:Key="AvatarBlueBackground" ResourceKey="SemiBlue3" />
+    <StaticResource x:Key="AvatarLightBlueBackground" ResourceKey="SemiLightBlue3" />
+    <StaticResource x:Key="AvatarCyanBackground" ResourceKey="SemiCyan3" />
+    <StaticResource x:Key="AvatarTealBackground" ResourceKey="SemiTeal3" />
+    <StaticResource x:Key="AvatarGreenBackground" ResourceKey="SemiGreen3" />
+    <StaticResource x:Key="AvatarLightGreenBackground" ResourceKey="SemiLightGreen3" />
+    <StaticResource x:Key="AvatarLimeBackground" ResourceKey="SemiLime3" />
+    <StaticResource x:Key="AvatarYellowBackground" ResourceKey="SemiYellow3" />
+    <StaticResource x:Key="AvatarAmberBackground" ResourceKey="SemiAmber3" />
+    <StaticResource x:Key="AvatarOrangeBackground" ResourceKey="SemiOrange3" />
+    <StaticResource x:Key="AvatarGreyBackground" ResourceKey="SemiGrey3" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml

@@ -3,32 +3,31 @@
     <SolidColorBrush x:Key="BadgeForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="BadgeContentForeground" Color="White" />
     <!-- Solid -->
-    <SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="BadgeSecondaryBadgeBackground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="BadgeTertiaryBadgeBackground" Color="#888D92" />
-    <SolidColorBrush x:Key="BadgeSuccessBadgeBackground" Color="#5DC264" />
-    <SolidColorBrush x:Key="BadgeWarningBadgeBackground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="BadgeDangerBadgeBackground" Color="#FC725A" />
+    <StaticResource x:Key="BadgePrimaryBadgeBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="BadgeSecondaryBadgeBackground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="BadgeTertiaryBadgeBackground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="BadgeSuccessBadgeBackground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="BadgeWarningBadgeBackground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="BadgeDangerBadgeBackground" ResourceKey="SemiColorDanger" />
     <!-- Light -->
-    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="#54A9FF" />
+    <StaticResource x:Key="BadgeLightPrimaryBadgeForeground" ResourceKey="SemiColorPrimary" />
     <SolidColorBrush x:Key="BadgeLightPrimaryBadgeBackground" Color="#053170" />
-    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeForeground" Color="#40B4F3" />
+    <StaticResource x:Key="BadgeLightSecondaryBadgeForeground" ResourceKey="SemiColorSecondary" />
     <SolidColorBrush x:Key="BadgeLightSecondaryBadgeBackground" Color="#003761" />
-    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeForeground" Color="#888D92" />
+    <StaticResource x:Key="BadgeLightTertiaryBadgeForeground" ResourceKey="SemiColorTertiary" />
     <SolidColorBrush x:Key="BadgeLightTertiaryBadgeBackground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="BadgeLightSuccessBadgeForeground" Color="#5DC264" />
+    <StaticResource x:Key="BadgeLightSuccessBadgeForeground" ResourceKey="SemiColorSuccess" />
     <SolidColorBrush x:Key="BadgeLightSuccessBadgeBackground" Color="#123C19" />
-    <SolidColorBrush x:Key="BadgeLightWarningBadgeForeground" Color="#FFAE43" />
+    <StaticResource x:Key="BadgeLightWarningBadgeForeground" ResourceKey="SemiColorWarning" />
     <SolidColorBrush x:Key="BadgeLightWarningBadgeBackground" Color="#551F03" />
-    <SolidColorBrush x:Key="BadgeLightDangerBadgeForeground" Color="#FC725A" />
+    <StaticResource x:Key="BadgeLightDangerBadgeForeground" ResourceKey="SemiColorDanger" />
     <SolidColorBrush x:Key="BadgeLightDangerBadgeBackground" Color="#6C090B" />
     <!-- Inverted -->
     <SolidColorBrush x:Key="BadgeInvertedBadgeBackground" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="BadgeInvertedSecondaryBadgeForeground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="BadgeInvertedTertiaryBadgeForeground" Color="#888D92" />
-    <SolidColorBrush x:Key="BadgeInvertedSuccessBadgeForeground" Color="#5DC264" />
-    <SolidColorBrush x:Key="BadgeInvertedWarningBadgeForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="BadgeInvertedDangerBadgeForeground" Color="#FC725A" />
+    <StaticResource x:Key="BadgeInvertedPrimaryBadgeForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="BadgeInvertedSecondaryBadgeForeground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="BadgeInvertedTertiaryBadgeForeground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="BadgeInvertedSuccessBadgeForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="BadgeInvertedWarningBadgeForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="BadgeInvertedDangerBadgeForeground" ResourceKey="SemiColorDanger" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/Banner.axaml

@@ -1,14 +1,12 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="BannerInformationBackground" Color="#FF54A9FF" Opacity="0.2" />
-    <SolidColorBrush x:Key="BannerInformationBorderBrush" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="BannerSuccessBackground" Color="#FF5DC264" Opacity="0.2" />
-    <SolidColorBrush x:Key="BannerSuccessBorderBrush" Color="#FF5DC264" />
-    <SolidColorBrush x:Key="BannerWarningBackground" Color="#FFFFAE43" Opacity="0.2" />
-    <SolidColorBrush x:Key="BannerWarningBorderBrush" Color="#FFFFAE43" />
-    <SolidColorBrush x:Key="BannerErrorBackground" Color="#FFFC725A" Opacity="0.2" />
-    <SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#FFFC725A" />
-
-    <SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.6" Color="#FFF9F9F9" />
+    <StaticResource x:Key="BannerInformationBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="BannerInformationBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="BannerSuccessBackground" ResourceKey="SemiColorSuccessLight" />
+    <StaticResource x:Key="BannerSuccessBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="BannerWarningBackground" ResourceKey="SemiColorWarningLight" />
+    <StaticResource x:Key="BannerWarningBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="BannerErrorBackground" ResourceKey="SemiColorDangerLight" />
+    <StaticResource x:Key="BannerErrorBorderBrush" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="BannerCloseButtonForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="BannerBorderBrush" Color="Transparent" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/Breadcrumb.axaml

@@ -1,6 +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" />
+    <StaticResource x:Key="BreadcrumbItemForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="BreadcrumbItemSeparatorForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="BreadcrumbItemLastForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="BreadcrumbItemPointeroverForeground" ResourceKey="SemiColorPrimary" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/ButtonGroup.axaml

@@ -1,82 +1,59 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    
-    <SolidColorBrush x:Key="ButtonGroupSeparatorForeground" Opacity="0.08" Color="White" />
+    <StaticResource x:Key="ButtonGroupSeparatorForeground" ResourceKey="SemiColorBorder" />
     <!--  Light  -->
-    <SolidColorBrush x:Key="ButtonGroupDefaultPrimaryForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultSecondaryForeground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultTertiaryForeground" Color="#888D92" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultSuccessForeground" Color="#5DC264" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultWarningForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDangerForeground" Color="#FC725A" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="ButtonGroupDefaultBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPressedBackground" Opacity="0.20" Color="White" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
-
+    <StaticResource x:Key="ButtonGroupDefaultPrimaryForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ButtonGroupDefaultSecondaryForeground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ButtonGroupDefaultTertiaryForeground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ButtonGroupDefaultSuccessForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonGroupDefaultWarningForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonGroupDefaultDangerForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ButtonGroupDefaultDisabledForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="ButtonGroupDefaultBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="ButtonGroupDefaultPointeroverBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="ButtonGroupDefaultPressedBackground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="ButtonGroupDefaultDisabledBackground" ResourceKey="SemiColorDisabledFill" />
     <SolidColorBrush x:Key="ButtonGroupDefaultBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonGroupDefaultPressedBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonGroupDefaultDisabledBorderBrush" Color="Transparent" />
-
     <!--  end Light  -->
-
     <!--  Solid  -->
-    <SolidColorBrush x:Key="ButtonGroupSolidForeground" Color="White" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledForeground" Color="Gray" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBackground" Color="#A9D7FF" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryBackground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryPointeroverBackground" Color="#6EC8F6" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryPressedBackground" Color="#9DDCF9" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryBackground" Color="#888D92" />
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryPointeroverBackground" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryPressedBackground" Color="#C6CACD" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessBackground" Color="#5DC264" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessPointeroverBackground" Color="#7FD184" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessPressedBackground" Color="#A6E1A8" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningBackground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningPointeroverBackground" Color="#FFC772" />
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningPressedBackground" Color="#FFDDA1" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerBackground" Color="#FC725A" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerPointeroverBackground" Color="#FD9983" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerPressedBackground" Color="#FDBEAC" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledBackground" Color="Gray" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" Color="#A9D7FF" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryBorderBrush" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryPointeroverBorderBrush" Color="#6EC8F6" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSecondaryPressedBorderBrush" Color="#9DDCF9" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryBorderBrush" Color="#888D92" />
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryPointeroverBorderBrush" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="ButtonGroupSolidTertiaryPressedBorderBrush" Color="#C6CACD" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessBorderBrush" Color="#5DC264" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessPointeroverBorderBrush" Color="#7FD184" />
-    <SolidColorBrush x:Key="ButtonGroupSolidSuccessPressedBorderBrush" Color="#A6E1A8" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningBorderBrush" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningPointeroverBorderBrush" Color="#FFC772" />
-    <SolidColorBrush x:Key="ButtonGroupSolidWarningPressedBorderBrush" Color="#FFDDA1" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerBorderBrush" Color="#FC725A" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerPointeroverBorderBrush" Color="#FD9983" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDangerPressedBorderBrush" Color="#FDBEAC" />
-
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledBorderBrush" Color="#FF2E3238" />
+    <StaticResource x:Key="ButtonGroupSolidForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPressedBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="ButtonGroupSolidSecondaryBackground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ButtonGroupSolidSecondaryPointeroverBackground" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidSecondaryPressedBackground" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ButtonGroupSolidTertiaryBackground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ButtonGroupSolidTertiaryPointeroverBackground" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidTertiaryPressedBackground" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ButtonGroupSolidSuccessBackground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonGroupSolidSuccessPointeroverBackground" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidSuccessPressedBackground" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ButtonGroupSolidWarningBackground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonGroupSolidWarningPointeroverBackground" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidWarningPressedBackground" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ButtonGroupSolidDangerBackground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ButtonGroupSolidDangerPointeroverBackground" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidDangerPressedBackground" ResourceKey="SemiColorDangerActive" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="ButtonGroupSolidSecondaryBorderBrush" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="ButtonGroupSolidSecondaryPointeroverBorderBrush" ResourceKey="SemiColorSecondaryPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidSecondaryPressedBorderBrush" ResourceKey="SemiColorSecondaryActive" />
+    <StaticResource x:Key="ButtonGroupSolidTertiaryBorderBrush" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="ButtonGroupSolidTertiaryPointeroverBorderBrush" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidTertiaryPressedBorderBrush" ResourceKey="SemiColorTertiaryActive" />
+    <StaticResource x:Key="ButtonGroupSolidSuccessBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="ButtonGroupSolidSuccessPointeroverBorderBrush" ResourceKey="SemiColorSuccessPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidSuccessPressedBorderBrush" ResourceKey="SemiColorSuccessActive" />
+    <StaticResource x:Key="ButtonGroupSolidWarningBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ButtonGroupSolidWarningPointeroverBorderBrush" ResourceKey="SemiColorWarningPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidWarningPressedBorderBrush" ResourceKey="SemiColorWarningActive" />
+    <StaticResource x:Key="ButtonGroupSolidDangerBorderBrush" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="ButtonGroupSolidDangerPointeroverBorderBrush" ResourceKey="SemiColorDangerPointerover" />
+    <StaticResource x:Key="ButtonGroupSolidDangerPressedBorderBrush" ResourceKey="SemiColorDangerActive" />
     <!--  end Solid  -->
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml

@@ -1,7 +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" />
+    <StaticResource x:Key="ClockHandBrush" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ClockHourTickForeground" ResourceKey="SemiColorTertiaryPointerover" />
+    <StaticResource x:Key="ClockMinuteTickForeground" ResourceKey="SemiGrey4" />
+    <StaticResource x:Key="ClockArborFill" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="ClockArborStroke" ResourceKey="SemiColorPrimary" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml

@@ -2,41 +2,35 @@
     <!--CalenderDayButton-->
     <SolidColorBrush x:Key="CalenderDayBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalenderDayBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalenderDayInRangeBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalenderDayTodayBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="CalenderDayTodayForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalenderDayNotCurrentMonthForeground" Opacity="0.6" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalenderDayPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="CalenderDayPressedBackground" Opacity="0.16" Color="White" />
-
-    <SolidColorBrush x:Key="CalenderDaySelectedBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalenderDaySelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="CalenderDaySelectedPointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="CalenderDaySelectedPressedBackground" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="CalendarDayInRangeForeground" Color="#F9F9F9" />
-
-    <SolidColorBrush x:Key="CalenderDayStartEndDateBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDateBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDatePointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDatePressedBackground" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="CalenderDayStartEndDateInRangeBackground" Color="#A9D7FF" />
-
-    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDateBackground" Opacity="0.3" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDatePressedBackground" Opacity="0.4" Color="#54A9FF" />
-
-    <SolidColorBrush x:Key="CalenderDayBlackoutForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="CalenderDayBlackoutBackground" Opacity="0.04" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="CalenderDayBlackoutTodayBackground" Color="#135CB8" />
-
+    <StaticResource x:Key="CalenderDayInRangeBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="CalenderDayTodayBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CalenderDayTodayForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalenderDayNotCurrentMonthForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="CalenderDayPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CalenderDayPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CalenderDaySelectedBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalenderDaySelectedForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="CalenderDaySelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="CalenderDaySelectedPressedBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="CalendarDayInRangeForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="CalenderDayStartEndDateBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalenderDayStartEndDateBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalenderDayStartEndDatePointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="CalenderDayStartEndDatePressedBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="CalenderDayStartEndDateInRangeBackground" ResourceKey="SemiColorPrimaryActive" />
+    <StaticResource x:Key="CalenderDayPreviewStartEndDateBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
+    <StaticResource x:Key="CalenderDayPreviewStartEndDatePressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
+    <StaticResource x:Key="CalenderDayBlackoutForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="CalenderDayBlackoutBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="CalenderDayBlackoutTodayBackground" ResourceKey="SemiColorPrimaryDisabled" />
     <!--CalenderYearButton-->
     <SolidColorBrush x:Key="CalenderYearBackground" Color="Transparent" />
     <SolidColorBrush x:Key="CalenderYearBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="CalenderYearPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="CalenderYearPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="CalenderYearSelectedBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="CalenderYearSelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="CalenderYearSelectedPointeroverBackground" Color="#7FC1FF" />
-
+    <StaticResource x:Key="CalenderYearPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="CalenderYearPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="CalenderYearSelectedBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="CalenderYearSelectedForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="CalenderYearSelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
     <!--CalenderView-->
     <SolidColorBrush x:Key="CalenderViewBackground" Color="Transparent" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/Dialog.axaml

@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FF16161A" Opacity="0.6" />
+    <StaticResource x:Key="OverlayDialogMaskBrush" ResourceKey="SemiColorOverlayBackground" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/Divider.axaml

@@ -1,4 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="DividerBorderBrush" Opacity="0.2" Color="White" />
+    <StaticResource x:Key="DividerBorderBrush" ResourceKey="SemiColorFill2" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml

@@ -1,145 +1,145 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="DualBadgeDefaultIconForeground">White</SolidColorBrush>
-    <SolidColorBrush x:Key="DualBadgeDefaultHeaderForeground">White</SolidColorBrush>
-    <SolidColorBrush x:Key="DualBadgeDefaultForeground">White</SolidColorBrush>
+    <StaticResource x:Key="DualBadgeDefaultIconForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="DualBadgeDefaultHeaderForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="DualBadgeDefaultForeground" ResourceKey="SemiColorWhite" />
     <LinearGradientBrush x:Key="DualBadgeDefaultHeaderBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF555B61" Offset="0" />
-        <GradientStop Color="#FF41464C" Offset="1" />
+        <GradientStop Color="#555B61" Offset="0" />
+        <GradientStop Color="#41464C" Offset="1" />
     </LinearGradientBrush>
 
     <LinearGradientBrush x:Key="DualBadgeFlatRedBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFFA664C" Offset="0" />
-        <GradientStop Color="#FFF93920" Offset="1" />
+        <GradientStop Color="#FA664C" Offset="0" />
+        <GradientStop Color="#F93920" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatPinkBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFED487B" Offset="0" />
-        <GradientStop Color="#FFE91E63" Offset="1" />
+        <GradientStop Color="#ED487B" Offset="0" />
+        <GradientStop Color="#E91E63" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatPurpleBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFB449C2" Offset="0" />
-        <GradientStop Color="#FF9E28B3" Offset="1" />
+        <GradientStop Color="#B449C2" Offset="0" />
+        <GradientStop Color="#9E28B3" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatVioletBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF885BD2" Offset="0" />
-        <GradientStop Color="#FF6A3AC7" Offset="1" />
+        <GradientStop Color="#885BD2" Offset="0" />
+        <GradientStop Color="#6A3AC7" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatIndigoBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF5E6FC4" Offset="0" />
-        <GradientStop Color="#FF3F51B5" Offset="1" />
+        <GradientStop Color="#5E6FC4" Offset="0" />
+        <GradientStop Color="#3F51B5" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatBlueBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF3295FB" Offset="0" />
-        <GradientStop Color="#FF0077FA" Offset="1" />
+        <GradientStop Color="#3295FB" Offset="0" />
+        <GradientStop Color="#0077FA" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatLightBlueBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF30ACF1" Offset="0" />
-        <GradientStop Color="#FF0095EE" Offset="1" />
+        <GradientStop Color="#30ACF1" Offset="0" />
+        <GradientStop Color="#0095EE" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatCyanBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF2CB8C5" Offset="0" />
-        <GradientStop Color="#FF2CB8C5" Offset="1" />
+        <GradientStop Color="#2CB8C5" Offset="0" />
+        <GradientStop Color="#2CB8C5" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatTealBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF27C2B0" Offset="0" />
-        <GradientStop Color="#FF00B3A1" Offset="1" />
+        <GradientStop Color="#27C2B0" Offset="0" />
+        <GradientStop Color="#00B3A1" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatGreenBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF5AC262" Offset="0" />
-        <GradientStop Color="#FF3BB346" Offset="1" />
+        <GradientStop Color="#5AC262" Offset="0" />
+        <GradientStop Color="#3BB346" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatLightGreenBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF93C55B" Offset="0" />
-        <GradientStop Color="#FF7BB63C" Offset="1" />
+        <GradientStop Color="#93C55B" Offset="0" />
+        <GradientStop Color="#7BB63C" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatLimeBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFA7DA2C" Offset="0" />
-        <GradientStop Color="#FF9BD100" Offset="1" />
+        <GradientStop Color="#A7DA2C" Offset="0" />
+        <GradientStop Color="#9BD100" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatYellowBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFFBDA32" Offset="0" />
-        <GradientStop Color="#FFFAC800" Offset="1" />
+        <GradientStop Color="#FBDA32" Offset="0" />
+        <GradientStop Color="#FAC800" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatAmberBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFF3C641" Offset="0" />
-        <GradientStop Color="#FFF0B114" Offset="1" />
+        <GradientStop Color="#F3C641" Offset="0" />
+        <GradientStop Color="#F0B114" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatOrangeBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFFDA633" Offset="0" />
-        <GradientStop Color="#FFFC8800" Offset="1" />
+        <GradientStop Color="#FDA633" Offset="0" />
+        <GradientStop Color="#FC8800" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgeFlatGreyBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF888D92" Offset="0" />
-        <GradientStop Color="#FF6B7075" Offset="1" />
+        <GradientStop Color="#888D92" Offset="0" />
+        <GradientStop Color="#6B7075" Offset="1" />
     </LinearGradientBrush>
 
 
     <LinearGradientBrush x:Key="DualBadgePlasticHeaderBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF555B61" Offset="0" />
-        <GradientStop Color="#FF2E3238" Offset="1" />
+        <GradientStop Color="#555B61" Offset="0" />
+        <GradientStop Color="#2E3238" Offset="1" />
     </LinearGradientBrush>
 
     <LinearGradientBrush x:Key="DualBadgePlasticRedBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFFA664C" Offset="0" />
-        <GradientStop Color="#FFD52515" Offset="1" />
+        <GradientStop Color="#FA664C" Offset="0" />
+        <GradientStop Color="#D52515" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticPinkBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFED487B" Offset="0" />
-        <GradientStop Color="#FFC51356" Offset="1" />
+        <GradientStop Color="#ED487B" Offset="0" />
+        <GradientStop Color="#C51356" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticPurpleBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFB449C2" Offset="0" />
-        <GradientStop Color="#FF871E9E" Offset="1" />
+        <GradientStop Color="#B449C2" Offset="0" />
+        <GradientStop Color="#871E9E" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticVioletBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF885BD2" Offset="0" />
-        <GradientStop Color="#FF572FB3" Offset="1" />
+        <GradientStop Color="#885BD2" Offset="0" />
+        <GradientStop Color="#572FB3" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticIndigoBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF5E6FC4" Offset="0" />
-        <GradientStop Color="#FF3342A1" Offset="1" />
+        <GradientStop Color="#5E6FC4" Offset="0" />
+        <GradientStop Color="#3342A1" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticBlueBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF3295FB" Offset="0" />
-        <GradientStop Color="#FF0077FA" Offset="1" />
+        <GradientStop Color="#3295FB" Offset="0" />
+        <GradientStop Color="#0077FA" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticLightBlueBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF30ACF1" Offset="0" />
-        <GradientStop Color="#FF007BCA" Offset="1" />
+        <GradientStop Color="#30ACF1" Offset="0" />
+        <GradientStop Color="#007BCA" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticCyanBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF2CB8C5" Offset="0" />
-        <GradientStop Color="#FF038698" Offset="1" />
+        <GradientStop Color="#2CB8C5" Offset="0" />
+        <GradientStop Color="#038698" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticTealBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF27C2B0" Offset="0" />
-        <GradientStop Color="#FF009589" Offset="1" />
+        <GradientStop Color="#27C2B0" Offset="0" />
+        <GradientStop Color="#009589" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticGreenBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF5AC262" Offset="0" />
-        <GradientStop Color="#FF30953B" Offset="1" />
+        <GradientStop Color="#5AC262" Offset="0" />
+        <GradientStop Color="#30953B" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticLightGreenBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF93C55B" Offset="0" />
-        <GradientStop Color="#FF649830" Offset="1" />
+        <GradientStop Color="#93C55B" Offset="0" />
+        <GradientStop Color="#649830" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticLimeBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFA7DA2C" Offset="0" />
-        <GradientStop Color="#FF7EAE00" Offset="1" />
+        <GradientStop Color="#A7DA2C" Offset="0" />
+        <GradientStop Color="#7EAE00" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticYellowBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFFBDA32" Offset="0" />
-        <GradientStop Color="#FFD0AA00" Offset="1" />
+        <GradientStop Color="#FBDA32" Offset="0" />
+        <GradientStop Color="#D0AA00" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticAmberBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFF3C641" Offset="0" />
-        <GradientStop Color="#FFC88A0F" Offset="1" />
+        <GradientStop Color="#F3C641" Offset="0" />
+        <GradientStop Color="#C88A0F" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticOrangeBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FFFDA633" Offset="0" />
-        <GradientStop Color="#FFD26700" Offset="1" />
+        <GradientStop Color="#FDA633" Offset="0" />
+        <GradientStop Color="#D26700" Offset="1" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="DualBadgePlasticGreyBackground" StartPoint="0%,0%" EndPoint="0%,100%">
-        <GradientStop Color="#FF888D92" Offset="0" />
-        <GradientStop Color="#FF555B61" Offset="1" />
+        <GradientStop Color="#888D92" Offset="0" />
+        <GradientStop Color="#555B61" Offset="1" />
     </LinearGradientBrush>
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/Form.axaml

@@ -1,4 +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" />
+    <StaticResource x:Key="FormGroupForeground" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="FormAsteriskForeground" ResourceKey="SemiColorDangerPointerover" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/Loading.axaml

@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="LoadingIconForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="LoadingMaskBackground" Opacity="0.12" Color="White" />
+    <StaticResource x:Key="LoadingIconForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="LoadingMaskBackground" ResourceKey="SemiColorFill0" />
 </ResourceDictionary>

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">
-    <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Opacity="0.62" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="NavigationMenuItemSeparatorBorderForeground" Opacity="0.08" Color="White" />
+    <StaticResource x:Key="NavigationMenuItemExpandIconForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="NavigationMenuItemSeparatorBorderForeground" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/NotificationShared.axaml

@@ -1,15 +1,13 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BoxShadows x:Key="NotificationCardBoxShadows">inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000</BoxShadows>
-    <SolidColorBrush x:Key="NotificationCardLightBackground" Color="#16161A" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBorderBrush" Color="#5DC264" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBackground" Opacity="0.2" Color="#5DC264" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBorderBrush" Color="#FFAE43" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBackground" Opacity="0.2" Color="#FFAE43" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBorderBrush" Color="#FC725A" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBackground" Opacity="0.2" Color="#FC725A" />
-
-    <SolidColorBrush x:Key="NotificationCardCloseButtonForeground" Opacity="0.8" Color="#F9F9F9" />
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="NotificationCardBoxShadows" ResourceKey="SemiShadowElevated" />
+    <StaticResource x:Key="NotificationCardLightBackground" ResourceKey="SemiColorBackground0" />
+    <StaticResource x:Key="NotificationCardLightInformationBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="NotificationCardLightInformationBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="NotificationCardLightSuccessBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="NotificationCardLightSuccessBackground" ResourceKey="SemiColorSuccessLight" />
+    <StaticResource x:Key="NotificationCardLightWarningBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="NotificationCardLightWarningBackground" ResourceKey="SemiColorWarningLight" />
+    <StaticResource x:Key="NotificationCardLightErrorBorderBrush" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="NotificationCardLightErrorBackground" ResourceKey="SemiColorDangerLight" />
+    <StaticResource x:Key="NotificationCardCloseButtonForeground" ResourceKey="SemiColorText1" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/Pagination.axaml

@@ -1,10 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="PaginationButtonDefaultForeground" Color="#FFF9F9F9" />
-    <SolidColorBrush x:Key="PaginationButtonSelectedForeground" Color="#FF54A9FF" />
-    <SolidColorBrush x:Key="PaginationButtonIconForeground" Opacity="0.6" Color="#FFF9F9F9" />
+    <StaticResource x:Key="PaginationButtonDefaultForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="PaginationButtonSelectedForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="PaginationButtonIconForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="PaginationButtonDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="PaginationButtonPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="PaginationButtonPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="PaginationButtonSelectedBackground" Opacity="0.2" Color="#FF54A9FF" />
+    <StaticResource x:Key="PaginationButtonPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="PaginationButtonPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="PaginationButtonSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/PopConfirm.axaml

@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="PopConfirmBackground">#43444A</SolidColorBrush>
-    <SolidColorBrush x:Key="PopConfirmBorderBrush" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="PopConfirmContentForeground" Opacity="0.6" Color="#F9F9F9" />
-    <BoxShadows x:Key="PopConfirmBorderBoxShadows">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
+    <StaticResource x:Key="PopConfirmBackground" ResourceKey="SemiColorBackground3" />
+    <StaticResource x:Key="PopConfirmBorderBrush" ResourceKey="SemiColorBorder" />
+    <StaticResource x:Key="PopConfirmContentForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="PopConfirmBorderBoxShadows" ResourceKey="SemiShadowElevated" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/Rating.axaml

@@ -1,4 +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" />
+    <StaticResource x:Key="RatingCharacterForeground" ResourceKey="SemiYellow5" />
+    <StaticResource x:Key="RatingCharacterBackground" ResourceKey="SemiColorFill0" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/SelectionList.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="SelectionListIndicatorBackground" Color="#FF0A4694"></SolidColorBrush>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="SelectionListIndicatorBackground" ResourceKey="SemiBlue1" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/Skeleton.axaml

@@ -1,14 +1,13 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <LinearGradientBrush x:Key="SkeletonStartAnimationBackground" StartPoint="0%,100%" EndPoint="100%,100%">
-        <GradientStop Offset="0" Color="#FF1C1F23" />
-        <GradientStop Offset="0" Color="#FF2E3238" />
-        <GradientStop Offset="1" Color="#FF1C1F23" />
+        <GradientStop Offset="0" Color="#1C1F23" />
+        <GradientStop Offset="0" Color="#2E3238" />
+        <GradientStop Offset="1" Color="#1C1F23" />
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="SkeletonEndAnimationBackground" StartPoint="0%,100%" EndPoint="100%,100%">
-        <GradientStop Offset="0" Color="#FF1C1F23" />
-        <GradientStop Offset="1" Color="#FF2E3238" />
-        <GradientStop Offset="1" Color="#FF1C1F23" />
+        <GradientStop Offset="0" Color="#1C1F23" />
+        <GradientStop Offset="1" Color="#2E3238" />
+        <GradientStop Offset="1" Color="#1C1F23" />
     </LinearGradientBrush>
-    <SolidColorBrush x:Key="SkeletonDefaultBackground" Color="#FF1C1F23"></SolidColorBrush>
-    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="SkeletonDefaultBackground" Color="#1C1F23" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml

@@ -1,6 +1,5 @@
 <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" />
+    <StaticResource x:Key="ClosableTagForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ClosableTagBackground" ResourceKey="SemiColorBackground4" />
+    <SolidColorBrush x:Key="ClosableTagBorder" Opacity="0.7" Color="{StaticResource SemiGrey2Color}" />
 </ResourceDictionary>

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">
-    <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" />
+    <StaticResource x:Key="TimelineHeaderForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="DefaultTimelineIconForeground" ResourceKey="SemiColorFill2" />
+    <StaticResource x:Key="OngoingTimelineIconForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="SuccessTimelineIconForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="WarningTimelineIconForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="ErrorTimelineIconForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="TimelineLineBrush" ResourceKey="SemiColorFill2" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/Toast.axaml

@@ -1,5 +1,4 @@
-<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 xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="ToastCardContentForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="ToastCardBackground" ResourceKey="SemiColorBackground3" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/ToolBar.axaml

@@ -1,4 +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" />
+    <StaticResource x:Key="ToolBarHeaderForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="ToolBarSeparatorForeground" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Dark/TwoTonePathIcon.axaml

@@ -1,6 +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"/>
+    <StaticResource x:Key="TwoTonePathIconForeground" ResourceKey="SemiColorPrimaryDisabled" />
+    <StaticResource x:Key="TwoTonePathIconStrokeBrush" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="TwoTonePathIconActiveForeground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="TwoTonePathIconActiveStrokeBrush" ResourceKey="SemiColorPrimaryPointerover" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml

@@ -7,6 +7,14 @@
     <Color x:Key="HighlightColor">#8EE3F0</Color>
     <Color x:Key="ButtonTextColor">#FFFFFF</Color>
     <Color x:Key="ButtonFaceColor">#202020</Color>
+    <SolidColorBrush x:Key="SemiColorWindow" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="SemiColorWindowText" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHotlight" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="SemiColorGrayText" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlightText" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlight" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonText" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonFace" Color="{StaticResource ButtonFaceColor}" />
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="_index.axaml" />
     </ResourceDictionary.MergedDictionaries>

src/Ursa.Themes.Semi/Themes/HighContrast/Badge.axaml

@@ -1,9 +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}" />
+    <StaticResource x:Key="BadgeBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="BadgeForeground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="BadgeContentForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="BadgePrimaryBadgeBackground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="BadgeLightPrimaryBadgeForeground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="BadgeInvertedBadgeBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="BadgeInvertedPrimaryBadgeForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/Banner.axaml

@@ -1,6 +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}" />
+    <StaticResource x:Key="BannerInformationBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="BannerBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="BannerInformationBorderBrush" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="BannerCloseButtonForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/Breadcrumb.axaml

@@ -1,6 +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}" />
+    <StaticResource x:Key="BreadcrumbItemForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="BreadcrumbItemSeparatorForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="BreadcrumbItemLastForeground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="BreadcrumbItemPointeroverForeground" ResourceKey="SemiColorHighlight" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/ButtonGroup.axaml

@@ -1,32 +1,32 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ButtonGroupSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
+    <StaticResource x:Key="ButtonGroupSeparatorForeground" ResourceKey="SemiColorButtonText" />
     <!--  Light  -->
-    <SolidColorBrush x:Key="ButtonGroupDefaultPrimaryForeground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="ButtonGroupDefaultPrimaryForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonGroupDefaultDisabledForeground" ResourceKey="SemiColorGrayText" />
 
-    <SolidColorBrush x:Key="ButtonGroupDefaultBackground" Color="{StaticResource ButtonFaceColor}" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPressedBackground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="ButtonGroupDefaultBackground" ResourceKey="ButtonFaceColor" />
+    <StaticResource x:Key="ButtonGroupDefaultPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ButtonGroupDefaultPressedBackground" ResourceKey="SemiColorHighlight" />
 
-    <SolidColorBrush x:Key="ButtonGroupDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="ButtonGroupDefaultBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonGroupDefaultPointeroverBorderBrush" ResourceKey="SemiColorHighlight" />
     <SolidColorBrush x:Key="ButtonGroupDefaultPressedBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="ButtonGroupDefaultDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="ButtonGroupDefaultDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
 
     <!--  end Light  -->
 
     <!--  Solid  -->
-    <SolidColorBrush x:Key="ButtonGroupSolidForeground" Color="{StaticResource HighlightTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledForeground" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="ButtonGroupSolidForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="ButtonGroupSolidDisabledForeground" ResourceKey="SemiColorGrayText" />
 
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBackground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPointeroverBackground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPressedBackground" ResourceKey="SemiColorHighlight" />
 
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryBorderBrush" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
-    <SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" ResourceKey="SemiColorHighlight" />
 
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="ButtonGroupSolidDisabledBorderBrush" ResourceKey="SemiColorGrayText" />
     <!--  end Solid  -->
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/Clock.axaml

@@ -1,7 +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}" />
+    <StaticResource x:Key="ClockHandBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ClockHourTickForeground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="ClockMinuteTickForeground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="ClockArborFill" ResourceKey="SemiColorButtonFace" />
+    <StaticResource x:Key="ClockArborStroke" ResourceKey="SemiColorButtonText" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/DatePicker.axaml

@@ -2,40 +2,40 @@
     <!--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}" />
+    <StaticResource x:Key="CalenderDayInRangeBackground" ResourceKey="SemiColorHotlight" />
+    <StaticResource x:Key="CalenderDayTodayBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayTodayForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="CalenderDayNotCurrentMonthForeground" ResourceKey="SemiColorGrayText" />
+    <StaticResource x:Key="CalenderDayPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayPressedBackground" ResourceKey="SemiColorHighlight" />
 
-    <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="CalendarDayInRangeForeground" Color="{StaticResource HighlightTextColor}" />
+    <StaticResource x:Key="CalenderDaySelectedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDaySelectedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CalenderDaySelectedPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDaySelectedPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalendarDayInRangeForeground" ResourceKey="SemiColorHighlightText" />
 
-    <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}" />
+    <StaticResource x:Key="CalenderDayStartEndDateBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayStartEndDateBorderBrush" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayStartEndDatePointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayStartEndDatePressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayStartEndDateInRangeBackground" ResourceKey="SemiColorHighlight" />
 
-    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDateBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDatePressedBackground" Color="{StaticResource HighlightColor}" />
+    <StaticResource x:Key="CalenderDayPreviewStartEndDateBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderDayPreviewStartEndDatePressedBackground" ResourceKey="SemiColorHighlight" />
 
-    <SolidColorBrush x:Key="CalenderDayBlackoutForeground" Color="{StaticResource GrayTextColor}" />
+    <StaticResource x:Key="CalenderDayBlackoutForeground" ResourceKey="SemiColorGrayText" />
     <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}" />
+    <StaticResource x:Key="CalenderYearPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderYearPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderYearSelectedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="CalenderYearSelectedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="CalenderYearSelectedPointeroverBackground" ResourceKey="SemiColorHighlight" />
 
     <!--CalenderView-->
     <SolidColorBrush x:Key="CalenderViewBackground" Color="Transparent" />

src/Ursa.Themes.Semi/Themes/HighContrast/Desert.axaml

@@ -7,6 +7,14 @@
     <Color x:Key="HighlightColor">#903909</Color>
     <Color x:Key="ButtonTextColor">#202020</Color>
     <Color x:Key="ButtonFaceColor">#FFFAEF</Color>
+    <SolidColorBrush x:Key="SemiColorWindow" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="SemiColorWindowText" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHotlight" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="SemiColorGrayText" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlightText" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlight" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonText" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonFace" Color="{StaticResource ButtonFaceColor}" />
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="_index.axaml" />
     </ResourceDictionary.MergedDictionaries>

src/Ursa.Themes.Semi/Themes/HighContrast/Divider.axaml

@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="DividerBorderBrush" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="DividerBorderBrush" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/Dusk.axaml

@@ -7,6 +7,14 @@
     <Color x:Key="HighlightColor">#A1BFDE</Color>
     <Color x:Key="ButtonTextColor">#B6F6F0</Color>
     <Color x:Key="ButtonFaceColor">#2D3236</Color>
+    <SolidColorBrush x:Key="SemiColorWindow" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="SemiColorWindowText" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHotlight" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="SemiColorGrayText" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlightText" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlight" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonText" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonFace" Color="{StaticResource ButtonFaceColor}" />
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="_index.axaml" />
     </ResourceDictionary.MergedDictionaries>

src/Ursa.Themes.Semi/Themes/HighContrast/Form.axaml

@@ -1,4 +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}" />
+    <StaticResource x:Key="FormGroupForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="FormAsteriskForeground" ResourceKey="SemiColorHighlight" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/NavigationMenu.axaml

@@ -1,4 +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}" />
+    <StaticResource x:Key="NavigationMenuItemExpandIconForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="NavigationMenuItemSeparatorBorderForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/NightSky.axaml

@@ -7,6 +7,14 @@
     <Color x:Key="HighlightColor">#D6B4FD</Color>
     <Color x:Key="ButtonTextColor">#FFEE32</Color>
     <Color x:Key="ButtonFaceColor">#000000</Color>
+    <SolidColorBrush x:Key="SemiColorWindow" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="SemiColorWindowText" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHotlight" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="SemiColorGrayText" Color="{StaticResource GrayTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlightText" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="SemiColorHighlight" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonText" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="SemiColorButtonFace" Color="{StaticResource ButtonFaceColor}" />
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="_index.axaml" />
     </ResourceDictionary.MergedDictionaries>

src/Ursa.Themes.Semi/Themes/HighContrast/Pagination.axaml

@@ -1,9 +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}" />
+    <StaticResource x:Key="PaginationButtonDefaultForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="PaginationButtonSelectedForeground" ResourceKey="SemiColorHighlightText" />
+    <StaticResource x:Key="PaginationButtonIconForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="PaginationButtonDefaultBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="PaginationButtonPointeroverBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="PaginationButtonPressedBackground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="PaginationButtonSelectedBackground" ResourceKey="SemiColorHighlight" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/Rating.axaml

@@ -1,4 +0,0 @@
-<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>

src/Ursa.Themes.Semi/Themes/HighContrast/SelectionList.axaml

@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="{StaticResource WindowColor}" />
+    <StaticResource x:Key="SelectionListIndicatorBackground" ResourceKey="SemiColorWindow" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/TagInput.axaml

@@ -1,5 +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}" />
+    <StaticResource x:Key="ClosableTagBackground" ResourceKey="SemiColorWindow" />
+    <StaticResource x:Key="ClosableTagForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="ClosableTagBorder" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/Timeline.axaml

@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="TimelineHeaderForeground" Color="{StaticResource WindowTextColor}" />
+    <StaticResource x:Key="TimelineHeaderForeground" ResourceKey="SemiColorWindowText" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/Toast.axaml

@@ -1,5 +0,0 @@
-<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>

src/Ursa.Themes.Semi/Themes/HighContrast/ToolBar.axaml

@@ -1,4 +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}" />
+    <StaticResource x:Key="ToolBarHeaderForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="ToolBarSeparatorForeground" ResourceKey="SemiColorButtonText" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/TwoTonePathIcon.axaml

@@ -1,6 +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}" />
+    <StaticResource x:Key="TwoTonePathIconForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="TwoTonePathIconStrokeBrush" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="TwoTonePathIconActiveForeground" ResourceKey="SemiColorButtonText" />
+    <StaticResource x:Key="TwoTonePathIconActiveStrokeBrush" ResourceKey="SemiColorButtonText" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/HighContrast/_index.axaml

@@ -13,7 +13,6 @@
         <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>

src/Ursa.Themes.Semi/Themes/Light/Avatar.axaml

@@ -1,19 +1,19 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AvatarForeground" Color="White" />
-    <SolidColorBrush x:Key="AvatarRedBackground" Color="#FB9078" />
-    <SolidColorBrush x:Key="AvatarPinkBackground" Color="#F27396" />
-    <SolidColorBrush x:Key="AvatarPurpleBackground" Color="#C96FD1" />
-    <SolidColorBrush x:Key="AvatarVioletBackground" Color="#A67FDD" />
-    <SolidColorBrush x:Key="AvatarIndigoBackground" Color="#8090D3" />
-    <SolidColorBrush x:Key="AvatarBlueBackground" Color="#65B2FC" />
-    <SolidColorBrush x:Key="AvatarLightBlueBackground" Color="#62C3F5" />
-    <SolidColorBrush x:Key="AvatarCyanBackground" Color="#58CBD3" />
-    <SolidColorBrush x:Key="AvatarTealBackground" Color="#54D1C1" />
-    <SolidColorBrush x:Key="AvatarGreenBackground" Color="#7DD182" />
-    <SolidColorBrush x:Key="AvatarLightGreenBackground" Color="#ADD37E" />
-    <SolidColorBrush x:Key="AvatarLimeBackground" Color="#B7E35B" />
-    <SolidColorBrush x:Key="AvatarYellowBackground" Color="#FCE865" />
-    <SolidColorBrush x:Key="AvatarAmberBackground" Color="#F6D86F" />
-    <SolidColorBrush x:Key="AvatarOrangeBackground" Color="#FDC165" />
-    <SolidColorBrush x:Key="AvatarGreyBackground" Color="#A7ABB0" />
+    <StaticResource x:Key="AvatarForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="AvatarRedBackground" ResourceKey="SemiRed3" />
+    <StaticResource x:Key="AvatarPinkBackground" ResourceKey="SemiPink3" />
+    <StaticResource x:Key="AvatarPurpleBackground" ResourceKey="SemiPurple3" />
+    <StaticResource x:Key="AvatarVioletBackground" ResourceKey="SemiViolet3" />
+    <StaticResource x:Key="AvatarIndigoBackground" ResourceKey="SemiIndigo3" />
+    <StaticResource x:Key="AvatarBlueBackground" ResourceKey="SemiBlue3" />
+    <StaticResource x:Key="AvatarLightBlueBackground" ResourceKey="SemiLightBlue3" />
+    <StaticResource x:Key="AvatarCyanBackground" ResourceKey="SemiCyan3" />
+    <StaticResource x:Key="AvatarTealBackground" ResourceKey="SemiTeal3" />
+    <StaticResource x:Key="AvatarGreenBackground" ResourceKey="SemiGreen3" />
+    <StaticResource x:Key="AvatarLightGreenBackground" ResourceKey="SemiLightGreen3" />
+    <StaticResource x:Key="AvatarLimeBackground" ResourceKey="SemiLime3" />
+    <StaticResource x:Key="AvatarYellowBackground" ResourceKey="SemiYellow3" />
+    <StaticResource x:Key="AvatarAmberBackground" ResourceKey="SemiAmber3" />
+    <StaticResource x:Key="AvatarOrangeBackground" ResourceKey="SemiOrange3" />
+    <StaticResource x:Key="AvatarGreyBackground" ResourceKey="SemiGrey3" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Light/Badge.axaml

@@ -3,32 +3,31 @@
     <SolidColorBrush x:Key="BadgeForeground" Color="White" />
     <SolidColorBrush x:Key="BadgeContentForeground" Color="#1C1F23" />
     <!-- Solid -->
-    <SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="BadgeSecondaryBadgeBackground" Color="#0095EE" />
-    <SolidColorBrush x:Key="BadgeTertiaryBadgeBackground" Color="#6B7075" />
-    <SolidColorBrush x:Key="BadgeSuccessBadgeBackground" Color="#3BB346" />
-    <SolidColorBrush x:Key="BadgeWarningBadgeBackground" Color="#FC8800" />
-    <SolidColorBrush x:Key="BadgeDangerBadgeBackground" Color="#F93920" />
+    <StaticResource x:Key="BadgePrimaryBadgeBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="BadgeSecondaryBadgeBackground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="BadgeTertiaryBadgeBackground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="BadgeSuccessBadgeBackground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="BadgeWarningBadgeBackground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="BadgeDangerBadgeBackground" ResourceKey="SemiColorDanger" />
     <!-- Light -->
-    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeForeground" Color="#0095EE" />
-    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeBackground" Color="#E9F7FD" />
-    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeForeground" Color="#6B7075" />
-    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeBackground" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="BadgeLightSuccessBadgeForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="BadgeLightSuccessBadgeBackground" Color="#ECF7EC" />
-    <SolidColorBrush x:Key="BadgeLightWarningBadgeForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="BadgeLightWarningBadgeBackground" Color="#FFF8EA" />
-    <SolidColorBrush x:Key="BadgeLightDangerBadgeForeground" Color="#F93920" />
-    <SolidColorBrush x:Key="BadgeLightDangerBadgeBackground" Color="#FEF2ED" />
+    <StaticResource x:Key="BadgeLightPrimaryBadgeForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="BadgeLightPrimaryBadgeBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="BadgeLightSecondaryBadgeForeground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="BadgeLightSecondaryBadgeBackground" ResourceKey="SemiColorSecondaryLight" />
+    <StaticResource x:Key="BadgeLightTertiaryBadgeForeground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="BadgeLightTertiaryBadgeBackground" ResourceKey="SemiColorTertiaryLight" />
+    <StaticResource x:Key="BadgeLightSuccessBadgeForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="BadgeLightSuccessBadgeBackground" ResourceKey="SemiColorSuccessLight" />
+    <StaticResource x:Key="BadgeLightWarningBadgeForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="BadgeLightWarningBadgeBackground" ResourceKey="SemiColorWarningLight" />
+    <StaticResource x:Key="BadgeLightDangerBadgeForeground" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="BadgeLightDangerBadgeBackground" ResourceKey="SemiColorDangerLight" />
     <!-- Inverted -->
     <SolidColorBrush x:Key="BadgeInvertedBadgeBackground" Color="White" />
-
-    <SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="BadgeInvertedSecondaryBadgeForeground" Color="#0095EE" />
-    <SolidColorBrush x:Key="BadgeInvertedTertiaryBadgeForeground" Color="#6B7075" />
-    <SolidColorBrush x:Key="BadgeInvertedSuccessBadgeForeground" Color="#3BB346" />
-    <SolidColorBrush x:Key="BadgeInvertedWarningBadgeForeground" Color="#FC8800" />
-    <SolidColorBrush x:Key="BadgeInvertedDangerBadgeForeground" Color="#F93920" />
+    <StaticResource x:Key="BadgeInvertedPrimaryBadgeForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="BadgeInvertedSecondaryBadgeForeground" ResourceKey="SemiColorSecondary" />
+    <StaticResource x:Key="BadgeInvertedTertiaryBadgeForeground" ResourceKey="SemiColorTertiary" />
+    <StaticResource x:Key="BadgeInvertedSuccessBadgeForeground" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="BadgeInvertedWarningBadgeForeground" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="BadgeInvertedDangerBadgeForeground" ResourceKey="SemiColorDanger" />
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Light/Banner.axaml

@@ -1,14 +1,12 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="BannerInformationBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="BannerInformationBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="BannerSuccessBackground" Color="#ECF7EC" />
-    <SolidColorBrush x:Key="BannerSuccessBorderBrush" Color="#3BB346" />
-    <SolidColorBrush x:Key="BannerWarningBackground" Color="#FFF8EA" />
-    <SolidColorBrush x:Key="BannerWarningBorderBrush" Color="#FC8800" />
-    <SolidColorBrush x:Key="BannerErrorBackground" Color="#FEF2ED" />
-    <SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#F93920" />
-
-    <SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.62" Color="#1C1F23" />
+    <StaticResource x:Key="BannerInformationBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="BannerInformationBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="BannerSuccessBackground" ResourceKey="SemiColorSuccessLight" />
+    <StaticResource x:Key="BannerSuccessBorderBrush" ResourceKey="SemiColorSuccess" />
+    <StaticResource x:Key="BannerWarningBackground" ResourceKey="SemiColorWarningLight" />
+    <StaticResource x:Key="BannerWarningBorderBrush" ResourceKey="SemiColorWarning" />
+    <StaticResource x:Key="BannerErrorBackground" ResourceKey="SemiColorDangerLight" />
+    <StaticResource x:Key="BannerErrorBorderBrush" ResourceKey="SemiColorDanger" />
+    <StaticResource x:Key="BannerCloseButtonForeground" ResourceKey="SemiColorText2" />
     <SolidColorBrush x:Key="BannerBorderBrush" Color="Transparent" />
 </ResourceDictionary>