Merge branch 'refs/heads/main' into ElasticWrapPanel

# Conflicts:
#	demo/Ursa.Demo/Models/MenuKeys.cs
#	demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
#	demo/Ursa.Demo/ViewModels/MenuViewModel.cs
#	src/Ursa.Themes.Semi/Controls/_index.axaml

src/Ursa.PrismExtension/IUrsaDialogService.cs

@@ -0,0 +1,15 @@
+using Avalonia.Controls;
+using Ursa.Controls;
+
+namespace Ursa.PrismExtension;
+
+public interface IUrsaDialogService
+{
+    public void ShowCustom(string viewName, object? vm, Window? owner = null, DialogOptions? options = null);
+
+    public Task<DialogResult> ShowModal(string viewName, object? vm, Window? owner = null,
+        DialogOptions? options = null);
+
+    public Task<TResult?> ShowCustomModal<TResult>(string viewName, object? vm, Window? owner = null,
+        DialogOptions? options = null);
+}

src/Ursa.PrismExtension/IUrsaDrawerService.cs

@@ -0,0 +1,12 @@
+using Ursa.Controls;
+using Ursa.Controls.Options;
+
+namespace Ursa.PrismExtension;
+
+public interface IUrsaDrawerService
+{
+    public void Show(string viewName, object? vm, string? hostId = null, DrawerOptions? options = null);
+    public void ShowCustom<TResult>(string viewName, object? vm, string? hostId = null, DrawerOptions? options = null);
+    public Task<DialogResult> ShowModal(string viewName, object? vm, string? hostId = null, DrawerOptions? options = null);
+    public Task<TResult?> ShowCustomModal<TResult>(string viewName, object? vm, string? hostId = null, DrawerOptions? options = null);
+}

src/Ursa.PrismExtension/IUrsaOverlayDialogService.cs

@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using Ursa.Controls;
+
+namespace Ursa.PrismExtension;
+
+public interface IUrsaOverlayDialogService
+{
+    public void Show(string viewName, object? vm, string? hostId = null, OverlayDialogOptions? options = null);
+
+    public void ShowCustom(string viewName, object? vm, string? hostId = null, OverlayDialogOptions? options = null);
+
+    public Task<DialogResult> ShowModal(string viewName, object? vm, string? hostId = null,
+        OverlayDialogOptions? options = null);
+
+    public Task<TResult?> ShowCustomModal<TResult>(string viewName, object? vm, string? hostId = null,
+        OverlayDialogOptions? options = null);
+}

src/Ursa.PrismExtension/Ursa.PrismExtension.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <Version>0.3.0-beta20240226</Version>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Authors>IRIHI Technology Co., Ltd.</Authors>
+        <Nullable>enable</Nullable>
+        <LangVersion>latest</LangVersion>
+        <PackageId>Irihi.Ursa.PrismExtension</PackageId>
+        <PackageIcon>irihi.png</PackageIcon>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Ursa\Ursa.csproj"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Prism.Core" Version="8.1.97"/>
+        <None Include="irihi.png" Pack="true" PackagePath=""/>
+    </ItemGroup>
+
+</Project>

src/Ursa.PrismExtension/UrsaDialogService.cs

@@ -0,0 +1,26 @@
+using Avalonia.Controls;
+using Prism.Ioc;
+using Ursa.Controls;
+
+namespace Ursa.PrismExtension;
+
+public class UrsaDialogService(IContainerExtension container) : IUrsaDialogService
+{
+    public void ShowCustom(string viewName, object? vm, Window? owner = null, DialogOptions? options = null)
+    {
+        var v = container.Resolve<Control>(UrsaDialogServiceExtension.UrsaDialogViewPrefix + viewName);
+        Dialog.ShowCustom(v, vm, owner, options);
+    }
+    
+    public Task<DialogResult> ShowModal(string viewName, object? vm, Window? owner = null, DialogOptions? options = null)
+    {
+        var v = container.Resolve<Control>(UrsaDialogServiceExtension.UrsaDialogViewPrefix + viewName);
+        return Dialog.ShowModal(v, vm, owner, options);
+    }
+    
+    public Task<TResult?> ShowCustomModal<TResult>(string viewName, object? vm, Window? owner = null, DialogOptions? options = null)
+    {
+        var v = container.Resolve<Control>(UrsaDialogServiceExtension.UrsaDialogViewPrefix + viewName);
+        return Dialog.ShowCustomModal<TResult>(v, vm, owner, options);
+    }
+}

src/Ursa.PrismExtension/UrsaDialogServiceExtension.cs

@@ -0,0 +1,21 @@
+using Avalonia.Controls;
+using Prism.Ioc;
+
+namespace Ursa.PrismExtension;
+
+public static class UrsaDialogServiceExtension
+{
+    internal const string UrsaDialogViewPrefix = "URSA_DIALOG_VIEW_";
+    
+    public static void RegisterUrsaDialogService(this IContainerRegistry containerRegistry)
+    {
+        containerRegistry.RegisterSingleton<IUrsaDialogService, UrsaDialogService>();
+        containerRegistry.RegisterSingleton<IUrsaOverlayDialogService, UrsaOverlayDialogService>();
+        containerRegistry.RegisterSingleton<IUrsaDrawerService, UrsaDrawerService>();
+    }
+    
+    public static void RegisterUrsaDialogView<T>(this IContainerRegistry containerRegistry, string name) where T : Control
+    {
+        containerRegistry.Register<Control, T>(UrsaDialogViewPrefix+name);
+    }
+}

src/Ursa.PrismExtension/UrsaDrawerService.cs

@@ -0,0 +1,33 @@
+using Avalonia.Controls;
+using Prism.Ioc;
+using Ursa.Controls;
+using Ursa.Controls.Options;
+
+namespace Ursa.PrismExtension;
+
+public class UrsaDrawerService(IContainerExtension container): IUrsaDrawerService 
+{
+    public void Show(string viewName, object? vm, string? hostId = null, DrawerOptions? options = null)
+    {
+        var v = container.Resolve<Control>(UrsaDialogServiceExtension.UrsaDialogViewPrefix + viewName);
+        Drawer.Show(v, vm, hostId, options);
+    }
+
+    public void ShowCustom<TResult>(string viewName, object? vm, string? hostId = null, DrawerOptions? options = null)
+    {
+        var v = container.Resolve<Control>(UrsaDialogServiceExtension.UrsaDialogViewPrefix + viewName);
+        Drawer.ShowCustom(v, vm, hostId, options);
+    }
+
+    public Task<DialogResult> ShowModal(string viewName, object? vm, string? hostId = null, DrawerOptions? options = null)
+    {
+        var v = container.Resolve<Control>(UrsaDialogServiceExtension.UrsaDialogViewPrefix + viewName);
+        return Drawer.ShowModal(v, vm, hostId, options);
+    }
+
+    public Task<TResult?> ShowCustomModal<TResult>(string viewName, object? vm, string? hostId = null, DrawerOptions? options = null)
+    {
+        var v = container.Resolve<Control>(UrsaDialogServiceExtension.UrsaDialogViewPrefix + viewName);
+        return Drawer.ShowCustomModal<TResult?>(v, vm, hostId, options);
+    }
+}

src/Ursa.PrismExtension/UrsaOverlayDialogService.cs

@@ -0,0 +1,32 @@
+using Avalonia.Controls;
+using Prism.Ioc;
+using Ursa.Controls;
+
+namespace Ursa.PrismExtension;
+
+public class UrsaOverlayDialogService(IContainerExtension container): IUrsaOverlayDialogService
+{
+    public void Show(string viewName, object? vm, string? hostId = null, OverlayDialogOptions? options = null)
+    {
+        var v = container.Resolve<Control>(UrsaDialogServiceExtension.UrsaDialogViewPrefix + viewName);
+        OverlayDialog.Show(v, vm, hostId, options);
+    }
+
+    public void ShowCustom(string viewName, object? vm, string? hostId = null, OverlayDialogOptions? options = null)
+    {
+        var v = container.Resolve<Control>(UrsaDialogServiceExtension.UrsaDialogViewPrefix + viewName);
+        OverlayDialog.ShowCustom(v, vm, hostId, options);
+    }
+    
+    public Task<DialogResult> ShowModal(string viewName, object? vm, string? hostId = null, OverlayDialogOptions? options = null)
+    {
+        var v = container.Resolve<Control>(UrsaDialogServiceExtension.UrsaDialogViewPrefix + viewName);
+        return OverlayDialog.ShowModal(v, vm, hostId, options);
+    }
+    
+    public Task<TResult?> ShowCustomModal<TResult>(string viewName, object? vm, string? hostId = null, OverlayDialogOptions? options = null)
+    {
+        var v = container.Resolve<Control>(UrsaDialogServiceExtension.UrsaDialogViewPrefix + viewName);
+        return OverlayDialog.ShowCustomModal<TResult>(v, vm, hostId, options);
+    }
+}

src/Ursa.Themes.Semi/AssemblyInfo.cs

@@ -0,0 +1,4 @@
+using Avalonia.Metadata;
+
+[assembly:XmlnsPrefix("https://irihi.tech/ursa/themes/semi", "u-semi")]
+[assembly:XmlnsDefinition("https://irihi.tech/ursa/themes/semi", "Ursa.Themes.Semi")]

src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs

@@ -0,0 +1,24 @@
+using Avalonia;
+
+namespace Ursa.Themes.Semi;
+
+internal class ClassHelper: AvaloniaObject
+{
+    static ClassHelper()
+    {
+        ClassesProperty.Changed.AddClassHandler<StyledElement>(OnClassesChanged);
+    }
+    
+    public static readonly AttachedProperty<string> ClassesProperty =
+        AvaloniaProperty.RegisterAttached<ClassHelper, StyledElement, string>("Classes");
+
+    public static void SetClasses(AvaloniaObject obj, string value) => obj.SetValue(ClassesProperty, value);
+    public static string GetClasses(AvaloniaObject obj) => obj.GetValue(ClassesProperty);
+    
+    private static void OnClassesChanged(StyledElement sender, AvaloniaPropertyChangedEventArgs value)
+    {
+        string classes = value.GetNewValue<string>();
+        sender.Classes.Clear();
+        sender.Classes.Add(classes);
+    }
+}

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

@@ -9,33 +9,35 @@
 
     <ControlTheme x:Key="{x:Type u:Badge}" TargetType="{x:Type u:Badge}">
         <!--  Set a very large corner radius to achieve pill look.  -->
-        <Setter Property="u:Badge.CornerRadius" Value="100" />
-        <Setter Property="u:Badge.FontSize" Value="14" />
-        <Setter Property="u:Badge.Background" Value="{DynamicResource BadgePrimaryBadgeBackground}" />
-        <Setter Property="u:Badge.ClipToBounds" Value="False" />
-        <Setter Property="u:Badge.HorizontalAlignment" Value="Center" />
-        <Setter Property="u:Badge.VerticalAlignment" Value="Center" />
-        <Setter Property="u:Badge.BorderThickness" Value="{DynamicResource BadgeBorderThickness}" />
-        <Setter Property="u:Badge.UseLayoutRounding" Value="False" />
-        <Setter Property="u:Badge.BorderBrush" Value="{DynamicResource BadgeBorderBrush}" />
-        <Setter Property="u:Badge.Template">
+        <Setter Property="CornerRadius" Value="{DynamicResource BadgeCornerRadius}" />
+        <Setter Property="BadgeFontSize" Value="{DynamicResource BadgeFontSize}" />
+        <Setter Property="Foreground" Value="{DynamicResource BadgeForeground}" />
+        <Setter Property="Background" Value="{DynamicResource BadgePrimaryBadgeBackground}" />
+        <Setter Property="ClipToBounds" Value="False" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="BorderThickness" Value="{DynamicResource BadgeBorderThickness}" />
+        <Setter Property="UseLayoutRounding" Value="False" />
+        <Setter Property="BorderBrush" Value="{DynamicResource BadgeBorderBrush}" />
+        <Setter Property="CornerPosition" Value="{DynamicResource BadgeCornerPosition}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="{x:Type u:Badge}">
                 <Grid
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalAlignment}"
                     ClipToBounds="False">
-
                     <ContentPresenter
                         Name="{x:Static u:Badge.PART_ContentPresenter}"
                         Margin="{TemplateBinding Padding}"
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                         VerticalAlignment="{TemplateBinding VerticalAlignment}"
                         Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}" />
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        Foreground="{DynamicResource BadgeContentForeground}" />
                     <Border
                         Name="{x:Static u:Badge.PART_BadgeContainer}"
-                        MinWidth="{DynamicResource BadgeHeight}"
-                        MinHeight="{DynamicResource BadgeHeight}"
+                        MinWidth="{DynamicResource BadgeMinWidth}"
+                        MinHeight="{DynamicResource BadgeMinHeight}"
                         Padding="{DynamicResource BadgePadding}"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Top"
@@ -43,21 +45,21 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}"
-                        IsVisible="{Binding !!BadgeContent, RelativeSource={RelativeSource TemplatedParent}}"
+                        IsVisible="{Binding !!Header, RelativeSource={RelativeSource TemplatedParent}}"
                         RenderTransformOrigin=".5,.5"
                         Theme="{TemplateBinding BadgeTheme}"
                         UseLayoutRounding="False">
                         <ContentPresenter
-                            Name="{x:Static u:Badge.PART_BadgeContentPresenter}"
+                            Name="{x:Static u:Badge.PART_HeaderPresenter}"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Focusable="False"
                             IsTabStop="False"
-                            TextElement.FontSize="{TemplateBinding FontSize}"
-                            TextElement.Foreground="{DynamicResource BadgeForeground}">
+                            TextElement.FontSize="{TemplateBinding BadgeFontSize}"
+                            TextElement.Foreground="{TemplateBinding Foreground}">
                             <ContentPresenter.Content>
                                 <MultiBinding Converter="{StaticResource BadgeContentConverter}">
-                                    <Binding Path="BadgeContent" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding Path="Header" RelativeSource="{RelativeSource TemplatedParent}" />
                                     <Binding Path="OverflowCount" RelativeSource="{RelativeSource TemplatedParent}" />
                                 </MultiBinding>
                             </ContentPresenter.Content>
@@ -80,10 +82,11 @@
                             HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalAlignment}"
                             Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Foreground="{DynamicResource BadgeContentForeground}" />
                         <Border
                             Name="{x:Static u:Badge.PART_BadgeContainer}"
-                            Width="{DynamicResource BadgeDotHeight}"
+                            Width="{DynamicResource BadgeDotWidth}"
                             Height="{DynamicResource BadgeDotHeight}"
                             HorizontalAlignment="Right"
                             VerticalAlignment="Top"
@@ -91,7 +94,7 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="{TemplateBinding CornerRadius}"
-                            IsVisible="{Binding !!BadgeContent, RelativeSource={RelativeSource TemplatedParent}}"
+                            IsVisible="{Binding !!Header, RelativeSource={RelativeSource TemplatedParent}}"
                             RenderTransformOrigin=".5,.5" />
                     </Grid>
                 </ControlTemplate>
@@ -99,36 +102,113 @@
         </Style>
 
         <Style Selector="^[CornerPosition=TopLeft] /template/ Border#PART_BadgeContainer">
-            <Setter Property="u:Badge.HorizontalAlignment" Value="Left" />
-            <Setter Property="u:Badge.VerticalAlignment" Value="Top" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Top" />
         </Style>
         <Style Selector="^[CornerPosition=TopRight] /template/ Border#PART_BadgeContainer">
-            <Setter Property="u:Badge.HorizontalAlignment" Value="Right" />
-            <Setter Property="u:Badge.VerticalAlignment" Value="Top" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="VerticalAlignment" Value="Top" />
         </Style>
         <Style Selector="^[CornerPosition=BottomLeft] /template/ Border#PART_BadgeContainer">
-            <Setter Property="u:Badge.HorizontalAlignment" Value="Left" />
-            <Setter Property="u:Badge.VerticalAlignment" Value="Bottom" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Bottom" />
         </Style>
         <Style Selector="^[CornerPosition=BottomRight] /template/ Border#PART_BadgeContainer">
-            <Setter Property="u:Badge.HorizontalAlignment" Value="Right" />
-            <Setter Property="u:Badge.VerticalAlignment" Value="Bottom" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="VerticalAlignment" Value="Bottom" />
         </Style>
 
-        <Style Selector="^.Primary">
-            <Setter Property="u:Badge.Background" Value="{DynamicResource BadgePrimaryBadgeBackground}" />
+        <Style Selector="^.Primary /template/ Border#PART_BadgeContainer">
+            <Setter Property="Background" Value="{DynamicResource BadgePrimaryBadgeBackground}" />
         </Style>
-        <Style Selector="^.Secondary">
-            <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeSecondaryBadgeBackground}" />
+        <Style Selector="^.Secondary /template/ Border#PART_BadgeContainer">
+            <Setter Property="Background" Value="{DynamicResource BadgeSecondaryBadgeBackground}" />
         </Style>
-        <Style Selector="^.Tertiary">
-            <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeTertiaryBadgeBackground}" />
+        <Style Selector="^.Tertiary /template/ Border#PART_BadgeContainer">
+            <Setter Property="Background" Value="{DynamicResource BadgeTertiaryBadgeBackground}" />
         </Style>
-        <Style Selector="^.Warning">
-            <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeWarningBadgeBackground}" />
+        <Style Selector="^.Success /template/ Border#PART_BadgeContainer">
+            <Setter Property="Background" Value="{DynamicResource BadgeSuccessBadgeBackground}" />
         </Style>
-        <Style Selector="^.Danger">
-            <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeDangerBadgeBackground}" />
+        <Style Selector="^.Warning /template/ Border#PART_BadgeContainer">
+            <Setter Property="Background" Value="{DynamicResource BadgeWarningBadgeBackground}" />
+        </Style>
+        <Style Selector="^.Danger /template/ Border#PART_BadgeContainer">
+            <Setter Property="Background" Value="{DynamicResource BadgeDangerBadgeBackground}" />
+        </Style>
+
+        <Style Selector="^.Light">
+            <Style Selector="^.Primary">
+                <Style Selector="^/template/ ContentPresenter#PART_HeaderPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource BadgeLightPrimaryBadgeForeground}" />
+                </Style>
+                <Style Selector="^/template/ Border#PART_BadgeContainer">
+                    <Setter Property="Background" Value="{DynamicResource BadgeLightPrimaryBadgeBackground}" />
+                </Style>
+            </Style>
+            <Style Selector="^.Secondary">
+                <Style Selector="^/template/ ContentPresenter#PART_HeaderPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource BadgeLightSecondaryBadgeForeground}" />
+                </Style>
+                <Style Selector="^/template/ Border#PART_BadgeContainer">
+                    <Setter Property="Background" Value="{DynamicResource BadgeLightSecondaryBadgeBackground}" />
+                </Style>
+            </Style>
+            <Style Selector="^.Tertiary">
+                <Style Selector="^/template/ ContentPresenter#PART_HeaderPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource BadgeLightTertiaryBadgeForeground}" />
+                </Style>
+                <Style Selector="^/template/ Border#PART_BadgeContainer">
+                    <Setter Property="Background" Value="{DynamicResource BadgeLightTertiaryBadgeBackground}" />
+                </Style>
+            </Style>
+            <Style Selector="^.Success">
+                <Style Selector="^/template/ ContentPresenter#PART_HeaderPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource BadgeLightSuccessBadgeForeground}" />
+                </Style>
+                <Style Selector="^/template/ Border#PART_BadgeContainer">
+                    <Setter Property="Background" Value="{DynamicResource BadgeLightSuccessBadgeBackground}" />
+                </Style>
+            </Style>
+            <Style Selector="^.Warning">
+                <Style Selector="^/template/ ContentPresenter#PART_HeaderPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource BadgeLightWarningBadgeForeground}" />
+                </Style>
+                <Style Selector="^/template/ Border#PART_BadgeContainer">
+                    <Setter Property="Background" Value="{DynamicResource BadgeLightWarningBadgeBackground}" />
+                </Style>
+            </Style>
+            <Style Selector="^.Danger">
+                <Style Selector="^/template/ ContentPresenter#PART_HeaderPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource BadgeLightDangerBadgeForeground}" />
+                </Style>
+                <Style Selector="^/template/ Border#PART_BadgeContainer">
+                    <Setter Property="Background" Value="{DynamicResource BadgeLightDangerBadgeBackground}" />
+                </Style>
+            </Style>
+        </Style>
+        <Style Selector="^.Inverted">
+            <Style Selector="^/template/ Border#PART_BadgeContainer">
+                <Setter Property="Background" Value="{DynamicResource BadgeInvertedBadgeBackground}" />
+            </Style>
+            <Style Selector="^.Primary /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource BadgeInvertedPrimaryBadgeForeground}" />
+            </Style>
+            <Style Selector="^.Secondary /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource BadgeInvertedSecondaryBadgeForeground}" />
+            </Style>
+            <Style Selector="^.Tertiary /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource BadgeInvertedTertiaryBadgeForeground}" />
+            </Style>
+            <Style Selector="^.Success /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource BadgeInvertedSuccessBadgeForeground}" />
+            </Style>
+            <Style Selector="^.Warning /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource BadgeInvertedWarningBadgeForeground}" />
+            </Style>
+            <Style Selector="^.Danger /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource BadgeInvertedDangerBadgeForeground}" />
+            </Style>
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

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

@@ -80,6 +80,19 @@
                 <Setter Property="PathIcon.Foreground" Value="{DynamicResource BannerInformationBorderBrush}" />
             </Style>
         </Style>
+        <Style Selector="^[Type=Success]">
+            <Style Selector="^.Bordered /template/ Border#PART_Container">
+                <Setter Property="Border.CornerRadius" Value="{DynamicResource BannerCornerRadius}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource BannerSuccessBorderBrush}" />
+            </Style>
+            <Style Selector="^ /template/ Border#PART_Container">
+                <Setter Property="Background" Value="{DynamicResource BannerSuccessBackground}" />
+            </Style>
+            <Style Selector="^ /template/ PathIcon#PART_BuildInIcon">
+                <Setter Property="PathIcon.Data" Value="{DynamicResource BannerSuccessIconGeometry}" />
+                <Setter Property="PathIcon.Foreground" Value="{DynamicResource BannerSuccessBorderBrush}" />
+            </Style>
+        </Style>
         <Style Selector="^[Type=Warning]">
             <Style Selector="^.Bordered /template/ Border#PART_Container">
                 <Setter Property="Border.CornerRadius" Value="{DynamicResource BannerCornerRadius}" />
@@ -106,18 +119,5 @@
                 <Setter Property="PathIcon.Foreground" Value="{DynamicResource BannerErrorBorderBrush}" />
             </Style>
         </Style>
-        <Style Selector="^[Type=Success]">
-            <Style Selector="^.Bordered /template/ Border#PART_Container">
-                <Setter Property="Border.CornerRadius" Value="{DynamicResource BannerCornerRadius}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource BannerSuccessBorderBrush}" />
-            </Style>
-            <Style Selector="^ /template/ Border#PART_Container">
-                <Setter Property="Background" Value="{DynamicResource BannerSuccessBackground}" />
-            </Style>
-            <Style Selector="^ /template/ PathIcon#PART_BuildInIcon">
-                <Setter Property="PathIcon.Data" Value="{DynamicResource BannerSuccessIconGeometry}" />
-                <Setter Property="PathIcon.Foreground" Value="{DynamicResource BannerSuccessBorderBrush}" />
-            </Style>
-        </Style>
     </ControlTheme>
 </ResourceDictionary>

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

@@ -0,0 +1,96 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:u="https://irihi.tech/ursa">
+    <Design.PreviewWith>
+        <StackPanel>
+            <u:Breadcrumb>
+                <TextBlock Text="Hello" />
+                <u:BreadcrumbItem Content="World" Icon="♥" />
+                <TextBlock Text="Avalonia" />
+                <TextBlock Text="Ursa" />
+            </u:Breadcrumb>
+        </StackPanel>
+    </Design.PreviewWith>
+    <ControlTheme x:Key="{x:Type u:Breadcrumb}" TargetType="u:Breadcrumb">
+        <Setter Property="Separator" Value="/" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:Breadcrumb">
+                <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:BreadcrumbItem}" TargetType="u:BreadcrumbItem">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:BreadcrumbItem">
+                <Border Background="Transparent">
+                    <StackPanel Orientation="Horizontal">
+                        <ContentPresenter
+                            Name="PART_IconPresenter"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding Icon}"
+                            ContentTemplate="{TemplateBinding IconTemplate}"
+                            Foreground="{DynamicResource SemiColorText2}"
+                            IsVisible="{TemplateBinding Icon,
+                                                        Converter={x:Static ObjectConverters.IsNotNull}}" />
+                        <ContentPresenter
+                            Name="PART_ContentPresenter"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Foreground="{DynamicResource SemiColorText2}"
+                            IsVisible="{TemplateBinding Content,
+                                                        Converter={x:Static ObjectConverters.IsNotNull}}" />
+                        <ContentPresenter
+                            Name="Separator"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding Separator}"
+                            Foreground="{DynamicResource SemiColorText3}">
+                            <ContentPresenter.IsVisible>
+                                <TemplateBinding Converter="{x:Static ObjectConverters.IsNotNull}" Property="Separator" />
+                            </ContentPresenter.IsVisible>
+                        </ContentPresenter>
+                    </StackPanel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+            <Setter Property="Margin" Value="0 0 4 0"></Setter>
+        </Style>
+        <Style Selector="^ /template/ ContentPresenter#Separator">
+            <Setter Property="Margin" Value="4 0"></Setter>
+        </Style>
+        <Style Selector="^[IsReadOnly=False]">
+            <Setter Property="Cursor" Value="Hand"></Setter>
+        </Style>
+        <Style Selector="^:last">
+            <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource SemiColorText0}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource SemiColorText0}" />
+                <Setter Property="FontWeight" Value="Bold" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#Separator">
+                <Setter Property="IsVisible" Value="False" />
+            </Style>
+            <Style Selector="^[IsReadOnly=False]:pointerover">
+                <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" />
+                </Style>
+                <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" />
+                </Style>
+            </Style>
+        </Style>
+        <Style Selector="^[IsReadOnly=False]:pointerover">
+            <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" />
+            </Style>
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -63,6 +63,7 @@
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
                             FontWeight="{TemplateBinding FontWeight}"
                             Foreground="{TemplateBinding Foreground}" />
                     </Border>

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

