diff --git a/modules/lang/org/+agenda.el b/modules/lang/org/+agenda.el
index 873938386..a849eee5a 100644
--- a/modules/lang/org/+agenda.el
+++ b/modules/lang/org/+agenda.el
@@ -1,4 +1,4 @@
-;;; lang/org/+agenda.el
+;;; lang/org/+agenda.el -*- lexical-binding: t; -*-
 
 (after! org-agenda
   (setq-default
diff --git a/modules/lang/org/+attach.el b/modules/lang/org/+attach.el
index 41d573ee2..16a93f57d 100644
--- a/modules/lang/org/+attach.el
+++ b/modules/lang/org/+attach.el
@@ -1,4 +1,4 @@
-;;; lang/org/+attach.el
+;;; lang/org/+attach.el -*- lexical-binding: t; -*-
 
 ;; FIXME Needs to be rewritten
 ;;
diff --git a/modules/lang/org/+babel.el b/modules/lang/org/+babel.el
index 0713fdeb4..cafba6546 100644
--- a/modules/lang/org/+babel.el
+++ b/modules/lang/org/+babel.el
@@ -1,4 +1,4 @@
-;;; lang/org/+babel.el
+;;; lang/org/+babel.el -*- lexical-binding: t; -*-
 
 (add-hook '+org-init-hook #'+org|init-babel t)
 
diff --git a/modules/lang/org/+capture.el b/modules/lang/org/+capture.el
index 387830c54..2f991f971 100644
--- a/modules/lang/org/+capture.el
+++ b/modules/lang/org/+capture.el
@@ -1,4 +1,4 @@
-;;; lang/org/+capture.el
+;;; lang/org/+capture.el -*- lexical-binding: t; -*-
 
 ;; Sets up two `org-capture' workflows that I like:
 ;;
diff --git a/modules/lang/org/+export.el b/modules/lang/org/+export.el
index 533251f99..bd92d580f 100644
--- a/modules/lang/org/+export.el
+++ b/modules/lang/org/+export.el
@@ -1,4 +1,4 @@
-;;; lang/org/+export.el
+;;; lang/org/+export.el -*- lexical-binding: t; -*-
 
 ;; My own, centralized exporting system as well.
 
diff --git a/modules/lang/org/+notebook.el b/modules/lang/org/+notebook.el
index 5bb9c1da9..9fb006539 100644
--- a/modules/lang/org/+notebook.el
+++ b/modules/lang/org/+notebook.el
@@ -1,4 +1,4 @@
-;;; lang/org/+notebook.el
+;;; lang/org/+notebook.el -*- lexical-binding: t; -*-
 
 ;; While I program, write or plan, I want easy access to notes of various kinds,
 ;; such as major-mode/language specific notes, or project-specific notes. They
diff --git a/modules/lang/org/autoload/attach.el b/modules/lang/org/autoload/attach.el
index f1a8c2811..43922f212 100644
--- a/modules/lang/org/autoload/attach.el
+++ b/modules/lang/org/autoload/attach.el
@@ -1,4 +1,4 @@
-;;; lang/org/autoload/attach.el
+;;; lang/org/autoload/attach.el -*- lexical-binding: t; -*-
 
 (defun +org--attach-icon (path)
   (char-to-string (pcase (downcase (file-name-extension path))
diff --git a/modules/lang/org/autoload/babel.el b/modules/lang/org/autoload/babel.el
index 9af2a8cde..5ee475191 100644
--- a/modules/lang/org/autoload/babel.el
+++ b/modules/lang/org/autoload/babel.el
@@ -1,4 +1,4 @@
-;;; lang/org/autoload/babel.el
+;;; lang/org/autoload/babel.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
 (defun +org/edit-special-same-window ()
diff --git a/modules/lang/org/autoload/capture.el b/modules/lang/org/autoload/capture.el
index f0d389ef2..7343ac6bf 100644
--- a/modules/lang/org/autoload/capture.el
+++ b/modules/lang/org/autoload/capture.el
@@ -1,4 +1,4 @@
-;;; lang/org/autoload/capture.el
+;;; lang/org/autoload/capture.el  -*- lexical-binding: t; -*-
 
 ;;;###autoload
 (defun +org/capture (&optional key string)
diff --git a/modules/lang/org/autoload/evil.el b/modules/lang/org/autoload/evil.el
index 3b7b2498d..f487c1192 100644
--- a/modules/lang/org/autoload/evil.el
+++ b/modules/lang/org/autoload/evil.el
@@ -1,4 +1,4 @@
-;;; lang/org/autoload/evil.el
+;;; lang/org/autoload/evil.el -*- lexical-binding: t; -*-
 
 ;;;###autoload (autoload '+org:capture "lang/org/autoload/evil" nil t)
 (evil-define-operator +org:capture (&optional beg end bang)
diff --git a/modules/lang/org/autoload/notebook.el b/modules/lang/org/autoload/notebook.el
index 1b40efaf2..afa689954 100644
--- a/modules/lang/org/autoload/notebook.el
+++ b/modules/lang/org/autoload/notebook.el
@@ -1,4 +1,4 @@
-;;; lang/org/autoload/notebook.el
+;;; lang/org/autoload/notebook.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
 (defun +org-mode-notes-dir ()
diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el
index 1a55da252..8f0563633 100644
--- a/modules/lang/org/autoload/org.el
+++ b/modules/lang/org/autoload/org.el
@@ -1,4 +1,4 @@
-;;; lang/org/autoload/org.el
+;;; lang/org/autoload/org.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
 (defun +org/indent ()
@@ -86,7 +86,7 @@ wrong places)."
              (insert "[ ] ")))
 
           ((memq type '(table table-row))
-           (cl-case direction
+           (pcase direction
              ('below (org-table-insert-row t))
              ('above (+org/table-prepend-row-or-shift-up))))
 
@@ -99,7 +99,7 @@ wrong places)."
                             (if (eq (org-element-type subcontext) 'headline)
                                 subcontext
                               1)))))
-             (cl-case direction
+             (pcase direction
                ('below
                 (let ((at-eol (= (point) (1- (line-end-position)))))
                   (goto-char (line-end-position))
diff --git a/modules/lang/org/autoload/tables.el b/modules/lang/org/autoload/tables.el
index b1df70827..036c3db3b 100644
--- a/modules/lang/org/autoload/tables.el
+++ b/modules/lang/org/autoload/tables.el
@@ -1,4 +1,4 @@
-;;; lang/org/autoload/tables.el
+;;; lang/org/autoload/tables.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
 (defun +org/table-next-row ()
diff --git a/modules/lang/org/autoload/util.el b/modules/lang/org/autoload/util.el
index ae5881b05..adcd5fa07 100644
--- a/modules/lang/org/autoload/util.el
+++ b/modules/lang/org/autoload/util.el
@@ -1,4 +1,4 @@
-;;; lang/org/autoload/util.el
+;;; lang/org/autoload/util.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
 (defun +org-get-property (name &optional file)
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 6cebab2bb..d11860e28 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -1,4 +1,4 @@
-;;; lang/org/config.el
+;;; lang/org/config.el -*- lexical-binding: t; -*-
 
 ;; A few things you can expect
 ;;   + `org-capture' in a popup frame (can be invoked from outside emacs too)