diff --git a/modules/base/default.nix b/modules/base/default.nix
index 91240c7f..0674e314 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -61,22 +61,22 @@
 
     console = {
       colors = [
-        "f8f8f8"
-        "a60000"
-        "005e00"
-        "813e00"
-        "0031a9"
-        "721045"
-        "00538b"
-        "282828"
-        "ffffff"
-        "972500"
-        "315b00"
-        "70480f"
-        "2544bb"
-        "8f0075"
-        "30517f"
-        "000000"
+        "eff1f5"
+        "d20f39"
+        "40a02b"
+        "df8e1d"
+        "1e66f5"
+        "ea76cb"
+        "179299"
+        "6c6f85"
+        "acb0be"
+        "d20f39"
+        "40a02b"
+        "df8e1d"
+        "1e66f5"
+        "ea76cb"
+        "179299"
+        "4c4f69"
       ];
       font = "Lat2-Terminus16";
       keyMap = "us";
diff --git a/modules/base/emacs/base-init.el b/modules/base/emacs/base-init.el
index fe686d40..9d1064c6 100644
--- a/modules/base/emacs/base-init.el
+++ b/modules/base/emacs/base-init.el
@@ -177,38 +177,9 @@
   )
 
 ;; Theming
-(use-package modus-themes
-  :config
-  (setq modus-themes-bold-constructs t) ;; Use bold accents
-  (setq modus-themes-fringes nil) ;; No fringes
-  (setq modus-themes-common-palette-overrides
-    `(
-      ;; Colourful active modeline
-      (bg-mode-line-active bg-blue-intense)
-      (fg-mode-line-active fg-main)
-      ;; Borderless modeline
-      (border-mode-line-active unspecified)
-      (border-mode-line-inactive unspecified)
-      ;; Alt syntax colours
-      (builtin magenta)
-      (comment yellow-cooler)
-      (constant magenta-cooler)
-      (docstring magenta-faint)
-      (docmarkup green-faint)
-      (fnname magenta-warmer)
-      (keyword cyan)
-      (preprocessor cyan-cooler)
-      (string red-cooler)
-      (type magenta-cooler)
-      (variable blue-warmer)
-      (rx-construct magenta-warmer)
-      (rx-backslash blue-cooler)
-      ;; Colours are nice
-      ,@modus-themes-preset-overrides-intense
-      )
-    )
-  (setq modus-themes-region '(bg-only)) ;; Don't lose syntax highlighting in the active region
-  (load-theme 'modus-operandi t)
+(use-package catppuccin-theme
+  :custom (catppuccin-flavor 'latte)
+  :config (load-theme 'catppuccin :no-confirm)
   )
 
 (use-package no-littering
diff --git a/modules/graphical/compositor/default.nix b/modules/graphical/compositor/default.nix
index c48e149c..e2e4d16a 100644
--- a/modules/graphical/compositor/default.nix
+++ b/modules/graphical/compositor/default.nix
@@ -279,6 +279,37 @@ in
             };
           };
           style = ''
+            @define-color base   #eff1f5;
+            @define-color mantle #e6e9ef;
+            @define-color crust  #dce0e8;
+
+            @define-color text     #4c4f69;
+            @define-color subtext0 #6c6f85;
+            @define-color subtext1 #5c5f77;
+
+            @define-color surface0 #ccd0da;
+            @define-color surface1 #bcc0cc;
+            @define-color surface2 #acb0be;
+
+            @define-color overlay0 #9ca0b0;
+            @define-color overlay1 #8c8fa1;
+            @define-color overlay2 #7c7f93;
+
+            @define-color blue      #1e66f5;
+            @define-color lavender  #7287fd;
+            @define-color sapphire  #209fb5;
+            @define-color sky       #04a5e5;
+            @define-color teal      #179299;
+            @define-color green     #40a02b;
+            @define-color yellow    #df8e1d;
+            @define-color peach     #fe640b;
+            @define-color maroon    #e64553;
+            @define-color red       #d20f39;
+            @define-color mauve     #8839ef;
+            @define-color pink      #ea76cb;
+            @define-color flamingo  #dd7878;
+            @define-color rosewater #dc8a78;
+
             * {
                 font-family: Hack, monospace;
                 font-size: 11px;
@@ -298,25 +329,25 @@ in
             }
 
             window#waybar {
-                background-color: #ffffff;
-                color: #000000;
+                background-color: @base;
+                color: @text;
             }
 
             #backlight {
-                background-color: #6aaeff;
+                background-color: @sky;
             }
 
             #battery {
-                background-color: #5ada88;
+                background-color: @green;
             }
             #battery.good {
-                background-color: #6aaeff;
+                background-color: @sky;
             }
             #battery.warning {
-                background-color: #f5df23;
+                background-color: @yellow;
             }
             #battery.critical {
-                background-color: #ff8892;
+                background-color: @pink;
             }
 
             #clock {
@@ -324,33 +355,34 @@ in
             }
 
             #custom-mail-status.has-mail {
-                background-color: #6aaeff;
+                background-color: @sky;
             }
 
             #idle_inhibitor.activated {
-                background-color: #6aaeff;
+                background-color: @sky;
             }
 
             #pulseaudio {
-                background-color: #f5df23;
+                background-color: @yellow;
             }
 
             #tags button {
+                padding: 0;
                 box-shadow: inset 0 -3px transparent
-                background-color: #ffffff;
-                color: #000000;
+                background-color: @base;
+                color: @text;
             }
             #tags button.occupied {
-                background-color: #f2eff3;
+                background-color: @crust;
             }
             #tags button.focused {
-                background-color: #6aaeff;
+                background-color: @sky;
             }
             #tags button.urgent {
-                background-color: #ff8892;
+                background-color: @pink;
             }
             #tags button:hover {
-                box-shadow: inset 0 -3px #000000;
+                box-shadow: inset 0 -3px @text;
             }
           '';
           systemd.enable = true;
diff --git a/modules/graphical/firefox/default.nix b/modules/graphical/firefox/default.nix
index 0d74e351..449d0a4c 100644
--- a/modules/graphical/firefox/default.nix
+++ b/modules/graphical/firefox/default.nix
@@ -72,8 +72,10 @@ in
           extensions = with pkgs.nur.repos.rycee.firefox-addons; [
             belgium-eid
             decentraleyes
+            firefox-color
             ff2mpv
             keepassxc-browser
+            stylus
             ublock-origin
             umatrix
             zotero-connector
diff --git a/modules/graphical/terminal/default.nix b/modules/graphical/terminal/default.nix
index 6d2c753e..51e7f7c2 100644
--- a/modules/graphical/terminal/default.nix
+++ b/modules/graphical/terminal/default.nix
@@ -28,24 +28,24 @@
           };
           mouse.hide-when-typing = true;
           colors = {
-            foreground = "000000";
-            background = "ffffff";
-            regular0 = "282828";
-            regular1 = "a60000";
-            regular2 = "005e00";
-            regular3 = "813e00";
-            regular4 = "0031a9";
-            regular5 = "721045";
-            regular6 = "00538b";
-            regular7 = "f8f8f8";
-            bright0 = "000000";
-            bright1 = "972500";
-            bright2 = "315b00";
-            bright3 = "70480f";
-            bright4 = "2544bb";
-            bright5 = "8f0075";
-            bright6 = "30517f";
-            bright7 = "ffffff";
+            foreground = "4c4f69";
+            background = "eff1f5";
+            regular0 = "5c5f77";
+            regular1 = "d20f39";
+            regular2 = "40a02b";
+            regular3 = "df8e1d";
+            regular4 = "1e66f5";
+            regular5 = "ea76cb";
+            regular6 = "179299";
+            regular7 = "acb0be";
+            bright0 =  "6c6f85";
+            bright1 =  "d20f39";
+            bright2 =  "40a02b";
+            bright3 =  "df8e1d";
+            bright4 =  "1e66f5";
+            bright5 =  "ea76cb";
+            bright6 =  "179299";
+            bright7 =  "bcc0cc";
           };
         };
       };
diff --git a/modules/graphical/theme/default.nix b/modules/graphical/theme/default.nix
index 03c8c282..9150d6da 100644
--- a/modules/graphical/theme/default.nix
+++ b/modules/graphical/theme/default.nix
@@ -7,6 +7,7 @@
   };
 
   config = lib.mkIf config.chvp.graphical.theme.enable {
+    chvp.base.zfs.homeLinks = [{ path = ".config/qt5ct"; type = "cache"; }];
     fonts = {
       fontDir.enable = true;
       fontconfig = {
@@ -31,23 +32,16 @@
 
     programs.dconf.enable = true;
     home-manager.users.charlotte = { pkgs, ... }: {
-      home.packages = [ pkgs.vanilla-dmz ];
+      home.packages = [ pkgs.catppuccin-cursors.latteLight ];
       home.file = {
         ".icons/default/index.theme".text = ''
           [Icon Theme]
           Name=Default
           Comment=Default Cursor Theme
-          Inherits=Vanilla-DMZ
+          Inherits=Catppuccin-Latte-Light-Cursors
         '';
       };
-      dconf.settings = {
-        "org/gnome/desktop/interface" = {
-          gtk-theme = "Breeze";
-          icon-theme = "breeze";
-          cursor-theme = "Vanilla-DMZ";
-        };
-        "org/gnome/desktop/wm/preferences".button-layout = "";
-      };
+      dconf.settings."org/gnome/desktop/wm/preferences".button-layout = "";
       gtk = {
         enable = true;
         font = {
@@ -56,46 +50,30 @@
           size = 10;
         };
         gtk2.extraConfig = ''
-          gtk-cursor-theme-name = "Vanilla-DMZ"
+          gtk-cursor-theme-name = "Catppuccin-Latte-Light-Cursors"
           gtk-cursor-theme-size = 24
         '';
         gtk3 = {
           extraConfig = {
-            gtk-cursor-theme-name = "Vanilla-DMZ";
+            gtk-cursor-theme-name = "Catppuccin-Latte-Light-Cursors";
             gtk-cursor-theme-size = 24;
           };
-          extraCss = ''
-            headerbar {
-                min-height: 0px;
-                padding: 0px;
-                margin: 0px;
-            }
-
-            headerbar entry,
-            headerbar spinbutton,
-            headerbar button,
-            headerbar separator {
-                min-height: 0px;
-                padding: 0px;
-                margin: 0px;
-            }
-          '';
         };
         iconTheme = {
           package = pkgs.libsForQt5.breeze-icons;
           name = "breeze";
         };
         theme = {
-          package = pkgs.libsForQt5.breeze-gtk;
-          name = "Breeze";
+          package = pkgs.catppuccin-gtk.override { size = "compact"; variant = "latte"; };
+          name = "Catppuccin-Latte-Compact-Blue-light";
         };
       };
       qt = {
         enable = true;
-        platformTheme = "gnome";
+        platformTheme = "qtct";
         style = {
-          name = "breeze";
-          package = pkgs.libsForQt5.breeze-qt5;
+          name = "lightly";
+          package = pkgs.lightly-qt;
         };
       };
     };