diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el
index cd73fb0..a1f5913 100644
--- a/core/siren-core-modules.el
+++ b/core/siren-core-modules.el
@@ -43,6 +43,7 @@
 (require 'siren-rainbow)
 (require 'siren-recentf)
 (require 'siren-savehist)
+(require 'siren-subword)
 (require 'siren-symbol-overlay)
 (require 'siren-undo-fu)
 (require 'siren-undo-fu-session)
diff --git a/modules/editor/siren-subword.el b/modules/editor/siren-subword.el
new file mode 100644
index 0000000..a2059f7
--- /dev/null
+++ b/modules/editor/siren-subword.el
@@ -0,0 +1,13 @@
+;;; siren-subword.el --- jimeh's Emacs Siren: subword-mode configuration.
+
+;;; Commentary:
+
+;; Basic configuration for subword-mode.
+
+;;; Code:
+
+;; Turn on subword-mode in all buffers.
+(global-subword-mode)
+
+(provide 'siren-subword)
+;;; siren-subword.el ends here
diff --git a/modules/languages/siren-applescript.el b/modules/languages/siren-applescript.el
index db7bf7a..b1e9342 100644
--- a/modules/languages/siren-applescript.el
+++ b/modules/languages/siren-applescript.el
@@ -13,15 +13,15 @@
   "\\.applescript\\'"
   "\\.scpt\\'"
 
-  :hook (applescript-mode . siren-applescript-mode-setup)
+  :hook
+  (applescript-mode . siren-applescript-mode-setup)
 
   :preface
   (defun siren-applescript-mode-setup ()
     (run-hooks 'prog-mode-hook)
     (setq-local tab-width 4)
 
-    (highlight-symbol-mode -1)
-    (subword-mode +1)))
+    (highlight-symbol-mode -1)))
 
 (provide 'siren-applescript)
 ;;; siren-applescript.el ends here
diff --git a/modules/languages/siren-coffee.el b/modules/languages/siren-coffee.el
index d25d0e9..9f8153e 100644
--- a/modules/languages/siren-coffee.el
+++ b/modules/languages/siren-coffee.el
@@ -27,8 +27,7 @@
          (file-exists-p (coffee-compiled-file-name (buffer-file-name)))
          (coffee-cos-mode t))
 
-    (setq-local tab-width 2)
-    (subword-mode +1)))
+    (setq-local tab-width 2)))
 
 (provide 'siren-coffee)
 ;;; siren-coffee.el ends here
diff --git a/modules/languages/siren-dart.el b/modules/languages/siren-dart.el
index 6243cd2..dd29340 100644
--- a/modules/languages/siren-dart.el
+++ b/modules/languages/siren-dart.el
@@ -27,8 +27,7 @@
     (when (fboundp 'auto-highlight-symbol-mode)
       (auto-highlight-symbol-mode -1))
 
-    (lsp-deferred)
-    (subword-mode y))
+    (lsp-deferred))
 
   :init
   (with-eval-after-load 'projectile
diff --git a/modules/languages/siren-dockerfile.el b/modules/languages/siren-dockerfile.el
index 4ff7e63..9033fa6 100644
--- a/modules/languages/siren-dockerfile.el
+++ b/modules/languages/siren-dockerfile.el
@@ -14,7 +14,6 @@
   (defun siren-dockerfile-mode-setup ()
     (with-eval-after-load 'flycheck
       (flycheck-select-checker 'hadolint))
-    (subword-mode +1)
     (lsp-deferred)
     (lsp-format-buffer-on-save-mode +1))
 
diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el
index 3e5658c..1663208 100644
--- a/modules/languages/siren-golang.el
+++ b/modules/languages/siren-golang.el
@@ -44,14 +44,11 @@
     (when (fboundp 'highlight-symbol-mode)
       (highlight-symbol-mode -1))
     (when (fboundp 'auto-highlight-symbol-mode)
-      (auto-highlight-symbol-mode -1))
-
-    (subword-mode t))
+      (auto-highlight-symbol-mode -1)))
 
   (defun siren-go-dot-mod-mode-setup ()
     (run-hooks 'prog-mode-hook)
-    (setq-local tab-width siren-go-tab-width)
-    (subword-mode t))
+    (setq-local tab-width siren-go-tab-width))
 
   (defun siren-define-golines-format-mode ()
     ;; Setup golines formatter for manual use - on save formatting is handled by
diff --git a/modules/languages/siren-groovy.el b/modules/languages/siren-groovy.el
index 107a8ad..a8bbd98 100644
--- a/modules/languages/siren-groovy.el
+++ b/modules/languages/siren-groovy.el
@@ -15,9 +15,7 @@
   (defun siren-groovy-mode-setup ()
     (setq-local groovy-highlight-assignments t
                 groovy-indent-offset 4
-                tab-width 4)
-
-    (subword-mode +1)))
+                tab-width 4)))
 
 (provide 'siren-groovy)
 ;;; siren-groovy.el ends here
diff --git a/modules/languages/siren-haskell.el b/modules/languages/siren-haskell.el
index d612158..bdd9805 100644
--- a/modules/languages/siren-haskell.el
+++ b/modules/languages/siren-haskell.el
@@ -18,8 +18,7 @@
 
   :preface
   (defun siren-haskell-mode-setup ()
-    (hs-minor-mode)
-    (subword-mode t)))
+    (hs-minor-mode)))
 
 (provide 'siren-haskell)
 ;;; siren-haskell.el ends here
diff --git a/modules/languages/siren-jinja2.el b/modules/languages/siren-jinja2.el
index 95e2d1f..2aad126 100644
--- a/modules/languages/siren-jinja2.el
+++ b/modules/languages/siren-jinja2.el
@@ -14,8 +14,7 @@
 
   :preface
   (defun siren-jinja2-mode-setup ()
-    (run-hooks 'prog-mode-hook)
-    (subword-mode +1)))
+    (run-hooks 'prog-mode-hook)))
 
 (provide 'siren-jinja2)
 ;;; siren-jinja2.el ends here
diff --git a/modules/languages/siren-js.el b/modules/languages/siren-js.el
index 6d3960a..ea7abaa 100644
--- a/modules/languages/siren-js.el
+++ b/modules/languages/siren-js.el
@@ -27,9 +27,7 @@
     (let ((width 2))
       (setq-local js-indent-level width
                   indent-level width
-                  tab-width width))
-
-    (subword-mode t)))
+                  tab-width width))))
 
 (use-package lsp-javascript
   :straight lsp-mode
diff --git a/modules/languages/siren-jsonnet.el b/modules/languages/siren-jsonnet.el
index 9b7d98e..4b0fc04 100644
--- a/modules/languages/siren-jsonnet.el
+++ b/modules/languages/siren-jsonnet.el
@@ -23,7 +23,6 @@
   (defun siren-jsonnet-mode-setup ()
     "Default tweaks for `jsonnet-mode'."
     (jsonnet-format-buffer-on-save-mode t)
-    (subword-mode)
     (siren-folding))
 
   :config
diff --git a/modules/languages/siren-jsx.el b/modules/languages/siren-jsx.el
index e6c88e6..93f08d5 100644
--- a/modules/languages/siren-jsx.el
+++ b/modules/languages/siren-jsx.el
@@ -12,8 +12,7 @@
   :hook (rjsx-mode . siren-rjsx-mode-setup)
 
   :preface
-  (defun siren-rjsx-mode-setup ()
-    (subword-mode t)))
+  (defun siren-rjsx-mode-setup ()))
 
 (provide 'siren-jsx)
 ;;; siren-jsx.el ends here
diff --git a/modules/languages/siren-lua.el b/modules/languages/siren-lua.el
index 3d6f43d..6d9ecf8 100644
--- a/modules/languages/siren-lua.el
+++ b/modules/languages/siren-lua.el
@@ -12,10 +12,7 @@
 
   :preface
   (defun siren-lua-mode-setup ()
-    (setq-local lua-indent-level 2
-                whitespace-action '(auto-cleanup))
-
-    (subword-mode +1)))
+    (setq-local lua-indent-level 2)))
 
 (use-package lsp-lua
   :straight lsp-mode
diff --git a/modules/languages/siren-makefile.el b/modules/languages/siren-makefile.el
index 311b387..8315057 100644
--- a/modules/languages/siren-makefile.el
+++ b/modules/languages/siren-makefile.el
@@ -20,7 +20,6 @@
 
   :preface
   (defun siren-makefile-mode-setup ()
-    (subword-mode +1)
     (siren-display-indentation -1)
     (setq-local tab-width 4))
 
diff --git a/modules/languages/siren-markdown.el b/modules/languages/siren-markdown.el
index 5253908..84c4224 100644
--- a/modules/languages/siren-markdown.el
+++ b/modules/languages/siren-markdown.el
@@ -51,8 +51,7 @@
     (siren-display-line-numbers t)
     (auto-fill-mode t)
     (flyspell-mode t)
-    (smartparens-mode t)
-    (subword-mode t))
+    (smartparens-mode t))
 
   (defun siren-markdown-mode-setup-prettier ()
     "Configure prettier-js-args based on auto-fill-column mode."
diff --git a/modules/languages/siren-php.el b/modules/languages/siren-php.el
index b0503c6..2145422 100644
--- a/modules/languages/siren-php.el
+++ b/modules/languages/siren-php.el
@@ -14,8 +14,7 @@
   (php-mode . siren-php-mode-setup)
 
   :preface
-  (defun siren-php-mode-setup ()
-    (subword-mode t)))
+  (defun siren-php-mode-setup ()))
 
 (provide 'siren-php)
 ;;; siren-php.el ends here
diff --git a/modules/languages/siren-protobuf.el b/modules/languages/siren-protobuf.el
index 781aa42..b4d725b 100644
--- a/modules/languages/siren-protobuf.el
+++ b/modules/languages/siren-protobuf.el
@@ -28,9 +28,7 @@
     (if (not (flycheck-protobuf-buf-project-root))
         (clang-format-on-save-mode t)
       (setq-local flycheck-checker 'protobuf-buf)
-      (buf-format-on-save-mode t))
-
-    (subword-mode t))
+      (buf-format-on-save-mode t)))
 
   (defun flycheck-protobuf-buf-project-root (&optional _checker)
     "Return the nearest directory holding the buf.yaml configuration."
diff --git a/modules/languages/siren-ruby.el b/modules/languages/siren-ruby.el
index 46b2639..87a6bc8 100644
--- a/modules/languages/siren-ruby.el
+++ b/modules/languages/siren-ruby.el
@@ -59,8 +59,7 @@
                 ruby-use-smie t
                 tab-width 2)
 
