diff --git a/modules/desktop/themes/catppuccin/default.nix b/modules/desktop/themes/catppuccin/default.nix
index a63e269..54987d2 100644
--- a/modules/desktop/themes/catppuccin/default.nix
+++ b/modules/desktop/themes/catppuccin/default.nix
@@ -5,16 +5,17 @@ let
   cfg = config.modules.desktop.themes;
   accent = "pink";
   variant = "mocha";
-  colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha;
+  colorScheme = inputs.nix-colors.colorSchemes.${"catppuccin-${variant}"};
+  pascalCase = s: (toUpper (substring 0 1 s)) + (toLower (substring 1 (stringLength s) s));
 in {
   config = mkIf (cfg.active == "catppuccin") {
     colorScheme = colorScheme;
 
     modules.desktop.themes = {
-      dark = true;
+      dark = variant != "latte";
 
       gtkTheme = {
-        name = "catppuccin-mocha-pink-compact+rimless"; # TODO: put accent in here
+        name = "catppuccin-${variant}-${accent}-compact+rimless";
         package = pkgs.catppuccin-gtk.override {
           variant = variant;
           accents = [ accent ];
@@ -46,7 +47,7 @@ in {
       editor = {
         vscode = {
           colorTheme = {
-            name = "Catppuccin Mocha";
+            name = "Catppuccin ${pascalCase variant}";
             extension = (pkgs.vscode-extensions.catppuccin.catppuccin-vsc.override {
               accent = accent;
               boldKeywords = false;
@@ -83,6 +84,7 @@ in {
 
       waybar = builtins.concatStringsSep "\n" [
         "@import \"${inputs.waybar-catppuccin}/themes/${variant}.css\";"
+        "@define-color accent @${accent};"
         (lib.readFile ./waybar.css)
       ];
 
diff --git a/modules/desktop/themes/catppuccin/waybar.css b/modules/desktop/themes/catppuccin/waybar.css
index 5c2363c..bb72f31 100644
--- a/modules/desktop/themes/catppuccin/waybar.css
+++ b/modules/desktop/themes/catppuccin/waybar.css
@@ -71,7 +71,7 @@ window#waybar {
 }
 
 #workspaces button.active {
-  background: @pink;
+  background: @accent;
   color: @surface0;
 }
 #workspaces button:hover {
@@ -80,7 +80,7 @@ window#waybar {
   box-shadow: none;
 }
 #workspaces button.active:hover {
-  background: @pink;
+  background: @accent;
   color: @surface0;
 }