diff --git a/quickshell/Common/StockThemes.js b/quickshell/Common/StockThemes.js
index a6770aae..b3b64a48 100644
--- a/quickshell/Common/StockThemes.js
+++ b/quickshell/Common/StockThemes.js
@@ -2,16 +2,16 @@
 // Separated from Theme.qml to keep that file clean
 
 const CatppuccinMocha = {
-    surface: "#313244",
+    surface: "#181825",
     surfaceText: "#cdd6f4",
-    surfaceVariant: "#313244",
+    surfaceVariant: "#1e1e2e",
     surfaceVariantText: "#a6adc8",
-    background: "#1e1e2e",
+    background: "#181825",
     backgroundText: "#cdd6f4",
     outline: "#6c7086",
-    surfaceContainer: "#45475a",
-    surfaceContainerHigh: "#585b70",
-    surfaceContainerHighest: "#6c7086"
+    surfaceContainer: "#1e1e2e",
+    surfaceContainerHigh: "#313244",
+    surfaceContainerHighest: "#45475a"
 }
 
 const CatppuccinLatte = {
diff --git a/quickshell/Modals/Settings/PowerSettings.qml b/quickshell/Modals/Settings/PowerSettings.qml
index f3ab69d2..35eddd04 100644
--- a/quickshell/Modals/Settings/PowerSettings.qml
+++ b/quickshell/Modals/Settings/PowerSettings.qml
@@ -22,7 +22,7 @@ Item {
                 width: parent.width
                 height: lockScreenSection.implicitHeight + Theme.spacingL * 2
                 radius: Theme.cornerRadius
-                color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
+                color: Theme.surfaceContainerHigh
                 border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
                 border.width: 0
 
@@ -106,7 +106,7 @@ Item {
                 width: parent.width
                 height: timeoutSection.implicitHeight + Theme.spacingL * 2
                 radius: Theme.cornerRadius
-                color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
+                color: Theme.surfaceContainerHigh
                 border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
                 border.width: 0
 
@@ -329,7 +329,7 @@ Item {
                 width: parent.width
                 height: powerMenuCustomSection.implicitHeight + Theme.spacingL * 2
                 radius: Theme.cornerRadius
-                color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
+                color: Theme.surfaceContainerHigh
                 border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
                 border.width: 0
 
@@ -516,7 +516,7 @@ Item {
                 width: parent.width
                 height: powerCommandConfirmSection.implicitHeight + Theme.spacingL * 2
                 radius: Theme.cornerRadius
-                color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
+                color: Theme.surfaceContainerHigh
                 border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
                 border.width: 0
 
@@ -560,7 +560,7 @@ Item {
                 width: parent.width
                 height: powerCommandCustomization.implicitHeight + Theme.spacingL * 2
                 radius: Theme.cornerRadius
-                color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
+                color: Theme.surfaceContainerHigh
                 border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
                 border.width: 0