diff --git a/init.el b/init.el
index 81c71e9..733b19f 100644
--- a/init.el
+++ b/init.el
@@ -669,12 +669,12 @@
   :hook (after-init . (lambda () (vertico-mode +1)))
   :custom
   (vertico-cycle t)
-  (require 'vertico-directory)
-  (require 'marginalia)
-  (require 'orderless))
+  :config
+  (require 'vertico-directory))
 
 (use-package marginalia
   :functions marginalia-mode
+  :hook (after-init . (lambda () (marginalia-mode +1)))
   :custom
   (marginalia-annotators '(marginalia-annotators-heavy
                            marginalia-annotators-light
@@ -701,17 +701,16 @@
   :functions (corfu-mode
               global-corfu-mode
               corfu-history-mode)
-  :hook (minibuffer-setup . (lambda ()
-                              "Enable `corfu-mode' for `M-:' and `M-!'."
-                              (when (local-variable-p 'completion-at-point-functions)
-                                (corfu-mode +1))))
+  :hook ((after-init . (lambda () (global-corfu-mode +1)))
+	 (minibuffer-setup . (lambda ()
+                               "Enable `corfu-mode' for `M-:' and `M-!'."
+                               (when (local-variable-p 'completion-at-point-functions)
+                                 (corfu-mode +1)))))
   :bind ( :map corfu-map
           ("M-SPC" . corfu-insert-separator)
           ("RET" . nil)
           ("TAB" . corfu-insert)
           ([tab] . corfu-insert))
-  :init
-  (global-corfu-mode +1)
   :custom
   (corfu-cycle t)
   (corfu-auto nil)
@@ -842,9 +841,9 @@
   :requires treesit
   :functions (treesit-auto-add-to-auto-mode-alist
               global-treesit-auto-mode)
+  :hook (after-init . (lambda () (global-treesit-auto-mode +1)))
   :config
-  (treesit-auto-add-to-auto-mode-alist)
-  (global-treesit-auto-mode +1))
+  (treesit-auto-add-to-auto-mode-alist))
 
 (use-package eldoc
   :custom
@@ -929,7 +928,7 @@
 (use-package flymake
   :bind (("C-c C-." . flymake-goto-next-error)
          ("C-c C-," . flymake-goto-prev-error))
-  :hook (prog-mode . (lambda () (flymake-mode +1)))
+  :hook ((prog-mode yaml-ts-mode) . (lambda () (flymake-mode +1)))
   :custom
   (flymake-no-changes-timeout 1)
   (flymake-show-diagnostics-at-end-of-line nil))
@@ -938,7 +937,7 @@
   :diminish
   :functions flymake-popon-mode
   :requires flymake
-  :hook (flymake-mode . (lambda () (flymake-popon-mode +1))))
+  :hook ((flymake-mode . (lambda () (flymake-popon-mode +1)))))
 
 (use-package flymake-shellcheck
   :if (executable-find "shellcheck")
@@ -949,9 +948,7 @@
   :if (executable-find "yamllint")
   :functions flymake-yamllint-setup
   :requires flymake
-  :hook (yaml-ts-mode . (lambda ()
-                          (progn (flymake-mode +1)
-                                 (flymake-yamllint-setup)))))
+  :hook (yaml-ts-mode . flymake-yamllint-setup))
 
 (use-package flymake-eslint
   :if (executable-find "eslint")
@@ -1007,10 +1004,6 @@ Calls `project-remember-projects-under' for ~/Projects/"
                             ("\\`\\(?:sourcehut:\\|sh:\\)\\([^:]+\\)\\'" "git.sr.ht" "sourcehut.user")
                             ("\\`\\(?:gitea:\\|gt:\\)\\([^:]+\\)\\'" "git.xenia.me.uk" "gitea.user"))))
 
-(use-package forge-topic
-  :custom
-  (forge-topic-list-limit '(60 . 10)))
-
 (use-package treemacs
   :functions (treemacs treemacs-load-theme)
   :bind (("M-g t" . treemacs-select-window))
@@ -1210,10 +1203,10 @@ Calls `project-remember-projects-under' for ~/Projects/"
   (elfeed-tube-setup))
 
 (use-package password-store
+  :defer t
   :functions password-store-get)
 
 (use-package pass
-  :defer t
   :bind (("C-c P" . pass))
   :custom
   (pass-show-keybindings nil)