diff --git a/conf.el b/conf.el
index 9224058..7ef2250 100644
--- a/conf.el
+++ b/conf.el
@@ -418,20 +418,13 @@ event of an error or nonlocal exit."
 ;; TODO this may not be needed
 (setq org-use-property-inheritance '("PARENT_TYPE"))
 
-(setq org-capture-templates
-      '(("t" "todo" entry (file "~/Org/capture.org") "* TODO %?\ndeliverable: \n%U\n")
-        ("n" "note" entry (file "~/Org/capture.org") "* %? :\\%note:\n%U\n" )
-        ("a" "appointment" entry (file "~/Org/capture.org") "* %?\n%U\n%^t\n" )
-        ("m" "multi-day" entry (file "~/Org/capture.org") "* TODO %?\n%U\n%^t--%^t\n" )
-        ("d" "deadline" entry (file "~/Org/capture.org") "* TODO %?\nDEADLINE: %^t\ndeliverable:\n%U\n" )
-        
-        ("j" "journal" entry (file+datetree "~/Org/diary.org") "* %?\n%U\n")
-        ("p" "org-protocol" entry (file+headline ,(concat org-directory "~/Org/capture.org") "Inbox")
-         "* %^{Title}\nSource: %u, %c\n #+BEGIN_QUOTE\n%i\n#+END_QUOTE\n\n\n%?")
-        ("L" "org-protocol" entry (file+headline ,(concat org-directory "~/Org/capture.org") "Inbox")
-         "* %? [[%:link][%:description]] \nCaptured On: %U")            
-        ("h" "habit" entry (file "~/Org/capture.org")
-         "* NEXT %?\n%U\n%a\nSCHEDULED: %(format-time-string \"%<<%Y-%m-%d %a .+1d/3d>>\")\n:PROPERTIES:\n:STYLE: habit\n:REPEAT_TO_STATE: NEXT\n:END:\n")))
+(let ((capfile "~/Org/capture.org"))
+  (setq org-capture-templates
+        '(("t" "todo" entry (file capfile) "* TODO %?\ndeliverable: \n%U\n")
+          ("n" "note" entry (file capfile) "* %? :\\%note:\n%U\n" )
+          ("a" "appointment" entry (file capfile) "* %?\n%U\n%^t\n" )
+          ("m" "multi-day" entry (file capfile) "* TODO %?\n%U\n%^t--%^t\n" )
+          ("d" "deadline" entry (file capfile) "* TODO %?\nDEADLINE: %^t\ndeliverable:\n%U\n" ))))
 
 (setq org-refile-targets (quote ((nil :maxlevel . 9)
                                  ("~/Org/reference/idea.org" :maxlevel . 9)
diff --git a/conf.org b/conf.org
index ecbe302..948bc93 100644
--- a/conf.org
+++ b/conf.org
@@ -602,20 +602,13 @@ There are several types of tags I use:
 #+END_SRC
 ** capture
 #+BEGIN_SRC emacs-lisp
-(setq org-capture-templates
-      '(("t" "todo" entry (file "~/Org/capture.org") "* TODO %?\ndeliverable: \n%U\n")
-        ("n" "note" entry (file "~/Org/capture.org") "* %? :\\%note:\n%U\n" )
-        ("a" "appointment" entry (file "~/Org/capture.org") "* %?\n%U\n%^t\n" )
-        ("m" "multi-day" entry (file "~/Org/capture.org") "* TODO %?\n%U\n%^t--%^t\n" )
-        ("d" "deadline" entry (file "~/Org/capture.org") "* TODO %?\nDEADLINE: %^t\ndeliverable:\n%U\n" )
-        
-        ("j" "journal" entry (file+datetree "~/Org/diary.org") "* %?\n%U\n")
-        ("p" "org-protocol" entry (file+headline ,(concat org-directory "~/Org/capture.org") "Inbox")
-         "* %^{Title}\nSource: %u, %c\n #+BEGIN_QUOTE\n%i\n#+END_QUOTE\n\n\n%?")
-        ("L" "org-protocol" entry (file+headline ,(concat org-directory "~/Org/capture.org") "Inbox")
-         "* %? [[%:link][%:description]] \nCaptured On: %U")            
-        ("h" "habit" entry (file "~/Org/capture.org")
-         "* NEXT %?\n%U\n%a\nSCHEDULED: %(format-time-string \"%<<%Y-%m-%d %a .+1d/3d>>\")\n:PROPERTIES:\n:STYLE: habit\n:REPEAT_TO_STATE: NEXT\n:END:\n")))
+(let ((capfile "~/Org/capture.org"))
+  (setq org-capture-templates
+        '(("t" "todo" entry (file capfile) "* TODO %?\ndeliverable: \n%U\n")
+          ("n" "note" entry (file capfile) "* %? :\\%note:\n%U\n" )
+          ("a" "appointment" entry (file capfile) "* %?\n%U\n%^t\n" )
+          ("m" "multi-day" entry (file capfile) "* TODO %?\n%U\n%^t--%^t\n" )
+          ("d" "deadline" entry (file capfile) "* TODO %?\nDEADLINE: %^t\ndeliverable:\n%U\n" ))))
 #+END_SRC
 ** refile
 *** targets