matugen: remove surface shifting option entirely

2025-12-06 05:25:41 -05:00 · 2025-11-07 23:52:33 -05:00
parent 20a684e8f5
commit 8a96f71d10
24 changed files with 360 additions and 468 deletions
--- a/Common/SettingsData.qml
+++ b/Common/SettingsData.qml
@@ -66,7 +66,6 @@ Singleton {
    property real popupTransparency: 1.0
    property real dockTransparency: 1
    property string widgetBackgroundColor: "sch"
-    property string surfaceBase: "s"
    property real cornerRadius: 12

    property bool use24HourClock: true
@@ -622,12 +621,6 @@ rm -rf '${home}'/.cache/icon-cache '${home}'/.cache/thumbnails 2>/dev/null || tr
        }
    }

-    function setSurfaceBase(base) {
-        set("surfaceBase", base)
-        if (typeof Theme !== "undefined") {
-            Theme.generateSystemThemesFromCurrentTheme()
-        }
-    }

    function setCornerRadius(radius) {
        set("cornerRadius", radius)
--- a/Common/Theme.qml
+++ b/Common/Theme.qml
@@ -260,12 +260,7 @@ Singleton {
    property color primaryText: currentThemeData.primaryText
    property color primaryContainer: currentThemeData.primaryContainer
    property color secondary: currentThemeData.secondary
-    property color surface: {
-        if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
-            return currentThemeData.background
-        }
-        return currentThemeData.surface
-    }
+    property color surface: currentThemeData.surface
    property color surfaceText: currentThemeData.surfaceText
    property color surfaceVariant: currentThemeData.surfaceVariant
    property color surfaceVariantText: currentThemeData.surfaceVariantText
@@ -274,24 +269,9 @@ Singleton {
    property color backgroundText: currentThemeData.backgroundText
    property color outline: currentThemeData.outline
    property color outlineVariant: currentThemeData.outlineVariant || Qt.rgba(outline.r, outline.g, outline.b, 0.6)
-    property color surfaceContainer: {
-        if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
-            return currentThemeData.surface
-        }
-        return currentThemeData.surfaceContainer
-    }
-    property color surfaceContainerHigh: {
-        if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
-            return currentThemeData.surfaceContainer
-        }
-        return currentThemeData.surfaceContainerHigh
-    }
-    property color surfaceContainerHighest: {
-        if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
-            return currentThemeData.surfaceContainerHigh
-        }
-        return currentThemeData.surfaceContainerHighest
-    }
+    property color surfaceContainer: currentThemeData.surfaceContainer
+    property color surfaceContainerHigh: currentThemeData.surfaceContainerHigh
+    property color surfaceContainerHighest: currentThemeData.surfaceContainerHighest

    property color onSurface: surfaceText
    property color onSurfaceVariant: surfaceVariantText
@@ -790,7 +770,6 @@ Singleton {
            "mode": isLight ? "light" : "dark",
            "iconTheme": iconTheme || "System Default",
            "matugenType": matugenType || "scheme-tonal-spot",
-            "surfaceBase": (typeof SettingsData !== "undefined" && SettingsData.surfaceBase) ? SettingsData.surfaceBase : "sc",
            "runUserTemplates": (typeof SettingsData !== "undefined") ? SettingsData.runUserMatugenTemplates : true
        }

