diff --git a/modules/languages/siren-rust.el b/modules/languages/siren-rust.el
index 4a107ad..064468e 100644
--- a/modules/languages/siren-rust.el
+++ b/modules/languages/siren-rust.el
@@ -36,7 +36,8 @@
   :after rust-mode
   :hook (flycheck-mode . flycheck-rust-setup))
 
-(use-package rust-playground)
+(use-package rust-playground
+  :defer t)
 
 (provide 'siren-rust)
 ;;; siren-rust.el ends here
diff --git a/modules/languages/siren-yaml.el b/modules/languages/siren-yaml.el
index 35b9f5b..3591e99 100644
--- a/modules/languages/siren-yaml.el
+++ b/modules/languages/siren-yaml.el
@@ -25,6 +25,7 @@
     (subword-mode +1)))
 
 (use-package yaml-imenu
+  :after yaml-mode
   :config
   (yaml-imenu-enable))
 
diff --git a/modules/misc/siren-zone.el b/modules/misc/siren-zone.el
index 5746396..853a939 100644
--- a/modules/misc/siren-zone.el
+++ b/modules/misc/siren-zone.el
@@ -8,6 +8,7 @@
 
 (use-package zone
   :straight (:type built-in)
+  :defer t
 
   :init
   (defun zone-choose (pgm)
@@ -20,7 +21,8 @@
     (let ((zone-programs (list (intern pgm))))
       (zone))))
 
-(use-package zone-nyan)
+(use-package zone-nyan
+  :defer t)
 
 (provide 'siren-zone)
 ;;; siren-zone.el ends here
diff --git a/modules/navigation/siren-anzu.el b/modules/navigation/siren-anzu.el
index eeaa53c..b26643e 100644
--- a/modules/navigation/siren-anzu.el
+++ b/modules/navigation/siren-anzu.el
@@ -7,6 +7,10 @@
 ;;; Code:
 
 (use-package anzu
+  :bind
+  ("C-x C-r" . anzu-query-replace-regexp)
+  ("M-%" . anzu-query-replace)
+
   :custom
   (anzu-mode-lighter "")
   (anzu-deactivate-region t)
@@ -20,7 +24,6 @@
 
   (global-set-key [remap query-replace] 'anzu-query-replace)
   (global-set-key [remap query-replace-regexp] 'anzu-query-replace-regexp)
-  (global-set-key (kbd "C-x C-r") 'anzu-query-replace-regexp)
 
   (global-anzu-mode +1))
 
diff --git a/modules/navigation/siren-dired.el b/modules/navigation/siren-dired.el
index 42e760c..bd9d14e 100644
--- a/modules/navigation/siren-dired.el
+++ b/modules/navigation/siren-dired.el
@@ -8,6 +8,7 @@
 
 (use-package dired
   :straight (:type built-in)
+  :defer t
   :bind (:map dired-mode-map
               ("M-?" . siren-dired-display-size))
 
@@ -62,6 +63,7 @@
               (file-attributes filename)))))
 
   :config
+  (require 'dired+)
   (when (string-match-p "^gnu" (symbol-name system-type))
     (setq dired-use-ls-dired t
           dired-listing-switches "-aBhl"))
@@ -74,10 +76,11 @@
               dired-listing-switches "-aBhl")))))
 
 (use-package dired-x
-  :straight (:type built-in))
+  :straight (:type built-in)
+  :after dired)
 
 (use-package dired+
-  :demand t
+  :defer t
   :bind (:map dired-mode-map
               ("c" . dired-create-directory)
               ("C-l" . diredp-up-directory-reuse-dir-buffer))
@@ -94,10 +97,12 @@
   (unbind-key "M-l" dired-mode-map))
 
 (use-package dired-subtree
+  :after dired
   :bind (:map dired-mode-map
               ("TAB" . dired-subtree-toggle)))
 
 (use-package dired-narrow
+  :after dired
   :bind (:map dired-mode-map
               ("C-s" . dired-narrow))
 
diff --git a/modules/navigation/siren-helm.el b/modules/navigation/siren-helm.el
index 7031d53..e295613 100755
--- a/modules/navigation/siren-helm.el
+++ b/modules/navigation/siren-helm.el
@@ -11,7 +11,7 @@
 
 (use-package helm-global-bindings
   :straight helm
-  :demand t
+  :demand
   :bind
   (:map helm-command-map
         ("M" . helm-man-woman))
diff --git a/modules/navigation/siren-imenu.el b/modules/navigation/siren-imenu.el
index f8cc960..d4e21e3 100644
--- a/modules/navigation/siren-imenu.el
+++ b/modules/navigation/siren-imenu.el
@@ -11,6 +11,7 @@
 
 (use-package imenu
   :straight (:type built-in)
+  :defer t
 
   :custom
   (imenu-auto-rescan t)
diff --git a/modules/shell/siren-vterm.el b/modules/shell/siren-vterm.el
index 5aee9f3..9250f0d 100644
--- a/modules/shell/siren-vterm.el
+++ b/modules/shell/siren-vterm.el
@@ -9,6 +9,7 @@
 (require 'siren-windmove)
 
 (use-package vterm
+  :defer t
   :hook
   (vterm-mode . siren-vterm-mode-setup)
 
diff --git a/modules/text-editing/siren-multiple-cursors.el b/modules/text-editing/siren-multiple-cursors.el
index 058bc5c..1137718 100644
--- a/modules/text-editing/siren-multiple-cursors.el
+++ b/modules/text-editing/siren-multiple-cursors.el
@@ -24,6 +24,7 @@
 
 ;; Allows searching forward/back (C-s/C-r) searching with multiple cursors.
 (use-package phi-search
+  :after multiple-cursors
   :custom
   (phi-search-limit 3000))