-    (hs-minor-mode t)
-    (subword-mode t))
+    (hs-minor-mode t))
 
   :init
   (with-eval-after-load 'projectile
diff --git a/modules/languages/siren-rust.el b/modules/languages/siren-rust.el
index 063cb75..af637fd 100644
--- a/modules/languages/siren-rust.el
+++ b/modules/languages/siren-rust.el
@@ -21,9 +21,7 @@
 
   :preface
   (defun siren-rust-mode-setup ()
-    (setq-local rust-format-on-save t)
-
-    (subword-mode t)))
+    (setq-local rust-format-on-save t)))
 
 (use-package lsp-rust
   :straight lsp-mode
diff --git a/modules/languages/siren-sh.el b/modules/languages/siren-sh.el
index f7df55d..ca0879f 100644
--- a/modules/languages/siren-sh.el
+++ b/modules/languages/siren-sh.el
@@ -34,9 +34,7 @@
 
   :preface
   (defun siren-sh-mode-setup ()
-    (setq-local tab-width 2)
-
-    (subword-mode +1)))
+    (setq-local tab-width 2)))
 
 (use-package lsp-bash
   :straight lsp-mode
diff --git a/modules/languages/siren-thrift.el b/modules/languages/siren-thrift.el
index b016900..bc34456 100644
--- a/modules/languages/siren-thrift.el
+++ b/modules/languages/siren-thrift.el
@@ -15,9 +15,7 @@
   :preface
   (defun siren-thrift-mode-setup ()
     (run-hooks 'prog-mode-hook)
-    (setq-local tab-width 2)
-
-    (subword-mode +1)))
+    (setq-local tab-width 2)))
 
 (provide 'siren-thrift)
 ;;; siren-thrift.el ends here
diff --git a/modules/languages/siren-typescript.el b/modules/languages/siren-typescript.el
index 845b4dc..cacaa62 100644
--- a/modules/languages/siren-typescript.el
+++ b/modules/languages/siren-typescript.el
@@ -29,7 +29,6 @@
                   tab-width width))
 
     (lsp-deferred)
