diff --git a/apps/web/src/m3-theme.scss b/apps/web/src/m3-theme.scss
index 3b55ded59..f3ecf65d1 100644
--- a/apps/web/src/m3-theme.scss
+++ b/apps/web/src/m3-theme.scss
@@ -119,7 +119,7 @@ html {
         --app-rail-bg: #111318;
         --app-header-bg: #111318;
         --app-content-bg: #161a22;
-        --app-rail-border: rgba(255, 255, 255, 0.05);
+        --app-rail-border: transparent;
         --app-search-bg: rgba(255, 255, 255, 0.05);
         --app-search-border: rgba(255, 255, 255, 0.09);
         --app-selection-color: #78adff;
diff --git a/libs/playlist/shared/ui/src/lib/playlist-switcher/playlist-switcher.component.scss b/libs/playlist/shared/ui/src/lib/playlist-switcher/playlist-switcher.component.scss
index 39cf02424..8066edd49 100644
--- a/libs/playlist/shared/ui/src/lib/playlist-switcher/playlist-switcher.component.scss
+++ b/libs/playlist/shared/ui/src/lib/playlist-switcher/playlist-switcher.component.scss
@@ -10,7 +10,11 @@
     app-region: no-drag;
 
     &:hover {
-        background: rgba(255, 255, 255, 0.13);
+        background: color-mix(
+            in srgb,
+            var(--mat-sys-on-surface) 8%,
+            transparent
+        );
     }
 
     &:active {
@@ -25,7 +29,11 @@
     display: inline-flex;
     align-items: center;
     justify-content: center;
-    background: rgba(255, 255, 255, 0.08);
+    background: color-mix(
+        in srgb,
+        var(--mat-sys-on-surface) 8%,
+        transparent
+    );
     flex-shrink: 0;
 }
 
@@ -123,7 +131,11 @@
     gap: 8px;
     padding: 8px 12px;
     margin: 0 8px 4px;
-    background: rgba(255, 255, 255, 0.06);
+    background: color-mix(
+        in srgb,
+        var(--mat-sys-on-surface) 6%,
+        transparent
+    );
     border-radius: 8px;
     border: 1px solid transparent;
     transition: all 0.2s ease;
@@ -242,11 +254,11 @@
 }
 
 .playlist-item.selected {
-    background: rgba(139, 92, 246, 0.1);
+    background: var(--app-selection-surface, rgba(139, 92, 246, 0.1));
 
     .playlist-title,
     .playlist-meta {
-        color: #a78bfa;
+        color: var(--app-selection-color, #a78bfa);
     }
 }
 
@@ -262,7 +274,11 @@
     width: 36px;
     height: 36px;
     border-radius: 8px;
-    background: rgba(255, 255, 255, 0.06);
+    background: color-mix(
+        in srgb,
+        var(--mat-sys-on-surface) 6%,
+        transparent
+    );
     flex-shrink: 0;
 }
 
diff --git a/libs/workspace/shell/feature/src/lib/workspace-shell/components/workspace-shell-rail/workspace-shell-rail.component.scss b/libs/workspace/shell/feature/src/lib/workspace-shell/components/workspace-shell-rail/workspace-shell-rail.component.scss
index 8c687d410..38bc7e72f 100644
--- a/libs/workspace/shell/feature/src/lib/workspace-shell/components/workspace-shell-rail/workspace-shell-rail.component.scss
+++ b/libs/workspace/shell/feature/src/lib/workspace-shell/components/workspace-shell-rail/workspace-shell-rail.component.scss
@@ -127,8 +127,8 @@
     padding: 5px 2px;
     margin: 4px 0;
     border-radius: 14px;
-    background: rgba(255, 255, 255, 0.03);
-    border: 1px solid rgba(255, 255, 255, 0.04);
+    background: color-mix(in srgb, var(--mat-sys-on-surface) 3%, transparent);
+    border: 1px solid color-mix(in srgb, var(--mat-sys-on-surface) 4%, transparent);
     position: relative;
     animation: region-enter 0.25s ease-out both;