diff --git a/demo/Ursa.Demo/Pages/BadgeDemo.axaml b/demo/Ursa.Demo/Pages/BadgeDemo.axaml
index 5d2f3d0b..012ea37b 100644
--- a/demo/Ursa.Demo/Pages/BadgeDemo.axaml
+++ b/demo/Ursa.Demo/Pages/BadgeDemo.axaml
@@ -5,8 +5,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:u="https://irihi.tech/ursa"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
+    d:DesignHeight="850"
+    d:DesignWidth="850"
     mc:Ignorable="d">
     <ScrollViewer HorizontalScrollBarVisibility="Auto">
         <StackPanel
@@ -17,10 +17,14 @@
             <StackPanel.Styles>
                 <Style Selector="u|Badge">
                     <Setter Property="Margin" Value="14" />
-                </Style>
-                <Style Selector="u|Badge > Border">
-                    <Setter Property="Background" Value="Orange" />
-                    <Setter Property="CornerRadius" Value="8" />
+                    <Style Selector="^ Border">
+                        <Setter Property="Background" Value="{DynamicResource SemiOrange3}" />
+                        <Setter Property="CornerRadius" Value="8" />
+                        <Style Selector="^ TextBlock">
+                            <Setter Property="HorizontalAlignment" Value="Center" />
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                    </Style>
                 </Style>
             </StackPanel.Styles>
 
@@ -29,26 +33,38 @@
                     HorizontalAlignment="Center"
                     Header="500"
                     OverflowCount="100">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="■■■"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="SUCCEED!">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="■■■"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="Hello" />
                 <u:Badge Header="Hello" Dot="True" />
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <u:Badge Header="5" CornerPosition="TopLeft">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="■■■"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="5" CornerPosition="TopRight">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="■■■"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="5" CornerPosition="BottomLeft">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="■■■"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="5" CornerPosition="BottomRight">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="■■■"/>
+                    </Border>
                 </u:Badge>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
@@ -56,88 +72,134 @@
                     Header="VIP"
                     CornerPosition="TopLeft"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="■■■"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge
                     Header="VIP"
                     CornerPosition="TopRight"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="■■■"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge
                     Header="VIP"
                     CornerPosition="BottomLeft"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="■■■"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge
                     Header="VIP"
                     CornerPosition="BottomRight"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="■■■"/>
+                    </Border>
                 </u:Badge>
             </StackPanel>
             <u:Badge HorizontalAlignment="Stretch" Header="VIP">
-                <Border Height="50" />
+                <Border Height="50">
+                    <TextBlock Text="■■■"/>
+                </Border>
             </u:Badge>
             <StackPanel Orientation="Horizontal">
                 <u:Badge Header="URSA" Classes="Primary">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Solid"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="URSA" Classes="Secondary">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Solid"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="URSA" Classes="Tertiary">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Solid"/>
+                    </Border>
+                </u:Badge>
+                <u:Badge Header="URSA" Classes="Success">
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Solid"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="URSA" Classes="Warning">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Solid"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="URSA" Classes="Danger">
-                    <Border Width="100" Height="50" />
-                </u:Badge>
-                <u:Badge Header="URSA" Classes="Success">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Solid"/>
+                    </Border>
                 </u:Badge>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <u:Badge Header="URSA" Classes="Light Primary">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Light"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="URSA" Classes="Light Secondary">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Light"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="URSA" Classes="Light Tertiary">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Light"/>
+                    </Border>
+                </u:Badge>
+                <u:Badge Header="URSA" Classes="Light Success">
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Light"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="URSA" Classes="Light Warning">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Light"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="URSA" Classes="Light Danger">
-                    <Border Width="100" Height="50" />
-                </u:Badge>
-                <u:Badge Header="URSA" Classes="Light Success">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Light"/>
+                    </Border>
                 </u:Badge>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <u:Badge Header="URSA" Classes="Inverted Primary">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Inverted"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="URSA" Classes="Inverted Secondary">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Inverted"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="URSA" Classes="Inverted Tertiary">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Inverted"/>