@@ -0,0 +1,61 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    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 SemiGrey6}"/>
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:Clock">
+                <Grid>
+                    <u:ClockTicks
+                        ShowHourTicks="{TemplateBinding ShowHourTicks}"
+                        ShowMinuteTicks="{TemplateBinding ShowMinuteTicks}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        HourTickForeground="{DynamicResource SemiGrey6}"
+                        MinuteTickForeground="{DynamicResource SemiGrey4}" />
+                    <UniformGrid Rows="2" IsVisible="{TemplateBinding ShowHourHand}">
+                        <Border
+                            Width="16"
+                            Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Bounds.Width, Converter={x:Static converter:ClockHandLengthConverter.Hour}}"
+                            VerticalAlignment="Bottom"
+                            Background="{TemplateBinding HandBrush}"
+                            CornerRadius="8" />
+                        <UniformGrid.RenderTransform>
+                            <RotateTransform Angle="{Binding HourAngle, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </UniformGrid.RenderTransform>
+                    </UniformGrid>
+                    <UniformGrid Rows="2" IsVisible="{TemplateBinding ShowMinuteHand}">
+                        <Border
+                            Width="8"
+                            Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Bounds.Width, Converter={x:Static converter:ClockHandLengthConverter.Minute}}"
+                            VerticalAlignment="Bottom"
+                            Background="{TemplateBinding HandBrush}"
+                            CornerRadius="4" />
+                        <UniformGrid.RenderTransform>
+                            <RotateTransform Angle="{Binding MinuteAngle, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </UniformGrid.RenderTransform>
+                    </UniformGrid>
+                    <UniformGrid Rows="2" IsVisible="{TemplateBinding ShowSecondHand}">
+                        <Border
+                            Width="4"
+                            Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Bounds.Width, Converter={x:Static converter:ClockHandLengthConverter.Second}}"
+                            VerticalAlignment="Bottom"
+                            Background="{TemplateBinding HandBrush}"
+                            CornerRadius="4" />
+                        <UniformGrid.RenderTransform>
+                            <RotateTransform Angle="{Binding SecondAngle, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </UniformGrid.RenderTransform>
+                    </UniformGrid>
+                    <Ellipse
+                        Width="20"
+                        Height="20"
+                        Fill="White"
+                        Stroke="{DynamicResource SemiBlue5}"
+                        StrokeThickness="3" />
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,27 @@
+<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:ControlClassesInput}" TargetType="u:ControlClassesInput">
+        <Setter Property="Width" Value="200" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:ControlClassesInput">
+                <u:TagInput
+                    HorizontalAlignment="Stretch"
+                    AllowDuplicates="False"
+                    Separator="{TemplateBinding Separator}"
+                    Tags="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TargetClasses, Mode=TwoWay}" />
+            </ControlTemplate>
+        </Setter>
+        <!--
+        <Setter Property="ContextFlyout">
+            <MenuFlyout>
+                <MenuItem Header="Undo" Command="{Binding $parent[u:ControlClassesInput].UnDo}" />
+                <MenuItem Header="Redo" Command="{Binding $parent[u:ControlClassesInput].Redo}" />
+                <MenuItem Header="Clear" Command="{Binding $parent[u:ControlClassesInput].Clear}" />
+            </MenuFlyout>
+        </Setter>
+        -->
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,732 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:theme="clr-namespace:Ursa.Themes.Semi"
+    xmlns:u="https://irihi.tech/ursa">
+
+    <ControlTheme x:Key="{x:Type u:OverlayDialogHost}" TargetType="u:OverlayDialogHost">
+        <Setter Property="OverlayMaskBrush" Value="{DynamicResource OverlayDialogMaskBrush}" />
+    </ControlTheme>
+    <ControlTheme x:Key="{x:Type u:CustomDialogControl}" TargetType="u:CustomDialogControl">
+        <Setter Property="CornerRadius" Value="12" />
+        <Setter Property="Transitions">
+            <Transitions>
+                <TransformOperationsTransition Duration="0.2" Property="RenderTransform"/>
+            </Transitions>
+        </Setter>
+        <Setter Property="RenderTransform" Value="scale(1.0)"></Setter>
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:CustomDialogControl">
+                <Border
+                    Name="PART_Border"
+                    Padding="0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Classes="Shadow"
+                    ClipToBounds="False"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    IsHitTestVisible="True"
+                    Theme="{DynamicResource CardBorder}">
+                    <Border ClipToBounds="True" CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid RowDefinitions="Auto, *">
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Content="{TemplateBinding Content}" />
+                            <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogControlBase.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="2"
+                                    Background="Transparent" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="1"
+                                    Margin="0,24,24,0"
+                                    DockPanel.Dock="Right"
+                                    Theme="{DynamicResource OverlayCloseButton}" />
+                            </Grid>
+                        </Grid>
+                    </Border>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:full-screen">
+            <Setter Property="CornerRadius" Value="0"/>
+            <Style Selector="^ /template/ Border#PART_Border">
+                <Setter Property="HorizontalAlignment" Value="Stretch"/>
+                <Setter Property="VerticalAlignment" Value="Stretch"/>
+                <Setter Property="Theme" Value="{x:Null}"/>
+                <Setter Property="Margin" Value="0"/>
+                <Setter Property="Background" Value="{DynamicResource BorderCardBackground}"></Setter>
+            </Style>
+        </Style>
+        <Style Selector="^ /template/ Panel#PART_TitleArea">
+            <Setter Property="ContextFlyout">
+                <MenuFlyout>
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControlBase].Close}"
+                        Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource WindowCloseIconGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </MenuFlyout>
+            </Setter>
+        </Style>
+        <Style Selector="^:not(:modal) /template/ Panel#PART_TitleArea">
+            <Setter Property="ContextFlyout">
+                <MenuFlyout>
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControlBase].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.BringForward}"
+                        Header="{DynamicResource STRING_MENU_BRING_FORWARD}">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeBringForwardGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControlBase].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.BringToFront}"
+                        Header="{DynamicResource STRING_MENU_BRING_TO_FRONT}">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeBringToFrontGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControlBase].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.SendBackward}"
+                        Header="{DynamicResource STRING_MENU_SEND_BACKWARD}">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeSendBackwardGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControlBase].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.SendToBack}"
+                        Header="{DynamicResource STRING_MENU_SEND_TO_BACK}">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeSendToBackGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControlBase].Close}"
+                        Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource WindowCloseIconGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </MenuFlyout>
+            </Setter>
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:DefaultDialogControl}" TargetType="u:DefaultDialogControl">
+        <Setter Property="CornerRadius" Value="12" />
+        <Setter Property="Transitions">
+            <Transitions>
+                <TransformOperationsTransition Duration="0.2" Property="RenderTransform"/>
+            </Transitions>
+        </Setter>
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:DefaultDialogControl">
+                <Border
+                    Name="PART_Border"
+                    Padding="0"
+                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                    VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                    BoxShadow="0 0 8 0 #1A000000"
+                    Classes="Shadow"
+                    ClipToBounds="False"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    IsHitTestVisible="True"
+                    Theme="{DynamicResource CardBorder}">
+                    <Border ClipToBounds="True" CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid RowDefinitions="Auto, *, Auto">
+                            <ScrollViewer Grid.Row="1">
+                                <ContentPresenter
+                                    Name="PART_ContentPresenter"
+                                    Grid.Row="1"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Margin="24,8"
+                                    Content="{TemplateBinding Content}" />
+                            </ScrollViewer>
+                            <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogControlBase.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="3"
+                                    Background="Transparent" />
+                                <PathIcon
+                                    Name="PART_Icon"
+                                    Grid.Column="0"
+                                    Width="16"
+                                    Height="16"
+                                    Margin="24,24,8,0"
+                                    VerticalAlignment="Center" />
+                                <TextBlock
+                                    Name="PART_Title"
+                                    Grid.Column="1"
+                                    Margin="0,24,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    FontWeight="Bold"
+                                    IsHitTestVisible="False"
+                                    IsVisible="{TemplateBinding Title,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}"
+                                    Text="{TemplateBinding Title}"
+                                    TextWrapping="Wrap" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="2"
+                                    Margin="0,24,24,0"
+                                    DockPanel.Dock="Right"
+                                    Theme="{DynamicResource OverlayCloseButton}" />
+                            </Grid>
+                            <StackPanel
+                                Grid.Row="2"
+                                Margin="24,0,24,24"
+                                HorizontalAlignment="Right"
+                                Orientation="Horizontal">
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Tertiary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Danger"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_NO}"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_YES}"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_OK}"
+                                    Theme="{DynamicResource SolidButton}" />
+                            </StackPanel>
+                        </Grid>
+                    </Border>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:full-screen">
+            <Setter Property="CornerRadius" Value="0"/>
+        </Style>
+        <Style Selector="^:full-screen /template/ Border#PART_Border">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Stretch"/>
+            <Setter Property="Theme" Value="{x:Null}"/>
+            <Setter Property="Margin" Value="0"></Setter>
+            <Setter Property="Background" Value="{DynamicResource BorderCardBackground}"></Setter>
+        </Style>
+        <Style Selector="^[Mode=None]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="False" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Title">
+                <Setter Property="Margin" Value="24 24 0 0" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Info]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Warning]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Error]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Question]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Success]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+        </Style>
+        <Style Selector="^ /template/ Panel#PART_TitleArea">
+            <Setter Property="ContextFlyout">
+                <MenuFlyout>
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControlBase].Close}"
+                        Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource WindowCloseIconGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </MenuFlyout>
+            </Setter>
+        </Style>
+        <Style Selector="^:not(:modal) /template/ Panel#PART_TitleArea">
+            <Setter Property="ContextFlyout">
+                <MenuFlyout>
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControlBase].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.BringForward}"
+                        Header="{DynamicResource STRING_MENU_BRING_FORWARD}">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeBringForwardGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControlBase].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.BringToFront}"
+                        Header="{DynamicResource STRING_MENU_BRING_TO_FRONT}">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeBringToFrontGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControlBase].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.SendBackward}"
+                        Header="{DynamicResource STRING_MENU_SEND_BACKWARD}">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeSendBackwardGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControlBase].UpdateLayer}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.SendToBack}"
+                        Header="{DynamicResource STRING_MENU_SEND_TO_BACK}">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource DialogArrangeSendToBackGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <MenuItem
+                        Command="{Binding $parent[u:DialogControlBase].Close}"
+                        CommandParameter="{x:Static u:DialogLayerChangeType.BringForward}"
+                        Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource WindowCloseIconGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </MenuFlyout>
+            </Setter>
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:DialogWindow}" TargetType="u:DialogWindow">
+        <Setter Property="Title" Value="{x:Null}" />
+        <Setter Property="Background" Value="{DynamicResource BorderCardBackground}" />
+        <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource WindowDefaultBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
+        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
+        <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
+        <Setter Property="Padding" Value="48 24" />
+        <Setter Property="SizeToContent" Value="WidthAndHeight" />
+        <Setter Property="WindowStartupLocation" Value="CenterOwner" />
+        <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="1" />
+        <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
+        <Setter Property="ExtendClientAreaChromeHints" Value="SystemChrome" />
+        <Setter Property="SystemDecorations">
+            <OnPlatform>
+                <OnPlatform.Windows>
+                    <SystemDecorations>Full</SystemDecorations>
+                </OnPlatform.Windows>
+                <OnPlatform.Default>
+                    <SystemDecorations>BorderOnly</SystemDecorations>
+                </OnPlatform.Default>
+            </OnPlatform>
+        </Setter>
+        <Setter Property="CanResize" Value="False" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:DialogWindow">
+                <Panel>
+                    <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+                    <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
+                    <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
+                    <VisualLayerManager>
+                        <Grid RowDefinitions="Auto, *">
+                            <ContentPresenter
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Content="{TemplateBinding Content}" />
+                            <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogWindow.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="2"
+                                    Background="Transparent" />
+                                <TextBlock
+                                    Grid.Column="0"
+                                    Margin="24,24,0,0"
+                                    FontSize="14"
+                                    FontWeight="Bold"
+                                    Text="{TemplateBinding Title}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="1"
+                                    Margin="0,24,24,0"
+                                    Theme="{DynamicResource CloseButton}" />
+                            </Grid>
+                        </Grid>
+                    </VisualLayerManager>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:DefaultDialogWindow}" TargetType="u:DefaultDialogWindow">
+        <Setter Property="Title" Value="{x:Null}" />
+        <Setter Property="Background" Value="{DynamicResource BorderCardBackground}" />
+        <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource WindowDefaultBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
+        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
+        <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
+        <Setter Property="Padding" Value="48 24" />
+        <Setter Property="SizeToContent" Value="WidthAndHeight" />
+        <Setter Property="WindowStartupLocation" Value="CenterOwner" />
+        <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="1" />
+        <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
+        <Setter Property="ExtendClientAreaChromeHints" Value="SystemChrome" />
+        <Setter Property="SystemDecorations">
+            <OnPlatform>
+                <OnPlatform.Windows>
+                    <SystemDecorations>Full</SystemDecorations>
+                </OnPlatform.Windows>
+                <OnPlatform.Default>
+                    <SystemDecorations>BorderOnly</SystemDecorations>
+                </OnPlatform.Default>
+            </OnPlatform>
+        </Setter>
+        <Setter Property="CanResize" Value="False" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:DefaultDialogWindow">
+                <Panel>
+                    <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+                    <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
+                    <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
+                    <VisualLayerManager>
+                        <Grid RowDefinitions="Auto, *, Auto">
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                Grid.Row="1"
+                                Margin="24,8"
+                                Content="{TemplateBinding Content}" />
+                            <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogWindow.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="3"
+                                    Background="Transparent" />
+                                <PathIcon
+                                    Name="PART_Icon"
+                                    Grid.Column="0"
+                                    Width="16"
+                                    Height="16"
+                                    Margin="24,24,8,0"
+                                    VerticalAlignment="Center" />
+                                <TextBlock
+                                    Name="PART_Title"
+                                    Grid.Column="1"
+                                    Margin="0,24,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    FontWeight="Bold"
+                                    IsHitTestVisible="False"
+                                    IsVisible="{TemplateBinding Title,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}"
+                                    Text="{TemplateBinding Title}"
+                                    TextWrapping="Wrap" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="2"
+                                    Margin="0,24,24,0"
+                                    DockPanel.Dock="Right"
+                                    Theme="{DynamicResource CloseButton}" />
+                            </Grid>
+                            <StackPanel
+                                Grid.Row="2"
+                                Margin="24,0,24,24"
+                                HorizontalAlignment="Right"
+                                Orientation="Horizontal">
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Tertiary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Danger"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_NO}"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_YES}"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_OK}"
+                                    Theme="{DynamicResource SolidButton}" />
+                            </StackPanel>
+                        </Grid>
+                    </VisualLayerManager>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^[Mode=None]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="False" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Title">
+                <Setter Property="Margin" Value="24 24 0 0" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Info]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Warning]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Error]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Question]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+        </Style>
+        <Style Selector="^[Mode=Success]">
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="IsVisible" Value="True" />
+                <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}" />
+                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_YesButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_NoButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_CancelButton">
+                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+            </Style>
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,71 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <ControlTheme x:Key="CloseButton" TargetType="Button">
+        <Setter Property="CornerRadius" Value="6" />
+        <Setter Property="Margin" Value="0, 4" />
+        <Setter Property="Padding" Value="4" />
+        <Setter Property="Height" Value="28" />
+        <Setter Property="Width" Value="28" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="Button">
+                <Border
+                    Name="PART_Border"
+                    Padding="{TemplateBinding Padding}"
+                    Background="Transparent"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <PathIcon
+                        Width="12"
+                        Height="12"
+                        Data="{DynamicResource WindowCloseIconGlyph}"/>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:pointerover /template/ Border">
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePointeroverBackground}" />
+        </Style>
+        <Style Selector="^:pointerover /template/ PathIcon">
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+
+        <Style Selector="^:pressed /template/ Border">
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePressedBackground}" />
+        </Style>
+        <Style Selector="^:pressed /template/ PathIcon">
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+    </ControlTheme>
+    
+    <ControlTheme x:Key="OverlayCloseButton" TargetType="Button">
+        <Setter Property="CornerRadius" Value="6" />
+        <Setter Property="Margin" Value="0, 4" />
+        <Setter Property="Padding" Value="4" />
+        <Setter Property="Height" Value="28" />
+        <Setter Property="Width" Value="28" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="Button">
+                <Border
+                    Name="PART_Border"
+                    Padding="{TemplateBinding Padding}"
+                    Background="Transparent"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <PathIcon
+                        Width="12"
+                        Height="12"
+                        Data="{DynamicResource WindowCloseIconGlyph}"/>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:pointerover /template/ Border">
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+        </Style>
+        <Style Selector="^:pressed /template/ Border">
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+        </Style>
+    </ControlTheme>
+    
+</ResourceDictionary>

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

@@ -0,0 +1,16 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    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">
+                <Panel>
+                    <ContentPresenter Content="{TemplateBinding Content}"></ContentPresenter>
+                    <iri:PureRectangle Background="Transparent" IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.IsEnabled, Converter={x:Static BoolConverters.Not}}" Cursor="No" ToolTip.Tip="{TemplateBinding DisabledTip}"/>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,167 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:u="https://irihi.tech/ursa">
+    <ControlTheme TargetType="u:CustomDrawerControl" x:Key="{x:Type u:CustomDrawerControl}">
+        <Setter Property="VerticalAlignment" Value="Stretch"></Setter>
+        <Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:CustomDrawerControl">
+                <Border Name="PART_Root" 
+                        Margin="8 -1 -1 -1"
+                        Padding="0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Classes="Shadow"
+                        ClipToBounds="False"
+                        CornerRadius="12 0 0 12"
+                        BorderThickness="1 0 0 0"
+                        IsHitTestVisible="True"
+                        Theme="{DynamicResource CardBorder}">
+                    <Border ClipToBounds="True" CornerRadius="{Binding #PART_Root.CornerRadius}">
+                        <Grid RowDefinitions="Auto, *">
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Content="{TemplateBinding Content}" />
+                            <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogControlBase.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="2"
+                                    Background="Transparent" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="1"
+                                    Margin="0,24,24,0"
+                                    DockPanel.Dock="Right"
+                                    Theme="{DynamicResource OverlayCloseButton}" />
+                            </Grid>
+                        </Grid>
+                    </Border>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^[Position=Right] /template/ Border#PART_Root">
+            <Setter Property="Margin" Value="8 0 0 0" />
+            <Setter Property="CornerRadius" Value="12 0 0  12" />
+            <Setter Property="BorderThickness" Value="1 0 0 0" />
+        </Style>
+        <Style Selector="^[Position=Left] /template/ Border#PART_Root">
+            <Setter Property="Margin" Value="0 0 8 0" />
+            <Setter Property="CornerRadius" Value="0 12 12 0" />
+            <Setter Property="BorderThickness" Value="0 0 1 0" />
+        </Style>
+        <Style Selector="^[Position=Top] /template/ Border#PART_Root">
+            <Setter Property="Margin" Value="0 0 0 8" />
+            <Setter Property="CornerRadius" Value="0 0 12 12" />
+            <Setter Property="BorderThickness" Value="0 0 0 1" />
+        </Style>
+        <Style Selector="^[Position=Bottom] /template/ Border#PART_Root">
+            <Setter Property="Margin" Value="0 8 0 0" />
+            <Setter Property="CornerRadius" Value="12 12 0 0" />
+            <Setter Property="BorderThickness" Value="0 1 0 0" />
+        </Style>
+    </ControlTheme>
+    
+    <ControlTheme x:Key="{x:Type u:DefaultDrawerControl}" TargetType="u:DefaultDrawerControl">
+        <Setter Property="VerticalAlignment" Value="Stretch"></Setter>
+        <Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:DefaultDrawerControl">
+                <Border Name="PART_Root" 
+                        Margin="8 -1 -1 -1"
+                        Padding="0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Classes="Shadow"
+                        ClipToBounds="False"
+                        CornerRadius="12 0 0 12"
+                        BorderThickness="1 0 0 0"
+                        IsHitTestVisible="True"
+                        Theme="{DynamicResource CardBorder}">
+                    <Border ClipToBounds="True" CornerRadius="{Binding #PART_Root.CornerRadius}">
+                        <Grid RowDefinitions="Auto, *, Auto">
+                            <ScrollViewer Grid.Row="1">
+                                <ContentPresenter
+                                    Name="PART_ContentPresenter"
+                                    Grid.Row="1"
+                                    Margin="24,8"
+                                    Content="{TemplateBinding Content}" />
+                            </ScrollViewer>
+                            <Grid Grid.Row="0" ColumnDefinitions=" *, Auto">
+                                <TextBlock
+                                    Name="PART_Title"
+                                    Grid.Column="0"
+                                    Margin="24,24,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    FontWeight="Bold"
+                                    IsHitTestVisible="False"
+                                    IsVisible="{TemplateBinding Title,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}"
+                                    Text="{TemplateBinding Title}"
+                                    TextWrapping="Wrap" />
+                                <Button
+                                    Name="{x:Static u:DrawerControlBase.PART_CloseButton}"
+                                    Grid.Column="1"
+                                    Margin="0,24,24,0"
+                                    DockPanel.Dock="Right"
+                                    Theme="{DynamicResource OverlayCloseButton}" />
+                            </Grid>
+                            <StackPanel
+                                Grid.Row="2"
+                                Margin="24,0,24,24"
+                                HorizontalAlignment="Right"
+                                Orientation="Horizontal">
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Tertiary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Danger"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_NO}"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_YES}"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_OK}"
+                                    Theme="{DynamicResource SolidButton}" />
+                            </StackPanel>
+                        </Grid>
+                    </Border>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^[Position=Right] /template/ Border#PART_Root">
+            <Setter Property="Margin" Value="8 0 0 0" />
+            <Setter Property="CornerRadius" Value="12 0 0  12" />
+            <Setter Property="BorderThickness" Value="1 0 0 0" />
+        </Style>
+        <Style Selector="^[Position=Left] /template/ Border#PART_Root">
+            <Setter Property="Margin" Value="0 0 8 0" />
+            <Setter Property="CornerRadius" Value="0 12 12 0" />
+            <Setter Property="BorderThickness" Value="0 0 1 0" />
+        </Style>
+        <Style Selector="^[Position=Top] /template/ Border#PART_Root">
+            <Setter Property="Margin" Value="0 0 0 8" />
+            <Setter Property="CornerRadius" Value="0 0 12 12" />
+            <Setter Property="BorderThickness" Value="0 0 0 1" />
+        </Style>
+        <Style Selector="^[Position=Bottom] /template/ Border#PART_Root">
+            <Setter Property="Margin" Value="0 8 0 0" />
+            <Setter Property="CornerRadius" Value="12 12 0 0" />
+            <Setter Property="BorderThickness" Value="0 1 0 0" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,33 @@
+<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:EnumSelector}" TargetType="u:EnumSelector">
+        <Setter Property="Width" Value="100" />
+        <Setter Property="HorizontalAlignment" Value="Left"></Setter>
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:EnumSelector">
+                <ComboBox
+                    Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Bounds.Width}"
+                    Name="PART_ComboBox"
+                    ItemsSource="{TemplateBinding Values}"
+                    SelectedItem="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedValue, Mode=TwoWay}" />
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^[DisplayDescription=True] /template/ ComboBox">
+            <Setter Property="ItemTemplate">
+                <DataTemplate x:DataType="u:EnumItemTuple">
+                    <TextBlock Text="{Binding DisplayName}"></TextBlock>
+                </DataTemplate>
+            </Setter>
+        </Style>
+        <Style Selector="^[DisplayDescription=False] /template/ ComboBox">
+            <Setter Property="ItemTemplate">
+                <DataTemplate x:DataType="u:EnumItemTuple">
+                    <TextBlock Text="{Binding Value}"></TextBlock>
+                </DataTemplate>
+            </Setter>
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,97 @@
+<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:Form}" TargetType="u:Form">
+        <Setter Property="Grid.IsSharedSizeScope" Value="False" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:Form">
+                <DataValidationErrors>
+                    <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
+                </DataValidationErrors>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:fixed-width">
+            <Setter Property="Grid.IsSharedSizeScope" Value="True" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:FormGroup}" TargetType="u:FormGroup">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:FormGroup">
+                <StackPanel Margin="0 28 0 0">
+                    <ContentPresenter Content="{TemplateBinding Header}" FontWeight="Bold" FontSize="18" />
+                    <Rectangle
+                        Height="1"
+                        Margin="0,8"
+                        HorizontalAlignment="Stretch"
+                        Fill="{DynamicResource SemiColorBorder}" />
+                    <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
+                </StackPanel>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:FormItem}" TargetType="u:FormItem">
+        <Setter Property="Margin" Value="0 8" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:FormItem">
+                <StackPanel>
+                    <StackPanel
+                        Name="PART_LabelPanel"
+                        Margin="0,0,0,4"
+                        HorizontalAlignment="{TemplateBinding LabelAlignment}"
+                        Orientation="Horizontal">
+                        <ContentPresenter Content="{TemplateBinding Label}" FontWeight="Bold" />
+                        <TextBlock
+                            Foreground="{DynamicResource SemiRed6}"
+                            IsVisible="{TemplateBinding IsRequired}"
+                            Text="*" />
+                    </StackPanel>
+                    <ContentPresenter Content="{TemplateBinding Content}" />
+                </StackPanel>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:not(:no-label):horizontal">
+            <Setter Property="Template">
+                <ControlTemplate TargetType="u:FormItem">
+                    <Grid RowDefinitions="*, *">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" SharedSizeGroup="Label" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Border
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Width="{TemplateBinding LabelWidth}">
+                            <StackPanel
+                                Name="PART_LabelPanel"
+                                Margin="8,8,8,0"
+                                HorizontalAlignment="{TemplateBinding LabelAlignment}"
+                                Orientation="Horizontal">
+                                <ContentPresenter Content="{TemplateBinding Label}" FontWeight="Bold" />
+                                <TextBlock
+                                    Foreground="{DynamicResource SemiRed6}"
+                                    IsVisible="{TemplateBinding IsRequired}"
+                                    Text="*" />
+                            </StackPanel>
+                        </Border>
+                        <ContentPresenter
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Content="{TemplateBinding Content}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter>
+        </Style>
+        <Style Selector="^:no-label">
+            <Setter Property="Template">
+                <ControlTemplate TargetType="u:FormItem">
+                    <ContentPresenter Content="{TemplateBinding Content}" />
+                </ControlTemplate>
+            </Setter>
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -121,7 +121,8 @@
             <Setter Property="Border.BorderBrush" Value="{DynamicResource IPv4BoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Border.Background" Value="{DynamicResource IPv4BoxDisabledBackground}" />
+            <Setter Property="Background" Value="{DynamicResource IPv4BoxDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiColorDisabledText}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

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

@@ -0,0 +1,288 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    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:BooleansToOpacityConverter x:Key="OpacityConverter" />
+    <ControlTheme x:Key="{x:Type u:IconButton}" TargetType="u:IconButton">
+        <Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultBorderBrush}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ButtonCornerRadius}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThickness}" />
+        <Setter Property="Padding" Value="{DynamicResource ButtonDefaultPadding}" />
+        <Setter Property="RenderTransform" Value="none" />
+        <Setter Property="FontSize" Value="{DynamicResource ButtonDefaultFontSize}" />
+        <Setter Property="FontWeight" Value="{DynamicResource ButtonDefaultFontWeight}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="MinHeight" Value="12" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:IconButton">
+                <Border
+                    Padding="{TemplateBinding Padding}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    TextElement.FontSize="{TemplateBinding FontSize}"
+                    TextElement.FontWeight="{TemplateBinding FontWeight}"
+                    UseLayoutRounding="False">
+                    <Grid
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                        ColumnDefinitions="Auto, Auto"
+                        RowDefinitions="Auto, Auto">
+                        <Panel
+                            Name="PART_IconRoot"
+                            Grid.Column="0">
+                            <Panel.IsVisible>
+                                <MultiBinding Converter="{x:Static BoolConverters.Or}">
+                                    <Binding Path="IsLoading" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding
+                                        Converter="{x:Static ObjectConverters.IsNotNull}"
+                                        Path="Icon"
+                                        RelativeSource="{RelativeSource TemplatedParent}" />
+                                </MultiBinding>
+                            </Panel.IsVisible>
+                            <ContentPresenter
+                                Content="{TemplateBinding Icon}"
+                                ContentTemplate="{TemplateBinding IconTemplate}"
+                                Opacity="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=!IsLoading, Converter={StaticResource OpacityConverter}}" />
+                            <u:LoadingIcon
+                                Classes="Small"
+                                Foreground="{TemplateBinding Foreground}"
+                                IsVisible="{TemplateBinding IsLoading}" />
+                        </Panel>
+                        <ContentPresenter
+                            Name="PART_ContentPresenter"
+                            Grid.Column="1"
+                            Margin="8 0 0 0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            IsVisible="{TemplateBinding Content, Converter={x:Static ObjectConverters.IsNotNull}}"
+                            Content="{TemplateBinding Content}" />
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:pressed">
+            <Setter Property="RenderTransform" Value="scale(0.98)" />
+        </Style>
+
+        <Style Selector="^.Primary">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" />
+        </Style>
+        <Style Selector="^.Secondary">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
+        </Style>
+        <Style Selector="^.Tertiary">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
+        </Style>
+        <Style Selector="^.Success">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSuccessForeground}" />
+        </Style>
+        <Style Selector="^.Warning">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
+        </Style>
+        <Style Selector="^.Danger">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
+        </Style>
+
+        <Style Selector="^:pointerover">
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+        </Style>
+
+        <Style Selector="^:pressed">
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+        </Style>
+
+        <Style Selector="^:disabled">
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+        </Style>
+        
+        <Style Selector="^:empty[IsLoading=False] /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Margin" Value="0"></Setter>
+        </Style>
+
+        <Style Selector="^:right">
+            <Style Selector="^ /template/ Panel#PART_IconRoot">
+                <Setter Property="Grid.Column" Value="1" />
+                <Setter Property="Grid.Row" Value="0" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Grid.Column" Value="0" />
+                <Setter Property="Grid.Row" Value="0" />
+                <Setter Property="Margin" Value="0 0 8 0" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:left">
+            <Style Selector="^ /template/ Panel#PART_IconRoot">
+                <Setter Property="Grid.Column" Value="0" />
+                <Setter Property="Grid.Row" Value="0" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Grid.Column" Value="1" />
+                <Setter Property="Grid.Row" Value="0" />
+                <Setter Property="Margin" Value="8 0 0 0" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:top">
+            <Style Selector="^ /template/ Panel#PART_IconRoot">
+                <Setter Property="Grid.Column" Value="0" />
+                <Setter Property="Grid.Row" Value="0" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Grid.Column" Value="0" />
+                <Setter Property="Grid.Row" Value="1" />
+                <Setter Property="Margin" Value="0 4 0 0" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:bottom">
+            <Style Selector="^ /template/ Panel#PART_IconRoot">
+                <Setter Property="Grid.Column" Value="0" />
+                <Setter Property="Grid.Row" Value="1" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+                <Setter Property="Grid.Column" Value="0" />
+                <Setter Property="Grid.Row" Value="0" />
+                <Setter Property="Margin" Value="0 0 0 4" />
+            </Style>
+        </Style>
+
+        <Style Selector="^.Large">
+            <Setter Property="Padding" Value="{DynamicResource ButtonLargePadding}" />
+        </Style>
+        <Style Selector="^.Small">
+            <Setter Property="Padding" Value="{DynamicResource ButtonSmallPadding}" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme
+        x:Key="SolidIconButton"
+        BasedOn="{StaticResource {x:Type u:IconButton}}"
+        TargetType="u:IconButton">
+        <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+        <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+
+        <Style Selector="^:pointerover">
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+        </Style>
+        <Style Selector="^:pressed">
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+        </Style>
+
+        <Style Selector="^.Primary">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryBorderBrush}" />
+            <Style Selector="^:pointerover">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+            </Style>
+            <Style Selector="^:pressed">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+            </Style>
+        </Style>
+        <Style Selector="^.Secondary">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryBorderBrush}" />
+            <Style Selector="^:pointerover">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPointeroverBorderBrush}" />
+            </Style>
+            <Style Selector="^:pressed">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSecondaryPressedBorderBrush}" />
+            </Style>
+        </Style>
+        <Style Selector="^.Tertiary">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryBorderBrush}" />
+            <Style Selector="^:pointerover">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPointeroverBorderBrush}" />
+            </Style>
+            <Style Selector="^:pressed">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidTertiaryPressedBorderBrush}" />
+            </Style>
+        </Style>
+        <Style Selector="^.Success">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessBorderBrush}" />
+            <Style Selector="^:pointerover">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPointeroverBorderBrush}" />
+            </Style>
+            <Style Selector="^:pressed">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSuccessPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidSuccessPressedBorderBrush}" />
+            </Style>
+        </Style>
+        <Style Selector="^.Warning">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningBorderBrush}" />
+            <Style Selector="^:pointerover">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPointeroverBorderBrush}" />
+            </Style>
+            <Style Selector="^:pressed">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidWarningPressedBorderBrush}" />
+            </Style>
+        </Style>
+        <Style Selector="^.Danger">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerBorderBrush}" />
+            <Style Selector="^:pointerover">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPointeroverBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPointeroverBorderBrush}" />
+            </Style>
+            <Style Selector="^:pressed">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerPressedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidDangerPressedBorderBrush}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:disabled">
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultDisabledBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme
+        x:Key="BorderlessIconButton"
+        BasedOn="{StaticResource {x:Type u:IconButton}}"
+        TargetType="u:IconButton">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Style Selector="^:disabled">
+            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+        </Style>
+
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,32 @@
+<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:ImageViewer}" TargetType="u:ImageViewer">
+        <Setter Property="Background" Value="LightGray" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="{x:Type u:ImageViewer}">
+                <VisualLayerManager Name="{x:Static u:ImageViewer.PART_Layer}">
+                    <Border Background="{TemplateBinding Background}" ClipToBounds="True">
+                        <Image
+                            Name="{x:Static u:ImageViewer.PART_Image}"
+                            Source="{TemplateBinding Source}"
+                            Stretch="Uniform">
+                            <Image.RenderTransform>
+                                <TransformGroup>
+                                    <ScaleTransform ScaleX="{Binding Scale, RelativeSource={RelativeSource TemplatedParent}}" ScaleY="{Binding Scale, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    <TranslateTransform X="{Binding TranslateX, RelativeSource={RelativeSource TemplatedParent}}" Y="{Binding TranslateY, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    <RotateTransform Angle="0" />
+                                </TransformGroup>
+                            </Image.RenderTransform>
+                        </Image>
+                    </Border>
+                </VisualLayerManager>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:moving">
+            <Setter Property="Cursor" Value="Hand" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -2,17 +2,19 @@
     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">
     <converters:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
 
     <ControlTheme x:Key="{x:Type u:KeyGestureInput}" TargetType="u:KeyGestureInput">
-        <Setter Property="Width" Value="{DynamicResource KeyGestureInputWidth}" />
-        <Setter Property="Height" Value="{DynamicResource KeyGestureInputHeight}" />
+        <Setter Property="MinWidth" Value="{DynamicResource KeyGestureInputWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource KeyGestureInputHeight}" />
         <Setter Property="Background" Value="{DynamicResource KeyGestureInputBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource KeyGestureInputBorderBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource KeyGestureInputBorderThickness}" />
         <Setter Property="CornerRadius" Value="{DynamicResource KeyGestureInputCornerRadius}" />
-
+        <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
+        <Setter Property="Padding" Value="8 0" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:KeyGestureInput">
                 <Border
@@ -23,11 +25,43 @@
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}">
-                    <SelectableTextBlock
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                        Text="{TemplateBinding Gesture,
-                                               Converter={StaticResource KeyGestureConverter}}" />
+                    <Panel VerticalAlignment="Stretch" Margin="{TemplateBinding Padding}">
+                        <Grid ColumnDefinitions="Auto, *, Auto" >
+                            <ContentPresenter Grid.Column="0"
+                                Content="{TemplateBinding InnerLeftContent}"
+                                Padding="{TemplateBinding Padding, Converter={x:Static ursaConverters:ThicknessIncludeConverter.Right}}"
+                                DockPanel.Dock="Left"
+                                VerticalAlignment="Stretch"
+                                VerticalContentAlignment="Center"
+                                Foreground="{DynamicResource TextBoxInnerForeground}"
+                                IsVisible="{Binding Path=InnerLeftContent, RelativeSource={RelativeSource TemplatedParent},
+                                                            Converter={x:Static ObjectConverters.IsNotNull}}" />
+                            <ContentPresenter
+                                Grid.Column="2"
+                                Content="{TemplateBinding InnerRightContent}"
+                                DockPanel.Dock="Right"
+                                Padding="{TemplateBinding Padding, Converter={x:Static ursaConverters:ThicknessIncludeConverter.Left}}"
+                                VerticalAlignment="Stretch"
+                                VerticalContentAlignment="Center"
+                                Foreground="{DynamicResource TextBoxInnerForeground}"
+                                IsVisible="{Binding Path=InnerRightContent, RelativeSource={RelativeSource TemplatedParent},
+                                                            Converter={x:Static ObjectConverters.IsNotNull}}" />
+                            <SelectableTextBlock
+                                Grid.Column="1"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Text="{TemplateBinding Gesture,
+                                                       Converter={StaticResource KeyGestureConverter}}" />
+                            <Button Grid.Column="0" Grid.ColumnSpan="3"
+                                Name="PART_ClearButton"
+                                Margin="0,0,8,0"
+                                HorizontalAlignment="Right"
+                                Command="{Binding $parent[u:KeyGestureInput].Clear}"
+                                Focusable="False"
+                                IsVisible="False"
+                                Theme="{DynamicResource InputClearButton}" />
+                        </Grid>
+                    </Panel>
                 </Border>
             </ControlTemplate>
         </Setter>
@@ -45,5 +79,13 @@
             <Setter Property="Background" Value="{DynamicResource KeyGestureInputPressedBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource KeyGestureInputFocusBorderBrush}" />
         </Style>
+        <Style Selector="^:not(:empty).clearButton, ^:not(:empty).ClearButton">
+            <Style Selector="^:focus /template/ Button#PART_ClearButton">
+                <Setter Property="IsVisible" Value="True" />
+            </Style>
+            <Style Selector="^:pointerover /template/ Button#PART_ClearButton">
+                <Setter Property="IsVisible" Value="True" />
+            </Style>
+        </Style>
     </ControlTheme>
 </ResourceDictionary>

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

@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converters="clr-namespace:Ursa.Themes.Semi.Converters"
-    xmlns:u="clr-namespace:Ursa.Controls;assembly=Ursa">
+    xmlns:u="clr-namespace:Ursa.Controls;assembly=Ursa"
+    xmlns:iri="https://irihi.tech/shared">
     <!--  Add Resources Here  -->
     <converters:BrushToColorConverter x:Key="BrushToColorConverter" />
     <ControlTheme x:Key="{x:Type u:LoadingIcon}" TargetType="u:LoadingIcon">
