diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index a0a70830..f426b06e 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -53,25 +53,28 @@ in
       };
 
       color = {
+        installPackages = !headless;
         extraPackages = with pkgs; [
           papirus-icon-theme
           bibata-cursors
           inputs.waifu-cursors.packages.${pkgs.system}.all
         ];
 
-        scheme = "catppuccin-mocha";
-        font = builtins.head nixosConfig.fonts.fontconfig.defaultFonts.monospace;
         cursor = "Bibata-Modern-Classic";
         cursorSize = 24;
         cursorPackage = pkgs.bibata-cursors;
+
         iconTheme = "Papirus";
         iconPackage = pkgs.papirus-icon-theme;
-        wallpaper = "Windows";
 
+        scheme = "catppuccin-mocha";
         accent = "mauve";
         accentHl = "pink";
         accentDim = "lavender";
         accentText = "base";
+
+        wallpaper = "Windows";
+        font = builtins.head nixosConfig.fonts.fontconfig.defaultFonts.monospace;
       };
 
       docs.enable = !headless;
diff --git a/home/modules/color/default.nix b/home/modules/color/default.nix
index 1331c196..1aedd3aa 100644
--- a/home/modules/color/default.nix
+++ b/home/modules/color/default.nix
@@ -54,10 +54,9 @@ in {
       [
         applyColors
         printNixColors
-        color.iconPackage
-        color.cursorPackage
       ]
-      ++ color.extraPackages;
+      ++ (lib.optionals color.installPackages [color.iconPackage color.cursorPackage])
+      ++ (lib.optionals color.installPackages color.extraPackages);
 
     # This module sets its own options to the values specified in a colorscheme file.
     modules.color = let
diff --git a/home/modules/color/options.nix b/home/modules/color/options.nix
index 1e81d6f2..b2c8ca9a 100644
--- a/home/modules/color/options.nix
+++ b/home/modules/color/options.nix
@@ -97,6 +97,8 @@ in rec {
     default = [];
   };
 
+  installPackages = lib.mkEnableOption "Install cursor and icon themes";
+
   # This option is set automatically
   wallpapers = let
     # Collect all the available wallpapers.