diff --git a/lisp/doom-editor.el b/lisp/doom-editor.el
index 9f79d7d57..2159b885c 100644
--- a/lisp/doom-editor.el
+++ b/lisp/doom-editor.el
@@ -584,7 +584,9 @@ current buffer."
                    filename))
           (prog1 (apply fn args)
             (when (buffer-live-p buf)
-              (with-current-buffer buf (goto-char pos)))))))))
+              (with-current-buffer buf (goto-char pos))))))))
+  :config
+  (setq helpful-set-variable-function #'setq!))
 
 
 (use-package! smartparens
diff --git a/lisp/doom-ui.el b/lisp/doom-ui.el
index 360998c66..ab5e116a3 100644
--- a/lisp/doom-ui.el
+++ b/lisp/doom-ui.el
@@ -546,7 +546,9 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
         (dolist (script '(symbol mathematical))
           (set-fontset-font t script symbol-font)))
       (when emoji-font
-        (set-fontset-font t 'emoji emoji-font)
+        ;; DEPRECATED: make unconditional when we drop 27 support
+        (when (version<= "28.1" emacs-version)
+          (set-fontset-font t 'emoji emoji-font))
         ;; some characters in the Emacs symbol script are often covered by emoji
         ;; fonts
         (set-fontset-font t 'symbol emoji-font nil 'append)))
diff --git a/lisp/packages.el b/lisp/packages.el
index fcf692262..07c83ce38 100644
--- a/lisp/packages.el
+++ b/lisp/packages.el
@@ -17,11 +17,11 @@
             :branch ,straight-repository-branch
             :local-repo "straight.el"
             :files ("straight*.el"))
-  :pin "5e84c4e2cd8ca79560477782ee4c9e5187725def")
+  :pin "b3760f5829dba37e855add7323304561eb57a3d4")
 
 ;; doom-ui.el
 (package! all-the-icons :pin "be9d5dcda9c892e8ca1535e288620eec075eb0be")
-(package! nerd-icons :pin "619a0382d2e159f3142c4200fe4cfc2e89247ef1")
+(package! nerd-icons :pin "e109d09b95706bb93c821b1229ca09cf00195690")
 (package! hide-mode-line :pin "bc5d293576c5e08c29e694078b96a5ed85631942")
 (package! highlight-numbers :pin "8b4744c7f46c72b1d3d599d4fb75ef8183dee307")
 (package! rainbow-delimiters :pin "f40ece58df8b2f0fb6c8576b527755a552a5e763")
@@ -30,9 +30,9 @@
 ;; doom-editor.el
 (package! better-jumper :pin "47622213783ece37d5337dc28d33b530540fc319")
 (package! dtrt-indent :pin "e0630f74f915c6cded05f76f66d66e540fcc37c3")
-(package! helpful :pin "66ba816b26b68dd7df08e86f8b96eaae16c8d6a2")
+(package! helpful :pin "a32a5b3d959a7fccf09a71d97b3d7c888ac31c69")
 (package! pcre2el :pin "018531ba0cf8e2b28d1108136a0e031b6a45f1c1")
-(package! smartparens :pin "79a338db115f441cd47bb91e6f75816c5e78a772")
+(package! smartparens :pin "0778a8a84064cf2bc3a9857bd0e7a4619cc1e5c3")
 (package! ws-butler
   ;; Use my fork of ws-butler, which has a few choice improvements and
   ;; optimizations (the original has been abandoned).
@@ -40,8 +40,8 @@
   :pin "572a10c11b6cb88293de48acbb59a059d36f9ba5")
 
 ;; doom-projects.el
-(package! projectile :pin "971cd5c4f25ff1f84ab7e8337ffc7f89f67a1b52")
-(package! project :pin "ce140cdb70138a4938c999d4606a52dbeced4676")
+(package! projectile :pin "9446ea92d28462aeb37846a8be0a0c97a7bc0cee")
+(package! project :pin "f64bcf065c0731caecbdcff5ca1c7f2d711b5b1e")
 
 ;; doom-keybinds.el
 (package! general :pin "833dea2c4a60e06fcd552b653dfc8960935c9fb4")
@@ -49,4 +49,4 @@
 
 (package! compat
   :recipe (:host github :repo "emacs-compat/compat")
-  :pin "ecf53005abf6f0325d14e0e024222e22e982c8dd")
+  :pin "ea8de2ea18cf7c348aadb6eb2aeb2a9d840bd064")
diff --git a/modules/app/rss/README.org b/modules/app/rss/README.org
index cd05ed240..f4a092151 100644
--- a/modules/app/rss/README.org
+++ b/modules/app/rss/README.org
@@ -78,7 +78,7 @@ configure feeds to follow:
 - You can "name" feeds as you please with ~org-mode~ ~org-insert-link~ ([[kbd:][C-c C-l]])
   and put name as you want into ~description~.
 - If you don't want to use ~org-directory/elfeed.org~ file you can specify it
