Merge pull request #428 from irihitech/aqua

HighContrast themes

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

@@ -4,10 +4,10 @@
     xmlns:u="https://irihi.tech/ursa">
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:Banner}" TargetType="u:Banner">
-        <Setter Property="u:Banner.BorderThickness" Value="{DynamicResource BannerBorderThickness}" />
-        <Setter Property="u:Banner.BorderBrush" Value="Transparent" />
-        <Setter Property="u:Banner.HorizontalContentAlignment" Value="Center" />
-        <Setter Property="u:Banner.Template">
+        <Setter Property="BorderThickness" Value="{DynamicResource BannerBorderThickness}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource BannerBorderBrush}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:Banner">
                 <Border
                     Name="PART_Container"

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

@@ -31,7 +31,7 @@
                             VerticalAlignment="Center"
                             Content="{TemplateBinding Icon}"
                             ContentTemplate="{TemplateBinding IconTemplate}"
-                            Foreground="{DynamicResource SemiColorText2}"
+                            Foreground="{DynamicResource BreadcrumbItemForeground}"
                             IsVisible="{TemplateBinding Icon,
                                                         Converter={x:Static ObjectConverters.IsNotNull}}" />
                         <ContentPresenter
@@ -39,14 +39,14 @@
                             VerticalAlignment="Center"
                             Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Foreground="{DynamicResource SemiColorText2}"
+                            Foreground="{DynamicResource BreadcrumbItemForeground}"
                             IsVisible="{TemplateBinding Content,
                                                         Converter={x:Static ObjectConverters.IsNotNull}}" />
                         <ContentPresenter
                             Name="Separator"
                             VerticalAlignment="Center"
                             Content="{TemplateBinding Separator}"
-                            Foreground="{DynamicResource SemiColorText3}">
+                            Foreground="{DynamicResource BreadcrumbItemSeparatorForeground}">
                             <ContentPresenter.IsVisible>
                                 <TemplateBinding Converter="{x:Static ObjectConverters.IsNotNull}" Property="Separator" />
                             </ContentPresenter.IsVisible>
@@ -56,20 +56,20 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-            <Setter Property="Margin" Value="0 0 4 0"></Setter>
+            <Setter Property="Margin" Value="0 0 4 0" />
         </Style>
         <Style Selector="^ /template/ ContentPresenter#Separator">
-            <Setter Property="Margin" Value="4 0"></Setter>
+            <Setter Property="Margin" Value="4 0" />
         </Style>
         <Style Selector="^[IsReadOnly=False]">
-            <Setter Property="Cursor" Value="Hand"></Setter>
+            <Setter Property="Cursor" Value="Hand" />
         </Style>
         <Style Selector="^:last">
             <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource SemiColorText0}" />
+                <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemLastForeground}" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource SemiColorText0}" />
+                <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemLastForeground}" />
                 <Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#Separator">
@@ -77,19 +77,19 @@
             </Style>
             <Style Selector="^[IsReadOnly=False]:pointerover">
                 <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-                    <Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" />
+                    <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemPointeroverForeground}" />
                 </Style>
                 <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                    <Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" />
+                    <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemPointeroverForeground}" />
                 </Style>
             </Style>
         </Style>
         <Style Selector="^[IsReadOnly=False]:pointerover">
             <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" />
+                <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemPointeroverForeground}" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" />
+                <Setter Property="Foreground" Value="{DynamicResource BreadcrumbItemPointeroverForeground}" />
             </Style>
         </Style>
     </ControlTheme>

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

@@ -16,13 +16,13 @@
         <Setter Property="Background" Value="{DynamicResource ButtonGroupDefaultBackground}" />
         <Setter Property="CornerRadius" Value="3" />
         <Setter Property="ClipToBounds" Value="True" />
-        <Setter Property="u:ButtonGroup.ItemContainerTheme" Value="{DynamicResource ButtonGroupItemTheme}" />
-        <Setter Property="u:ButtonGroup.ItemsPanel">
+        <Setter Property="ItemContainerTheme" Value="{DynamicResource ButtonGroupItemTheme}" />
+        <Setter Property="ItemsPanel">
             <ItemsPanelTemplate>
                 <StackPanel Orientation="Horizontal" />
             </ItemsPanelTemplate>
         </Setter>
-        <Setter Property="u:ButtonGroup.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:ButtonGroup">
                 <Border
                     Background="{TemplateBinding Background}"
@@ -43,7 +43,7 @@
         <Setter Property="Padding" Value="{DynamicResource ButtonGroupDefaultPadding}" />
         <Setter Property="FontWeight" Value="{DynamicResource ButtonGroupDefaultFontWeight}" />
         <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Button.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="Button">
                 <DockPanel LastChildFill="True">
                     <Rectangle

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

@@ -14,6 +14,7 @@
         <Setter Property="MinWidth" Value="{DynamicResource CalenderDayMinWidth}" />
         <Setter Property="MinHeight" Value="{DynamicResource CalenderDayMinHeight}" />
         <Setter Property="Margin" Value="{DynamicResource CalenderDayMargin}" />
+        <Setter Property="Foreground" Value="{DynamicResource CalendarItemCalendarDayButtonForeground}" />
         <Setter Property="Background" Value="{DynamicResource CalenderDayBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayBorderBrush}" />
         <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayBorderThickness}" />
@@ -43,6 +44,7 @@
             <Setter Property="Background" Value="{DynamicResource CalenderDayInRangeBackground}" />
             <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayInRangeCornerRadius}" />
             <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayNoBorderThickness}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
         </Style>
 
         <Style Selector="^:today">
@@ -143,7 +145,7 @@
 
     <ControlTheme x:Key="{x:Type u:CalendarYearButton}" TargetType="u:CalendarYearButton">
         <Setter Property="MinWidth" Value="{DynamicResource CalenderYearMinWidth}" />