-    (subword-mode t)
     (flycheck-mode t)))
 
 (use-package tide
diff --git a/modules/languages/siren-vue.el b/modules/languages/siren-vue.el
index 415ba46..e062ae1 100644
--- a/modules/languages/siren-vue.el
+++ b/modules/languages/siren-vue.el
@@ -15,7 +15,6 @@
   :preface
   (defun siren-vue-mode-setup ()
     (lsp-deferred)
-    (subword-mode)
     (siren-folding)))
 
 (provide 'siren-vue)
diff --git a/modules/languages/siren-web-mode.el b/modules/languages/siren-web-mode.el
index 7eda468..209f12f 100644
--- a/modules/languages/siren-web-mode.el
+++ b/modules/languages/siren-web-mode.el
@@ -40,8 +40,7 @@
       (siren-display-fill-column -1))
 
     (lsp-deferred)
-    (hs-minor-mode t)
-    (subword-mode t)))
+    (hs-minor-mode t)))
 
 (provide 'siren-web-mode)
 ;;; siren-web-mode.el ends here
diff --git a/modules/languages/siren-yaml.el b/modules/languages/siren-yaml.el
index 800e6d3..26cc571 100644
--- a/modules/languages/siren-yaml.el
+++ b/modules/languages/siren-yaml.el
@@ -21,9 +21,7 @@
   :preface
   (defun siren-yaml-mode-setup ()
     (run-hooks 'prog-mode-hook)
-
-    (setq-local tab-width 2)
-    (subword-mode t)))
+    (setq-local tab-width 2)))
 
 (use-package lsp-yaml
   :straight lsp-mode
diff --git a/modules/version-control/siren-magit.el b/modules/version-control/siren-magit.el
index 3507152..73afea5 100644
--- a/modules/version-control/siren-magit.el
+++ b/modules/version-control/siren-magit.el
@@ -58,7 +58,6 @@
     (auto-fill-mode t)
     (flyspell-mode t)
     (smartparens-mode t)
-    (subword-mode t)
     (whitespace-mode t))
 
   :config