+                    </Border>
+                </u:Badge>
+                <u:Badge Header="URSA" Classes="Inverted Success">
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Inverted"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="URSA" Classes="Inverted Warning">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Inverted"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge Header="URSA" Classes="Inverted Danger">
-                    <Border Width="100" Height="50" />
-                </u:Badge>
-                <u:Badge Header="URSA" Classes="Inverted Success">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Inverted"/>
+                    </Border>
                 </u:Badge>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
@@ -145,37 +207,49 @@
                     Header="URSA"
                     Classes="Primary"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Solid"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge
                     Header="URSA"
                     Classes="Secondary"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Solid"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge
                     Header="URSA"
                     Classes="Tertiary"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Solid"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge
                     Header="URSA"
-                    Classes="Warning"
+                    Classes="Success"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Solid"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge
                     Header="URSA"
-                    Classes="Danger"
+                    Classes="Warning"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Solid"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge
                     Header="URSA"
-                    Classes="Success"
+                    Classes="Danger"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Solid"/>
+                    </Border>
                 </u:Badge>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
@@ -183,76 +257,100 @@
                     Header="URSA"
                     Classes="Light Primary"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Light"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge
                     Header="URSA"
                     Classes="Light Secondary"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Light"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge
                     Header="URSA"
                     Classes="Light Tertiary"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Light"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge
                     Header="URSA"
-                    Classes="Light Warning"
+                    Classes="Light Success"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Light"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge
                     Header="URSA"
-                    Classes="Light Danger"
+                    Classes="Light Warning"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Light"/>
+                    </Border>
                 </u:Badge>
                 <u:Badge
                     Header="URSA"
-                    Classes="Light Success"
+                    Classes="Light Danger"
                     Dot="True">
-                    <Border Width="100" Height="50" />
+                    <Border Width="100" Height="50">
+                        <TextBlock Text="Light"/>
+                    </Border>
                 </u:Badge>
             </StackPanel>
-            <Border Background="LightGray" CornerRadius="4">
+            <Border Background="{DynamicResource SemiGrey2}" CornerRadius="4">
                 <StackPanel Orientation="Horizontal">
                     <u:Badge
                         Header="URSA"
                         Classes="Inverted Primary"
                         Dot="True">
-                        <Border Width="100" Height="50" />
+                        <Border Width="100" Height="50">
+                            <TextBlock Text="Inverted"/>
+                        </Border>
                     </u:Badge>
                     <u:Badge
                         Header="URSA"
-                        Classes="Inverted Primary"
+                        Classes="Inverted Secondary"
                         Dot="True">
-                        <Border Width="100" Height="50" />
+                        <Border Width="100" Height="50">
+                            <TextBlock Text="Inverted"/>
+                        </Border>
                     </u:Badge>
                     <u:Badge
                         Header="URSA"
-                        Classes="Inverted Secondary"
+                        Classes="Inverted Tertiary"
                         Dot="True">
-                        <Border Width="100" Height="50" />
+                        <Border Width="100" Height="50">
+                            <TextBlock Text="Inverted"/>
+                        </Border>
                     </u:Badge>
                     <u:Badge
                         Header="URSA"
-                        Classes="Inverted Tertiary"
+                        Classes="Inverted Success"
                         Dot="True">
-                        <Border Width="100" Height="50" />
+                        <Border Width="100" Height="50">
+                            <TextBlock Text="Inverted"/>
+                        </Border>
                     </u:Badge>
                     <u:Badge
                         Header="URSA"
                         Classes="Inverted Warning"
                         Dot="True">
-                        <Border Width="100" Height="50" />
+                        <Border Width="100" Height="50">
+                            <TextBlock Text="Inverted"/>
+                        </Border>
                     </u:Badge>
                     <u:Badge
                         Header="URSA"
                         Classes="Inverted Danger"
                         Dot="True">
