diff --git a/modules/users/common.nix b/modules/users/common.nix
index 9d54f6d..cb1a0b1 100644
--- a/modules/users/common.nix
+++ b/modules/users/common.nix
@@ -53,7 +53,7 @@
     sessionVariables = {
       EDITOR = "emacs";
       BROWSER = "firefox";
-      TERMINAL = "alacritty";
+      TERMINAL = "kitty";
     };
   };
 
@@ -64,10 +64,6 @@
     
     # Communication
     firefox
-    thunderbird
-    
-    # Productivity
-    libreoffice
     
     # Development (basic)
     git
@@ -75,7 +71,7 @@
     wget
     
     # Media
-    vlc
+    celluloid
     
     # Utilities
     file
@@ -104,8 +100,6 @@
       };
     };
     
-    # Enable CUPS for printing
-    printing.enable = true;
     
     # Enable sound
     pipewire = {
diff --git a/modules/users/geir.nix b/modules/users/geir.nix
index da820dd..fc71315 100644
--- a/modules/users/geir.nix
+++ b/modules/users/geir.nix
@@ -62,8 +62,7 @@
       emacsPackages.vterm
       
       # Media & Entertainment
-      vlc
-      mpv
+      celluloid
       
       # File Management
       nautilus