diff --git a/unravel-emacs.org b/unravel-emacs.org
index ce4d1af..b39e532 100644
--- a/unravel-emacs.org
+++ b/unravel-emacs.org
@@ -3762,12 +3762,14 @@ the capture phase ([[#h:f8f06938-0dfe-45c3-b4cf-996d36cba82d][The =unravel-org.e
     (setq org-refile-targets
           '((org-agenda-files . (:maxlevel . 2))
             (nil . (:maxlevel . 2))))
-    (setq org-refile-use-outline-path t)
+    (setq org-refile-use-outline-path 'file)
     (setq org-refile-allow-creating-parent-nodes 'confirm)
     (setq org-refile-use-cache t)
+    (setq org-outline-path-complete-in-steps nil)
     (setq org-reverse-note-order nil)
     (setq org-todo-keywords
-          '((sequence "TODO(t)" "|" "CANCEL(c@)" "DONE(d!)")))
+          '((sequence "PROJECT(p!)" "TODO(t!)" "WORKING(w!)" "|" "CANCEL(c@)" "DONE(d!)")
+            (sequence "FOLLOWUP(f!)" "WAITING(a@/!)" "DELEGATED(e@/!)")))
 
     (defface prot/org-bold-done
       '((t :inherit (bold org-done)))
@@ -3775,7 +3777,7 @@ the capture phase ([[#h:f8f06938-0dfe-45c3-b4cf-996d36cba82d][The =unravel-org.e
 
     (setq org-todo-keyword-faces
           '(("CANCEL" . prot/org-bold-done)))
-    (setq org-use-fast-todo-selection 'expert)
+    (setq org-use-fast-todo-selection t)
 
     (setq org-fontify-done-headline nil)
     (setq org-fontify-todo-headline nil)
diff --git a/unravel-modules/unravel-org.el b/unravel-modules/unravel-org.el
index cfb2f8c..bcac1f3 100644
--- a/unravel-modules/unravel-org.el
+++ b/unravel-modules/unravel-org.el
@@ -135,12 +135,14 @@
   (setq org-refile-targets
         '((org-agenda-files . (:maxlevel . 2))
           (nil . (:maxlevel . 2))))
-  (setq org-refile-use-outline-path t)
+  (setq org-refile-use-outline-path 'file)
   (setq org-refile-allow-creating-parent-nodes 'confirm)
   (setq org-refile-use-cache t)
+  (setq org-outline-path-complete-in-steps nil)
   (setq org-reverse-note-order nil)
   (setq org-todo-keywords
-        '((sequence "TODO(t)" "|" "CANCEL(c@)" "DONE(d!)")))
+        '((sequence "PROJECT(p!)" "TODO(t!)" "WORKING(w!)" "|" "CANCEL(c@)" "DONE(d!)")
+          (sequence "FOLLOWUP(f!)" "WAITING(a@/!)" "DELEGATED(e@/!)")))
 
   (defface prot/org-bold-done
     '((t :inherit (bold org-done)))
@@ -148,7 +150,7 @@
 
   (setq org-todo-keyword-faces
         '(("CANCEL" . prot/org-bold-done)))
-  (setq org-use-fast-todo-selection 'expert)
+  (setq org-use-fast-todo-selection t)
 
   (setq org-fontify-done-headline nil)
   (setq org-fontify-todo-headline nil)