@@ -12,6 +13,7 @@
                 <Arc
                     Name="PART_Arc"
                     Width="20"
+                    IsVisible="{TemplateBinding IsVisible}"
                     Height="20"
                     StartAngle="0"
                     StrokeJoin="Round"
@@ -28,7 +30,7 @@
                         </ConicGradientBrush>
                     </Arc.Stroke>
                     <Arc.Styles>
-                        <Style Selector="Arc">
+                        <Style Selector="Arc[IsVisible=True]">
                             <Style.Animations>
                                 <Animation IterationCount="Infinite" Duration="0:0:0.5">
                                     <KeyFrame Cue="0%">
@@ -66,9 +68,10 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="u:Loading">
                 <Panel IsVisible="{TemplateBinding IsLoading}">
-                    <Border
+                    <iri:PureRectangle
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
+                        IsHitTestVisible="True"
                         Background="{TemplateBinding Background}" />
                     <Grid
                         HorizontalAlignment="Center"

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

@@ -0,0 +1,299 @@
+<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:MessageBoxWindow}" TargetType="u:MessageBoxWindow">
+        <Setter Property="Title" Value="{x:Null}" />
+        <Setter Property="Background" Value="{DynamicResource BorderCardBackground}" />
+        <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource WindowDefaultBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
+        <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
+        <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
+        <Setter Property="Padding" Value="48 24" />
+        <Setter Property="SizeToContent" Value="WidthAndHeight" />
+        <Setter Property="WindowStartupLocation" Value="CenterOwner" />
+        <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="1" />
+        <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
+        <Setter Property="ExtendClientAreaChromeHints" Value="SystemChrome" />
+        <Setter Property="SystemDecorations">
+            <OnPlatform>
+                <OnPlatform.Windows>
+                    <SystemDecorations>Full</SystemDecorations>
+                </OnPlatform.Windows>
+                <OnPlatform.Default>
+                    <SystemDecorations>BorderOnly</SystemDecorations>
+                </OnPlatform.Default>
+            </OnPlatform>
+        </Setter>
+        <Setter Property="CanResize" Value="False" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:MessageBoxWindow">
+                <Panel>
+                    <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+                    <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
+                    <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
+                    <ChromeOverlayLayer />
+                    <Grid RowDefinitions="Auto, *, Auto">
+                        <Grid
+                            Grid.Row="0"
+                            Margin="24,24,24,0"
+                            ColumnDefinitions="Auto, *, Auto">
+                            <PathIcon
+                                Name="PART_Icon"
+                                Grid.Column="0"
+                                Width="24"
+                                Height="24"
+                                Margin="0,0,8,0"
+                                VerticalAlignment="Center"
+                                IsHitTestVisible="False" />
+                            <TextBlock
+                                Grid.Column="1"
+                                VerticalAlignment="Center"
+                                FontSize="16"
+                                FontWeight="Bold"
+                                IsHitTestVisible="False"
+                                Text="{TemplateBinding Title}"
+                                TextTrimming="CharacterEllipsis"
+                                TextWrapping="NoWrap" />
+                            <Button
+                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                Grid.Column="2"
+                                Theme="{DynamicResource CloseButton}" />
+                        </Grid>
+                        <Grid
+                            Grid.Row="1"
+                            MaxWidth="{DynamicResource MessageBoxWindowContentMaxWidth}"
+                            Margin="{TemplateBinding Padding}"
+                            ColumnDefinitions="Auto, *">
+                            <ScrollViewer
+                                Grid.Column="1"
+                                MaxHeight="300"
+                                HorizontalScrollBarVisibility="Disabled"
+                                VerticalScrollBarVisibility="Auto">
+                                <TextBlock
+                                    Name="PART_ContentPresenter"
+                                    VerticalAlignment="Center"
+                                    Text="{TemplateBinding Content}"
+                                    TextAlignment="Left"
+                                    TextWrapping="Wrap" />
+                            </ScrollViewer>
+                        </Grid>
+                        <StackPanel
+                            Grid.Row="2"
+                            Margin="24,0,24,24"
+                            HorizontalAlignment="Right"
+                            Orientation="Horizontal">
+                            <Button
+                                Name="{x:Static u:MessageBoxWindow.PART_CancelButton}"
+                                Margin="8,0,0,0"
+                                Classes="Tertiary"
+                                Content="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
+                            <Button
+                                Name="{x:Static u:MessageBoxWindow.PART_NoButton}"
+                                Margin="8,0,0,0"
+                                Classes="Danger"
+                                Content="{DynamicResource STRING_MENU_DIALOG_NO}"
+                                Theme="{DynamicResource SolidButton}" />
+                            <Button
+                                Name="{x:Static u:MessageBoxWindow.PART_YesButton}"
+                                Margin="8,0,0,0"
+                                Classes="Primary"
+                                Content="{DynamicResource STRING_MENU_DIALOG_YES}"
+                                Theme="{DynamicResource SolidButton}" />
+                            <Button
+                                Name="{x:Static u:MessageBoxWindow.PART_OKButton}"
+                                Margin="8,0,0,0"
+                                Classes="Primary"
+                                Content="{DynamicResource STRING_MENU_DIALOG_OK}"
+                                Theme="{DynamicResource SolidButton}" />
+                        </StackPanel>
+                    </Grid>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^[MessageIcon=None] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^[MessageIcon=Asterisk] /template/ PathIcon#PART_Icon, ^[MessageIcon=Information] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Error] /template/ PathIcon#PART_Icon, ^[MessageIcon=Hand] /template/ PathIcon#PART_Icon, ^[MessageIcon=Stop] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Exclamation] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiYellow6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Question] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Warning] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Success] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:MessageBoxControl}" TargetType="u:MessageBoxControl">
+        <Setter Property="CornerRadius" Value="12" />
+        <Setter Property="Padding" Value="48 24" />
+        <Setter Property="u:DialogControlBase.CanDragMove" Value="True"></Setter>
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:MessageBoxControl">
+                <Border
+                    Padding="0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Classes="Shadow"
+                    ClipToBounds="False"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    IsHitTestVisible="True"
+                    Theme="{DynamicResource CardBorder}">
+                    <Border ClipToBounds="True" CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid RowDefinitions="Auto, *, Auto">
+                            <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogControlBase.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="3"
+                                    Background="Transparent" />
+                                <PathIcon
+                                    Name="PART_Icon"
+                                    Grid.Column="0"
+                                    Width="24"
+                                    Height="24"
+                                    Margin="24,24,8,0"
+                                    VerticalAlignment="Center"
+                                    IsHitTestVisible="False" />
+                                <TextBlock
+                                    Name="PART_Title"
+                                    Grid.Column="1"
+                                    Margin="0,24,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    FontWeight="Bold"
+                                    IsHitTestVisible="False"
+                                    Text="{TemplateBinding Title}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="2"
+                                    Margin="0,24,24,0"
+                                    Theme="{DynamicResource OverlayCloseButton}" />
+                            </Grid>
+                            <Grid
+                                Grid.Row="1"
+                                MaxWidth="{DynamicResource MessageBoxWindowContentMaxWidth}"
+                                Margin="{TemplateBinding Padding}">
+                                <ScrollViewer
+                                    MaxHeight="300"
+                                    HorizontalScrollBarVisibility="Disabled"
+                                    VerticalScrollBarVisibility="Auto">
+                                    <TextBlock
+                                        Name="PART_ContentPresenter"
+                                        VerticalAlignment="Center"
+                                        Text="{TemplateBinding Content}"
+                                        TextAlignment="Left"
+                                        TextWrapping="Wrap" />
+                                </ScrollViewer>
+                            </Grid>
+                            <StackPanel
+                                Grid.Row="2"
+                                Margin="24,0,24,24"
+                                HorizontalAlignment="Right"
+                                Orientation="Horizontal">
+                                <Button
+                                    Name="{x:Static u:MessageBoxControl.PART_CancelButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Tertiary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxControl.PART_NoButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Danger"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_NO}"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxControl.PART_YesButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_YES}"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxControl.PART_OKButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_OK}"
+                                    Theme="{DynamicResource SolidButton}" />
+                            </StackPanel>
+                        </Grid>
+                    </Border>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^ /template/ Panel#PART_TitleArea">
+            <Setter Property="ContextFlyout">
+                <MenuFlyout>
+                    <MenuItem Command="{Binding $parent[u:CustomDialogControl].CloseDialog}" Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}">
+                        <MenuItem.Icon>
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource WindowCloseIconGlyph}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </MenuFlyout>
+            </Setter>
+        </Style>
+        <Style Selector="^[MessageIcon=None] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^[MessageIcon=None] /template/ TextBlock#PART_Title">
+            <Setter Property="Margin" Value="24 24 0 0" />
+        </Style>
+        <Style Selector="^[MessageIcon=Asterisk] /template/ PathIcon#PART_Icon, ^[MessageIcon=Information] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogInformationIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Error] /template/ PathIcon#PART_Icon, ^[MessageIcon=Hand] /template/ PathIcon#PART_Icon, ^[MessageIcon=Stop] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogErrorIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Exclamation] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiYellow6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Question] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogQuestionIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Warning] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogWarningIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Success] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
+            <Setter Property="Data" Value="{DynamicResource DialogSuccessIconGlyph}" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,271 @@
+<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:MultiComboBox}" TargetType="u:MultiComboBox">
+        <Setter Property="Focusable" Value="True" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Width" Value="300" />
+        <Setter Property="MaxDropdownHeight" Value="300" />
+        <Setter Property="MaxSelectionBoxHeight" Value="270"></Setter>
+        <Setter Property="MinHeight" Value="32" />
+        <Setter Property="Padding" Value="12 4" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:MultiComboBox">
+                <DataValidationErrors>
+                    <Panel>
+                        <Border
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}">
+                            <Grid Name="PART_RootGrid" ColumnDefinitions="Auto, *, Auto, Auto, 32">
+                                <Border
+                                    Name="{x:Static u:MultiComboBox.PART_BackgroundBorder}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="5"
+                                    Background="Transparent" />
+                                <ContentPresenter
+                                    Grid.Column="0"
+                                    Margin="8,0"
+                                    IsHitTestVisible="False"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding InnerLeftContent}"
+                                    Foreground="{DynamicResource TextBoxInnerForeground}"
+                                    IsVisible="{TemplateBinding InnerLeftContent,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                <ScrollViewer
+                                    Grid.Column="1"
+                                    Grid.ColumnSpan="2"
+                                    MaxHeight="{TemplateBinding MaxSelectionBoxHeight}"
+                                    Background="{x:Null}"
+                                    HorizontalScrollBarVisibility="Disabled">
+                                    <u:MultiComboBoxSelectedItemList
+                                        VerticalAlignment="Center"
+                                        ItemTemplate="{TemplateBinding SelectedItemTemplate}"
+                                        ItemsSource="{TemplateBinding SelectedItems}"
+                                        RemoveCommand="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Remove}">
+                                        <ItemsControl.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <WrapPanel Orientation="Horizontal" />
+                                            </ItemsPanelTemplate>
+                                        </ItemsControl.ItemsPanel>
+                                    </u:MultiComboBoxSelectedItemList>
+                                </ScrollViewer>
+                                <Button
+                                    Name="ClearButton"
+                                    Grid.Column="2"
+                                    Command="{Binding $parent[u:MultiComboBox].Clear}"
+                                    Content="{DynamicResource IconButtonClearData}"
+                                    IsVisible="False"
+                                    Theme="{DynamicResource InnerIconButton}" />
+                                <ContentPresenter
+                                    Grid.Column="3"
+                                    Margin="8,0"
+                                    VerticalAlignment="Center"
+                                    IsHitTestVisible="False"
+                                    Content="{TemplateBinding InnerRightContent}"
+                                    Foreground="{DynamicResource TextBoxInnerForeground}"
+                                    IsVisible="{TemplateBinding InnerRightContent,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                <PathIcon
+                                    x:Name="DropDownGlyph"
+                                    Grid.Column="4"
+                                    Width="12"
+                                    Height="12"
+                                    Margin="0,0,10,0"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Center"
+                                    Data="{DynamicResource ComboBoxIcon}"
+                                    Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
+                                    IsHitTestVisible="False"
+                                    UseLayoutRounding="False" />
+                            </Grid>
+                        </Border>
+                        <Popup
+                            Width="{Binding #PART_RootGrid.Bounds.Width}"
+                            MaxHeight="{TemplateBinding MaxDropdownHeight}"
+                            IsLightDismissEnabled="True"
+                            IsOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsDropDownOpen, Mode=TwoWay}"
+                            PlacementTarget="PART_RootGrid">
+                            <Border
+                                Margin="0,4"
+                                HorizontalAlignment="Stretch"
+                                Background="{DynamicResource ComboBoxPopupBackground}"
+                                BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
+                                BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
+                                BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
+                                ClipToBounds="True"
+                                CornerRadius="6">
+                                <ScrollViewer
+                                    Grid.IsSharedSizeScope="True"
+                                    HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                    VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                                    <ItemsPresenter
+                                        Name="PART_ItemsPresenter"
+                                        Margin="{DynamicResource ComboBoxDropdownContentMargin}"
+                                        HorizontalAlignment="Stretch"
+                                        ItemsPanel="{TemplateBinding ItemsPanel}" />
+                                </ScrollViewer>
+                            </Border>
+                        </Popup>
+                    </Panel>
+                </DataValidationErrors>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^.Large">
+            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
+        </Style>
+        <Style Selector="^.Small">
+            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
+        </Style>
+
+        <Style Selector="^.clearButton, ^.ClearButton">
+            <Style Selector="^:pointerover:not(:selection-empty) /template/ Button#ClearButton">
+                <Setter Property="IsVisible" Value="{Binding $parent[ComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNotNull}}" />
+            </Style>
+        </Style>
+
+
+        <!--  Pointerover State  -->
+        <Style Selector="^:pointerover">
+            <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPointeroverBorderBrush}" />
+        </Style>
+        <Style Selector="^:pointerover /template/ PathIcon#DropDownGlyph">
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconPointeroverForeground}" />
+        </Style>
+
+        <!--  Pressed State  -->
+        <Style Selector="^:pressed">
+            <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPressedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPressedBorderBrush}" />
+            <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconPressedForeground}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:dropdownopen">
+            <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPressedBorderBrush}" />
+        </Style>
+
+        <!--  Disabled State  -->
+        <Style Selector="^:disabled">
+            <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
+            <Style Selector="^ /template/ ContentControl#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxDisabledForeground}" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxDisabledForeground}" />
+            </Style>
+            <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconDisabledForeground}" />
+            </Style>
+        </Style>
+        <!--  Error State  -->
+        <Style Selector="^:error">
+            <Style Selector="^ /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsBackground}" />
+            </Style>
+            <Style Selector="^:pointerover /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                <Setter Property="BorderBrush" Value="Transparent" />
+            </Style>
+            <Style Selector="^:pressed /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
+                <Setter Property="BorderBrush" Value="Transparent" />
+            </Style>
+            <Style Selector="^:focus /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+            </Style>
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:MultiComboBoxItem}" TargetType="u:MultiComboBoxItem">
+        <Setter Property="Padding" Value="8,0,0,0" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="{DynamicResource ListBoxItemCheckFontSize}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ListBoxItemCheckBoxCornerRadius}" />
+        <Setter Property="MinHeight" Value="32" />
+        <Setter Property="Foreground" Value="{DynamicResource ListBoxItemCheckForeground}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ListBoxItemCheckDefaultBorderBrush}" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:MultiComboBoxItem">
+                <Border
+                    x:Name="RootBorder"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <Grid x:Name="RootGrid" ColumnDefinitions="Auto, *">
+                        <PathIcon
+                            Name="CheckGlyph"
+                            Grid.Column="0"
+                            Width="{DynamicResource ListBoxItemCheckBoxGlyphWidth}"
+                            Height="{DynamicResource ListBoxItemCheckBoxGlyphHeight}"
+                            Margin="8,0"
+                            VerticalAlignment="Center"
+                            Data="{DynamicResource ListBoxItemCheckCheckGlyph}"
+                            Opacity="0" />
+                        <ContentPresenter
+                            x:Name="ContentPresenter"
+                            Grid.Column="1"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            IsVisible="{TemplateBinding Content,
+                                                        Converter={x:Static ObjectConverters.IsNotNull}}"
+                            RecognizesAccessKey="True"
+                            TextWrapping="Wrap" />
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:disabled">
+            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemDisabledForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ListBoxItemDisabledBackground}" />
+            <Style Selector="^:selected">
+                <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedDisabledBackground}" />
+            </Style>
+        </Style>
+
+        <!--  Pointerover State  -->
+        <Style Selector="^:pointerover">
+            <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
+        </Style>
+
+        <!--  Pressed State  -->
+        <Style Selector="^:pressed">
+            <Setter Property="Background" Value="{DynamicResource ListBoxItemPressedBackground}" />
+        </Style>
+
+        <!--  Selected State  -->
+        <Style Selector="^:selected /template/ PathIcon#CheckGlyph">
+            <Setter Property="Opacity" Value="1" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:MultiComboBoxSelectedItemList}" TargetType="u:MultiComboBoxSelectedItemList">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:MultiComboBoxSelectedItemList">
+                <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,251 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    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">
+        <Setter Property="Grid.IsSharedSizeScope" Value="True" />
+        <Setter Property="SubMenuIndent" Value="24" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:NavMenu">
+                <DockPanel LastChildFill="True">
+                    <ContentPresenter Content="{TemplateBinding Header}" DockPanel.Dock="Top" />
+                    <ContentPresenter Content="{TemplateBinding Footer}" DockPanel.Dock="Bottom" />
+                    <ScrollViewer
+                        HorizontalAlignment="Stretch"
+                        HorizontalScrollBarVisibility="Disabled"
+                        AllowAutoHide="True"
+                        
+                        VerticalScrollBarVisibility="Auto">
+                        <ScrollViewer.Styles>
+                            <Style Selector="ScrollViewer /template/ ScrollBar">
+                                <Setter Property="Opacity" Value="0"></Setter>
+                            </Style>
+                            <Style Selector="ScrollViewer:pointerover">
+                                <Style Selector="^ /template/ ScrollBar#PART_HorizontalScrollBar">
+                                    <Setter Property="Opacity" Value="1" />
+                                </Style>
+                                <Style Selector="^ /template/ ScrollBar#PART_VerticalScrollBar">
+                                    <Setter Property="Opacity" Value="1" />
+                                </Style>
+                            </Style>
+                        </ScrollViewer.Styles>
+                        <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
+                    </ScrollViewer>
+                </DockPanel>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:not(:horizontal-collapsed)">
+            <Setter Property="Width" Value="{Binding $self.ExpandWidth}"></Setter>
+        </Style>
+        <Style Selector="^:horizontal-collapsed">
+            <Setter Property="Width" Value="{Binding $self.CollapseWidth}" />
+            <Setter Property="Grid.IsSharedSizeScope" Value="False"></Setter>
+        </Style>
+    </ControlTheme>
+
+    <ControlTemplate x:Key="DefaultNavMenuItemTemplate" TargetType="u:NavMenuItem">
+        <Grid RowDefinitions="Auto, *">
+            <Border
+                Name="PART_Border"
+                Grid.Row="0"
+                MinHeight="32"
+                HorizontalAlignment="Stretch"
+                Background="{TemplateBinding u:NavMenuItem.Background}"
+                CornerRadius="4"
+                Cursor="Hand">
+                <Grid
+                    Name="PART_RootGrid"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Center">
+                    <Grid.Margin>
+                        <MultiBinding Converter="{StaticResource NavMarginConverter}">
+                            <Binding Path="SubMenuIndent" RelativeSource="{RelativeSource TemplatedParent}" />
+                            <Binding Path="Level" RelativeSource="{RelativeSource TemplatedParent}" />
+                            <Binding Path="IsHorizontalCollapsed" RelativeSource="{RelativeSource TemplatedParent}" />
+                        </MultiBinding>
+                    </Grid.Margin>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" SharedSizeGroup="Icon" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" SharedSizeGroup="Expander" />
+                    </Grid.ColumnDefinitions>
+                    <ContentPresenter
+                        Name="PART_IconPresenter"
+                        Padding="8"
+                        HorizontalAlignment="Left"
+                        Background="Transparent"
+                        Content="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}}"
+                        ContentTemplate="{Binding IconTemplate, RelativeSource={RelativeSource TemplatedParent}}" />
+                    <ContentPresenter
+                        Name="PART_HeaderPresenter"
+                        Grid.Column="1"
+                        Padding="0,8"
+                        Background="Transparent"
+                        Content="{Binding Header, RelativeSource={RelativeSource TemplatedParent}}"
+                        ContentTemplate="{Binding HeaderTemplate, RelativeSource={RelativeSource TemplatedParent}}" />
+                    <PathIcon
+                        Name="PART_ExpanderIcon"
+                        Grid.Column="2"
+                        Width="8"
+                        Height="8"
+                        Margin="12,0"
+                        Data="{DynamicResource NavigationMenuItemExpandIconGlyph}"
+                        Foreground="{DynamicResource NavigationMenuItemExpandIconForeground}">
+                        <PathIcon.Transitions>
+                            <Transitions>
+                                <TransformOperationsTransition Property="RenderTransform" Duration="0.1" />
+                            </Transitions>
+                        </PathIcon.Transitions>
+                    </PathIcon>
+                    <Popup
+                        Name="PART_Popup"
+                        Grid.Column="0"
+                        IsLightDismissEnabled="True"
+                        Placement="RightEdgeAlignedTop"
+                        PlacementTarget="{Binding #PART_Border}">
+                        <Border
+                            Margin="{DynamicResource NavigationMenuItemFlyoutMargin}"
+                            Padding="{DynamicResource MenuFlyoutPadding}"
+                            HorizontalAlignment="Stretch"
+                            Background="{DynamicResource MenuFlyoutBackground}"
+                            BorderBrush="{DynamicResource MenuFlyoutBorderBrush}"
+                            BorderThickness="{DynamicResource MenuFlyoutBorderThickness}"
+                            BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
+                            CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
+                            <StackPanel Name="PART_OverflowPanel" />
+                        </Border>
+                    </Popup>
+                </Grid>
+            </Border>
+            <ItemsPresenter
+                Name="PART_ItemsPresenter"
+                Grid.Row="1"
+                Margin="0,4,0,0"
+                VerticalAlignment="Top"
+                Grid.IsSharedSizeScope="True"
+                ItemsPanel="{Binding ItemsPanel, RelativeSource={RelativeSource TemplatedParent}}"
+                RenderTransformOrigin="0.5,0">
+                <ItemsPresenter.Transitions>
+                    <Transitions>
+                        <DoubleTransition Property="Height" Duration="0.1" />
+                        <TransformOperationsTransition Property="RenderTransform" Duration="0.1" />
+                    </Transitions>
+                </ItemsPresenter.Transitions>
+            </ItemsPresenter>
+        </Grid>
+    </ControlTemplate>
+    <ControlTheme x:Key="{x:Type u:NavMenuItem}" TargetType="u:NavMenuItem">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="ItemsPanel">
+            <ItemsPanelTemplate>
+                <u:OverflowStackPanel />
+            </ItemsPanelTemplate>
+        </Setter>
+        <Setter Property="Template" Value="{StaticResource DefaultNavMenuItemTemplate}" />
+        <Style Selector="^:selected">
+            <Setter Property="Background" Value="{DynamicResource NavigationMenuItemSelectedBackground}" />
+            <Style Selector="^:pointerover">
+                <Setter Property="Background" Value="{DynamicResource NavigationMenuItemSelectedBackground}" />
+            </Style>
+        </Style>
+        <Style Selector="^:vertical-collapsed /template/ ItemsPresenter#PART_ItemsPresenter">
+            <Setter Property="Height" Value="0" />
+            <Setter Property="RenderTransform" Value="scale(1,0)" />
+        </Style>
+        <Style Selector="^:vertical-collapsed /template/ PathIcon#PART_ExpanderIcon">
+            <Setter Property="RenderTransform" Value="rotate(180deg)" />
+        </Style>
+        <Style Selector="^:empty /template/ PathIcon#PART_ExpanderIcon">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^ /template/ Border#PART_Border:pointerover">
+            <Setter Property="Background" Value="{DynamicResource NavigationMenuItemPointeroverBackground}" />
+        </Style>
+        <Style Selector="^:horizontal-collapsed:first-level">
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Style Selector="^ /template/ Border#PART_Border">
+                <Setter Property="ToolTip.Tip" >
+                    <Template>
+                        <ContentPresenter Content="{TemplateBinding u:NavMenuItem.Header}" ContentTemplate="{TemplateBinding u:NavMenuItem.HeaderTemplate}"></ContentPresenter>
+                    </Template>
+                </Setter>
+                <Setter Property="ToolTip.ShowDelay" Value="0" />
+                <Setter Property="HorizontalAlignment" Value="Stretch" />
+            </Style>
+            <Style Selector="^ /template/ Border#PART_Border:pointerover">
+                <Setter Property="Background" Value="{DynamicResource NavigationMenuItemPointeroverBackground}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+                <Setter Property="Grid.ColumnSpan" Value="3" />
+                <Setter Property="Margin" Value="0 8" />
+                <Setter Property="HorizontalAlignment" Value="Center" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="IsVisible" Value="False" />
+            </Style>
+            <Style Selector="^ /template/ PathIcon#PART_ExpanderIcon">
+                <Setter Property="IsVisible" Value="False" />
+            </Style>
+            <Style Selector="^ /template/ ItemsPresenter#PART_ItemsPresenter">
+                <Setter Property="IsVisible" Value="False" />
+            </Style>
+        </Style>
+        <Style Selector="^:horizontal-collapsed:not(:first-level)">
+            <Style Selector="^ /template/ PathIcon#PART_ExpanderIcon">
+                <Setter Property="RenderTransform" Value="rotate(-90deg)" />
+            </Style>
+        </Style>
+        <Style Selector="^:horizontal-collapsed:first-level">
+            <Setter Property="Grid.IsSharedSizeScope" Value="True"></Setter>
+        </Style>
+        <Style Selector="^[IsSeparator=True]">
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <StackPanel
+                        Name="PART_RootPanel"
+                        Margin="{DynamicResource NavigationMenuSeparatorMargin}"
+                        Cursor="No">
+                        <ContentPresenter
+                            Name="PART_HeaderPresenter"
+                            Margin="{DynamicResource NavigationMenuSeparatorHeaderMargin}"
+                            HorizontalAlignment="Left"
+                            Content="{TemplateBinding Header}"
+                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                            Foreground="{DynamicResource TextBlockQuaternaryForeground}"
+                            IsVisible="{TemplateBinding Header,
+                                                        Converter={x:Static ObjectConverters.IsNotNull}}">
+                            <ContentPresenter.Styles>
+                                <Style Selector="TextBlock">
+                                    <Setter Property="FontSize" Value="{DynamicResource NavigationMenuSeparatorHeaderFontSize}" />
+                                </Style>
+                            </ContentPresenter.Styles>
+                        </ContentPresenter>
+                        <Rectangle
+                            Name="PART_SeparatorBorder"
+                            Height="{DynamicResource NavigationMenuSeparatorBorderHeight}"
+                            Margin="{DynamicResource NavigationMenuSeparatorBorderMargin}"
+                            HorizontalAlignment="Stretch"
+                            Fill="{DynamicResource SemiColorBorder}" />
+                    </StackPanel>
+                </ControlTemplate>
+            </Setter>
+            <Style Selector="^:horizontal-collapsed:first-level">
+                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+                    <Setter Property="IsVisible" Value="False" />
+                </Style>
+                <Style Selector="^ /template/ Rectangle#PART_SeparatorBorder">
+                    <Setter Property="HorizontalAlignment" Value="Center" />
+                    <Setter Property="Width" Value="12" />
+                </Style>
+            </Style>
+        </Style>
+    </ControlTheme>
+
+</ResourceDictionary>

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

