diff --git a/Assets/Matugen/templates/gtk3.css b/Assets/Matugen/templates/gtk3.css
index e5ae1352..6db0bb71 100644
--- a/Assets/Matugen/templates/gtk3.css
+++ b/Assets/Matugen/templates/gtk3.css
@@ -17,7 +17,7 @@
 @define-color card_bg_color {{colors.surface.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;
+@define-color sidebar_bg_color {{colors.surface_variant.default.hex}};
+@define-color sidebar_fg_color {{colors.on_surface_variant.default.hex}};
 @define-color sidebar_border_color @window_bg_color;
 @define-color sidebar_backdrop_color @window_bg_color;
diff --git a/Assets/Matugen/templates/gtk4.css b/Assets/Matugen/templates/gtk4.css
index e5ae1352..6db0bb71 100644
--- a/Assets/Matugen/templates/gtk4.css
+++ b/Assets/Matugen/templates/gtk4.css
@@ -17,7 +17,7 @@
 @define-color card_bg_color {{colors.surface.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;
+@define-color sidebar_bg_color {{colors.surface_variant.default.hex}};
+@define-color sidebar_fg_color {{colors.on_surface_variant.default.hex}};
 @define-color sidebar_border_color @window_bg_color;
 @define-color sidebar_backdrop_color @window_bg_color;
diff --git a/Services/MatugenService.qml b/Services/MatugenService.qml
index 2ef9cf57..3a0f874c 100644
--- a/Services/MatugenService.qml
+++ b/Services/MatugenService.qml
@@ -345,6 +345,8 @@ Singleton {
       }
     }
 
+    console.log(JSON.stringify(matugenColors))
+
     return JSON.stringify(matugenColors)
   }
 
@@ -385,6 +387,7 @@ Singleton {
     Logger.log("Matugen", "Generating templates from predefined color scheme")
 
     var content = Matugen.buildConfigToml()
+        console.log(content)
     var mode = Settings.data.colorSchemes.darkMode ? "dark" : "light"
     var pathEsc = dynamicConfigPath.replace(/'/g, "'\\''")
     var extraRepo = (Quickshell.shellDir + "/Assets/Matugen/extra").replace(/'/g, "'\\''")
@@ -397,7 +400,7 @@ Singleton {
 
     // Build the script
     var script = ""
-    script += "cat > '" + pathEsc + "' << 'EOF'\n" + content + "EOF\n"
+    script += "cat > '" + pathEsc + "' << 'EOF'\n" + content + "\nEOF\n"
     script += "for d in '" + extraRepo + "' '" + extraUser + "'; do\n"
     script += "  if [ -d \"$d\" ]; then\n"
     script += "    for f in \"$d\"/*.toml; do\n"
@@ -416,6 +419,8 @@ Singleton {
     }
 
     script += "\n"
+    console.log("------")
+    console.log(script)
     generateProcess.command = ["bash", "-lc", script]
 
     // Write JSON file with our custom colors