diff --git a/styles/less/global/global.less b/styles/less/global/global.less
index 6cc63c2a..060691d0 100644
--- a/styles/less/global/global.less
+++ b/styles/less/global/global.less
@@ -51,3 +51,11 @@
         }
     }
 }
+
+.themed.theme-dark {
+    color-scheme: dark;
+}
+
+.themed.theme-light {
+    color-scheme: light;
+}
diff --git a/styles/less/ui/sidebar/daggerheartMenu.less b/styles/less/ui/sidebar/daggerheartMenu.less
index 203735d4..80eda9a1 100644
--- a/styles/less/ui/sidebar/daggerheartMenu.less
+++ b/styles/less/ui/sidebar/daggerheartMenu.less
@@ -1,43 +1,6 @@
-.theme-light.tab.sidebar-tab.daggerheartMenu-sidebar {
-    fieldset {
-        border-color: @dark-blue;
-
-        legend {
-            color: @dark-blue;
-        }
-    }
-
-    button {
-        background: transparent;
-    }
-
-    .menu-refresh-container .menu-refresh-inner-container .experience-chip {
-        background: @dark-blue-10;
-        color: @dark-blue;
-
-        &.selected {
-            background: @dark-blue-40;
-        }
-    }
-}
-
 .tab.sidebar-tab.daggerheartMenu-sidebar {
     padding: 4px;
 
-    fieldset {
-        border-color: @golden;
-
-        legend {
-            color: @golden;
-        }
-    }
-
-    button {
-        background: @golden;
-        border: 1px solid @dark-blue;
-        color: @dark-blue;
-    }
-
     div[data-application-part] {
         display: flex;
         flex-direction: column;
@@ -68,8 +31,8 @@
                 gap: 5px;
                 cursor: pointer;
                 padding: 5px;
-                background: @golden-10;
-                color: @golden;
+                background: light-dark(@dark-blue-10, @golden-10);
+                color: light-dark(@dark-blue, @golden);
 
                 .label {
                     font-style: normal;
@@ -79,7 +42,7 @@
                 }
 
                 &.selected {
-                    background: @golden-40;
+                    background: light-dark(@dark-blue-40, @golden-40);
                 }
             }
         }