diff --git a/modules/siren-avy.el b/modules/siren-avy.el
index c6d1526..049114b 100644
--- a/modules/siren-avy.el
+++ b/modules/siren-avy.el
@@ -14,9 +14,12 @@
   ("M-o" . ace-window)
 
   :config
-  (use-package ace-window)
   (setq avy-background t
         avy-style 'at-full))
 
+(use-package ace-window
+  :bind
+  ("M-o" . ace-window))
+
 (provide 'siren-avy)
 ;;; siren-avy.el ends here
diff --git a/modules/siren-css.el b/modules/siren-css.el
index 52b3c06..033bcaa 100644
--- a/modules/siren-css.el
+++ b/modules/siren-css.el
@@ -6,10 +6,11 @@
 
 ;;; Code:
 
+(require 'siren-rainbow)
+
 (use-package css-mode
   :mode "\\.css\\'"
   :config
-  (use-package rainbow-mode)
   (require 'siren-programming)
 
   (setq css-indent-offset 2)
diff --git a/modules/siren-elscreen.el b/modules/siren-elscreen.el
index 86c75ab..a614f13 100644
--- a/modules/siren-elscreen.el
+++ b/modules/siren-elscreen.el
@@ -27,10 +27,10 @@
          ("C-;" . elscreen-display-screen-name-list))
 
   :config
-  (use-package elscreen-buffer-group)
-
   ;; Start ElScreen.
   (elscreen-start))
 
+(use-package elscreen-buffer-group :defer t)
+
 (provide 'siren-elscreen)
 ;;; siren-elscreen.el ends here
diff --git a/modules/siren-go.el b/modules/siren-go.el
index b06ae53..4e684f7 100644
--- a/modules/siren-go.el
+++ b/modules/siren-go.el
@@ -22,25 +22,6 @@
 
   :config
   (message "loading go-mode")
-  (use-package company-go)
-  (use-package go-eldoc)
-  (use-package go-guru)
-  (use-package go-rename)
-  (use-package gotest)
-
-  (use-package go-projectile
-    :init
-    ;; prevent go-projectile from screwing up GOPATH
-    (setq go-projectile-switch-gopath 'never))
-
-  (use-package flycheck-gometalinter
-    :init
-    (setq flycheck-gometalinter-fast t
-          flycheck-gometalinter-tests t
-          flycheck-gometalinter-vendor t)
-    :config
-    (eval-after-load 'flycheck
-      '(add-hook 'flycheck-mode-hook #'flycheck-gometalinter-setup)))
 
   (when (memq window-system '(mac ns))
     (exec-path-from-shell-copy-env "GOPATH"))
@@ -92,5 +73,26 @@
   (add-hook 'go-mode-hook (lambda ()
                             (run-hooks 'siren-go-mode-hook))))
 
+(use-package company-go :defer t)
+(use-package go-eldoc :defer t)
+(use-package go-guru :defer t)
+(use-package go-rename :defer t)
+(use-package gotest :defer t)
+
+(use-package go-projectile
+  :defer t
+  :init
+  ;; prevent go-projectile from screwing up GOPATH
+  (setq go-projectile-switch-gopath 'never))
+
+(use-package flycheck-gometalinter
+  :init
+  (setq flycheck-gometalinter-fast t
+        flycheck-gometalinter-tests t
+        flycheck-gometalinter-vendor t)
+  :config
+  (eval-after-load 'flycheck
+    '(add-hook 'flycheck-mode-hook #'flycheck-gometalinter-setup)))
+
 (provide 'siren-go)
 ;;; siren-go.el ends here
diff --git a/modules/siren-helm.el b/modules/siren-helm.el
index 6564e23..a83a599 100644
--- a/modules/siren-helm.el
+++ b/modules/siren-helm.el
@@ -17,7 +17,7 @@
   ("C-c C-'" . helm-do-ag-project-root)
 
   :config
-  (setq helm-ag-ignore-patterns '("*.sql")
+  (setq helm-ag-ignore-patterns '("*.sql" "archive-contents")
         helm-ag-source-type "file-line"))
 
 (use-package helm-descbinds
diff --git a/modules/siren-magit.el b/modules/siren-magit.el
index 3a07e68..7899d49 100644
--- a/modules/siren-magit.el
+++ b/modules/siren-magit.el
@@ -20,11 +20,6 @@
   (require 'siren-ediff)
   (require 'magit)
 
-  (use-package magit-gh-pulls
-    :config
-    (setq gh-use-local-git-config t)
-    (add-hook 'magit-mode-hook 'turn-on-magit-gh-pulls))
-
   (setq magit-completing-read-function 'magit-ido-completing-read
         magit-status-buffer-switch-function 'switch-to-buffer
         magit-bury-buffer-function 'bury-buffer
@@ -50,5 +45,10 @@
   (add-hook 'git-commit-mode-hook (lambda ()
                                     (run-hooks 'siren-git-commit-mode-hook))))
 
+(use-package magit-gh-pulls
+  :config
+  (setq gh-use-local-git-config t)
+  (add-hook 'magit-mode-hook 'turn-on-magit-gh-pulls))
+
 (provide 'siren-magit)
 ;;; siren-magit.el ends here
diff --git a/modules/siren-package-lint.el b/modules/siren-package-lint.el
index c761d93..8fb170c 100644
--- a/modules/siren-package-lint.el
+++ b/modules/siren-package-lint.el
@@ -2,16 +2,17 @@
 
 ;;; Commentary:
 
-;; Basic configuration for avy. Avy allows us to effectively navigate to visible
-;; things.
+;; Basic configuration for package-lint.
 
 ;;; Code:
 
 (use-package package-lint
+  :defer t)
+
+(use-package flycheck-package
   :defer t
   :config
-  (use-package flycheck-package
-    :config (flycheck-package-setup)))
+  (flycheck-package-setup))
 
 (provide 'siren-package-lint)
 ;;; siren-package-lint.el ends here