-        <Setter Property="MinHeight" Value="{DynamicResource CalenderYearMinHeight }" />
+        <Setter Property="MinHeight" Value="{DynamicResource CalenderYearMinHeight}" />
         <Setter Property="Margin" Value="{DynamicResource CalenderYearMargin}" />
         <Setter Property="Background" Value="{DynamicResource CalenderYearBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CalenderYearBorderBrush}" />

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

@@ -5,7 +5,7 @@
     xmlns:u="https://irihi.tech/ursa">
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:Clock}" TargetType="u:Clock">
-        <Setter Property="HandBrush" Value="{DynamicResource SemiGrey6}"/>
+        <Setter Property="HandBrush" Value="{DynamicResource ClockHandBrush}"/>
         <Setter Property="Template">
             <ControlTemplate TargetType="u:Clock">
                 <Grid>
@@ -13,8 +13,8 @@
                         ShowHourTicks="{TemplateBinding ShowHourTicks}"
                         ShowMinuteTicks="{TemplateBinding ShowMinuteTicks}"
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        HourTickForeground="{DynamicResource SemiGrey6}"
-                        MinuteTickForeground="{DynamicResource SemiGrey4}" />
+                        HourTickForeground="{DynamicResource ClockHourTickForeground}"
+                        MinuteTickForeground="{DynamicResource ClockMinuteTickForeground}" />
                     <UniformGrid Rows="2" IsVisible="{TemplateBinding ShowHourHand}">
                         <Border
                             Width="16"
@@ -51,8 +51,8 @@
                     <Ellipse
                         Width="20"
                         Height="20"
-                        Fill="White"
-                        Stroke="{DynamicResource SemiBlue5}"
+                        Fill="{DynamicResource ClockArborFill}"
+                        Stroke="{DynamicResource ClockArborStroke}"
                         StrokeThickness="3" />
                 </Grid>
             </ControlTemplate>

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

@@ -7,7 +7,7 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DisableContainer">
                 <Panel>
-                    <ContentPresenter Content="{TemplateBinding Content}"></ContentPresenter>
+                    <ContentPresenter Content="{TemplateBinding Content}" />
                     <iri:PureRectangle Background="Transparent" IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content.IsEnabled, Converter={x:Static BoolConverters.Not}}" Cursor="No" ToolTip.Tip="{TemplateBinding DisabledTip}"/>
                 </Panel>
             </ControlTemplate>

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

@@ -9,28 +9,28 @@
     </Design.PreviewWith>
     <!--  Add Resources Here  -->
     <ControlTheme x:Key="DividerLeftLine" TargetType="{x:Type Rectangle}">
-        <Setter Property="Rectangle.Fill" Value="{DynamicResource DividerBorderBrush}" />
-        <Setter Property="Rectangle.Height" Value="{DynamicResource SizeDividerWidth}" />
-        <Setter Property="Rectangle.MinWidth" Value="{DynamicResource SizeDividerLeftMinWidth}" />
+        <Setter Property="Fill" Value="{DynamicResource DividerBorderBrush}" />
+        <Setter Property="Height" Value="{DynamicResource SizeDividerWidth}" />
+        <Setter Property="MinWidth" Value="{DynamicResource SizeDividerLeftMinWidth}" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </ControlTheme>
 
     <ControlTheme x:Key="DividerRightLine" TargetType="{x:Type Rectangle}">
-        <Setter Property="Rectangle.Fill" Value="{DynamicResource DividerBorderBrush}" />
-        <Setter Property="Rectangle.Height" Value="{DynamicResource SizeDividerWidth}" />
-        <Setter Property="Rectangle.MinWidth" Value="{DynamicResource SizeDividerRightMinWidth}" />
+        <Setter Property="Fill" Value="{DynamicResource DividerBorderBrush}" />
+        <Setter Property="Height" Value="{DynamicResource SizeDividerWidth}" />
+        <Setter Property="MinWidth" Value="{DynamicResource SizeDividerRightMinWidth}" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </ControlTheme>
 
     <ControlTheme x:Key="DividerContentPresenter" TargetType="{x:Type ContentPresenter}">
-        <Setter Property="ContentPresenter.Content" Value="{TemplateBinding Content}" />
-        <Setter Property="ContentPresenter.Background" Value="{TemplateBinding Background}" />
-        <Setter Property="TextElement.Foreground" Value="{TemplateBinding Foreground}" />
-        <Setter Property="ContentPresenter.ContentTemplate" Value="{TemplateBinding ContentTemplate}" />
-        <Setter Property="TextElement.FontFamily" Value="{TemplateBinding FontFamily}" />
-        <Setter Property="TextElement.FontWeight" Value="{TemplateBinding FontWeight}" />
-        <Setter Property="TextElement.FontSize" Value="{TemplateBinding FontSize}" />
-        <Setter Property="ContentPresenter.Margin" Value="{DynamicResource ThicknessDividerTextMargin}" />
+        <Setter Property="Content" Value="{TemplateBinding Content}" />
+        <Setter Property="Background" Value="{TemplateBinding Background}" />
+        <Setter Property="Foreground" Value="{TemplateBinding Foreground}" />
+        <Setter Property="ContentTemplate" Value="{TemplateBinding ContentTemplate}" />
+        <Setter Property="FontFamily" Value="{TemplateBinding FontFamily}" />
+        <Setter Property="FontWeight" Value="{TemplateBinding FontWeight}" />
+        <Setter Property="FontSize" Value="{TemplateBinding FontSize}" />
+        <Setter Property="Margin" Value="{DynamicResource ThicknessDividerTextMargin}" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </ControlTheme>
 
@@ -123,4 +123,4 @@
             </Setter>
         </Style>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

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

@@ -4,19 +4,19 @@
     xmlns:u="https://irihi.tech/ursa"
     xmlns:converters="clr-namespace:Ursa.Converters;assembly=Ursa">
     <ControlTheme x:Key="{x:Type u:DualBadge}" TargetType="u:DualBadge">
