diff --git a/modules/siren-auto-complete.el b/modules/siren-auto-complete.el
index ddefdf6..a1958f4 100644
--- a/modules/siren-auto-complete.el
+++ b/modules/siren-auto-complete.el
@@ -6,9 +6,10 @@
 
 ;;; Code:
 
+(require 'siren-flyspell)
+
 (use-package auto-complete
   :config
-  (require 'siren-flyspell)
   (ac-flyspell-workaround)
 
   (setq ac-auto-show-menu 0.2
diff --git a/modules/siren-coffee.el b/modules/siren-coffee.el
index b09aab5..d9e832e 100644
--- a/modules/siren-coffee.el
+++ b/modules/siren-coffee.el
@@ -6,13 +6,13 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+
 (use-package coffee-mode
   :mode "\\.coffee\\'"
   :interpreter "coffee"
 
   :config
-  (require 'siren-programming)
-
   (setq coffee-tab-width 2)
 
   (defun siren-coffee-mode-defaults ()
diff --git a/modules/siren-company.el b/modules/siren-company.el
index 14dc2dd..28f7acb 100644
--- a/modules/siren-company.el
+++ b/modules/siren-company.el
@@ -6,12 +6,12 @@
 
 ;;; Code:
 
+(require 'siren-fci)
+
 (use-package company
   :config
 
   ;; work-around for issues with fci-mode
-  (require 'siren-fci)
-
   (defvar-local company-fci-mode-on-p nil)
 
   (defun company-turn-off-fci (&rest ignore)
diff --git a/modules/siren-conf.el b/modules/siren-conf.el
index c716e24..327cf1c 100644
--- a/modules/siren-conf.el
+++ b/modules/siren-conf.el
@@ -6,11 +6,11 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+
 (use-package conf-mode
   :mode "Procfile\\'"
   :config
-  (require 'siren-programming)
-
   (defun siren-conf-mode-defaults ()
     (siren-prog-mode-defaults)
     (setq tab-width 2)
diff --git a/modules/siren-css.el b/modules/siren-css.el
index 033bcaa..976dff9 100644
--- a/modules/siren-css.el
+++ b/modules/siren-css.el
@@ -6,13 +6,12 @@
 
 ;;; Code:
 
+(require 'siren-programming)
 (require 'siren-rainbow)
 
 (use-package css-mode
   :mode "\\.css\\'"
   :config
-  (require 'siren-programming)
-
   (setq css-indent-offset 2)
 
   (defun siren-css-mode-defaults ()
diff --git a/modules/siren-cucumber.el b/modules/siren-cucumber.el
index 5cda5df..243fbea 100644
--- a/modules/siren-cucumber.el
+++ b/modules/siren-cucumber.el
@@ -6,13 +6,13 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+
 (use-package feature-mode
   :mode "\\.feature\\'"
   :interpreter "cucumber"
 
   :config
-  (require 'siren-programming)
-
   (defun siren-feature-mode-defaults ()
     (siren-prog-mode-defaults)
     (setq tab-width 2)
diff --git a/modules/siren-dockerfile.el b/modules/siren-dockerfile.el
index 1d339db..08ffd58 100644
--- a/modules/siren-dockerfile.el
+++ b/modules/siren-dockerfile.el
@@ -6,12 +6,12 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+
 (use-package dockerfile-mode
   :mode "Dockerfile\\'"
 
   :config
-  (require 'siren-programming)
-
   (defun siren-dockerfile-mode-defaults ()
     (siren-prog-mode-defaults)
     (subword-mode +1))
diff --git a/modules/siren-gitconfig.el b/modules/siren-gitconfig.el
index 975c5b2..80683fa 100644
--- a/modules/siren-gitconfig.el
+++ b/modules/siren-gitconfig.el
@@ -6,12 +6,12 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+
 (use-package gitconfig-mode
   :mode "\\.gitconfig" "gitconfig\\'" "\\.git\\\/config"
 
   :config
-  (require 'siren-programming)
-
   (defun siren-gitconfig-mode-defaults ()
     (siren-prog-mode-defaults)
     (setq tab-width 2)
diff --git a/modules/siren-gitignore.el b/modules/siren-gitignore.el
index be71c73..7a7d8ae 100644
--- a/modules/siren-gitignore.el
+++ b/modules/siren-gitignore.el
@@ -6,12 +6,12 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+
 (use-package gitignore-mode
   :mode "\\.gitignore" "gitignore\\'"
 
   :config
-  (require 'siren-programming)
-
   (defun siren-gitignore-mode-defaults ()
     (siren-prog-mode-defaults)
     (setq tab-width 2)
diff --git a/modules/siren-go.el b/modules/siren-go.el
index 4e684f7..cd50c83 100644
--- a/modules/siren-go.el
+++ b/modules/siren-go.el
@@ -6,6 +6,8 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+
 (use-package go-mode
   :mode "\\.go\\'"
   :interpreter "go"
@@ -31,7 +33,6 @@
 
   (define-key 'help-command (kbd "G") 'godoc)
 
-  (require 'siren-programming)
   (defun siren-go-mode-defaults ()
     (siren-prog-mode-defaults)
 
diff --git a/modules/siren-json.el b/modules/siren-json.el
index 0676d4b..d91af27 100644
--- a/modules/siren-json.el
+++ b/modules/siren-json.el
@@ -6,10 +6,11 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+
 (use-package json-mode
   :mode "\\.json\\'"
   :config
-  (require 'siren-programming)
   (require 'omnifmt)
 
   (defun siren-json-mode-defaults ()
diff --git a/modules/siren-lua.el b/modules/siren-lua.el
index b189b3a..e1b2bb0 100644
--- a/modules/siren-lua.el
+++ b/modules/siren-lua.el
@@ -6,10 +6,10 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+
 (use-package lua-mode
   :config
-  (require 'siren-programming)
-
   (defun siren-lua-mode-defaults ()
     (siren-prog-mode-defaults)
 
diff --git a/modules/siren-magit.el b/modules/siren-magit.el
index 7899d49..384b878 100644
--- a/modules/siren-magit.el
+++ b/modules/siren-magit.el
@@ -6,6 +6,10 @@
 
 ;;; Code:
 
+(require 'siren-fci)
+(require 'siren-flyspell)
+(require 'siren-ediff)
+
 (use-package magit
   :bind
   ("C-x g". magit-status)
@@ -15,9 +19,6 @@
   (defalias 'bl 'magit-blame)
 
   :config
-  (require 'siren-fci)
-  (require 'siren-flyspell)
-  (require 'siren-ediff)
   (require 'magit)
 
   (setq magit-completing-read-function 'magit-ido-completing-read
diff --git a/modules/siren-markdown.el b/modules/siren-markdown.el
index 6d31c64..ceb3bff 100644
--- a/modules/siren-markdown.el
+++ b/modules/siren-markdown.el
@@ -6,6 +6,9 @@
 
 ;;; Code:
 
+(require 'siren-flyspell)
+(require 'siren-smartparens)
+
 (use-package markdown-mode
   :mode
   "\\.md"
@@ -15,7 +18,6 @@
   "\\.markdown"
 
   :config
-  (require 'siren-flyspell)
   (setq markdown-command "redcarpet")
 
   (defun siren-markdown-mode-defaults ()
@@ -27,6 +29,7 @@
     (linum-mode t)
     (flyspell-mode)
     (auto-fill-mode)
+    (smartparens-mode +1)
     (subword-mode)
     (define-key markdown-mode-map (kbd "C-c p") 'markdown-preview))
 
diff --git a/modules/siren-neotree.el b/modules/siren-neotree.el
index 46a495a..52a4796 100644
--- a/modules/siren-neotree.el
+++ b/modules/siren-neotree.el
@@ -6,6 +6,9 @@
 
 ;;; Code:
 
+(require 'siren-all-the-icons)
+(require 'siren-projectile)
+
 (use-package neotree
   :bind
   ("C-x C-p" . neotree-toggle)
@@ -33,9 +36,6 @@ or the current buffer directory."
       (neotree-project-dir)))
 
   :config
-  (require 'siren-all-the-icons)
-  (require 'siren-projectile)
-
   (if window-system
       (setq neo-theme 'icons)
     (setq neo-theme 'ascii))
diff --git a/modules/siren-php.el b/modules/siren-php.el
index 89acab0..11dc69d 100644
--- a/modules/siren-php.el
+++ b/modules/siren-php.el
@@ -6,10 +6,11 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+(require 'siren-rainbow)
+
 (use-package php-mode
   :config
-  (require 'siren-rainbow)
-
   (defun siren-php-mode-defaults ()
     (siren-prog-mode-defaults)
     (rainbow-mode +1)
diff --git a/modules/siren-plantuml.el b/modules/siren-plantuml.el
index 2107343..5be9100 100644
--- a/modules/siren-plantuml.el
+++ b/modules/siren-plantuml.el
@@ -6,12 +6,12 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+
 (use-package plantuml-mode
   :mode "\\.uml\\'"
 
   :config
-  (require 'siren-programming)
-
   (defun siren-plantuml-mode-defaults ()
     (siren-prog-mode-defaults)
     (setq tab-width 2)
diff --git a/modules/siren-sass.el b/modules/siren-sass.el
index d77c559..5351444 100644
--- a/modules/siren-sass.el
+++ b/modules/siren-sass.el
@@ -6,12 +6,12 @@
 
 ;;; Code:
 
+(require 'siren-css)
+
 (use-package sass-mode
   :mode "\\.sass\\'"
 
   :config
-  (require 'siren-css)
-
   ;; turn off annoying auto-compile on save
   (setq sass-compile-at-save nil)
 
diff --git a/modules/siren-scss.el b/modules/siren-scss.el
index 9fe84c7..904f4ba 100644
--- a/modules/siren-scss.el
+++ b/modules/siren-scss.el
@@ -6,12 +6,12 @@
 
 ;;; Code:
 
+(require 'siren-css)
+
 (use-package scss-mode
   :mode "\\.scss\\'"
 
   :config
-  (require 'siren-css)
-
   ;; turn off annoying auto-compile on save
   (setq scss-compile-at-save nil)
 
diff --git a/modules/siren-thrift.el b/modules/siren-thrift.el
index 7e7f651..3e6944a 100644
--- a/modules/siren-thrift.el
+++ b/modules/siren-thrift.el
@@ -6,12 +6,12 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+
 (use-package thrift
   :mode "\\.thrift\\'"
 
   :config
-  (require 'siren-programming)
-
   (defun siren-thrift-mode-defaults ()
     (siren-prog-mode-defaults)
 
diff --git a/modules/siren-web-mode.el b/modules/siren-web-mode.el
index 326304d..fcc5639 100644
--- a/modules/siren-web-mode.el
+++ b/modules/siren-web-mode.el
@@ -6,14 +6,14 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+
 (use-package web-mode
   :mode
   "\\.html\\'"
   "\\.html.erb\\'"
 
   :config
-  (require 'siren-programming)
-
   (setq web-mode-code-indent-offset 2
         web-mode-css-indent-offset 2
         web-mode-markup-indent-offset 2
diff --git a/modules/siren-yaml.el b/modules/siren-yaml.el
index 663cccc..d5b16ed 100644
--- a/modules/siren-yaml.el
+++ b/modules/siren-yaml.el
@@ -6,11 +6,11 @@
 
 ;;; Code:
 
+(require 'siren-programming)
+
 (use-package yaml-mode
   :mode "\\.yml\\'" "\\.yaml\\'"
   :config
-  (require 'siren-programming)
-
   (defun siren-yaml-mode-defaults ()
     (siren-prog-mode-defaults)
     (setq tab-width 2
diff --git a/themes/siren-theme-doom-vibrant.el b/themes/siren-theme-doom-vibrant.el
index 0d8db47..588e264 100644
--- a/themes/siren-theme-doom-vibrant.el
+++ b/themes/siren-theme-doom-vibrant.el
@@ -6,10 +6,11 @@
 
 ;;; Code:
 
+(require 'siren-all-the-icons)
+
 (use-package doom-themes
   :ensure t
   :config
-  (require 'siren-all-the-icons)
 
   ;; Global settings (defaults)
   (setq doom-themes-enable-bold t    ; if nil, bold is universally disabled