diff --git a/README.org b/README.org
index e798e734..dff28524 100644
--- a/README.org
+++ b/README.org
@@ -243,6 +243,8 @@ This evil-collection package includes a lot of other evil based things.
 #+end_src
 
 ** Completion
+My completion framework is a combination of packages so that everything remains seperate and lightweight.
+
 *** SELECTRUM
 I prefer selectrum over Ivy or Helm for completions. It is using the basic completing read system and therefore it is more inline with basic emacs. Also, let's add prescient to be able to filter selectrum well. We'll add some keybindings too for easier navigation on the home row.
 
@@ -350,9 +352,9 @@ Consult has a lot of nice functions like Ivy's Counsel functions (enhanced searc
 #+end_src
 
 *** MARGINALIA
+
 Marginalia makes for some great decoration to our minibuffer completion items. Works great with Selectrum which does not have this out of the box.
 #+begin_src emacs-lisp
-  ;; Enable richer annotations using the Marginalia package
   (use-package marginalia
     :bind (:map minibuffer-local-map
            ("C-M-a" . marginalia-cycle)
@@ -384,10 +386,11 @@ Marginalia makes for some great decoration to our minibuffer completion items. W
 #+end_src
 ** Format
 #+begin_src emacs-lisp
-    (use-package format-all
-      :config
-      (format-all-mode +1)
-      :defer 1)
+(use-package format-all
+  :config
+  (format-all-mode +1)
+  (setq format-all-formatters '("Emacs Lisp" emacs-lisp))
+  :defer 1)
 #+end_src
 ** Org Mode
 
@@ -505,37 +508,36 @@ Basic Org-Roam setup. We select the directory and the basic width of the Org-Roa
 
 We also need to setup some capture templates to use some specific setups with my journalling. These include a space for my [[file:../../org/homework_for_life.org][Homework For Life]], tasks for the day, and how I can love on my family.
 #+BEGIN_SRC emacs-lisp
+(use-package org-roam
+  :after org
+  :config
+  (setq org-roam-directory "~/org")
+  (setq org-roam-buffer-width 0.25)
+  (setq org-roam-file-exclude-regexp ".stversion.*\|.stfolder.*\|.*~.*\|.*sync.*")
+  (setq org-roam-db-location "~/.dotemacs/org-roam.db")
+  (setq org-roam-capture-templates
+        '(("d" "default" plain (function org-roam--capture-get-point)
+           "%?"
+           :file-name "${slug}"
+           :head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\nj ")
+          ("b" "bible" plain (function org-roam--capture-get-point)
+           "%?"
+           :file-name "${slug}"
+           :head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n- tags %^G\n\n* ")
+          ("l" "TFC Lesson" plain (function org-roam--capture-get-point)
+           (file ".templates/lessontemplate.org")
+           :file-name "${slug}"
+           :head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")))
 
-  (use-package org-roam
-    :after org
-    :config
-    (setq org-roam-directory "~/org")
-    (setq org-roam-buffer-width 0.25)
-    (setq org-roam-file-exclude-regexp ".stversion.*\|.stfolder.*\|.*~.*\|.*sync.*")
-    (setq org-roam-db-location "~/.dotemacs/org-roam.db")
-    (setq org-roam-capture-templates
-          '(("d" "default" plain (function org-roam--capture-get-point)
-             "%?"
-             :file-name "${slug}"
-             :head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\nj ")
-            ("b" "bible" plain (function org-roam--capture-get-point)
-             "%?"
-             :file-name "${slug}"
-             :head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n- tags %^G\n\n* ")
-            ("l" "TFC Lesson" plain (function org-roam--capture-get-point)
-             (file ".templates/lessontemplate.org")
-             :file-name "${slug}"
-             :head "#+TITLE: ${title}\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n")))
-
-    (setq org-roam-dailies-capture-templates
-          '(("d" "daily" plain #'org-roam-capture--get-point ""
-             :immediate-finish t
-             :file-name "%<%Y-%m-%d>"
-             :head "#+TITLE: %<%Y-%m-%d>\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\n* HFL\n* Tasks\n* Family\n** How Do I Love Abbie?")
-            ("b" "biblical daily" plain #'org-roam-capture--get-point ""
-             :immediate-finish t
-             :file-name "%<%Y-%m-%d>-bib"
-             :head "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun"))))
+  (setq org-roam-dailies-capture-templates
+        '(("d" "daily" plain #'org-roam-capture--get-point ""
+           :immediate-finish t
+           :file-name "%<%Y-%m-%d>"
+           :head "#+TITLE: %<%Y-%m-%d>\n#+AUTHOR: Chris Cochrun\n#+CREATED: %<%D - %I:%M %p>\n\n* HFL\n* Tasks\n* Family\n** How Do I Love Abbie?")
+          ("b" "biblical daily" plain #'org-roam-capture--get-point ""
+           :immediate-finish t
+           :file-name "%<%Y-%m-%d>-bib"
+           :head "#+TITLE: %<%Y-%m-%d> - Biblical\n#+AUTHOR: Chris Cochrun"))))
 
 #+END_SRC
 
diff --git a/init.el b/init.el
index 945ba13b..d6ba24a2 100644
--- a/init.el
+++ b/init.el
@@ -171,7 +171,6 @@
 (use-package consult
   :after selectrum)
 
-;; Enable richer annotations using the Marginalia package
 (use-package marginalia
   :bind (:map minibuffer-local-map
          ("C-M-a" . marginalia-cycle)
@@ -200,6 +199,7 @@
 (use-package format-all
   :config
   (format-all-mode +1)
+  (setq format-all-formatters '("Emacs Lisp" emacs-lisp))
   :defer 1)
 
 (defun chris/org-mode-setup ()