@@ -1,338 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    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:NavigationMenuItemLevelToMarginConverter x:Key="MarginConverter" Indent="8" />
-
-    <ControlTheme x:Key="{x:Type u:NavigationMenu}" TargetType="u:NavigationMenu">
-        <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="u:NavigationMenu">
-                <Border
-                    Name="PART_RootBorder"
-                    Width="{DynamicResource NavigationMenuExpandWidth}"
-                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <Border.Transitions>
-                        <Transitions>
-                            <DoubleTransition Property="Width" Duration="0:0:0.1" />
-                        </Transitions>
-                    </Border.Transitions>
-                    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                        <Grid
-                            Name="PART_RootGrid"
-                            HorizontalAlignment="Stretch"
-                            Background="{TemplateBinding Background}"
-                            RowDefinitions="Auto, *, Auto, Auto">
-                            <StackPanel
-                                Margin="{DynamicResource NavigationMenuHeaderMargin}"
-                                HorizontalAlignment="Center"
-                                Orientation="Horizontal">
-                                <ContentPresenter
-                                    Name="PART_IconPresenter"
-                                    Margin="{DynamicResource NavigationMenuIconMargin}"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding Icon}" />
-                                <ContentPresenter
-                                    Name="PART_HeaderPresenter"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding Header}"
-                                    ContentTemplate="{TemplateBinding HeaderTemplate}" />
-
-                            </StackPanel>
-                            <ItemsPresenter Grid.Row="1" ItemsPanel="{TemplateBinding ItemsPanel}" />
-                            <ContentPresenter
-                                Name="PART_FooterPresenter"
-                                Grid.Row="2"
-                                Content="{TemplateBinding Footer}"
-                                ContentTemplate="{TemplateBinding FooterTemplate}" />
-                            <ToggleSwitch
-                                Name="{x:Static u:NavigationMenu.PART_CloseButton}"
-                                Grid.Row="3"
-                                Content="Open"
-                                IsChecked="{TemplateBinding IsClosed,
-                                                            Mode=TwoWay}"
-                                IsVisible="{TemplateBinding ShowCollapseButton}"
-                                Theme="{DynamicResource ButtonToggleSwitch}">
-                                <ToggleSwitch.OnContent>
-                                    <PathIcon
-                                        Width="{DynamicResource NavigationMenuExpandIconWidth}"
-                                        Height="{DynamicResource NavigationMenuExpandIconHeight}"
-                                        Data="{DynamicResource NavigationMenuExpandIconGlyph}"
-                                        Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
-                                </ToggleSwitch.OnContent>
-                                <ToggleSwitch.OffContent>
-                                    <PathIcon
-                                        Width="{DynamicResource NavigationMenuExpandIconWidth}"
-                                        Height="{DynamicResource NavigationMenuExpandIconHeight}"
-                                        Data="{DynamicResource NavigationMenuExpandIconGlyph}"
-                                        Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
-                                </ToggleSwitch.OffContent>
-                            </ToggleSwitch>
-                        </Grid>
-                    </ScrollViewer>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-        <Style Selector="^:closed">
-            <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
-                <Setter Property="ContentPresenter.IsVisible" Value="False" />
-            </Style>
-            <Style Selector="^ /template/ Border#PART_RootBorder">
-                <Setter Property="Border.Width" Value="{DynamicResource NavigationMenuClosedWidth}" />
-            </Style>
-            <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-                <Setter Property="Grid.HorizontalAlignment" Value="Center" />
-            </Style>
-        </Style>
-    </ControlTheme>
-
-    <ControlTheme x:Key="{x:Type u:NavigationMenuItem}" TargetType="u:NavigationMenuItem">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="u:NavigationMenuItem">
-                <Border>
-                    <StackPanel>
-                        <Border
-                            Name="PART_HeaderBorder"
-                            Margin="{DynamicResource NavigationMenuItemDefaultMargin}"
-                            Padding="{DynamicResource NavigationMenuItemDefaultPadding}"
-                            Background="{DynamicResource NavigationMenuItemDefaultBackground}"
-                            CornerRadius="{DynamicResource NavigationMenuItemDefaultCornerRadius}">
-                            <Grid
-                                Name="PART_RootStackPanel"
-                                HorizontalAlignment="Stretch"
-                                ColumnDefinitions="Auto, Auto, *, Auto">
-                                <ContentPresenter
-                                    Name="PART_IconPresenter"
-                                    Grid.Column="1"
-                                    MinWidth="{DynamicResource NavigationMenuItemIconMinWidth}"
-                                    Content="{TemplateBinding Icon}"
-                                    ContentTemplate="{TemplateBinding IconTemplate}">
-                                    <ContentPresenter.Margin>
-                                        <MultiBinding Converter="{StaticResource MarginConverter}">
-                                            <Binding Path="Level" RelativeSource="{RelativeSource TemplatedParent}" />
-                                            <Binding Path="IsClosed" RelativeSource="{RelativeSource TemplatedParent}" />
-                                        </MultiBinding>
-                                    </ContentPresenter.Margin>
-                                </ContentPresenter>
-                                <ContentPresenter
-                                    Name="PART_HeaderPresenter"
-                                    Grid.Column="2"
-                                    Margin="{DynamicResource NavigationMenuItemHeaderMargin}"
-                                    VerticalAlignment="Center"
-                                    Background="{TemplateBinding Background}"
-                                    Content="{TemplateBinding Header}"
-                                    ContentTemplate="{TemplateBinding HeaderTemplate}">
-                                    <ContentPresenter.Transitions>
-                                        <Transitions>
-                                            <DoubleTransition Property="Opacity" Duration="0:0:0.15" />
-                                        </Transitions>
-                                    </ContentPresenter.Transitions>
-                                </ContentPresenter>
-                                <PathIcon
-                                    Name="PART_ExpandIcon"
-                                    Grid.Column="3"
-                                    Width="{DynamicResource NavigationMenuItemExpandIconWidth}"
-                                    Height="{DynamicResource NavigationMenuItemExpandIconHeight}"
-                                    Data="{DynamicResource NavigationMenuItemExpandIconGlyph}"
-                                    Foreground="{DynamicResource NavigationMenuItemExpandIconForeground}">
-                                    <PathIcon.Transitions>
-                                        <Transitions>
-                                            <TransformOperationsTransition Property="RenderTransform" Duration="0.1" />
-                                        </Transitions>
-                                    </PathIcon.Transitions>
-                                </PathIcon>
-                            </Grid>
-                        </Border>
-                        <ItemsPresenter Name="PART_ItemsPresenter" ItemsPanel="{TemplateBinding ItemsPanel}">
-                            <ItemsPresenter.Transitions>
-                                <Transitions>
-                                    <DoubleTransition Property="Opacity" Duration="0:0:0.15" />
-                                </Transitions>
-                            </ItemsPresenter.Transitions>
-                        </ItemsPresenter>
-                    </StackPanel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-
-        <Style Selector="^ /template/ Border#PART_HeaderBorder:pointerover">
-            <Setter Property="Border.Background" Value="{DynamicResource NavigationMenuItemPointeroverBackground}" />
-        </Style>
-        <Style Selector="^ /template/ Border#PART_HeaderBorder:pressed">
-            <Setter Property="Border.Background" Value="{DynamicResource NavigationMenuItemPressedBackground}" />
-        </Style>
-
-        <Style Selector="^:highlighted /template/ ContentPresenter#PART_IconPresenter">
-            <Setter Property="u:NavigationMenuItem.Foreground" Value="{DynamicResource NavigationMenuItemHighlightForeground}" />
-        </Style>
-
-        <Style Selector="^:selected /template/ Border#PART_HeaderBorder">
-            <Setter Property="u:NavigationMenuItem.Background" Value="{DynamicResource NavigationMenuItemSelectedBackground}" />
-        </Style>
-
-        <Style Selector="^:empty:closed:top-level">
-            <Setter Property="Template">
-                <ControlTemplate TargetType="u:NavigationMenuItem">
-                    <Border
-                        Name="PART_HeaderBorder"
-                        Margin="{DynamicResource NavigationMenuItemDefaultMargin}"
-                        Padding="{DynamicResource NavigationMenuItemDefaultPadding}"
-                        HorizontalAlignment="Center"
-                        Background="{DynamicResource NavigationMenuItemDefaultBackground}"
-                        CornerRadius="{DynamicResource NavigationMenuItemDefaultCornerRadius}"
-                        ToolTip.ShowDelay="0"
-                        ToolTip.Tip="{TemplateBinding Header}">
-                        <ContentPresenter
-                            Name="PART_IconPresenter"
-                            Grid.Column="1"
-                            MinWidth="{DynamicResource NavigationMenuItemIconMinWidth}"
-                            Margin="{DynamicResource NavigationMenuItemIconMargin}"
-                            Content="{TemplateBinding Icon}"
-                            ContentTemplate="{TemplateBinding IconTemplate}" />
-                    </Border>
-                </ControlTemplate>
-            </Setter>
-            <Style Selector="^ /template/ Border#PART_HeaderBorder:pointerover">
-                <Setter Property="Border.Background" Value="{DynamicResource NavigationMenuItemPointeroverBackground}" />
-            </Style>
-            <Style Selector="^ /template/ Border#PART_HeaderBorder:pressed">
-                <Setter Property="Border.Background" Value="{DynamicResource NavigationMenuItemPressedBackground}" />
-            </Style>
-        </Style>
-
-        <Style Selector="^:not(:empty):closed">
-            <Setter Property="Template">
-                <ControlTemplate TargetType="u:NavigationMenuItem">
-                    <Panel>
-                        <Border
-                            Name="PART_HeaderBorder"
-                            Margin="{DynamicResource NavigationMenuItemDefaultMargin}"
-                            Padding="{DynamicResource NavigationMenuItemDefaultPadding}"
-                            HorizontalAlignment="Center"
-                            Background="{DynamicResource NavigationMenuItemDefaultBackground}"
-                            CornerRadius="{DynamicResource NavigationMenuItemDefaultCornerRadius}">
-                            <Grid HorizontalAlignment="Stretch" ColumnDefinitions="Auto, *, Auto">
-                                <ContentPresenter
-                                    Name="PART_IconPresenter"
-                                    Grid.Column="0"
-                                    MinWidth="{DynamicResource NavigationMenuItemIconMinWidth}"
-                                    Content="{TemplateBinding Icon}"
-                                    ContentTemplate="{TemplateBinding IconTemplate}" />
-                                <ContentPresenter
-                                    Name="PART_HeaderPresenter"
-                                    Grid.Column="1"
-                                    Margin="{DynamicResource NavigationMenuItemHeaderMargin}"
-                                    VerticalAlignment="Center"
-                                    Background="{TemplateBinding Background}"
-                                    Content="{TemplateBinding Header}"
-                                    ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                    IsVisible="{TemplateBinding IsTopLevelMenuItem,
-                                                                Converter={x:Static BoolConverters.Not}}" />
-                                <PathIcon
-                                    Grid.Column="2"
-                                    Width="{DynamicResource NavigationMenuItemExpandIconWidth}"
-                                    Height="{DynamicResource NavigationMenuItemExpandIconHeight}"
-                                    Margin="{DynamicResource NavigationMenuItemExpandIconMargin}"
-                                    Data="{DynamicResource NavigationMenuItemExpandIconGlyph}"
-                                    Foreground="{DynamicResource NavigationMenuItemExpandIconForeground}"
-                                    IsVisible="{TemplateBinding IsTopLevelMenuItem,
-                                                                Converter={x:Static BoolConverters.Not}}"
-                                    RenderTransform="rotate(-90deg)" />
-                            </Grid>
-                        </Border>
-                        <Popup
-                            Name="{x:Static u:NavigationMenuItem.PART_Popup}"
-                            IsLightDismissEnabled="True"
-                            IsOpen="{TemplateBinding IsPopupOpen,
-                                                     Mode=TwoWay}"
-                            Placement="RightEdgeAlignedTop"
-                            PlacementTarget="PART_HeaderBorder"
-                            WindowManagerAddShadowHint="False">
-                            <Border
-                                MinWidth="{DynamicResource MenuFlyoutMinWidth}"
-                                MinHeight="{DynamicResource MenuFlyoutMinHeight}"
-                                MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
-                                MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
-                                Margin="{DynamicResource NavigationMenuItemFlyoutMargin}"
-                                Padding="{DynamicResource MenuFlyoutPadding}"
-                                HorizontalAlignment="Stretch"
-                                Background="{DynamicResource MenuFlyoutBackground}"
-                                BorderBrush="{DynamicResource MenuFlyoutBorderBrush}"
-                                BorderThickness="{DynamicResource MenuFlyoutBorderThickness}"
-                                BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
-                                CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
-                                <ScrollViewer Theme="{DynamicResource MenuScrollViewer}">
-                                    <ItemsPresenter
-                                        Name="PART_ItemsPresenter"
-                                        Grid.IsSharedSizeScope="True"
-                                        ItemsPanel="{TemplateBinding ItemsPanel}" />
-                                </ScrollViewer>
-                            </Border>
-                        </Popup>
-                    </Panel>
-                </ControlTemplate>
-            </Setter>
-            <Style Selector="^ /template/ Border#PART_HeaderBorder:pointerover">
-                <Setter Property="Border.Background" Value="{DynamicResource NavigationMenuItemPointeroverBackground}" />
-            </Style>
-            <Style Selector="^ /template/ Border#PART_HeaderBorder:pressed">
-                <Setter Property="Border.Background" Value="{DynamicResource NavigationMenuItemPressedBackground}" />
-            </Style>
-        </Style>
-
-        <Style Selector="^:not(:closed):collapsed /template/ ItemsPresenter#PART_ItemsPresenter">
-            <Setter Property="ItemsPresenter.Height" Value="{DynamicResource NavigationMenuItemCollapsedHeight}" />
-            <Setter Property="ItemsPresenter.Opacity" Value="{DynamicResource NavigationMenuItemCollapsedOpacity}" />
-        </Style>
-        <Style Selector="^:not(:empty):not(:collapsed) /template/ PathIcon#PART_ExpandIcon">
-            <Setter Property="PathIcon.RenderTransform" Value="rotate(-180deg)" />
-        </Style>
-        <Style Selector="^:empty /template/ PathIcon#PART_ExpandIcon">
-            <Setter Property="PathIcon.IsVisible" Value="False" />
-        </Style>
-    </ControlTheme>
-
-    <ControlTheme x:Key="{x:Type u:NavigationMenuSeparator}" TargetType="u:NavigationMenuSeparator">
-        <Setter Property="Template">
-            <ControlTemplate TargetType="u:NavigationMenuSeparator">
-                <StackPanel Name="PART_RootPanel" Margin="{DynamicResource NavigationMenuSeparatorMargin}">
-                    <ContentPresenter
-                        Name="PART_HeaderPresenter"
-                        Margin="{DynamicResource NavigationMenuSeparatorHeaderMargin}"
-                        HorizontalAlignment="Left"
-                        Content="{TemplateBinding Header}"
-                        ContentTemplate="{TemplateBinding HeaderTemplate}"
-                        Foreground="{DynamicResource TextBlockQuaternaryForeground}"
-                        IsVisible="{TemplateBinding Header,
-                                                    Converter={x:Static ObjectConverters.IsNotNull}}">
-                        <ContentPresenter.Styles>
-                            <Style Selector="TextBlock">
-                                <Setter Property="FontSize" Value="{DynamicResource NavigationMenuSeparatorHeaderFontSize}" />
-                            </Style>
-                        </ContentPresenter.Styles>
-                    </ContentPresenter>
-                    <Rectangle
-                        Height="{DynamicResource NavigationMenuSeparatorBorderHeight}"
-                        Margin="{DynamicResource NavigationMenuSeparatorBorderMargin}"
-                        HorizontalAlignment="Stretch"
-                        Fill="{DynamicResource SemiColorBorder}" />
-                </StackPanel>
-            </ControlTemplate>
-        </Setter>
-        <Style Selector="^:closed /template/ StackPanel#PART_RootPanel">
-            <Setter Property="StackPanel.HorizontalAlignment" Value="Center" />
-            <Setter Property="StackPanel.Width" Value="{DynamicResource NavigationMenuSeparatorClosedWidth}" />
-        </Style>
-        <Style Selector="^:closed /template/ ContentPresenter#PART_HeaderPresenter">
-            <Setter Property="ContentPresenter.IsVisible" Value="False" />
-        </Style>
-    </ControlTheme>
-</ResourceDictionary>

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

@@ -0,0 +1,216 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:u="https://irihi.tech/ursa">
+    <!--  Add Resources Here  -->
+    <Design.PreviewWith>
+        <u:NumPad />
+    </Design.PreviewWith>
+    <ControlTheme x:Key="{x:Type u:NumPad}" TargetType="{x:Type u:NumPad}">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:NumPad">
+                <Border>
+                    <Border.Styles>
+                        <Style Selector="u|NumPadButton">
+                            <Setter Property="NumMode" Value="{Binding $parent[u:NumPad].NumMode}" />
+                            <Setter Property="Command" Value="{Binding $parent[u:NumPad].ProcessClick}" />
+                            <Setter Property="Focusable" Value="False" />
+                            <Setter Property="CommandParameter" Value="{Binding $self}" />
+                            <Setter Property="Width" Value="54" />
+                            <Setter Property="Height" Value="54" />
+                            <Setter Property="UseLayoutRounding" Value="False" />
+                            <Setter Property="HorizontalAlignment" Value="Stretch" />
+                            <Setter Property="VerticalAlignment" Value="Stretch" />
+                            <Setter Property="Margin" Value="1" />
+                        </Style>
+                    </Border.Styles>
+                    <Grid
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        ColumnDefinitions="*,*,*,*"
+                        RowDefinitions="*,*,*,*,*">
+                        <ToggleButton
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            MinWidth="54"
+                            MinHeight="54"
+                            Margin="1"
+                            Padding="0"
+                            Focusable="False"
+                            FontWeight="Regular"
+                            IsChecked="{TemplateBinding NumMode,
+                                                        Mode=TwoWay}">
+                            <TextBlock>
+                                <Run Text="Num" />
+                                <LineBreak />
+                                <Run Text="Lock" />
+                            </TextBlock>
+                        </ToggleButton>
+                        <u:NumPadButton
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            FunctionContent="/"
+                            FunctionKey="Divide"
+                            NumContent="/"
+                            NumKey="Divide" />
+                        <u:NumPadButton
+                            Grid.Row="0"
+                            Grid.Column="2"
+                            FunctionContent="*"
+                            FunctionKey="Multiply"
+                            NumContent="*"
+                            NumKey="Multiply" />
+                        <u:NumPadButton
+                            Grid.Row="0"
+                            Grid.Column="3"
+                            FunctionContent="-"
+                            FunctionKey="Subtract"
+                            NumContent="-"
+                            NumKey="Subtract" />
+                        <u:NumPadButton
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            FunctionContent="Home"
+                            FunctionKey="Home"
+                            NumContent="7"
+                            NumKey="NumPad7" />
+                        <u:NumPadButton
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            FunctionContent="Up"
+                            FunctionKey="Up"
+                            NumContent="8"
+                            NumKey="NumPad8" />
+                        <u:NumPadButton
+                            Grid.Row="1"
+                            Grid.Column="2"
+                            FunctionKey="PageUp"
+                            NumContent="9"
+                            NumKey="NumPad9">
+                            <u:NumPadButton.FunctionContent>
+                                <TextBlock><Run Text="Page" /><LineBreak /><Run Text="Up" /></TextBlock>
+                            </u:NumPadButton.FunctionContent>
+                        </u:NumPadButton>
+                        <u:NumPadButton
+                            Grid.Row="1"
+                            Grid.RowSpan="2"
+                            Grid.Column="3"
+                            Height="{x:Static x:Double.NaN}"
+                            VerticalAlignment="Stretch"
+                            FunctionContent="+"
+                            FunctionKey="Add"
+                            NumContent="+"
+                            NumKey="Add" />
+                        <u:NumPadButton
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            FunctionContent="Left"
+                            FunctionKey="Left"
+                            NumContent="4"
+                            NumKey="NumPad4" />
+                        <u:NumPadButton
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            FunctionContent=" "
+                            FunctionKey="None"
+                            NumContent="5"
+                            NumKey="NumPad5" />
+                        <u:NumPadButton
+                            Grid.Row="2"
+                            Grid.Column="2"
+                            FunctionContent="Right"
+                            FunctionKey="Right"
+                            NumContent="6"
+                            NumKey="NumPad6" />
+                        <u:NumPadButton
+                            Grid.Row="3"
+                            Grid.Column="0"
+                            FunctionContent="End"
+                            FunctionKey="End"
+                            NumContent="1"
+                            NumKey="NumPad1" />
+                        <u:NumPadButton
+                            Grid.Row="3"
+                            Grid.Column="1"
+                            FunctionContent="Down"
+                            FunctionKey="Down"
+                            NumContent="2"
+                            NumKey="NumPad2" />
+                        <u:NumPadButton
+                            Grid.Row="3"
+                            Grid.Column="2"
+                            FunctionKey="PageDown"
+                            NumContent="3"
+                            NumKey="NumPad3">
+                            <u:NumPadButton.FunctionContent>
+                                <TextBlock><Run Text="Page" /><LineBreak /><Run Text="Down" /></TextBlock>
+                            </u:NumPadButton.FunctionContent>
+                        </u:NumPadButton>
+                        <u:NumPadButton
+                            Grid.Row="3"
+                            Grid.RowSpan="2"
+                            Grid.Column="3"
+                            Height="{x:Static x:Double.NaN}"
+                            VerticalAlignment="Stretch"
+                            FunctionContent="Enter"
+                            FunctionKey="Enter"
+                            NumContent="Enter"
+                            NumKey="Enter" />
+                        <u:NumPadButton
+                            Grid.Row="4"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Width="{x:Static x:Double.NaN}"
+                            FunctionContent="Insert"
+                            FunctionKey="Insert"
+                            NumContent="0"
+                            NumKey="NumPad0" />
+                        <u:NumPadButton
+                            Grid.Row="4"
+                            Grid.Column="2"
+                            FunctionContent="Delete"
+                            FunctionKey="Delete"
+                            NumContent="."
+                            NumKey="Decimal" />
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:NumPadButton}" TargetType="u:NumPadButton">
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Background" Value="{DynamicResource ButtonDefaultBackground}" />
+        <Setter Property="CornerRadius" Value="3" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:NumPadButton">
+                <Border
+                    Name="PART_Background"
+                    Background="{TemplateBinding Background}"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <Panel>
+                        <ContentPresenter
+                            Name="PART_ContentPresenter"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding NumContent}"
+                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=NumMode}" />
+                        <ContentPresenter
+                            Name="PART_FunctionContentPresenter"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding FunctionContent}"
+                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=!NumMode}" />
+                    </Panel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:pointerover /template/ Border#PART_Background">
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+        </Style>
+        <Style Selector="^:pressed /template/ Border#PART_Background">
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,38 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:Ursa.Converters;assembly=Ursa"
+    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">
+            <ControlTemplate TargetType="u:NumberDisplayerBase">
+                <TextBlock
+                    FontSize="{TemplateBinding FontSize}"
+                    Foreground="{TemplateBinding Foreground}"
+                    FontFamily="{TemplateBinding FontFamily}"
+                    Background="{TemplateBinding Background}"
+                    FontWeight="{TemplateBinding FontWeight}"
+                    FontStyle="{TemplateBinding FontStyle}"
+                    FontStretch="{TemplateBinding FontStretch}"
+                    Text="{TemplateBinding InternalText, Mode=OneWay}" />
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^[IsSelectable=True]">
+            <Setter Property="Template">
+                <ControlTemplate TargetType="u:NumberDisplayerBase">
+                    <SelectableTextBlock
+                        FontSize="{TemplateBinding FontSize}"
+                        Foreground="{TemplateBinding Foreground}"
+                        FontFamily="{TemplateBinding FontFamily}"
+                        Background="{TemplateBinding Background}"
+                        FontWeight="{TemplateBinding FontWeight}"
+                        FontStyle="{TemplateBinding FontStyle}"
+                        FontStretch="{TemplateBinding FontStretch}"
+                        Text="{TemplateBinding InternalText, Mode=OneWay}" />
+                </ControlTemplate>
+            </Setter>
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,87 @@
+<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="InputClearButton" TargetType="Button">
+        <Setter Property="Button.Foreground" Value="{DynamicResource TextBoxButtonDefaultForeground}" />
+        <Setter Property="Button.Cursor" Value="Hand" />
+        <Setter Property="Button.Template">
+            <ControlTemplate TargetType="Button">
+                <!--  Background must be transparent or hit test will fail  -->
+                <ContentControl Background="Transparent">
+                    <PathIcon
+                        Width="16"
+                        Height="16"
+                        Data="{DynamicResource TextBoxClearButtonData}"
+                        Foreground="{TemplateBinding Foreground}" />
+                </ContentControl>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:pointerover">
+            <Setter Property="Foreground" Value="{DynamicResource TextBoxButtonPointeroverForeground}" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:NumericUpDown}" TargetType="{x:Type u:NumericUpDown}">
+        <Setter Property="NumericUpDown.VerticalContentAlignment" Value="Center" />
+        <Setter Property="NumericUpDown.CornerRadius" Value="{DynamicResource NumericUpDownCornerRadius}" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:NumericUpDown">
+                <DataValidationErrors>
+                    <ButtonSpinner
+                        Name="PART_Spinner"
+                        MinWidth="0"
+                        HorizontalContentAlignment="Stretch"
+                        VerticalContentAlignment="Stretch"
+                        AllowSpin="{TemplateBinding AllowSpin}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                        <Panel>
+                            <TextBox
+                                Name="PART_TextBox"
+                                Height="{TemplateBinding Height}"
+                                MinHeight="{DynamicResource NumericUpDownWrapperDefaultHeight}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                AcceptsReturn="False"
+                                CornerRadius="{TemplateBinding CornerRadius}"
+                                DataValidationErrors.Errors="{ReflectionBinding $parent[u:NumericUpDown].(DataValidationErrors.Errors)}"
+                                FontSize="{TemplateBinding FontSize}"
+                                Foreground="{TemplateBinding Foreground}"
+                                InnerLeftContent="{TemplateBinding InnerLeftContent}"
+                                TextWrapping="NoWrap"
+                                Theme="{DynamicResource NonErrorTextBox}"
+                                Watermark="{TemplateBinding Watermark}" />
+                            <Panel
+                                Name="PART_DragPanel"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="Transparent"
+                                Cursor="SizeAll"/>
+                            <Button
+                                Name="PART_ClearButton"
+                                Margin="0,0,8,0"
+                                HorizontalAlignment="Right"
+                                Command="{Binding $parent[u:NumericUpDown].Clear}"
+                                Focusable="False"
+                                IsVisible="False"
+                                Theme="{StaticResource InputClearButton}" />
+                        </Panel>
+                    </ButtonSpinner>
+                </DataValidationErrors>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^.clearButton, ^.ClearButton">
+            <Style Selector="^[IsReadOnly=False]:focus /template/ Button#PART_ClearButton">
+                <Setter Property="IsVisible" Value="True" />
+            </Style>
+            <Style Selector="^[IsReadOnly=False]:pointerover /template/ Button#PART_ClearButton">
+                <Setter Property="IsVisible" Value="True" />
+            </Style>
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -12,7 +12,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="u:Pagination">
                 <StackPanel Orientation="Horizontal">
-                    <u:PaginationButton Name="{x:Static u:Pagination.PART_PreviousButton}">
+                    <u:PaginationButton u:DisabledAdorner.IsEnabled="True" Name="{x:Static u:Pagination.PART_PreviousButton}">
                         <PathIcon
                             Width="12"
                             Height="12"
@@ -20,15 +20,25 @@
                             Foreground="{DynamicResource PaginationButtonIconForeground}" />
                     </u:PaginationButton>
                     <StackPanel Name="{x:Static u:Pagination.PART_ButtonPanel}" Orientation="Horizontal" />
-                    <u:PaginationButton Name="{x:Static u:Pagination.PART_NextButton}">
+                    <u:PaginationButton u:DisabledAdorner.IsEnabled="True" Name="{x:Static u:Pagination.PART_NextButton}">
                         <PathIcon
                             Width="12"
                             Height="12"
                             Data="{DynamicResource PaginationForwardGlyph}"
                             Foreground="{DynamicResource PaginationButtonIconForeground}" />
                     </u:PaginationButton>
+                    <StackPanel Orientation="Horizontal" IsVisible="{TemplateBinding ShowQuickJump}">
+                        <TextBlock
+                            Margin="4 0"
+                            VerticalAlignment="Center"
+                            Text="{DynamicResource STRING_PAGINATION_JUMP_TO}" />
+                        <u:NumericIntUpDown x:Name="{x:Static u:Pagination.PART_QuickJumpInput}" ShowButtonSpinner="False" Width="50"></u:NumericIntUpDown>
+                        <TextBlock
+                            Margin="4 0"
+                            VerticalAlignment="Center"
+                            Text="{DynamicResource STRING_PAGINATION_PAGE}" />
+                    </StackPanel>
                     <ComboBox
-                        Name="{x:Static u:Pagination.PART_SizeChangerComboBox}"
                         IsVisible="{TemplateBinding ShowPageSizeSelector}"
                         ItemsSource="{TemplateBinding PageSizeOptions}"
                         SelectedItem="{TemplateBinding PageSize,
@@ -114,9 +124,9 @@
             </Style>
         </Style>
         <Style Selector="^:selected">
-            <Setter Property="u:PaginationButton.Background" Value="{DynamicResource PaginationButtonSelectedBackground}" />
-            <Setter Property="u:PaginationButton.Foreground" Value="{DynamicResource PaginationButtonSelectedForeground}" />
-            <Setter Property="u:PaginationButton.FontWeight" Value="600" />
+            <Setter Property="Background" Value="{DynamicResource PaginationButtonSelectedBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource PaginationButtonSelectedForeground}" />
+            <Setter Property="FontWeight" Value="600" />
         </Style>
     </ControlTheme>
 

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

