diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index fb297e1c4..a17228d85 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -1153,15 +1153,12 @@ between the two."
 (use-package! org-crypt ; built-in
   :when (modulep! +crypt)
   :commands org-encrypt-entries org-encrypt-entry org-decrypt-entries org-decrypt-entry
-  :hook (org-reveal-start . org-decrypt-entry)
+  :hook (org-load . org-crypt-use-before-save-magic)
   :preface
   ;; org-crypt falls back to CRYPTKEY property then `epa-file-encrypt-to', which
   ;; is a better default than the empty string `org-crypt-key' defaults to.
   (defvar org-crypt-key nil)
-  (after! org
-    (add-to-list 'org-tags-exclude-from-inheritance "crypt")
-    (add-hook! 'org-mode-hook
-      (add-hook 'before-save-hook 'org-encrypt-entries nil t))))
+  (after! org (add-to-list 'org-tags-exclude-from-inheritance "crypt")))
 
 
 (use-package! org-clock ; built-in
@@ -1462,6 +1459,9 @@ between the two."
   (setq org-num-face '(:inherit org-special-keyword :underline nil :weight bold)
         org-num-skip-tags '("noexport" "nonum"))
 
+  ;; Other org properties are all-caps. Be consistent.
+  (setq org-effort-property "EFFORT")
+
   ;; Prevent modifications made in invisible sections of an org document, as
   ;; unintended changes can easily go unseen otherwise.
   (setq org-catch-invisible-edits 'smart)
diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el
index 03d39e3ef..02d9620d6 100644
--- a/modules/lang/org/packages.el
+++ b/modules/lang/org/packages.el
@@ -66,7 +66,7 @@
 
 (when (modulep! :editor evil +everywhere)
   (package! evil-org
-    :recipe (:host github :repo "hlissner/evil-org-mode")
+    :recipe (:host github :repo "doomelpa/evil-org-mode")
     :pin "a9706da260c45b98601bcd72b1d2c0a24a017700"))
 (when (modulep! :tools pdf)
   (package! org-pdftools :pin "4e420233a153a9c4ab3d1a7e1d7d3211c836f0ac"))
diff --git a/modules/tools/lsp/+eglot.el b/modules/tools/lsp/+eglot.el
index a163bfc5a..c99da683a 100644
--- a/modules/tools/lsp/+eglot.el
+++ b/modules/tools/lsp/+eglot.el
@@ -62,9 +62,12 @@ server an expensive restart when its buffer is reverted."
 
 
 (use-package! consult-eglot
-  :defer t
   :when (modulep! :completion vertico)
-  :init (define-key eglot-mode-map [remap xref-find-apropos] #'consult-eglot-symbols))
+  :defer t
+  :init
+  (map! :after eglot
+        :map eglot-mode-map
+        [remap xref-find-apropos] #'consult-eglot-symbols))
 
 
 (use-package! flycheck-eglot