-        <Setter Property="u:DualBadge.CornerRadius" Value="{DynamicResource DualBadgeDefaultCornerRadius}" />
-        <Setter Property="u:DualBadge.FontSize" Value="{DynamicResource DualBadgeDefaultFontSize}" />
-        <Setter Property="u:DualBadge.IconForeground" Value="{DynamicResource DualBadgeDefaultIconForeground}" />
-        <Setter Property="u:DualBadge.HeaderForeground" Value="{DynamicResource DualBadgeDefaultHeaderForeground}" />
-        <Setter Property="u:DualBadge.HeaderBackground" Value="{DynamicResource DualBadgeDefaultHeaderBackground}" />
-        <Setter Property="u:DualBadge.Foreground" Value="{DynamicResource DualBadgeDefaultForeground}" />
-        <Setter Property="u:DualBadge.Background" Value="{DynamicResource DualBadgeFlatGreenBackground}" />
-        <Setter Property="u:DualBadge.ClipToBounds" Value="{DynamicResource DualBadgeDefaultClipToBounds}" />
-        <Setter Property="u:DualBadge.HorizontalAlignment" Value="{DynamicResource DualBadgeDefaultHorizontalAlignment}" />
-        <Setter Property="u:DualBadge.VerticalAlignment" Value="{DynamicResource DualBadgeDefaultVerticalAlignment}" />
-        <Setter Property="u:DualBadge.UseLayoutRounding" Value="{DynamicResource DualBadgeDefaultUseLayoutRounding}" />
-        <Setter Property="u:DualBadge.Padding" Value="{DynamicResource DualBadgeDefaultPadding}" />
-        <Setter Property="u:DualBadge.Template">
+        <Setter Property="CornerRadius" Value="{DynamicResource DualBadgeDefaultCornerRadius}" />
+        <Setter Property="FontSize" Value="{DynamicResource DualBadgeDefaultFontSize}" />
+        <Setter Property="IconForeground" Value="{DynamicResource DualBadgeDefaultIconForeground}" />
+        <Setter Property="HeaderForeground" Value="{DynamicResource DualBadgeDefaultHeaderForeground}" />
+        <Setter Property="HeaderBackground" Value="{DynamicResource DualBadgeDefaultHeaderBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource DualBadgeDefaultForeground}" />
+        <Setter Property="Background" Value="{DynamicResource DualBadgeFlatGreenBackground}" />
+        <Setter Property="ClipToBounds" Value="{DynamicResource DualBadgeDefaultClipToBounds}" />
+        <Setter Property="HorizontalAlignment" Value="{DynamicResource DualBadgeDefaultHorizontalAlignment}" />
+        <Setter Property="VerticalAlignment" Value="{DynamicResource DualBadgeDefaultVerticalAlignment}" />
+        <Setter Property="UseLayoutRounding" Value="{DynamicResource DualBadgeDefaultUseLayoutRounding}" />
+        <Setter Property="Padding" Value="{DynamicResource DualBadgeDefaultPadding}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="{x:Type u:DualBadge}">
                 <Border
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"

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

@@ -21,14 +21,14 @@
         <Style Selector="^[DisplayDescription=True] /template/ ComboBox">
             <Setter Property="ItemTemplate">
                 <DataTemplate x:DataType="u:EnumItemTuple">
-                    <TextBlock Text="{Binding DisplayName}"></TextBlock>
+                    <TextBlock Text="{Binding DisplayName}" />
                 </DataTemplate>
             </Setter>
         </Style>
         <Style Selector="^[DisplayDescription=False] /template/ ComboBox">
             <Setter Property="ItemTemplate">
                 <DataTemplate x:DataType="u:EnumItemTuple">
-                    <TextBlock Text="{Binding Value}"></TextBlock>
+                    <TextBlock Text="{Binding Value}" />
                 </DataTemplate>
             </Setter>
         </Style>

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

@@ -38,7 +38,7 @@
                         Height="1"
                         Margin="0,8"
                         HorizontalAlignment="Stretch"
-                        Fill="{DynamicResource SemiColorBorder}"
+                        Fill="{DynamicResource FormGroupForeground}"
                         IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Header, Converter={x:Static ObjectConverters.IsNotNull}}" />
                     <ItemsPresenter
                         ItemsPanel="{TemplateBinding ItemsPanel}" />
@@ -64,7 +64,7 @@
                             FontWeight="{DynamicResource TextBlockTitleFontWeight}"
                             Target="{Binding #PART_ContentPresenter.Content}" />
                         <TextBlock
-                            Foreground="{DynamicResource SemiRed6}"
+                            Foreground="{DynamicResource FormAsteriskForeground}"
                             IsVisible="{TemplateBinding IsRequired}"
                             Text="*" />
                     </StackPanel>
@@ -100,7 +100,7 @@
                                     FontWeight="{DynamicResource TextBlockTitleFontWeight}"
                                     Target="{Binding #PART_ContentPresenter.Content}" />
                                 <TextBlock
-                                    Foreground="{DynamicResource SemiRed6}"
+                                    Foreground="{DynamicResource FormAsteriskForeground}"
                                     IsVisible="{TemplateBinding IsRequired}"
                                     Text="*" />
                             </StackPanel>

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

@@ -30,20 +30,21 @@
             Header="Clear" />
     </MenuFlyout>
     <ControlTheme x:Key="{x:Type u:IPv4Box}" TargetType="{x:Type u:IPv4Box}">
