diff --git a/dots/.config/matugen/templates/gtk-3.0/gtk.css b/dots/.config/matugen/templates/gtk-3.0/gtk.css
index c0054f864..1b5e6e7fe 100644
--- a/dots/.config/matugen/templates/gtk-3.0/gtk.css
+++ b/dots/.config/matugen/templates/gtk-3.0/gtk.css
@@ -8,15 +8,15 @@
 @define-color accent_bg_color {{colors.primary.default.hex}};
 @define-color window_bg_color {{colors.background.default.hex}};
 @define-color window_fg_color {{colors.on_background.default.hex}};
-@define-color headerbar_bg_color {{colors.surface_dim.default.hex}};
+@define-color headerbar_bg_color {{colors.surface_container.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.surface_container_highest.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.surface_container.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.surface_container.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_border_color @window_bg_color;
-@define-color sidebar_backdrop_color @window_bg_color;
+@define-color sidebar_bg_color {{colors.surface_container_lowest.default.hex}};
+@define-color sidebar_fg_color {{colors.on_surface.default.hex}};
+@define-color sidebar_border_color @sidebar_bg_color;
+@define-color sidebar_backdrop_color @sidebar_bg_color;
diff --git a/dots/.config/matugen/templates/gtk-4.0/gtk.css b/dots/.config/matugen/templates/gtk-4.0/gtk.css
index 80b1d6975..de8ba1e19 100644
--- a/dots/.config/matugen/templates/gtk-4.0/gtk.css
+++ b/dots/.config/matugen/templates/gtk-4.0/gtk.css
@@ -9,18 +9,18 @@
     @define-color accent_bg_color {{colors.primary.light.hex}};
     @define-color window_bg_color {{colors.background.light.hex}};
     @define-color window_fg_color {{colors.on_background.light.hex}};
-    @define-color headerbar_bg_color {{colors.surface_dim.light.hex}};
+    @define-color headerbar_bg_color {{colors.surface_container.light.hex}};
     @define-color headerbar_fg_color {{colors.on_surface.light.hex}};
-    @define-color popover_bg_color {{colors.surface_dim.light.hex}};
+    @define-color popover_bg_color {{colors.surface_container_highest.light.hex}};
     @define-color popover_fg_color {{colors.on_surface.light.hex}};
-    @define-color view_bg_color {{colors.surface.light.hex}};
+    @define-color view_bg_color {{colors.surface_container_lowest.light.hex}};
     @define-color view_fg_color {{colors.on_surface.light.hex}};
-    @define-color card_bg_color {{colors.surface.light.hex}};
+    @define-color card_bg_color {{colors.surface_container.light.hex}};
     @define-color card_fg_color {{colors.on_surface.light.hex}};
-    @define-color sidebar_bg_color @window_bg_color;
-    @define-color sidebar_fg_color @window_fg_color;
-    @define-color sidebar_border_color @window_bg_color;
-    @define-color sidebar_backdrop_color @window_bg_color;
+    @define-color sidebar_bg_color {{colors.surface_container.light.hex}};
+    @define-color sidebar_fg_color {{colors.on_surface.light.hex}};
+    @define-color sidebar_border_color @sidebar_bg_color;
+    @define-color sidebar_backdrop_color @sidebar_bg_color;
 }
 
 @media (prefers-color-scheme: dark) {
@@ -29,16 +29,16 @@
     @define-color accent_bg_color {{colors.primary.dark.hex}};
     @define-color window_bg_color {{colors.background.dark.hex}};
     @define-color window_fg_color {{colors.on_background.dark.hex}};
-    @define-color headerbar_bg_color {{colors.surface_dim.dark.hex}};
+    @define-color headerbar_bg_color {{colors.surface_container.dark.hex}};
     @define-color headerbar_fg_color {{colors.on_surface.dark.hex}};
-    @define-color popover_bg_color {{colors.surface_dim.dark.hex}};
+    @define-color popover_bg_color {{colors.surface_container_highest.dark.hex}};
     @define-color popover_fg_color {{colors.on_surface.dark.hex}};
-    @define-color view_bg_color {{colors.surface.dark.hex}};
+    @define-color view_bg_color {{colors.surface_container_lowest.dark.hex}};
     @define-color view_fg_color {{colors.on_surface.dark.hex}};
-    @define-color card_bg_color {{colors.surface.dark.hex}};
+    @define-color card_bg_color {{colors.surface_container.dark.hex}};
     @define-color card_fg_color {{colors.on_surface.dark.hex}};
-    @define-color sidebar_bg_color @window_bg_color;
-    @define-color sidebar_fg_color @window_fg_color;
-    @define-color sidebar_border_color @window_bg_color;
-    @define-color sidebar_backdrop_color @window_bg_color;
+    @define-color sidebar_bg_color {{colors.surface_container.dark.hex}};
+    @define-color sidebar_fg_color {{colors.on_surface.dark.hex}};
+    @define-color sidebar_border_color @sidebar_bg_color;
+    @define-color sidebar_backdrop_color @sidebar_bg_color;
 }