diff --git a/config/org-mode.org b/config/org-mode.org
index b1e5fa5..8905e13 100644
--- a/config/org-mode.org
+++ b/config/org-mode.org
@@ -58,24 +58,21 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 #+begin_src emacs-lisp :results output silent
   (setq org-capture-templates
         '(("n" "Note" entry
-           (file+olp+datetree "inbox.org" "Notes")
+           (file+olp+datetree "notes.org" "Inbox")
            "* %?")
           ("t" "Task" entry
-           (file+olp+datetree "inbox.org" "Tasks")
+           (file+olp+datetree "tasks.org" "Inbox")
            "* TODO %?")
-          ("c" "Calendar Event" entry
-           (file+olp+datetree "inbox.org" "Calendar")
-           "* %?\n%^t\n\n%i")
           ("r" "Reading List" entry
-           (file+olp+datetree "inbox.org" "Reading List")
+           (file+olp+datetree "reading.org" "Inbox")
            "* %?")
           ("m" "Email Workflow")
           ("mf" "Follow Up" entry
-           (file+olp+datetree "inbox.org" "Tasks")
-           "* TODO Follow up with %:fromname on %a\nDEADLINE: %^{deadline}t\n\n%i")
+           (file+olp+datetree "tasks.org" "Inbox")
+           "* TODO Follow up with %:fromname on %a :email:\nDEADLINE: %^{deadline}t\n\n%i")
           ("mr" "Read Later" entry
-           (file+olp+datetree "inbox.org" "Reading List")
-           "* TODO Read %:subject\nSCHEDULED: %^{scheduled}t\n\n%i")
+           (file+olp+datetree "reading.org" "Inbox")
+           "* TODO Read %:subject :email:\nSCHEDULED: %^{scheduled}t\n\n%i")
           ))
 #+end_src
 
@@ -149,9 +146,12 @@ Better syncing to mobile, for use with [[https://github.com/orgzly-revived/orgzl
 #+begin_src emacs-lisp
   (with-eval-after-load 'org
     (setq org-mobile-directory "~/.orgmobile/"
+          org-mobile-capture-file "inbox.org"
           org-mobile-agendas nil
           org-mobile-files (list (expand-file-name "diary.org" org-directory)
-                                 (expand-file-name "task.org" org-directory))
+                                 (expand-file-name "notes.org" org-directory)
+                                 (expand-file-name "tasks.org" org-directory)
+                                 (expand-file-name "reading.org" org-directory))
           org-mobile-inbox-for-pull (expand-file-name "inbox.org" org-directory)
           org-mobile-force-id-on-agenda-items nil)
     (add-hook 'org-capture-finalize-hook #'org-mobile-push))