-        <Setter Property="u:IPv4Box.Focusable" Value="True" />
-        <Setter Property="u:IPv4Box.ShowLeadingZero" Value="True" />
-        <Setter Property="u:IPv4Box.TextAlignment" Value="Center" />
-        <Setter Property="u:IPv4Box.HorizontalAlignment" Value="Left" />
-        <Setter Property="u:IPv4Box.CornerRadius" Value="{DynamicResource IPv4BoxCornerRadius}" />
-        <Setter Property="u:IPv4Box.Background" Value="{DynamicResource IPv4BoxBackground}" />
-        <Setter Property="u:IPv4Box.MinHeight" Value="{DynamicResource IPv4BoxDefaultMinHeight}" />
-        <Setter Property="u:IPv4Box.BorderThickness" Value="{DynamicResource IPv4BoxBorderThickness}" />
-        <Setter Property="u:IPv4Box.SelectionBrush" Value="{DynamicResource IPv4BoxSelectionBrush}" />
-        <Setter Property="u:IPv4Box.SelectionForegroundBrush" Value="{DynamicResource IPv4BoxSelectionForeground}" />
-        <Setter Property="u:IPv4Box.CaretBrush" Value="{DynamicResource IPv4BoxCaretBrush}" />
-        <Setter Property="u:IPv4Box.ContextFlyout" Value="{DynamicResource IPv4BoxMenuFlyout}" />
-        <Setter Property="FocusAdorner" Value="{x:Null}"></Setter>
-        <Setter Property="u:IPv4Box.Template">
+        <Setter Property="Focusable" Value="True" />
+        <Setter Property="ShowLeadingZero" Value="True" />
+        <Setter Property="TextAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
+        <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
+        <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
+        <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
+        <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
+        <Setter Property="ContextFlyout" Value="{DynamicResource IPv4BoxMenuFlyout}" />
+        <Setter Property="FocusAdorner" Value="{x:Null}" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:IPv4Box">
                 <Border
                     Name="PART_Border"
@@ -113,17 +114,20 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:pointerover /template/ Border#PART_Border">
-            <Setter Property="Background" Value="{DynamicResource IPv4BoxPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:pressed /template/ Border#PART_Border">
             <Setter Property="Background" Value="{DynamicResource IPv4BoxPressedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource  TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:focus-within">
-            <Setter Property="Border.BorderBrush" Value="{DynamicResource IPv4BoxFocusBorderBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Background" Value="{DynamicResource IPv4BoxDisabledBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource SemiColorDisabledText}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TextBoxDisabledForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

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

@@ -109,7 +109,7 @@
         </Style>
         
         <Style Selector="^:empty[IsLoading=False] /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Margin" Value="0"></Setter>
+            <Setter Property="Margin" Value="0" />
         </Style>
 
         <Style Selector="^:right">

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

@@ -7,13 +7,12 @@
     <converters:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
 
     <ControlTheme x:Key="{x:Type u:KeyGestureInput}" TargetType="u:KeyGestureInput">
-        <Setter Property="MinWidth" Value="{DynamicResource KeyGestureInputWidth}" />
-        <Setter Property="MinHeight" Value="{DynamicResource KeyGestureInputHeight}" />
-        <Setter Property="Background" Value="{DynamicResource KeyGestureInputBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource KeyGestureInputBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource KeyGestureInputBorderThickness}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource KeyGestureInputCornerRadius}" />
-        <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
+        <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
+        <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="8 0" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:KeyGestureInput">
@@ -67,18 +66,18 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:pointerover /template/ Border#Background">
-            <Setter Property="Background" Value="{DynamicResource KeyGestureInputPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:pressed /template/ Border#Background">
-            <Setter Property="Background" Value="{DynamicResource KeyGestureInputPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxPressedBackground}" />
         </Style>
         <Style Selector="^:focus /template/ Border#Background">
-            <Setter Property="Background" Value="{DynamicResource KeyGestureInputPressedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource KeyGestureInputFocusBorderBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:focus-within /template/ Border#Background">
-            <Setter Property="Background" Value="{DynamicResource KeyGestureInputPressedBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource KeyGestureInputFocusBorderBrush}" />
+            <Setter Property="Background" Value="{DynamicResource TextBoxPressedBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
         </Style>
         <Style Selector="^:not(:empty).clearButton, ^:not(:empty).ClearButton">
             <Style Selector="^:focus /template/ Button#PART_ClearButton">

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

@@ -7,7 +7,7 @@
     <!--  Add Resources Here  -->
     <converters:BrushToColorConverter x:Key="BrushToColorConverter" />
     <ControlTheme x:Key="{x:Type u:LoadingIcon}" TargetType="u:LoadingIcon">
-        <Setter Property="IsLoading" Value="True"></Setter>
+        <Setter Property="IsLoading" Value="True" />
         <Setter Property="Foreground" Value="{DynamicResource LoadingIconForeground}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:LoadingIcon">

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

@@ -155,7 +155,7 @@
     <ControlTheme x:Key="{x:Type u:MessageBoxControl}" TargetType="u:MessageBoxControl">
         <Setter Property="CornerRadius" Value="12" />
         <Setter Property="Padding" Value="48 24" />
-        <Setter Property="u:DialogControlBase.CanDragMove" Value="True"></Setter>
+        <Setter Property="u:DialogControlBase.CanDragMove" Value="True" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:MessageBoxControl">
                 <Border

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

@@ -8,10 +8,10 @@
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
         <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
-        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="MaxDropdownHeight" Value="300" />
-        <Setter Property="MaxSelectionBoxHeight" Value="270"></Setter>
+        <Setter Property="MaxSelectionBoxHeight" Value="270" />
         <Setter Property="MinHeight" Value="32" />
         <Setter Property="Padding" Value="12 4" />
         <Setter Property="BorderThickness" Value="1" />
@@ -267,11 +267,13 @@
 
         <!--  Pointerover State  -->
         <Style Selector="^:pointerover">
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPointeroverForeground}" />
             <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
         </Style>
 
         <!--  Pressed State  -->
         <Style Selector="^:pressed">
+            <Setter Property="Foreground" Value="{DynamicResource ComboBoxItemPressedForeground}" />
             <Setter Property="Background" Value="{DynamicResource ListBoxItemPressedBackground}" />
         </Style>
 

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

