diff --git a/configurations/laptop/home.nix b/configurations/laptop/home.nix
index c8a46e26..c0d429cb 100644
--- a/configurations/laptop/home.nix
+++ b/configurations/laptop/home.nix
@@ -53,7 +53,7 @@
   };
 
   home.sessionVariables = {
-    EDITOR = "emacsclient -n";
+    EDITOR = "emacsclient -c";
   };
 
 }
diff --git a/global-home.nix b/global-home.nix
index 1cf734e6..60df4405 100644
--- a/global-home.nix
+++ b/global-home.nix
@@ -314,7 +314,7 @@ fi
   ];
   
   home.sessionVariables = {
-    EDITOR = "emacsclient -n";
+    EDITOR = "emacsclient -c";
     # EDITOR = "nvim";
 
     # Dotnet path not found fix
diff --git a/global.nix b/global.nix
index 1a1eb0f8..43338436 100644
--- a/global.nix
+++ b/global.nix
@@ -28,6 +28,7 @@
     six
     rapidfuzz
     paramiko
+    packaging
   ];
   python-with-my-packages = pkgs.python3.withPackages my-python-packages;
   in
@@ -202,7 +203,7 @@
 
     # Set neovim to be used instead of less for viewing manpages
     # MANPAGER = "nvim +Man!";
-    MANPAGER = "emacsclient -n";
+    MANPAGER = "emacsclient -c";
 
     # Nicer terminal prompt
     PS1="\[\e[0;36m\]\u\[\e[0m\]@\[\e[0;33m\]\h\[\e[0m\]:\[\e[0;35m\]\w\[\e[0m\] \$ ";
diff --git a/modules/nixos/cspark-desktop-exwm/module.nix b/modules/nixos/cspark-desktop-exwm/module.nix
index 49a06752..a1c3a34d 100644
--- a/modules/nixos/cspark-desktop-exwm/module.nix
+++ b/modules/nixos/cspark-desktop-exwm/module.nix
@@ -42,6 +42,7 @@ in
       udiskie # Automounting drives
       dunst # Notification daemon
 
+      scrot # Screenshot tool
       lxqt.pcmanfm-qt # File Manager
       lxqt.lxqt-archiver # Archiver
       qt6Packages.qt6ct # Manage QT6 Themes
@@ -131,7 +132,7 @@ in
     };
 
     environment.sessionVariables = {
-      EDITOR="emacsclient -n";
+      EDITOR="emacsclient -c";
       QT_QPA_PLATFORMTHEME = "qt6ct";
       SDL_VIDEODRIVER = "x11,windows";
       _JAVA_AWT_WM_NONREPARENTING = "1";
@@ -139,7 +140,7 @@ in
       SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass";
     };
     environment.variables = {
-      EDITOR="emacsclient -n";
+      EDITOR="emacsclient -c";
       QT_QPA_PLATFORMTHEME = "qt6ct";
       SDL_VIDEODRIVER = "x11,windows";
       _JAVA_AWT_WM_NONREPARENTING = "1";