@@ -0,0 +1,228 @@
+<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:RangeSlider}" TargetType="u:RangeSlider">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource SliderTrackForeground}" />
+        <Setter Property="TrackWidth" Value="4" />
+        <Style Selector="^:horizontal">
+            <Setter Property="Template">
+                <ControlTemplate TargetType="u:RangeSlider">
+                    <DataValidationErrors>
+                        <Grid
+                            x:Name="SliderContainer"
+                            Margin="{TemplateBinding Padding}"
+                            Background="Transparent"
+                            RowDefinitions="Auto,Auto,Auto">
+                            <Grid.Styles>
+                                <Style Selector="TickBar">
+                                    <Setter Property="ReservedSpace" Value="{Binding #PART_Track.LowerThumb.Bounds}" />
+                                </Style>
+                            </Grid.Styles>
+                            <TickBar
+                                Name="TopTickBar"
+                                Grid.Row="0"
+                                Height="{DynamicResource SliderTickHorizontalHeight}"
+                                Margin="0,0,0,4"
+                                VerticalAlignment="Bottom"
+                                Fill="{DynamicResource SliderTickForeground}"
+                                IsVisible="False"
+                                Maximum="{TemplateBinding u:RangeSlider.Maximum}"
+                                Minimum="{TemplateBinding u:RangeSlider.Minimum}"
+                                Orientation="{TemplateBinding u:RangeSlider.Orientation}"
+                                Placement="Top"
+                                TickFrequency="{TemplateBinding u:RangeSlider.TickFrequency}"
+                                Ticks="{TemplateBinding Ticks}" />
+                            <TickBar
+                                Name="BottomTickBar"
+                                Grid.Row="2"
+                                Height="{DynamicResource SliderTickHorizontalHeight}"
+                                Margin="0,4,0,0"
+                                VerticalAlignment="Top"
+                                Fill="{DynamicResource SliderTickForeground}"
+                                IsVisible="False"
+                                Maximum="{TemplateBinding u:RangeSlider.Maximum}"
+                                Minimum="{TemplateBinding u:RangeSlider.Minimum}"
+                                Orientation="{TemplateBinding u:RangeSlider.Orientation}"
+                                Placement="Bottom"
+                                TickFrequency="{TemplateBinding u:RangeSlider.TickFrequency}"
+                                Ticks="{TemplateBinding Ticks}" />
+                            <u:RangeTrack
+                                Name="{x:Static u:RangeSlider.PART_Track}"
+                                Grid.Row="1"
+                                Cursor="Hand"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Orientation="{Binding Orientation, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                LowerValue="{Binding LowerValue, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                UpperValue="{Binding UpperValue, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
+                                <u:RangeTrack.LowerSection>
+                                    <Border
+                                        Name="PART_LowerSection"
+                                        Height="{TemplateBinding TrackWidth}"
+                                        Background="{TemplateBinding Background}"
+                                        CornerRadius="100" />
+                                </u:RangeTrack.LowerSection>
+                                <u:RangeTrack.LowerThumb>
+                                    <Thumb
+                                        Width="16"
+                                        Height="16"
+                                        Theme="{DynamicResource SliderThumbTheme}" />
+                                </u:RangeTrack.LowerThumb>
+                                <u:RangeTrack.InnerSection>
+                                    <Border
+                                        Name="PART_InnerSection"
+                                        Height="{TemplateBinding TrackWidth}"
+                                        Background="{TemplateBinding Foreground}"
+                                        CornerRadius="100" />
+                                </u:RangeTrack.InnerSection>
+                                <u:RangeTrack.UpperThumb>
+                                    <Thumb
+                                        Width="16"
+                                        Height="16"
+                                        Theme="{DynamicResource SliderThumbTheme}" />
+                                </u:RangeTrack.UpperThumb>
+                                <u:RangeTrack.UpperSection>
+                                    <Border
+                                        Name="PART_UpperSection"
+                                        Height="{TemplateBinding TrackWidth}"
+                                        Background="{TemplateBinding Background}"
+                                        CornerRadius="100" />
+                                </u:RangeTrack.UpperSection>
+                            </u:RangeTrack>
+                        </Grid>
+                    </DataValidationErrors>
+                </ControlTemplate>
+            </Setter>
+        </Style>
+        <Style Selector="^:vertical">
+            <Setter Property="Template">
+                <ControlTemplate TargetType="u:RangeSlider">
+                    <DataValidationErrors>
+                        <Grid
+                            x:Name="SliderContainer"
+                            Margin="{TemplateBinding Padding}"
+                            Background="{DynamicResource SliderContainerBackground}"
+                            ColumnDefinitions="Auto,Auto,Auto">
+                            <Grid.Styles>
+                                <Style Selector="TickBar">
+                                    <Setter Property="ReservedSpace" Value="{Binding #PART_Track.LowerThumb.Bounds}" />
+                                </Style>
+                            </Grid.Styles>
+                            <TickBar
+                                Name="LeftTickBar"
+                                Grid.Column="0"
+                                Width="{DynamicResource SliderTickVerticalWidth}"
+                                Margin="0,0,4,0"
+                                HorizontalAlignment="Right"
+                                Fill="{DynamicResource SliderTickForeground}"
+                                IsVisible="False"
+                                Maximum="{TemplateBinding u:RangeSlider.Maximum}"
+                                Minimum="{TemplateBinding u:RangeSlider.Minimum}"
+                                Orientation="{TemplateBinding u:RangeSlider.Orientation}"
+                                Placement="Left"
+                                TickFrequency="{TemplateBinding u:RangeSlider.TickFrequency}"
+                                Ticks="{TemplateBinding Ticks}" />
+                            <TickBar
+                                Name="RightTickBar"
+                                Grid.Column="2"
+                                Width="{DynamicResource SliderTickVerticalWidth}"
+                                Margin="4,0,0,0"
+                                HorizontalAlignment="Left"
+                                Fill="{DynamicResource SliderTickForeground}"
+                                IsVisible="False"
+                                Maximum="{TemplateBinding u:RangeSlider.Maximum}"
+                                Minimum="{TemplateBinding u:RangeSlider.Minimum}"
+                                Orientation="{TemplateBinding u:RangeSlider.Orientation}"
+                                Placement="Right"
+                                TickFrequency="{TemplateBinding u:RangeSlider.TickFrequency}"
+                                Ticks="{TemplateBinding Ticks}" />
+                            <u:RangeTrack
+                                Name="{x:Static u:RangeSlider.PART_Track}"
+                                Cursor="Hand"
+                                Grid.Column="1"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Orientation="{Binding Orientation, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                LowerValue="{Binding LowerValue, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                UpperValue="{Binding UpperValue, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
+                                <u:RangeTrack.LowerSection>
+                                    <Border
+                                        Name="PART_LowerSection"
+                                        Width="{TemplateBinding TrackWidth}"
+                                        Background="{TemplateBinding Background}"
+                                        CornerRadius="100" />
+                                </u:RangeTrack.LowerSection>
+                                <u:RangeTrack.LowerThumb>
+                                    <Thumb
+                                        Width="16"
+                                        Height="16"
+                                        Theme="{DynamicResource SliderThumbTheme}" />
+                                </u:RangeTrack.LowerThumb>
+                                <u:RangeTrack.InnerSection>
+                                    <Border
+                                        Name="PART_InnerSection"
+                                        Width="{TemplateBinding TrackWidth}"
+                                        Background="{TemplateBinding Foreground}"
+                                        CornerRadius="100" />
+                                </u:RangeTrack.InnerSection>
+                                <u:RangeTrack.UpperThumb>
+                                    <Thumb
+                                        Width="16"
+                                        Height="16"
+                                        Theme="{DynamicResource SliderThumbTheme}" />
+                                </u:RangeTrack.UpperThumb>
+                                <u:RangeTrack.UpperSection>
+                                    <Border
+                                        Name="PART_UpperSection"
+                                        Width="{TemplateBinding TrackWidth}"
+                                        Background="{TemplateBinding Background}"
+                                        CornerRadius="100" />
+                                </u:RangeTrack.UpperSection>
+                            </u:RangeTrack>
+                        </Grid>
+                    </DataValidationErrors>
+                </ControlTemplate>
+            </Setter>
+        </Style>
+        <Style Selector="^[TickPlacement=TopLeft] /template/ TickBar#LeftTickBar, ^[TickPlacement=Outside] /template/ TickBar#LeftTickBar">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+
+        <Style Selector="^[TickPlacement=TopLeft] /template/ TickBar#TopTickBar, ^[TickPlacement=Outside] /template/ TickBar#TopTickBar">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+
+        <Style Selector="^[TickPlacement=BottomRight] /template/ TickBar#BottomTickBar, ^[TickPlacement=Outside] /template/ TickBar#BottomTickBar">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+
+        <Style Selector="^[TickPlacement=BottomRight] /template/ TickBar#RightTickBar, ^[TickPlacement=Outside] /template/ TickBar#RightTickBar">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+
+        <Style Selector="^:error /template/ Thumb#thumb">
+            <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+        </Style>
+        
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ Border#PART_InnerSection">
+                <Setter Property="Background" Value="{DynamicResource SliderTrackDisabledForeground}" />
+            </Style>
+
+            <Style Selector="^ /template/ Border#PART_UpperSection, ^ /template/ Border#PART_LowerSection">
+                <Setter Property="Background" Value="{DynamicResource SliderTrackDisabledBackground}" />
+            </Style>
+
+            <Style Selector="^ /template/ Thumb">
+                <Setter Property="BorderBrush" Value="{DynamicResource SliderThumbDisabledBorderBrush}" />
+            </Style>
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,92 @@
+<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:ScrollToButton}" TargetType="u:ScrollToButton">
+        <Setter Property="HorizontalAlignment" Value="Right" />
+        <Setter Property="VerticalAlignment" Value="Bottom" />
+        <Setter Property="Cursor" Value="Hand"></Setter>
+        <Setter Property="Margin" Value="0, 0, 16, 16" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:ScrollToButton">
+                <Border
+                    Name="PART_Background"
+                    Background="{DynamicResource ButtonDefaultBackground}"
+                    CornerRadius="{DynamicResource ButtonCornerRadius}">
+                    <PathIcon
+                        Name="PART_Icon"
+                        Margin="8"
+                        Width="12"
+                        Height="12"
+                        Data="{DynamicResource ScrollToButtonIconGlyph}"
+                        Foreground="{DynamicResource ButtonDefaultPrimaryForeground}" />
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:pressed">
+            <Setter Property="RenderTransform" Value="scale(0.98)" />
+        </Style>
+        <Style Selector="^:pointerover /template/ Border#PART_Background">
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPointeroverBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPointeroverBackground}" />
+        </Style>
+        <Style Selector="^:pressed /template/ Border#PART_Background">
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonDefaultPressedBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
+        </Style>
+        <Style Selector="^[Direction=Right] /template/ PathIcon#PART_Icon">
+            <Setter Property="RenderTransform" Value="rotate(90deg)"></Setter>
+        </Style>
+        <Style Selector="^[Direction=Bottom] /template/ PathIcon#PART_Icon">
+            <Setter Property="RenderTransform" Value="rotate(180deg)"></Setter>
+        </Style>
+        <Style Selector="^[Direction=Left] /template/ PathIcon#PART_Icon">
+            <Setter Property="RenderTransform" Value="rotate(270deg)"></Setter>
+        </Style>
+    </ControlTheme>
+    
+    
+    <ControlTheme x:Key="PrimaryScrollToButton" TargetType="u:ScrollToButton">
+        <Setter Property="HorizontalAlignment" Value="Right" />
+        <Setter Property="VerticalAlignment" Value="Bottom" />
+        <Setter Property="Cursor" Value="Hand"></Setter>
+        <Setter Property="Margin" Value="0, 0, 16, 16" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:ScrollToButton">
+                <Border
+                    Name="PART_Background"
+                    Background="{DynamicResource ButtonSolidPrimaryBackground}"
+                    CornerRadius="{DynamicResource ButtonCornerRadius}">
+                    <PathIcon
+                        Name="PART_Icon"
+                        Margin="8"
+                        Width="12"
+                        Height="12"
+                        Data="{DynamicResource ScrollToButtonIconGlyph}"
+                        Foreground="{DynamicResource ButtonSolidForeground}" />
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:pressed">
+            <Setter Property="RenderTransform" Value="scale(0.98)" />
+        </Style>
+        <Style Selector="^:pointerover /template/ Border#PART_Background">
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPointeroverBorderBrush}" />
+        </Style>
+        <Style Selector="^:pressed /template/ Border#PART_Background">
+            <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryPressedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
+        </Style>
+        <Style Selector="^[Direction=Right] /template/ PathIcon#PART_Icon">
+            <Setter Property="RenderTransform" Value="rotate(90deg)"></Setter>
+        </Style>
+        <Style Selector="^[Direction=Bottom] /template/ PathIcon#PART_Icon">
+            <Setter Property="RenderTransform" Value="rotate(180deg)"></Setter>
+        </Style>
+        <Style Selector="^[Direction=Left] /template/ PathIcon#PART_Icon">
+            <Setter Property="RenderTransform" Value="rotate(270deg)"></Setter>
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,61 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:u="https://irihi.tech/ursa">
+    <ControlTheme x:Key="{x:Type u:SelectionList}" TargetType="u:SelectionList">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Indicator">
+            <Template>
+                <Border
+                    Margin="2"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Background="{DynamicResource SemiBlue1}"
+                    Theme="{DynamicResource CardBorder}" />
+            </Template>
+        </Setter>
+        <Setter Property="ListBox.Template">
+            <ControlTemplate TargetType="u:SelectionList">
+                <Border
+                    Name="border"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    ClipToBounds="{TemplateBinding ClipToBounds}"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <Panel>
+                        <ContentPresenter Name="{x:Static u:SelectionList.PART_Indicator}" Content="{TemplateBinding Indicator}" />
+                        <ItemsPresenter
+                            Name="PART_ItemsPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            ItemsPanel="{TemplateBinding ItemsPanel}" />
+                    </Panel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:SelectionListItem}" TargetType="u:SelectionListItem">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Padding" Value="8" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:SelectionListItem">
+                <ContentPresenter
+                    Name="PART_ContentPresenter"
+                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                    Padding="{TemplateBinding Padding}"
+                    Background="{TemplateBinding Background}"
+                    Content="{TemplateBinding Content}"
+                    FontWeight="{TemplateBinding FontWeight}"
+                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                    Foreground="{TemplateBinding Foreground}" />
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:selected">
+            <Setter Property="FontWeight" Value="Bold" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,47 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    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">
+            <ControlTemplate TargetType="u:Skeleton">
+                <Border
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    ClipToBounds="{TemplateBinding ClipToBounds}"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <Panel>
+                        <ContentPresenter
+                            x:Name="PART_ContentPresenter"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+                        <iri:PureRectangle
+                            x:Name="PART_LoadingBorder"
+                            Classes.Active="{Binding Path= IsActive, RelativeSource={RelativeSource TemplatedParent}}"
+                            IsHitTestVisible="{TemplateBinding IsLoading}"
+                            Background="{DynamicResource SkeletonDefaultBackground}"
+                            IsVisible="{TemplateBinding IsLoading}">
+                        </iri:PureRectangle>
+                        <iri:PureRectangle
+                            x:Name="PART_ActiveBorder"
+                            IsHitTestVisible="{TemplateBinding IsLoading}"
+                            IsVisible="{TemplateBinding IsLoading}"
+                            >
+                        </iri:PureRectangle>
+                    </Panel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+    <!--  Add Styles Here  -->
+</ResourceDictionary>

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

@@ -42,10 +42,10 @@
                 </Border>
             </ControlTemplate>
         </Setter>
-        <Style Selector="^:pointerover /template/ Border#PART_RootBorder">
+        <Style Selector="^:pointerover /template/ Border#PART_BackgroundBorder">
             <Setter Property="Border.Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
         </Style>
-        <Style Selector="^:focus-within /template/ Border#PART_RootBorder">
+        <Style Selector="^:focus-within /template/ Border#PART_BackgroundBorder">
             <Setter Property="Border.BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
     </ControlTheme>
@@ -121,11 +121,12 @@
                             Data="{DynamicResource ClosableTagCloseIconGlyph}"
                             DockPanel.Dock="Right"
                             Foreground="{TemplateBinding Foreground}" />
-                        <TextBlock
+                        <ContentPresenter
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             FontSize="12"
                             Foreground="{TemplateBinding Foreground}"
-                            Text="{TemplateBinding Content}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
                             TextTrimming="CharacterEllipsis" />
                     </DockPanel>
                 </Border>

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

@@ -0,0 +1,79 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <ControlTheme x:Key="LooklessTextBox" TargetType="TextBox">
+        <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" />
+        <Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
+        <Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
+        <Setter Property="TextBox.FontSize" Value="14" />
+        <Setter Property="TextBox.Cursor" Value="Ibeam" />
+        <Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
+        <Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxContentPadding}" />
+        <Setter Property="TextBox.MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
+        <Setter Property="TextBox.VerticalAlignment" Value="Center" />
+        <Setter Property="TextBox.VerticalContentAlignment" Value="Center" />
+        <Setter Property="TextBox.FocusAdorner" Value="{x:Null}" />
+        <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
+        <Setter Property="TextBox.Template">
+            <ControlTemplate TargetType="TextBox">
+                <Border Name="PART_ContentPresenterBorder" MinHeight="{TemplateBinding MinHeight}">
+                    <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
+                        <ContentPresenter
+                            Grid.Column="0"
+                            Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding InnerLeftContent}"
+                            Foreground="{DynamicResource TextBoxInnerForeground}"
+                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerLeftContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                        <ScrollViewer
+                            Grid.Column="1"
+                            AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
+                            HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+                            IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
+                            VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+                            <Panel>
+                                <TextBlock
+                                    Name="PART_Watermark"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    IsVisible="{TemplateBinding Text,
+                                                                Converter={x:Static StringConverters.IsNullOrEmpty}}"
+                                    Opacity="0.5"
+                                    Text="{TemplateBinding Watermark}"
+                                    TextAlignment="{TemplateBinding TextAlignment}"
+                                    TextWrapping="{TemplateBinding TextWrapping}" />
+                                <TextPresenter
+                                    Name="PART_TextPresenter"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    CaretBrush="{TemplateBinding CaretBrush}"
+                                    CaretIndex="{TemplateBinding CaretIndex}"
+                                    LineHeight="{TemplateBinding LineHeight}"
+                                    PasswordChar="{TemplateBinding PasswordChar}"
+                                    RevealPassword="{TemplateBinding RevealPassword}"
+                                    SelectionBrush="{TemplateBinding SelectionBrush}"
+                                    SelectionEnd="{TemplateBinding SelectionEnd}"
+                                    SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                    SelectionStart="{TemplateBinding SelectionStart}"
+                                    Text="{TemplateBinding Text,
+                                                           Mode=TwoWay}"
+                                    TextAlignment="{TemplateBinding TextAlignment}"
+                                    TextWrapping="{TemplateBinding TextWrapping}" />
+                            </Panel>
+                        </ScrollViewer>
+                        <ContentPresenter
+                            Grid.Column="2"
+                            Padding="{DynamicResource TextBoxInnerRightContentPadding}"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding InnerRightContent}"
+                            Foreground="{DynamicResource TextBoxInnerForeground}"
+                            IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        
+        <Style Selector="^:disabled">
+            <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,35 @@
+<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 TargetType="u:ThemeToggleButton" x:Key="{x:Type u:ThemeToggleButton}">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:ThemeToggleButton">
+                <Button
+                    Padding="8"
+                    FontWeight="Regular"
+                    Name="{x:Static u:ThemeToggleButton.PART_ThemeButton}"
+                    HorizontalAlignment="Center"
+                    Theme="{DynamicResource BorderlessButton}">
+                    <PathIcon
+                        Name="PART_Icon"
+                        Width="16"
+                        Height="16"
+                        Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                </Button>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:dark /template/ PathIcon#PART_Icon">
+            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDarkGlyph}"></Setter>
+            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_DARK}"></Setter>
+        </Style>
+        <Style Selector="^:light /template/ PathIcon#PART_Icon">
+            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonLightGlyph}"></Setter>
+            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_LIGHT}"></Setter>
+        </Style>
+        <Style Selector="^ /template/ PathIcon#PART_Icon">
+            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDefaultGlyph}"></Setter>
+            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_SYSTEM}"></Setter>
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,155 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:u="https://irihi.tech/ursa">
+    <!-- Add Resources Here -->
+    <Design.PreviewWith>
+        <StackPanel Margin="20">
+            <TextBlock Text="Hello World"/>
+        </StackPanel>
+    </Design.PreviewWith>
+    
+    <ControlTheme x:Key="{x:Type u:TimeBox}" TargetType="{x:Type u:TimeBox}">
+        <Setter Property="u:TimeBox.Focusable" Value="True"/>
+        <Setter Property="u:TimeBox.ShowLeadingZero" Value="True"/>
+        <Setter Property="u:TimeBox.TextAlignment" Value="Center"/>
+        <Setter Property="u:TimeBox.HorizontalAlignment" Value="Left"/>
+        <Setter Property="u:TimeBox.CornerRadius" Value="{DynamicResource TimeBoxCornerRadius}" />
+        <Setter Property="u:TimeBox.Background" Value="{DynamicResource TimeBoxBackground}" />
+        <Setter Property="u:TimeBox.MinHeight" Value="{DynamicResource TimeBoxDefaultMinHeight}" />
+        <Setter Property="u:TimeBox.BorderThickness" Value="{DynamicResource TimeBoxBorderThickness}" />
+        <Setter Property="u:TimeBox.SelectionBrush" Value="{DynamicResource TimeBoxSelectionBrush}" />
+        <Setter Property="u:TimeBox.SelectionForegroundBrush" Value="{DynamicResource TimeBoxSelectionForeground}" />
+        <Setter Property="u:TimeBox.CaretBrush" Value="{DynamicResource TimeBoxCaretBrush}" />
+        <Setter Property="u:TimeBox.Template">
+            <ControlTemplate TargetType="u:TimeBox">
+                <Border Name="PART_Border"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <Grid Width="{TemplateBinding Width}" ColumnDefinitions="1*, Auto, 1*, Auto, 1*, Auto, 1*">
+                        <Border Name="{x:Static u:TimeBox.PART_HourBorder}" 
+                                Grid.Column="0"
+                                Background="Transparent"
+                                BorderBrush="Transparent"
+                                BorderThickness="0"
+                                CornerRadius="{TemplateBinding CornerRadius}">
+                            <Grid>
+                                <TextPresenter Name="{x:Static u:TimeBox.PART_HoursTextPresenter}"
+                                               MinWidth="8"
+                                               VerticalAlignment="Center"
+                                               CaretBrush="{TemplateBinding CaretBrush}"
+                                               Cursor="IBeam"
+                                               SelectionBrush="{TemplateBinding SelectionBrush}"
+                                               SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                               TextAlignment="{TemplateBinding TextAlignment}"/>
+                                <Panel Name="{x:Static u:TimeBox.PART_HourDragPanel}"
+                                       HorizontalAlignment="Stretch"
+                                       VerticalAlignment="Stretch"
+                                       Background="Transparent"/>
+                            </Grid>
+                        </Border>
+                        <TextBlock
+                            Grid.Column="1"
+                            Margin="0,4"
+                            VerticalAlignment="Center"
+                            Focusable="False"
+                            Text=":" />
+                        <Border Name="{x:Static u:TimeBox.PART_MinuteBorder}" 
+                                Grid.Column="2"
+                                Background="Transparent"
+                                BorderBrush="Transparent"
+                                BorderThickness="0"
+                                CornerRadius="{TemplateBinding CornerRadius}">
+                            <Grid>
+                                <TextPresenter Name="{x:Static u:TimeBox.PART_MinuteTextPresenter}"
+                                               MinWidth="8"
+                                               VerticalAlignment="Center"
+                                               CaretBrush="{TemplateBinding CaretBrush}"
+                                               Cursor="IBeam"
+                                               SelectionBrush="{TemplateBinding SelectionBrush}"
+                                               SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                               TextAlignment="{TemplateBinding TextAlignment}"/>
+                                <Panel Name="{x:Static u:TimeBox.PART_MinuteDragPanel}"
+                                       HorizontalAlignment="Stretch"
+                                       VerticalAlignment="Stretch"
+                                       Background="Transparent"/>
+                            </Grid>
+                        </Border>
+                        <TextBlock
+                            Grid.Column="3"
+                            Margin="0,4"
+                            VerticalAlignment="Center"
+                            Focusable="False"
+                            Text=":" />
+                        <Border Name="{x:Static u:TimeBox.PART_SecondBorder}" 
+                                Grid.Column="4"
+                                Background="Transparent"
+                                BorderBrush="Transparent"
+                                BorderThickness="0"
+                                CornerRadius="{TemplateBinding CornerRadius}">
+                            <Grid>
+                                <TextPresenter Name="{x:Static u:TimeBox.PART_SecondTextPresenter}"
+                                               MinWidth="8"
+                                               VerticalAlignment="Center"
+                                               CaretBrush="{TemplateBinding CaretBrush}"
+                                               Cursor="IBeam"
+                                               SelectionBrush="{TemplateBinding SelectionBrush}"
+                                               SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                               TextAlignment="{TemplateBinding TextAlignment}"/>
+                                <Panel Name="{x:Static u:TimeBox.PART_SecondDragPanel}"
+                                       HorizontalAlignment="Stretch"
+                                       VerticalAlignment="Stretch"
+                                       Background="Transparent"/>
+                            </Grid>
+                        </Border>
+                        <TextBlock
+                            Grid.Column="5"
+                            Margin="0,4"
+                            VerticalAlignment="Center"
+                            Focusable="False"
+                            Text="." />
+                        <Border Name="{x:Static u:TimeBox.PART_MilliSecondBorder}" 
+                                Grid.Column="6"
+                                Background="Transparent"
+                                BorderBrush="Transparent"
+                                BorderThickness="0"
+                                CornerRadius="{TemplateBinding CornerRadius}">
+                            <Grid>
+                                <TextPresenter Name="{x:Static u:TimeBox.PART_MillisecondTextPresenter}"
+                                               MinWidth="8"
+                                               VerticalAlignment="Center"
+                                               CaretBrush="{TemplateBinding CaretBrush}"
+                                               Cursor="IBeam"
+                                               SelectionBrush="{TemplateBinding SelectionBrush}"
+                                               SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
+                                               TextAlignment="{TemplateBinding TextAlignment}"/>
+                                <Panel Name="{x:Static u:TimeBox.PART_MilliSecondDragPanel}"
+                                       HorizontalAlignment="Stretch"
+                                       VerticalAlignment="Stretch"
+                                       Background="Transparent"/>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:focus-within">
+            <Setter Property="Border.BorderBrush" Value="{DynamicResource TimeBoxFocusBorderBrush}" />
+        </Style>
+        <Style Selector="^:disabled">
+            <Setter Property="Background" Value="{DynamicResource TimeBoxDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiColorDisabledText}" />
+        </Style>
+        <Style Selector="^[DragOrientation=Horizontal]">
+            <Style Selector="^/template/ Panel">
+                <Setter Property="Cursor" Value="SizeWestEast"/>
+            </Style>
+        </Style>
+        <Style Selector="^[DragOrientation=Vertical]">
+            <Style Selector="^/template/ Panel">
+                <Setter Property="Cursor" Value="SizeNorthSouth"/>
+            </Style>
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,246 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:Ursa.Converters;assembly=Ursa"
+    xmlns:iri="https://irihi.tech/shared"
+    xmlns:u="https://irihi.tech/ursa">
+    <!--  Add Resources Here  -->
+    <Design.PreviewWith>
+        <u:TimePickerPresenter Height="300" />
+    </Design.PreviewWith>
+    <ControlTheme x:Key="{x:Type u:TimePickerPresenter}" TargetType="u:TimePickerPresenter">
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="MaxHeight" Value="300" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:TimePickerPresenter">
+                <Grid Name="{x:Static u:TimePickerPresenter.PART_PickerContainer}" ColumnDefinitions="*, Auto, *, Auto, *, Auto, *">
+                    <Grid.Styles>
+                        <Style Selector="u|UrsaDateTimeScrollPanel &gt; ListBoxItem">
+                            <Setter Property="Theme" Value="{DynamicResource DateTimePickerItem}" />
+                        </Style>
+                    </Grid.Styles>
+                    <ScrollViewer
+                        Name="{x:Static u:TimePickerPresenter.PART_HourScrollPanel}"
+                        Grid.Column="0"
+                        HorizontalAlignment="Left"
+                        HorizontalContentAlignment="Left"
+                        HorizontalScrollBarVisibility="Disabled"
+                        VerticalScrollBarVisibility="Hidden">
+                        <u:UrsaDateTimeScrollPanel
+                            Name="{x:Static u:TimePickerPresenter.PART_HourSelector}"
+                            MinWidth="64"
+                            HorizontalAlignment="Left"
+                            ItemHeight="32"
+                            PanelType="Hour"
+                            ShouldLoop="True" />
+                    </ScrollViewer>
+                    <Rectangle
+                        Name="{x:Static u:TimePickerPresenter.PART_FirstSeparator}"
+                        Grid.Column="1"
+                        Width="0.5"
+                        Margin="0,8"
+                        VerticalAlignment="Stretch"
+                        Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
+                    <ScrollViewer
+                        Name="{x:Static u:TimePickerPresenter.PART_MinuteScrollPanel}"
+                        Grid.Column="2"
+                        HorizontalAlignment="Left"
+                        HorizontalContentAlignment="Left"
+                        HorizontalScrollBarVisibility="Disabled"
+                        VerticalScrollBarVisibility="Hidden">
+                        <u:UrsaDateTimeScrollPanel
+                            Name="{x:Static u:TimePickerPresenter.PART_MinuteSelector}"
+                            MinWidth="64"
+                            ItemHeight="32"
+                            PanelType="Minute"
+                            ShouldLoop="True" />
+                    </ScrollViewer>
+                    <Rectangle
+                        Name="{x:Static u:TimePickerPresenter.PART_SecondSeparator}"
+                        Grid.Column="3"
+                        Width="0.5"
+                        Margin="0,8"
+                        VerticalAlignment="Stretch"
+                        Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
+                    <ScrollViewer
+                        Name="{x:Static u:TimePickerPresenter.PART_SecondScrollPanel}"
+                        Grid.Column="4"
+                        HorizontalAlignment="Left"
+                        HorizontalContentAlignment="Left"
+                        HorizontalScrollBarVisibility="Disabled"
+                        VerticalScrollBarVisibility="Hidden">
+                        <u:UrsaDateTimeScrollPanel
+                            Name="{x:Static u:TimePickerPresenter.PART_SecondSelector}"
+                            MinWidth="64"
+                            ItemHeight="32"
+                            PanelType="Minute"
+                            ShouldLoop="True" />
+                    </ScrollViewer>
+                    <Rectangle
+                        Name="{x:Static u:TimePickerPresenter.PART_ThirdSeparator}"
+                        Grid.Column="5"
+                        Width="0.5"
+                        Margin="0,8"
+                        VerticalAlignment="Stretch"
+                        Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
+                    <ScrollViewer
+                        Name="{x:Static u:TimePickerPresenter.PART_AmPmScrollPanel}"
+                        Grid.Column="6"
+                        HorizontalAlignment="Left"
+                        HorizontalContentAlignment="Left"
+                        HorizontalScrollBarVisibility="Disabled"
+                        VerticalScrollBarVisibility="Hidden">
+                        <u:UrsaDateTimeScrollPanel
+                            Name="{x:Static u:TimePickerPresenter.PART_AmPmSelector}"
+                            MinWidth="64"
+                            ItemHeight="32"
+                            PanelType="TimePeriod" />
+                    </ScrollViewer>
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:TimePicker}" TargetType="u:TimePicker">
+        <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBoxForeground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
+        <Setter Property="MinHeight" Value="32"/>
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:TimePicker">
+                <DataValidationErrors>
+                    <Panel
+                        x:Name="LayoutRoot"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                        <Border
+                            x:Name="Background"
+                            HorizontalAlignment="Stretch"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
+                        <Grid ColumnDefinitions="*, Auto">
+                            <TextBox
+                                Name="{x:Static u:TimePicker.PART_TextBox}"
+                                Grid.Column="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Foreground="{TemplateBinding Foreground}"
+                                InnerLeftContent="{TemplateBinding InnerLeftContent}"
+                                InnerRightContent="{TemplateBinding InnerRightContent}"
+                                IsReadOnly="{TemplateBinding IsReadonly}"
+                                Theme="{DynamicResource LooklessTextBox}"
+                                Watermark="{TemplateBinding Watermark}">
+                            </TextBox>
+                            <Button
+                                Name="ClearButton"
+                                Grid.Column="1"
+                                Padding="0,0,8,0"
+                                Command="{Binding $parent[iri:IClearControl].Clear}"
+                                Content="{DynamicResource IconButtonClearData}"
+                                Focusable="False"
+                                IsVisible="False"
+                                Theme="{DynamicResource InnerIconButton}" />
+                            <Button
+                                Name="{x:Static u:TimePicker.PART_Button}"
+                                Grid.Column="1"
+                                Padding="0,0,8,0"
+                                Content="{DynamicResource TimePickerIconGlyph}"
+                                Focusable="False"
+                                Theme="{DynamicResource InnerIconButton}" />
+                            <Popup
+                                Name="{x:Static iri:PartNames.PART_Popup}"
+                                Grid.Column="0"
+                                IsLightDismissEnabled="True"
+                                IsOpen="{TemplateBinding IsDropdownOpen,
+                                                         Mode=TwoWay}"
+                                Placement="BottomEdgeAlignedLeft"
+                                PlacementTarget="Background">
+                                <Border
+                                    Margin="0,4"
+                                    HorizontalAlignment="Stretch"
+                                    Background="{DynamicResource ComboBoxPopupBackground}"
+                                    BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
+                                    BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
+                                    BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
+                                    ClipToBounds="True"
+                                    CornerRadius="6">
+                                    <DockPanel>
+                                        <StackPanel DockPanel.Dock="Bottom" IsVisible="{TemplateBinding NeedConfirmation}">
+                                            <Button
+                                                Margin="8"
+                                                HorizontalAlignment="Right"
+                                                Command="{Binding $parent[u:TimePicker].Confirm}"
+                                                Content="{DynamicResource STRING_DATE_TIME_CONFIRM}" />
+                                        </StackPanel>
+                                        <ContentPresenter
+                                            Name="PART_PopupHeader"
+                                            Margin="8,8,8,0"
+                                            Content="{TemplateBinding PopupInnerTopContent}"
+                                            DockPanel.Dock="Top"
+                                            IsVisible="{TemplateBinding PopupInnerTopContent,
+                                                                        Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                        <ContentPresenter
+                                            Name="PART_PopupFooter"
+                                            Margin="8,0,8,8"
+                                            Content="{TemplateBinding PopupInnerBottomContent}"
+                                            DockPanel.Dock="Bottom"
+                                            IsVisible="{TemplateBinding PopupInnerBottomContent,
+                                                                        Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                        <u:TimePickerPresenter
+                                            Name="{x:Static u:TimePicker.PART_Presenter}"
+                                            NeedsConfirmation="{TemplateBinding NeedConfirmation}"
+                                            PanelFormat="{TemplateBinding PanelFormat}"
+                                            Time="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedTime, Mode=OneWayToSource}" />
+                                    </DockPanel>
+                                </Border>
+                            </Popup>
+                        </Grid>
+                    </Panel>
+                </DataValidationErrors>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^.clearButton, ^.ClearButton">
+            <Style Selector="^:pointerover /template/ Button#ClearButton">
+                <Setter Property="IsVisible" Value="{Binding $parent[u:TimePicker].SelectedTime, Converter={x:Static ObjectConverters.IsNotNull}}" />
+            </Style>
+            <Style Selector="^:pointerover /template/ Button#PART_Button">
+                <Setter Property="IsVisible" Value="{Binding $parent[u:TimePicker].SelectedTime, Converter={x:Static ObjectConverters.IsNull}}"/>
+            </Style>
+        </Style>
+
+        <Style Selector="^:pointerover">
+            <Style Selector="^ /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerPointeroverBackground}" />
+            </Style>
+        </Style>
+
+        <!--  Disabled State  -->
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerDisabledBackground}" />
+            </Style>
+
+            <Style Selector="^ /template/ Button#PART_Button">
+                <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerDisabledIconForeground}" />
+            </Style>
+            <Style Selector="^ /template/ TextBox#PART_TextBox">
+                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="BorderBrush" Value="Transparent" />
+            </Style>
+        </Style>
+
+        <!--  Focused State  -->
+        <Style Selector="^:focus /template/ Border#Background">
+            <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" />
+        </Style>
+        <Style Selector="^:focus-within /template/ Border#Background">
+            <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,199 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    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}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
+        <Setter Property="MinHeight" Value="32" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:TimeRangePicker">
+                <DataValidationErrors>
+                    <Panel
+                        x:Name="LayoutRoot"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch">
+                        <Border
+                            x:Name="Background"
+                            HorizontalAlignment="Stretch"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
+                        <Grid ColumnDefinitions="*, Auto, * Auto" Name="PART_Grid">
+                            <TextBox
+                                Name="{x:Static u:TimeRangePicker.PART_StartTextBox}"
+                                Grid.Column="0"
+                                MinHeight="{TemplateBinding MinHeight}"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="Transparent"
+                                BorderThickness="1"
+                                CornerRadius="3 0 0 3"
+                                Foreground="{TemplateBinding Foreground}"
+                                InnerLeftContent="{TemplateBinding InnerLeftContent}"
+                                IsReadOnly="{TemplateBinding IsReadonly}"
+                                Watermark="{TemplateBinding StartWatermark}" />
+                            <TextBlock
+                                Grid.Column="1"
+                                VerticalAlignment="Center"
+                                Text="~" />
+                            <TextBox
+                                Name="{x:Static u:TimeRangePicker.PART_EndTextBox}"
+                                Grid.Column="2"
+                                MinHeight="{TemplateBinding MinHeight}"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Background="Transparent"
+                                CornerRadius="0"
+                                Foreground="{TemplateBinding Foreground}"
+                                InnerRightContent="{TemplateBinding InnerRightContent}"
+                                IsReadOnly="{TemplateBinding IsReadonly}"
+                                Watermark="{TemplateBinding EndWatermark}" />
+                            <Button
+                                Name="ClearButton"
+                                Grid.Column="3"
+                                Padding="8,0"
+                                Command="{Binding $parent[iri:IClearControl].Clear}"
+                                Content="{DynamicResource IconButtonClearData}"
+                                Focusable="False"
+                                IsVisible="False"
+                                Theme="{DynamicResource InnerIconButton}" />
+                            <Button
+                                Name="{x:Static u:TimePicker.PART_Button}"
+                                Grid.Column="3"
+                                Padding="8,0"
+                                Content="{DynamicResource TimePickerIconGlyph}"
+                                Focusable="False"
+                                Theme="{DynamicResource InnerIconButton}" />
+                        </Grid>
+                        <Popup
+                            Name="{x:Static iri:PartNames.PART_Popup}"
+                            IsLightDismissEnabled="True"
+                            OverlayDismissEventPassThrough="True"
+                            OverlayInputPassThroughElement="{Binding ElementName=PART_Grid}"
+                            IsOpen="{TemplateBinding IsDropdownOpen,
+                                                     Mode=TwoWay}"
+                            Placement="BottomEdgeAlignedLeft"
+                            PlacementTarget="Background">
+                            <Border
+                                Margin="0,4"
+                                HorizontalAlignment="Stretch"
+                                Background="{DynamicResource ComboBoxPopupBackground}"
+                                BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
+                                BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
+                                BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
+                                ClipToBounds="True"
+                                CornerRadius="6">
+                                <DockPanel>
+                                    <StackPanel DockPanel.Dock="Bottom" IsVisible="{TemplateBinding NeedConfirmation}">
+                                        <Button
+                                            Margin="8"
+                                            HorizontalAlignment="Right"
+                                            Command="{Binding $parent[u:TimeRangePicker].Confirm}"
+                                            Content="{DynamicResource STRING_DATE_TIME_CONFIRM}" />
+                                    </StackPanel>
+                                    <ContentPresenter
+                                        Name="PART_PopupHeader"
+                                        Margin="8,8,8,0"
+                                        Content="{TemplateBinding PopupInnerTopContent}"
+                                        DockPanel.Dock="Top"
+                                        IsVisible="{TemplateBinding PopupInnerTopContent,
+                                                                    Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                    <ContentPresenter
+                                        Name="PART_PopupFooter"
+                                        Margin="8,0,8,8"
+                                        Content="{TemplateBinding PopupInnerBottomContent}"
+                                        DockPanel.Dock="Bottom"
+                                        IsVisible="{TemplateBinding PopupInnerBottomContent,
+                                                                    Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                    <Grid ColumnDefinitions="*, Auto, *" RowDefinitions="Auto, Auto, *">
+                                        <TextBlock
+                                            Grid.Row="0"
+                                            Grid.Column="0"
+                                            Margin="0,16"
+                                            HorizontalAlignment="Center"
+                                            FontWeight="Bold"
+                                            Text="{DynamicResource STRING_DATE_TIME_START_TIME}" />
+                                        <TextBlock
+                                            Grid.Row="0"
+                                            Grid.Column="2"
+                                            Margin="0,16"
+                                            HorizontalAlignment="Center"
+                                            FontWeight="Bold"
+                                            Text="{DynamicResource STRING_DATE_TIME_END_TIME}" />
+                                        <Rectangle
+                                            Grid.Row="1"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="3"
+                                            Fill="{DynamicResource DateTimePickerSeparatorBackground}"
+                                            Margin="8 0"
+                                            Height="1" />
+                                        <u:TimePickerPresenter
+                                            Name="{x:Static u:TimeRangePicker.PART_StartPresenter}"
+                                            Grid.Row="2"
+                                            Grid.Column="0"
+                                            NeedsConfirmation="{TemplateBinding NeedConfirmation}"
+                                            PanelFormat="{TemplateBinding PanelFormat}"
+                                            Time="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=StartTime, Mode=OneWayToSource}" />
+                                        <Rectangle
+                                            Grid.Row="2"
+                                            Grid.Column="1"
+                                            Width="1"
+                                            Margin="0,4"
+                                            VerticalAlignment="Stretch"
+                                            Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
+                                        <u:TimePickerPresenter
+                                            Name="{x:Static u:TimeRangePicker.PART_EndPresenter}"
+                                            Grid.Row="2"
+                                            Grid.Column="2"
+                                            NeedsConfirmation="{TemplateBinding NeedConfirmation}"
+                                            PanelFormat="{TemplateBinding PanelFormat}"
+                                            Time="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=EndTime, Mode=OneWayToSource}" />
+                                    </Grid>
+                                </DockPanel>
+                            </Border>
+                        </Popup>
+                    </Panel>
+                </DataValidationErrors>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^.clearButton, ^.ClearButton">
+            <Style Selector="^:pointerover /template/ Button#ClearButton">
+                <Setter Property="IsVisible" Value="{Binding $parent[u:TimePicker].SelectedTime, Converter={x:Static ObjectConverters.IsNotNull}}" />
+            </Style>
+            <Style Selector="^:pointerover /template/ Button#PART_Button">
+                <Setter Property="IsVisible" Value="{Binding $parent[u:TimePicker].SelectedTime, Converter={x:Static ObjectConverters.IsNull}}" />
+            </Style>
+        </Style>
+
+        <!--  Disabled State  -->
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerDisabledBackground}" />
+            </Style>
+
+            <Style Selector="^ /template/ Button#PART_Button">
+                <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerDisabledIconForeground}" />
+            </Style>
+            <Style Selector="^ /template/ TextBox#PART_TextBox">
+                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="BorderBrush" Value="Transparent" />
+            </Style>
+        </Style>
+
+        <!--  Focused State  -->
+        <Style Selector="^ /template/ Border#Background:focus">
+            <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" />
+        </Style>
+        <Style Selector="^ /template/ Border#Background:focus-within">
+            <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerFocusBorderBrush}" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -6,9 +6,9 @@
     <Design.PreviewWith>
         <StackPanel Width="100" Spacing="20">
             <u:Timeline>
