diff --git a/lisp/cli/packages.el b/lisp/cli/packages.el
index adc561aee..602b6de33 100644
--- a/lisp/cli/packages.el
+++ b/lisp/cli/packages.el
@@ -688,7 +688,7 @@ If ELPA-P, include packages installed with package.el (M-x package-install)."
     ("^In repository \"[^\"]+\", [^ ]+ (on branch \"[^\"]+\") is ahead of default branch \"[^\"]+\""
      . "^Checkout branch \"")
     ("^In repository "
-     . "^Reset branch \\|^Delete remote [^,]+, re-create it with correct URL\\|^Checkout \"main\""))
+     . "^Reset branch \\|^Delete remote [^,]+, re-create it with correct URL\\|^Checkout \""))
   "A list of regexps, mapped to regexps.
 
 Their CAR is tested against the prompt, and CDR is tested against the presented
@@ -736,10 +736,12 @@ original state.")
       ;; We can't intercept C-g, so no point displaying any options for this key
       ;; when C-c is the proper way to abort batch Emacs.
       (delq! "C-g" actions 'assoc)
-      ;; HACK: These are associated with opening dired or magit, which isn't
-      ;;   possible in tty Emacs, so...
-      (delq! "e" actions 'assoc)
-      (delq! "g" actions 'assoc)
+      ;; HACK: Remove actions that don't work in noninteractive Emacs (like
+      ;;   opening dired or magit).
+      (setq actions
+            (cl-remove-if (lambda (o)
+                            (string-match-p "^\\(?:Magit\\|Dired\\)" (nth 1 o)))
+                          actions))
       (if (doom-cli-context-suppress-prompts-p doom-cli--context)
           (cl-loop for (_key desc func) in actions
                    when desc
diff --git a/modules/completion/company/README.org b/modules/completion/company/README.org
index 922953aec..2279155c0 100644
--- a/modules/completion/company/README.org
+++ b/modules/completion/company/README.org
@@ -3,6 +3,12 @@
 #+created:  February 19, 2017
 #+since:    2.0.0
 
+#+begin_quote
+  *This module is deprecated* in favor of the [[doom-module::completion corfu]]
+    module. This module will be in maintenance mode until it is eventually
+    removed. Consider switching to the Corfu module instead.
+#+end_quote
+
 * Description :unfold:
 This module provides code completion, powered by [[https://github.com/company-mode/company-mode][company-mode]]. Many of Doom's
 [[doom-module::lang]] modules require it for "intellisense" functionality.
diff --git a/modules/completion/ivy/README.org b/modules/completion/ivy/README.org
index d10206b0a..a0deb43b8 100644
--- a/modules/completion/ivy/README.org
+++ b/modules/completion/ivy/README.org
@@ -3,6 +3,12 @@
 #+created:  February 20, 2017
 #+since:    2.0.0
 
+#+begin_quote
+  *This module is deprecated* in favor of the [[doom-module::completion vertico]]
+    module. This module will be in maintenance mode until it is eventually
+    removed. Consider switching to the Vertico module instead.
+#+end_quote
+
 * Description :unfold:
 This module provides Ivy integration for a variety of Emacs commands, as well as
 a unified interface for project search and replace, powered by [[https://github.com/BurntSushi/ripgrep/][ripgrep]].
diff --git a/modules/emacs/vc/autoload/hydra.el b/modules/emacs/vc/autoload/hydra.el
deleted file mode 100644
index d8c84d1e3..000000000
--- a/modules/emacs/vc/autoload/hydra.el
+++ /dev/null
@@ -1,44 +0,0 @@
-;;; emacs/vc/autoload/hydra.el -*- lexical-binding: t; -*-
-;;;###if (modulep! :ui hydra)
-
-;;;###autoload (autoload '+vc/smerge-hydra/body "emacs/vc/autoload/hydra" nil t)
-(defhydra +vc/smerge-hydra (:hint nil
-                            :pre (if (not smerge-mode) (smerge-mode 1))
-                            ;; Disable `smerge-mode' when quitting hydra if
-                            ;; no merge conflicts remain.
-                            :post (smerge-auto-leave))
-    "
-                                                         [smerge]
-  Movement   Keep           Diff              Other
-  ╭─────────────────────────────────────────────────────────╯
-     ^_g_^       [_b_] base       [_<_] upper/base    [_C_] Combine
-     ^_C-k_^     [_u_] upper      [_=_] upper/lower   [_r_] resolve
-     ^_k_ ↑^     [_l_] lower      [_>_] base/lower    [_R_] remove
-     ^_j_ ↓^     [_a_] all        [_H_] hightlight    [_n_] next in project
-     ^_C-j_^     [_RET_] current  [_E_] ediff                 ╭──────────
-     ^_G_^                                                │ [_q_] quit
-"
-    ("g" (progn (goto-char (point-min)) (smerge-next)))
-    ("G" (progn (goto-char (point-max)) (smerge-prev)))
-    ("C-j" smerge-vc-next-conflict)
-    ("C-k" smerge-prev)
-    ("j" next-line)
-    ("k" previous-line)
-    ("b" smerge-keep-base)
-    ("u" smerge-keep-upper)
-    ("l" smerge-keep-lower)
-    ("a" smerge-keep-all)
-    ("RET" smerge-keep-current)
-    ("\C-m" smerge-keep-current)
-    ("<" smerge-diff-base-upper)
-    ("=" smerge-diff-upper-lower)
-    (">" smerge-diff-base-lower)
-    ("H" smerge-refine)
-    ("E" smerge-ediff)
-    ("C" smerge-combine-with-next)
-    ("r" smerge-resolve)
-    ("R" smerge-kill-current)
-    ;; Often after calling `smerge-vc-next-conflict', the cursor will land at
-    ;; the bottom of the window
-    ("n" (progn (smerge-vc-next-conflict) (recenter-top-bottom (/ (window-height) 8))))
-    ("q" nil :color blue))
diff --git a/modules/emacs/vc/packages.el b/modules/emacs/vc/packages.el
index 09ca2fe63..b430f1539 100644
--- a/modules/emacs/vc/packages.el
+++ b/modules/emacs/vc/packages.el
@@ -6,7 +6,7 @@
 (package! smerge-mode :built-in t)
 
 (package! browse-at-remote :pin "76aa27dfd469fcae75ed7031bb73830831aaccbf")
-(package! git-commit :pin "9d4192b7b12c6b7f0664d99c4f876cfcc0a30ad4")
+(package! git-commit :pin "e77782272082977d56635308b89cf686abd87ef5")
 (package! git-timemachine
   ;; The original lives on codeberg.org; which has uptime issues.
   :recipe (:host github :repo "emacsmirror/git-timemachine")
diff --git a/modules/tools/lsp/+lsp.el b/modules/tools/lsp/+lsp.el
index 8ea2eda5e..59c05a02c 100644
--- a/modules/tools/lsp/+lsp.el
+++ b/modules/tools/lsp/+lsp.el
@@ -43,6 +43,11 @@ Can be a list of backends; accepts any value `company-backends' accepts.")
   (when (modulep! :config default +bindings)
     (setq lsp-keymap-prefix nil))
 
+  ;; REVIEW: Remove when zigtools/zls#1879 is resolved.
+  (after! lsp-zig
+    (unless (featurep :system 'windows)
+      (setq lsp-zig-download-url-format "https://github.com/zigtools/zls/releases/latest/download/zls-%s-%s.tar.xz")))
+
   :config
   (add-to-list 'doom-debug-variables 'lsp-log-io)
 
@@ -54,10 +59,6 @@ Can be a list of backends; accepts any value `company-backends' accepts.")
         lsp-xml-jar-file (expand-file-name "org.eclipse.lsp4xml-0.3.0-uber.jar" lsp-server-install-dir)
         lsp-groovy-server-file (expand-file-name "groovy-language-server-all.jar" lsp-server-install-dir))
 
-  ;; REVIEW: Remove when zigtools/zls#1879 is resolved.
-  (unless (featurep :system 'windows)
-    (setq lsp-zig-download-url-format "https://github.com/zigtools/zls/releases/latest/download/zls-%s-%s.tar.xz"))
-
   (add-hook! 'doom-escape-hook
     (defun +lsp-signature-stop-maybe-h ()
       "Close the displayed `lsp-signature'."
diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el
index c6087d594..c4cbf5921 100644
--- a/modules/tools/magit/packages.el
+++ b/modules/tools/magit/packages.el
@@ -1,9 +1,9 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/magit/packages.el
 
-(when (package! magit :pin "9d4192b7b12c6b7f0664d99c4f876cfcc0a30ad4")
+(when (package! magit :pin "e77782272082977d56635308b89cf686abd87ef5")
   (when (modulep! +forge)
-    (package! forge :pin "9edfcb2c1528dc7e607daa2d8fa655fc80e0d8b7")
+    (package! forge :pin "21d410c8102422f32db14ddac4eae9e28c2b5c5a")
     (package! code-review
       :recipe (:host github
                :repo "doomelpa/code-review"
diff --git a/modules/ui/indent-guides/config.el b/modules/ui/indent-guides/config.el
index f3524f9cd..58b43ea16 100644
--- a/modules/ui/indent-guides/config.el
+++ b/modules/ui/indent-guides/config.el
@@ -1,10 +1,39 @@
 ;;; ui/indent-guides/config.el -*- lexical-binding: t; -*-
 
+(defcustom +indent-guides-inhibit-functions nil
+  "A list of predicate functions.
+
+Each function will be run in the context of a buffer where
+`highlight-indent-guides-mode' should be enabled. If any function returns
+non-nil, the mode will not be activated."
+  :type 'hook
+  :group '+indent-guides)
+
+
+;;
+;;; Packages
+
 (use-package! highlight-indent-guides
-  :hook ((prog-mode text-mode conf-mode) . highlight-indent-guides-mode)
+  :hook ((prog-mode text-mode conf-mode) . +indent-guides-init-maybe-h)
   :init
   (setq highlight-indent-guides-method (if (display-graphic-p) 'bitmap 'character)
         highlight-indent-guides-bitmap-function #'highlight-indent-guides--bitmap-line)
+
+  (defun +indent-guides-init-maybe-h ()
+    "Enable `highlight-indent-guides-mode'.
+Consults `+indent-guides-inhibit-functions'."
+    (unless (run-hook-with-args-until-success '+indent-guides-inhibit-functions)
+      (highlight-indent-guides-mode +1)))
+
+  (add-hook! '+indent-guides-inhibit-functions
+    ;; Org's virtual indentation messes up indent-guides.
+    (defun +indent-guides-in-org-indent-mode-p ()
+      (bound-and-true-p org-indent-mode))
+    ;; Fix #6438: indent-guides prevent inline images from displaying in ein
+    ;; notebooks.
+    (defun +indent-guides-in-ein-notebook-p ()
+      (and (bound-and-true-p ein:notebook-mode)
+           (bound-and-true-p ein:output-area-inlined-images))))
   :config
   ;; HACK: If this package is loaded too early (by the user, and in terminal
   ;;   Emacs), then `highlight-indent-guides-auto-set-faces' will have been
@@ -12,11 +41,4 @@
   ;;   need to call it again, but at a time when I can ensure a frame exists an
   ;;   the current theme is loaded.
   (when (doom-context-p 'init)
-    (add-hook 'doom-first-buffer-hook #'highlight-indent-guides-auto-set-faces))
-
-  ;; `highlight-indent-guides' breaks when `org-indent-mode' is active
-  (add-hook! 'org-mode-local-vars-hook
-    (defun +indent-guides-disable-maybe-h ()
-      (and highlight-indent-guides-mode
-           (bound-and-true-p org-indent-mode)
-           (highlight-indent-guides-mode -1)))))
+    (add-hook 'doom-first-buffer-hook #'highlight-indent-guides-auto-set-faces)))
diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el
index 4dcc1f2a3..688d803d0 100644
--- a/modules/ui/vc-gutter/config.el
+++ b/modules/ui/vc-gutter/config.el
@@ -69,7 +69,7 @@
     (defun +vc-gutter-enable-maybe-h ()
       "Conditionally enable `diff-hl-dired-mode' in dired buffers.
 Respects `diff-hl-disable-on-remote'."
-      (unless (and diff-hl-disable-on-remote
+      (unless (and (bound-and-true-p diff-hl-disable-on-remote)
                    (file-remote-p default-directory))
         (diff-hl-dired-mode +1))))
 
diff --git a/modules/ui/vc-gutter/packages.el b/modules/ui/vc-gutter/packages.el
index 227bb1a91..256314351 100644
--- a/modules/ui/vc-gutter/packages.el
+++ b/modules/ui/vc-gutter/packages.el
@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/vc-gutter/packages.el
 
-(package! diff-hl :pin "f66345ed1f174e844ce43d8225613b7b0fc3e253")
+(package! diff-hl :pin "57d9d4e3e17397bf178c3aa5c369b5edd24523e0")
diff --git a/templates/init.example.el b/templates/init.example.el
index 80142384f..f18e9c4cd 100644
--- a/templates/init.example.el
+++ b/templates/init.example.el
@@ -21,8 +21,8 @@
        ;;layout            ; auie,ctsrnm is the superior home row
 
        :completion
-       company           ; the ultimate code completion backend
-       ;;(corfu +orderless)  ; complete with cap(f), cape and a flying feather!
+       ;;company           ; the ultimate code completion backend
+       (corfu +orderless)  ; complete with cap(f), cape and a flying feather!
        ;;helm              ; the *other* search engine for love and life
        ;;ido               ; the other *other* search engine...
        ;;ivy               ; a search engine for love and life