diff --git a/modules/graphical/compositor/default.nix b/modules/graphical/compositor/default.nix
index 8c6c2e32..4957b8ff 100644
--- a/modules/graphical/compositor/default.nix
+++ b/modules/graphical/compositor/default.nix
@@ -152,7 +152,7 @@ let
     configure_touchpads tap enabled
     configure_touchpads scroll-method two-finger
 
-    ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XCURSOR_SIZE QT_QPA_PLATFORM_THEME QT_STYLE_OVERRIDE QT_PLUGIN_PATH QTWEBKIT_PLUGIN_PATH
+    ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XCURSOR_SIZE QT_QPA_PLATFORM_THEME QT_STYLE_OVERRIDE QT_PLUGIN_PATH QTWEBKIT_PLUGIN_PATH GDK_PIXBUF_MODULE_FILE XDG_DATA_DIRS GIO_EXTRA_MODULES PATH
     systemctl --user start river-session.target
     systemctl --user start tray.target
   '';
diff --git a/modules/graphical/firefox/default.nix b/modules/graphical/firefox/default.nix
index 761412e2..55d5b102 100644
--- a/modules/graphical/firefox/default.nix
+++ b/modules/graphical/firefox/default.nix
@@ -73,11 +73,9 @@ in
             belgium-eid
             cookie-autodelete
             decentraleyes
-            firefox-color
             ff2mpv
             keepassxc-browser
             multi-account-containers
-            stylus
             ublock-origin
             vue-js-devtools
             zotero-connector
diff --git a/modules/graphical/theme/default.nix b/modules/graphical/theme/default.nix
index 122c5aea..1c636a64 100644
--- a/modules/graphical/theme/default.nix
+++ b/modules/graphical/theme/default.nix
@@ -7,7 +7,10 @@
   };
 
   config = lib.mkIf config.chvp.graphical.theme.enable {
-    chvp.base.zfs.homeLinks = [{ path = ".config/qt5ct"; type = "cache"; }];
+    chvp.base.zfs.homeLinks = [
+      { path = ".config/qt5ct"; type = "cache"; }
+      { path = ".config/qt6ct"; type = "cache"; }
+    ];
     fonts = {
       fontDir.enable = true;
       fontconfig = {
@@ -32,7 +35,11 @@
 
     programs.dconf.enable = true;
     home-manager.users.charlotte = { pkgs, ... }: {
-      home.packages = [ pkgs.catppuccin-cursors.latteLight ];
+      home.packages = [
+        pkgs.catppuccin-cursors.latteLight
+        # Also install dark mode to profile for darkman
+        (pkgs.catppuccin-gtk.override { size = "compact"; variant = "frappe"; })
+      ];
       home.file = {
         ".icons/default/index.theme".text = ''
           [Icon Theme]
@@ -76,6 +83,42 @@
           package = pkgs.lightly-qt;
         };
       };
+      services.darkman = {
+        enable = true;
+        settings = {
+          lat = 51.0;
+          lng = 3.7;
+          usegeoclue = false;
+          dbusserver = true;
+          portal = true;
+        };
+        darkModeScripts = {
+          emacs = ''
+            emacsclient --eval "(setq catppuccin-flavor 'frappe)"
+            emacsclient --eval "(load-theme 'catppuccin :no-confirm)"
+          '';
+          gtk = ''
+            ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme Catppuccin-Frappe-Compact-Blue-Dark
+          '';
+          qt = ''
+            sed -i "s/Latte/Frappe/" ~/.config/qt5ct/qt5ct.conf
+            sed -i "s/Latte/Frappe/" ~/.config/qt6ct/qt6ct.conf
+          '';
+        };
+        lightModeScripts = {
+          emacs = ''
+            emacsclient --eval "(setq catppuccin-flavor 'latte)"
+            emacsclient --eval "(load-theme 'catppuccin :no-confirm)"
+          '';
+          gtk = ''
+            ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme Catppuccin-Latte-Compact-Blue-Light
+          '';
+          qt = ''
+            sed -i "s/Frappe/Latte/" ~/.config/qt5ct/qt5ct.conf
+            sed -i "s/Frappe/Latte/" ~/.config/qt6ct/qt6ct.conf
+          '';
+        };
+      };
     };
   };
 }