-                <u:TimelineItem Content="Hello" Time="2022-01-01" />
-                <u:TimelineItem Content="World" Time="2022-02-01" />
-                <u:TimelineItem Content="!" Time="2022-03-01" />
+                <u:TimelineItem Content="Hello" />
+                <u:TimelineItem Content="World" />
+                <u:TimelineItem Content="!" />
                 <u:TimelineItem />
             </u:Timeline>
         </StackPanel>
@@ -32,98 +32,166 @@
         WarningBrush="{DynamicResource WarningTimelineIconForeground}" />
 
     <ControlTheme x:Key="{x:Type u:TimelineItem}" TargetType="u:TimelineItem">
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="u:TimelineItem.Template">
             <ControlTemplate TargetType="u:TimelineItem">
-                <Grid ColumnDefinitions="Auto, *" RowDefinitions="*, Auto, *">
+                <Grid
+                    Name="PART_RootGrid"
+                    ColumnDefinitions="Auto, Auto, Auto"
+                    RowDefinitions="Auto, Auto, Auto">
+                    <!--  Icon and Axis  -->
                     <Grid
+                        Name="PART_IconAxisRoot"
                         Grid.Row="0"
-                        Grid.RowSpan="2"
-                        Grid.Column="0"
-                        RowDefinitions="Auto, Auto, *">
-                        <Rectangle
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Width="1"
-                            Height="8"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Top"
-                            Classes="start"
-                            Fill="{DynamicResource TimelineLineBrush}" />
-                        <Panel Grid.Row="1">
-                            <Ellipse
-                                Name="PART_Indicator"
-                                Width="8"
-                                Height="8"
-                                Margin="2"
+                        Grid.RowSpan="3"
+                        Grid.Column="1"
+                        RowDefinitions="Auto, *">
+                        <Panel Grid.Row="0" Name="{x:Static u:TimelineItem.PART_Icon}">
+                            <ContentPresenter
+                                Margin="8"
                                 HorizontalAlignment="Center"
-                                VerticalAlignment="Top"
-                                Fill="{DynamicResource DefaultTimelineIconForeground}" />
+                                VerticalAlignment="Center"
+                                Content="{TemplateBinding Icon}"
+                                ContentTemplate="{TemplateBinding IconTemplate}" />
+                            <Ellipse
+                                Name="PART_DefaultIcon"
+                                Width="12"
+                                Height="12"
+                                Margin="8"
+                                IsVisible="False"
+                                Fill="Gray" />
                         </Panel>
                         <Rectangle
-                            Grid.Row="2"
-                            Grid.Column="0"
-                            Width="1"
+                            Grid.Row="1"
+                            Width="2"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Stretch"
                             Classes="end"
                             Fill="{DynamicResource TimelineLineBrush}" />
                     </Grid>
-                    <Rectangle
-                        Grid.Row="2"
-                        Grid.Column="0"
-                        Width="1"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Stretch"
-                        Classes="end"
-                        Fill="{DynamicResource TimelineLineBrush}" />
                     <ContentPresenter
+                        Name="{x:Static u:TimelineItem.PART_Header}"
                         Grid.Row="0"
-                        Grid.Column="1"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Bottom"
-                        Foreground="Gray">
-                        <ContentPresenter.Content>
+                        Grid.Column="2"
+                        Margin="8,4"
+                        VerticalAlignment="Top"
+                        Content="{TemplateBinding Header}"
+                        ContentTemplate="{TemplateBinding HeaderTemplate}"
+                        FontSize="14"
+                        Foreground="{DynamicResource SemiGrey9}" />
+                    <ContentPresenter
+                        Name="{x:Static u:TimelineItem.PART_Content}"
+                        Grid.Row="1"
+                        Grid.Column="2"
+                        Margin="8,2"
+                        VerticalAlignment="Top"
+                        Content="{TemplateBinding Content}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        TextElement.FontSize="12"
+                        TextElement.Foreground="Gray" />
+                    <TextBlock
+                        Name="{x:Static u:TimelineItem.PART_Time}"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="8,2"
+                        VerticalAlignment="Top"
+                        FontSize="12"
+                        Foreground="Gray"
+                        TextWrapping="Wrap">
+                        <TextBlock.Text>
                             <MultiBinding Converter="{StaticResource FormatConverter}">
                                 <Binding Path="Time" RelativeSource="{RelativeSource TemplatedParent}" />
                                 <Binding Path="TimeFormat" RelativeSource="{RelativeSource TemplatedParent}" />
                             </MultiBinding>
-                        </ContentPresenter.Content>
-                    </ContentPresenter>
-                    <ContentPresenter
-                        Name="content"
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        Margin="0,0,0,16"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}" />
+                        </TextBlock.Text>
+                    </TextBlock>
                 </Grid>
             </ControlTemplate>
         </Setter>
-        <Style Selector="^:first /template/ Rectangle.start">
-            <Setter Property="Rectangle.Fill" Value="Transparent" />
-        </Style>
         <Style Selector="^:last /template/ Rectangle.end">
             <Setter Property="Rectangle.Fill" Value="Transparent" />
         </Style>
-        <Style Selector="^:none /template/ Ellipse#PART_Indicator">
-            <Setter Property="Ellipse.Fill" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=u:TimelineItem}, Path=IconForeground}" />
+        <Style Selector="^:empty-icon /template/ Ellipse#PART_DefaultIcon">
+            <Setter Property="IsVisible" Value="True"/>
         </Style>
-        <Style Selector="^:not(:none):default /template/ Ellipse#PART_Indicator">
-            <Setter Property="Ellipse.Fill" Value="{DynamicResource DefaultTimelineIconForeground}" />
+        <Style Selector="^:empty-icon[Type=Default] /template/ Ellipse#PART_DefaultIcon">
+            <Setter Property="Fill" Value="{DynamicResource SemiGrey6}"/>
         </Style>
-        <Style Selector="^:not(:none):ongoing /template/ Ellipse#PART_Indicator">
-            <Setter Property="Ellipse.Fill" Value="{DynamicResource OngoingTimelineIconForeground}" />
+        <Style Selector="^:empty-icon[Type=Error] /template/ Ellipse#PART_DefaultIcon">
+            <Setter Property="Fill" Value="{DynamicResource SemiRed6}"/>
         </Style>
-        <Style Selector="^:not(:none):success /template/ Ellipse#PART_Indicator">
-            <Setter Property="Ellipse.Fill" Value="{DynamicResource SuccessTimelineIconForeground}" />
+        <Style Selector="^:empty-icon[Type=Ongoing] /template/ Ellipse#PART_DefaultIcon">
+            <Setter Property="Fill" Value="{DynamicResource SemiBlue6}"/>
         </Style>
-        <Style Selector="^:not(:none):warning /template/ Ellipse#PART_Indicator">
-            <Setter Property="Ellipse.Fill" Value="{DynamicResource WarningTimelineIconForeground}" />
+        <Style Selector="^:empty-icon[Type=Success] /template/ Ellipse#PART_DefaultIcon">
+            <Setter Property="Fill" Value="{DynamicResource SemiGreen6}"/>
         </Style>
-        <Style Selector="^:not(:none):error /template/ Ellipse#PART_Indicator">
-            <Setter Property="Ellipse.Fill" Value="{DynamicResource ErrorTimelineIconForeground}" />
+        <Style Selector="^:empty-icon[Type=Warning] /template/ Ellipse#PART_DefaultIcon">
+            <Setter Property="Fill" Value="{DynamicResource SemiOrange6}"/>
+        </Style>
+        <Style Selector="^:all-left">
+            <Style Selector="^ /template/ ContentPresenter#PART_Header">
+                <Setter Property="Grid.Row" Value="0" />
+                <Setter Property="Grid.Column" Value="2" />
+                <Setter Property="HorizontalContentAlignment" Value="Left" />
+                <Setter Property="HorizontalAlignment" Value="Left" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_Content">
+                <Setter Property="Grid.Row" Value="1" />
+                <Setter Property="Grid.Column" Value="2" />
+                <Setter Property="HorizontalContentAlignment" Value="Left" />
+                <Setter Property="HorizontalAlignment" Value="Left" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Time">
+                <Setter Property="Grid.Row" Value="2" />
+                <Setter Property="Grid.Column" Value="2" />
+                <Setter Property="TextAlignment" Value="Left" />
+                <Setter Property="HorizontalAlignment" Value="Left" />
+                <Setter Property="Margin" Value="8 2 8 12"></Setter>
+            </Style>
+        </Style>
+        <Style Selector="^:all-right">
+            <Style Selector="^ /template/ ContentPresenter#PART_Header">
+                <Setter Property="Grid.Row" Value="0" />
+                <Setter Property="Grid.Column" Value="0" />
+                <Setter Property="HorizontalContentAlignment" Value="Right" />
+                <Setter Property="HorizontalAlignment" Value="Right" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_Content">
+                <Setter Property="Grid.Row" Value="1" />
+                <Setter Property="Grid.Column" Value="0" />
+                <Setter Property="HorizontalContentAlignment" Value="Right" />
+                <Setter Property="HorizontalAlignment" Value="Right" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Time">
+                <Setter Property="Grid.Row" Value="2" />
+                <Setter Property="Grid.Column" Value="0" />
+                <Setter Property="TextAlignment" Value="Right" />
+                <Setter Property="HorizontalAlignment" Value="Right" />
+                <Setter Property="Margin" Value="8 2 8 12"></Setter>
+            </Style>
+        </Style>
+        <Style Selector="^:separate">
+            <Style Selector="^ /template/ ContentPresenter#PART_Header">
+                <Setter Property="Grid.Row" Value="0" />
+                <Setter Property="Grid.Column" Value="2" />
+                <Setter Property="HorizontalContentAlignment" Value="Left" />
+                <Setter Property="HorizontalAlignment" Value="Left" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_Content">
+                <Setter Property="Grid.Row" Value="1" />
+                <Setter Property="Grid.Column" Value="2" />
+                <Setter Property="HorizontalContentAlignment" Value="Left" />
+                <Setter Property="HorizontalAlignment" Value="Left" />
+                <Setter Property="Margin" Value="8 2 8 12"></Setter>
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PART_Time">
+                <Setter Property="Grid.Row" Value="0" />
+                <Setter Property="Grid.Column" Value="0" />
+                <Setter Property="TextAlignment" Value="Right" />
+                <Setter Property="HorizontalAlignment" Value="Right" />
+            </Style>
         </Style>
     </ControlTheme>
 </ResourceDictionary>

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

@@ -0,0 +1,140 @@
+<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="ToolBarExpandToggleButton" TargetType="ToggleButton">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <ContentPresenter
+                    x:Name="PART_ContentPresenter"
+                    Padding="{TemplateBinding Padding}"
+                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Content="{TemplateBinding Content}"
+                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    RecognizesAccessKey="True"
+                    TextElement.FontSize="{TemplateBinding FontSize}"
+                    TextElement.FontWeight="{TemplateBinding FontWeight}"
+                    UseLayoutRounding="False" />
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+    <ControlTheme x:Key="{x:Type u:ToolBar}" TargetType="u:ToolBar">
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="ItemsPanel">
+            <ItemsPanelTemplate>
+                <u:ToolBarPanel />
+            </ItemsPanelTemplate>
+        </Setter>
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:ToolBar">
+                <Border
+                    Name="PART_BackgroundBorder"
+                    Padding="{TemplateBinding Padding}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                    VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                    CornerRadius="4">
+                    <DockPanel LastChildFill="True">
+                        <ContentPresenter
+                            Name="PART_Header"
+                            Margin="8,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Content="{TemplateBinding Header}"
+                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                            DockPanel.Dock="Left"
+                            Foreground="{DynamicResource SemiColorText2}"
+                            IsVisible="{TemplateBinding Header,
+                                                        Converter={x:Static ObjectConverters.IsNotNull}}" />
+                        <Panel Name="PART_PopupButtonPanel" DockPanel.Dock="Right">
+                            <ToggleButton
+                                Name="button"
+                                Padding="8,0"
+                                VerticalAlignment="Stretch"
+                                IsVisible="False"
+                                Theme="{DynamicResource ToolBarExpandToggleButton}">
+                                <PathIcon
+                                    Name="PART_Icon"
+                                    Height="12"
+                                    Foreground="{DynamicResource SemiColorText2}"
+                                    Data="{DynamicResource ToolBarHorizontalMoreGlyph}" />
+                            </ToggleButton>
+                            <Popup
+                                IsLightDismissEnabled="True"
+                                IsOpen="{Binding #button.IsChecked, Mode=TwoWay}"
+                                Placement="{TemplateBinding PopupPlacement}"
+                                PlacementTarget="{Binding #button}">
+                                <Border Padding="2" Theme="{DynamicResource CardBorder}">
+                                    <StackPanel Name="{x:Static u:ToolBar.PART_OverflowPanel}" />
+                                </Border>
+                            </Popup>
+                        </Panel>
+                        <ItemsPresenter
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            ItemsPanel="{TemplateBinding ItemsPanel}" />
+                    </DockPanel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^[Orientation=Horizontal]">
+            <Setter Property="PopupPlacement" Value="BottomEdgeAlignedLeft" />
+        </Style>
+        <Style Selector="^[Orientation=Vertical]">
+            <Setter Property="PopupPlacement" Value="RightEdgeAlignedTop" />
+            <Style Selector="^ /template/ ContentPresenter#PART_Header">
+                <Setter Property="DockPanel.Dock" Value="Top" />
+                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Setter Property="VerticalAlignment" Value="Top" />
+                <Setter Property="Margin" Value="0 8" />
+            </Style>
+            <Style Selector="^ /template/ Panel#PART_PopupButtonPanel">
+                <Setter Property="DockPanel.Dock" Value="Bottom" />
+            </Style>
+            <Style Selector="^ /template/ ToggleButton#button">
+                <Setter Property="Padding" Value="0 8" />
+            </Style>
+            <Style Selector="^ /template/ PathIcon#PART_Icon">
+                <Setter Property="Data" Value="{DynamicResource ToolBarVerticalMoreGlyph}" />
+                <Setter Property="Width" Value="12" />
+                <Setter Property="Height" Value="{x:Static x:Double.NaN}" />
+            </Style>
+        </Style>
+        <Style Selector="^:overflow /template/ ToggleButton#button">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:ToolBarSeparator}" TargetType="u:ToolBarSeparator">
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Rectangle
+                    Name="PART_Rect"
+                    Margin="4"
+                    Fill="{DynamicResource SemiColorBorder}" />
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^ /template/ Rectangle#PART_Rect">
+            <Setter Property="Width" Value="1" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+        </Style>
+        <Style Selector="^:vertical /template/ Rectangle#PART_Rect">
+            <Setter Property="Height" Value="1" />
+            <Setter Property="Width" Value="{x:Static x:Double.NaN}" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,298 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
+    xmlns:converters1="clr-namespace:Ursa.Converters;assembly=Ursa"
+    xmlns:iri="https://irihi.tech/shared"
+    xmlns:u="https://irihi.tech/ursa">
+    <!--  Add Resources Here  -->
+
+    <converters:MarginMultiplierConverter
+        x:Key="LeftMarginConverter"
+        Indent="20"
+        Left="True" />
+
+    <ControlTheme x:Key="{x:Type u:TreeComboBox}" TargetType="u:TreeComboBox">
+        <Setter Property="Padding" Value="{DynamicResource ComboBoxSelectorDefaultPadding}" />
+        <Setter Property="FocusAdorner" Value="{x:Null}" />
+        <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="MinHeight" Value="{DynamicResource ComboBoxDefaultHeight}" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:TreeComboBox">
+                <Grid MinWidth="{TemplateBinding MinHeight}" ColumnDefinitions="Auto, *, Auto, Auto, Auto">
+                    <Border
+                        Name="Background"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="5"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}" />
+                    <ContentPresenter
+                        Grid.Column="0"
+                        Margin="8,0,0,0"
+                        VerticalAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        Content="{TemplateBinding InnerLeftContent}"
+                        Foreground="{DynamicResource TextBoxInnerForeground}"
+                        IsVisible="{TemplateBinding InnerLeftContent,
+                                                    Converter={x:Static ObjectConverters.IsNotNull}}" />
+                    <TextBlock
+                        Name="PlaceholderTextBlock"
+                        Grid.Column="1"
+                        Margin="{TemplateBinding Padding}"
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                        Foreground="{TemplateBinding Foreground}"
+                        IsVisible="{TemplateBinding SelectionBoxItem,
+                                                    Converter={x:Static ObjectConverters.IsNull}}"
+                        Opacity="0.3"
+                        Text="{TemplateBinding Watermark}"
+                        TextTrimming="CharacterEllipsis" />
+                    <ContentPresenter
+                        Grid.Column="1"
+                        Margin="{TemplateBinding Padding}"
+                        VerticalAlignment="Center"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        Content="{TemplateBinding SelectionBoxItem}">
+                        <ContentPresenter.ContentTemplate>
+                            <MultiBinding Converter="{x:Static converters1:SelectionBoxTemplateConverter.Instance}">
+                                <TemplateBinding Property="SelectedItemTemplate" />
+                                <TemplateBinding Property="ItemTemplate" />
+                            </MultiBinding>
+                        </ContentPresenter.ContentTemplate>
+                    </ContentPresenter>
+                    <Button
+                        Name="PART_ClearButton"
+                        Grid.Column="2"
+                        Command="{Binding $parent[iri:IClearControl].Clear}"
+                        IsVisible="False"
+                        Theme="{DynamicResource InnerIconButton}"
+                        Content="{DynamicResource IconButtonClearData}" />
+                    <ContentPresenter
+                        Grid.Column="3"
+                        Margin="0 0 8 0"
+                        VerticalAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        Content="{TemplateBinding InnerRightContent}"
+                        Foreground="{DynamicResource TextBoxInnerForeground}"
+                        IsVisible="{TemplateBinding InnerRightContent,
+                                                    Converter={x:Static ObjectConverters.IsNotNull}}" />
+                    <Panel
+                        Grid.Column="4"
+                        Width="32"
+                        Background="Transparent"
+                        IsHitTestVisible="True">
+                        <PathIcon
+                            x:Name="DropDownGlyph"
+                            Width="12"
+                            Height="12"
+                            Margin="0,0,10,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Data="{DynamicResource ComboBoxIcon}"
+                            Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
+                            UseLayoutRounding="False" />
+                    </Panel>
+                    <Popup
+                        Name="{x:Static iri:PartNames.PART_Popup}"
+                        Grid.Column="0"
+                        MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                        MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                        ClipToBounds="False"
+                        InheritsTransform="True"
+                        IsLightDismissEnabled="True"
+                        IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                        PlacementTarget="Background"
+                        WindowManagerAddShadowHint="False">
+                        <Border
+                            Name="PopupBorder"
+                            Margin="0,4"
+                            BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
+                            Background="{DynamicResource ComboBoxPopupBackground}"
+                            BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
+                            BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
+                            ClipToBounds="True"
+                            CornerRadius="6">
+                            <DockPanel LastChildFill="True">
+                                <ContentPresenter
+                                    Name="PART_PopupHeader"
+                                    Margin="8,8 8 0"
+                                    IsVisible="{TemplateBinding PopupInnerTopContent,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}"
+                                    Content="{TemplateBinding PopupInnerTopContent}"
+                                    DockPanel.Dock="Top" />
+                                <ContentPresenter
+                                    Name="PART_PopupFooter"
+                                    Margin="8 0 8 8"
+                                    IsVisible="{TemplateBinding PopupInnerBottomContent,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}"
+                                    Content="{TemplateBinding PopupInnerBottomContent}"
+                                    DockPanel.Dock="Bottom" />
+                                <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}">
+                                    <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
+                                </ScrollViewer>
+                            </DockPanel>
+                        </Border>
+                    </Popup>
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+        
+        <Style Selector="^.clearButton, ^.ClearButton">
+            <Style Selector="^:pointerover /template/ Button#PART_ClearButton">
+                <Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNotNull}}"/>
+            </Style>
+        </Style>
+        
+        <Style Selector="^.Large">
+            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}"/>
+        </Style>
+        <Style Selector="^.Small">
+            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}"/>
+        </Style>
+        
+        <!--  Pointerover State  -->
+        <Style Selector="^:pointerover">
+            <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPointeroverBorderBrush}" />
+        </Style>
+        <Style Selector="^:pointerover /template/ PathIcon#DropDownGlyph">
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconPointeroverForeground}" />
+        </Style>
+
+        <!--  Pressed State  -->
+        <Style Selector="^:pressed">
+            <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPressedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPressedBorderBrush}" />
+            <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconPressedForeground}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:dropdownopen">
+            <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorPressedBorderBrush}" />
+        </Style>
+
+        <!--  Disabled State  -->
+        <Style Selector="^:disabled">
+            <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorDisabledBackground}" />
+            <Style Selector="^ /template/ ContentControl#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxDisabledForeground}" />
+            </Style>
+            <Style Selector="^ /template/ TextBlock#PlaceholderTextBlock">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxDisabledForeground}" />
+            </Style>
+            <Style Selector="^ /template/ PathIcon#DropDownGlyph">
+                <Setter Property="Foreground" Value="{DynamicResource ComboBoxIconDisabledForeground}" />
+            </Style>
+        </Style>
+        <!--  Error State  -->
+        <Style Selector="^:error">
+            <Style Selector="^ /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsBackground}" />
+            </Style>
+            <Style Selector="^:pointerover /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
+                <Setter Property="BorderBrush" Value="Transparent" />
+            </Style>
+            <Style Selector="^:pressed /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
+                <Setter Property="BorderBrush" Value="Transparent" />
+            </Style>
+            <Style Selector="^:focus /template/ Border#Background">
+                <Setter Property="Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+            </Style>
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:TreeComboBoxItem}" TargetType="u:TreeComboBoxItem">
+        <Setter Property="Background" Value="{DynamicResource TreeViewItemDefaultBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource TreeViewItemDefaultForeground}" />
+        <Setter Property="CornerRadius" Value="3" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:TreeComboBoxItem">
+                <StackPanel>
+                    <Border
+                        Name="PART_LayoutRoot"
+                        MinHeight="{TemplateBinding MinHeight}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        TemplatedControl.IsTemplateFocusTarget="True">
+                        <Grid
+                            Name="{x:Static iri:PartNames.PART_Header}"
+                            Margin="{TemplateBinding Level,
+                                                     Mode=OneWay,
+                                                     Converter={StaticResource LeftMarginConverter}}"
+                            ColumnDefinitions="Auto, *">
+                            <ToggleButton
+                                Name="PART_ExpandCollapseChevron"
+                                Grid.Column="0"
+                                Padding="{DynamicResource TreeViewItemIconMargin}"
+                                Focusable="False"
+                                IsChecked="{TemplateBinding IsExpanded,
+                                                            Mode=TwoWay}"
+                                Theme="{DynamicResource ToggleButtonTreeViewItemIconButton}" />
+                            <ContentPresenter
+                                Name="{x:Static iri:PartNames.PART_HeaderPresenter}"
+                                Grid.Column="1"
+                                Margin="{TemplateBinding Padding}"
+                                Padding="{DynamicResource TreeViewItemPadding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                Content="{TemplateBinding Header}"
+                                ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                Focusable="False"
+                                Foreground="{TemplateBinding Foreground}" />
+                        </Grid>
+                    </Border>
+                    <ItemsPresenter
+                        Name="{x:Static iri:PartNames.PART_ItemsPresenter}"
+                        IsVisible="{TemplateBinding IsExpanded}"
+                        ItemsPanel="{TemplateBinding ItemsPanel}" />
+                </StackPanel>
+            </ControlTemplate>
+        </Setter>
+
+        <!--  Pointerover state  -->
+        <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover">
+            <Setter Property="Background" Value="{DynamicResource TreeViewItemPointeroverBackground}" />
+        </Style>
+
+        <!--  Pressed state  -->
+        <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover">
+            <Setter Property="Background" Value="{DynamicResource TreeViewItemPressedBackground}" />
+        </Style>
+
+        <!--  Disabled state  -->
+        <Style Selector="^:disabled /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource TreeViewItemDisabledBackground}" />
+        </Style>
+        <Style Selector="^:disabled /template/ ContentPresenter#PART_HeaderPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource TreeViewItemDisabledForeground}" />
+        </Style>
+
+        <!--  Selected state  -->
+        <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource TreeViewItemSelectedBackground}" />
+        </Style>
+
+        <!--  Disabled Selected state  -->
+        <Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot">
+            <Setter Property="Background" Value="{DynamicResource TreeViewItemSelectedDisabledBackground}" />
+        </Style>
+
+        <Style Selector="^:empty /template/ ToggleButton#PART_ExpandCollapseChevron">
+            <Setter Property="Opacity" Value="0" />
+            <Setter Property="IsHitTestVisible" Value="False" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,38 @@
+<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:TwoTonePathIcon}" TargetType="u:TwoTonePathIcon">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
+        <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
+        <Setter Property="StrokeThickness" Value="0.4" />
+        <Setter Property="Foreground" Value="{DynamicResource SemiBlue2}" />
+        <Setter Property="StrokeBrush" Value="{DynamicResource SemiBlue6}" />
+        <Setter Property="ActiveForeground" Value="{DynamicResource SemiBlue6}" />
+        <Setter Property="ActiveStrokeBrush" Value="{DynamicResource SemiBlue6}" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:TwoTonePathIcon">
+                <Border Background="{TemplateBinding Background}">
+                    <Panel>
+                        <Viewbox Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                            <Path
+                                Name="PART_Fill"
+                                Data="{TemplateBinding Data}"
+                                StrokeThickness="{TemplateBinding StrokeThickness}"
+                                StrokeJoin="Round"
+                                Fill="{TemplateBinding Foreground}"
+                                Stroke="{TemplateBinding StrokeBrush}"
+                                Stretch="Uniform" />
+                        </Viewbox>
+                    </Panel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:active /template/ Path#PART_Fill">
+            <Setter Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ActiveForeground}" />
+            <Setter Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ActiveStrokeBrush}" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -0,0 +1,80 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:u="https://irihi.tech/ursa">
+    <Design.PreviewWith>
+        <u:VerificationCode Count="4" />
+    </Design.PreviewWith>
+    <!--  Add Resources Here  -->
+    <ControlTheme x:Key="{x:Type u:VerificationCodeItem}" TargetType="u:VerificationCodeItem">
+        <Setter Property="Margin" Value="8" />
+        <Setter Property="FontSize" Value="20" />
+        <Setter Property="Focusable" Value="True" />
+        <Setter Property="Height" Value="48" />
+        <Setter Property="Width" Value="48" />
+        <Setter Property="CornerRadius" Value="3" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Border
+                    Name="PART_Background"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Background="{DynamicResource TextBoxDefaultBackground}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <TextPresenter
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        PasswordChar="{TemplateBinding PasswordChar}"
+                        Text="{TemplateBinding Text}"
+                        TextElement.FontSize="{TemplateBinding FontSize}" />
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:pointerover /template/ Border#PART_Background">
+            <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+        </Style>
+        <Style Selector="^:focus /template/ Border#PART_Background">
+            <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
+        </Style>
+        <Style Selector="^:error /template/ Border#PART_Background">
+            <Setter Property="Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
+        </Style>
+        <Style Selector="^:focus:error /template/ Border#PART_Background">
+            <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:VerificationCodeCollection}" TargetType="u:VerificationCodeCollection">
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:VerificationCodeCollection">
+                <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type u:VerificationCode}" TargetType="u:VerificationCode">
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:VerificationCode">
+                <DataValidationErrors>
+                    <u:VerificationCodeCollection HorizontalAlignment="Left" Name="{x:Static u:VerificationCode.PART_ItemsControl}" ItemsSource="{TemplateBinding Digits}">
+                        <u:VerificationCodeCollection.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <UniformGrid Columns="{TemplateBinding Count}" Rows="1" />
+                            </ItemsPanelTemplate>
+                        </u:VerificationCodeCollection.ItemsPanel>
+                        <u:VerificationCodeCollection.ItemContainerTheme>
+                            <ControlTheme BasedOn="{StaticResource {x:Type u:VerificationCodeItem}}" TargetType="u:VerificationCodeItem">
+                                <Setter Property="PasswordChar" Value="{Binding $parent[u:VerificationCode].PasswordChar}" />
+                                <Setter Property="DataValidationErrors.Errors" Value="{Binding $parent[u:VerificationCode].(DataValidationErrors.Errors)}" />
+                            </ControlTheme>
+                        </u:VerificationCodeCollection.ItemContainerTheme>
+                    </u:VerificationCodeCollection>
+                </DataValidationErrors>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>

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

