diff --git a/home/emacs/modules/custom-email-config.el b/home/emacs/modules/custom-email-config.el
index 18ba8ae6..f36fa3df 100644
--- a/home/emacs/modules/custom-email-config.el
+++ b/home/emacs/modules/custom-email-config.el
@@ -22,7 +22,13 @@
                          (".*@icloud.com" . "iCloud/Sent")
                          (".*@ukaea.uk" . "Outlook/Sent")
                          (".*@jet.uk" . "Outlook/Sent"))
-      notmuch-indicator-args '((:terms "tag:unread and tag:inbox" :label "󰮒 "))
+      notmuch-saved-searches '((:name "inbox" :query "tag:inbox" :key "i")
+			       (:name "unread" :query "tag:unread AND tag:inbox" :key "u")
+			       (:name "flagged" :query "tag:flagged" :key "f")
+			       (:name "sent" :query "tag:sent" :key "t")
+			       (:name "drafts" :query "tag:draft" :key "d")
+			       (:name "all mail" :query "*" :key "a"))
+      notmuch-indicator-args '((:terms "tag:unread AND tag:inbox" :label "󰮒 "))
       notmuch-indicator-force-refresh-commands '(notmuch-refresh-this-buffer
                                                  notmuch-refresh-all-buffers
                                                  notmuch-poll-and-refresh-this-buffer))
@@ -35,9 +41,8 @@
       "email"
       ("m" notmuch)
       ("c" notmuch-mua-new-mail)
-      ("i" (notmuch-unthreaded "is:inbox"))
-      ("u" (notmuch-unthreaded "is:unread AND is:inbox"))
-      ("C-i" (notmuch-tree "is:inbox"))
-      ("C-u" (notmuch-tree "is:unread AND is:inbox")))))
+      ("s" notmuch-search)
+      ("i" (notmuch-search "is:inbox"))
+      ("u" (notmuch-search "is:unread AND is:inbox")))))
 
 (provide 'custom-email-config)
diff --git a/home/emacs/modules/custom-org-config.el b/home/emacs/modules/custom-org-config.el
index 87b07cd5..558acaf0 100644
--- a/home/emacs/modules/custom-org-config.el
+++ b/home/emacs/modules/custom-org-config.el
@@ -11,13 +11,9 @@
                                  (search . " %i"))
       org-refile-use-outline-path t
       org-refile-allow-creating-parent-nodes t
+      org-refile-use-outline-path 'file
       org-refile-targets '((nil :maxlevel . 3)
                            (org-agenda-files :maxlevel . 3))
-      ;; Without this, completers like ivy/helm are only given the first level of
-      ;; each outline candidates. i.e. all the candidates under the "Tasks" heading
-      ;; are just "Tasks/". This is unhelpful. We want the full path to each refile
-      ;; target! e.g. FILE/Tasks/heading/subheading
-      org-refile-use-outline-path 'file
       org-outline-path-complete-in-steps nil
       org-default-notes-file (expand-file-name "notes.org" org-directory))
 
@@ -25,12 +21,22 @@
   (setq org-capture-templates
 	'(("n" "Note" entry
 	   (file+headline "notes.org" "Inbox")
-	   "* %u %?\n%i\n%a"
+	   "* %?"
+	   :prepend t
+	   :empty-lines 1)
+	  ("N" "Note (with context)" entry
+	   (file+headline "notes.org" "Inbox")
+	   "* %?\n%a\n%i"
 	   :prepend t
 	   :empty-lines 1)
 	  ("t" "Task" entry
 	   (file+headline "todo.org" "Inbox")
-	   "* TODO %?\n%i\n%a"
+	   "* TODO %?"
+	   :prepend t
+	   :emptry-lines 1)
+	  ("T" "Task (with context)" entry
+	   (file+headline "todo.org" "Inbox")
+	   "* TODO %?\n%a\n%i"
 	   :prepend t
 	   :emptry-lines 1)
 	  )))