diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el
index d89bbc1..082c49b 100644
--- a/core/siren-core-modules.el
+++ b/core/siren-core-modules.el
@@ -122,6 +122,7 @@
 (require 'siren-string-edit)
 (require 'siren-string-inflection)
 (require 'siren-toggle-comments)
+(require 'siren-tree-sitter)
 (require 'siren-yasnippet)
 
 ;; Version control
diff --git a/modules/languages/siren-css.el b/modules/languages/siren-css.el
index 536de58..ffcfded 100644
--- a/modules/languages/siren-css.el
+++ b/modules/languages/siren-css.el
@@ -9,7 +9,6 @@
 (require 'siren-lsp)
 (require 'siren-prettier-js)
 (require 'siren-rainbow)
-(require 'siren-tree-sitter)
 
 (use-package css-mode
   :mode "\\.css\\'"
@@ -24,7 +23,6 @@
   (defun siren-css-mode-setup ()
     (setq-local tab-width 2)
 
-    (tree-sitter-mode +1)
     (prettier-js-mode)
     (lsp-deferred)
     (rainbow-mode +1)))
diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el
index 4ff5829..f04896b 100644
--- a/modules/languages/siren-golang.el
+++ b/modules/languages/siren-golang.el
@@ -13,7 +13,6 @@
 (require 'siren-prog-mode)
 (require 'siren-projectile)
 (require 'siren-reformatter)
-(require 'siren-tree-sitter)
 
 (use-package go-mode
   :mode "\\.go\\'"
@@ -48,7 +47,6 @@
     (when (fboundp 'auto-highlight-symbol-mode)
       (auto-highlight-symbol-mode -1))
 
-    (tree-sitter-mode t)
     (origami-mode t)
     (subword-mode t))
 
diff --git a/modules/languages/siren-js.el b/modules/languages/siren-js.el
index c998f44..c26a0f7 100644
--- a/modules/languages/siren-js.el
+++ b/modules/languages/siren-js.el
@@ -8,7 +8,6 @@
 
 (require 'siren-lsp)
 (require 'siren-origami)
-(require 'siren-tree-sitter)
 
 (use-package js-mode
   :straight (:type built-in)
@@ -32,7 +31,6 @@
                   indent-level width
                   tab-width width))
 
-    (tree-sitter-mode t)
     (subword-mode t)
     (origami-mode t)))
 
diff --git a/modules/languages/siren-json.el b/modules/languages/siren-json.el
index b732583..85c40a2 100644
--- a/modules/languages/siren-json.el
+++ b/modules/languages/siren-json.el
@@ -9,7 +9,6 @@
 (require 'siren-js)
 (require 'siren-lsp)
 (require 'siren-origami)
-(require 'siren-tree-sitter)
 
 (use-package json-mode
   :mode "\\.json\\'"
@@ -31,7 +30,6 @@
                   json-reformat:indent-width width
                   tab-width width))
 
-    (tree-sitter-mode t)
     (origami-mode t))
 
   :init
diff --git a/modules/languages/siren-php.el b/modules/languages/siren-php.el
index 82be9c9..42dd82e 100644
--- a/modules/languages/siren-php.el
+++ b/modules/languages/siren-php.el
@@ -9,7 +9,6 @@
 (require 'siren-origami)
 (require 'siren-prettier-js)
 (require 'siren-rainbow)
-(require 'siren-tree-sitter)
 
 (use-package php-mode
   :interpreter "php"
@@ -19,7 +18,6 @@
 
   :preface
   (defun siren-php-mode-setup ()
-    (tree-sitter-mode t)
     (prettier-js-mode t)
     (rainbow-mode t)
     (subword-mode t)
diff --git a/modules/languages/siren-ruby.el b/modules/languages/siren-ruby.el
index ed81dba..46b2639 100644
--- a/modules/languages/siren-ruby.el
+++ b/modules/languages/siren-ruby.el
@@ -12,7 +12,6 @@
 (require 'siren-projectile)
 (require 'siren-string-inflection)
 (require 'siren-cycle-quotes)
-(require 'siren-tree-sitter)
 
 (use-package ruby-mode
   :straight (:type built-in)
@@ -60,7 +59,6 @@
                 ruby-use-smie t
                 tab-width 2)
 
-    (tree-sitter-mode t)
     (hs-minor-mode t)
     (subword-mode t))
 
diff --git a/modules/languages/siren-rust.el b/modules/languages/siren-rust.el
index 7ed1d60..9c5842a 100644
--- a/modules/languages/siren-rust.el
+++ b/modules/languages/siren-rust.el
@@ -8,7 +8,6 @@
 
 (require 'siren-lsp)
 (require 'siren-origami)
-(require 'siren-tree-sitter)
 
 (use-package rust-mode
   :mode "\\.rs\\'"
@@ -25,7 +24,6 @@
   (defun siren-rust-mode-setup ()
     (setq-local rust-format-on-save t)
 
-    (tree-sitter-mode t)
     (origami-mode t)
     (subword-mode t))
 
diff --git a/modules/languages/siren-sh.el b/modules/languages/siren-sh.el
index 4367696..f7df55d 100644
--- a/modules/languages/siren-sh.el
+++ b/modules/languages/siren-sh.el
@@ -6,8 +6,6 @@
 
 ;;; Code:
 
-(require 'siren-tree-sitter)
-
 (use-package sh-script
   :straight (:type built-in)
   :mode
@@ -38,8 +36,7 @@
   (defun siren-sh-mode-setup ()
     (setq-local tab-width 2)
 
-    (subword-mode +1)
-    (tree-sitter-mode +1)))
+    (subword-mode +1)))
 
 (use-package lsp-bash
   :straight lsp-mode
diff --git a/modules/languages/siren-terraform.el b/modules/languages/siren-terraform.el
index 4cd12b0..b9fbf06 100644
--- a/modules/languages/siren-terraform.el
+++ b/modules/languages/siren-terraform.el
@@ -8,7 +8,6 @@
 
 (require 'siren-lsp)
 (require 'siren-reformatter)
-(require 'siren-tree-sitter)
 
 (use-package terraform-mode
   :hook
@@ -20,7 +19,6 @@
   :preface
   (defun siren-terraform-mode-setup ()
     (setq-local tab-width 2)
-    (tree-sitter-hl-mode +1)
     (terraform-format-on-save-mode 1))
 
   :config
diff --git a/modules/languages/siren-typescript.el b/modules/languages/siren-typescript.el
index 2162148..2f0919d 100644
--- a/modules/languages/siren-typescript.el
+++ b/modules/languages/siren-typescript.el
@@ -10,7 +10,6 @@
 (require 'siren-lsp)
 (require 'siren-origami)
 (require 'siren-prettier-js)
-(require 'siren-tree-sitter)
 (require 'siren-web-mode)
 
 (use-package typescript-mode
@@ -57,7 +56,6 @@
     (setq-local flycheck-check-syntax-automatically '(save mode-enabled)
                 company-tooltip-align-annotations t)
 
-    (tree-sitter-mode t)
     (prettier-js-mode t)
     (flycheck-mode t)
     (eldoc-mode t)
diff --git a/modules/languages/siren-yaml.el b/modules/languages/siren-yaml.el
index 98a12c7..800e6d3 100644
--- a/modules/languages/siren-yaml.el
+++ b/modules/languages/siren-yaml.el
@@ -8,7 +8,6 @@
 
 (require 'siren-lsp)
 (require 'siren-prog-mode)
-(require 'siren-tree-sitter)
 
 (use-package yaml-mode
   :mode "\\.yml\\'" "\\.yaml\\'"
@@ -24,7 +23,6 @@
     (run-hooks 'prog-mode-hook)
 
     (setq-local tab-width 2)
-    (tree-sitter-mode t)
     (subword-mode t)))
 
 (use-package lsp-yaml
diff --git a/modules/text-editing/siren-tree-sitter.el b/modules/text-editing/siren-tree-sitter.el
index decf259..6355705 100644
--- a/modules/text-editing/siren-tree-sitter.el
+++ b/modules/text-editing/siren-tree-sitter.el
@@ -7,6 +7,22 @@
 ;;; Code:
 
 (use-package tree-sitter
+  :hook
+  ((css-mode
+    js-mode
+    json-mode
+    php-mode
+    ruby-mode
+    rust-mode
+    sh-mode
+    terraform-mode
+    typescript-mode
+    yaml-mode) . siren-tree-sitter-mode-enable)
+
+  :preface
+  (defun siren-tree-sitter-mode-enable ()
+    (tree-sitter-mode t))
+
   :defer t)
 
 (use-package tree-sitter-langs