diff --git a/flake.lock b/flake.lock
index de56abf..f418c37 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1750506804,
-        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
+        "lastModified": 1755615617,
+        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
+        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
         "type": "github"
       },
       "original": {
diff --git a/home/develop/emacs.nix b/home/develop/emacs.nix
index 8befadc..98bfa5c 100644
--- a/home/develop/emacs.nix
+++ b/home/develop/emacs.nix
@@ -84,7 +84,7 @@
 
       # === CODE FORMATTING AND CLEANUP ===
       web-beautify            # Format and beautify web code (HTML/CSS/JS)
-      whitespace-cleanup-mode # Automatically clean up whitespace on save
+      ethan-wspace            # Automatically clean up whitespace on save
 
       # === PARENTHESES AND STRUCTURE EDITING ===
       paredit                 # Balanced parentheses editing for Lisp-like languages
diff --git a/home/develop/emacs/custom.el b/home/develop/emacs/custom.el
index 7aa618b..de6d6eb 100644
--- a/home/develop/emacs/custom.el
+++ b/home/develop/emacs/custom.el
@@ -387,11 +387,15 @@ frame if FRAME is nil, and to 1 if AMT is nil."
   (yas-global-mode 1))
 
 ;; Clean up whitespace
-(use-package whitespace-cleanup-mode
-  :diminish
+(use-package ethan-wspace
+  :ensure t
+  :diminish ethan-wspace-mode
   :config
-  (setq whitespace-cleanup-mode-only-if-initially-clean nil)
-  (global-whitespace-cleanup-mode))
+  ;; Enable globally
+  (global-ethan-wspace-mode 1)
+
+  ;; Customize what to clean
+  (setq mode-require-final-newline nil)) ; ethan-wspace handles this
 
 ;; Rainbow delimiters
 (use-package rainbow-delimiters)