diff --git a/.config/emacs/config.org b/.config/emacs/config.org
index 7691689..c475fe2 100644
--- a/.config/emacs/config.org
+++ b/.config/emacs/config.org
@@ -30,17 +30,23 @@
       - [[#org-export-packages][Org Export Packages]]
     - [[#completion][Completion]]
       - [[#company][Company]]
+      - [[#yasnippet][YASnippet]]
+    - [[#checkers][Checkers]]
       - [[#flycheck][Flycheck]]
+      - [[#flyspell][Flyspell]]
+    - [[#programming-integration][Programming Integration]]
       - [[#lsp][LSP]]
       - [[#dap][DAP]]
-      - [[#yasnippet][YASnippet]]
+    - [[#programming-languages][Programming Languages]]
       - [[#cc][C/C++]]
-    - [[#lua][Lua]]
-    - [[#yaml][YAML]]
-    - [[#php][PHP]]
-    - [[#prettify][Prettify]]
+      - [[#lua][Lua]]
+      - [[#php][PHP]]
+      - [[#cmake][CMake]]
+      - [[#glsl][GLSL]]
+      - [[#yaml][YAML]]
     - [[#rss][RSS]]
     - [[#git][Git]]
+    - [[#prettify][Prettify]]
 - [[#general][General]]
   - [[#buffers][Buffers]]
   - [[#electric][Electric]]
@@ -256,12 +262,6 @@ Install and configure packages.
 	((latex-indent-line . 4)
 	 (latex-indent-region . 4)))
   (smart-tabs-insinuate 'c 'c++ 'java 'python 'latex))
-
-(use-package flyspell-correct
-  :after flyspell
-  :config
-  (setq flyspell-issue-message-flag nil)
-  (setq flyspell-issue-welcome-flag nil))
 #+END_SRC
 
 *** Evil
@@ -512,7 +512,6 @@ Autocomplete packages (includes code completion and snippets).
 
 #+BEGIN_SRC emacs-lisp
 (use-package company
-  :defer t
   :hook
   ((c-mode-common
 	emacs-lisp-mode
@@ -533,13 +532,30 @@ Autocomplete packages (includes code completion and snippets).
   :config (company-prescient-mode 1))
 #+END_SRC
 
+**** YASnippet
+
+#+BEGIN_SRC emacs-lisp
+(use-package yasnippet
+  :defer t
+  :init
+  (setq yas-snippet-dirs (list (concat dot-emacs-dir "/snippets")))
+  (setq yas-prompt-functions '(yas-completing-prompt))
+  :config
+  (yas-global-mode))
+
+(use-package yasnippet-snippets
+  :after yasnippet)
+#+END_SRC
+
+https://stackoverflow.com/questions/22735895/configuring-a-yasnippet-for-two-scenarios-1-region-is-active-2-region-is
+
+*** Checkers
 **** Flycheck
 
 On the fly syntax checking.
 
 #+BEGIN_SRC emacs-lisp
 (use-package flycheck
-  :defer t
   :hook
   ((c-mode-common
 	emacs-lisp-mode
@@ -567,6 +583,20 @@ On the fly syntax checking.
   :config (setq flycheck-clang-tidy-extra-options "--format-style=file"))
 #+END_SRC
 
+**** Flyspell
+
+Give Flyspell a selection menu.
+
+#+BEGIN_SRC emacs-lisp
+(use-package flyspell-correct
+  :defer t
+  :after flyspell
+  :config
+  (setq flyspell-issue-message-flag nil)
+  (setq flyspell-issue-welcome-flag nil))
+#+END_SRC
+
+*** Programming Integration
 **** LSP
 
 Language Server Protocol.
@@ -648,23 +678,7 @@ Debug Adapter Protocol.
 	(make-directory dap-utils-extension-path t)))
 #+END_SRC
 
-**** YASnippet
-
-#+BEGIN_SRC emacs-lisp
-(use-package yasnippet
-  :defer t
-  :init
-  (setq yas-snippet-dirs (list (concat dot-emacs-dir "/snippets")))
-  (setq yas-prompt-functions '(yas-completing-prompt))
-  :config
-  (yas-global-mode))
-
-(use-package yasnippet-snippets
-  :after yasnippet)
-#+END_SRC
-
-https://stackoverflow.com/questions/22735895/configuring-a-yasnippet-for-two-scenarios-1-region-is-active-2-region-is
-
+*** Programming Languages
 **** C/C++
 
 #+BEGIN_SRC emacs-lisp
@@ -679,7 +693,7 @@ https://stackoverflow.com/questions/22735895/configuring-a-yasnippet-for-two-sce
     (add-to-list 'company-backends 'company-glsl)))
 #+END_SRC
 
-*** Lua
+**** Lua
 
 #+BEGIN_SRC emacs-lisp
 (use-package lua-mode
@@ -687,14 +701,7 @@ https://stackoverflow.com/questions/22735895/configuring-a-yasnippet-for-two-sce
   :config (setq lua-indent-level 4))
 #+END_SRC
 
-*** YAML
-
-#+BEGIN_SRC emacs-lisp
-(use-package yaml-mode
-  :defer t)
-#+END_SRC
-
-*** PHP
+**** PHP
 
 #+BEGIN_SRC emacs-lisp
 (use-package php-mode
@@ -708,48 +715,27 @@ https://stackoverflow.com/questions/22735895/configuring-a-yasnippet-for-two-sce
   :defer t)
 #+END_SRC
 
-*** Prettify
+**** CMake
 
 #+BEGIN_SRC emacs-lisp
-(use-package dashboard
-  :demand
-  :hook (dashboard-mode . dot/hook-disable-line-numbers)
-  :config
-  (setq initial-buffer-choice (lambda () (get-buffer "*dashboard*")))
-  (setq dashboard-banner-logo-title "GNU Emacs master race!")
-  (setq dashboard-center-content t)
-  (setq dashboard-set-file-icons t)
-  (setq dashboard-set-footer nil)
-  (setq dashboard-set-heading-icons t)
-  (setq dashboard-show-shortcuts t)
-  (setq dashboard-startup-banner 'logo)
-  (setq dashboard-items '((projects . 10)
-						  (bookmarks . 5)
-						  (recents . 5)))
-  (dashboard-setup-startup-hook))
-
-;; A better *help* buffer
-(use-package helpful
-  :hook (helpful-mode . dot/hook-disable-line-numbers))
-
-(use-package rainbow-mode
-  :hook (prog-mode . rainbow-mode))
-
-(use-package rainbow-delimiters
-  :hook (prog-mode . rainbow-delimiters-mode))
-
-(use-package org-bullets
-  :hook (org-mode . org-bullets-mode))
-
-;; Cmake syntax highlighting
 (use-package cmake-mode
   :defer t)
+#+END_SRC
+
+**** GLSL
 
-;; Shader syntax highlighting
+#+BEGIN_SRC emacs-lisp
 (use-package glsl-mode
   :defer t)
 #+END_SRC
 
+**** YAML
+
+#+BEGIN_SRC emacs-lisp
+(use-package yaml-mode
+  :defer t)
+#+END_SRC
+
 *** RSS
 
 #+BEGIN_SRC emacs-lisp
@@ -777,6 +763,7 @@ https://stackoverflow.com/questions/22735895/configuring-a-yasnippet-for-two-sce
   :hook (prog-mode . (lambda () (when (vc-registered buffer-file-name) (diff-hl-flydiff-mode) (dot/toggle-fringe 1)))))
 
 (use-package transient
+  :defer t
   :config (setq transient-history-file (concat dot-cache-dir "/transient/history.el")))
 
 (use-package magit
@@ -792,6 +779,40 @@ https://stackoverflow.com/questions/22735895/configuring-a-yasnippet-for-two-sce
 									   ("~/code" . 3))))
 #+END_SRC
 
+*** Prettify
+
+#+BEGIN_SRC emacs-lisp
+(use-package dashboard
+  :demand
+  :hook (dashboard-mode . dot/hook-disable-line-numbers)
+  :config
+  (setq initial-buffer-choice (lambda () (get-buffer "*dashboard*")))
+  (setq dashboard-banner-logo-title "GNU Emacs master race!")
+  (setq dashboard-center-content t)
+  (setq dashboard-set-file-icons t)
+  (setq dashboard-set-footer nil)
+  (setq dashboard-set-heading-icons t)
+  (setq dashboard-show-shortcuts t)
+  (setq dashboard-startup-banner 'logo)
+  (setq dashboard-items '((projects . 10)
+						  (bookmarks . 5)
+						  (recents . 5)))
+  (dashboard-setup-startup-hook))
+
+;; A better *help* buffer
+(use-package helpful
+  :hook (helpful-mode . dot/hook-disable-line-numbers))
+
+(use-package rainbow-mode
+  :hook (prog-mode . rainbow-mode))
+
+(use-package rainbow-delimiters
+  :hook (prog-mode . rainbow-delimiters-mode))
+
+(use-package org-bullets
+  :hook (org-mode . org-bullets-mode))
+#+END_SRC
+
 * General
 
 #+BEGIN_SRC emacs-lisp