@@ -19,11 +19,10 @@
                         HorizontalAlignment="Stretch"
                         HorizontalScrollBarVisibility="Disabled"
                         AllowAutoHide="True"
-                        
                         VerticalScrollBarVisibility="Auto">
                         <ScrollViewer.Styles>
                             <Style Selector="ScrollViewer /template/ ScrollBar">
-                                <Setter Property="Opacity" Value="0"></Setter>
+                                <Setter Property="Opacity" Value="0" />
                             </Style>
                             <Style Selector="ScrollViewer:pointerover">
                                 <Style Selector="^ /template/ ScrollBar#PART_HorizontalScrollBar">
@@ -40,11 +39,11 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:not(:horizontal-collapsed)">
-            <Setter Property="Width" Value="{Binding $self.ExpandWidth}"></Setter>
+            <Setter Property="Width" Value="{Binding $self.ExpandWidth}" />
         </Style>
         <Style Selector="^:horizontal-collapsed">
             <Setter Property="Width" Value="{Binding $self.CollapseWidth}" />
-            <Setter Property="Grid.IsSharedSizeScope" Value="False"></Setter>
+            <Setter Property="Grid.IsSharedSizeScope" Value="False" />
         </Style>
     </ControlTheme>
 
@@ -55,7 +54,8 @@
                 Grid.Row="0"
                 MinHeight="32"
                 HorizontalAlignment="Stretch"
-                Background="{TemplateBinding u:NavMenuItem.Background}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
                 CornerRadius="4"
                 Cursor="Hand">
                 <Grid
@@ -149,9 +149,11 @@
         </Setter>
         <Setter Property="Template" Value="{StaticResource DefaultNavMenuItemTemplate}" />
         <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource NavigationMenuItemSelectedBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}" />
+            <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedBackground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource NavigationMenuItemSelectedBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForeground}" />
+                <Setter Property="Background" Value="{DynamicResource ListBoxItemSelectedPointeroverBackground}" />
             </Style>
         </Style>
         <Style Selector="^:vertical-collapsed /template/ ItemsPresenter#PART_ItemsPresenter">
@@ -165,21 +167,25 @@
             <Setter Property="IsVisible" Value="False" />
         </Style>
         <Style Selector="^ /template/ Border#PART_Border:pointerover">
-            <Setter Property="Background" Value="{DynamicResource NavigationMenuItemPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
+        </Style>
+        <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter:pointerover">
+            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemPointeroverForeground}" />
         </Style>
         <Style Selector="^:horizontal-collapsed:first-level">
             <Setter Property="HorizontalAlignment" Value="Stretch" />
             <Style Selector="^ /template/ Border#PART_Border">
-                <Setter Property="ToolTip.Tip" >
+                <Setter Property="ToolTip.Tip">
                     <Template>
-                        <ContentPresenter Content="{TemplateBinding u:NavMenuItem.Header}" ContentTemplate="{TemplateBinding u:NavMenuItem.HeaderTemplate}"></ContentPresenter>
+                        <ContentPresenter Content="{TemplateBinding u:NavMenuItem.Header}"
+                                          ContentTemplate="{TemplateBinding u:NavMenuItem.HeaderTemplate}" />
                     </Template>
                 </Setter>
                 <Setter Property="ToolTip.ShowDelay" Value="0" />
                 <Setter Property="HorizontalAlignment" Value="Stretch" />
             </Style>
             <Style Selector="^ /template/ Border#PART_Border:pointerover">
-                <Setter Property="Background" Value="{DynamicResource NavigationMenuItemPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource ListBoxItemPointeroverBackground}" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
                 <Setter Property="Grid.ColumnSpan" Value="3" />
@@ -202,7 +208,7 @@
             </Style>
         </Style>
         <Style Selector="^:horizontal-collapsed:first-level">
-            <Setter Property="Grid.IsSharedSizeScope" Value="True"></Setter>
+            <Setter Property="Grid.IsSharedSizeScope" Value="True" />
         </Style>
         <Style Selector="^[IsSeparator=True]">
             <Setter Property="Template">
@@ -218,11 +224,11 @@
                             Content="{TemplateBinding Header}"
                             ContentTemplate="{TemplateBinding HeaderTemplate}"
                             Foreground="{DynamicResource TextBlockQuaternaryForeground}"
-                            IsVisible="{TemplateBinding Header,
-                                                        Converter={x:Static ObjectConverters.IsNotNull}}">
+                            IsVisible="{TemplateBinding Header, Converter={x:Static ObjectConverters.IsNotNull}}">
                             <ContentPresenter.Styles>
                                 <Style Selector="TextBlock">
-                                    <Setter Property="FontSize" Value="{DynamicResource NavigationMenuSeparatorHeaderFontSize}" />
+                                    <Setter Property="FontSize"
+                                            Value="{DynamicResource NavigationMenuSeparatorHeaderFontSize}" />
                                 </Style>
                             </ContentPresenter.Styles>
                         </ContentPresenter>
@@ -231,7 +237,7 @@
                             Height="{DynamicResource NavigationMenuSeparatorBorderHeight}"
                             Margin="{DynamicResource NavigationMenuSeparatorBorderMargin}"
                             HorizontalAlignment="Stretch"
-                            Fill="{DynamicResource SemiColorBorder}" />
+                            Fill="{DynamicResource NavigationMenuItemSeparatorBorderForeground}" />
                     </StackPanel>
                 </ControlTemplate>
             </Setter>
@@ -248,4 +254,4 @@
         </Style>
     </ControlTheme>
 
-</ResourceDictionary>
+</ResourceDictionary>

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

@@ -52,7 +52,7 @@
     </ControlTheme>
 
     <ControlTheme x:Key="TinyPagination" TargetType="{x:Type u:Pagination}">
