diff --git a/SukiUI.Demo/SukiUIDemoView.axaml b/SukiUI.Demo/SukiUIDemoView.axaml
index b91610124..d38b33779 100644
--- a/SukiUI.Demo/SukiUIDemoView.axaml
+++ b/SukiUI.Demo/SukiUIDemoView.axaml
@@ -93,6 +93,18 @@
         </MenuItem>
     </suki:SukiWindow.MenuItems>
     <suki:SukiSideMenu ItemsSource="{Binding DemoPages}" SelectedItem="{Binding ActivePage}">
+        <suki:SukiSideMenu.Styles>
+            <Style Selector="Image.AppIcon">
+                <Setter Property="Transitions">
+                    <Transitions>
+                        <DoubleTransition Property="Opacity" Duration="0.1" />
+                    </Transitions>
+                </Setter>
+                <Style Selector="^:pointerover">
+                    <Setter Property="Opacity" Value="0.5" />
+                </Style>
+            </Style>
+        </suki:SukiSideMenu.Styles>
         <suki:SukiSideMenu.ItemTemplate>
             <DataTemplate>
                 <suki:SukiSideMenuItem Header="{Binding DisplayName}">
@@ -106,9 +118,11 @@
             <Image Width="80"
                    Height="80"
                    Margin="30,10,30,30"
+                   Classes="AppIcon"
                    IsVisible="{Binding $parent[suki:SukiWindow].((demo:SukiUIDemoViewModel)DataContext).TitleBarVisible}"
                    PointerPressed="InputElement_OnPointerPressed"
                    Source="Assets/OIG.N5o-removebg-preview.png"
+                   ToolTip.ShowDelay="0"
                    ToolTip.Tip="Click To Toggle Top Menu." />
         </suki:SukiSideMenu.HeaderContent>
         <suki:SukiSideMenu.FooterContent>
diff --git a/SukiUI/Models/SukiColorTheme.cs b/SukiUI/Models/SukiColorTheme.cs
index 05ac5f862..b00da0c98 100644
--- a/SukiUI/Models/SukiColorTheme.cs
+++ b/SukiUI/Models/SukiColorTheme.cs
@@ -11,21 +11,34 @@ public record SukiColorTheme
     public Color Primary { get; }
 
     public IBrush PrimaryBrush => new SolidColorBrush(Primary);
+    
+    public Color PrimaryDark { get; }
+
+    public IBrush PrimaryDarkBrush => new SolidColorBrush(PrimaryDark);
 
     public Color Accent { get; }
 
     public IBrush AccentBrush => new SolidColorBrush(Accent);
+    
+    public Color AccentDark { get; }
+
+    public IBrush AccentDarkBrush => new SolidColorBrush(AccentDark);
 
     // Used in shaders to save calculating them per-frame.
     internal Color BackgroundPrimary { get; }
     internal Color BackgroundAccent { get; }
     internal Color Background { get; }
 
+    // dark scale...
+    private const double dS = 0.5;
+
     public SukiColorTheme(string displayName, Color primary, Color accent)
     {
         DisplayName = displayName;
         Primary = primary;
         Accent = accent;
+        PrimaryDark = new Color(primary.A, (byte)(primary.R * dS), (byte)(primary.G * dS), (byte)(primary.B * dS));
+        AccentDark = new Color(accent.A, (byte)(accent.R * dS), (byte)(accent.G * dS), (byte)(accent.B * dS));
         Background = GetBackgroundColor(Primary);
         BackgroundPrimary = new Color(primary.A, (byte)(primary.R / 1.3), (byte)(primary.G / 1.3), (byte)(primary.B / 1.3));
         BackgroundAccent = new Color(accent.A, (byte)(accent.R / 1.3), (byte)(accent.G / 1.3), (byte)(accent.B / 1.3));
diff --git a/SukiUI/Theme/Button.axaml b/SukiUI/Theme/Button.axaml
index 216f78495..686c96907 100644
--- a/SukiUI/Theme/Button.axaml
+++ b/SukiUI/Theme/Button.axaml
@@ -70,6 +70,7 @@
             <Setter Property="Transitions">
                 <Transitions>
                     <BrushTransition Property="BorderBrush" Duration="0:0:0.3" />
+                    <BrushTransition Property="Background" Duration="0:0:0.3" />
                 </Transitions>
             </Setter>
         </Style>
@@ -114,7 +115,15 @@
             </Style>
         </Style>
         <Style Selector="^:disabled">
-            <Setter Property="Opacity" Value="0.5" />
+            <Style Selector="^ /template/ TextBlock">
+                <Setter Property="Foreground" Value="{DynamicResource SukiDisabledText}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource SukiDisabledText}" />
+            </Style>
+            <Style Selector="^ /template/ Border">
+                <Setter Property="BorderBrush" Value="{DynamicResource SukiStrongBackground}" />
+            </Style>
         </Style>
 
         <!--  Classes  -->
@@ -179,14 +188,7 @@
             <Setter Property="Background" Value="Transparent" />
             <!--  Nested Selectors  -->
             <Style Selector="^ /template/ TextBlock">
-                <Setter Property="Foreground">
-                    <Setter.Value>
-                        <LinearGradientBrush StartPoint="48%,0%" EndPoint="50%,100%">
-                            <GradientStop Offset="0.8" Color="{DynamicResource SukiPrimaryColor}" />
-                            <GradientStop Offset="1" Color="{DynamicResource SukiPrimaryColor}" />
-                        </LinearGradientBrush>
-                    </Setter.Value>
-                </Setter>
+                <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor}" />
             </Style>
             <Style Selector="^ /template/ controls|Loading">
                 <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor}" />