@@ -4,15 +4,44 @@
         <ResourceInclude Source="Badge.axaml" />
         <ResourceInclude Source="Banner.axaml" />
         <ResourceInclude Source="ButtonGroup.axaml" />
+        <ResourceInclude Source="Breadcrumb.axaml" />
+        <ResourceInclude Source="ControlClassesInput.axaml" />
+        <ResourceInclude Source="Clock.axaml" />
+        <ResourceInclude Source="Dialog.axaml" />
+        <ResourceInclude Source="DialogShared.axaml" />
+        <ResourceInclude Source="DisableContainer.axaml" />
         <ResourceInclude Source="Divider.axaml" />
+        <ResourceInclude Source="Drawer.axaml" />
         <ResourceInclude Source="DualBadge.axaml" />
         <ResourceInclude Source="ElasticWrapPanel.axaml" />
+        <ResourceInclude Source="EnumSelector.axaml" />
+        <ResourceInclude Source="Form.axaml" />
+        <ResourceInclude Source="IconButton.axaml" />
+        <ResourceInclude Source="ImageViewer.axaml" />
         <ResourceInclude Source="IPv4Box.axaml" />
         <ResourceInclude Source="KeyGestureInput.axaml" />
         <ResourceInclude Source="Loading.axaml" />
-        <ResourceInclude Source="Navigation.axaml" />
+        <ResourceInclude Source="MessageBox.axaml" />
+        <ResourceInclude Source="MultiComboBox.axaml" />
+        <ResourceInclude Source="NavMenu.axaml" />
+        <ResourceInclude Source="NumericUpDown.axaml" />
+        <ResourceInclude Source="NumPad.axaml" />
+        <ResourceInclude Source="NumberDisplayer.axaml" />
         <ResourceInclude Source="Pagination.axaml" />
+        <ResourceInclude Source="RangeSlider.axaml" />
+        <ResourceInclude Source="ScrollToButton.axaml" />
+        <ResourceInclude Source="SelectionList.axaml" />
         <ResourceInclude Source="TagInput.axaml" />
+        <ResourceInclude Source="TextBox.axaml" />
+        <ResourceInclude Source="ThemeSelector.axaml" />
+        <ResourceInclude Source="TimePicker.axaml" />
+        <ResourceInclude Source="TimeRangePicker.axaml" />
         <ResourceInclude Source="Timeline.axaml" />
+        <ResourceInclude Source="TreeComboBox.axaml"/>
+        <ResourceInclude Source="Skeleton.axaml" />
+        <ResourceInclude Source="TwoTonePathIcon.axaml" />
+        <ResourceInclude Source="ToolBar.axaml" />
+        <ResourceInclude Source="TimeBox.axaml"/>
+        <ResourceInclude Source="VerificationCode.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>

src/Ursa.Themes.Semi/Converters/BooleansToOpacityConverter.cs

@@ -0,0 +1,21 @@
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace Ursa.Themes.Semi.Converters;
+
+public class BooleansToOpacityConverter: IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is bool b)
+        {
+            return b? 1.0: 0.0;
+        }
+        return 1;
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}

src/Ursa.Themes.Semi/Converters/ClockHandLengthConverter.cs

@@ -0,0 +1,27 @@
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace Ursa.Themes.Semi.Converters;
+
+public class ClockHandLengthConverter(double ratio) : IValueConverter
+{
+    public static ClockHandLengthConverter Hour { get; } = new(1-0.618);
+    public static ClockHandLengthConverter Minute { get; } = new(0.618);
+    public static ClockHandLengthConverter Second { get; } = new(1);
+    
+    private double _ratio = ratio;
+
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is double d)
+        {
+            return d * ratio / 2;
+        }
+        return 0.0;
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}

src/Ursa.Themes.Semi/Converters/NavMenuMarginConverter.cs

@@ -0,0 +1,17 @@
+using System.Globalization;
+using Avalonia;
+using Avalonia.Data.Converters;
+
+namespace Ursa.Themes.Semi.Converters;
+
+public class NavMenuMarginConverter: IMultiValueConverter
+{
+    public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (values[0] is double indent && values[1] is int level && values[2] is bool b)
+        {
+            return b ? new Thickness() : new Thickness(indent * (level-1), 0, 0, 0);
+        }
+        return AvaloniaProperty.UnsetValue;
+    }
+}

src/Ursa.Themes.Semi/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>
+<Styles x:Class="Ursa.Themes.Semi.SemiTheme" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
@@ -13,11 +8,11 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="../Controls/_index.axaml" />
                 <ResourceInclude Source="Themes/Shared/_index.axaml" />
+                <ResourceInclude Source="Locale/zh-cn.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
 
     <StyleInclude Source="../Styles/_index.axaml" />
-
     <!--  Add Styles Here  -->
 </Styles>

src/Ursa.Themes.Semi/Index.axaml.cs

@@ -0,0 +1,70 @@
+using System.Globalization;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Styling;
+
+namespace Ursa.Themes.Semi;
+
+/// <summary>
+/// Notice: Don't set Locale if your app is in InvariantGlobalization mode.
+/// </summary>
+public class SemiTheme: Styles
+{
+    private static readonly Lazy<Dictionary<CultureInfo, string>> _localeToResource = new Lazy<Dictionary<CultureInfo, string>>(
+        () => new Dictionary<CultureInfo, string>
+        {
+            { new CultureInfo("zh-CN"), "avares://Ursa.Themes.Semi/Locale/zh-CN.axaml" },
+            { new CultureInfo("en-US"), "avares://Ursa.Themes.Semi/Locale/en-US.axaml" },
+        });
+    
+    private static readonly string _defaultResource = "avares://Ursa.Themes.Semi/Locale/zh-CN.axaml";
+    
+    private readonly IServiceProvider? sp;
+    public SemiTheme(IServiceProvider? provider = null)
+    {
+        sp = provider;
+        AvaloniaXamlLoader.Load(provider, this);
+    }
+
+    private CultureInfo? _locale;
+    public CultureInfo? Locale
+    {
+        get => _locale;
+        set
+        {
+            try
+            {
+                _locale = value;
+                var resource = TryGetLocaleResource(value);
+                var d = AvaloniaXamlLoader.Load(sp, new Uri(resource)) as ResourceDictionary;
+                if (d is null) return;
+                foreach (var kv in d)
+                {
+                    this.Resources.Add(kv);
+                }
+            }
+            catch
+            {
+                _locale = CultureInfo.InvariantCulture;
+            }
+            
+        }
+    }
+    
+    private static string TryGetLocaleResource(CultureInfo? locale)
+    {
+        if (Equals(locale, CultureInfo.InvariantCulture))
+        {
+            return _defaultResource;
+        }
+        if (locale is null)
+        {
+            return _localeToResource.Value[new CultureInfo("zh-CN")];
+        }
+        if (_localeToResource.Value.TryGetValue(locale, out var resource))
+        {
+            return resource;
+        }
+        return _localeToResource.Value[new CultureInfo("zh-CN")];
+    }
+}

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

@@ -0,0 +1,21 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    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>
+    <x:String x:Key="STRING_MENU_SEND_TO_BACK">Send to Back</x:String>
+    <x:String x:Key="STRING_MENU_DIALOG_OK">OK</x:String>
+    <x:String x:Key="STRING_MENU_DIALOG_CANCEL">Cancel</x:String>
+    <x:String x:Key="STRING_MENU_DIALOG_YES">Yes</x:String>
+    <x:String x:Key="STRING_MENU_DIALOG_NO">No</x:String>
+    <x:String x:Key="STRING_MENU_DIALOG_CLOSE">Close</x:String>
+    <x:String x:Key="STRING_PAGINATION_JUMP_TO">Jump to page</x:String>
+    <x:String x:Key="STRING_PAGINATION_PAGE"> </x:String>
+    <x:String x:Key="STRING_THEME_TOGGLE_DARK">Dark</x:String>
+    <x:String x:Key="STRING_THEME_TOGGLE_LIGHT">Light</x:String>
+    <x:String x:Key="STRING_THEME_TOGGLE_SYSTEM">System</x:String>
+    <x:String x:Key="STRING_DATE_TIME_CONFIRM">Confirm</x:String>
+    <x:String x:Key="STRING_DATE_TIME_START_TIME">Start Time</x:String>
+    <x:String x:Key="STRING_DATE_TIME_END_TIME">End Time</x:String>
+</ResourceDictionary>

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

@@ -0,0 +1,21 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    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>
+    <x:String x:Key="STRING_MENU_SEND_TO_BACK">置于底层</x:String>
+    <x:String x:Key="STRING_MENU_DIALOG_OK">确认</x:String>
+    <x:String x:Key="STRING_MENU_DIALOG_CANCEL">取消</x:String>
+    <x:String x:Key="STRING_MENU_DIALOG_YES">是</x:String>
+    <x:String x:Key="STRING_MENU_DIALOG_NO">否</x:String>
+    <x:String x:Key="STRING_MENU_DIALOG_CLOSE">关闭</x:String>
+    <x:String x:Key="STRING_PAGINATION_JUMP_TO">跳至</x:String>
+    <x:String x:Key="STRING_PAGINATION_PAGE">页</x:String>
+    <x:String x:Key="STRING_THEME_TOGGLE_DARK">暗色</x:String>
+    <x:String x:Key="STRING_THEME_TOGGLE_LIGHT">亮色</x:String>
+    <x:String x:Key="STRING_THEME_TOGGLE_SYSTEM">跟随系统</x:String>
+    <x:String x:Key="STRING_DATE_TIME_CONFIRM">确认</x:String>
+    <x:String x:Key="STRING_DATE_TIME_START_TIME">开始时间</x:String>
+    <x:String x:Key="STRING_DATE_TIME_END_TIME">结束时间</x:String>
+</ResourceDictionary>

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

@@ -0,0 +1,20 @@
+<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>
+        <Style Selector="^#PART_IconPresenter">
+            <Setter Property="Margin" Value="0 0 2 0"></Setter>
+        </Style>
+        <Style Selector="^#Separator">
+            <Setter Property="Margin" Value="2 0"></Setter>
+        </Style>
+    </Style>
+</Styles>

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

@@ -42,15 +42,15 @@
     <Style Selector="u|ButtonGroup.Tertiary Button">
         <Setter Property="Foreground" Value="{DynamicResource ButtonGroupDefaultTertiaryForeground}" />
     </Style>
+    <Style Selector="u|ButtonGroup.Success Button">
+        <Setter Property="Foreground" Value="{DynamicResource ButtonGroupDefaultSuccessForeground}" />
+    </Style>
     <Style Selector="u|ButtonGroup.Warning Button">
         <Setter Property="Foreground" Value="{DynamicResource ButtonGroupDefaultWarningForeground}" />
     </Style>
     <Style Selector="u|ButtonGroup.Danger Button">
         <Setter Property="Foreground" Value="{DynamicResource ButtonGroupDefaultDangerForeground}" />
     </Style>
-    <Style Selector="u|ButtonGroup.Success Button">
-        <Setter Property="Foreground" Value="{DynamicResource ButtonGroupDefaultSuccessForeground}" />
-    </Style>
 
     <Style Selector="u|ButtonGroup.Solid.Primary">
         <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidPrimaryBackground}" />
@@ -61,15 +61,15 @@
     <Style Selector="u|ButtonGroup.Solid.Tertiary">
         <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidTertiaryBackground}" />
     </Style>
+    <Style Selector="u|ButtonGroup.Solid.Success">
+        <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidSuccessBackground}" />
+    </Style>
     <Style Selector="u|ButtonGroup.Solid.Warning">
         <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidWarningBackground}" />
     </Style>
     <Style Selector="u|ButtonGroup.Solid.Danger">
         <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidDangerBackground}" />
     </Style>
-    <Style Selector="u|ButtonGroup.Solid.Success">
-        <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidSuccessBackground}" />
-    </Style>
     <Style Selector="u|ButtonGroup.Solid Button">
         <Setter Property="Foreground" Value="{DynamicResource ButtonGroupSolidForeground}" />
     </Style>
@@ -100,6 +100,14 @@
             <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidTertiaryPressedBackground}" />
         </Style>
     </Style>
+    <Style Selector="u|ButtonGroup.Solid.Success Button">
+        <Style Selector="^:pointerover">
+            <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidSuccessPointeroverBackground}" />
+        </Style>
+        <Style Selector="^:pressed">
+            <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidSuccessPressedBackground}" />
+        </Style>
+    </Style>
     <Style Selector="u|ButtonGroup.Solid.Warning Button">
         <Style Selector="^:pointerover">
             <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidWarningPointeroverBackground}" />
@@ -116,13 +124,5 @@
             <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidDangerPressedBackground}" />
         </Style>
     </Style>
-    <Style Selector="u|ButtonGroup.Solid.Success Button">
-        <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidSuccessPointeroverBackground}" />
-        </Style>
-        <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource ButtonGroupSolidSuccessPressedBackground}" />
-        </Style>
-    </Style>
 
 </Styles>

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

@@ -0,0 +1,29 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        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
+                FillMode="None"
+                IterationCount="Infinite"
+                Easing="CubicEaseInOut"
+                PlaybackDirection="Alternate"
+                Duration="0:0:1.4">
+                <KeyFrame Cue="0%">
+                    <Setter Property="Background" Value="{DynamicResource SkeletonStartAnimationBackground}" />
+                </KeyFrame>
+                <KeyFrame Cue="100%">
+                    <Setter Property="Background" Value="{DynamicResource SkeletonEndAnimationBackground}" />
+                </KeyFrame>
+            </Animation>
+        </Style.Animations>
+    </Style>
+</Styles>

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

@@ -0,0 +1,21 @@
+<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>
+    <Style Selector="u|TimeBox /template/ Border#PART_MinuteBorder:pointerover">
+        <Setter Property="Background" Value="{DynamicResource TimeBoxPointeroverBackground}"/>
+    </Style>
+    <Style Selector="u|TimeBox /template/ Border#PART_SecondBorder:pointerover">
+        <Setter Property="Background" Value="{DynamicResource TimeBoxPointeroverBackground}"/>
+    </Style>
+    <Style Selector="u|TimeBox /template/ Border#PART_MilliSecondBorder:pointerover">
+        <Setter Property="Background" Value="{DynamicResource TimeBoxPointeroverBackground}"/>
+    </Style>
+</Styles>

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

@@ -0,0 +1,26 @@
+<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="FontWeight" Value="Regular" />
+        <Setter Property="Foreground" Value="{DynamicResource SemiColorText0}"></Setter>
+    </Style>
+    <Style Selector="u|ToolBar CheckBox">
+        <Setter Property="Margin" Value="8 0" />
+    </Style>
+    <Style Selector="u|ToolBar ToggleButton">
+        <Setter Property="FontWeight" Value="Regular" />
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Foreground" Value="{DynamicResource SemiColorText0}"/>
+    </Style>
+    <Style Selector="u|ToolBar ComboBox">
+        <Setter Property="HorizontalAlignment" Value="Stretch"/>
+    </Style>
+    <!-- Add Styles Here -->
+</Styles>

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

@@ -4,6 +4,10 @@
             <!--  Add Controls for Previewer Here  -->
         </Border>
     </Design.PreviewWith>
+    <StyleInclude Source="Breadcrumb.axaml" />
     <StyleInclude Source="ButtonGroup.axaml" />
+    <StyleInclude Source="Skeleton.axaml" />
+    <StyleInclude Source="ToolBar.axaml"/>
+    <StyleInclude Source="TimeBox.axaml"/>
     <!--  Add Styles Here  -->
 </Styles>

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

@@ -1,10 +1,34 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="BadgeBorderBrush" Opacity="0.08" Color="White" />
-    <SolidColorBrush x:Key="BadgeForeground" Color="White" />
+    <SolidColorBrush x:Key="BadgeBorderBrush" Color="#1C1F23" />
+    <SolidColorBrush x:Key="BadgeForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="BadgeContentForeground" Color="White" />
+    <!-- Solid -->
     <SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="#FF54A9FF" />
     <SolidColorBrush x:Key="BadgeSecondaryBadgeBackground" Color="#FF40B4F3" />
     <SolidColorBrush x:Key="BadgeTertiaryBadgeBackground" Color="#FF888D92" />
+    <SolidColorBrush x:Key="BadgeSuccessBadgeBackground" Color="#FF5DC264" />
     <SolidColorBrush x:Key="BadgeWarningBadgeBackground" Color="#FFFFAE43" />
     <SolidColorBrush x:Key="BadgeDangerBadgeBackground" Color="#FFFC725A" />
-</ResourceDictionary>
+    <!-- Light -->
+    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="#FF54A9FF" />
+    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeBackground" Color="#FF003D8F" />
+    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeForeground" Color="#FF40B4F3" />
+    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeBackground" Color="#FF004B83" />
+    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeForeground" Color="#FF888D92" />
+    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeBackground" Color="#FF2E3238" />
+    <SolidColorBrush x:Key="BadgeLightSuccessBadgeForeground" Color="#FF5DC264" />
+    <SolidColorBrush x:Key="BadgeLightSuccessBadgeBackground" Color="#FF1B5924" />
+    <SolidColorBrush x:Key="BadgeLightWarningBadgeForeground" Color="#FFFFAE43" />
+    <SolidColorBrush x:Key="BadgeLightWarningBadgeBackground" Color="#FF7E3100" />
+    <SolidColorBrush x:Key="BadgeLightDangerBadgeForeground" Color="#FFFC725A" />
+    <SolidColorBrush x:Key="BadgeLightDangerBadgeBackground" Color="#FF8E0805" />
+    <!-- Inverted -->
+    <SolidColorBrush x:Key="BadgeInvertedBadgeBackground" Color="#1C1F23" />
+
+    <SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="#FF54A9FF" />
+    <SolidColorBrush x:Key="BadgeInvertedSecondaryBadgeForeground" Color="#FF40B4F3" />
+    <SolidColorBrush x:Key="BadgeInvertedTertiaryBadgeForeground" Color="#FF888D92" />
+    <SolidColorBrush x:Key="BadgeInvertedSuccessBadgeForeground" Color="#FF5DC264" />
+    <SolidColorBrush x:Key="BadgeInvertedWarningBadgeForeground" Color="#FFFFAE43" />
+    <SolidColorBrush x:Key="BadgeInvertedDangerBadgeForeground" Color="#FFFC725A" />
+</ResourceDictionary>

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

@@ -2,12 +2,12 @@
     <!--  Add Resources Here  -->
     <SolidColorBrush x:Key="BannerInformationBackground" Color="#FF053170" />
     <SolidColorBrush x:Key="BannerInformationBorderBrush" Color="#FF54A9FF" />
+    <SolidColorBrush x:Key="BannerSuccessBackground" Color="#FF123C19" />
+    <SolidColorBrush x:Key="BannerSuccessBorderBrush" Color="#FF5DC264" />
     <SolidColorBrush x:Key="BannerWarningBackground" Color="#FF551F03" />
     <SolidColorBrush x:Key="BannerWarningBorderBrush" Color="#FFFFAE43" />
     <SolidColorBrush x:Key="BannerErrorBackground" Color="#FF6C090B" />
     <SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#FFFC725A" />
-    <SolidColorBrush x:Key="BannerSuccessBackground" Color="#FF123C19" />
-    <SolidColorBrush x:Key="BannerSuccessBorderBrush" Color="#FF5DC264" />
 
     <SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.6" Color="#FFF9F9F9" />
 </ResourceDictionary>

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

@@ -1,5 +1,7 @@
 <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" />
     <!--  Light  -->
     <SolidColorBrush x:Key="ButtonGroupDefaultPrimaryForeground" Color="#54A9FF" />
     <SolidColorBrush x:Key="ButtonGroupDefaultSecondaryForeground" Color="#40B4F3" />

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

@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FFA7ABB0" Opacity="0.2"></SolidColorBrush>
+</ResourceDictionary>

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

@@ -0,0 +1,14 @@
+<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" />
+    </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" />
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="SkeletonDefaultBackground" Color="#FF1C1F23"></SolidColorBrush>
+    <!--  Add Resources Here  -->
+</ResourceDictionary>

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

@@ -0,0 +1,12 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="TimeBoxBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="TimeBoxPointeroverBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="TimeBoxPressedBackground" Opacity="0.2" Color="White" />
+    <SolidColorBrush x:Key="TimeBoxBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TimeBoxDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="TimeBoxFocusBorderBrush" Color="#FF54A9FF" />
+    <SolidColorBrush x:Key="TimeBoxSelectionBrush" Color="#FF54A9FF" />
+    <SolidColorBrush x:Key="TimeBoxSelectionForeground" Color="White" />
+    <SolidColorBrush x:Key="TimeBoxCaretBrush" Color="White" />
+</ResourceDictionary>

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

@@ -4,6 +4,7 @@
         <MergeResourceInclude Source="Badge.axaml" />
         <MergeResourceInclude Source="Banner.axaml" />
         <MergeResourceInclude Source="ButtonGroup.axaml" />
+        <MergeResourceInclude Source="Dialog.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="DualBadge.axaml" />
         <MergeResourceInclude Source="IPv4Box.axaml" />
@@ -13,5 +14,7 @@
         <MergeResourceInclude Source="Pagination.axaml" />
         <MergeResourceInclude Source="TagInput.axaml" />
         <MergeResourceInclude Source="Timeline.axaml" />
+        <MergeResourceInclude Source="Skeleton.axaml" />
+        <MergeResourceInclude Source="TimeBox.axaml"/>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>

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

@@ -1,10 +1,34 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <SolidColorBrush x:Key="BadgeBorderBrush" Opacity="0.08" Color="#1C1F23" />
+    <SolidColorBrush x:Key="BadgeBorderBrush" Color="White"/>
     <SolidColorBrush x:Key="BadgeForeground" Color="White" />
+    <SolidColorBrush x:Key="BadgeContentForeground" Color="#1C1F23" />
+    <!-- Solid -->
     <SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="#0077F0" />
     <SolidColorBrush x:Key="BadgeSecondaryBadgeBackground" Color="#0095EE" />
     <SolidColorBrush x:Key="BadgeTertiaryBadgeBackground" Color="#6B7075" />
     <SolidColorBrush x:Key="BadgeWarningBadgeBackground" Color="#FC8800" />
     <SolidColorBrush x:Key="BadgeDangerBadgeBackground" Color="#F93920" />
-</ResourceDictionary>
+    <SolidColorBrush x:Key="BadgeSuccessBadgeBackground" Color="#3BB346" />
+    <!-- Light -->
+    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="#0077FA" />
+    <SolidColorBrush x:Key="BadgeLightPrimaryBadgeBackground" Color="#D4ECFF" />
+    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeForeground" Color="#0095EE" />
+    <SolidColorBrush x:Key="BadgeLightSecondaryBadgeBackground" Color="#CEEEFC" />
+    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeForeground" Color="#6B7075" />
+    <SolidColorBrush x:Key="BadgeLightTertiaryBadgeBackground" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="BadgeLightWarningBadgeForeground" Color="#FC8800" />
+    <SolidColorBrush x:Key="BadgeLightWarningBadgeBackground" Color="#FFEFD0" />
+    <SolidColorBrush x:Key="BadgeLightDangerBadgeForeground" Color="#F93920" />
+    <SolidColorBrush x:Key="BadgeLightDangerBadgeBackground" Color="#FEE0D5" />
+    <SolidColorBrush x:Key="BadgeLightSuccessBadgeForeground" Color="#3BB346" />
+    <SolidColorBrush x:Key="BadgeLightSuccessBadgeBackground" Color="#D0F0D1" />
+    <!-- Inverted -->
+    <SolidColorBrush x:Key="BadgeInvertedBadgeBackground" Color="White" />
+
+    <SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="#0077F0" />
+    <SolidColorBrush x:Key="BadgeInvertedSecondaryBadgeForeground" Color="#0095EE" />
+    <SolidColorBrush x:Key="BadgeInvertedTertiaryBadgeForeground" Color="#6B7075" />
+    <SolidColorBrush x:Key="BadgeInvertedWarningBadgeForeground" Color="#FC8800" />
+    <SolidColorBrush x:Key="BadgeInvertedDangerBadgeForeground" Color="#F93920" />
+    <SolidColorBrush x:Key="BadgeInvertedSuccessBadgeForeground" Color="#3BB346" />
+</ResourceDictionary>

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

@@ -2,12 +2,12 @@
     <!--  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="BannerSuccessBackground" Color="#ECF7EC" />
-    <SolidColorBrush x:Key="BannerSuccessBorderBrush" Color="#3BB346" />
 
     <SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.62" Color="#1C1F23" />
 </ResourceDictionary>

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

@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <SolidColorBrush x:Key="OverlayDialogMaskBrush" Color="#FF555B61" Opacity="0.2"></SolidColorBrush>
+</ResourceDictionary>

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

@@ -0,0 +1,14 @@
+<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="#FFF9F9F9" />
+        <GradientStop Offset="0" Color="#FFE6E8EA" />
+        <GradientStop Offset="1" Color="#FFF9F9F9" />
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="SkeletonEndAnimationBackground" StartPoint="0%,100%" EndPoint="100%,100%">
+        <GradientStop Offset="0" Color="#FFF9F9F9" />
+        <GradientStop Offset="1" Color="#FFE6E8EA" />
+        <GradientStop Offset="1" Color="#FFF9F9F9" />
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="SkeletonDefaultBackground" Color="#FFF9F9F9"></SolidColorBrush>
+    <!--  Add Resources Here  -->
+</ResourceDictionary>

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

@@ -0,0 +1,12 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="TimeBoxBackground" Opacity="0.05" Color="#FF2E3238" />
+    <SolidColorBrush x:Key="TimeBoxPointeroverBackground" Opacity="0.09" Color="#FF2E3238" />
+    <SolidColorBrush x:Key="TimeBoxPressedBackground" Opacity="0.13" Color="#FF2E3238" />
+    <SolidColorBrush x:Key="TimeBoxBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="TimeBoxDisabledBackground" Opacity="0.02" Color="#2E3238" />
+    <SolidColorBrush x:Key="TimeBoxFocusBorderBrush" Color="#FF0077FA" />
+    <SolidColorBrush x:Key="TimeBoxSelectionBrush" Color="#FF0077FA" />
+    <SolidColorBrush x:Key="TimeBoxSelectionForeground" Color="White" />
+    <SolidColorBrush x:Key="TimeBoxCaretBrush" Color="Black" />
+</ResourceDictionary>

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

@@ -4,6 +4,7 @@
         <MergeResourceInclude Source="Badge.axaml" />
         <MergeResourceInclude Source="Banner.axaml" />
         <MergeResourceInclude Source="ButtonGroup.axaml" />
+        <MergeResourceInclude Source="Dialog.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="DualBadge.axaml" />
         <MergeResourceInclude Source="IPv4Box.axaml" />
@@ -13,5 +14,7 @@
         <MergeResourceInclude Source="Pagination.axaml" />
         <MergeResourceInclude Source="TagInput.axaml" />
         <MergeResourceInclude Source="Timeline.axaml" />
+        <MergeResourceInclude Source="Skeleton.axaml" />
+        <MergeResourceInclude Source="TimeBox.axaml"/>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>

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

@@ -1,8 +1,14 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
-    <x:Double x:Key="BadgeHeight">18</x:Double>
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:common="clr-namespace:Ursa.Common;assembly=Ursa">
+    <x:Double x:Key="BadgeMinWidth">18</x:Double>
+    <x:Double x:Key="BadgeMinHeight">18</x:Double>
+    <x:Double x:Key="BadgeDotWidth">8</x:Double>
     <x:Double x:Key="BadgeDotHeight">8</x:Double>
     <Thickness x:Key="BadgePadding">6,0</Thickness>
     <Thickness x:Key="BadgeBorderThickness">1</Thickness>
-    <x:Double x:Key="BadgeFontSize">8</x:Double>
-</ResourceDictionary>
+    <x:Double x:Key="BadgeFontSize">10</x:Double>
+    <CornerRadius x:Key="BadgeCornerRadius">100</CornerRadius>
+    <common:CornerPosition x:Key="BadgeCornerPosition">TopRight</common:CornerPosition>
+</ResourceDictionary>

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

@@ -1,10 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
-    <PathGeometry x:Key="BannerInformationIconGeometry">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</PathGeometry>
-    <PathGeometry x:Key="BannerWarningIconGeometry">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.8831 9.82235L11.6854 17.4112C11.4029 17.7806 10.965 17.9981 10.5 18C10.035 18.0019 9.59533 17.788 9.30982 17.421L5.81604 13.4209C5.30744 12.767 5.42524 11.8246 6.07916 11.316C6.73308 10.8074 7.67549 10.9252 8.1841 11.5791L10.4838 14.0439L15.5 8C16.0032 7.34193 16.9446 7.21641 17.6027 7.71964C18.2608 8.22287 18.3863 9.16428 17.8831 9.82235Z</PathGeometry>
-    <PathGeometry x:Key="BannerErrorIconGeometry">M10.2268 2.3986L1.52616 19.0749C0.831449 20.4064 1.79747 22 3.29933 22H20.7007C22.2025 22 23.1686 20.4064 22.4739 19.0749L13.7732 2.3986C13.0254 0.965441 10.9746 0.965442 10.2268 2.3986ZM13.1415 14.0101C13.0603 14.5781 12.5739 15 12.0001 15C11.4263 15 10.9398 14.5781 10.8586 14.0101L10.2829 9.97992C10.1336 8.93495 10.9445 8.00002 12.0001 8.00002C13.0556 8.00002 13.8665 8.93495 13.7172 9.97992L13.1415 14.0101ZM13.5001 18.5C13.5001 19.3284 12.8285 20 12.0001 20C11.1716 20 10.5001 19.3284 10.5001 18.5C10.5001 17.6716 11.1716 17 12.0001 17C12.8285 17 13.5001 17.6716 13.5001 18.5Z</PathGeometry>
-    <PathGeometry x:Key="BannerSuccessIconGeometry">M23 12C23 18.0751 18.0751 23 12 23C5.92487 23 1 18.0751 1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12ZM13.5 17.5C13.5 16.6716 12.8284 16 12 16C11.1716 16 10.5 16.6716 10.5 17.5C10.5 18.3284 11.1716 19 12 19C12.8284 19 13.5 18.3284 13.5 17.5ZM12 5C10.9138 5 10.0507 5.91244 10.1109 6.99692L10.4168 12.5023C10.4635 13.3426 11.1584 14 12 14C12.8416 14 13.5365 13.3426 13.5832 12.5023L13.8891 6.99692C13.9493 5.91244 13.0862 5 12 5Z</PathGeometry>
-    <PathGeometry x:Key="BannerCloseIconGeometry">M 17.6568 19.7782 C 18.2426 20.3639 19.1924 20.3639 19.7782 19.7782 C 20.3639 19.1924 20.3639 18.2426 19.7782 17.6568 L 14.1213 12 L 19.7782 6.34313 C 20.3639 5.75734 20.3639 4.8076 19.7782 4.22181 C 19.1924 3.63602 18.2426 3.63602 17.6568 4.22181 L 12 9.87866 L 6.34313 4.22181 C 5.75734 3.63602 4.8076 3.63602 4.22181 4.22181 C 3.63602 4.8076 3.63602 5.75734 4.22181 6.34313 L 9.87866 12 L 4.22181 17.6568 C 3.63602 18.2426 3.63602 19.1924 4.22181 19.7782 C 4.8076 20.3639 5.75734 20.3639 6.34313 19.7782 L 12 14.1213 L 17.6568 19.7782 Z</PathGeometry>
+    <StreamGeometry x:Key="BannerInformationIconGeometry">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</StreamGeometry>
+    <StreamGeometry x:Key="BannerSuccessIconGeometry">M23 12C23 18.0751 18.0751 23 12 23C5.92487 23 1 18.0751 1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12ZM13.5 17.5C13.5 16.6716 12.8284 16 12 16C11.1716 16 10.5 16.6716 10.5 17.5C10.5 18.3284 11.1716 19 12 19C12.8284 19 13.5 18.3284 13.5 17.5ZM12 5C10.9138 5 10.0507 5.91244 10.1109 6.99692L10.4168 12.5023C10.4635 13.3426 11.1584 14 12 14C12.8416 14 13.5365 13.3426 13.5832 12.5023L13.8891 6.99692C13.9493 5.91244 13.0862 5 12 5Z</StreamGeometry>
+    <StreamGeometry x:Key="BannerWarningIconGeometry">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.8831 9.82235L11.6854 17.4112C11.4029 17.7806 10.965 17.9981 10.5 18C10.035 18.0019 9.59533 17.788 9.30982 17.421L5.81604 13.4209C5.30744 12.767 5.42524 11.8246 6.07916 11.316C6.73308 10.8074 7.67549 10.9252 8.1841 11.5791L10.4838 14.0439L15.5 8C16.0032 7.34193 16.9446 7.21641 17.6027 7.71964C18.2608 8.22287 18.3863 9.16428 17.8831 9.82235Z</StreamGeometry>
+    <StreamGeometry x:Key="BannerErrorIconGeometry">M10.2268 2.3986L1.52616 19.0749C0.831449 20.4064 1.79747 22 3.29933 22H20.7007C22.2025 22 23.1686 20.4064 22.4739 19.0749L13.7732 2.3986C13.0254 0.965441 10.9746 0.965442 10.2268 2.3986ZM13.1415 14.0101C13.0603 14.5781 12.5739 15 12.0001 15C11.4263 15 10.9398 14.5781 10.8586 14.0101L10.2829 9.97992C10.1336 8.93495 10.9445 8.00002 12.0001 8.00002C13.0556 8.00002 13.8665 8.93495 13.7172 9.97992L13.1415 14.0101ZM13.5001 18.5C13.5001 19.3284 12.8285 20 12.0001 20C11.1716 20 10.5001 19.3284 10.5001 18.5C10.5001 17.6716 11.1716 17 12.0001 17C12.8285 17 13.5001 17.6716 13.5001 18.5Z</StreamGeometry>
+    <StreamGeometry x:Key="BannerCloseIconGeometry">M 17.6568 19.7782 C 18.2426 20.3639 19.1924 20.3639 19.7782 19.7782 C 20.3639 19.1924 20.3639 18.2426 19.7782 17.6568 L 14.1213 12 L 19.7782 6.34313 C 20.3639 5.75734 20.3639 4.8076 19.7782 4.22181 C 19.1924 3.63602 18.2426 3.63602 17.6568 4.22181 L 12 9.87866 L 6.34313 4.22181 C 5.75734 3.63602 4.8076 3.63602 4.22181 4.22181 C 3.63602 4.8076 3.63602 5.75734 4.22181 6.34313 L 9.87866 12 L 4.22181 17.6568 C 3.63602 18.2426 3.63602 19.1924 4.22181 19.7782 C 4.8076 20.3639 5.75734 20.3639 6.34313 19.7782 L 12 14.1213 L 17.6568 19.7782 Z</StreamGeometry>
 
     <CornerRadius x:Key="BannerCornerRadius">3</CornerRadius>
     <Thickness x:Key="BannerBorderThickness">1</Thickness>

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

