diff --git a/lisp/mitch-packages.el b/lisp/mitch-packages.el
index 6325428..4c96d1d 100644
--- a/lisp/mitch-packages.el
+++ b/lisp/mitch-packages.el
@@ -53,10 +53,10 @@
 (use-package evil-commentary
   :diminish 'evil-commentary-mode
   :config (evil-commentary-mode)
-  :after evil)
+  :hook (prog-mode . evil-commentary-mode))
 (use-package evil-surround
   :diminish 'global-evil-surround-mode
-  :after evil
+  :hook (prog-mode . evil-surround-mode)
   :config (global-evil-surround-mode 1))
 (use-package evil-terminal-cursor-changer
   :after evil
@@ -483,11 +483,13 @@
 (use-package popon
   :straight
   (:type git
-         :repo "https://codeberg.org/akib/emacs-popon"))
+         :repo "https://codeberg.org/akib/emacs-popon")
+  :if (not (display-graphic-p)))
 (use-package corfu-terminal
   :straight
   (:type git
          :repo "https://codeberg.org/akib/emacs-corfu-terminal")
+  :after popon
   :init (unless
             (display-graphic-p)
           (corfu-terminal-mode +1)))