diff --git a/core/core-keybinds.el b/core/core-keybinds.el
index d9766e049..86fb7f6c0 100644
--- a/core/core-keybinds.el
+++ b/core/core-keybinds.el
@@ -208,7 +208,7 @@ If any hook returns non-nil, all hooks after it are ignored.")
   (which-key-mode +1))
 
 
-;; `hydra'
+;;;###package hydra
 (setq lv-use-seperator t)
 
 
diff --git a/core/core-ui.el b/core/core-ui.el
index 5b448b49c..f8df58b1b 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -322,11 +322,10 @@ read-only or not file-visiting."
 ;;
 ;;; Third party packages
 
-;; `avy'
+;;;###package avy
 (setq avy-all-windows nil
       avy-background t)
 
-;; `all-the-icons'
 (def-package! all-the-icons
   :commands (all-the-icons-octicon all-the-icons-faicon all-the-icons-fileicon
              all-the-icons-wicon all-the-icons-material all-the-icons-alltheicon)
@@ -342,25 +341,27 @@ read-only or not file-visiting."
                 all-the-icons-wicon all-the-icons-alltheicon))
     (advice-add fn :around #'doom*disable-all-the-icons-in-tty)))
 
-;; `hide-mode-line-mode'
+;;;###package hide-mode-line-mode
 (add-hook 'completion-list-mode-hook #'hide-mode-line-mode)
 (add-hook 'Man-mode-hook #'hide-mode-line-mode)
 
-;; `highlight-numbers' --- better number literal fontification in code
+;; Better fontification of number literals in code
 (def-package! highlight-numbers
   :hook ((prog-mode conf-mode) . highlight-numbers-mode)
   :config (setq highlight-numbers-generic-regexp "\\_<[[:digit:]]+\\(?:\\.[0-9]*\\)?\\_>"))
 
-;; `highlight-escape-sequences'
+;;;###package highlight-escape-sequences
 (def-package! highlight-escape-sequences
   :hook ((prog-mode conf-mode) . highlight-escape-sequences-mode))
 
-;; `rainbow-delimiters' --- helps us distinguish stacked delimiter pairs.
-;; Especially in parentheses-drunk languages like Lisp.
+;;;###package rainbow-delimiters
+;; Helps us distinguish stacked delimiter pairs, especially in parentheses-drunk
+;; languages like Lisp.
 (setq rainbow-delimiters-max-face-count 3)
 
-;; `visual-fill-column' --- for a distractions-free-like UI, that dynamically
-;; resizes margins and can center a buffer.
+;;;###package visual-fill-column
+;; For a distractions-free-like UI, that dynamically resizes margins and can
+;; center a buffer.
 (setq visual-fill-column-center-text t
       visual-fill-column-width
       ;; take Emacs 26 line numbers into account
diff --git a/modules/lang/emacs-lisp/packages.el b/modules/lang/emacs-lisp/packages.el
index 4509683e1..67b572ecd 100644
--- a/modules/lang/emacs-lisp/packages.el
+++ b/modules/lang/emacs-lisp/packages.el
@@ -1,6 +1,8 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/emacs-lisp/packages.el
 
+(package! elisp-mode :built-in t)
+
 (package! auto-compile)
 (package! highlight-quoted)
 (package! macrostep)