-        <Setter Property="DisplayCurrentPageInQuickJumper" Value="True"></Setter>
+        <Setter Property="DisplayCurrentPageInQuickJumper" Value="True" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:Pagination">
                 <StackPanel Orientation="Horizontal">

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

@@ -11,6 +11,7 @@
         <Setter Property="Width" Value="{DynamicResource TextBoxDefaultHeight}" />
         <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
         <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
         <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
         <Setter Property="FocusAdorner" Value="{x:Null}" />
         <Setter Property="Template">
@@ -20,6 +21,7 @@
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
                     Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}">
                     <TextPresenter

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

@@ -6,7 +6,7 @@
     <ControlTheme x:Key="{x:Type u:ScrollToButton}" TargetType="u:ScrollToButton">
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Bottom" />
-        <Setter Property="Cursor" Value="Hand"></Setter>
+        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Margin" Value="0, 0, 16, 16" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ScrollToButton">
@@ -36,13 +36,13 @@
             <Setter Property="Background" Value="{DynamicResource ButtonDefaultPressedBackground}" />
         </Style>
         <Style Selector="^[Direction=Right] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(90deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(90deg)" />
         </Style>
         <Style Selector="^[Direction=Bottom] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(180deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(180deg)" />
         </Style>
         <Style Selector="^[Direction=Left] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(270deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(270deg)" />
         </Style>
     </ControlTheme>
     
@@ -50,7 +50,7 @@
     <ControlTheme x:Key="PrimaryScrollToButton" TargetType="u:ScrollToButton">
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Bottom" />
-        <Setter Property="Cursor" Value="Hand"></Setter>
+        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Margin" Value="0, 0, 16, 16" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ScrollToButton">
@@ -80,13 +80,13 @@
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonSolidPrimaryPressedBorderBrush}" />
         </Style>
         <Style Selector="^[Direction=Right] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(90deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(90deg)" />
         </Style>
         <Style Selector="^[Direction=Bottom] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(180deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(180deg)" />
         </Style>
         <Style Selector="^[Direction=Left] /template/ PathIcon#PART_Icon">
-            <Setter Property="RenderTransform" Value="rotate(270deg)"></Setter>
+            <Setter Property="RenderTransform" Value="rotate(270deg)" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

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

@@ -10,11 +10,11 @@
                     Margin="2"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
-                    Background="{DynamicResource SemiBlue1}"
+                    Background="{DynamicResource SelectionListIndicatorBackground}"
                     Theme="{DynamicResource CardBorder}" />
             </Template>
         </Setter>
-        <Setter Property="ListBox.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:SelectionList">
                 <Border
                     Name="border"

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

@@ -30,14 +30,11 @@
                             Classes.Active="{Binding Path= IsActive, RelativeSource={RelativeSource TemplatedParent}}"
                             IsHitTestVisible="{TemplateBinding IsLoading}"
                             Background="{DynamicResource SkeletonDefaultBackground}"
-                            IsVisible="{TemplateBinding IsLoading}">
-                        </iri:PureRectangle>
+                            IsVisible="{TemplateBinding IsLoading}" />
                         <iri:PureRectangle
                             x:Name="PART_ActiveBorder"
                             IsHitTestVisible="{TemplateBinding IsLoading}"
-                            IsVisible="{TemplateBinding IsLoading}"
-                            >
-                        </iri:PureRectangle>
+                            IsVisible="{TemplateBinding IsLoading}" />
                     </Panel>
                 </Border>
             </ControlTemplate>

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

@@ -6,7 +6,7 @@
     <ControlTheme x:Key="{x:Type u:TagInput}" TargetType="u:TagInput">
         <Setter Property="InputTheme" Value="{DynamicResource TagInputTextBoxTheme}" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="MinHeight" Value="{DynamicResource TagInputDefaultHeight}" />
+        <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="ItemTemplate">
             <DataTemplate>
@@ -22,8 +22,8 @@
                     VerticalAlignment="Stretch"
                     Background="{DynamicResource TextBoxDefaultBackground}"
                     BorderBrush="{DynamicResource TextBoxDefaultBorderBrush}"
-                    BorderThickness="1"
-                    CornerRadius="3">
+                    BorderThickness="{DynamicResource TextBoxBorderThickness}"
+                    CornerRadius="{DynamicResource TextBoxDefaultCornerRadius}">
                     <Panel HorizontalAlignment="Stretch">
                         <TextBlock
                             Name="{x:Static u:TagInput.PART_Watermark}"
@@ -49,10 +49,11 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:empty /template/ TextBlock#PART_Watermark">
-            <Setter Property="IsVisible" Value="True"></Setter>
+            <Setter Property="IsVisible" Value="True" />
         </Style>
         <Style Selector="^:pointerover /template/ Border#PART_BackgroundBorder">
             <Setter Property="Background" Value="{DynamicResource TextBoxPointeroverBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxPointeroverBorderBrush}" />
         </Style>
         <Style Selector="^:focus-within /template/ Border#PART_BackgroundBorder">
             <Setter Property="BorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
@@ -60,13 +61,13 @@
     </ControlTheme>
 
     <ControlTheme x:Key="TagInputTextBoxTheme" TargetType="TextBox">
-        <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" />
-        <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxDefaultBackground}" />
-        <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
-        <Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
-        <Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
-        <Setter Property="TextBox.Cursor" Value="Ibeam" />
-        <Setter Property="TextBox.CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextBoxInnerForeground}" />
+        <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
+        <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
+        <Setter Property="Cursor" Value="Ibeam" />
+        <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
@@ -106,10 +107,10 @@
 
     <ControlTheme x:Key="{x:Type u:ClosableTag}" TargetType="u:ClosableTag">
         <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="u:ClosableTag.Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
