diff --git a/emacs.org b/emacs.org
index 6f5c8d4..f4ce013 100644
--- a/emacs.org
+++ b/emacs.org
@@ -857,26 +857,6 @@ validate the agenda changes.
          ("C-c c" . org-capture)
          ("C-c l" . org-store-link)
          ("C-c p" . org-latex-export-to-pdf))
-  :custom
-  (org-directory "~/src/org")
-  ;; Don't sort-lines ^^^
-  (org-agenda-span 'fortnight)
-  (org-archive-directory "~/src/org/attic")
-  (org-confirm-babel-evaluate nil)
-  (org-default-notes-file (concat org-directory "/notes.org"))
-  (org-fontify-done-headline t)
-  (org-hide-emphasis-markers t)
-  (org-hide-leading-stars t)
-  (org-log-done t)
-  (org-pretty-entities t)
-  (org-src-preserve-indentation t)
-  (org-src-strip-leading-and-trailing-blank-lines t)
-  ;; Ref https://orgmode.org/manual/Template-elements.html for more detail.
-  (org-agenda-files
-   (list "~/src/org"
-         "~/src/git.mitchty.net/mitchty/dotfiles"))
-  ;;      "#+TITLE: %a\n#+ROAM_KEY: %U\n\n [[%U][%U]]\n"
-
   :config
   (add-to-list 'org-structure-template-alist '("el" . "#+BEGIN_SRC emacs-lisp\n?\n#+END_SRC"))
   (add-to-list 'org-structure-template-alist '("hs" . "#+BEGIN_SRC haskell\n?\n#+END_SRC"))
@@ -896,12 +876,26 @@ validate the agenda changes.
              (python . t)
              (ruby  . t)
              (shell . t)
-             ))))
-
-(use-package org-capture
-  :after org
-  :ensure t
+             )))
   :custom
+  (org-directory "~/src/org")
+  ;; Don't sort-lines ^^^
+  (org-agenda-span 'fortnight)
+  (org-archive-directory "~/src/org/attic")
+  (org-confirm-babel-evaluate nil)
+  (org-default-notes-file (concat org-directory "/notes.org"))
+  (org-fontify-done-headline t)
+  (org-hide-emphasis-markers t)
+  (org-hide-leading-stars t)
+  (org-log-done t)
+  (org-pretty-entities t)
+  (org-src-preserve-indentation t)
+  (org-src-strip-leading-and-trailing-blank-lines t)
+  ;; Ref https://orgmode.org/manual/Template-elements.html for more detail.
+  (org-agenda-files
+   (list "~/src/org"
+         "~/src/git.mitchty.net/mitchty/dotfiles"))
+  ;;      "#+TITLE: %a\n#+ROAM_KEY: %U\n\n [[%U][%U]]\n"
   (org-capture-templates
    '(
 ;; TODO: make this crap work somehow
@@ -1005,6 +999,7 @@ Figure out the customization needed here.
 #+BEGIN_SRC emacs-lisp
 (use-package org-habit
   :after org
+  :ensure t
   :custom
   (org-habit-graph-column 44)
   (org-habit-preceding-days 31)