-  with ~(setq rmh-elfeed-org-files '("path/to/your/elfeed/file.org))~
+  with ~(setq rmh-elfeed-org-files '("path/to/your/elfeed/file.org"))~
 
 ** Keybindings
 + General
diff --git a/modules/app/rss/packages.el b/modules/app/rss/packages.el
index f78955804..f486b1729 100644
--- a/modules/app/rss/packages.el
+++ b/modules/app/rss/packages.el
@@ -4,4 +4,4 @@
 (package! elfeed :pin "55fb162fa27e71b88effa59a83c57842e262b00f")
 (package! elfeed-goodies :pin "544ef42ead011d960a0ad1c1d34df5d222461a6b")
 (when (modulep! +org)
-  (package! elfeed-org :pin "7f3ad868f2fa3c17492340f7af84f208b9c25635"))
+  (package! elfeed-org :pin "fe59a96969bd321f5f9ec7317a4bc80943b94c86"))
diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el
index a6014cbf2..c00d4a70a 100644
--- a/modules/completion/corfu/config.el
+++ b/modules/completion/corfu/config.el
@@ -9,8 +9,8 @@ major mode regardless of size.")
 ;;
 ;;; Packages
 (use-package! corfu
-  :hook (doom-first-buffer . global-corfu-mode)
-  :hook (org-mode . corfu-mode)
+  :hook ((doom-first-buffer . global-corfu-mode)
+         (org-mode . corfu-mode))
   :init
   (when (modulep! +orderless)
     (after! orderless
diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el
index 3e56729ff..74d7b942c 100644
--- a/modules/editor/evil/config.el
+++ b/modules/editor/evil/config.el
@@ -245,8 +245,6 @@ directives. By default, this only recognizes C directives.")
   :hook (org-mode . embrace-org-mode-hook)
   :hook (ruby-mode . embrace-ruby-mode-hook)
   :hook (emacs-lisp-mode . embrace-emacs-lisp-mode-hook)
-  :hook ((lisp-mode emacs-lisp-mode clojure-mode racket-mode hy-mode)
-         . +evil-embrace-lisp-mode-hook-h)
   :hook ((c++-mode c++-ts-mode rustic-mode csharp-mode java-mode swift-mode typescript-mode)
          . +evil-embrace-angle-bracket-modes-hook-h)
   :hook (scala-mode . +evil-embrace-scala-mode-hook-h)
@@ -284,16 +282,6 @@ directives. By default, this only recognizes C directives.")
             embrace--pairs-list))
     (embrace-add-pair-regexp ?l "\\[a-z]+{" "}" #'+evil--embrace-latex))
 
-  (defun +evil-embrace-lisp-mode-hook-h ()
-    ;; Avoid `embrace-add-pair-regexp' because it would overwrite the default
-    ;; `f' rule, which we want for other modes
-    (push (cons ?f (make-embrace-pair-struct
-                    :key ?f
-                    :read-function #'+evil--embrace-elisp-fn
-                    :left-regexp "([^ ]+ "
-                    :right-regexp ")"))
-          embrace--pairs-list))
-
   (defun +evil-embrace-angle-bracket-modes-hook-h ()
     (let ((var (make-local-variable 'evil-embrace-evil-surround-keys)))
       (set var (delq ?< evil-embrace-evil-surround-keys))
diff --git a/modules/editor/fold/packages.el b/modules/editor/fold/packages.el
index 8676dbac8..032d3ed72 100644
--- a/modules/editor/fold/packages.el
+++ b/modules/editor/fold/packages.el
@@ -7,5 +7,5 @@
 (when (modulep! :editor evil)
   (package! evil-vimish-fold :pin "b6e0e6b91b8cd047e80debef1a536d9d49eef31a"))
 (when (modulep! :tools tree-sitter)
-  (package! ts-fold :pin "9d9e0c5cf7b5397e06571bb6bf497598dc8796a8"
+  (package! ts-fold :pin "75e72c658ad8d8aac3af554a6b51b3c5c22dd0aa"
     :recipe (:host github :repo "emacs-tree-sitter/ts-fold")))
diff --git a/modules/lang/clojure/README.org b/modules/lang/clojure/README.org
index 36f57233a..d9d98d2e8 100644
--- a/modules/lang/clojure/README.org
+++ b/modules/lang/clojure/README.org
@@ -43,6 +43,8 @@ This module adds support for the Clojure(Script) language.
 
 This module requires:
 - [[https://clojure.org/][clojure]]
+
+This module optionally requires:
 - [[https://github.com/borkdude/clj-kondo][clj-kondo]], for linting code (if [[doom-module::checkers syntax]])
 - [[https://clojure-lsp.github.io/clojure-lsp/][clojure-lsp]], for LSP support (if [[doom-module:+lsp]])
 - [[https://github.com/babashka/neil][neil]] for the ability to add packages to your Clojure project from Emacs
@@ -147,10 +149,17 @@ Several bindings used for viewing documentation for various functions, both insi
 | [[kbd:][K]]                 | ~+lookup/documentation~ |
 
 
-* TODO Configuration
-#+begin_quote
- 󱌣 This module has no configuration documentation yet. [[doom-contrib-module:][Write some?]]
-#+end_quote
+* Configuration
+** =enrich-classpath=
+In recent versions, an option has been introduced that attempts to improve the experience of CIDER by accessing java source & javadocs, though this option is still currently considered beta.
+
+In order to opt into this, add the following to your =config.el=
+
+#+begin_src emacs-lisp
+(setq cider-enrich-classpath t)
+#+end_src
+
+See [[https://docs.cider.mx/cider/config/basic_config.html#use-enrich-classpath][the docs]] for more
 
 * Troubleshooting
 /There are no known problems with this module./ [[doom-report:][Report one?]]
diff --git a/modules/lang/clojure/packages.el b/modules/lang/clojure/packages.el
index 5603afe85..33c4f5fe9 100644
--- a/modules/lang/clojure/packages.el
+++ b/modules/lang/clojure/packages.el
@@ -10,17 +10,17 @@
 
 ;; HACK Forward declare these clj-refactor/cider deps so that their deps are
 ;;      byte-compiled first.
-(package! parseclj :pin "4d0e780e00f1828b00c43099e6eebc6582998f72")
-(package! parseedn :pin "a09686fbb9113b8b1b4f20c9e1dc0d6fea01a64f")
+(package! parseclj :pin "74ff7d63fed92a3c859e474ae85f011e794b751a")
+(package! parseedn :pin "c8f07926a688bfe995fde4460103915d401a1aff")
 
 ;;; Core packages
-(package! clojure-mode :pin "3453cd229b412227aaffd1dc2870fa8fa213c5b1")
-(package! clj-refactor :pin "b5abe655e572a6ecfed02bb8164b64716ef76b8e")
-(package! cider :pin "1ed5163433c991c00ea83fdd4447e8daf4aeccbe")
+(package! clojure-mode :pin "25d713a67d8e0209ee74bfc0153fdf677697b43f")
+(package! clj-refactor :pin "0a2a6cbc2e29177f4f55730637a357433a03fa38")
+(package! cider :pin "120fd885d37c07137f1c162e8d522ab3eed1ac3f")
 (when (and (modulep! :checkers syntax)
            (not (modulep! :checkers syntax +flymake)))
   (package! flycheck-clj-kondo :pin "ff7bed2315755cfe02ef471edf522e27b78cd5ca"))
-(package! jet :pin "f007660c568e924e32d486a02aa4cd18203313cc")
+(package! jet :pin "7d5157aac692fc761d8ed7a9f820fa6522136254")
 (package! neil
   :recipe (:host github :repo "babashka/neil" :files ("*.el"))
-  :pin "1dbac785cee4af8ad499839adbb83a8a297e7c70")
+  :pin "40993873bb4ef6d88af450e8a96d03275e266f6b")
diff --git a/modules/lang/java/packages.el b/modules/lang/java/packages.el
index 8bbde7eaf..e9ec41e84 100644
--- a/modules/lang/java/packages.el
+++ b/modules/lang/java/packages.el
@@ -2,10 +2,10 @@
 ;;; lang/java/packages.el
 
 (package! android-mode :pin "d5332e339a1f5e30559a53feffb8442ca79265d6")
-(package! groovy-mode :pin "c612ac1e9f742856914ad6e8eb9e9dc169f489ab")
+(package! groovy-mode :pin "7b8520b2e2d3ab1d62b35c426e17ac25ed0120bb")
 
 (when (modulep! +meghanada)
-  (package! meghanada :pin "59c46cabb7eee715fe810ce59424934a1286df84"))
+  (package! meghanada :pin "fb29746e442e3d7b903759d15977d142a4bf2131"))
 
 (when (modulep! +eclim)
   (package! eclim :pin "222ddd48fcf0ee01592dec77c58e0cf3f2ea1100")
@@ -14,4 +14,4 @@
 
 (when (modulep! +lsp)
   (unless (modulep! :tools lsp +eglot)
-    (package! lsp-java :pin "dbe448a886e2f4fb5d3a616f4499adbe643ba7a5")))
+    (package! lsp-java :pin "449673da7221a30f1b1756cedcc48b9a2b52a51e")))
diff --git a/modules/lang/markdown/config.el b/modules/lang/markdown/config.el
index 6602d1339..6182d8eb1 100644
--- a/modules/lang/markdown/config.el
+++ b/modules/lang/markdown/config.el
@@ -26,10 +26,6 @@ capture, the end position, and the output buffer.")
         markdown-make-gfm-checkboxes-buttons t
         markdown-fontify-whole-heading-line t
 
-        ;; HACK Due to jrblevin/markdown-mode#578, invoking `imenu' throws a
-        ;;      'wrong-type-argument consp nil' error if you use native-comp.
-        markdown-nested-imenu-heading-index (not (ignore-errors (native-comp-available-p)))
-
         ;; `+markdown-compile' offers support for many transpilers (see
         ;; `+markdown-compile-functions'), which it tries until one succeeds.
         markdown-command #'+markdown-compile
diff --git a/modules/lang/markdown/packages.el b/modules/lang/markdown/packages.el
index 1afd00040..cc59bb7fc 100644
--- a/modules/lang/markdown/packages.el
+++ b/modules/lang/markdown/packages.el
@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/markdown/packages.el
 
-(package! markdown-mode :pin "c765b73b370f0fcaaa3cee28b2be69652e2d2c39")
+(package! markdown-mode :pin "b1a862f0165b7bafe0f874738a55be1b1720dd7d")
 (package! markdown-toc :pin "3d724e518a897343b5ede0b976d6fb46c46bcc01")
 (package! edit-indirect :pin "f80f63822ffae78de38dbe72cacaeb1aaa96c732")
 
diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el
index 6ca2c2211..8690b1318 100644
--- a/modules/lang/org/autoload/org.el
+++ b/modules/lang/org/autoload/org.el
@@ -508,7 +508,11 @@ All my (performant) foldings needs are met between this and `org-show-subtree'
        ;; Must be done on a timer because `org-show-set-visibility' (used by
        ;; `org-reveal') relies on overlays that aren't immediately available
        ;; when `org-mode' first initializes.
-       (run-at-time 0.1 nil #'org-reveal '(4))))
+       (let ((buf (current-buffer)))
+         (unless (doom-temp-buffer-p buf)
+           (run-at-time 0.1 nil (lambda ()
+                                  (with-current-buffer buf
+                                    (org-reveal '(4)))))))))
 
 ;;;###autoload
 (defun +org-remove-occur-highlights-h ()
diff --git a/modules/lang/plantuml/config.el b/modules/lang/plantuml/config.el
index f55d45395..64ff4ed13 100644
--- a/modules/lang/plantuml/config.el
+++ b/modules/lang/plantuml/config.el
@@ -17,7 +17,11 @@
 (use-package! flycheck-plantuml
   :when (modulep! :checkers syntax)
   :after plantuml-mode
-  :config (flycheck-plantuml-setup))
+  :config
+  (flycheck-plantuml-setup)
+  (when (eq plantuml-default-exec-mode 'executable)
+    ;; Surprisingly, this works, even though flycheck-plantuml specifies -Djava.awt...
+    (setq-default flycheck-plantuml-executable plantuml-executable-path)))
 
 
 (after! ob-plantuml
diff --git a/modules/lang/scala/packages.el b/modules/lang/scala/packages.el
index 8616e07ee..ba727aef4 100644
--- a/modules/lang/scala/packages.el
+++ b/modules/lang/scala/packages.el
@@ -6,4 +6,4 @@
 
 (when (and (modulep! +lsp)
            (not (modulep! :tools lsp +eglot)))
-  (package! lsp-metals :pin "a2df7263ece6ac69214e41c52d66aab8d3f650eb"))
+  (package! lsp-metals :pin "da7e54ed65f4e153c94b9c54689908dce142ef37"))
diff --git a/modules/term/eshell/config.el b/modules/term/eshell/config.el
index 91db53186..cf2beb9b2 100644
--- a/modules/term/eshell/config.el
+++ b/modules/term/eshell/config.el
@@ -69,7 +69,7 @@ You should use `set-eshell-alias!' to change this.")
         ;; TODO Use `eshell-input-filter-initial-space' when Emacs 25 support is dropped
         eshell-input-filter (lambda (input) (not (string-match-p "\\`\\s-+" input)))
         ;; em-prompt
-        eshell-prompt-regexp "^.* λ "
+        eshell-prompt-regexp "^[^#$\n]* [#$λ] "
         eshell-prompt-function #'+eshell-default-prompt-fn
         ;; em-glob
         eshell-glob-case-insensitive t
@@ -105,6 +105,12 @@ You should use `set-eshell-alias!' to change this.")
   ;; cursor comes close to the left/right edges of the window.
   (setq-hook! 'eshell-mode-hook hscroll-margin 0)
 
+  ;; Recognize prompts as Imenu entries.
+  (setq-hook! 'eshell-mode-hook
+    imenu-generic-expression
+    `((,(propertize "λ" 'face 'eshell-prompt)
+       ,(concat eshell-prompt-regexp "\\(.*\\)") 1)))
+
   ;; Don't auto-write our aliases! Let us manage our own `eshell-aliases-file'
   ;; or configure `+eshell-aliases' via elisp.
   (advice-add #'eshell-write-aliases-list :override #'ignore)
@@ -230,7 +236,9 @@ Emacs versions < 29."
 
 
 (use-package eshell-syntax-highlighting
-  :hook (eshell-mode . eshell-syntax-highlighting-mode))
+  :hook (eshell-mode . eshell-syntax-highlighting-mode)
+  :init
+  (add-hook 'eshell-syntax-highlighting-elisp-buffer-setup-hook #'highlight-quoted-mode))
 
 
 (use-package! fish-completion
diff --git a/modules/term/eshell/packages.el b/modules/term/eshell/packages.el
index 128c16500..4bbff9fe5 100644
--- a/modules/term/eshell/packages.el
+++ b/modules/term/eshell/packages.el
@@ -6,8 +6,8 @@
 (package! shrink-path :pin "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
 (package! esh-help :pin "417673ed18a983930a66a6692dbfb288a995cb80")
 (package! eshell-did-you-mean :pin "80cd8c4b186a2fb29621cf634bcf2bcd914f1e3d")
-(package! eshell-syntax-highlighting :pin "8bf0494ca71944b9d4bfb8ec3c93ea29d46bc2f9")
+(package! eshell-syntax-highlighting :pin "4ac27eec6595ba116a6151dfaf0b0e0440101e10")
 
 (unless IS-WINDOWS
-  (package! fish-completion :pin "10384881817b5ae38cf6197a077a663420090d2c")
+  (package! fish-completion :pin "df42e153082927536763bdf408184152a7c938c3")
   (package! bash-completion :pin "f1daac0386c24cbe8a244a62c7588cc6847b07ae"))
diff --git a/modules/tools/debugger/packages.el b/modules/tools/debugger/packages.el
index b418d4d3a..208504513 100644
--- a/modules/tools/debugger/packages.el
+++ b/modules/tools/debugger/packages.el
@@ -1,10 +1,10 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/debugger/packages.el
 
-(when (package! realgud :pin "220ce2c348dab6cfc1cfa3c3f59644e777f9e8ff")
+(when (package! realgud :pin "365063ea8ce8ec6a852cb388088d84147421c3c2")
   (when (modulep! :lang javascript)
     (package! realgud-trepan-ni :pin "0ec088ea343835e24ae73da09bea96bfb02a3130")))
 
 (when (modulep! +lsp)
-  (package! dap-mode :pin "096070aacff875a09c13e596e5d60a55e0f07ab1")
+  (package! dap-mode :pin "755845ae053bbfdd3f7b3dca13efa4be480370b5")
   (package! posframe :pin "017deece88360c7297265680d78a0bb316470716"))
diff --git a/modules/tools/lsp/+eglot.el b/modules/tools/lsp/+eglot.el
index 95294f5eb..5b56b600e 100644
--- a/modules/tools/lsp/+eglot.el
+++ b/modules/tools/lsp/+eglot.el
@@ -16,6 +16,12 @@
   (setq eglot-sync-connect 1
         eglot-autoshutdown t
         eglot-send-changes-idle-time 0.5
+        ;; NOTE This setting disable the eglot-events-buffer enabling more
+        ;;      consistent performance on long running emacs instance.
+        ;;      Default is 2000000 lines. After each new event the whole buffer
+        ;;      is pretty printed which causes steady performance decrease over time.
+        ;;      CPU is spent on pretty priting and Emacs GC is put under high pressure.
+        eglot-events-buffer-size 0
         ;; NOTE We disable eglot-auto-display-help-buffer because :select t in
         ;;      its popup rule causes eglot to steal focus too often.
         eglot-auto-display-help-buffer nil)
@@ -32,7 +38,7 @@
     :type-definition #'eglot-find-typeDefinition
     :documentation   #'+eglot-lookup-documentation)
 
-  (add-to-list 'doom-debug-variables '(eglot-events-buffer-size . 0))
+  (add-to-list 'doom-debug-variables '(eglot-events-buffer-size . 2000000))
 
   (defadvice! +lsp--defer-server-shutdown-a (fn &optional server)
     "Defer server shutdown for a few seconds.
diff --git a/modules/tools/lsp/packages.el b/modules/tools/lsp/packages.el
index c4f76e1d6..8ca5f8cd5 100644
--- a/modules/tools/lsp/packages.el
+++ b/modules/tools/lsp/packages.el
@@ -3,13 +3,13 @@
 
 (if (modulep! +eglot)
     (progn
-      (package! eglot :pin "8ccec6532e70f68289a06acc24437986a8a8a6c1")
+      (package! eglot :pin "2b145778ba5e57f393e50aea76b28e518c401828")
       (when (modulep! :completion vertico)
         (package! consult-eglot :pin "db9d41c9812a5a8a7b9a22fa7f3c314e37584d41"))
       (when (and (modulep! :checkers syntax)
              (not (modulep! :checkers syntax +flymake)))
         (package! flycheck-eglot :pin "9ff8d0068be59b1450964b390349d75a68af21ed")))
-  (package! lsp-mode :pin "266945b3e470212305812581d24a938a96c47a3a")
+  (package! lsp-mode :pin "d441f3d268a31a4a514af2db506a5eec47ee617d")
   (package! lsp-ui :pin "0dd39900c8ed8145d207985cb2f65cedd1ffb410")
   (when (modulep! :completion ivy)
     (package! lsp-ivy :pin "9ecf4dd9b1207109802bd1882aa621eb1c385106"))
diff --git a/modules/tools/terraform/README.org b/modules/tools/terraform/README.org
index ade7f1820..36506eb99 100644
--- a/modules/tools/terraform/README.org
+++ b/modules/tools/terraform/README.org
@@ -12,7 +12,9 @@ run Terraform commands directly from Emacs.
 /This module has no dedicated maintainers./ [[doom-contrib-maintainer:][Become a maintainer?]]
 
 ** Module flags
-/This module has no flags./
+- +lsp ::
+  Enable LSP support for ~terraform-mode~. Requires [[doom-module::tools lsp]] and a langserver
+  (supports terraform-ls or terraform-lsp).
 
 ** Packages
 - [[doom-package:company-terraform]] if [[doom-package::completion company]]
diff --git a/modules/tools/tree-sitter/packages.el b/modules/tools/tree-sitter/packages.el
index 6b57fb998..c2f9a1ef5 100644
--- a/modules/tools/tree-sitter/packages.el
+++ b/modules/tools/tree-sitter/packages.el
@@ -2,9 +2,9 @@
 ;;; tools/tree-sitter/packages.el
 
 (package! tree-sitter :pin "3cfab8a0e945db9b3df84437f27945746a43cc71")
-(package! tree-sitter-langs :pin "2f0f97abbd97e17773a24eec3f329d262f81d020")
+(package! tree-sitter-langs :pin "3a3ad0527d5f8c7768678878eb5cfe399bedf703")
 (package! tree-sitter-indent :pin "4ef246db3e4ff99f672fe5e4b416c890f885c09e")
 
 (when (modulep! :editor evil +everywhere)
   (package! evil-textobj-tree-sitter
-    :pin "19979843f5fc437917f9a4dae977f5e6d4793726"))
+    :pin "9a9edd42a2dca9dfd0bc6026d47f689fa117b90f"))
diff --git a/modules/tools/upload/README.org b/modules/tools/upload/README.org
index 0cdff03e6..ecd373ca1 100644
--- a/modules/tools/upload/README.org
+++ b/modules/tools/upload/README.org
@@ -45,9 +45,9 @@ Uses ~ssh-deploy~ to map a local folder to a remote one. Set
 ~ssh-deploy-root-remote~ and ~ssh-deploy-root-local~ in a =.dir-locals.el= file
 to establish this mapping. E.g.
 #+begin_src emacs-lisp
-((nil . ((ssh-deploy-root-local . "/local/path/to/project")
+((nil . ((ssh-deploy-root-local . "/local/path/to/project/")
          (ssh-deploy-root-remote . "/ssh:user@server:/remote/project/")
-         (ssh-deploy-on-explicit-save . t))))
+         (ssh-deploy-on-explicit-save . 1))))
 #+end_src
 
 #+begin_quote
@@ -66,7 +66,7 @@ Check out [[https://github.com/cjohansson/emacs-ssh-deploy#deployment-configurat
 ** ~root-local~ and ~root-remote~ must match
 The final directory names much match:
 #+begin_src emacs-lisp
-((nil . ((ssh-deploy-root-local . "/local/path/to/example-project")
+((nil . ((ssh-deploy-root-local . "/local/path/to/example-project/")
          (ssh-deploy-root-remote . "/ssh:user@server:/remote/example-project/")
 #+end_src
 
diff --git a/modules/tools/upload/config.el b/modules/tools/upload/config.el
index dadc824c7..25e2829be 100644
--- a/modules/tools/upload/config.el
+++ b/modules/tools/upload/config.el
@@ -37,7 +37,8 @@
   (add-hook! 'after-save-hook
     (defun +upload-init-after-save-h ()
       (when (and (bound-and-true-p ssh-deploy-root-remote)
-                 ssh-deploy-on-explicit-save)
+                 (integerp ssh-deploy-on-explicit-save)
+                 (> ssh-deploy-on-explicit-save 0))
         (ssh-deploy-upload-handler ssh-deploy-force-on-explicit-save))))
 
   ;; Enable ssh-deploy if variables are set, and check for changes on open file
diff --git a/modules/ui/doom-quit/config.el b/modules/ui/doom-quit/config.el
index 89f54f7b8..3e6f69702 100644
--- a/modules/ui/doom-quit/config.el
+++ b/modules/ui/doom-quit/config.el
@@ -1,10 +1,13 @@
 ;;; ui/doom-quit/config.el -*- lexical-binding: t; -*-
 
 (defvar +doom-quit-messages
-  '(;; from Doom 1
+  `(;; from Doom 1
     "Please don't leave, there's more demons to toast!"
     "Let's beat it -- This is turning into a bloodbath!"
-    "I wouldn't leave if I were you. DOS is much worse."
+    ,(format "I wouldn't leave if I were you. %s is much worse."
+             (if (member system-type '(ms-dos-windows-nt cygwin))
+                 "DOS"
+               "UNIX"))
     "Don't leave yet -- There's a demon around that corner!"
     "Ya know, next time you come in here I'm gonna toast ya."
     "Go ahead and leave. See if I care."
diff --git a/modules/ui/treemacs/config.el b/modules/ui/treemacs/config.el
index 0b8ab61ce..9f3febb6a 100644
--- a/modules/ui/treemacs/config.el
+++ b/modules/ui/treemacs/config.el
@@ -33,6 +33,7 @@ This must be set before `treemacs' has loaded.")
   (when +treemacs-git-mode
     ;; If they aren't supported, fall back to simpler methods
     (when (and (memq +treemacs-git-mode '(deferred extended))
+               (not treemacs-python-executable)
                (not (executable-find "python3")))
       (setq +treemacs-git-mode 'simple))
     (treemacs-git-mode +treemacs-git-mode)
diff --git a/templates/packages.example.el b/templates/packages.example.el
index 839b83c58..364e6e9b7 100644
--- a/templates/packages.example.el
+++ b/templates/packages.example.el
@@ -7,44 +7,44 @@
 
 
 ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
-;(package! some-package)
+;; (package! some-package)
 
 ;; To install a package directly from a remote git repo, you must specify a
 ;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
 ;; https://github.com/radian-software/straight.el#the-recipe-format
-;(package! another-package
-;  :recipe (:host github :repo "username/repo"))
+;; (package! another-package
+;;   :recipe (:host github :repo "username/repo"))
 
 ;; If the package you are trying to install does not contain a PACKAGENAME.el
 ;; file, or is located in a subdirectory of the repo, you'll need to specify
 ;; `:files' in the `:recipe':
-;(package! this-package
-;  :recipe (:host github :repo "username/repo"
-;           :files ("some-file.el" "src/lisp/*.el")))
+;; (package! this-package
+;;   :recipe (:host github :repo "username/repo"
+;;            :files ("some-file.el" "src/lisp/*.el")))
 
 ;; If you'd like to disable a package included with Doom, you can do so here
 ;; with the `:disable' property:
-;(package! builtin-package :disable t)
+;; (package! builtin-package :disable t)
 
 ;; You can override the recipe of a built in package without having to specify
 ;; all the properties for `:recipe'. These will inherit the rest of its recipe
 ;; from Doom or MELPA/ELPA/Emacsmirror:
-;(package! builtin-package :recipe (:nonrecursive t))
-;(package! builtin-package-2 :recipe (:repo "myfork/package"))
+;; (package! builtin-package :recipe (:nonrecursive t))
+;; (package! builtin-package-2 :recipe (:repo "myfork/package"))
 
 ;; Specify a `:branch' to install a package from a particular branch or tag.
 ;; This is required for some packages whose default branch isn't 'master' (which
 ;; our package manager can't deal with; see radian-software/straight.el#279)
-;(package! builtin-package :recipe (:branch "develop"))
+;; (package! builtin-package :recipe (:branch "develop"))
 
 ;; Use `:pin' to specify a particular commit to install.
-;(package! builtin-package :pin "1a2b3c4d5e")
+;; (package! builtin-package :pin "1a2b3c4d5e")
 
 
 ;; Doom's packages are pinned to a specific commit and updated from release to
 ;; release. The `unpin!' macro allows you to unpin single packages...
-;(unpin! pinned-package)
+;; (unpin! pinned-package)
 ;; ...or multiple packages
-;(unpin! pinned-package another-pinned-package)
+;; (unpin! pinned-package another-pinned-package)
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
-;(unpin! t)
+;; (unpin! t)