@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <StreamGeometry x:Key="DialogArrangeBringForwardGlyph">M2,2H16V16H2V2M22,8V22H8V18H10V20H20V10H18V8H22Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogArrangeBringToFrontGlyph">M2,2H11V6H9V4H4V9H6V11H2V2M22,13V22H13V18H15V20H20V15H18V13H22M8,8H16V16H8V8Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogArrangeSendBackwardGlyph">M2,2H16V16H2V2M22,8V22H8V18H18V8H22M4,4V14H14V4H4Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogArrangeSendToBackGlyph">M2,2H11V11H2V2M9,4H4V9H9V4M22,13V22H13V13H22M15,20H20V15H15V20M16,8V11H13V8H16M11,16H8V13H11V16Z</StreamGeometry>
+</ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Shared/DialogShared.axaml

@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StreamGeometry x:Key="DialogQuestionIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM11.8281 14.6094C10.9688 14.6094 10.5391 14.0723 10.5391 13.3691C10.5391 12.3242 11.0566 11.6504 12.2676 10.7324C12.2894 10.7158 12.3111 10.6993 12.3326 10.6829C13.1573 10.0555 13.7324 9.61807 13.7324 8.82812C13.7324 7.93945 12.9023 7.42188 11.9746 7.42188C11.2129 7.42188 10.627 7.70508 10.168 8.30078C9.83594 8.64258 9.57227 8.82812 9.12305 8.82812C8.38086 8.82812 8 8.31055 8 7.71484C8 7.10938 8.3418 6.49414 8.87891 6.02539C9.60156 5.40039 10.7539 5 12.2773 5C14.9922 5 16.8965 6.33789 16.8965 8.64258C16.8965 10.3223 15.8906 11.1328 14.709 11.9531C13.9082 12.5391 13.5273 12.8809 13.2246 13.5742L13.2238 13.5756C12.8922 14.1609 12.638 14.6094 11.8281 14.6094ZM11.8086 18.7695C10.8711 18.7695 10.0996 18.1641 10.0996 17.2266C10.0996 16.2891 10.8711 15.6836 11.8086 15.6836C12.7461 15.6836 13.5078 16.2891 13.5078 17.2266C13.5078 18.1641 12.7461 18.7695 11.8086 18.7695Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogInformationIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogWarningIconGlyph">M10.2268 2.3986L1.52616 19.0749C0.831449 20.4064 1.79747 22 3.29933 22H20.7007C22.2025 22 23.1686 20.4064 22.4739 19.0749L13.7732 2.3986C13.0254 0.965441 10.9746 0.965442 10.2268 2.3986ZM13.1415 14.0101C13.0603 14.5781 12.5739 15 12.0001 15C11.4263 15 10.9398 14.5781 10.8586 14.0101L10.2829 9.97992C10.1336 8.93495 10.9445 8.00002 12.0001 8.00002C13.0556 8.00002 13.8665 8.93495 13.7172 9.97992L13.1415 14.0101ZM13.5001 18.5C13.5001 19.3284 12.8285 20 12.0001 20C11.1716 20 10.5001 19.3284 10.5001 18.5C10.5001 17.6716 11.1716 17 12.0001 17C12.8285 17 13.5001 17.6716 13.5001 18.5Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogErrorIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.0352 16.8626C16.4597 17.4585 15.5101 17.4751 14.9142 16.8996L12.0368 14.121L9.25822 16.9984C8.68274 17.5943 7.73314 17.6109 7.13722 17.0354C6.5413 16.4599 6.52472 15.5103 7.1002 14.9144L9.87883 12.037L7.00147 9.2584C6.40555 8.68293 6.38897 7.73332 6.96445 7.1374C7.53992 6.54148 8.48953 6.52491 9.08545 7.10038L11.9628 9.87901L14.7414 7.00165C15.3169 6.40573 16.2665 6.38916 16.8624 6.96463C17.4584 7.54011 17.4749 8.48971 16.8995 9.08563L14.1208 11.963L16.9982 14.7416C17.5941 15.3171 17.6107 16.2667 17.0352 16.8626Z</StreamGeometry>
+    <StreamGeometry x:Key="DialogSuccessIconGlyph">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.8831 9.82235L11.6854 17.4112C11.4029 17.7806 10.965 17.9981 10.5 18C10.035 18.0019 9.59533 17.788 9.30982 17.421L5.81604 13.4209C5.30744 12.767 5.42524 11.8246 6.07916 11.316C6.73308 10.8074 7.67549 10.9252 8.1841 11.5791L10.4838 14.0439L15.5 8C16.0032 7.34193 16.9446 7.21641 17.6027 7.71964C18.2608 8.22287 18.3863 9.16428 17.8831 9.82235Z</StreamGeometry>
+</ResourceDictionary>

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

@@ -0,0 +1,3 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:Double x:Key="MessageBoxWindowContentMaxWidth">300</x:Double>
+</ResourceDictionary>

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

@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
-    <PathGeometry x:Key="PaginationFastBackwardGlyph">M12.6185 4.39653C13.1272 4.92524 13.1272 5.78245 12.6185 6.31116L7.14483 12L12.6185 17.6888C13.1272 18.2176 13.1272 19.0748 12.6185 19.6035C12.1098 20.1322 11.285 20.1322 10.7763 19.6035L4.38153 12.9573C3.87282 12.4286 3.87282 11.5714 4.38153 11.0427L10.7763 4.39653C11.285 3.86782 12.1098 3.86782 12.6185 4.39653Z M19.6185 4.39653C20.1272 4.92524 20.1272 5.78245 19.6185 6.31116L14.1448 12L19.6185 17.6888C20.1272 18.2176 20.1272 19.0748 19.6185 19.6035C19.1098 20.1322 18.285 20.1322 17.7763 19.6035L11.3815 12.9573C10.8728 12.4286 10.8728 11.5714 11.3815 11.0427L17.7763 4.39653C18.285 3.86782 19.1098 3.86782 19.6185 4.39653Z</PathGeometry>
-    <PathGeometry x:Key="PaginationFastForwardGlyph">M4.38153 4.39653C4.89024 3.86782 5.71502 3.86782 6.22373 4.39653L12.6185 11.0427C13.1272 11.5714 13.1272 12.4286 12.6185 12.9573L6.22373 19.6035C5.71502 20.1322 4.89024 20.1322 4.38153 19.6035C3.87282 19.0748 3.87282 18.2176 4.38153 17.6888L9.85517 12L4.38153 6.31116C3.87282 5.78245 3.87282 4.92524 4.38153 4.39653Z M11.3815 4.39653C11.8902 3.86782 12.715 3.86782 13.2237 4.39653L19.6185 11.0427C20.1272 11.5714 20.1272 12.4286 19.6185 12.9573L13.2237 19.6035C12.715 20.1322 11.8902 20.1322 11.3815 19.6035C10.8728 19.0748 10.8728 18.2176 11.3815 17.6888L16.8552 12L11.3815 6.31116C10.8728 5.78245 10.8728 4.92524 11.3815 4.39653Z</PathGeometry>
-    <PathGeometry x:Key="PaginationForwardGlyph">M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z</PathGeometry>
-    <PathGeometry x:Key="PaginationBackwardGlyph">M16.2782 4.23933C16.864 4.82511 16.864 5.77486 16.2782 6.36065L10.6213 12.0175L16.2782 17.6744C16.864 18.2601 16.864 19.2099 16.2782 19.7957C15.6924 20.3815 14.7426 20.3815 14.1569 19.7957L7.43934 13.0782C6.85355 12.4924 6.85355 11.5426 7.43934 10.9568L14.1569 4.23933C14.7426 3.65354 15.6924 3.65354 16.2782 4.23933Z</PathGeometry>
-    <PathGeometry x:Key="PaginationMoreGlyph">M7 12C7 13.3807 5.88071 14.5 4.5 14.5C3.11929 14.5 2 13.3807 2 12C2 10.6193 3.11929 9.5 4.5 9.5C5.88071 9.5 7 10.6193 7 12Z M14.5 12C14.5 13.3807 13.3807 14.5 12 14.5C10.6193 14.5 9.5 13.3807 9.5 12C9.5 10.6193 10.6193 9.5 12 9.5C13.3807 9.5 14.5 10.6193 14.5 12Z M19.5 14.5C20.8807 14.5 22 13.3807 22 12C22 10.6193 20.8807 9.5 19.5 9.5C18.1193 9.5 17 10.6193 17 12C17 13.3807 18.1193 14.5 19.5 14.5Z</PathGeometry>
+    <StreamGeometry x:Key="PaginationFastBackwardGlyph">M12.6185 4.39653C13.1272 4.92524 13.1272 5.78245 12.6185 6.31116L7.14483 12L12.6185 17.6888C13.1272 18.2176 13.1272 19.0748 12.6185 19.6035C12.1098 20.1322 11.285 20.1322 10.7763 19.6035L4.38153 12.9573C3.87282 12.4286 3.87282 11.5714 4.38153 11.0427L10.7763 4.39653C11.285 3.86782 12.1098 3.86782 12.6185 4.39653Z M19.6185 4.39653C20.1272 4.92524 20.1272 5.78245 19.6185 6.31116L14.1448 12L19.6185 17.6888C20.1272 18.2176 20.1272 19.0748 19.6185 19.6035C19.1098 20.1322 18.285 20.1322 17.7763 19.6035L11.3815 12.9573C10.8728 12.4286 10.8728 11.5714 11.3815 11.0427L17.7763 4.39653C18.285 3.86782 19.1098 3.86782 19.6185 4.39653Z</StreamGeometry>
+    <StreamGeometry x:Key="PaginationFastForwardGlyph">M4.38153 4.39653C4.89024 3.86782 5.71502 3.86782 6.22373 4.39653L12.6185 11.0427C13.1272 11.5714 13.1272 12.4286 12.6185 12.9573L6.22373 19.6035C5.71502 20.1322 4.89024 20.1322 4.38153 19.6035C3.87282 19.0748 3.87282 18.2176 4.38153 17.6888L9.85517 12L4.38153 6.31116C3.87282 5.78245 3.87282 4.92524 4.38153 4.39653Z M11.3815 4.39653C11.8902 3.86782 12.715 3.86782 13.2237 4.39653L19.6185 11.0427C20.1272 11.5714 20.1272 12.4286 19.6185 12.9573L13.2237 19.6035C12.715 20.1322 11.8902 20.1322 11.3815 19.6035C10.8728 19.0748 10.8728 18.2176 11.3815 17.6888L16.8552 12L11.3815 6.31116C10.8728 5.78245 10.8728 4.92524 11.3815 4.39653Z</StreamGeometry>
+    <StreamGeometry x:Key="PaginationForwardGlyph">M7.43934 19.7957C6.85355 19.2099 6.85355 18.2601 7.43934 17.6744L13.0962 12.0175L7.43934 6.36065C6.85355 5.77486 6.85355 4.82511 7.43934 4.23933C8.02513 3.65354 8.97487 3.65354 9.56066 4.23933L16.2782 10.9568C16.864 11.5426 16.864 12.4924 16.2782 13.0782L9.56066 19.7957C8.97487 20.3815 8.02513 20.3815 7.43934 19.7957Z</StreamGeometry>
+    <StreamGeometry x:Key="PaginationBackwardGlyph">M16.2782 4.23933C16.864 4.82511 16.864 5.77486 16.2782 6.36065L10.6213 12.0175L16.2782 17.6744C16.864 18.2601 16.864 19.2099 16.2782 19.7957C15.6924 20.3815 14.7426 20.3815 14.1569 19.7957L7.43934 13.0782C6.85355 12.4924 6.85355 11.5426 7.43934 10.9568L14.1569 4.23933C14.7426 3.65354 15.6924 3.65354 16.2782 4.23933Z</StreamGeometry>
+    <StreamGeometry x:Key="PaginationMoreGlyph">M7 12C7 13.3807 5.88071 14.5 4.5 14.5C3.11929 14.5 2 13.3807 2 12C2 10.6193 3.11929 9.5 4.5 9.5C5.88071 9.5 7 10.6193 7 12Z M14.5 12C14.5 13.3807 13.3807 14.5 12 14.5C10.6193 14.5 9.5 13.3807 9.5 12C9.5 10.6193 10.6193 9.5 12 9.5C13.3807 9.5 14.5 10.6193 14.5 12Z M19.5 14.5C20.8807 14.5 22 13.3807 22 12C22 10.6193 20.8807 9.5 19.5 9.5C18.1193 9.5 17 10.6193 17 12C17 13.3807 18.1193 14.5 19.5 14.5Z</StreamGeometry>
 </ResourceDictionary>

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

@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <StreamGeometry x:Key="ScrollToButtonIconGlyph">M19.637 16.4369C19.0513 17.0227 18.1015 17.0227 17.5157 16.4369L11.8589 10.7801L6.20202 16.4369C5.61623 17.0227 4.66648 17.0227 4.0807 16.4369C3.49491 15.8511 3.49491 14.9014 4.0807 14.3156L10.7982 7.59809C11.384 7.01231 12.3337 7.01231 12.9195 7.59809L19.637 14.3156C20.2228 14.9014 20.2228 15.8511 19.637 16.4369Z</StreamGeometry>
+</ResourceDictionary>

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

@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!--  Add Resources Here  -->
+</ResourceDictionary>

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

@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
-    <PathGeometry x:Key="ClosableTagCloseIconGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</PathGeometry>
+    <StreamGeometry x:Key="ClosableTagCloseIconGlyph">M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z</StreamGeometry>
     <x:Double x:Key="TagInputDefaultHeight">32</x:Double>
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Shared/ThemeSelector.axaml

@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <StreamGeometry x:Key="ThemeSelectorButtonDarkGlyph">M9,2C7.95,2 6.95,2.16 6,2.46C10.06,3.73 13,7.5 13,12C13,16.5 10.06,20.27 6,21.54C6.95,21.84 7.95,22 9,22A10,10 0 0,0 19,12A10,10 0 0,0 9,2Z</StreamGeometry>
+    <StreamGeometry x:Key="ThemeSelectorButtonLightGlyph">M12,8A4,4 0 0,0 8,12A4,4 0 0,0 12,16A4,4 0 0,0 16,12A4,4 0 0,0 12,8M12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6A6,6 0 0,1 18,12A6,6 0 0,1 12,18M20,8.69V4H15.31L12,0.69L8.69,4H4V8.69L0.69,12L4,15.31V20H8.69L12,23.31L15.31,20H20V15.31L23.31,12L20,8.69Z</StreamGeometry>
+    <StreamGeometry x:Key="ThemeSelectorButtonDefaultGlyph">M12,18V6A6,6 0 0,1 18,12A6,6 0 0,1 12,18M20,15.31L23.31,12L20,8.69V4H15.31L12,0.69L8.69,4H4V8.69L0.69,12L4,15.31V20H8.69L12,23.31L15.31,20H20V15.31Z</StreamGeometry>
+</ResourceDictionary>

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

@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <x:Double x:Key="TimeBoxDefaultMinHeight">32</x:Double>
+    <x:Double x:Key="TimeBoxSmallMinHeight">24</x:Double>
+    <x:Double x:Key="TimeBoxLargeMinHeight">40</x:Double>
+    <Thickness x:Key="TimeBoxBorderThickness">1</Thickness>
+    <CornerRadius x:Key="TimeBoxCornerRadius">3</CornerRadius>
+</ResourceDictionary>

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

@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <StreamGeometry x:Key="ToolBarHorizontalMoreGlyph">M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z</StreamGeometry>
+    <StreamGeometry x:Key="ToolBarVerticalMoreGlyph">M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z</StreamGeometry>
+</ResourceDictionary>

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

@@ -4,12 +4,20 @@
         <MergeResourceInclude Source="Badge.axaml" />
         <MergeResourceInclude Source="Banner.axaml" />
         <MergeResourceInclude Source="ButtonGroup.axaml" />
+        <MergeResourceInclude Source="Dialog.axaml" />
+        <MergeResourceInclude Source="DialogShared.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="DualBadge.axaml" />
         <MergeResourceInclude Source="IPv4Box.axaml" />
         <MergeResourceInclude Source="KeyGestureInput.axaml" />
+        <MergeResourceInclude Source="MessageBox.axaml" />
         <MergeResourceInclude Source="NavigationMenu.axaml" />
         <MergeResourceInclude Source="Pagination.axaml" />
+        <MergeResourceInclude Source="ScrollToButton.axaml" />
         <MergeResourceInclude Source="TagInput.axaml" />
+        <MergeResourceInclude Source="Skeleton.axaml" />
+        <MergeResourceInclude Source="ThemeSelector.axaml" />
+        <MergeResourceInclude Source="ToolBar.axaml" />
+        <MergeResourceInclude Source="TimeBox.axaml"/>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>

src/Ursa.Themes.Semi/Ursa.Themes.Semi.csproj

@@ -1,23 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <Import Project="../Package.props" />
+    <Import Project="../Package.props"/>
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <LangVersion>11</LangVersion>
-        <Version>0.1.0-beta20230702</Version>
+        <LangVersion>latest</LangVersion>
+        <Version>0.3.0-beta20240518</Version>
         <Authors>IRIHI Technology Co., Ltd.</Authors>
         <PackageId>Irihi.Ursa.Themes.Semi</PackageId>
+        <PackageIcon>irihi.png</PackageIcon>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageProjectUrl>https://github.com/irihitech/Ursa.Avalonia</PackageProjectUrl>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Ursa\Ursa.csproj" />
+        <ProjectReference Include="..\Ursa\Ursa.csproj"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <UpToDateCheckInput Remove="Controls\Skeleton.axaml"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="irihi.png" Pack="true" PackagePath=""/>
     </ItemGroup>
 
 </Project>

src/Ursa/AssemblyInfo.cs

@@ -3,3 +3,4 @@ using Avalonia.Metadata;
 [assembly:XmlnsPrefix("https://irihi.tech/ursa", "u")]
 [assembly:XmlnsDefinition("https://irihi.tech/ursa", "Ursa")]
 [assembly:XmlnsDefinition("https://irihi.tech/ursa", "Ursa.Controls")]
+[assembly:XmlnsDefinition("https://irihi.tech/ursa", "Ursa.Controls.Shapes")]

src/Ursa/Common/Position.cs

@@ -0,0 +1,9 @@
+namespace Ursa.Common;
+
+public enum Position
+{
+    Left,
+    Top,
+    Right,
+    Bottom,
+}

src/Ursa/Controls/Badge.cs

@@ -1,7 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
-using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
 using Avalonia.Media;
@@ -10,18 +9,14 @@ using Ursa.Common;
 
 namespace Ursa.Controls;
 
-[TemplatePart(PART_ContentPresenter, typeof(ContentPresenter))]
 [TemplatePart(PART_BadgeContainer, typeof(Border))]
-[TemplatePart(PART_BadgeContentPresenter, typeof(ContentPresenter))]
-public class Badge: ContentControl
+public class Badge: HeaderedContentControl
 {
     public const string PART_ContentPresenter = "PART_ContentPresenter";
     public const string PART_BadgeContainer = "PART_BadgeContainer";
-    public const string PART_BadgeContentPresenter = "PART_BadgeContentPresenter";
-    
-    private ContentPresenter? _content;
+    public const string PART_HeaderPresenter = "PART_HeaderPresenter";
+
     private Border? _badgeContainer;
-    private ContentPresenter? _badgeContent;
 
     public static readonly StyledProperty<ControlTheme> BadgeThemeProperty = AvaloniaProperty.Register<Badge, ControlTheme>(
         nameof(BadgeTheme));
@@ -39,14 +34,6 @@ public class Badge: ContentControl
         set => SetValue(DotProperty, value);
     }
 
-    public static readonly StyledProperty<object?> BadgeContentProperty = AvaloniaProperty.Register<Badge, object?>(
-        nameof(BadgeContent));
-    public object? BadgeContent
-    {
-        get => GetValue(BadgeContentProperty);
-        set => SetValue(BadgeContentProperty, value);
-    }
-
     public static readonly StyledProperty<CornerPosition> CornerPositionProperty = AvaloniaProperty.Register<Badge, CornerPosition>(
         nameof(CornerPosition));
     public CornerPosition CornerPosition
@@ -63,17 +50,24 @@ public class Badge: ContentControl
         set => SetValue(OverflowCountProperty, value);
     }
 
+    public static readonly StyledProperty<double> BadgeFontSizeProperty = AvaloniaProperty.Register<Badge, double>(
+        nameof(BadgeFontSize));
+
+    public double BadgeFontSize
+    {
+        get => GetValue(BadgeFontSizeProperty);
+        set => SetValue(BadgeFontSizeProperty, value);
+    }
+
     static Badge()
     {
-        BadgeContentProperty.Changed.AddClassHandler<Badge>((badge, args) => badge.UpdateBadgePosition());
+        HeaderProperty.Changed.AddClassHandler<Badge>((badge, args) => badge.UpdateBadgePosition());
     }
 
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        _content = e.NameScope.Find<ContentPresenter>(PART_ContentPresenter);
         _badgeContainer = e.NameScope.Find<Border>(PART_BadgeContainer);
-        _badgeContent = e.NameScope.Find<ContentPresenter>(PART_BadgeContentPresenter);
     }
 
     protected override void OnLoaded(RoutedEventArgs e)
@@ -92,7 +86,7 @@ public class Badge: ContentControl
     {
         var vertical = CornerPosition is CornerPosition.BottomLeft or CornerPosition.BottomRight ? 1 : -1;
         var horizontal = CornerPosition is CornerPosition.TopRight or CornerPosition.BottomRight ? 1 : -1;
-        if (_badgeContainer is not null && _content?.Child is not null)
+        if (_badgeContainer is not null && base.Presenter?.Child is not null)
         {
             _badgeContainer.RenderTransform = new TransformGroup()
             {

src/Ursa/Controls/Banner/Banner.cs

@@ -6,6 +6,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Interactivity;
 using Avalonia.Metadata;
+using Irihi.Avalonia.Shared.Helpers;
 
 namespace Ursa.Controls;
 
@@ -57,16 +58,9 @@ public class Banner: HeaderedContentControl
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        if (_closeButton != null)
-        {
-            _closeButton.Click -= OnCloseClick;
-        }
+        Button.ClickEvent.RemoveHandler(OnCloseClick, _closeButton);
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
-        if (_closeButton != null)
-        {
-            _closeButton.Click += OnCloseClick;
-        }
-        
+        Button.ClickEvent.AddHandler(OnCloseClick, _closeButton);
     }
 
     private void OnCloseClick(object sender, RoutedEventArgs args)

src/Ursa/Controls/Breadcrumb/Breadcrumb.cs

@@ -0,0 +1,128 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Layout;
+using Avalonia.Metadata;
+
+namespace Ursa.Controls;
+
+public class Breadcrumb: ItemsControl
+{
+    private static readonly ITemplate<Panel?> _defaultPanel =
+        new FuncTemplate<Panel?>(() => new StackPanel() { Orientation = Orientation.Horizontal });
+    
+    
+    public static readonly StyledProperty<IBinding?> IconBindingProperty = AvaloniaProperty.Register<Breadcrumb, IBinding?>(
+        nameof(IconBinding));
+
+    [AssignBinding]
+    [InheritDataTypeFromItems(nameof(ItemsSource))]
+    public IBinding? IconBinding
+    {
+        get => GetValue(IconBindingProperty);
+        set => SetValue(IconBindingProperty, value);
+    }
+
+    public static readonly StyledProperty<IBinding?> CommandBindingProperty = AvaloniaProperty.Register<Breadcrumb, IBinding?>(
+        nameof(CommandBinding));
+
+    [AssignBinding]
+    [InheritDataTypeFromItems(nameof(ItemsSource))]
+    public IBinding? CommandBinding
+    {
+        get => GetValue(CommandBindingProperty);
+        set => SetValue(CommandBindingProperty, value);
+    }
+
+    public static readonly StyledProperty<object?> SeparatorProperty = AvaloniaProperty.Register<Breadcrumb, object?>(
+        nameof(Separator));
+
+    /// <summary>
+    /// Separator between items.
+    /// Usage: Separator can only be raw string or ITemplate&lt;Control&gt;.
+    /// </summary>
+    public object? Separator
+    {
+        get => GetValue(SeparatorProperty);
+        set => SetValue(SeparatorProperty, value);
+    }
+
+    public static readonly StyledProperty<IDataTemplate?> IconTemplateProperty = AvaloniaProperty.Register<Breadcrumb, IDataTemplate?>(
+        nameof(IconTemplate));
+
+    public IDataTemplate? IconTemplate
+    {
+        get => GetValue(IconTemplateProperty);
+        set => SetValue(IconTemplateProperty, value);
+    }
+    
+    static Breadcrumb()
+    {
+        ItemsPanelProperty.OverrideDefaultValue<Breadcrumb>(_defaultPanel);
+    }
+    
+    protected override bool NeedsContainerOverride(object? item, int index, out object? recycleKey)
+    {
+        return NeedsContainer<BreadcrumbItem>(item, out recycleKey);
+    }
+
+    protected override Control CreateContainerForItemOverride(object? item, int index, object? recycleKey)
+    {
+        return new BreadcrumbItem();
+    }
+
+    protected override void PrepareContainerForItemOverride(Control container, object? item, int index)
+    {
+        // base.PrepareContainerForItemOverride(container, item, index);
+        if (container is not BreadcrumbItem breadcrumbItem) return;
+        if (!breadcrumbItem.IsSet(BreadcrumbItem.SeparatorProperty))
+        {
+            if (GetSeparatorInstance(Separator) is { } a)
+            {
+                breadcrumbItem.Separator = a;
+            }
+            SeparatorProperty.Changed.AddClassHandler<Breadcrumb, object?>((_, args) =>
+            {
+                if (GetSeparatorInstance(args.NewValue.Value) is { } b)
+                    breadcrumbItem.Separator = b;
+            });
+        }
+
+        PseudolassesExtensions.Set(container.Classes, BreadcrumbItem.PC_Last, index == ItemCount - 1);
+
+        if (container == item) return;
+        if(!breadcrumbItem.IsSet(ContentControl.ContentProperty))
+        {
+            breadcrumbItem.SetCurrentValue(ContentControl.ContentProperty, item);
+            if (DisplayMemberBinding is not null)
+            {
+                breadcrumbItem[!ContentControl.ContentProperty] = DisplayMemberBinding;
+            }
+        }
+        if (!breadcrumbItem.IsSet(ContentControl.ContentTemplateProperty) && this.ItemTemplate != null)
+        {
+            breadcrumbItem.SetCurrentValue(ContentControl.ContentTemplateProperty, this.ItemTemplate);
+        }
+        if (!breadcrumbItem.IsSet(BreadcrumbItem.IconProperty) && IconBinding != null)
+        {
+            breadcrumbItem[!BreadcrumbItem.IconProperty] = IconBinding;
+        }
+        if (!breadcrumbItem.IsSet(BreadcrumbItem.CommandProperty) && CommandBinding != null)
+        {
+            breadcrumbItem[!BreadcrumbItem.CommandProperty] = CommandBinding;
+        }
+        if (!breadcrumbItem.IsSet(BreadcrumbItem.IconTemplateProperty) && IconTemplate != null)
+        {
+            breadcrumbItem.IconTemplate = IconTemplate;
+        }
+    }
+
+    private static object? GetSeparatorInstance(object? separator) => separator switch
+    {
+        null => null,
+        string s => s,
+        ITemplate<Control?> t => t.Build(),
+        _ => separator.ToString()
+    };
+}

src/Ursa/Controls/Breadcrumb/BreadcrumbItem.cs

@@ -0,0 +1,69 @@
+using System.Windows.Input;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.LogicalTree;
+
+namespace Ursa.Controls;
+
+[PseudoClasses(PC_Last)]
+public class BreadcrumbItem: ContentControl
+{
+    public const string PC_Last = ":last";
+    public static readonly StyledProperty<object?> SeparatorProperty =
+        AvaloniaProperty.Register<BreadcrumbItem, object?>(
+            nameof(Separator));
+
+    public object? Separator
+    {
+        get => GetValue(SeparatorProperty);
+        set => SetValue(SeparatorProperty, value);
+    }
+
+    public static readonly StyledProperty<object?> IconProperty = AvaloniaProperty.Register<BreadcrumbItem, object?>(
+        nameof(Icon));
+
+    public object? Icon
+    {
+        get => GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+
+    public static readonly StyledProperty<ICommand?> CommandProperty = AvaloniaProperty.Register<BreadcrumbItem, ICommand?>(
+        nameof(Command));
+
+    public ICommand? Command
+    {
+        get => GetValue(CommandProperty);
+        set => SetValue(CommandProperty, value);
+    }
+
+    public static readonly StyledProperty<IDataTemplate?> IconTemplateProperty = AvaloniaProperty.Register<BreadcrumbItem, IDataTemplate?>(
+        nameof(IconTemplate));
+
+    public IDataTemplate? IconTemplate
+    {
+        get => GetValue(IconTemplateProperty);
+        set => SetValue(IconTemplateProperty, value);
+    }
+
+    public static readonly StyledProperty<bool> IsReadOnlyProperty = AvaloniaProperty.Register<BreadcrumbItem, bool>(
+        nameof(IsReadOnly));
+
+    public bool IsReadOnly
+    {
+        get => GetValue(IsReadOnlyProperty);
+        set => SetValue(IsReadOnlyProperty, value);
+    }
+
+    protected override void OnPointerPressed(PointerPressedEventArgs e)
+    {
+        base.OnPointerPressed(e);
+        if (!IsReadOnly)
+        {
+            Command?.Execute(null);
+        }
+    }
+}

src/Ursa/Controls/ButtonGroup.cs

@@ -1,23 +0,0 @@
-using System.Net.Http.Headers;
-using Avalonia;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Media;
-using Avalonia.Metadata;
-
-namespace Ursa.Controls;
-
-public class ButtonGroup: ItemsControl
-{
-    protected override bool NeedsContainerOverride(object? item, int index, out object? recycleKey)
-    {
-        recycleKey = null;
-        return item is not Button;
-    }
-
-    protected override Control CreateContainerForItemOverride(object? item, int index, object? recycleKey)
-    {
-        return new Button();
-    }
-}