@@ -211,17 +213,13 @@
             <Style Selector="^:pressed /template/ Border">
                 <Setter Property="Background" Value="Transparent" />
             </Style>
+            <Style Selector="^:disabled /template/ ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryDarkColor}" />
+            </Style>
             <!--  Color Variants  -->
             <Style Selector="^.Accent">
                 <Style Selector="^ /template/ TextBlock">
-                    <Setter Property="Foreground">
-                        <Setter.Value>
-                            <LinearGradientBrush StartPoint="48%,0%" EndPoint="50%,100%">
-                                <GradientStop Offset="0.8" Color="{DynamicResource SukiAccentColor}" />
-                                <GradientStop Offset="1" Color="{DynamicResource SukiAccentColor}" />
-                            </LinearGradientBrush>
-                        </Setter.Value>
-                    </Setter>
+                    <Setter Property="Foreground" Value="{DynamicResource SukiAccentColor}" />
                 </Style>
                 <Style Selector="^ /template/ controls|Loading">
                     <Setter Property="Foreground" Value="{DynamicResource SukiAccentColor}" />
@@ -229,6 +227,9 @@
                 <Style Selector="^ /template/ ContentPresenter">
                     <Setter Property="Foreground" Value="{DynamicResource SukiAccentColor}" />
                 </Style>
+                <Style Selector="^:disabled /template/ ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource SukiAccentDarkColor}" />
+                </Style>
             </Style>
         </Style>
 
@@ -257,7 +258,6 @@
             <Setter Property="Padding" Value="20,8,20,8" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor}" />
-            <Setter Property="BorderBrush" Value="#2948c5" />
             <Setter Property="Transitions">
                 <Transitions>
                     <BrushTransition Property="Background" Duration="0:0:0.2" />
@@ -284,6 +284,12 @@
             <Style Selector="^:pressed /template/ Border">
                 <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor}" />
             </Style>
+            <Style Selector="^:disabled /template/ Border">
+                <Setter Property="Background" Value="{DynamicResource SukiPrimaryDarkColor}" />
+            </Style>
+            <Style Selector="^:disabled /template/ ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource SukiLowText}" />
+            </Style>
             <!--  Color Variants  -->
             <Style Selector="^.Accent">
                 <Setter Property="Background" Value="{DynamicResource SukiAccentColor75}" />
@@ -293,6 +299,9 @@
                 <Style Selector="^:pressed /template/ Border">
                     <Setter Property="Background" Value="{DynamicResource SukiAccentColor}" />
                 </Style>
+                <Style Selector="^:disabled /template/ Border">
+                    <Setter Property="Background" Value="{DynamicResource SukiAccentDarkColor}" />
+                </Style>
             </Style>
         </Style>
 
@@ -342,6 +351,14 @@
                 <Setter Property="BorderBrush" Value="Transparent" />
                 <Setter Property="Background" Value="{DynamicResource SukiPrimaryColor}" />
             </Style>
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ Border">
+                    <Setter Property="BorderBrush" Value="{DynamicResource SukiPrimaryDarkColor}" />
+                </Style>
+                <Style Selector="^ /template/ ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryDarkColor}" />
+                </Style>
+            </Style>
             <!--  Color Variants  -->
             <Style Selector="^.Accent">
                 <Setter Property="BorderBrush" Value="{DynamicResource SukiAccentColor}" />
@@ -356,10 +373,24 @@
                 </Style>
                 <Style Selector="^:pointerover">
                     <Setter Property="Background" Value="{DynamicResource SukiAccentColor}" />
+                    <Style Selector="^ /template/ ContentPresenter">
+                        <Setter Property="Foreground" Value="White" />
+                    </Style>
+                    <Style Selector="^ /template/ TextBlock">
+                        <Setter Property="Foreground" Value="White" />
+                    </Style>
                 </Style>
                 <Style Selector="^:pressed /template/ Border">
                     <Setter Property="Background" Value="{DynamicResource SukiAccentColor}" />
                 </Style>
+                <Style Selector="^:disabled">
+                    <Style Selector="^ /template/ Border">
+                        <Setter Property="BorderBrush" Value="{DynamicResource SukiAccentDarkColor}" />
+                    </Style>
+                    <Style Selector="^ /template/ ContentPresenter">
+                        <Setter Property="Foreground" Value="{DynamicResource SukiAccentDarkColor}" />
+                    </Style>
+                </Style>
             </Style>
         </Style>
 
diff --git a/SukiUI/Theme/Index.axaml.cs b/SukiUI/Theme/Index.axaml.cs
index 1289c9e14..b4ad05912 100644
--- a/SukiUI/Theme/Index.axaml.cs
+++ b/SukiUI/Theme/Index.axaml.cs
@@ -162,7 +162,9 @@ private void SetColorThemeResourcesOnColorThemeChanged()
     private void SetColorTheme(SukiColorTheme colorTheme)
     {
         SetColorWithOpacities("SukiPrimaryColor", colorTheme.Primary);
+        SetResource("SukiPrimaryDarkColor", colorTheme.PrimaryDark);
         SetColorWithOpacities("SukiAccentColor", colorTheme.Accent);
+        SetResource("SukiAccentDarkColor", colorTheme.AccentDark);
         ActiveColorTheme = colorTheme;
         OnColorThemeChanged?.Invoke(ActiveColorTheme);
     }