--- a/Common/settings/SettingsSpec.js
+++ b/Common/settings/SettingsSpec.js
@@ -18,7 +18,6 @@ var SPEC = {
    dockTransparency: { def: 1.0, coerce: percentToUnit },

    widgetBackgroundColor: { def: "sch" },
-    surfaceBase: { def: "s", onChange: "regenSystemThemes" },
    cornerRadius: { def: 12, onChange: "updateNiriLayout" },

    use24HourClock: { def: true },
--- a/Modules/Greetd/GreetdSettings.qml
+++ b/Modules/Greetd/GreetdSettings.qml
@@ -38,7 +38,6 @@ Singleton {
    property real fontScale: 1.0
    property real cornerRadius: 12
    property string widgetBackgroundColor: "sch"
-    property string surfaceBase: "s"
    property string lockDateFormat: ""
    property bool lockScreenShowPowerActions: true
    property var screenPreferences: ({})
@@ -74,7 +73,6 @@ Singleton {
                fontScale = settings.fontScale !== undefined ? settings.fontScale : 1.0
                cornerRadius = settings.cornerRadius !== undefined ? settings.cornerRadius : 12
                widgetBackgroundColor = settings.widgetBackgroundColor !== undefined ? settings.widgetBackgroundColor : "sch"
-                surfaceBase = settings.surfaceBase !== undefined ? settings.surfaceBase : "s"
                lockDateFormat = settings.lockDateFormat !== undefined ? settings.lockDateFormat : ""
                lockScreenShowPowerActions = settings.lockScreenShowPowerActions !== undefined ? settings.lockScreenShowPowerActions : true
                screenPreferences = settings.screenPreferences !== undefined ? settings.screenPreferences : ({})
--- a/Modules/Settings/ThemeColorsTab.qml
+++ b/Modules/Settings/ThemeColorsTab.qml
@@ -111,40 +111,6 @@ Item {
                            color: Theme.surfaceText
                            anchors.verticalCenter: parent.verticalCenter
                        }
-
-                        Item {
-                            width: parent.width - parent.children[0].width - parent.children[1].width - surfaceBaseGroup.width - Theme.spacingM * 3
-                            height: 1
-                        }
-
-                        DankButtonGroup {
-                            id: surfaceBaseGroup
-                            property int currentSurfaceIndex: {
-                                switch (SettingsData.surfaceBase) {
-                                    case "sc": return 0
-                                    case "s": return 1
-                                    default: return 0
-                                }
-                            }
-
-                            model: ["Container", "Surface"]
-                            currentIndex: currentSurfaceIndex
-                            selectionMode: "single"
-                            anchors.verticalCenter: parent.verticalCenter
-
-                            buttonHeight: 20
-                            minButtonWidth: 48
-                            buttonPadding: Theme.spacingS
-                            checkIconSize: Theme.iconSizeSmall - 2
-                            textSize: Theme.fontSizeSmall - 2
-                            spacing: 1
-
-                            onSelectionChanged: (index, selected) => {
-                                if (!selected) return
-                                const surfaceOptions = ["sc", "s"]
-                                SettingsData.setSurfaceBase(surfaceOptions[index])
-                            }
-                        }
                    }

                    Column {
--- a/matugen/templates/alacritty.toml
+++ b/matugen/templates/alacritty.toml
@@ -1,5 +1,5 @@
 [colors.primary]
-background = '{{colors.surface.default.hex}}'
+background = '{{colors.background.default.hex}}'
 foreground = '{{colors.on_surface.default.hex}}'

 [colors.selection]
@@ -7,5 +7,5 @@ text = '{{colors.on_surface.default.hex}}'
 background = '{{colors.primary_container.default.hex}}'

 [colors.cursor]
-text = '{{colors.surface.default.hex}}'
+text = '{{colors.background.default.hex}}'
 cursor = '{{colors.primary.default.hex}}'
--- a/matugen/templates/dank.json
+++ b/matugen/templates/dank.json
@@ -37,11 +37,11 @@
            "secondary_fixed_dim": "{{colors.secondary_fixed_dim.dark.hex}}",
            "shadow": "{{colors.shadow.dark.hex}}",
            "source_color": "{{colors.source_color.dark.hex}}",
-            "surface": "{{colors.surface.dark.hex}}",
+            "surface": "{{colors.background.dark.hex}}",
            "surface_bright": "{{colors.surface_bright.dark.hex}}",
-            "surface_container": "{{colors.surface_container.dark.hex}}",
-            "surface_container_high": "{{colors.surface_container_high.dark.hex}}",
-            "surface_container_highest": "{{colors.surface_container_highest.dark.hex}}",
+            "surface_container": "{{colors.surface.dark.hex}}",
+            "surface_container_high": "{{colors.surface_container.dark.hex}}",
+            "surface_container_highest": "{{colors.surface_container_high.dark.hex}}",
            "surface_container_low": "{{colors.surface_container_low.dark.hex}}",
            "surface_container_lowest": "{{colors.surface_container_lowest.dark.hex}}",
            "surface_dim": "{{colors.surface_dim.dark.hex}}",
@@ -89,11 +89,11 @@
            "secondary_fixed_dim": "{{colors.secondary_fixed_dim.light.hex}}",
            "shadow": "{{colors.shadow.light.hex}}",
            "source_color": "{{colors.source_color.light.hex}}",
-            "surface": "{{colors.surface.light.hex}}",
+            "surface": "{{colors.background.light.hex}}",
            "surface_bright": "{{colors.surface_bright.light.hex}}",
-            "surface_container": "{{colors.surface_container.light.hex}}",
-            "surface_container_high": "{{colors.surface_container_high.light.hex}}",
-            "surface_container_highest": "{{colors.surface_container_highest.light.hex}}",
+            "surface_container": "{{colors.surface.light.hex}}",
+            "surface_container_high": "{{colors.surface_container.light.hex}}",
+            "surface_container_highest": "{{colors.surface_container_high.light.hex}}",
            "surface_container_low": "{{colors.surface_container_low.light.hex}}",
            "surface_container_lowest": "{{colors.surface_container_lowest.light.hex}}",
            "surface_dim": "{{colors.surface_dim.light.hex}}",
--- a/matugen/templates/dark-kcolorscheme.colors
+++ b/matugen/templates/dark-kcolorscheme.colors
@@ -2,11 +2,11 @@
 contrast=4

 [General]
-ColorScheme=DankMatugenDark
-Name=Dank Shell (matugen-dark)
+ColorScheme=DankMatugen
+Name=Dank Shell (matugen)

 [ColorEffects:Disabled]
-Color={{colors.on_surface_variant.dark.red}},{{colors.on_surface_variant.dark.green}},{{colors.on_surface_variant.dark.blue}}
+Color={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
 ColorAmount=0
 ColorEffect=0
 ContrastAmount=0.65
@@ -16,7 +16,7 @@ IntensityEffect=2

 [ColorEffects:Inactive]
 ChangeSelectionColor=true
-Color={{colors.outline.dark.red}},{{colors.outline.dark.green}},{{colors.outline.dark.blue}}
+Color={{colors.outline.default.red}},{{colors.outline.default.green}},{{colors.outline.default.blue}}
 ColorAmount=0.025
 ColorEffect=2
 ContrastAmount=0.1
@@ -26,121 +26,121 @@ IntensityAmount=0
 IntensityEffect=0

 [Colors:Button]
-BackgroundAlternate={{colors.surface_container_high.dark.red}},{{colors.surface_container_high.dark.green}},{{colors.surface_container_high.dark.blue}}
-BackgroundNormal={{colors.surface_container.dark.red}},{{colors.surface_container.dark.green}},{{colors.surface_container.dark.blue}}
-DecorationFocus={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-DecorationHover={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundActive={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundInactive={{colors.on_surface_variant.dark.red}},{{colors.on_surface_variant.dark.green}},{{colors.on_surface_variant.dark.blue}}
-ForegroundLink={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundNegative={{colors.error.dark.red}},{{colors.error.dark.green}},{{colors.error.dark.blue}}
-ForegroundNeutral={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
-ForegroundNormal={{colors.on_surface.dark.red}},{{colors.on_surface.dark.green}},{{colors.on_surface.dark.blue}}
-ForegroundPositive={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundVisited={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
+BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Complementary]
-BackgroundAlternate={{colors.surface_container_high.dark.red}},{{colors.surface_container_high.dark.green}},{{colors.surface_container_high.dark.blue}}
-BackgroundNormal={{colors.surface.dark.red}},{{colors.surface.dark.green}},{{colors.surface.dark.blue}}
-DecorationFocus={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-DecorationHover={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundActive={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundInactive={{colors.on_surface_variant.dark.red}},{{colors.on_surface_variant.dark.green}},{{colors.on_surface_variant.dark.blue}}
-ForegroundLink={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundNegative={{colors.error.dark.red}},{{colors.error.dark.green}},{{colors.error.dark.blue}}
-ForegroundNeutral={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
-ForegroundNormal={{colors.on_surface.dark.red}},{{colors.on_surface.dark.green}},{{colors.on_surface.dark.blue}}
-ForegroundPositive={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundVisited={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
+BackgroundAlternate={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Header]
-BackgroundAlternate={{colors.surface.dark.red}},{{colors.surface.dark.green}},{{colors.surface.dark.blue}}
-BackgroundNormal={{colors.surface_container.dark.red}},{{colors.surface_container.dark.green}},{{colors.surface_container.dark.blue}}
-DecorationFocus={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-DecorationHover={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundActive={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundInactive={{colors.on_surface_variant.dark.red}},{{colors.on_surface_variant.dark.green}},{{colors.on_surface_variant.dark.blue}}
-ForegroundLink={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundNegative={{colors.error.dark.red}},{{colors.error.dark.green}},{{colors.error.dark.blue}}
-ForegroundNeutral={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
-ForegroundNormal={{colors.on_surface.dark.red}},{{colors.on_surface.dark.green}},{{colors.on_surface.dark.blue}}
-ForegroundPositive={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundVisited={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
+BackgroundAlternate={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Header][Inactive]
-BackgroundAlternate={{colors.surface_container.dark.red}},{{colors.surface_container.dark.green}},{{colors.surface_container.dark.blue}}
-BackgroundNormal={{colors.surface.dark.red}},{{colors.surface.dark.green}},{{colors.surface.dark.blue}}
-DecorationFocus={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-DecorationHover={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundActive={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundInactive={{colors.on_surface_variant.dark.red}},{{colors.on_surface_variant.dark.green}},{{colors.on_surface_variant.dark.blue}}
-ForegroundLink={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundNegative={{colors.error.dark.red}},{{colors.error.dark.green}},{{colors.error.dark.blue}}
-ForegroundNeutral={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
-ForegroundNormal={{colors.on_surface.dark.red}},{{colors.on_surface.dark.green}},{{colors.on_surface.dark.blue}}
-ForegroundPositive={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundVisited={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
+BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Selection]
-BackgroundAlternate={{colors.primary_container.dark.red}},{{colors.primary_container.dark.green}},{{colors.primary_container.dark.blue}}
-BackgroundNormal={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-DecorationFocus={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-DecorationHover={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundActive={{colors.on_primary.dark.red}},{{colors.on_primary.dark.green}},{{colors.on_primary.dark.blue}}
-ForegroundInactive={{colors.on_surface_variant.dark.red}},{{colors.on_surface_variant.dark.green}},{{colors.on_surface_variant.dark.blue}}
-ForegroundLink={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundNegative={{colors.error.dark.red}},{{colors.error.dark.green}},{{colors.error.dark.blue}}
-ForegroundNeutral={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
-ForegroundNormal={{colors.on_primary.dark.red}},{{colors.on_primary.dark.green}},{{colors.on_primary.dark.blue}}
-ForegroundPositive={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundVisited={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
+BackgroundAlternate={{colors.primary_container.default.red}},{{colors.primary_container.default.green}},{{colors.primary_container.default.blue}}
+BackgroundNormal={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.on_primary.default.red}},{{colors.on_primary.default.green}},{{colors.on_primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_primary.default.red}},{{colors.on_primary.default.green}},{{colors.on_primary.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Tooltip]
-BackgroundAlternate={{colors.surface.dark.red}},{{colors.surface.dark.green}},{{colors.surface.dark.blue}}
-BackgroundNormal={{colors.surface_container.dark.red}},{{colors.surface_container.dark.green}},{{colors.surface_container.dark.blue}}
-DecorationFocus={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-DecorationHover={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundActive={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundInactive={{colors.on_surface_variant.dark.red}},{{colors.on_surface_variant.dark.green}},{{colors.on_surface_variant.dark.blue}}
-ForegroundLink={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundNegative={{colors.error.dark.red}},{{colors.error.dark.green}},{{colors.error.dark.blue}}
-ForegroundNeutral={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
-ForegroundNormal={{colors.on_surface.dark.red}},{{colors.on_surface.dark.green}},{{colors.on_surface.dark.blue}}
-ForegroundPositive={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundVisited={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
+BackgroundAlternate={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:View]
-BackgroundAlternate={{colors.surface_container_low.dark.red}},{{colors.surface_container_low.dark.green}},{{colors.surface_container_low.dark.blue}}
-BackgroundNormal={{colors.background.dark.red}},{{colors.background.dark.green}},{{colors.background.dark.blue}}
-DecorationFocus={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-DecorationHover={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundActive={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundInactive={{colors.on_surface_variant.dark.red}},{{colors.on_surface_variant.dark.green}},{{colors.on_surface_variant.dark.blue}}
-ForegroundLink={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundNegative={{colors.error.dark.red}},{{colors.error.dark.green}},{{colors.error.dark.blue}}
-ForegroundNeutral={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
-ForegroundNormal={{colors.on_surface.dark.red}},{{colors.on_surface.dark.green}},{{colors.on_surface.dark.blue}}
-ForegroundPositive={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundVisited={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
+BackgroundAlternate={{colors.surface_container_low.default.red}},{{colors.surface_container_low.default.green}},{{colors.surface_container_low.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Window]
-BackgroundAlternate={{colors.surface_container.dark.red}},{{colors.surface_container.dark.green}},{{colors.surface_container.dark.blue}}
-BackgroundNormal={{colors.surface.dark.red}},{{colors.surface.dark.green}},{{colors.surface.dark.blue}}
-DecorationFocus={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-DecorationHover={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundActive={{colors.primary.dark.red}},{{colors.primary.dark.green}},{{colors.primary.dark.blue}}
-ForegroundInactive={{colors.on_surface_variant.dark.red}},{{colors.on_surface_variant.dark.green}},{{colors.on_surface_variant.dark.blue}}
-ForegroundLink={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundNegative={{colors.error.dark.red}},{{colors.error.dark.green}},{{colors.error.dark.blue}}
-ForegroundNeutral={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
-ForegroundNormal={{colors.on_surface.dark.red}},{{colors.on_surface.dark.green}},{{colors.on_surface.dark.blue}}
-ForegroundPositive={{colors.tertiary.dark.red}},{{colors.tertiary.dark.green}},{{colors.tertiary.dark.blue}}
-ForegroundVisited={{colors.secondary.dark.red}},{{colors.secondary.dark.green}},{{colors.secondary.dark.blue}}
+BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [WM]
-activeBackground={{colors.surface_container.dark.red}},{{colors.surface_container.dark.green}},{{colors.surface_container.dark.blue}}
-activeBlend={{colors.on_surface.dark.red}},{{colors.on_surface.dark.green}},{{colors.on_surface.dark.blue}}
-activeForeground={{colors.on_surface.dark.red}},{{colors.on_surface.dark.green}},{{colors.on_surface.dark.blue}}
-inactiveBackground={{colors.surface.dark.red}},{{colors.surface.dark.green}},{{colors.surface.dark.blue}}
-inactiveBlend={{colors.on_surface_variant.dark.red}},{{colors.on_surface_variant.dark.green}},{{colors.on_surface_variant.dark.blue}}
-inactiveForeground={{colors.on_surface_variant.dark.red}},{{colors.on_surface_variant.dark.green}},{{colors.on_surface_variant.dark.blue}}
+activeBackground={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+activeBlend={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+activeForeground={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+inactiveBackground={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+inactiveBlend={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+inactiveForeground={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
--- a/matugen/templates/dgop.json
+++ b/matugen/templates/dgop.json
@@ -4,7 +4,7 @@
    "border_secondary": "{{colors.secondary.default.hex}}",
    "header_background": "{{colors.primary.default.hex}}",
    "header_text": "{{colors.on_primary.default.hex}}",
-    "footer_background": "{{colors.surface_container.default.hex}}",
+    "footer_background": "{{colors.surface.default.hex}}",
    "footer_text": "{{colors.on_surface_variant.default.hex}}",
    "text_primary": "{{colors.on_surface.default.hex}}",
    "text_secondary": "{{colors.on_surface_variant.default.hex}}",
@@ -32,7 +32,7 @@
    "cpu_low": "{{colors.primary_container.default.hex}}",
    "cpu_medium": "{{colors.primary.default.hex}}",
    "cpu_high": "{{colors.tertiary.default.hex}}",
-    "progress_background": "{{colors.surface_container_high.default.hex}}"
+    "progress_background": "{{colors.surface_container.default.hex}}"
  },
  "temperature": {
    "cold": "{{colors.primary_container.default.hex}}",
--- a/matugen/templates/firefox-userchrome.css
+++ b/matugen/templates/firefox-userchrome.css
@@ -19,7 +19,7 @@
    --md-sys-color-on-error-container: {{colors.on_error_container.light.hex}};
    --md-sys-color-background: {{colors.background.light.hex}};
    --md-sys-color-on-background: {{colors.on_background.light.hex}};
-    --md-sys-color-surface: {{colors.surface.light.hex}};
+    --md-sys-color-surface: {{colors.background.light.hex}};
    --md-sys-color-on-surface: {{colors.on_surface.light.hex}};
    --md-sys-color-surface-variant: {{colors.surface_variant.light.hex}};
    --md-sys-color-on-surface-variant: {{colors.on_surface_variant.light.hex}};
@@ -46,9 +46,9 @@
    --md-sys-color-surface-bright: {{colors.surface_bright.light.hex}};
    --md-sys-color-surface-container-lowest: {{colors.surface_container_lowest.light.hex}};
    --md-sys-color-surface-container-low: {{colors.surface_container_low.light.hex}};
-    --md-sys-color-surface-container: {{colors.surface_container.light.hex}};
-    --md-sys-color-surface-container-high: {{colors.surface_container_high.light.hex}};
-    --md-sys-color-surface-container-highest: {{colors.surface_container_highest.light.hex}};
+    --md-sys-color-surface-container: {{colors.background.light.hex}};
+    --md-sys-color-surface-container-high: {{colors.background.light.hex}};
+    --md-sys-color-surface-container-highest: {{colors.background.light.hex}};

    --m3-radius: 12px;
    --m3-radius-sm: 10px;
--- a/matugen/templates/foot.ini
+++ b/matugen/templates/foot.ini
@@ -1,5 +1,5 @@
 [colors]
 foreground={{colors.on_surface.default.hex_stripped}}
-background={{colors.surface.default.hex_stripped}}
+background={{colors.background.default.hex_stripped}}
 selection-foreground={{colors.on_surface.default.hex_stripped}}
 selection-background={{colors.primary_container.default.hex_stripped}}
--- a/matugen/templates/ghostty.conf
+++ b/matugen/templates/ghostty.conf
@@ -1,4 +1,4 @@
-background = {{colors.surface.default.hex}}
+background = {{colors.background.default.hex}}
 foreground = {{colors.on_surface.default.hex}}
 cursor-color = {{colors.primary.default.hex}}
 selection-background = {{colors.primary_container.default.hex}}
--- a/matugen/templates/gtk-colors.css
+++ b/matugen/templates/gtk-colors.css
@@ -6,15 +6,15 @@
@define-color accent_color {{colors.primary_fixed_dim.default.hex}};
@define-color accent_fg_color {{colors.on_primary_fixed.default.hex}};
@define-color accent_bg_color {{colors.primary_fixed_dim.default.hex}};
-@define-color window_bg_color {{colors.surface_dim.default.hex}};
+@define-color window_bg_color {{colors.background.default.hex}};
@define-color window_fg_color {{colors.on_surface.default.hex}};
-@define-color headerbar_bg_color {{colors.surface_dim.default.hex}};
+@define-color headerbar_bg_color {{colors.background.default.hex}};
@define-color headerbar_fg_color {{colors.on_surface.default.hex}};
-@define-color popover_bg_color {{colors.surface_dim.default.hex}};
+@define-color popover_bg_color {{colors.background.default.hex}};
@define-color popover_fg_color {{colors.on_surface.default.hex}};
-@define-color view_bg_color {{colors.surface.default.hex}};
+@define-color view_bg_color {{colors.background.default.hex}};
@define-color view_fg_color {{colors.on_surface.default.hex}};
-@define-color card_bg_color {{colors.surface.default.hex}};
+@define-color card_bg_color {{colors.background.default.hex}};
@define-color card_fg_color {{colors.on_surface.default.hex}};
@define-color sidebar_bg_color @window_bg_color;
@define-color sidebar_fg_color @window_fg_color;
--- a/matugen/templates/gtk-light-colors.css
+++ b/matugen/templates/gtk-light-colors.css
@@ -7807,15 +7807,15 @@ window.background:not(.solid-csd):not(.csd) > notebook > stack:not(:only-child)
@define-color accent_color {{colors.primary_fixed_dim.default.hex}};
@define-color accent_fg_color {{colors.on_primary_fixed.default.hex}};
@define-color accent_bg_color {{colors.primary_fixed_dim.default.hex}};
-@define-color window_bg_color {{colors.surface_dim.default.hex}};
+@define-color window_bg_color {{colors.background.default.hex}};
@define-color window_fg_color {{colors.on_surface.default.hex}};
-@define-color headerbar_bg_color {{colors.surface_dim.default.hex}};
+@define-color headerbar_bg_color {{colors.background.default.hex}};
@define-color headerbar_fg_color {{colors.on_surface.default.hex}};
-@define-color popover_bg_color {{colors.surface_dim.default.hex}};
+@define-color popover_bg_color {{colors.background.default.hex}};
@define-color popover_fg_color {{colors.on_surface.default.hex}};
-@define-color view_bg_color {{colors.surface.default.hex}};
+@define-color view_bg_color {{colors.background.default.hex}};
@define-color view_fg_color {{colors.on_surface.default.hex}};
-@define-color card_bg_color {{colors.surface.default.hex}};
+@define-color card_bg_color {{colors.background.default.hex}};
@define-color card_fg_color {{colors.on_surface.default.hex}};
@define-color sidebar_bg_color @window_bg_color;
@define-color sidebar_fg_color @window_fg_color;
--- a/matugen/templates/kcolorscheme.colors
+++ b/matugen/templates/kcolorscheme.colors
@@ -26,8 +26,8 @@ IntensityAmount=0
 IntensityEffect=0

 [Colors:Button]
-BackgroundAlternate={{colors.surface_container_high.default.red}},{{colors.surface_container_high.default.green}},{{colors.surface_container_high.default.blue}}
-BackgroundNormal={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
+BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
 DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
@@ -40,8 +40,8 @@ ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.gre
 ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Complementary]
-BackgroundAlternate={{colors.surface_container_high.default.red}},{{colors.surface_container_high.default.green}},{{colors.surface_container_high.default.blue}}
-BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundAlternate={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
 DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
@@ -54,8 +54,8 @@ ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.gre
 ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Header]
-BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
-BackgroundNormal={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
+BackgroundAlternate={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
 DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
@@ -68,8 +68,8 @@ ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.gre
 ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Header][Inactive]
-BackgroundAlternate={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
-BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
 DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
@@ -96,8 +96,8 @@ ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.gre
 ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Tooltip]
-BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
-BackgroundNormal={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
+BackgroundAlternate={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
 DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
@@ -124,8 +124,8 @@ ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.gre
 ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Window]
-BackgroundAlternate={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
-BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
 DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
@@ -138,9 +138,9 @@ ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.gre
 ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [WM]
-activeBackground={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
+activeBackground={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
 activeBlend={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
 activeForeground={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
-inactiveBackground={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+inactiveBackground={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
 inactiveBlend={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
 inactiveForeground={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
--- a/matugen/templates/kitty-tabs.conf
+++ b/matugen/templates/kitty-tabs.conf
@@ -5,16 +5,16 @@ tab_bar_align           left
 tab_bar_min_tabs        2
 tab_bar_margin_width    0.0
 tab_bar_margin_height   2.5 1.5
-tab_bar_margin_color    {{colors.surface.default.hex}}
+tab_bar_margin_color    {{colors.background.default.hex}}

-tab_bar_background              {{colors.surface.default.hex}}
+tab_bar_background              {{colors.background.default.hex}}

 active_tab_foreground           {{colors.on_primary_container.default.hex}}
 active_tab_background           {{colors.primary_container.default.hex}}
 active_tab_font_style           bold

 inactive_tab_foreground         {{colors.on_surface_variant.default.hex}}
-inactive_tab_background         {{colors.surface_container.default.hex}}
+inactive_tab_background         {{colors.background.default.hex}}
 inactive_tab_font_style         normal

 tab_activity_symbol             " ● "
--- a/matugen/templates/kitty.conf
+++ b/matugen/templates/kitty.conf
@@ -2,7 +2,7 @@ cursor {{colors.on_surface.default.hex}}
 cursor_text_color {{colors.on_surface_variant.default.hex}}

 foreground            {{colors.on_surface.default.hex}}
-background            {{colors.surface.default.hex}}
+background            {{colors.background.default.hex}}
 selection_foreground  {{colors.on_secondary.default.hex}}
 selection_background  {{colors.secondary_fixed_dim.default.hex}}
 url_color             {{colors.primary.default.hex}}
--- a/matugen/templates/light-kcolorscheme.colors
+++ b/matugen/templates/light-kcolorscheme.colors
@@ -2,11 +2,11 @@
 contrast=4

 [General]
-ColorScheme=DankMatugenLight
-Name=Dank Shell (matugen-light)
+ColorScheme=DankMatugen
+Name=Dank Shell (matugen)

 [ColorEffects:Disabled]
-Color={{colors.on_surface_variant.light.red}},{{colors.on_surface_variant.light.green}},{{colors.on_surface_variant.light.blue}}
+Color={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
 ColorAmount=0
 ColorEffect=0
 ContrastAmount=0.65
@@ -16,7 +16,7 @@ IntensityEffect=2

 [ColorEffects:Inactive]
 ChangeSelectionColor=true
-Color={{colors.outline.light.red}},{{colors.outline.light.green}},{{colors.outline.light.blue}}
+Color={{colors.outline.default.red}},{{colors.outline.default.green}},{{colors.outline.default.blue}}
 ColorAmount=0.025
 ColorEffect=2
 ContrastAmount=0.1
@@ -26,121 +26,121 @@ IntensityAmount=0
 IntensityEffect=0

 [Colors:Button]
-BackgroundAlternate={{colors.surface_container_high.light.red}},{{colors.surface_container_high.light.green}},{{colors.surface_container_high.light.blue}}
-BackgroundNormal={{colors.surface_container.light.red}},{{colors.surface_container.light.green}},{{colors.surface_container.light.blue}}
-DecorationFocus={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-DecorationHover={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundActive={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundInactive={{colors.on_surface_variant.light.red}},{{colors.on_surface_variant.light.green}},{{colors.on_surface_variant.light.blue}}
-ForegroundLink={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundNegative={{colors.error.light.red}},{{colors.error.light.green}},{{colors.error.light.blue}}
-ForegroundNeutral={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
-ForegroundNormal={{colors.on_surface.light.red}},{{colors.on_surface.light.green}},{{colors.on_surface.light.blue}}
-ForegroundPositive={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundVisited={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
+BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Complementary]
-BackgroundAlternate={{colors.surface_container_high.light.red}},{{colors.surface_container_high.light.green}},{{colors.surface_container_high.light.blue}}
-BackgroundNormal={{colors.surface.light.red}},{{colors.surface.light.green}},{{colors.surface.light.blue}}
-DecorationFocus={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-DecorationHover={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundActive={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundInactive={{colors.on_surface_variant.light.red}},{{colors.on_surface_variant.light.green}},{{colors.on_surface_variant.light.blue}}
-ForegroundLink={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundNegative={{colors.error.light.red}},{{colors.error.light.green}},{{colors.error.light.blue}}
-ForegroundNeutral={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
-ForegroundNormal={{colors.on_surface.light.red}},{{colors.on_surface.light.green}},{{colors.on_surface.light.blue}}
-ForegroundPositive={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundVisited={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
+BackgroundAlternate={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Header]
-BackgroundAlternate={{colors.surface.light.red}},{{colors.surface.light.green}},{{colors.surface.light.blue}}
-BackgroundNormal={{colors.surface_container.light.red}},{{colors.surface_container.light.green}},{{colors.surface_container.light.blue}}
-DecorationFocus={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-DecorationHover={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundActive={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundInactive={{colors.on_surface_variant.light.red}},{{colors.on_surface_variant.light.green}},{{colors.on_surface_variant.light.blue}}
-ForegroundLink={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundNegative={{colors.error.light.red}},{{colors.error.light.green}},{{colors.error.light.blue}}
-ForegroundNeutral={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
-ForegroundNormal={{colors.on_surface.light.red}},{{colors.on_surface.light.green}},{{colors.on_surface.light.blue}}
-ForegroundPositive={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundVisited={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
+BackgroundAlternate={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Header][Inactive]
-BackgroundAlternate={{colors.surface_container.light.red}},{{colors.surface_container.light.green}},{{colors.surface_container.light.blue}}
-BackgroundNormal={{colors.surface.light.red}},{{colors.surface.light.green}},{{colors.surface.light.blue}}
-DecorationFocus={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-DecorationHover={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundActive={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundInactive={{colors.on_surface_variant.light.red}},{{colors.on_surface_variant.light.green}},{{colors.on_surface_variant.light.blue}}
-ForegroundLink={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundNegative={{colors.error.light.red}},{{colors.error.light.green}},{{colors.error.light.blue}}
-ForegroundNeutral={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
-ForegroundNormal={{colors.on_surface.light.red}},{{colors.on_surface.light.green}},{{colors.on_surface.light.blue}}
-ForegroundPositive={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundVisited={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
+BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Selection]
-BackgroundAlternate={{colors.primary_container.light.red}},{{colors.primary_container.light.green}},{{colors.primary_container.light.blue}}
-BackgroundNormal={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-DecorationFocus={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-DecorationHover={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundActive={{colors.on_primary.light.red}},{{colors.on_primary.light.green}},{{colors.on_primary.light.blue}}
-ForegroundInactive={{colors.on_surface_variant.light.red}},{{colors.on_surface_variant.light.green}},{{colors.on_surface_variant.light.blue}}
-ForegroundLink={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundNegative={{colors.error.light.red}},{{colors.error.light.green}},{{colors.error.light.blue}}
-ForegroundNeutral={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
-ForegroundNormal={{colors.on_primary.light.red}},{{colors.on_primary.light.green}},{{colors.on_primary.light.blue}}
-ForegroundPositive={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundVisited={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
+BackgroundAlternate={{colors.primary_container.default.red}},{{colors.primary_container.default.green}},{{colors.primary_container.default.blue}}
+BackgroundNormal={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.on_primary.default.red}},{{colors.on_primary.default.green}},{{colors.on_primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_primary.default.red}},{{colors.on_primary.default.green}},{{colors.on_primary.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Tooltip]
-BackgroundAlternate={{colors.surface.light.red}},{{colors.surface.light.green}},{{colors.surface.light.blue}}
-BackgroundNormal={{colors.surface_container.light.red}},{{colors.surface_container.light.green}},{{colors.surface_container.light.blue}}
-DecorationFocus={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-DecorationHover={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundActive={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundInactive={{colors.on_surface_variant.light.red}},{{colors.on_surface_variant.light.green}},{{colors.on_surface_variant.light.blue}}
-ForegroundLink={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundNegative={{colors.error.light.red}},{{colors.error.light.green}},{{colors.error.light.blue}}
-ForegroundNeutral={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
-ForegroundNormal={{colors.on_surface.light.red}},{{colors.on_surface.light.green}},{{colors.on_surface.light.blue}}
-ForegroundPositive={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundVisited={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
+BackgroundAlternate={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:View]
-BackgroundAlternate={{colors.surface_container_low.light.red}},{{colors.surface_container_low.light.green}},{{colors.surface_container_low.light.blue}}
-BackgroundNormal={{colors.background.light.red}},{{colors.background.light.green}},{{colors.background.light.blue}}
-DecorationFocus={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-DecorationHover={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundActive={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundInactive={{colors.on_surface_variant.light.red}},{{colors.on_surface_variant.light.green}},{{colors.on_surface_variant.light.blue}}
-ForegroundLink={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundNegative={{colors.error.light.red}},{{colors.error.light.green}},{{colors.error.light.blue}}
-ForegroundNeutral={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
-ForegroundNormal={{colors.on_surface.light.red}},{{colors.on_surface.light.green}},{{colors.on_surface.light.blue}}
-ForegroundPositive={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundVisited={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
+BackgroundAlternate={{colors.surface_container_low.default.red}},{{colors.surface_container_low.default.green}},{{colors.surface_container_low.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Window]
-BackgroundAlternate={{colors.surface_container.light.red}},{{colors.surface_container.light.green}},{{colors.surface_container.light.blue}}
-BackgroundNormal={{colors.surface.light.red}},{{colors.surface.light.green}},{{colors.surface.light.blue}}
-DecorationFocus={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-DecorationHover={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundActive={{colors.primary.light.red}},{{colors.primary.light.green}},{{colors.primary.light.blue}}
-ForegroundInactive={{colors.on_surface_variant.light.red}},{{colors.on_surface_variant.light.green}},{{colors.on_surface_variant.light.blue}}
-ForegroundLink={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundNegative={{colors.error.light.red}},{{colors.error.light.green}},{{colors.error.light.blue}}
-ForegroundNeutral={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
-ForegroundNormal={{colors.on_surface.light.red}},{{colors.on_surface.light.green}},{{colors.on_surface.light.blue}}
-ForegroundPositive={{colors.tertiary.light.red}},{{colors.tertiary.light.green}},{{colors.tertiary.light.blue}}
-ForegroundVisited={{colors.secondary.light.red}},{{colors.secondary.light.green}},{{colors.secondary.light.blue}}
+BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
+ForegroundInactive={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+ForegroundLink={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundNegative={{colors.error.default.red}},{{colors.error.default.green}},{{colors.error.default.blue}}
+ForegroundNeutral={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}
+ForegroundNormal={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.green}},{{colors.tertiary.default.blue}}
+ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [WM]
-activeBackground={{colors.surface_container.light.red}},{{colors.surface_container.light.green}},{{colors.surface_container.light.blue}}
-activeBlend={{colors.on_surface.light.red}},{{colors.on_surface.light.green}},{{colors.on_surface.light.blue}}
-activeForeground={{colors.on_surface.light.red}},{{colors.on_surface.light.green}},{{colors.on_surface.light.blue}}
-inactiveBackground={{colors.surface.light.red}},{{colors.surface.light.green}},{{colors.surface.light.blue}}
-inactiveBlend={{colors.on_surface_variant.light.red}},{{colors.on_surface_variant.light.green}},{{colors.on_surface_variant.light.blue}}
-inactiveForeground={{colors.on_surface_variant.light.red}},{{colors.on_surface_variant.light.green}},{{colors.on_surface_variant.light.blue}}
+activeBackground={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+activeBlend={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+activeForeground={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
+inactiveBackground={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+inactiveBlend={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
+inactiveForeground={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
--- a/matugen/templates/qtct-colors.conf
+++ b/matugen/templates/qtct-colors.conf
@@ -1,7 +1,7 @@
 [ColorScheme]
-active_colors={{colors.on_surface.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.surface_container_high.default.hex}}, {{colors.outline.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.outline_variant.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.on_primary.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.surface.default.hex}}, {{colors.background.default.hex}}, {{colors.shadow.default.hex}}, {{colors.primary.default.hex}}, {{colors.on_primary.default.hex}}, {{colors.secondary.default.hex}}, {{colors.secondary.default.hex}}, {{colors.surface_container_low.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}
-disabled_colors={{colors.on_surface_variant.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.surface_container_high.default.hex}}, {{colors.outline.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.outline_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.shadow.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}
-inactive_colors={{colors.on_surface_variant.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.surface_container_high.default.hex}}, {{colors.outline.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.outline_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.shadow.default.hex}}, {{colors.secondary.default.hex}}, {{colors.on_secondary.default.hex}}, {{colors.secondary.default.hex}}, {{colors.secondary.default.hex}}, {{colors.surface_container_low.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}
+active_colors={{colors.on_surface.default.hex}}, {{colors.surface.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.outline.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.outline_variant.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.on_primary.default.hex}}, {{colors.on_surface.default.hex}}, {{colors.background.default.hex}}, {{colors.background.default.hex}}, {{colors.shadow.default.hex}}, {{colors.primary.default.hex}}, {{colors.on_primary.default.hex}}, {{colors.secondary.default.hex}}, {{colors.secondary.default.hex}}, {{colors.surface_container_low.default.hex}}, {{colors.surface.default.hex}}, {{colors.surface.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}
+disabled_colors={{colors.on_surface_variant.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.outline.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.outline_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.shadow.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}
+inactive_colors={{colors.on_surface_variant.default.hex}}, {{colors.surface.default.hex}}, {{colors.surface_container.default.hex}}, {{colors.outline.default.hex}}, {{colors.surface_variant.default.hex}}, {{colors.outline_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.surface.default.hex}}, {{colors.surface.default.hex}}, {{colors.shadow.default.hex}}, {{colors.secondary.default.hex}}, {{colors.on_secondary.default.hex}}, {{colors.secondary.default.hex}}, {{colors.secondary.default.hex}}, {{colors.surface_container_low.default.hex}}, {{colors.surface.default.hex}}, {{colors.surface.default.hex}}, {{colors.on_surface_variant.default.hex}}, {{colors.on_surface_variant.default.hex}}

 [ColorEffects:Disabled]
 Color={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
@@ -24,8 +24,8 @@ IntensityAmount=0
 IntensityEffect=0

 [Colors:Button]
-BackgroundAlternate={{colors.surface_container_high.default.red}},{{colors.surface_container_high.default.green}},{{colors.surface_container_high.default.blue}}
-BackgroundNormal={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
+BackgroundAlternate={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
+BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
 DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
@@ -38,8 +38,8 @@ ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.gre
 ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Complementary]
-BackgroundAlternate={{colors.surface_container_high.default.red}},{{colors.surface_container_high.default.green}},{{colors.surface_container_high.default.blue}}
-BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundAlternate={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
 DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
@@ -52,8 +52,8 @@ ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.gre
 ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Header]
-BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
-BackgroundNormal={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
+BackgroundAlternate={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
 DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
@@ -66,8 +66,8 @@ ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.gre
 ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Header][Inactive]
-BackgroundAlternate={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
-BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
 DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
@@ -94,8 +94,8 @@ ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.gre
 ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Tooltip]
-BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
-BackgroundNormal={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
+BackgroundAlternate={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
+BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
 DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
@@ -122,8 +122,8 @@ ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.gre
 ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [Colors:Window]
-BackgroundAlternate={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
-BackgroundNormal={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundAlternate={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+BackgroundNormal={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
 DecorationFocus={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 DecorationHover={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
 ForegroundActive={{colors.primary.default.red}},{{colors.primary.default.green}},{{colors.primary.default.blue}}
@@ -136,9 +136,9 @@ ForegroundPositive={{colors.tertiary.default.red}},{{colors.tertiary.default.gre
 ForegroundVisited={{colors.secondary.default.red}},{{colors.secondary.default.green}},{{colors.secondary.default.blue}}

 [WM]
-activeBackground={{colors.surface_container.default.red}},{{colors.surface_container.default.green}},{{colors.surface_container.default.blue}}
+activeBackground={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
 activeBlend={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
 activeForeground={{colors.on_surface.default.red}},{{colors.on_surface.default.green}},{{colors.on_surface.default.blue}}
-inactiveBackground={{colors.surface.default.red}},{{colors.surface.default.green}},{{colors.surface.default.blue}}
+inactiveBackground={{colors.background.default.red}},{{colors.background.default.green}},{{colors.background.default.blue}}
 inactiveBlend={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
 inactiveForeground={{colors.on_surface_variant.default.red}},{{colors.on_surface_variant.default.green}},{{colors.on_surface_variant.default.blue}}
--- a/matugen/templates/vesktop.css
+++ b/matugen/templates/vesktop.css
@@ -34,11 +34,11 @@
 	--accent-3: {{colors.primary.default.hex}};             /* accent buttons */
 	--accent-4: {{colors.surface_bright.default.hex}};      /* accent buttons when hovered */
 	--accent-5: {{colors.primary_fixed_dim.default.hex}};   /* accent buttons when clicked */
-	--mention:  {{colors.surface.default.hex}};             /* mentions & mention messages */
+	--mention:  {{colors.background.default.hex}};             /* mentions & mention messages */
 	--mention-hover: {{colors.surface_bright.default.hex}}; /* mentions & mention messages when hovered */

 	/* text colors */
-	--text-0: {{colors.surface.default.hex}};               /* text on colored elements */
+	--text-0: {{colors.background.default.hex}};               /* text on colored elements */
 	--text-1: {{colors.on_surface.default.hex}};            /* other normally white text */
 	--text-2: {{colors.on_surface.default.hex}};            /* headings and important text */
 	--text-3: {{colors.on_surface_variant.default.hex}};    /* normal text */
@@ -47,9 +47,9 @@

 	/* background and dark colors */
    --bg-1: {{colors.primary.default.hex}};                             /* dark buttons when clicked */
-	--bg-2: {{colors.surface_container_high.default.hex}};              /* dark buttons */
+	--bg-2: {{colors.surface_container.default.hex}};              /* dark buttons */
 	--bg-3: {{colors.surface_container_low.default.hex}};               /* spacing, secondary elements */
-	--bg-4: {{colors.surface.default.hex}};                             /* main background color */
+	--bg-4: {{colors.background.default.hex}};                             /* main background color */
 	--hover: {{colors.surface_bright.default.hex}};                     /* channels and buttons when hovered */
 	--active: {{colors.surface_bright.default.hex}};                    /* channels and buttons when clicked or selected */
 	--message-hover: {{colors.surface_bright.default.hex}};             /* messages when hovered */
--- a/matugen/templates/vscode-color-theme.json
+++ b/matugen/templates/vscode-color-theme.json
@@ -2,69 +2,69 @@
  "$schema": "vscode://schemas/color-theme",
  "name": "Dynamic Base16 DankShell",
  "colors": {
-    "editor.background": "{{colors.surface.default.hex}}",
+    "editor.background": "{{colors.background.default.hex}}",
    "editor.foreground": "{{colors.on_surface.default.hex}}",
    "editorLineNumber.foreground": "{{colors.outline.default.hex}}",
    "editorLineNumber.activeForeground": "{{colors.on_surface.default.hex}}",
    "editorCursor.foreground": "{{colors.primary.default.hex}}",
    "editor.selectionBackground": "{{colors.primary_container.default.hex}}",
-    "editor.inactiveSelectionBackground": "{{colors.surface_container.default.hex}}",
-    "editor.lineHighlightBackground": "{{colors.surface_container.default.hex}}",
-    "editorIndentGuide.background": "{{colors.surface_container_high.default.hex}}",
+    "editor.inactiveSelectionBackground": "{{colors.background.default.hex}}",
+    "editor.lineHighlightBackground": "{{colors.background.default.hex}}",
+    "editorIndentGuide.background": "{{colors.background.default.hex}}",
    "editorIndentGuide.activeBackground": "{{colors.outline.default.hex}}",
    "editorWhitespace.foreground": "{{colors.outline_variant.default.hex}}",
-    "editorBracketMatch.background": "{{colors.surface_container_high.default.hex}}",
+    "editorBracketMatch.background": "{{colors.background.default.hex}}",
    "editorBracketMatch.border": "{{colors.primary.default.hex}}",

-    "activityBar.background": "{{colors.surface.default.hex}}",
+    "activityBar.background": "{{colors.background.default.hex}}",
    "activityBar.foreground": "{{colors.on_surface.default.hex}}",
    "activityBar.activeBorder": "{{colors.primary.default.hex}}",
-    "activityBar.activeBackground": "{{colors.surface_container.default.hex}}",
+    "activityBar.activeBackground": "{{colors.background.default.hex}}",
    "activityBarBadge.background": "{{colors.primary.default.hex}}",
    "activityBarBadge.foreground": "{{colors.on_primary.default.hex}}",

-    "sideBar.background": "{{colors.surface.default.hex}}",
+    "sideBar.background": "{{colors.background.default.hex}}",
    "sideBar.foreground": "{{colors.on_surface.default.hex}}",
-    "sideBar.border": "{{colors.surface_container.default.hex}}",
+    "sideBar.border": "{{colors.background.default.hex}}",
    "sideBarTitle.foreground": "{{colors.on_surface.default.hex}}",
-    "sideBarSectionHeader.background": "{{colors.surface_container.default.hex}}",
+    "sideBarSectionHeader.background": "{{colors.background.default.hex}}",
    "sideBarSectionHeader.foreground": "{{colors.on_surface.default.hex}}",

-    "list.activeSelectionBackground": "{{colors.surface_container_high.default.hex}}",
+    "list.activeSelectionBackground": "{{colors.background.default.hex}}",
    "list.activeSelectionForeground": "{{colors.on_surface.default.hex}}",
-    "list.inactiveSelectionBackground": "{{colors.surface_container.default.hex}}",
+    "list.inactiveSelectionBackground": "{{colors.background.default.hex}}",
    "list.inactiveSelectionForeground": "{{colors.on_surface.default.hex}}",
-    "list.hoverBackground": "{{colors.surface_container.default.hex}}",
+    "list.hoverBackground": "{{colors.background.default.hex}}",
    "list.hoverForeground": "{{colors.on_surface.default.hex}}",
-    "list.focusBackground": "{{colors.surface_container_high.default.hex}}",
+    "list.focusBackground": "{{colors.background.default.hex}}",
    "list.focusForeground": "{{colors.on_surface.default.hex}}",
    "list.highlightForeground": "{{colors.primary.default.hex}}",

-    "statusBar.background": "{{colors.surface.default.hex}}",
+    "statusBar.background": "{{colors.background.default.hex}}",
    "statusBar.foreground": "{{colors.on_surface.default.hex}}",
-    "statusBar.border": "{{colors.surface_container.default.hex}}",
-    "statusBar.noFolderBackground": "{{colors.surface.default.hex}}",
+    "statusBar.border": "{{colors.background.default.hex}}",
+    "statusBar.noFolderBackground": "{{colors.background.default.hex}}",
    "statusBar.debuggingBackground": "{{colors.error.default.hex}}",
    "statusBar.debuggingForeground": "{{colors.on_error.default.hex}}",

-    "tab.activeBackground": "{{colors.surface.default.hex}}",
-    "tab.inactiveBackground": "{{colors.surface_container.default.hex}}",
+    "tab.activeBackground": "{{colors.background.default.hex}}",
+    "tab.inactiveBackground": "{{colors.background.default.hex}}",
    "tab.activeForeground": "{{colors.on_surface.default.hex}}",
    "tab.inactiveForeground": "{{colors.outline.default.hex}}",
-    "tab.border": "{{colors.surface.default.hex}}",
+    "tab.border": "{{colors.background.default.hex}}",
    "tab.activeBorder": "{{colors.primary.default.hex}}",
    "tab.unfocusedActiveBorder": "{{colors.outline.default.hex}}",

-    "editorGroupHeader.tabsBackground": "{{colors.surface_container.default.hex}}",
-    "editorGroupHeader.noTabsBackground": "{{colors.surface.default.hex}}",
+    "editorGroupHeader.tabsBackground": "{{colors.background.default.hex}}",
+    "editorGroupHeader.noTabsBackground": "{{colors.background.default.hex}}",

-    "titleBar.activeBackground": "{{colors.surface.default.hex}}",
+    "titleBar.activeBackground": "{{colors.background.default.hex}}",
    "titleBar.activeForeground": "{{colors.on_surface.default.hex}}",
-    "titleBar.inactiveBackground": "{{colors.surface.default.hex}}",
+    "titleBar.inactiveBackground": "{{colors.background.default.hex}}",
    "titleBar.inactiveForeground": "{{colors.outline.default.hex}}",
-    "titleBar.border": "{{colors.surface_container.default.hex}}",
+    "titleBar.border": "{{colors.background.default.hex}}",

-    "input.background": "{{colors.surface_container.default.hex}}",
+    "input.background": "{{colors.background.default.hex}}",
    "input.foreground": "{{colors.on_surface.default.hex}}",
    "input.border": "{{colors.outline.default.hex}}",
    "input.placeholderForeground": "{{colors.outline.default.hex}}",
@@ -72,13 +72,13 @@
    "inputValidation.errorBackground": "{{colors.error.default.hex}}",
    "inputValidation.errorBorder": "{{colors.error.default.hex}}",

-    "dropdown.background": "{{colors.surface_container.default.hex}}",
+    "dropdown.background": "{{colors.background.default.hex}}",
    "dropdown.foreground": "{{colors.on_surface.default.hex}}",
    "dropdown.border": "{{colors.outline.default.hex}}",

-    "quickInput.background": "{{colors.surface_container.default.hex}}",
+    "quickInput.background": "{{colors.background.default.hex}}",
    "quickInput.foreground": "{{colors.on_surface.default.hex}}",
-    "quickInputList.focusBackground": "{{colors.surface_container_high.default.hex}}",
+    "quickInputList.focusBackground": "{{colors.background.default.hex}}",
    "quickInputList.focusForeground": "{{colors.on_surface.default.hex}}",

    "button.background": "{{colors.primary.default.hex}}",
@@ -89,13 +89,13 @@
    "badge.background": "{{colors.secondary.default.hex}}",
    "badge.foreground": "{{colors.on_secondary.default.hex}}",

-    "panel.background": "{{colors.surface.default.hex}}",
+    "panel.background": "{{colors.background.default.hex}}",
    "panel.border": "{{colors.primary.default.hex}}",
    "panelTitle.activeBorder": "{{colors.primary.default.hex}}",
    "panelTitle.activeForeground": "{{colors.on_surface.default.hex}}",
    "panelTitle.inactiveForeground": "{{colors.outline.default.hex}}",

-    "terminal.background": "{{colors.surface.default.hex}}",
+    "terminal.background": "{{colors.background.default.hex}}",
    "terminal.foreground": "{{colors.on_surface.default.hex}}",

    "gitDecoration.modifiedResourceForeground": "{{colors.primary.default.hex}}",
@@ -108,20 +108,20 @@
    "gitDecoration.conflictingResourceForeground": "{{colors.error_container.default.hex}}",
    "gitDecoration.submoduleResourceForeground": "{{colors.primary.default.hex}}",

-    "editorWidget.background": "{{colors.surface_container.default.hex}}",
+    "editorWidget.background": "{{colors.background.default.hex}}",
    "editorWidget.border": "{{colors.outline.default.hex}}",
-    "editorSuggestWidget.background": "{{colors.surface_container.default.hex}}",
+    "editorSuggestWidget.background": "{{colors.background.default.hex}}",
    "editorSuggestWidget.border": "{{colors.outline.default.hex}}",
-    "editorSuggestWidget.selectedBackground": "{{colors.surface_container_high.default.hex}}",
+    "editorSuggestWidget.selectedBackground": "{{colors.background.default.hex}}",
    "editorSuggestWidget.highlightForeground": "{{colors.primary.default.hex}}",

    "peekView.border": "{{colors.primary.default.hex}}",
-    "peekViewEditor.background": "{{colors.surface_container.default.hex}}",
-    "peekViewResult.background": "{{colors.surface_container.default.hex}}",
-    "peekViewTitle.background": "{{colors.surface_container.default.hex}}",
+    "peekViewEditor.background": "{{colors.background.default.hex}}",
+    "peekViewResult.background": "{{colors.background.default.hex}}",
+    "peekViewTitle.background": "{{colors.background.default.hex}}",

    "notificationCenter.border": "{{colors.outline.default.hex}}",
-    "notifications.background": "{{colors.surface_container.default.hex}}",
+    "notifications.background": "{{colors.background.default.hex}}",
    "notifications.border": "{{colors.outline.default.hex}}",

    "breadcrumb.foreground": "{{colors.outline.default.hex}}",
@@ -146,14 +146,14 @@
    "merge.currentHeaderBackground": "{{colors.primary.default.hex}}40",
    "merge.incomingHeaderBackground": "{{colors.secondary.default.hex}}40",

-    "menubar.selectionBackground": "{{colors.surface_container_high.default.hex}}",
-    "menu.background": "{{colors.surface_container.default.hex}}",
+    "menubar.selectionBackground": "{{colors.background.default.hex}}",
+    "menu.background": "{{colors.background.default.hex}}",
    "menu.foreground": "{{colors.on_surface.default.hex}}",
-    "menu.selectionBackground": "{{colors.surface_container_high.default.hex}}",
+    "menu.selectionBackground": "{{colors.background.default.hex}}",
    "menu.selectionForeground": "{{colors.on_surface.default.hex}}",

-    "debugToolBar.background": "{{colors.surface_container.default.hex}}",
-    "debugExceptionWidget.background": "{{colors.surface_container.default.hex}}",
+    "debugToolBar.background": "{{colors.background.default.hex}}",
+    "debugExceptionWidget.background": "{{colors.background.default.hex}}",
    "debugExceptionWidget.border": "{{colors.error.default.hex}}"
  },

--- a/scripts/matugen-worker.sh
+++ b/scripts/matugen-worker.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail

-if [ $# -lt 5 ]; then
+if [ $# -lt 4 ]; then
    echo "Usage: $0 STATE_DIR SHELL_DIR CONFIG_DIR SYNC_MODE_WITH_PORTAL --run" >&2
    exit 1
 fi
@@ -64,13 +64,11 @@ key_of() {
  local mode=$(echo "$json" | sed 's/.*"mode": *"\([^"]*\)".*/\1/')
  local icon=$(echo "$json" | sed 's/.*"iconTheme": *"\([^"]*\)".*/\1/')
  local matugen_type=$(echo "$json" | sed 's/.*"matugenType": *"\([^"]*\)".*/\1/')
-  local surface_base=$(echo "$json" | sed 's/.*"surfaceBase": *"\([^"]*\)".*/\1/')
  local run_user_templates=$(echo "$json" | sed 's/.*"runUserTemplates": *\([^,}]*\).*/\1/')
  [[ -z "$icon" ]] && icon="System Default"
  [[ -z "$matugen_type" ]] && matugen_type="scheme-tonal-spot"
-  [[ -z "$surface_base" ]] && surface_base="sc"
  [[ -z "$run_user_templates" ]] && run_user_templates="true"
-  echo "${kind}|${value}|${mode}|${icon}|${matugen_type}|${surface_base}|${run_user_templates}" | sha256sum | cut -d' ' -f1
+  echo "${kind}|${value}|${mode}|${icon}|${matugen_type}|${run_user_templates}" | sha256sum | cut -d' ' -f1
 }

 set_system_color_scheme() {
@@ -96,17 +94,15 @@ set_system_color_scheme() {

 build_once() {
  local json="$1"
-  local kind value mode icon matugen_type surface_base run_user_templates
+  local kind value mode icon matugen_type run_user_templates
  kind=$(echo "$json" | sed 's/.*"kind": *"\([^"]*\)".*/\1/')
  value=$(echo "$json" | sed 's/.*"value": *"\([^"]*\)".*/\1/')
  mode=$(echo "$json" | sed 's/.*"mode": *"\([^"]*\)".*/\1/')
  icon=$(echo "$json" | sed 's/.*"iconTheme": *"\([^"]*\)".*/\1/')
  matugen_type=$(echo "$json" | sed 's/.*"matugenType": *"\([^"]*\)".*/\1/')
-  surface_base=$(echo "$json" | sed 's/.*"surfaceBase": *"\([^"]*\)".*/\1/')
  run_user_templates=$(echo "$json" | sed 's/.*"runUserTemplates": *\([^,}]*\).*/\1/')
  [[ -z "$icon" ]] && icon="System Default"
  [[ -z "$matugen_type" ]] && matugen_type="scheme-tonal-spot"
-  [[ -z "$surface_base" ]] && surface_base="sc"
  [[ -z "$run_user_templates" ]] && run_user_templates="true"

  USER_MATUGEN_DIR="$CONFIG_DIR/matugen/dms"
@@ -190,32 +186,6 @@ EOF
    cat "$config" >> "$TMP_CFG"
    echo "" >> "$TMP_CFG"
  done
-  
-  # Handle surface shifting if needed
-  if [[ "$surface_base" == "s" ]]; then
-    TMP_TEMPLATES_DIR="$(mktemp -d)"
-    trap 'rm -rf "$TMP_TEMPLATES_DIR"' RETURN
-
-    # Create shifted versions of templates
-    for template in "$SHELL_DIR/matugen/templates"/*.{css,conf,json,kdl,colors,ini,toml} \
-                    "$USER_MATUGEN_DIR/templates"/*.{css,conf,json,kdl,colors,toml,ini}; do
-      [[ -f "$template" ]] || continue
-      template_name="$(basename "$template")"
-      shifted_template="$TMP_TEMPLATES_DIR/$template_name"
-
-      # Apply surface shifting transformations
-      sed -e 's/{{colors\.surface\.default\.hex}}/{{colors.background.default.hex}}/g' \
-          -e 's/{{colors\.surface_container\.default\.hex}}/{{colors.surface.default.hex}}/g' \
-          -e 's/{{colors\.surface_container_high\.default\.hex}}/{{colors.surface_container.default.hex}}/g' \
-          -e 's/{{colors\.surface_container_highest\.default\.hex}}/{{colors.surface_container_high.default.hex}}/g' \
-          "$template" > "$shifted_template"
-    done
-
-    # Update config to use shifted templates
-    sed -i "s|input_path = '$SHELL_DIR/matugen/templates/|input_path = '$TMP_TEMPLATES_DIR/|g" "$TMP_CFG"
-    sed -i "s|input_path = '$USER_MATUGEN_DIR/templates/|input_path = '$TMP_TEMPLATES_DIR/|g" "$TMP_CFG"
-    sed -i "s|input_path = '\\./matugen/templates/|input_path = '$TMP_TEMPLATES_DIR/|g" "$TMP_CFG"
-  fi

  pushd "$SHELL_DIR" >/dev/null
  MAT_MODE=(-m "$mode")
@@ -239,52 +209,39 @@ EOF
  TMP_CONTENT_CFG="$(mktemp)"
  echo "[config]" > "$TMP_CONTENT_CFG"
  echo "" >> "$TMP_CONTENT_CFG"
-  
-  # Use shifted templates for content config if surface_base is "s"
-  CONTENT_TEMPLATES_PATH="$SHELL_DIR/matugen/templates/"
-  if [[ "$surface_base" == "s" && -n "${TMP_TEMPLATES_DIR:-}" ]]; then
-    CONTENT_TEMPLATES_PATH="$TMP_TEMPLATES_DIR/"
-  fi

  if command -v ghostty >/dev/null 2>&1; then
    cat "$SHELL_DIR/matugen/configs/ghostty.toml" >> "$TMP_CONTENT_CFG"
-    sed -i "s|input_path = './matugen/templates/|input_path = '${CONTENT_TEMPLATES_PATH}|g" "$TMP_CONTENT_CFG"
    echo "" >> "$TMP_CONTENT_CFG"
  fi

  if command -v kitty >/dev/null 2>&1; then
    cat "$SHELL_DIR/matugen/configs/kitty.toml" >> "$TMP_CONTENT_CFG"
-    sed -i "s|input_path = './matugen/templates/|input_path = '${CONTENT_TEMPLATES_PATH}|g" "$TMP_CONTENT_CFG"
    echo "" >> "$TMP_CONTENT_CFG"
  fi

  if command -v foot >/dev/null 2>&1; then
    cat "$SHELL_DIR/matugen/configs/foot.toml" >> "$TMP_CONTENT_CFG"
-    sed -i "s|input_path = './matugen/templates/|input_path = '${CONTENT_TEMPLATES_PATH}|g" "$TMP_CONTENT_CFG"
    echo "" >> "$TMP_CONTENT_CFG"
  fi

  if command -v alacritty >/dev/null 2>&1; then
    cat "$SHELL_DIR/matugen/configs/alacritty.toml" >> "$TMP_CONTENT_CFG"
-    sed -i "s|input_path = './matugen/templates/|input_path = '${CONTENT_TEMPLATES_PATH}|g" "$TMP_CONTENT_CFG"
    echo "" >> "$TMP_CONTENT_CFG"
  fi

  if command -v dgop >/dev/null 2>&1; then
    cat "$SHELL_DIR/matugen/configs/dgop.toml" >> "$TMP_CONTENT_CFG"
-    sed -i "s|input_path = './matugen/templates/|input_path = '${CONTENT_TEMPLATES_PATH}|g" "$TMP_CONTENT_CFG"
    echo "" >> "$TMP_CONTENT_CFG"
  fi

  if command -v code >/dev/null 2>&1; then
    cat "$SHELL_DIR/matugen/configs/vscode.toml" >> "$TMP_CONTENT_CFG"
-    sed -i "s|input_path = './matugen/templates/|input_path = '${CONTENT_TEMPLATES_PATH}|g" "$TMP_CONTENT_CFG"
    echo "" >> "$TMP_CONTENT_CFG"
  fi

  if command -v codium >/dev/null 2>&1; then
    cat "$SHELL_DIR/matugen/configs/codium.toml" >> "$TMP_CONTENT_CFG"
-    sed -i "s|input_path = './matugen/templates/|input_path = '${CONTENT_TEMPLATES_PATH}|g" "$TMP_CONTENT_CFG"
    echo "" >> "$TMP_CONTENT_CFG"
  fi

--- a/translations/en.json
+++ b/translations/en.json
@@ -188,13 +188,13 @@
  {
    "term": "Apply GTK Colors",
    "context": "Apply GTK Colors",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1413",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1379",
    "comment": ""
  },
  {
    "term": "Apply Qt Colors",
    "context": "Apply Qt Colors",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1449",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1415",
    "comment": ""
  },
  {
@@ -866,19 +866,19 @@
  {
    "term": "Controls opacity of all popouts, modals, and their content layers (DankDash, Settings, App Drawer, Control Center, etc.)",
    "context": "Controls opacity of all popouts, modals, and their content layers (DankDash, Settings, App Drawer, Control Center, etc.)",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:873",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:839",
    "comment": ""
  },
  {
    "term": "Controls opacity of individual widgets inside DankBar",
    "context": "Controls opacity of individual widgets inside DankBar",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:802",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:768",
    "comment": ""
  },
  {
    "term": "Controls opacity of the DankBar panel background",
    "context": "Controls opacity of the DankBar panel background",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:754",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:720",
    "comment": ""
  },
  {
@@ -914,7 +914,7 @@
  {
    "term": "Corner Radius (0 = square corners)",
    "context": "Corner Radius (0 = square corners)",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:910",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:876",
    "comment": ""
  },
  {
@@ -1046,13 +1046,13 @@
  {
    "term": "Dank Bar Transparency",
    "context": "Dank Bar Transparency",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:747",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:713",
    "comment": ""
  },
  {
    "term": "Dank Bar Widget Transparency",
    "context": "Dank Bar Widget Transparency",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:795",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:761",
    "comment": ""
  },
  {
@@ -1076,7 +1076,7 @@
  {
    "term": "Darken Modal Background",
    "context": "Darken Modal Background",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:951",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:917",
    "comment": ""
  },
  {
@@ -1574,19 +1574,19 @@
  {
    "term": "Font Family",
    "context": "Font Family",
-    "reference": "Modules/Notepad/NotepadSettings.qml:220, Modules/Settings/ThemeColorsTab.qml:1015",
+    "reference": "Modules/Notepad/NotepadSettings.qml:220, Modules/Settings/ThemeColorsTab.qml:981",
    "comment": ""
  },
  {
    "term": "Font Scale",
    "context": "Font Scale",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1135",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1101",
    "comment": ""
  },
  {
    "term": "Font Settings",
    "context": "Font Settings",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1006",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:972",
    "comment": ""
  },
  {
@@ -1598,7 +1598,7 @@
  {
    "term": "Font Weight",
    "context": "Font Weight",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1036",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1002",
    "comment": ""
  },
  {
@@ -1790,7 +1790,7 @@
  {
    "term": "Icon Theme",
    "context": "Icon Theme",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1331",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1297",
    "comment": ""
  },
  {
@@ -2120,7 +2120,7 @@
  {
    "term": "Matugen Palette",
    "context": "Matugen Palette",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:629, Modules/Settings/PersonalizationTab.qml:1785",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:595, Modules/Settings/PersonalizationTab.qml:1785",
    "comment": ""
  },
  {
@@ -2240,7 +2240,7 @@
  {
    "term": "Monospace Font",
    "context": "Monospace Font",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1102",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1068",
    "comment": ""
  },
  {
@@ -2774,7 +2774,7 @@
  {
    "term": "Popup Transparency",
    "context": "Popup Transparency",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:866",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:832",
    "comment": ""
  },
  {
@@ -3044,7 +3044,7 @@
  {
    "term": "Scale all font sizes",
    "context": "Scale all font sizes",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1142",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1108",
    "comment": ""
  },
  {
@@ -3128,7 +3128,7 @@
  {
    "term": "Select font weight",
    "context": "Select font weight",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1037",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1003",
    "comment": ""
  },
  {
@@ -3140,13 +3140,13 @@
  {
    "term": "Select monospace font for process list and technical displays",
    "context": "Select monospace font for process list and technical displays",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1103",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1069",
    "comment": ""
  },
  {
    "term": "Select system font family",
    "context": "Select system font family",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1016",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:982",
    "comment": ""
  },
  {
@@ -3158,7 +3158,7 @@
  {
    "term": "Select the palette algorithm used for wallpaper-based colors",
    "context": "Select the palette algorithm used for wallpaper-based colors",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:630, Modules/Settings/PersonalizationTab.qml:1786",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:596, Modules/Settings/PersonalizationTab.qml:1786",
    "comment": ""
  },
  {
@@ -3248,7 +3248,7 @@
  {
    "term": "Show darkened overlay behind modal dialogs",
    "context": "Show darkened overlay behind modal dialogs",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:958",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:924",
    "comment": ""
  },
  {
@@ -3476,13 +3476,13 @@
  {
    "term": "Sync Mode with Portal",
    "context": "Sync Mode with Portal",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1239",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1205",
    "comment": ""
  },
  {
    "term": "Sync dark mode with settings portals for system-wide theme hints",
    "context": "Sync dark mode with settings portals for system-wide theme hints",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1246",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1212",
    "comment": ""
  },
  {
@@ -3494,7 +3494,7 @@
  {
    "term": "System App Theming",
    "context": "System App Theming",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1381",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1347",
    "comment": ""
  },
  {
@@ -3596,7 +3596,7 @@
  {
    "term": "The below settings will modify your GTK and Qt settings. If you wish to preserve your current configurations, please back them up (qt5ct.conf|qt6ct.conf and ~/.config/gtk-3.0|gtk-4.0).",
    "context": "The below settings will modify your GTK and Qt settings. If you wish to preserve your current configurations, please back them up (qt5ct.conf|qt6ct.conf and ~/.config/gtk-3.0|gtk-4.0).",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:1292",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:1258",
    "comment": ""
  },
  {
@@ -4016,7 +4016,7 @@
  {
    "term": "Widget Styling",
    "context": "Widget Styling",
-    "reference": "Modules/Settings/ThemeColorsTab.qml:734",
+    "reference": "Modules/Settings/ThemeColorsTab.qml:700",
    "comment": ""
  },
  {
--- a/translations/poexports/tr.json
+++ b/translations/poexports/tr.json
@@ -468,7 +468,7 @@
    "Corner Radius (0 = square corners)": "Köşe Yarıçapı (0 = kare köşeler)"
  },
  "Corner Radius Override": {
-    "Corner Radius Override": ""
+    "Corner Radius Override": "Köşe Yarıçapı Değiştirme"
  },
  "Cover Open": {
    "Cover Open": "Kapak Açık"
@@ -861,7 +861,7 @@
    "Good": "İyi"
  },
  "Goth Corner Radius": {
-    "Goth Corner Radius": ""
+    "Goth Corner Radius": "Gotik Köşe Yarıçapı"
  },
  "Goth Corners": {
    "Goth Corners": "Gotik Köşeler"
@@ -1065,7 +1065,7 @@
    "Manual Show/Hide": "Manuel Göster/Gizle"
  },
  "Margin": {
-    "Margin": ""
+    "Margin": "Kenar Boşluğu"
  },
  "Marker Supply Empty": {
    "Marker Supply Empty": "Sarf Malzemesi Boş"