diff --git a/emacs/.config/doom/config.org b/emacs/.config/doom/config.org
index 100cb62..911d66d 100644
--- a/emacs/.config/doom/config.org
+++ b/emacs/.config/doom/config.org
@@ -112,6 +112,7 @@ accurate though.
 * Eglot
 Eglot versus LSP? Until 27 lands stable, Eglot wins. I can actually read all
 it's source.
+    
 #+BEGIN_SRC emacs-lisp
 ;; app/eglot
 ;; Back to eglot ...
@@ -196,6 +197,7 @@ Helpful modes to make working less painful.
       +pretty-code-enabled-modes '(emacs-lisp-mode org-mode))
 #+END_SRC
 * Org-mode
+** Basic configuration
 #+BEGIN_SRC emacs-lisp
 ;; tools/deft
 (setq deft-extensions '("org"))
@@ -203,44 +205,19 @@ Helpful modes to make working less painful.
 
 (after! org
   (setq org-directory (expand-file-name "~/org/")
-        org-journal-dir "~/org/journal/"
         org-agenda-files (list org-directory)
         org-agenda-window-setup 'only-window
         org-pretty-entities t
         org-log-done 'time
-        ;org-contacts-files '("~/org/contacts.org")
-        ; attempt to return todo function to spacemacs
-        ;evil-org-key-theme '(textobjects navigation additional insert todo)
-        ;; show actually italicized text instead of /italicized text/
-        ;org-agenda-block-separator ""
         org-fontify-whole-heading-line t
         org-fontify-done-headline t
         org-fontify-quote-and-verse-blocks t
         org-ellipsis "…"
         org-capture-templates
             '(("i" "Send to inbox" entry (file+headline "~/org/inbox.org" "Inbox")
-               "* TODO %?\n")
-               ("l" "Send to inbox with link" entry (file+headline "~/org/inbox.org" "Inbox")
-               "* TODO %?\n  %i\n  %a")
-              ("w" "Work diary entry" entry (file "~/org/work_diary.org")
-               "* %u\n%?\n")
-              ("u" "Add unblink entry" entry (file+headline "~/org/unblink.org" "Misc")
-               "* TITLE\n:PROPERTIES:\n:EXPORT_FILE_NAME: TITLE\n:EXPORT_DATE: %i\n:END:\n%?\n")
-              ("n" "Add an idea" entry (file "~/org/ideas.org")
-               "*  %?\nEntered on %U\n"))
+               "* TODO %?\n"))
         org-todo-keywords
             '((sequence "TODO(t)" "NEXT(n)" "MAYBE(m)" "|" "DONE(d)" "WONTDO(w)"))
-
-        org-todo-keyword-faces
-            '((("TODO" . (:foreground "red" :weight bold))
-               ("NEXT" . (:foreground "blue"))
-               ("MAYBE" . (:foreground "sea green"))
-               ("WAITING" . (:foreground "forest green"))
-               ("WONTDO" . (:foreground "forest green"))
-               ("DONE" . (:foreground "light sea green"))))
-        org-agenda-span 5
-        org-agenda-start-day "1d"
-        ;;org-use-tag-inheritance t; bug in variable below, just turn 'em off
         org-tag-alist '(("@personal" . ?h)
                         ("@farm" . ?f)
                         ("@town" . ?s)
@@ -261,6 +238,9 @@ Helpful modes to make working less painful.
 (setq org-outline-path-complete-in-steps nil)         ; Refile in a single go
 (setq org-refile-use-outline-path t)                  ; Show full paths for refiling
 
+#+END_SRC
+** Key bindings
+#+BEGIN_SRC emacs-lisp
 ;; org-set-tags-command
 (setq +inbox-file "~/org/inbox.org")
 (defun +open-inbox-file ()
@@ -274,6 +254,13 @@ Helpful modes to make working less painful.
    :desc "Open today" "T" #'org-roam-today
    :desc "Open tomorrow" "N" #'org-roam-tomorrow)
 
+(map! :leader
+      (:prefix "f" :desc "Save all org buffers" "a" #'org-save-all-org-buffers))
+#+END_SRC
+** Agenda configuration
+#+BEGIN_SRC emacs-lisp
+(setq org-agenda-span 5
+      org-agenda-start-day "1d")
 (defun +show-agenda ()
   (interactive)
   (delete-other-windows)
@@ -284,11 +271,12 @@ Helpful modes to make working less painful.
   (split-window-vertically)
   (other-window 1)
   (find-file +todo-file))
+#+END_SRC
+** Org-roam
+I am absolutely in love with [[https://org-roam.readthedocs.io/en/develop/][Org-roam]]. Everything about it makes taking notes
+easier. I just need to level up with Zettels and web publishing of my notes.
 
-
-(map! :leader
-      (:prefix "f" :desc "Save all org buffers" "a" #'org-save-all-org-buffers))
-
+#+BEGIN_SRC emacs-lisp
 (use-package! org-roam
   :commands (org-roam-insert org-roam-find-file org-roam)
   :init