diff --git a/config/org-mode.org b/config/org-mode.org
index 367e728..5a9c237 100644
--- a/config/org-mode.org
+++ b/config/org-mode.org
@@ -26,7 +26,12 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
         org-refile-use-outline-path t
         org-refile-allow-creating-parent-nodes t
         org-refile-use-outline-path 'file
-        org-refile-targets '((nil . (:maxlevel . 2))))
+        org-refile-targets '((nil . (:maxlevel . 2))
+                             (org-agenda-files . (:maxlevel . 2))))
+
+  ;; Add emacs config files to `org-file-targets'
+  (dolist (fname my/config-files)
+    (add-to-list 'org-refile-targets (cons fname '(:maxlevel . 2)) t))
 
   ;; Visually indent org-mode files to a given header level
   (add-hook 'org-mode-hook #'org-indent-mode)
@@ -60,22 +65,23 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
            "* %?"
            :tree-type month)
           ("t" "Task" entry
-           (file+headline "tasks.org" "Inbox")
+           (file+datetree "inbox.org")
            "* TODO %?"
-           :prepend t)
+           :tree-type month)
           ("c" "Calendar Event" entry
-           (file+headline "calendar.org" "Inbox")
+           (file+datetree "calendar/inbox.org")
            "* %?\n%^t\n\n%i"
-           :prepend t)
+           :tree-type month)
           ("r" "Reading List" entry
            (file+headline "reading.org" "Inbox")
            "* %?")
           ("m" "Email Workflow")
           ("mf" "Follow Up" entry
-           (file+olp "mail.org" "Follow Up")
-           "* TODO Follow up with %:fromname on %a\nDEADLINE: %^{deadline}t\n\n%i")
+           (file+datetree "inbox.org")
+           "* TODO Follow up with %:fromname on %a\nDEADLINE: %^{deadline}t\n\n%i"
+           :tree-type month)
           ("mr" "Read Later" entry
-           (file+olp "mail.org" "Read Later")
+           (file+headline "reading.org" "Email")
            "* TODO Read %:subject\nSCHEDULED: %^{scheduled}t\n\n%i")
           ))
 #+end_src
@@ -143,9 +149,12 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
                                    (todo . " %-12:c")
                                    (tags . " %-12:c")
                                    (search . " %-12:c"))
-        org-agenda-files (list (expand-file-name org-directory)))
-
-  (add-to-list 'org-refile-targets '(org-agenda-files . (:maxlevel . 2)) t)
+        org-agenda-files (list
+                          (expand-file-name org-directory)
+                          (expand-file-name "calendar" org-directory)
+                          (expand-file-name "journal" org-directory)
+                          (expand-file-name "noter" org-directory)
+                          (expand-file-name "projects" org-directory)))
 #+end_src
 * org-journal
 #+begin_src emacs-lisp :results output silent
@@ -175,13 +184,6 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
     (org-noter-prefer-root-as-file-level nil))
 #+end_src
 
-* Refile to config
-#+begin_src emacs-lisp
-  ;; Add emacs config files to `org-file-targets'
-  (dolist (fname my/config-files)
-    (add-to-list 'org-refile-targets (cons fname '(:maxlevel . 2)) t))
-#+end_src
-
 * citar
 #+begin_src emacs-lisp :results output silent
   (use-package citar