diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el
index e6d447475..3107710b5 100644
--- a/core/autoload/buffers.el
+++ b/core/autoload/buffers.el
@@ -42,7 +42,6 @@ leftover buffers and processes.")
 
 ;;
 ;; Functions
-;;
 
 ;;;###autoload
 (defun doom-buffer-frame-predicate (buf)
@@ -197,7 +196,6 @@ regex PATTERN. Returns the number of killed buffers."
 
 ;;
 ;; Hooks
-;;
 
 ;;;###autoload
 (defun doom|mark-buffer-as-real ()
@@ -207,7 +205,6 @@ regex PATTERN. Returns the number of killed buffers."
 
 ;;
 ;; Advice
-;;
 
 ;;;###autoload
 (defun doom*switch-to-fallback-buffer-maybe (orig-fn)
@@ -241,7 +238,6 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
 
 ;;
 ;; Interactive commands
-;;
 
 ;;;###autoload
 (defun doom/kill-this-buffer-in-all-windows (buffer &optional dont-save)
diff --git a/core/autoload/cache.el b/core/autoload/cache.el
index bf1c46bd5..235f6243a 100644
--- a/core/autoload/cache.el
+++ b/core/autoload/cache.el
@@ -34,7 +34,6 @@ listed in `doom-cache-alists' to files."
 
 ;;
 ;; Library
-;;
 
 ;;;###autoload
 (defmacro with-cache! (location &rest body)
diff --git a/core/autoload/debug.el b/core/autoload/debug.el
index cd963b9fa..675201a4c 100644
--- a/core/autoload/debug.el
+++ b/core/autoload/debug.el
@@ -71,7 +71,6 @@ ready to be pasted in a bug report on github."
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun doom/info ()
@@ -135,9 +134,7 @@ pasting into a bug report or discord."
     (user-error "No backtrace buffer detected")))
 
 
-;;
-;; Vanilla sandbox
-;;
+;;; Vanilla sandbox
 
 (defvar doom--sandbox-init-doom-p nil)
 
@@ -204,9 +201,7 @@ standing in the way, and without sacrificing access to installed packages."
     (pop-to-buffer buf)))
 
 
-;;
-;; Reporting bugs
-;;
+;;; Reporting bugs
 
 (defun doom--open-bug-report ()
   "TODO"
@@ -276,9 +271,7 @@ will be automatically appended to the result."
       (pop-to-buffer buf))))
 
 
-;;
-;; Profiling
-;;
+;;; Profiling
 
 (defvar doom--profiler nil)
 ;;;###autoload
diff --git a/core/autoload/editor.el b/core/autoload/editor.el
index 56d9cb942..572e35c6f 100644
--- a/core/autoload/editor.el
+++ b/core/autoload/editor.el
@@ -28,7 +28,6 @@ lines, above and below, with only whitespace in between."
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun doom/backward-to-bol-or-indent ()
@@ -273,7 +272,6 @@ Respects `require-final-newline'."
 
 ;;
 ;; Advice
-;;
 
 ;;;###autoload
 (defun doom*newline-and-indent (_orig-fn)
@@ -293,7 +291,6 @@ with weak native support."
 
 ;;
 ;; Hooks
-;;
 
 ;;;###autoload
 (defun doom|enable-delete-trailing-whitespace ()
diff --git a/core/autoload/files.el b/core/autoload/files.el
index 99831229b..a1066b0f6 100644
--- a/core/autoload/files.el
+++ b/core/autoload/files.el
@@ -67,6 +67,10 @@
            short-new-name)
           (short-new-name))))
 
+
+;;
+;; Commands
+
 ;;;###autoload
 (defun doom/delete-this-file (&optional path force-p)
   "Delete FILENAME (defaults to the file associated with current buffer) and
diff --git a/core/autoload/help.el b/core/autoload/help.el
index d41dc7662..6f2d4d8d0 100644
--- a/core/autoload/help.el
+++ b/core/autoload/help.el
@@ -44,7 +44,6 @@
 
 ;;
 ;; Helpers
-;;
 
 ;;;###autoload
 (defun doom-active-minor-modes ()
@@ -57,7 +56,6 @@
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (define-obsolete-function-alias 'doom/describe-setting 'doom/describe-setters "2.1.0")
diff --git a/core/autoload/packages.el b/core/autoload/packages.el
index d6b5624e7..2c4b47e6d 100644
--- a/core/autoload/packages.el
+++ b/core/autoload/packages.el
@@ -34,7 +34,6 @@
 
 ;;
 ;; Library
-;;
 
 ;;;###autoload
 (defun doom-refresh-packages-maybe (&optional force-p)
@@ -314,7 +313,6 @@ Used by `doom-packages-install'."
 
 ;;
 ;; Main functions
-;;
 
 (defun doom--delete-package-files (name-or-desc)
   (let ((pkg-build-dir
@@ -404,7 +402,6 @@ package.el as appropriate."
 
 ;;
 ;; Interactive commands
-;;
 
 ;;;###autoload
 (defun doom/update-package (pkg)
@@ -436,7 +433,6 @@ calls."
 
 ;;
 ;; Advice
-;;
 
 ;;;###autoload
 (defun doom*package-delete (desc &rest _)
diff --git a/core/autoload/projects.el b/core/autoload/projects.el
index 0d5c5d305..e43f5af15 100644
--- a/core/autoload/projects.el
+++ b/core/autoload/projects.el
@@ -2,7 +2,6 @@
 
 ;;
 ;; Macros
-;;
 
 ;;;###autoload
 (defmacro without-project-cache! (&rest body)
@@ -25,7 +24,6 @@ they are absolute."
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun doom/reload-project ()
@@ -39,7 +37,6 @@ they are absolute."
 
 ;;
 ;; Library
-;;
 
 ;;;###autoload
 (defun doom-project-p (&optional nocache)
diff --git a/core/autoload/scratch.el b/core/autoload/scratch.el
index 7d3d06536..97a2ed206 100644
--- a/core/autoload/scratch.el
+++ b/core/autoload/scratch.el
@@ -22,7 +22,6 @@ following:
 
 ;;
 ;; Library
-;;
 
 ;;;###autoload
 (defun doom-scratch-buffer (&optional file mode text)
diff --git a/core/core-cli.el b/core/core-cli.el
index b620e9dc5..35290bcea 100644
--- a/core/core-cli.el
+++ b/core/core-cli.el
@@ -10,7 +10,6 @@
 
 ;;
 ;; Dispatcher API
-;;
 
 (defvar doom-auto-accept (getenv "YES")
   "If non-nil, Doom will auto-accept any confirmation prompts during batch
@@ -85,10 +84,8 @@ BODY will be run when this dispatcher is called."
 
 
 ;;
-;; Dispatch commands
-;;
+;; Dummy dispatch commands (no-op because they're handled especially)
 
-;; Dummy dispatchers (no-op because they're handled especially)
 (dispatcher! run :noop
   "Run Doom Emacs from bin/doom's parent directory.
 
diff --git a/core/core-editor.el b/core/core-editor.el
index 6151c7c46..1ba77ff3a 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -73,7 +73,6 @@ fundamental-mode) for performance sake."
 
 ;;
 ;; Built-in plugins
-;;
 
 (push '("/LICENSE\\'" . text-mode) auto-mode-alist)
 
@@ -151,8 +150,7 @@ savehist file."
 
 
 ;;
-;; Core Plugins
-;;
+;; Packages
 
 ;; Auto-close delimiters and blocks as you type. It's more powerful than that,
 ;; but that is all Doom uses it for.
diff --git a/core/core-lib.el b/core/core-lib.el
index 132877e07..bc154dac3 100644
--- a/core/core-lib.el
+++ b/core/core-lib.el
@@ -1,6 +1,6 @@
 ;;; core-lib.el -*- lexical-binding: t; -*-
 
-;; Built in packages we use a lot of
+;; Built-in packages we use a lot of
 (require 'subr-x)
 (require 'cl-lib)
 
@@ -31,7 +31,6 @@ means to remove KEY from ALIST if the new value is `eql' to DEFAULT."
 
 ;;
 ;; Helpers
-;;
 
 (defun doom--resolve-path-forms (spec &optional directory)
   "Converts a simple nested series of or/and forms into a series of
@@ -93,8 +92,7 @@ This is used by `associate!', `file-exists-p!' and `project-file-exists-p!'."
 
 
 ;;
-;; Functions
-;;
+;; Public library
 
 (defun doom-unquote (exp)
   "Return EXP unquoted."
diff --git a/core/core-modules.el b/core/core-modules.el
index b4ebc0a2b..f2813bf3a 100644
--- a/core/core-modules.el
+++ b/core/core-modules.el
@@ -30,7 +30,6 @@ A warning will be put out if these deprecated modules are used.")
 
 ;;
 ;; Bootstrap API
-;;
 
 (defun doom-initialize-modules (&optional force-p)
   "Loads the init.el in `doom-private-dir' and sets up hooks for a healthy
@@ -65,7 +64,6 @@ non-nil."
 
 ;;
 ;; Module API
-;;
 
 (defun doom-module-p (category module)
   "Returns t if CATEGORY MODULE is enabled (ie. present in `doom-modules')."
@@ -188,7 +186,6 @@ non-nil, return paths of possible modules, activated or otherwise."
 
 ;;
 ;; Use-package modifications
-;;
 
 (autoload 'use-package "use-package-core" nil nil t)
 
@@ -246,7 +243,6 @@ non-nil, return paths of possible modules, activated or otherwise."
 
 ;;
 ;; Module config macros
-;;
 
 (defmacro doom! (&rest modules)
   "Bootstraps DOOM Emacs and its modules.
@@ -382,7 +378,6 @@ omitted. eg. (featurep! +flag1)"
 
 ;;
 ;; FIXME Cross-module configuration (deprecated)
-;;
 
 ;; I needed a way to reliably cross-configure modules without littering my
 ;; modules with `after!' blocks or testing whether they were enabled, so I wrote
diff --git a/core/core-packages.el b/core/core-packages.el
index 72d430971..36121bf39 100644
--- a/core/core-packages.el
+++ b/core/core-packages.el
@@ -75,7 +75,6 @@ missing) and shouldn't be deleted.")
 
 ;;
 ;; Bootstrapper
-;;
 
 (defun doom-initialize-packages (&optional force-p)
   "Ensures that Doom's package management system, package.el and quelpa are
@@ -137,7 +136,6 @@ them."
 
 ;;
 ;; Package API
-;;
 
 (defun doom-ensure-packages-initialized (&optional force-p)
   "Make sure package.el is initialized."
@@ -169,7 +167,6 @@ them."
 
 ;;
 ;; Module package macros
-;;
 
 (cl-defmacro package! (name &rest plist &key recipe pin disable _ignore _freeze)
   "Declares a package and how to install it (if applicable).
diff --git a/core/core-projects.el b/core/core-projects.el
index 32926ccd0..d24811088 100644
--- a/core/core-projects.el
+++ b/core/core-projects.el
@@ -63,8 +63,7 @@
 
 
 ;;
-;; Projects
-;;
+;; Project-based minor modes
 
 (defvar-local doom-project nil
   "Either the symbol or a list of project modes you want to enable. Available
diff --git a/core/core-ui.el b/core/core-ui.el
index 54fe47f9d..a53c12e08 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -75,8 +75,7 @@ shorter major mode name in the mode-line. See `doom|set-mode-name'.")
 
 
 ;;
-;; Plugins
-;;
+;; Third party packages
 
 ;; `avy'
 (setq avy-all-windows nil
@@ -136,7 +135,6 @@ shorter major mode name in the mode-line. See `doom|set-mode-name'.")
 
 ;;
 ;; Built-in packages
-;;
 
 ;; show typed keystrokes in minibuffer
 (defun doom|enable-ui-keystrokes ()  (setq echo-keystrokes 0.02))
@@ -326,7 +324,6 @@ character that looks like a space that `whitespace-mode' won't affect.")
 
 ;;
 ;; Theme & font
-;;
 
 (defvar doom-last-window-system
   (if (daemonp) 'daemon initial-window-system)
@@ -393,7 +390,6 @@ frame's window-system, the theme will be reloaded.")
 
 ;;
 ;; Bootstrap
-;;
 
 ;; simple name in frame title
 (setq frame-title-format '("%b – Doom Emacs"))
@@ -454,7 +450,6 @@ instead). Meant for `kill-buffer-query-functions'."
 (add-hook 'emacs-startup-hook #'doom|init-ui)
 
 
-;;
 ;; Fixes/hacks
 ;;
 
diff --git a/core/core.el b/core/core.el
index 9ef4927ce..c8aa7ae11 100644
--- a/core/core.el
+++ b/core/core.el
@@ -12,7 +12,6 @@ line or use --debug-init to enable this.")
 
 ;;
 ;; Constants
-;;
 
 (defconst doom-version "2.0.9"
   "Current version of DOOM emacs.")
@@ -82,7 +81,6 @@ file.")
 
 ;;
 ;; Doom core variables
-;;
 
 (defvar doom-init-p nil
   "Non-nil if `doom-initialize' has run.")
@@ -105,7 +103,6 @@ Doom was setup, which can cause problems.")
 
 ;;
 ;; Custom error types
-;;
 
 (define-error 'doom-error "Error in Doom Emacs core")
 (define-error 'doom-hook-error "Error in a Doom startup hook" 'doom-error)
@@ -117,7 +114,6 @@ Doom was setup, which can cause problems.")
 
 ;;
 ;; Custom hooks
-;;
 
 (defvar doom-init-hook nil
   "Hooks run after all init.el files are loaded, including your private and all
@@ -206,7 +202,6 @@ and `doom-exit-window-hook'."
 
 ;;
 ;; Emacs core configuration
-;;
 
 ;; UTF-8 as the default coding system
 (when (fboundp 'set-charset-priority)
@@ -309,7 +304,6 @@ original value of `symbol-file'."
 
 ;;
 ;; Bootstrap helpers
-;;
 
 (defun doom-try-run-hook (hook)
   "Run HOOK (a hook function), but marks thrown errors to make it a little
@@ -382,7 +376,6 @@ If RETURN-P, return the message as a string instead of displaying it."
 
 ;;
 ;; Bootstrap functions
-;;
 
 (defun doom-initialize (&optional force-p force-load-core-p)
   "Bootstrap Doom, if it hasn't already (or if FORCE-P is non-nil).
@@ -463,7 +456,6 @@ in interactive sessions, nil otherwise (but logs a warning)."
 
 ;;
 ;; Bootstrap Doom
-;;
 
 (add-to-list 'load-path doom-core-dir)
 
diff --git a/modules/app/calendar/config.el b/modules/app/calendar/config.el
index b359e1212..c1c9b0a43 100644
--- a/modules/app/calendar/config.el
+++ b/modules/app/calendar/config.el
@@ -9,8 +9,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! calfw
   :commands (cfw:open-calendar-buffer)
diff --git a/modules/app/email/autoload/email.el b/modules/app/email/autoload/email.el
index 7b2f017bc..a471fa181 100644
--- a/modules/app/email/autoload/email.el
+++ b/modules/app/email/autoload/email.el
@@ -74,7 +74,6 @@ default/fallback account."
 
 ;;
 ;; Hooks
-;;
 
 (defun +email|init ()
   (add-hook 'kill-buffer-hook #'+email|kill-mu4e nil t))
diff --git a/modules/app/email/config.el b/modules/app/email/config.el
index 8f9210440..2894d0471 100644
--- a/modules/app/email/config.el
+++ b/modules/app/email/config.el
@@ -9,8 +9,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! mu4e
   :commands (mu4e mu4e-compose-new)
@@ -134,6 +133,5 @@
 
 ;;
 ;; Sub-modules
-;;
 
 (if (featurep! +gmail) (load! "+gmail"))
diff --git a/modules/app/irc/config.el b/modules/app/irc/config.el
index 3adb8557f..d80a17993 100644
--- a/modules/app/irc/config.el
+++ b/modules/app/irc/config.el
@@ -44,8 +44,7 @@ playback.")
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! circe
   :commands (circe circe-server-buffers)
diff --git a/modules/app/notmuch/autoload.el b/modules/app/notmuch/autoload.el
index 22d6d2104..67f4f5e0c 100644
--- a/modules/app/notmuch/autoload.el
+++ b/modules/app/notmuch/autoload.el
@@ -21,7 +21,6 @@
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun +notmuch/quit ()
@@ -88,7 +87,6 @@
 
 ;;
 ;; Advice
-;;
 
 ;;;###autoload
 (defun +notmuch*dont-confirm-on-kill-process (orig-fn &rest args)
diff --git a/modules/app/rss/autoload.el b/modules/app/rss/autoload.el
index f83756e58..982707c8d 100644
--- a/modules/app/rss/autoload.el
+++ b/modules/app/rss/autoload.el
@@ -46,7 +46,6 @@
 
 ;;
 ;; Hooks
-;;
 
 ;;;###autoload
 (defun +rss|elfeed-wrap ()
@@ -81,7 +80,6 @@
 
 ;;
 ;; Functions
-;;
 
 ;;;###autoload
 (defun +rss-dead-feeds (&optional years)
diff --git a/modules/app/rss/config.el b/modules/app/rss/config.el
index 256ef0c05..2aedd9816 100644
--- a/modules/app/rss/config.el
+++ b/modules/app/rss/config.el
@@ -18,7 +18,6 @@ easier to scroll through.")
 
 ;;
 ;; Packages
-;;
 
 (def-package! elfeed
   :commands elfeed
diff --git a/modules/app/twitter/autoload.el b/modules/app/twitter/autoload.el
index 1214c0537..274bd02fd 100644
--- a/modules/app/twitter/autoload.el
+++ b/modules/app/twitter/autoload.el
@@ -21,7 +21,6 @@ that works with the feature/popup module."
 
 ;;
 ;; Commands
-;;
 
 (defvar +twitter--old-wconf nil)
 ;;;###autoload
diff --git a/modules/app/write/config.el b/modules/app/write/config.el
index 08a74ddff..ecb6adc01 100644
--- a/modules/app/write/config.el
+++ b/modules/app/write/config.el
@@ -25,8 +25,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! langtool
   :when (featurep! +langtool)
diff --git a/modules/completion/company/autoload.el b/modules/completion/company/autoload.el
index 58326f90b..0ce0e9b3a 100644
--- a/modules/completion/company/autoload.el
+++ b/modules/completion/company/autoload.el
@@ -56,7 +56,6 @@ To have BACKENDS apply to any mode that is a parent of MODES, set MODES to
 
 ;;
 ;; Library
-;;
 
 (defun +company--backends ()
   (append (cl-loop for (mode . rest) in +company-backend-alist
@@ -73,7 +72,6 @@ To have BACKENDS apply to any mode that is a parent of MODES, set MODES to
 
 ;;
 ;; Hooks
-;;
 
 ;;;###autoload
 (defun +company|init-backends ()
@@ -87,7 +85,6 @@ To have BACKENDS apply to any mode that is a parent of MODES, set MODES to
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun +company/toggle-auto-completion ()
@@ -151,6 +148,7 @@ C-x C-l."
 
 ;;;###autoload
 (defun +company/dabbrev-code-previous ()
+  "TODO"
   (interactive)
   (require 'company-dabbrev)
   (let ((company-selection-wrap-around t))
diff --git a/modules/completion/company/config.el b/modules/completion/company/config.el
index b784b2e2e..f14b12223 100644
--- a/modules/completion/company/config.el
+++ b/modules/completion/company/config.el
@@ -40,6 +40,9 @@
     [backtab]     #'company-select-previous))
 
 
+;;
+;; Packages
+
 (def-package! company-prescient
   :hook (company-mode . company-prescient-mode)
   :config
diff --git a/modules/completion/helm/autoload/evil.el b/modules/completion/helm/autoload/evil.el
index 45ef949d7..f7a0372c4 100644
--- a/modules/completion/helm/autoload/evil.el
+++ b/modules/completion/helm/autoload/evil.el
@@ -8,7 +8,8 @@
   (helm-swoop :$query search :$multiline bang))
 
 
-;; --- file searching ---------------------
+;;
+;; Project searching
 
 ;;;###autoload (autoload '+helm:pt "completion/helm/autoload/evil" nil t)
 (evil-define-command +helm:pt (all-files-p query)
diff --git a/modules/completion/helm/autoload/helm.el b/modules/completion/helm/autoload/helm.el
index af39ece1a..422ed99a7 100644
--- a/modules/completion/helm/autoload/helm.el
+++ b/modules/completion/helm/autoload/helm.el
@@ -41,7 +41,6 @@ workspace."
 
 ;;
 ;; Project search
-;;
 
 (defun +helm-ag-search-args (all-files-p recursive-p)
   (list (concat "ag " (if IS-WINDOWS "--vimgrep" "--nocolor --nogroup"))
diff --git a/modules/completion/helm/config.el b/modules/completion/helm/config.el
index 05184198c..445daa079 100644
--- a/modules/completion/helm/config.el
+++ b/modules/completion/helm/config.el
@@ -35,7 +35,6 @@ be negative.")
 
 ;;
 ;; Packages
-;;
 
 (def-package! helm-mode
   :defer 1
diff --git a/modules/completion/ivy/autoload/evil.el b/modules/completion/ivy/autoload/evil.el
index 0f408044b..28a83c11f 100644
--- a/modules/completion/ivy/autoload/evil.el
+++ b/modules/completion/ivy/autoload/evil.el
@@ -14,7 +14,8 @@
   (+ivy/tasks bang))
 
 
-;; --- file searching ---------------------
+;;
+;; Project searching
 
 ;;;###autoload (autoload '+ivy:pt "completion/ivy/autoload/evil" nil t)
 (evil-define-command +ivy:pt (all-files-p query)
diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el
index 94abf79e2..f7a0b15b9 100644
--- a/modules/completion/ivy/autoload/ivy.el
+++ b/modules/completion/ivy/autoload/ivy.el
@@ -21,7 +21,6 @@
 
 ;;
 ;; Library
-;;
 
 ;;;###autoload
 (defun +ivy-projectile-find-file-transformer (str)
@@ -206,7 +205,6 @@ search current file. See `+ivy-task-tags' to customize what this searches for."
 
 ;;
 ;; File searching
-;;
 
 ;;;###autoload
 (defun +ivy/projectile-find-file ()
diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el
index c453aa666..5ea37780c 100644
--- a/modules/completion/ivy/config.el
+++ b/modules/completion/ivy/config.el
@@ -31,7 +31,6 @@ immediately runs it on the current candidate (ending the ivy session)."
 
 ;;
 ;; Packages
-;;
 
 (def-package! ivy
   :defer 1
@@ -224,7 +223,6 @@ immediately runs it on the current candidate (ending the ivy session)."
 
 ;;
 ;; Evil key fixes
-;;
 
 (map! :when (featurep! :feature evil +everywhere)
       :after ivy
diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el
index ebfbfbd42..18f84b6dd 100644
--- a/modules/config/default/+bindings.el
+++ b/modules/config/default/+bindings.el
@@ -488,7 +488,6 @@
         [remap quit-window] #'kill-this-buffer))
 
 
-;;
 ;; <leader>
 ;;
 
@@ -785,7 +784,6 @@
 
 ;;
 ;; Keybinding fixes
-;;
 
 ;; This section is dedicated to "fixing" certain keys so that they behave
 ;; sensibly (and consistently with similar contexts).
diff --git a/modules/config/default/+evil-commands.el b/modules/config/default/+evil-commands.el
index 0683cdbae..4b49f280f 100644
--- a/modules/config/default/+evil-commands.el
+++ b/modules/config/default/+evil-commands.el
@@ -35,9 +35,8 @@ command from the current directory instead of the project root."
 
 ;;
 ;; Commands
-;;
 
-;;; Commands defined elsewhere
+;;; these are defined in feature/evil
 ;;(ex! "al[ign]"      #'+evil:align)
 ;;(ex! "g[lobal]"     #'+evil:global)
 
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index dc7df3979..fe294b412 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -4,8 +4,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! emacs-snippets
   :if (featurep! +snippets)
@@ -14,7 +13,6 @@
 
 ;;
 ;; Config
-;;
 
 ;; Don't store authinfo in non-encrypted files!
 (defvar auth-sources
diff --git a/modules/config/literate/init.el b/modules/config/literate/init.el
index a7a7c19e7..ce02535b2 100644
--- a/modules/config/literate/init.el
+++ b/modules/config/literate/init.el
@@ -1,7 +1,5 @@
 ;;; config/literate/init.el -*- lexical-binding: t; -*-
 
-;;; config/literate/config.el -*- lexical-binding: t; -*-
-
 (defvar +literate-config-file
   (expand-file-name "config.org" doom-private-dir)
   "The file path of your literate config file.")
diff --git a/modules/editor/format/autoload/format.el b/modules/editor/format/autoload/format.el
index 99200a29e..e0bd6d6fe 100644
--- a/modules/editor/format/autoload/format.el
+++ b/modules/editor/format/autoload/format.el
@@ -137,7 +137,6 @@ See `+format/buffer' for the interactive version of this function, and
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun +format/buffer ()
@@ -185,7 +184,6 @@ is selected)."
 
 ;;
 ;; Hooks
-;;
 
 ;;;###autoload
 (defun +format|enable-on-save ()
diff --git a/modules/editor/format/config.el b/modules/editor/format/config.el
index 99d98abf1..438eb970e 100644
--- a/modules/editor/format/config.el
+++ b/modules/editor/format/config.el
@@ -14,8 +14,7 @@ If nil, it is disabled in all modes, the same as if the +onsave flag wasn't
 
 
 ;;
-;; Plugins
-;;
+;; Bootstrap
 
 (defun +format|enable-on-save-maybe ()
   "Enable formatting on save in certain major modes.
diff --git a/modules/emacs/dired/config.el b/modules/emacs/dired/config.el
index 1b878c206..1bdafea03 100644
--- a/modules/emacs/dired/config.el
+++ b/modules/emacs/dired/config.el
@@ -62,7 +62,6 @@
 
 ;;
 ;; Evil integration
-;;
 
 (map! :when (featurep! :feature evil +everywhere)
       :after dired
diff --git a/modules/emacs/eshell/autoload/eshell.el b/modules/emacs/eshell/autoload/eshell.el
index 0069dcc61..7f734a49c 100644
--- a/modules/emacs/eshell/autoload/eshell.el
+++ b/modules/emacs/eshell/autoload/eshell.el
@@ -11,7 +11,6 @@
 
 ;;
 ;; Helpers
-;;
 
 (defun +eshell--add-buffer (buf)
   (ring-remove+insert+extend +eshell-buffers buf 'grow))
@@ -77,7 +76,6 @@
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun +eshell/open (arg &optional command)
@@ -124,7 +122,6 @@ module to be loaded."
 
 ;;
 ;; Keybinds
-;;
 
 ;;;###autoload
 (defun +eshell/search-history ()
@@ -245,7 +242,6 @@ delete."
 
 ;;
 ;; Hooks
-;;
 
 ;;;###autoload
 (defun +eshell|init ()
diff --git a/modules/emacs/eshell/config.el b/modules/emacs/eshell/config.el
index 60c3ccd8c..1fb2194b1 100644
--- a/modules/emacs/eshell/config.el
+++ b/modules/emacs/eshell/config.el
@@ -47,8 +47,7 @@ You should use `det-eshell-alias!' to change this.")
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (after! eshell ; built-in
   (setq eshell-banner-message
diff --git a/modules/emacs/hideshow/autoload.el b/modules/emacs/hideshow/autoload.el
index 087bb62df..d676d57bc 100644
--- a/modules/emacs/hideshow/autoload.el
+++ b/modules/emacs/hideshow/autoload.el
@@ -35,7 +35,6 @@
 
 ;;
 ;; Indentation detection
-;;
 
 (defun +hideshow--empty-line-p ()
   (string= "" (string-trim (thing-at-point 'line))))
diff --git a/modules/emacs/vc/config.el b/modules/emacs/vc/config.el
index 427b4403d..38a590e84 100644
--- a/modules/emacs/vc/config.el
+++ b/modules/emacs/vc/config.el
@@ -38,12 +38,11 @@ otherwise in default state."
 
 ;;
 ;; `vc' (built-in)
-;;
 
 ;; `vc-hooks'
 (setq vc-make-backup-files nil)
 
-;; `vc-annotate' (built-in)
+;; `vc-annotate'
 (after! vc-annotate
   (set-popup-rules!
     '(("^\\vc-d" :select nil) ; *vc-diff*
@@ -52,7 +51,7 @@ otherwise in default state."
     '(vc-annotate-mode vc-git-log-view-mode)
     'normal))
 
-;; `smerge-mode' (built-in)
+;; `smerge-mode'
 (after! smerge-mode
   (unless EMACS26+
     (with-no-warnings
diff --git a/modules/feature/eval/autoload/settings.el b/modules/feature/eval/autoload/settings.el
index 04ec819ca..5a9e579eb 100644
--- a/modules/feature/eval/autoload/settings.el
+++ b/modules/feature/eval/autoload/settings.el
@@ -2,7 +2,6 @@
 
 ;;
 ;; REPLs
-;;
 
 (defvar +eval-repls nil
   "An alist mapping major modes to plists that describe REPLs. Used by
@@ -29,8 +28,6 @@ command that will be called interactively."
 
 ;;
 ;; Evaluation
-;;
-
 
 (defvar +eval-runners nil
   "Alist mapping major modes to interactive runner functions.")
diff --git a/modules/feature/eval/config.el b/modules/feature/eval/config.el
index f17bc335d..994a8cd94 100644
--- a/modules/feature/eval/config.el
+++ b/modules/feature/eval/config.el
@@ -6,8 +6,7 @@
 
 
 ;;
-;; Plugin(s)
-;;
+;; Packages
 
 (def-package! quickrun
   :defer t
diff --git a/modules/feature/evil/+everywhere.el b/modules/feature/evil/+everywhere.el
index f9c075647..371701a62 100644
--- a/modules/feature/evil/+everywhere.el
+++ b/modules/feature/evil/+everywhere.el
@@ -136,7 +136,6 @@ variable for an explanation of the defaults (in comments). See
 
 ;;
 ;; Bootstrap
-;;
 
 (after! eldoc
   (eldoc-add-command-completions "evil-window-"))
diff --git a/modules/feature/evil/autoload/evil.el b/modules/feature/evil/autoload/evil.el
index 74a87bddd..f15c13b11 100644
--- a/modules/feature/evil/autoload/evil.el
+++ b/modules/feature/evil/autoload/evil.el
@@ -20,7 +20,6 @@
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun +evil/visual-indent ()
@@ -104,7 +103,6 @@ evil-window-move-* (e.g. `evil-window-move-far-left')"
 
 ;;
 ;; Evil commands/operators
-;;
 
 ;;;###autoload (autoload '+evil:apply-macro "feature/evil/autoload/evil" nil t)
 (evil-define-operator +evil:apply-macro (beg end)
diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index e07c5850d..4ea48d95e 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -225,8 +225,7 @@ line with a linewise comment.")
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! evil-commentary
   :commands (evil-commentary evil-commentary-yank evil-commentary-line)
@@ -398,7 +397,6 @@ the new algorithm is confusing, like in python or ruby."
 
 ;;
 ;; Text object plugins
-;;
 
 (def-package! evil-args
   :commands (evil-inner-arg evil-outer-arg
diff --git a/modules/feature/file-templates/autoload.el b/modules/feature/file-templates/autoload.el
index 2c07c6b51..595b9f6e0 100644
--- a/modules/feature/file-templates/autoload.el
+++ b/modules/feature/file-templates/autoload.el
@@ -59,7 +59,6 @@ these properties:
 
 ;;
 ;; Library
-;;
 
 ;;;###autoload
 (cl-defun +file-templates--expand (pred &key project mode trigger ignore _when)
@@ -113,7 +112,6 @@ evil is loaded and enabled)."
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun +file-templates/insert-license ()
diff --git a/modules/feature/file-templates/config.el b/modules/feature/file-templates/config.el
index f7fcaab41..b7cb10292 100644
--- a/modules/feature/file-templates/config.el
+++ b/modules/feature/file-templates/config.el
@@ -101,7 +101,6 @@ information.")
 
 ;;
 ;; Library
-;;
 
 (defun +file-templates-in-emacs-dirs-p (file)
   "Returns t if FILE is in Doom or your private directory."
@@ -122,7 +121,6 @@ must be non-read-only, empty, and there must be a rule in
 
 ;;
 ;; Bootstrap
-;;
 
 (after! yasnippet
   (if (featurep! :feature snippets)
diff --git a/modules/feature/lookup/autoload/docsets.el b/modules/feature/lookup/autoload/docsets.el
index c7ba5b008..f8b8efbca 100644
--- a/modules/feature/lookup/autoload/docsets.el
+++ b/modules/feature/lookup/autoload/docsets.el
@@ -55,7 +55,6 @@ Used by `+lookup/in-docsets' and `+lookup/documentation'."
 
 ;;
 ;; Library
-;;
 
 ;;;###autoload
 (defun +lookup-docsets-for-buffer ()
@@ -85,7 +84,6 @@ This list is built from `+lookup-docset-alist'."
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defalias '+lookup/install-docset #'helm-dash-install-docset)
diff --git a/modules/feature/lookup/autoload/lookup.el b/modules/feature/lookup/autoload/lookup.el
index de5964ff9..0f988a137 100644
--- a/modules/feature/lookup/autoload/lookup.el
+++ b/modules/feature/lookup/autoload/lookup.el
@@ -65,7 +65,6 @@ properties:
 
 ;;
 ;; Library
-;;
 
 ;; Helpers
 (defun +lookup--online-provider (&optional force-p namespace)
@@ -128,7 +127,6 @@ properties:
 
 ;;
 ;; Main commands
-;;
 
 ;;;###autoload
 (defun +lookup/definition (identifier &optional other-window)
@@ -273,7 +271,6 @@ Otherwise, falls back on `find-file-at-point'."
 
 ;;
 ;; Source-specific commands
-;;
 
 (defvar counsel-dash-docsets)
 (defvar helm-dash-docsets)
diff --git a/modules/feature/lookup/config.el b/modules/feature/lookup/config.el
index 46971184d..11fbe186d 100644
--- a/modules/feature/lookup/config.el
+++ b/modules/feature/lookup/config.el
@@ -74,7 +74,6 @@ argument: the identifier at point.")
 
 ;;
 ;; dumb-jump
-;;
 
 (def-package! dumb-jump
   :commands dumb-jump-result-follow
@@ -89,7 +88,6 @@ argument: the identifier at point.")
 
 ;;
 ;; xref
-;;
 
 ;; By default, `etags--xref-backend' is the default xref backend. No need. We'll
 ;; set these up ourselves in other modules.
@@ -116,7 +114,6 @@ argument: the identifier at point.")
 
 ;;
 ;; Dash docset integration
-;;
 
 ;; Both packages depend on helm-dash, for now
 (def-package! helm-dash
diff --git a/modules/feature/snippets/autoload/snippets.el b/modules/feature/snippets/autoload/snippets.el
index 5a3aeea10..ce7518cac 100644
--- a/modules/feature/snippets/autoload/snippets.el
+++ b/modules/feature/snippets/autoload/snippets.el
@@ -92,7 +92,6 @@ buggy behavior when <delete> is pressed in an empty field."
 
 ;;
 ;; Hooks
-;;
 
 ;;;###autoload
 (defun +snippets|enable-project-modes (mode &rest _)
diff --git a/modules/feature/snippets/config.el b/modules/feature/snippets/config.el
index 29b1f3fd2..e1aedd1b3 100644
--- a/modules/feature/snippets/config.el
+++ b/modules/feature/snippets/config.el
@@ -5,8 +5,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! yasnippet
   :commands (yas-minor-mode-on yas-expand yas-expand-snippet yas-lookup-snippet
diff --git a/modules/feature/workspaces/autoload/workspaces.el b/modules/feature/workspaces/autoload/workspaces.el
index 948282a14..4464b621e 100644
--- a/modules/feature/workspaces/autoload/workspaces.el
+++ b/modules/feature/workspaces/autoload/workspaces.el
@@ -16,7 +16,6 @@
 
 ;;
 ;; Library
-;;
 
 (defun +workspace--protected-p (name)
   (equal name persp-nil-name))
@@ -203,8 +202,7 @@ throws an error."
 
 
 ;;
-;; Interactive commands
-;;
+;; Commands
 
 ;;;###autoload
 (defun +workspace/load (name)
@@ -446,7 +444,6 @@ the next."
 
 ;;
 ;; Tabs display in minibuffer
-;;
 
 (defun +workspace--tabline (&optional names)
   (let ((names (or names (+workspace-list-names)))
@@ -493,7 +490,6 @@ the next."
 
 ;;
 ;; Hooks
-;;
 
 ;;;###autoload
 (defun +workspaces|delete-associated-workspace (&optional frame)
@@ -581,7 +577,6 @@ This be hooked to `projectile-after-switch-project-hook'."
 
 ;;
 ;; Advice
-;;
 
 ;;;###autoload
 (defun +workspaces*autosave-real-buffers (orig-fn &rest args)
diff --git a/modules/feature/workspaces/config.el b/modules/feature/workspaces/config.el
index 76ff118e9..f6df57581 100644
--- a/modules/feature/workspaces/config.el
+++ b/modules/feature/workspaces/config.el
@@ -33,8 +33,7 @@ stored in `persp-save-dir'.")
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! persp-mode
   :defer t
diff --git a/modules/lang/cc/autoload.el b/modules/lang/cc/autoload.el
index 1ab7cd017..d1da3d579 100644
--- a/modules/lang/cc/autoload.el
+++ b/modules/lang/cc/autoload.el
@@ -6,7 +6,6 @@
 
 ;;
 ;; Library
-;;
 
 ;;;###autoload
 (defun +cc-sp-point-is-template-p (id action context)
@@ -89,7 +88,6 @@ preceded by the opening brace or a comma (disregarding whitespace in between)."
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun +cc/reload-compile-db ()
@@ -125,7 +123,6 @@ preceded by the opening brace or a comma (disregarding whitespace in between)."
 
 ;;
 ;; Hooks
-;;
 
 ;;;###autoload
 (defun +cc|fontify-constants ()
diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el
index bfde05d0f..189e77fca 100644
--- a/modules/lang/cc/config.el
+++ b/modules/lang/cc/config.el
@@ -20,8 +20,7 @@ compilation database is present in the project.")
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! cc-mode
   :commands (c-mode c++-mode objc-mode java-mode)
@@ -159,22 +158,18 @@ compilation database is present in the project.")
 
 ;;
 ;; Major modes
-;;
 
-;; `cmake-mode'
-(def-package! company-cmake
+(def-package! company-cmake  ; for `cmake-mode'
   :when (featurep! :completion company)
   :after cmake-mode
   :config (set-company-backend! 'cmake-mode 'company-cmake))
 
 
-;; `demangle-mode'
 (def-package! demangle-mode
   :hook llvm-mode)
 
 
-;; `glsl-mode'
-(def-package! company-glsl
+(def-package! company-glsl  ; for `glsl-mode'
   :when (featurep! :completion company)
   :after glsl-mode
   :config (set-company-backend! 'glsl-mode 'company-glsl))
@@ -182,7 +177,6 @@ compilation database is present in the project.")
 
 ;;
 ;; Rtags Support
-;;
 
 (def-package! rtags
   :when (featurep! +rtags)
diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index b15ea77ed..f06931192 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -21,6 +21,7 @@
           cider-stacktrace-default-filters '(tooling dup)
           cider-prompt-save-file-on-load nil
           cider-repl-use-clojure-font-lock t)
+
     (map! :map cider-mode-map
           :localleader
           :n  "'"  #'cider-jack-in
diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el
index cc3e79889..6314281c5 100644
--- a/modules/lang/data/config.el
+++ b/modules/lang/data/config.el
@@ -10,7 +10,6 @@
   (set-company-backend! 'nxml-mode '(company-nxml company-yasnippet)))
 
 
-;;
 ;; Third-party plugins
 ;;
 
@@ -37,7 +36,6 @@
   :mode "\\.?vimperatorrc\\'")
 
 
-;;
 ;; Frameworks
 ;;
 
diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el
index faa2700d4..3d743fdc0 100644
--- a/modules/lang/emacs-lisp/autoload.el
+++ b/modules/lang/emacs-lisp/autoload.el
@@ -2,7 +2,6 @@
 
 ;;
 ;; Library
-;;
 
 ;;;###autoload
 (defun +emacs-lisp-eval (beg end)
@@ -73,7 +72,6 @@ library/userland functions"
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun +emacs-lisp/repl ()
@@ -89,7 +87,6 @@ library/userland functions"
 
 ;;
 ;; Hooks
-;;
 
 ;;;###autoload
 (defun +emacs-lisp|extend-imenu ()
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index f2ecb5536..9c500bfb3 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -3,9 +3,9 @@
 (defvar +emacs-lisp-enable-extra-fontification t
   "If non-nil, highlight special forms, and defined functions and variables.")
 
+
 ;;
 ;; elisp-mode deferral hack
-;;
 
 ;; `elisp-mode' is loaded at startup. In order to lazy load its config we need
 ;; to pretend it isn't loaded
@@ -27,7 +27,6 @@
 
 ;;
 ;; Config
-;;
 
 (add-to-list 'auto-mode-alist '("\\.Cask\\'" . emacs-lisp-mode))
 
@@ -77,8 +76,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 ;; `auto-compile'
 (setq auto-compile-display-buffer nil
@@ -124,7 +122,6 @@
 
 ;;
 ;; Project modes
-;;
 
 (def-project-mode! +emacs-lisp-ert-mode
   :modes (emacs-lisp-mode)
diff --git a/modules/lang/go/autoload.el b/modules/lang/go/autoload.el
index 5532e757c..83bfb3d96 100644
--- a/modules/lang/go/autoload.el
+++ b/modules/lang/go/autoload.el
@@ -2,7 +2,6 @@
 
 ;;
 ;; Tests
-;;
 
 (defvar +go-test-last nil
   "The last test run.")
diff --git a/modules/lang/go/config.el b/modules/lang/go/config.el
index fe97b79a0..57397706a 100644
--- a/modules/lang/go/config.el
+++ b/modules/lang/go/config.el
@@ -1,8 +1,7 @@
 ;;; lang/go/config.el -*- lexical-binding: t; -*-
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (after! go-mode
   (set-env! "GOPATH" "GOROOT")
diff --git a/modules/lang/haskell/config.el b/modules/lang/haskell/config.el
index 28d539687..2a608cda9 100644
--- a/modules/lang/haskell/config.el
+++ b/modules/lang/haskell/config.el
@@ -4,8 +4,7 @@
       ((featurep! +dante)  (load! "+dante")))
 
 ;;
-;; Common plugins
-;;
+;; Common packages
 
 (after! haskell-mode
   (setq haskell-process-suggest-remove-import-lines t  ; warnings for redundant imports etc
diff --git a/modules/lang/java/config.el b/modules/lang/java/config.el
index bd5a11904..9e42b0b62 100644
--- a/modules/lang/java/config.el
+++ b/modules/lang/java/config.el
@@ -9,8 +9,7 @@
 
 
 ;;
-;; Common plugins
-;;
+;; Common packages
 
 (def-package! android-mode
   :commands android-mode
diff --git a/modules/lang/javascript/autoload.el b/modules/lang/javascript/autoload.el
index 787e1528a..00bf9d692 100644
--- a/modules/lang/javascript/autoload.el
+++ b/modules/lang/javascript/autoload.el
@@ -34,7 +34,6 @@ ignore the cache."
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun +javascript/repl ()
@@ -82,7 +81,6 @@ Run this for any buffer you want to skewer."
 
 ;;
 ;; Hooks
-;;
 
 ;;;###autoload
 (defun +javascript|add-node-modules-path ()
@@ -112,7 +110,6 @@ prioritize project-local packages over global ones."
 
 ;;
 ;; Advice
-;;
 
 ;;;###autoload
 (defun +javascript*tide-project-root ()
diff --git a/modules/lang/latex/config.el b/modules/lang/latex/config.el
index f0c6d2be8..51669a764 100644
--- a/modules/lang/latex/config.el
+++ b/modules/lang/latex/config.el
@@ -23,8 +23,7 @@ If no viewers are found, `latex-preview-pane' is used.")
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! tex
   :mode ("\\.tex\\'" . TeX-latex-mode)
diff --git a/modules/lang/lua/config.el b/modules/lang/lua/config.el
index 58d086f43..90ce581a3 100644
--- a/modules/lang/lua/config.el
+++ b/modules/lang/lua/config.el
@@ -3,6 +3,7 @@
 ;; sp's default rules are obnoxious, so disable them
 (provide 'smartparens-lua)
 
+
 (after! lua-mode
   (set-lookup-handlers! 'lua-mode :documentation 'lua-search-documentation)
   (set-electric! 'lua-mode :words '("else" "end"))
@@ -16,7 +17,6 @@
 
 ;;
 ;; Frameworks
-;;
 
 (def-project-mode! +lua-love-mode
   :modes (lua-mode markdown-mode json-mode)
diff --git a/modules/lang/org/+attach.el b/modules/lang/org/+attach.el
index 09ed06832..3a31dbdf1 100644
--- a/modules/lang/org/+attach.el
+++ b/modules/lang/org/+attach.el
@@ -25,8 +25,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! org-download
   :commands (org-download-dnd org-download-dnd-base64)
@@ -70,7 +69,6 @@
 
 ;;
 ;; Bootstrap
-;;
 
 (defun +org|init-attach ()
   (setq org-attach-directory (expand-file-name +org-attach-dir org-directory))
diff --git a/modules/lang/org/+babel.el b/modules/lang/org/+babel.el
index 4c57a9b94..615833886 100644
--- a/modules/lang/org/+babel.el
+++ b/modules/lang/org/+babel.el
@@ -53,8 +53,7 @@ string). Stops at the first function to return non-nil.")
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! ob-ipython
   :when (featurep! +ipython)
diff --git a/modules/lang/org/+present.el b/modules/lang/org/+present.el
index 99b3f5d49..6c99391d4 100644
--- a/modules/lang/org/+present.el
+++ b/modules/lang/org/+present.el
@@ -7,8 +7,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! ox-reveal
   :defer t
@@ -43,8 +42,6 @@
 
 ;;
 ;; Bootstrap
-;;
 
 (defun +org|init-present ()
   (require 'ox-reveal))
-
diff --git a/modules/lang/org/autoload/org-attach.el b/modules/lang/org/autoload/org-attach.el
index 1eb724d7c..c99715ef7 100644
--- a/modules/lang/org/autoload/org-attach.el
+++ b/modules/lang/org/autoload/org-attach.el
@@ -113,7 +113,6 @@ the cursor."
 
 ;;
 ;; Advice
-;;
 
 ;;;###autoload
 (defun +org-attach*insert-link (_link filename)
diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el
index 3621d4eec..edf161be6 100644
--- a/modules/lang/org/autoload/org.el
+++ b/modules/lang/org/autoload/org.el
@@ -22,7 +22,6 @@ current file). Only scans first 2048 bytes of the document."
 
 ;;
 ;; Modes
-;;
 
 ;;;###autoload
 (define-minor-mode +org-pretty-mode
@@ -39,7 +38,6 @@ current file). Only scans first 2048 bytes of the document."
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun +org/dwim-at-point ()
@@ -314,7 +312,6 @@ another level of headings on each invocation."
 
 ;;
 ;; Hooks
-;;
 
 ;;;###autoload
 (defun +org|delete-backward-char-and-realign-table-maybe ()
@@ -419,7 +416,6 @@ with `org-cycle')."
 
 ;;
 ;; Advice
-;;
 
 ;;;###autoload
 (defun +org*fix-newline-and-indent-in-src-blocks ()
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index eb2ffcfa3..06cedc4c4 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -15,8 +15,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 ;; `toc-org'
 (setq toc-org-hrefify-default "org")
@@ -39,7 +38,6 @@
 
 ;;
 ;; Bootstrap
-;;
 
 (add-hook! 'org-load-hook
   #'(org-crypt-use-before-save-magic
@@ -68,7 +66,6 @@
 
 ;;
 ;; `org-mode' hooks
-;;
 
 (defun +org|unfold-to-2nd-level-or-point ()
   "My version of the 'overview' #+STARTUP option: expand first-level headings.
@@ -118,7 +115,6 @@ unfold to point on startup."
 
 ;;
 ;; `org-load' hooks
-;;
 
 (defun +org|setup-agenda ()
   (setq-default
@@ -404,7 +400,6 @@ conditions where a window's buffer hasn't changed at the time this hook is run."
 
 ;;
 ;; Built-in libraries
-;;
 
 (def-package! org-crypt ; built-in
   :commands org-crypt-use-before-save-magic
diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el
index 31ee4e3d7..c92cae75b 100644
--- a/modules/lang/php/config.el
+++ b/modules/lang/php/config.el
@@ -102,7 +102,6 @@
 
 ;;
 ;; Projects
-;;
 
 (def-project-mode! +php-laravel-mode
   :modes (php-mode yaml-mode web-mode nxml-mode js2-mode scss-mode)
diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index e44c4d2bf..6485698b1 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -9,8 +9,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! python
   :defer t
@@ -126,7 +125,6 @@
 
 ;;
 ;; Environment management
-;;
 
 (def-package! pipenv
   :commands pipenv-project-p
diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index 5308e06b7..37d852c6a 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -9,8 +9,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! enh-ruby-mode
   :mode "\\.rb\\'"
@@ -114,7 +113,6 @@
 
 ;;
 ;; Version managers
-;;
 
 (def-package! rbenv
   :when (featurep! +rbenv)
diff --git a/modules/lang/sh/config.el b/modules/lang/sh/config.el
index 77abb3e8a..e73738fca 100644
--- a/modules/lang/sh/config.el
+++ b/modules/lang/sh/config.el
@@ -8,8 +8,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! sh-script ; built-in
   :mode ("\\.zunit\\'" . sh-mode)
diff --git a/modules/lang/solidity/config.el b/modules/lang/solidity/config.el
index 0795e40b8..0157c37fd 100644
--- a/modules/lang/solidity/config.el
+++ b/modules/lang/solidity/config.el
@@ -1,8 +1,7 @@
 ;;; lang/solidity/config.el -*- lexical-binding: t; -*-
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 ;; `solidity-mode'
 (setq solidity-comment-style 'slash)
diff --git a/modules/lang/web/config.el b/modules/lang/web/config.el
index 6a9c0179f..747435a50 100644
--- a/modules/lang/web/config.el
+++ b/modules/lang/web/config.el
@@ -20,8 +20,7 @@
 
 
 ;;
-;; Frameworks
-;;
+;; Framework-based minor-modes
 
 (def-project-mode! +web-jekyll-mode
   :modes (web-mode js-mode coffee-mode css-mode haml-mode pug-mode)
diff --git a/modules/tools/ein/autoload.el b/modules/tools/ein/autoload.el
index 3796e2a22..5ddcbaae5 100644
--- a/modules/tools/ein/autoload.el
+++ b/modules/tools/ein/autoload.el
@@ -9,7 +9,6 @@
 
 ;;
 ;; Library
-;;
 
 (defun +ein--collect-ein-buffer-links ()
   (let ((end (window-end))
diff --git a/modules/tools/ein/config.el b/modules/tools/ein/config.el
index 97126600d..e9b2f0412 100644
--- a/modules/tools/ein/config.el
+++ b/modules/tools/ein/config.el
@@ -5,8 +5,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (after! ein
   (setq ein:notebook-modes
diff --git a/modules/tools/magit/autoload.el b/modules/tools/magit/autoload.el
index 3c4c12ea5..72df14f4f 100644
--- a/modules/tools/magit/autoload.el
+++ b/modules/tools/magit/autoload.el
@@ -47,7 +47,6 @@
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun +magit/quit (&optional _kill-buffer)
@@ -102,7 +101,6 @@ format."
 
 ;;
 ;; Advice
-;;
 
 ;;;###autoload
 (defun +magit*hub-settings--format-magithub.enabled ()
diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el
index fe0d4d1e4..383a88997 100644
--- a/modules/tools/magit/config.el
+++ b/modules/tools/magit/config.el
@@ -12,8 +12,7 @@ available.")
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! magit
   :commands magit-file-delete
diff --git a/modules/tools/password-store/autoload.el b/modules/tools/password-store/autoload.el
index 856b984ce..a464569e9 100644
--- a/modules/tools/password-store/autoload.el
+++ b/modules/tools/password-store/autoload.el
@@ -30,7 +30,6 @@
 
 ;;
 ;; API
-;;
 
 ;;;###autoload (autoload 'auth-source-pass-parse-entry "auth-source-pass")
 ;;;###autoload
@@ -62,7 +61,6 @@ search of your username. May prompt for your gpg passphrase."
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload (autoload 'password-store-dir "password-store")
 ;;;###autoload (autoload 'password-store-list "password-store")
@@ -112,7 +110,6 @@ fields in `+pass-url-fields' is used to find the url field."
 
 ;;
 ;; Ivy interface
-;;
 
 ;;;###autoload
 (defun +pass/ivy (arg)
@@ -136,7 +133,6 @@ fields in `+pass-url-fields' is used to find the url field."
 
 ;;
 ;; TODO Helm interface
-;;
 
 ;; (defun +pass/helm ()
 ;;   (interactive)
diff --git a/modules/tools/password-store/config.el b/modules/tools/password-store/config.el
index bf982a1d2..3ccfa5b5b 100644
--- a/modules/tools/password-store/config.el
+++ b/modules/tools/password-store/config.el
@@ -8,8 +8,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 ;; `password-store'
 (setq password-store-password-length 12)
diff --git a/modules/tools/tmux/autoload/tmux.el b/modules/tools/tmux/autoload/tmux.el
index c3173845c..63f51156e 100644
--- a/modules/tools/tmux/autoload/tmux.el
+++ b/modules/tools/tmux/autoload/tmux.el
@@ -13,7 +13,6 @@
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defun +tmux (command &rest args)
@@ -87,7 +86,6 @@ but do not execute them."
 
 ;;
 ;; Data functions
-;;
 
 ;;;###autoload
 (defun +tmux-list-sessions ()
diff --git a/modules/ui/doom-dashboard/config.el b/modules/ui/doom-dashboard/config.el
index 31e1da990..65700c31c 100644
--- a/modules/ui/doom-dashboard/config.el
+++ b/modules/ui/doom-dashboard/config.el
@@ -99,7 +99,6 @@ PLIST can have the following properties:
 
 ;;
 ;; Bootstrap
-;;
 
 (setq doom-fallback-buffer-name +doom-dashboard-name
       initial-buffer-choice #'+doom-dashboard-initial-buffer)
@@ -109,7 +108,6 @@ PLIST can have the following properties:
 
 ;;
 ;; Major mode
-;;
 
 (define-derived-mode +doom-dashboard-mode special-mode
   (format "DOOM v%s" doom-version)
@@ -168,7 +166,6 @@ PLIST can have the following properties:
 
 ;;
 ;; Hooks
-;;
 
 (defun +doom-dashboard|reposition-point ()
   "Trap the point in the buttons."
@@ -264,7 +261,6 @@ project (which may be different across perspective)."
 
 ;;
 ;; Library
-;;
 
 (defun +doom-dashboard-initial-buffer ()
   "Returns buffer to display on startup. Designed for `initial-buffer-choice'."
@@ -338,7 +334,6 @@ controlled by `+doom-dashboard-pwd-policy'."
 
 ;;
 ;; Widgets
-;;
 
 (defun doom-dashboard-widget-banner ()
   (let ((point (point)))
diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el
index 800b7342e..753d93afa 100644
--- a/modules/ui/doom-modeline/config.el
+++ b/modules/ui/doom-modeline/config.el
@@ -2,7 +2,6 @@
 
 ;;
 ;; Modeline library
-;;
 
 (defvar doom--modeline-fn-alist ())
 (defvar doom--modeline-var-alist ())
@@ -89,7 +88,6 @@ DEFAULT is non-nil, set the default mode-line for all buffers."
 
 ;;
 ;; Custom faces
-;;
 
 (defgroup +doom-modeline nil
   "TODO"
@@ -157,8 +155,7 @@ active."
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 ;; anzu and evil-anzu expose current/total state that can be displayed in the
 ;; mode-line.
@@ -229,7 +226,6 @@ active."
 
 ;;
 ;; Variables
-;;
 
 (defvar +doom-modeline-height 23
   "How tall the mode-line should be (only respected in GUI emacs).")
@@ -260,7 +256,6 @@ file-name => comint.el")
 
 ;;
 ;; Modeline helpers
-;;
 
 (defun active ()
   (eq (selected-window) +doom-modeline-current-window))
@@ -389,7 +384,6 @@ Example:
 
 ;;
 ;; buffer information
-;;
 
 (def-modeline-segment! buffer-default-directory
   "Displays `default-directory'. This is for special buffers like the scratch
@@ -479,7 +473,6 @@ directory, the file name, and its state (modified, read-only or non-existent)."
 
 ;;
 ;; major-mode
-;;
 
 (def-modeline-segment! major-mode
   "The major mode, including process, environment and text-scale info."
@@ -495,7 +488,6 @@ directory, the file name, and its state (modified, read-only or non-existent)."
 
 ;;
 ;; vcs
-;;
 
 (defvar-local +doom-modeline--vcs nil)
 (defun +doom-modeline--update-vcs ()
@@ -544,7 +536,6 @@ directory, the file name, and its state (modified, read-only or non-existent)."
 
 ;;
 ;; flycheck
-;;
 
 (defvar +doom-modeline-vspc
   (propertize " " 'face 'variable-pitch)
@@ -589,7 +580,6 @@ icons."
 
 ;;
 ;; selection-info
-;;
 
 (defsubst doom-column (pos)
   (save-excursion (goto-char pos)
@@ -629,7 +619,6 @@ lines are selected, or the NxM dimensions of a block selection."
 
 ;;
 ;; matches (anzu, evil-substitute, iedit, macro)
-;;
 
 (defun +doom-modeline--macro-recording ()
   "Display current Emacs or evil macro being recorded."
@@ -715,7 +704,6 @@ with `evil-ex-substitute', and/or 4. The number of active `iedit' regions."
 
 ;;
 ;; media-info
-;;
 
 (def-modeline-segment! media-info
   "Metadata regarding the current file, such as dimensions for images."
@@ -728,7 +716,6 @@ with `evil-ex-substitute', and/or 4. The number of active `iedit' regions."
 
 ;;
 ;; bar
-;;
 
 (defvar +doom-modeline--bar-active nil)
 (defvar +doom-modeline--bar-inactive nil)
@@ -759,7 +746,6 @@ Returns \"\" to not break --no-window-system."
 
 ;;
 ;; Mode lines
-;;
 
 (def-modeline! 'main
   '(bar matches " " buffer-info "  %l:%c %p  " selection-info)
@@ -784,7 +770,6 @@ Returns \"\" to not break --no-window-system."
 
 ;;
 ;; Hooks
-;;
 
 (defun +doom-modeline|refresh-bars (&optional width height)
   (setq +doom-modeline--bar-active
@@ -818,7 +803,6 @@ Returns \"\" to not break --no-window-system."
 
 ;;
 ;; Bootstrap
-;;
 
 (doom-set-modeline 'main t) ; set default modeline
 
diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el
index e123b2060..44c74a63c 100644
--- a/modules/ui/doom/config.el
+++ b/modules/ui/doom/config.el
@@ -19,8 +19,7 @@
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 ;; <https://github.com/hlissner/emacs-doom-theme>
 (def-package! doom-themes
diff --git a/modules/ui/fci/config.el b/modules/ui/fci/config.el
index 705001078..fdef24869 100644
--- a/modules/ui/fci/config.el
+++ b/modules/ui/fci/config.el
@@ -12,8 +12,7 @@ Changes to this variable do not take effect until `fci-mode' is restarted.")
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! fill-column-indicator
   :hook ((text-mode prog-mode conf-mode) . turn-on-fci-mode)
diff --git a/modules/ui/modeline/config.el b/modules/ui/modeline/config.el
index b2a06c7c7..56384e303 100644
--- a/modules/ui/modeline/config.el
+++ b/modules/ui/modeline/config.el
@@ -68,7 +68,6 @@ Currently available functions:
 
 ;;
 ;; Custom faces
-;;
 
 (defgroup +modeline nil
   "TODO"
@@ -124,8 +123,7 @@ Currently available functions:
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! anzu
   :after-call isearch-mode
@@ -161,7 +159,6 @@ Currently available functions:
 
 ;;
 ;; Hacks
-;;
 
 ;; Keep `+modeline-current-window' up-to-date
 (defvar +modeline-current-window (frame-selected-window))
@@ -225,7 +222,6 @@ Currently available functions:
 
 ;;
 ;; Helpers
-;;
 
 (defun +modeline--make-xpm (width height &optional color)
   "Create an XPM bitmap. Inspired by `powerline''s `pl/make-xpm'."
@@ -264,7 +260,6 @@ use `buffer-name'."
 
 ;;
 ;; Buffer file path styles
-;;
 
 (defun +modeline-file-path-with-project ()
   "Returns the unaltered buffer file path relative to the project root's
@@ -356,7 +351,6 @@ Meant for `+modeline-buffer-path-function'."
 
 ;;
 ;; Bars
-;;
 
 (defvar +modeline-bar-start nil "TODO")
 (put '+modeline-bar-start 'risky-local-variable t)
@@ -394,7 +388,6 @@ Meant for `+modeline-buffer-path-function'."
 
 ;;
 ;; Segments
-;;
 
 (defun +modeline|update-on-change ()
   (+modeline--set-+modeline-buffer-state)
@@ -666,7 +659,6 @@ icons."
 
 ;;
 ;; Preset modeline formats
-;;
 
 (def-modeline-format! :main
   '(+modeline-matches " "
@@ -696,9 +688,6 @@ icons."
 
 
 ;;
-;;
-;;
-
 (def-modeline-segment! +modeline--rest
   (let ((rhs-str (format-mode-line +modeline-format-right)))
     (list (propertize
diff --git a/modules/ui/popup/+hacks.el b/modules/ui/popup/+hacks.el
index 6d5f9b334..f30d81e96 100644
--- a/modules/ui/popup/+hacks.el
+++ b/modules/ui/popup/+hacks.el
@@ -24,7 +24,6 @@
 
 ;;
 ;; Core functions
-;;
 
 ;; Don't try to resize popup windows
 (advice-add #'balance-windows :around #'+popup*save)
@@ -32,7 +31,6 @@
 
 ;;
 ;; External functions
-;;
 
 ;; `company'
 (progn
diff --git a/modules/ui/popup/autoload/popup.el b/modules/ui/popup/autoload/popup.el
index eb856a004..dc2a036eb 100644
--- a/modules/ui/popup/autoload/popup.el
+++ b/modules/ui/popup/autoload/popup.el
@@ -129,7 +129,6 @@ and enables `+popup-buffer-mode'."
 
 ;;
 ;; Public library
-;;
 
 ;;;###autoload
 (defun +popup-buffer-p (&optional buffer)
@@ -211,7 +210,6 @@ Uses `shrink-window-if-larger-than-buffer'."
 
 ;;
 ;; Hooks
-;;
 
 ;;;###autoload
 (defun +popup|adjust-fringes ()
@@ -291,7 +289,6 @@ Any non-nil value besides the above will be used as the raw value for
 
 ;;
 ;; Commands
-;;
 
 ;;;###autoload
 (defalias 'other-popup #'+popup/other)
@@ -397,7 +394,6 @@ the message buffer in a popup window."
 
 ;;
 ;; Advice
-;;
 
 ;;;###autoload
 (defun +popup*close (&rest _)
@@ -555,7 +551,6 @@ Accepts the same arguments as `display-buffer-in-side-window'. You must set
 
 ;;
 ;; Emacs backwards compatibility
-;;
 
 (unless EMACS26+
   (defvar window-sides-reversed nil)
diff --git a/modules/ui/popup/autoload/settings.el b/modules/ui/popup/autoload/settings.el
index e700e5445..ed685f686 100644
--- a/modules/ui/popup/autoload/settings.el
+++ b/modules/ui/popup/autoload/settings.el
@@ -199,7 +199,6 @@ Example:
 
 ;;
 ;; Obsolete settings
-;;
 
 ;; FIXME obsolete :popup
 ;;;###autoload
diff --git a/modules/ui/popup/config.el b/modules/ui/popup/config.el
index acb13bbe9..04fa0bd1c 100644
--- a/modules/ui/popup/config.el
+++ b/modules/ui/popup/config.el
@@ -35,7 +35,6 @@ adjustment.")
 
 ;;
 ;; Global modes
-;;
 
 (defvar +popup-mode-map (make-sparse-keymap)
   "Active keymap in a session with the popup system enabled. See
@@ -95,7 +94,6 @@ that window has been changed or closed."
 
 ;;
 ;; Macros
-;;
 
 (defmacro with-popup-rules! (rules &rest body)
   "Evaluate BODY with popup RULES. RULES is a list of popup rules. Each rule
@@ -128,7 +126,6 @@ prevent the popup(s) from messing up the UI (or vice versa)."
 
 ;;
 ;; Default popup rules & bootstrap
-;;
 
 (set-popup-rules!
   (when (featurep! +all)
@@ -175,6 +172,5 @@ prevent the popup(s) from messing up the UI (or vice versa)."
 
 ;;
 ;; Hacks
-;;
 
 (load! "+hacks")
diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el
index df77e025d..3a4ad4caa 100644
--- a/modules/ui/vc-gutter/config.el
+++ b/modules/ui/vc-gutter/config.el
@@ -17,8 +17,7 @@ to the right fringe.")
 
 
 ;;
-;; Plugins
-;;
+;; Packages
 
 (def-package! git-gutter-fringe
   :commands (git-gutter:revert-hunk git-gutter:stage-hunk)