diff --git a/init.el b/init.el
index b4b692c..855bfff 100644
--- a/init.el
+++ b/init.el
@@ -840,9 +840,9 @@
 ;;; Packages
 
 (setup (:require gforth)
-  (autoload 'forth-mode "gforth")
+  (:autoload forth-mode
+             forth-block-mode)
   (add-to-list 'auto-mode-alist '("\\.fs\\'" . forth-mode))
-  (autoload 'forth-block-mode "gforth")
   (add-to-list 'auto-mode-alist '("\\.fb\\'" . forth-block-mode)))
 
 (setup (:straight (0x0 :host gitlab
@@ -952,7 +952,7 @@
   
   
   ;; Registers
-  (autoload 'consult-register-preview "consult")
+  (:autoload consult-register-preview)
   (:option register-preview-delay 0
            register-preview-function #'consult-register-format)
   (:advise register-preview :override #'consult-register-window)
@@ -1006,8 +1006,8 @@
   
   (:hook acdw/reading-mode)
   
-  (autoload 'elpher-bookmarks "elpher" nil t)
-  (autoload 'elpher-go "elpher" nil t)
+  (:autoload (elpher-bookmarks :interactive t)
+             (elpher-go :interactive t))
   
   ;; Make `eww' gemini/gopher aware.  From Emacswiki.
   ;; (define-advice eww-browse-url (:around (fn url &rest args) gemini-elpher)
@@ -1166,8 +1166,7 @@
                                 (_ 'message))))
 
 (setup (:straight async)
-  (autoload 'dired-async-mode "dired-async.el" nil t)
-  
+  (:autoload (dired-async-mode :interactive t))
   (dired-async-mode +1)
   
   (add-hook 'dired-mode
@@ -1385,6 +1384,10 @@
 (setup (:straight eros)
   (:hook-into emacs-lisp-mode))
 
+(setup (:straight esh-autosuggest)
+  (:autoload esh-autosuggest-mode)
+  (:hook-into eshell-mode))
+
 (setup (:straight expand-region)
   (:global "C-=" #'er/expand-region
            "C-SPC"
@@ -1899,7 +1902,7 @@ If used with a numeric prefix argument N, N backticks will be inserted."
 
 (setup (:straight-if fennel-mode
                      (executable-find "fennel"))
-  (autoload 'fennel-repl "fennel-mode" nil t)
+  (:autoload (fennel-repl :interactive t))
   (:file-match (rx ".fnl" eos)))
 
 (setup (:straight-if geiser