diff --git a/demo/Ursa.Demo/Pages/BadgeDemo.axaml b/demo/Ursa.Demo/Pages/BadgeDemo.axaml
index 5d2f3d0..88254c0 100644
--- a/demo/Ursa.Demo/Pages/BadgeDemo.axaml
+++ b/demo/Ursa.Demo/Pages/BadgeDemo.axaml
@@ -5,7 +5,7 @@
     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:DesignHeight="1000"
     d:DesignWidth="800"
     mc:Ignorable="d">
     <ScrollViewer HorizontalScrollBarVisibility="Auto">
@@ -19,7 +19,7 @@
                     <Setter Property="Margin" Value="14" />
                 </Style>
                 <Style Selector="u|Badge > Border">
-                    <Setter Property="Background" Value="Orange" />
+                    <Setter Property="Background" Value="{DynamicResource SemiOrange3}" />
                     <Setter Property="CornerRadius" Value="8" />
                 </Style>
             </StackPanel.Styles>
@@ -90,15 +90,15 @@
                 <u:Badge Header="URSA" Classes="Tertiary">
                     <Border Width="100" Height="50" />
                 </u:Badge>
+                <u:Badge Header="URSA" Classes="Success">
+                    <Border Width="100" Height="50" />
+                </u:Badge>
                 <u:Badge Header="URSA" Classes="Warning">
                     <Border Width="100" Height="50" />
                 </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" />
-                </u:Badge>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <u:Badge Header="URSA" Classes="Light Primary">
@@ -110,15 +110,15 @@
                 <u:Badge Header="URSA" Classes="Light Tertiary">
                     <Border Width="100" Height="50" />
                 </u:Badge>
+                <u:Badge Header="URSA" Classes="Light Success">
+                    <Border Width="100" Height="50" />
+                </u:Badge>
                 <u:Badge Header="URSA" Classes="Light Warning">
                     <Border Width="100" Height="50" />
                 </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" />
-                </u:Badge>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <u:Badge Header="URSA" Classes="Inverted Primary">
@@ -130,15 +130,15 @@
                 <u:Badge Header="URSA" Classes="Inverted Tertiary">
                     <Border Width="100" Height="50" />
                 </u:Badge>
+                <u:Badge Header="URSA" Classes="Inverted Success">
+                    <Border Width="100" Height="50" />
+                </u:Badge>
                 <u:Badge Header="URSA" Classes="Inverted Warning">
                     <Border Width="100" Height="50" />
                 </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" />
-                </u:Badge>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <u:Badge
@@ -159,6 +159,12 @@
                     Dot="True">
                     <Border Width="100" Height="50" />
                 </u:Badge>
+                <u:Badge
+                    Header="URSA"
+                    Classes="Success"
+                    Dot="True">
+                    <Border Width="100" Height="50" />
+                </u:Badge>
                 <u:Badge
                     Header="URSA"
                     Classes="Warning"
@@ -171,12 +177,6 @@
                     Dot="True">
                     <Border Width="100" Height="50" />
                 </u:Badge>
-                <u:Badge
-                    Header="URSA"
-                    Classes="Success"
-                    Dot="True">
-                    <Border Width="100" Height="50" />
-                </u:Badge>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <u:Badge
@@ -197,6 +197,12 @@
                     Dot="True">
                     <Border Width="100" Height="50" />
                 </u:Badge>
+                <u:Badge
+                    Header="URSA"
+                    Classes="Light Success"
+                    Dot="True">
+                    <Border Width="100" Height="50" />
+                </u:Badge>
                 <u:Badge
                     Header="URSA"
                     Classes="Light Warning"
@@ -209,14 +215,8 @@
                     Dot="True">
                     <Border Width="100" Height="50" />
                 </u:Badge>
-                <u:Badge
-                    Header="URSA"
-                    Classes="Light Success"
-                    Dot="True">
-                    <Border Width="100" Height="50" />
-                </u:Badge>
             </StackPanel>
-            <Border Background="LightGray" CornerRadius="4">
+            <Border Background="{DynamicResource SemiGrey2}" CornerRadius="4">
                 <StackPanel Orientation="Horizontal">
                     <u:Badge
                         Header="URSA"
@@ -224,12 +224,6 @@
                         Dot="True">
                         <Border Width="100" Height="50" />
                     </u:Badge>
-                    <u:Badge
-                        Header="URSA"
-                        Classes="Inverted Primary"
-                        Dot="True">
-                        <Border Width="100" Height="50" />
-                    </u:Badge>
                     <u:Badge
                         Header="URSA"
                         Classes="Inverted Secondary"
@@ -242,6 +236,12 @@
                         Dot="True">
                         <Border Width="100" Height="50" />
                     </u:Badge>
+                    <u:Badge
+                        Header="URSA"
+                        Classes="Inverted Success"
+                        Dot="True">
+                        <Border Width="100" Height="50" />
+                    </u:Badge>
                     <u:Badge
                         Header="URSA"
                         Classes="Inverted Warning"
diff --git a/src/Ursa.Themes.Semi/Controls/Badge.axaml b/src/Ursa.Themes.Semi/Controls/Badge.axaml
index 4402f05..2be2ba7 100644
--- a/src/Ursa.Themes.Semi/Controls/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Badge.axaml
@@ -125,15 +125,15 @@
         <Style Selector="^.Tertiary">
             <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeTertiaryBadgeBackground}" />
         </Style>
+        <Style Selector="^.Success">
+            <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeSuccessBadgeBackground}" />
+        </Style>
         <Style Selector="^.Warning">
             <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeWarningBadgeBackground}" />
         </Style>
         <Style Selector="^.Danger">
             <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeDangerBadgeBackground}" />
         </Style>
-        <Style Selector="^.Success">
-            <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeSuccessBadgeBackground}" />
-        </Style>
 
         <Style Selector="^.Light">
             <Style Selector="^.Primary">
@@ -148,6 +148,10 @@
                 <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeLightTertiaryBadgeForeground}" />
                 <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeLightTertiaryBadgeBackground}" />
             </Style>
+            <Style Selector="^.Success">
+                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeLightSuccessBadgeForeground}" />
+                <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeLightSuccessBadgeBackground}" />
+            </Style>
             <Style Selector="^.Warning">
                 <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeLightWarningBadgeForeground}" />
                 <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeLightWarningBadgeBackground}" />
@@ -156,10 +160,6 @@
                 <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>
         </Style>
         <Style Selector="^.Inverted">
             <Setter Property="u:Badge.Background" Value="{DynamicResource BadgeInvertedBadgeBackground}" />
@@ -172,15 +172,15 @@
             <Style Selector="^.Tertiary">
                 <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeInvertedTertiaryBadgeForeground}" />
             </Style>
+            <Style Selector="^.Success">
+                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeInvertedSuccessBadgeForeground}" />
+            </Style>
             <Style Selector="^.Warning">
                 <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeInvertedWarningBadgeForeground}" />
             </Style>
             <Style Selector="^.Danger">
                 <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeInvertedDangerBadgeForeground}" />
             </Style>
-            <Style Selector="^.Success">
-                <Setter Property="u:Badge.Foreground" Value="{DynamicResource BadgeInvertedSuccessBadgeForeground}" />
-            </Style>
         </Style>
     </ControlTheme>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml
index 6d97358..93181ae 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Badge.axaml
@@ -5,9 +5,9 @@
     <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 +15,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