-        <Setter Property="u:ClosableTag.Background" Value="{DynamicResource ClosableTagBackground}" />
-        <Setter Property="u:ClosableTag.BorderBrush" Value="{DynamicResource SemiColorBorder}" />
-        <Setter Property="u:ClosableTag.BorderThickness" Value="1" />
+        <Setter Property="Foreground" Value="{DynamicResource ClosableTagForeground}" />
+        <Setter Property="Background" Value="{DynamicResource ClosableTagBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ClosableTagBorder}" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ClosableTag">

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

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

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

@@ -20,16 +20,16 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:dark /template/ PathIcon#PART_Icon">
-            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDarkGlyph}"></Setter>
-            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_DARK}"></Setter>
+            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDarkGlyph}" />
+            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_DARK}" />
         </Style>
         <Style Selector="^:light /template/ PathIcon#PART_Icon">
-            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonLightGlyph}"></Setter>
-            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_LIGHT}"></Setter>
+            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonLightGlyph}" />
+            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_LIGHT}" />
         </Style>
         <Style Selector="^ /template/ PathIcon#PART_Icon">
-            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDefaultGlyph}"></Setter>
-            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_SYSTEM}"></Setter>
+            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDefaultGlyph}" />
+            <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_SYSTEM}" />
         </Style>
     </ControlTheme>
 </ResourceDictionary>

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

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

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

@@ -133,8 +133,7 @@
                                 InnerRightContent="{TemplateBinding InnerRightContent}"
                                 IsReadOnly="{TemplateBinding IsReadonly}"
                                 Theme="{DynamicResource LooklessTextBox}"
-                                Watermark="{TemplateBinding Watermark}">
-                            </TextBox>
+                                Watermark="{TemplateBinding Watermark}" />
                             <Button
                                 Name="ClearButton"
                                 Grid.Column="1"

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

@@ -34,7 +34,7 @@
     <ControlTheme x:Key="{x:Type u:TimelineItem}" TargetType="u:TimelineItem">
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="u:TimelineItem.Template">
+        <Setter Property="Template">
             <ControlTemplate TargetType="u:TimelineItem">
                 <Grid
                     Name="PART_RootGrid"
@@ -79,7 +79,7 @@
                         Content="{TemplateBinding Header}"
                         ContentTemplate="{TemplateBinding HeaderTemplate}"
                         FontSize="14"
-                        Foreground="{DynamicResource SemiGrey9}" />
+                        Foreground="{DynamicResource TimelineHeaderForeground}" />
                     <ContentPresenter
                         Name="{x:Static u:TimelineItem.PART_Content}"
                         Grid.Row="1"
@@ -148,7 +148,7 @@
                 <Setter Property="Grid.Column" Value="2" />
                 <Setter Property="TextAlignment" Value="Left" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="Margin" Value="8 2 8 12"></Setter>
+                <Setter Property="Margin" Value="8 2 8 12" />
             </Style>
         </Style>
         <Style Selector="^:all-right">
@@ -169,7 +169,7 @@
                 <Setter Property="Grid.Column" Value="0" />
                 <Setter Property="TextAlignment" Value="Right" />
                 <Setter Property="HorizontalAlignment" Value="Right" />
-                <Setter Property="Margin" Value="8 2 8 12"></Setter>
+                <Setter Property="Margin" Value="8 2 8 12" />
             </Style>
         </Style>
         <Style Selector="^:separate">
@@ -184,7 +184,7 @@
                 <Setter Property="Grid.Column" Value="2" />
                 <Setter Property="HorizontalContentAlignment" Value="Left" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="Margin" Value="8 2 8 12"></Setter>
+                <Setter Property="Margin" Value="8 2 8 12" />
             </Style>
             <Style Selector="^ /template/ TextBlock#PART_Time">
                 <Setter Property="Grid.Row" Value="0" />

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

@@ -54,7 +54,7 @@
                             Content="{TemplateBinding Header}"
                             ContentTemplate="{TemplateBinding HeaderTemplate}"
                             DockPanel.Dock="Left"
-                            Foreground="{DynamicResource SemiColorText2}"
+                            Foreground="{DynamicResource ToolBarHeaderForeground}"
                             IsVisible="{TemplateBinding Header,
                                                         Converter={x:Static ObjectConverters.IsNotNull}}" />
                         <Panel Name="PART_PopupButtonPanel" DockPanel.Dock="Right">
@@ -67,7 +67,7 @@
                                 <PathIcon
                                     Name="PART_Icon"
                                     Height="12"
-                                    Foreground="{DynamicResource SemiColorText2}"
+                                    Foreground="{DynamicResource ToolBarHeaderForeground}"
                                     Data="{DynamicResource ToolBarHorizontalMoreGlyph}" />
                             </ToggleButton>
                             <Popup
@@ -122,7 +122,7 @@
                 <Rectangle
                     Name="PART_Rect"
                     Margin="4"
-                    Fill="{DynamicResource SemiColorBorder}" />
+                    Fill="{DynamicResource ToolBarSeparatorForeground}" />
             </ControlTemplate>
         </Setter>
         <Style Selector="^ /template/ Rectangle#PART_Rect">

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

@@ -18,6 +18,7 @@
         <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
         <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ComboBoxSelectorBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="MinHeight" Value="{DynamicResource ComboBoxDefaultHeight}" />
         <Setter Property="Cursor" Value="Hand" />
@@ -68,7 +69,7 @@
                     </ContentPresenter>
                     <ContentPresenter
                         Grid.Column="2"
-                        Margin="0 0 8 0"
+                        Margin="0,0,8,0"
                         VerticalAlignment="Center"
                         VerticalContentAlignment="Center"
                         Content="{TemplateBinding InnerRightContent}"
@@ -78,11 +79,11 @@
                     <Button
                         Name="PART_ClearButton"
                         Grid.Column="3"
-                        Command="{Binding $parent[u:TreeComboBox].Clear}"
                         Margin="0,0,8,0"
+                        Command="{Binding $parent[u:TreeComboBox].Clear}"
+                        Content="{DynamicResource IconButtonClearData}"
                         IsVisible="False"
