diff --git a/home/develop/emacs.nix b/home/develop/emacs.nix
index 8befadc..cad20e0 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
+      ws-butler               # 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..3d42713 100644
--- a/home/develop/emacs/custom.el
+++ b/home/develop/emacs/custom.el
@@ -387,11 +387,13 @@ 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 ws-butler
+  :ensure t
+  :diminish ws-butler-mode
   :config
-  (setq whitespace-cleanup-mode-only-if-initially-clean nil)
-  (global-whitespace-cleanup-mode))
+  (ws-butler-global-mode t)
+  ;; Keep whitespace before point when editing
+  (setq ws-butler-keep-whitespace-before-point t))
 
 ;; Rainbow delimiters
 (use-package rainbow-delimiters)