diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el
index 1c7aeb9..2b22616 100644
--- a/core/siren-core-modules.el
+++ b/core/siren-core-modules.el
@@ -23,7 +23,9 @@
 ;; Editor
 (require 'siren-browse-kill-ring)
 (require 'siren-display-indentation)
+(require 'siren-fci)
 (require 'siren-helm-command)
+(require 'siren-highlight-symbol)
 (require 'siren-ido)
 (require 'siren-linum)
 (require 'siren-minions)
diff --git a/modules/completion/siren-company.el b/modules/completion/siren-company.el
index b4dbdf8..4a053ee 100644
--- a/modules/completion/siren-company.el
+++ b/modules/completion/siren-company.el
@@ -6,8 +6,6 @@
 
 ;;; Code:
 
-;; (require 'siren-fci)
-
 (use-package company
   :hook
   (company-completion-started . siren-company--turn-off-fci)
diff --git a/modules/navigation/siren-highlight-symbol.el b/modules/editor/siren-highlight-symbol.el
similarity index 100%
rename from modules/navigation/siren-highlight-symbol.el
rename to modules/editor/siren-highlight-symbol.el
diff --git a/modules/languages/siren-conf.el b/modules/languages/siren-conf.el
index 97f9639..fe5a9d4 100644
--- a/modules/languages/siren-conf.el
+++ b/modules/languages/siren-conf.el
@@ -6,14 +6,7 @@
 
 ;;; Code:
 
-(require 'siren-display-indentation)
-(require 'siren-fci)
-(require 'siren-flyspell)
-(require 'siren-linum)
 (require 'siren-prog-mode)
-(require 'siren-flycheck)
-(require 'siren-highlight-symbol)
-(require 'siren-smartparens)
 
 (use-package conf-mode
   :mode "Procfile\\'" "\\.conf\\'" "\\.cfg\\'"
@@ -21,16 +14,8 @@
 
   :init
   (defun siren-conf-mode-setup ()
-    (siren-prog-mode-setup)
-    (setq tab-width 2)
-
-    (siren-display-indentation)
-    (fci-mode)
-    (flycheck-mode)
-    (flyspell-prog-mode)
-    (highlight-symbol-mode)
-    (linum-mode)
-    (smartparens-mode)))
+    (run-hooks 'prog-mode-hook)
+    (setq tab-width 2)))
 
 (provide 'siren-conf)
 ;;; siren-conf.el ends here
diff --git a/modules/languages/siren-cucumber.el b/modules/languages/siren-cucumber.el
index 70b5df2..6fd5a78 100644
--- a/modules/languages/siren-cucumber.el
+++ b/modules/languages/siren-cucumber.el
@@ -6,14 +6,7 @@
 
 ;;; Code:
 
-(require 'siren-display-indentation)
-(require 'siren-fci)
-(require 'siren-flyspell)
-(require 'siren-linum)
 (require 'siren-prog-mode)
-(require 'siren-flycheck)
-(require 'siren-highlight-symbol)
-(require 'siren-smartparens)
 
 (use-package feature-mode
   :mode "\\.feature\\'"
@@ -22,16 +15,8 @@
 
   :init
   (defun siren-feature-mode-setup ()
-    (siren-prog-mode-setup)
-    (setq tab-width 2)
-
-    (siren-display-indentation)
-    (fci-mode)
-    (flycheck-mode)
-    (flyspell-prog-mode)
-    (highlight-symbol-mode)
-    (linum-mode)
-    (smartparens-mode)))
+    (run-hooks 'prog-mode-hook)
+    (setq tab-width 2)))
 
 (provide 'siren-cucumber)
 ;;; siren-cucumber.el ends here
diff --git a/modules/languages/siren-ruby.el b/modules/languages/siren-ruby.el
index 10290c2..c9835d1 100644
--- a/modules/languages/siren-ruby.el
+++ b/modules/languages/siren-ruby.el
@@ -10,7 +10,6 @@
 (require 'siren-folding)
 (require 'siren-projectile)
 (require 'siren-realgud)
-(require 'siren-smartparens)
 (require 'siren-toggle-quotes)
 
 (add-to-list 'projectile-globally-ignored-directories "vendor/bundle")
diff --git a/modules/languages/siren-thrift.el b/modules/languages/siren-thrift.el
index 0edc95a..ec0fcdf 100644
--- a/modules/languages/siren-thrift.el
+++ b/modules/languages/siren-thrift.el
@@ -6,13 +6,7 @@
 
 ;;; Code:
 
-(require 'siren-fci)
-(require 'siren-flyspell)
-(require 'siren-linum)
 (require 'siren-prog-mode)
-(require 'siren-flycheck)
-(require 'siren-highlight-symbol)
-(require 'siren-smartparens)
 
 (use-package thrift
   :mode "\\.thrift\\'"
@@ -20,15 +14,9 @@
 
   :init
   (defun siren-thrift-mode-setup ()
-    (siren-prog-mode-setup)
+    (run-hooks 'prog-mode-hook)
     (setq tab-width 2)
 
-    (fci-mode)
-    (flycheck-mode)
-    (flyspell-prog-mode)
-    (highlight-symbol-mode)
-    (linum-mode)
-    (smartparens-mode)
     (subword-mode +1)))
 
 (provide 'siren-thrift)
diff --git a/modules/languages/siren-yaml.el b/modules/languages/siren-yaml.el
index 198525b..e326db6 100644
--- a/modules/languages/siren-yaml.el
+++ b/modules/languages/siren-yaml.el
@@ -6,12 +6,7 @@
 
 ;;; Code:
 
-(require 'siren-display-indentation)
-(require 'siren-fci)
-(require 'siren-flyspell)
-(require 'siren-linum)
 (require 'siren-prog-mode)
-(require 'siren-smartparens)
 
 (use-package yaml-mode
   :mode "\\.yml\\'" "\\.yaml\\'"
@@ -23,15 +18,8 @@
 
   :init
   (defun siren-yaml-mode-setup ()
-    (siren-prog-mode-setup)
-    (setq tab-width 2
-          whitespace-action '(auto-cleanup))
-
-    (siren-display-indentation)
-    (fci-mode)
-    (flyspell-mode)
-    (linum-mode t)
-    (smartparens-mode +1)
+    (run-hooks 'prog-mode-hook)
+    (setq tab-width 2)
     (subword-mode +1)))
 
 (use-package yaml-imenu
diff --git a/modules/misc/siren-zone.el b/modules/misc/siren-zone.el
index fac2730..605f4c8 100644
--- a/modules/misc/siren-zone.el
+++ b/modules/misc/siren-zone.el
@@ -6,8 +6,6 @@
 
 ;;; Code:
 
-(require 'siren-linum)
-
 (use-package zone
   :ensure nil ;; loaded from emacs built-ins
   :init