-                        Theme="{DynamicResource InnerIconButton}"
-                        Content="{DynamicResource IconButtonClearData}" />
+                        Theme="{DynamicResource InnerIconButton}" />
 
                     <PathIcon
                         x:Name="DropDownGlyph"
@@ -94,8 +95,8 @@
                         VerticalAlignment="Center"
                         Data="{DynamicResource ComboBoxIcon}"
                         Foreground="{DynamicResource ComboBoxIconDefaultForeground}"
-                        UseLayoutRounding="False"
-                        IsHitTestVisible="True" />
+                        IsHitTestVisible="True"
+                        UseLayoutRounding="False" />
 
                     <Popup
                         Name="{x:Static iri:PartNames.PART_Popup}"
@@ -111,27 +112,27 @@
                         <Border
                             Name="PopupBorder"
                             Margin="0,4"
-                            BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
                             Background="{DynamicResource ComboBoxPopupBackground}"
                             BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
+                            BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
                             BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
                             ClipToBounds="True"
                             CornerRadius="6">
                             <DockPanel LastChildFill="True">
                                 <ContentPresenter
                                     Name="PART_PopupHeader"
-                                    Margin="8,8 8 0"
-                                    IsVisible="{TemplateBinding PopupInnerTopContent,
-                                                                Converter={x:Static ObjectConverters.IsNotNull}}"
+                                    Margin="8,8,8,0"
                                     Content="{TemplateBinding PopupInnerTopContent}"
-                                    DockPanel.Dock="Top" />
+                                    DockPanel.Dock="Top"
+                                    IsVisible="{TemplateBinding PopupInnerTopContent,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}" />
                                 <ContentPresenter
                                     Name="PART_PopupFooter"
-                                    Margin="8 0 8 8"
-                                    IsVisible="{TemplateBinding PopupInnerBottomContent,
-                                                                Converter={x:Static ObjectConverters.IsNotNull}}"
+                                    Margin="8,0,8,8"
                                     Content="{TemplateBinding PopupInnerBottomContent}"
-                                    DockPanel.Dock="Bottom" />
+                                    DockPanel.Dock="Bottom"
+                                    IsVisible="{TemplateBinding PopupInnerBottomContent,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}" />
                                 <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}">
                                     <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
                                 </ScrollViewer>
@@ -141,23 +142,23 @@
                 </Grid>
             </ControlTemplate>
         </Setter>
-        
+
         <Style Selector="^.clearButton, ^.ClearButton">
             <Style Selector="^:pointerover /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNotNull}}"/>
+                <Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNotNull}}" />
             </Style>
             <Style Selector="^:pointerover /template/ PathIcon#DropDownGlyph">
-                <Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}"/>
+                <Setter Property="IsVisible" Value="{Binding $parent[u:TreeComboBox].SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" />
             </Style>
         </Style>
-        
+
         <Style Selector="^.Large">
-            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}"/>
+            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
         </Style>
         <Style Selector="^.Small">
-            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}"/>
+            <Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
         </Style>
-        
+
         <!--  Pointerover State  -->
         <Style Selector="^:pointerover">
             <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorPointeroverBackground}" />
@@ -217,7 +218,7 @@
         <Setter Property="Background" Value="{DynamicResource TreeViewItemDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource TreeViewItemDefaultForeground}" />
         <Setter Property="CornerRadius" Value="3" />
-        <Setter Property="MinHeight" Value="32"></Setter>
+        <Setter Property="MinHeight" Value="32" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:TreeComboBoxItem">
@@ -265,7 +266,6 @@
             </ControlTemplate>
         </Setter>
 
-        <!--  Pointerover state  -->
         <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover">
             <Setter Property="Background" Value="{DynamicResource TreeViewItemPointeroverBackground}" />
         </Style>
@@ -287,6 +287,12 @@
         <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
             <Setter Property="Background" Value="{DynamicResource TreeViewItemSelectedBackground}" />
         </Style>
+        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource TreeViewItemSelectedForeground}" />
+        </Style>
+        <Style Selector="^:selected /template/ ToggleButton#PART_ExpandCollapseChevron">
+            <Setter Property="Foreground" Value="{DynamicResource TreeViewItemSelectedForeground}" />
+        </Style>
 
         <!--  Disabled Selected state  -->
         <Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot">

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

@@ -8,10 +8,10 @@
         <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
         <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
         <Setter Property="StrokeThickness" Value="0.4" />
-        <Setter Property="Foreground" Value="{DynamicResource SemiBlue2}" />
-        <Setter Property="StrokeBrush" Value="{DynamicResource SemiBlue6}" />
-        <Setter Property="ActiveForeground" Value="{DynamicResource SemiBlue6}" />
-        <Setter Property="ActiveStrokeBrush" Value="{DynamicResource SemiBlue6}" />
+        <Setter Property="Foreground" Value="{DynamicResource TwoTonePathIconForeground}" />
+        <Setter Property="StrokeBrush" Value="{DynamicResource TwoTonePathIconStrokeBrush}" />
+        <Setter Property="ActiveForeground" Value="{DynamicResource TwoTonePathIconActiveForeground}" />
+        <Setter Property="ActiveStrokeBrush" Value="{DynamicResource TwoTonePathIconActiveStrokeBrush}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:TwoTonePathIcon">
                 <Border Background="{TemplateBinding Background}">

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

@@ -41,7 +41,6 @@
         <ResourceInclude Source="ScrollToButton.axaml" />
         <ResourceInclude Source="SelectionList.axaml" />
         <ResourceInclude Source="TagInput.axaml" />
-        <ResourceInclude Source="TextBox.axaml" />
         <ResourceInclude Source="ThemeSelector.axaml" />
         <ResourceInclude Source="TimePicker.axaml" />
         <ResourceInclude Source="TimeRangePicker.axaml" />