diff --git a/templates/default.mustache b/templates/default.mustache
index b483d9a..90c0eac 100644
--- a/templates/default.mustache
+++ b/templates/default.mustache
@@ -1,16 +1,37 @@
-/*
-Base16 {{scheme-name}}
-Scheme author: {{scheme-author}}
-Template author: Tinted Theming (https://github.com/tinted-theming)
-In files gtk-3.0/gtk.css and gtk-3.20/gtk.css, delete section "Default color scheme" and inject this
-*/
+/* GTK3 / GTK4 Color Overrides - Generated by Tinty */
+@define-color accent_color #{{base0D-hex}};
+@define-color accent_bg_color #{{base0D-hex}};
+@define-color accent_fg_color #{{base00-hex}};
 
-@define-color bg_color #{{base00-hex}};
-@define-color fg_color #{{base05-hex}};
-@define-color base_color #{{base01-hex}};
-@define-color text_color #{{base05-hex}};
-@define-color text_color_disabled #{{base03-hex}};
-@define-color selected_bg_color #{{base02-hex}};
-@define-color selected_fg_color #{{base05-hex}};
-@define-color tooltip_bg_color #{{base00-hex}};
-@define-color tooltip_fg_color #{{base05-hex}};
+@define-color window_bg_color #{{base00-hex}};
+@define-color window_fg_color #{{base05-hex}};
+
+@define-color view_bg_color #{{base00-hex}};
+@define-color view_fg_color #{{base05-hex}};
+
+@define-color headerbar_bg_color #{{base00-hex}};
+@define-color headerbar_fg_color #{{base05-hex}};
+
+@define-color dialog_bg_color #{{base00-hex}};
+@define-color dialog_fg_color #{{base05-hex}};
+
+@define-color popover_bg_color #{{base00-hex}};
+@define-color popover_fg_color #{{base05-hex}};
+
+/* Sidebar / Lists */
+@define-color sidebar_bg_color #{{base01-hex}};
+@define-color sidebar_fg_color #{{base05-hex}};
+
+/* Terminal / Darker Elements */
+@define-color card_bg_color #{{base01-hex}};
+@define-color card_fg_color #{{base05-hex}};
+
+/* Standard Palette */
+@define-color red_1 #{{base08-hex}};
+@define-color green_1 #{{base0B-hex}};
+@define-color yellow_1 #{{base0A-hex}};
+@define-color blue_1 #{{base0D-hex}};
+@define-color purple_1 #{{base0E-hex}};
+@define-color teal_1 #{{base0C-hex}};
+@define-color orange_1 #{{base09-hex}};
+@define-color gray_1 #{{base03-hex}};