diff --git a/lisp/mitch-packages.el b/lisp/mitch-packages.el
index a6674bf..77e568c 100644
--- a/lisp/mitch-packages.el
+++ b/lisp/mitch-packages.el
@@ -40,11 +40,10 @@ NAME and ARGS are in `use-package'."
 (use-package whitespace
   :straight (:type built-in)
   :defer 1
-  :diminish global-whitespace-mode
+  :diminish whitespace-mode
   :custom
   (whitespace-style '(face lines-tail))
   (whitespace-line-column 80)
-  :config (global-whitespace-mode t))
 (use-package eshell
   :straight (:type built-in)
   :commands (eshell/emacs eshell/man)
@@ -464,16 +463,11 @@ targets."
   (org-hide-leading-stars t)
   (org-startup-indented t)
   :config
-  (defun local-disable-whitespace ()
-    "Disable whitespace-mode in the current buffer."
-    (setq-local whitespace-style nil))
   (add-hook 'after-save-hook
-            #'(lambda () (if (equal major-mode 'org-mode)
-                             (org-babel-tangle))))
-  (add-hook 'org-mode-hook
-            (local-disable-whitespace))
+	    #'(lambda () (if (equal major-mode 'org-mode)
+			(org-babel-tangle))))
   :hook (org-mode . turn-off-line-numbers))
-(use-package org-tempo
+(use-feature org-tempo
   :straight (:type built-in)
   :after org
   :config