-                        <Border Width="100" Height="50" />
+                        <Border Width="100" Height="50">
+                            <TextBlock Text="Inverted"/>
+                        </Border>
                     </u:Badge>
                 </StackPanel>
             </Border>
diff --git a/src/Ursa.Themes.Semi/Controls/Badge.axaml b/src/Ursa.Themes.Semi/Controls/Badge.axaml
index 4402f054..099384fa 100644
--- a/src/Ursa.Themes.Semi/Controls/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Badge.axaml
@@ -32,7 +32,8 @@
                         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 BadgeMinWidth}"
@@ -81,7 +82,8 @@
                             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 BadgeDotWidth}"
@@ -100,86 +102,112 @@
         </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="^.Success">
-            <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeSuccessBadgeBackground}" />
+        <Style Selector="^.Danger /template/ Border#PART_BadgeContainer">
+            <Setter Property="Background" Value="{DynamicResource BadgeDangerBadgeBackground}" />
         </Style>
 
         <Style Selector="^.Light">
             <Style Selector="^.Primary">
-                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeLightPrimaryBadgeForeground}" />
-                <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeLightPrimaryBadgeBackground}" />
+                <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">
-                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeLightSecondaryBadgeForeground}" />
-                <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeLightSecondaryBadgeBackground}" />
+                <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">
-                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeLightTertiaryBadgeForeground}" />
-                <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeLightTertiaryBadgeBackground}" />
+                <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">
-                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeLightWarningBadgeForeground}" />
-                <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeLightWarningBadgeBackground}" />
+                <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">
-                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeLightDangerBadgeForeground}" />
-                <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeLightDangerBadgeBackground}" />
-            </Style>
-            <Style Selector="^.Success">
-                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeLightSuccessBadgeForeground}" />
-                <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeLightSuccessBadgeBackground}" />
+                <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">
-            <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeInvertedBadgeBackground}" />
-            <Style Selector="^.Primary">
-                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeInvertedPrimaryBadgeForeground}" />
+            <Style Selector="^/template/ Border#PART_BadgeContainer">
+                <Setter Property="Background" Value="{DynamicResource BadgeInvertedBadgeBackground}" />
             </Style>
-            <Style Selector="^.Secondary">
-                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeInvertedSecondaryBadgeForeground}" />
+            <Style Selector="^.Primary /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource BadgeInvertedPrimaryBadgeForeground}" />
             </Style>
-            <Style Selector="^.Tertiary">
-                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeInvertedTertiaryBadgeForeground}" />
+            <Style Selector="^.Secondary /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource BadgeInvertedSecondaryBadgeForeground}" />
             </Style>
-            <Style Selector="^.Warning">
-                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeInvertedWarningBadgeForeground}" />
+            <Style Selector="^.Tertiary /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource BadgeInvertedTertiaryBadgeForeground}" />
             </Style>
-            <Style Selector="^.Danger">
-                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeInvertedDangerBadgeForeground}" />
+            <Style Selector="^.Success /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource BadgeInvertedSuccessBadgeForeground}" />
             </Style>
-            <Style Selector="^.Success">
-                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeInvertedSuccessBadgeForeground}" />
+            <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>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml
index 6d973585..37c65848 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml
@@ -1,13 +1,14 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <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" />
-    <SolidColorBrush x:Key="BadgeSuccessBadgeBackground" Color="#FF5DC264" />
     <!-- Light -->
     <SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="#FF54A9FF" />
     <SolidColorBrush x:Key="BadgeLightPrimaryBadgeBackground" Color="#FF003D8F" />
@@ -15,19 +16,19 @@
     <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" />
-    <SolidColorBrush x:Key="BadgeLightSuccessBadgeForeground" Color="#FF5DC264" />
-    <SolidColorBrush x:Key="BadgeLightSuccessBadgeBackground" Color="#FF1B5924" />
     <!-- 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" />
-    <SolidColorBrush x:Key="BadgeInvertedSuccessBadgeForeground" Color="#FF5DC264" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml b/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml
index 61282694..403f1375 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/Badge.axaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <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" />