diff --git a/.spacemacs b/.spacemacs
index 3613601..aee27e2 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -573,28 +573,38 @@ you should place your code here."
       (let ((name (read-string "Filename: ")))
         (expand-file-name (format "%s.org" name) "~/Documents/letters/") ))
 
+    ;; https://orgmode.org/manual/Template-elements.html
+    ;; https://orgmode.org/manual/Template-expansion.html
     (setq org-capture-templates
-          '(("t" "todo list item"           ; name
-             entry                          ; type
-             (file org-default-notes-file "Tasks")
-             "* TODO %?\n DEADLINE: %^T")  ; template
-            ("T" "todo list item with source" ; name
-             entry                          ; type
-             (file org-default-notes-file "Tasks")
-             "* TODO %?\n %a \n DEADLINE: %^T \n %i") ; template
+          '(("t" "todo list item" entry
+             (file+olp+datetree "~/Documents/Org/tasks.org")
+             "* TODO %?\n SCHEDULED: %^T"
+             :tree-type month
+             )
+            ("T" "todo list item with source" entry
+             (file+olp+datetree "~/Documents/Org/tasks.org")
+             "* TODO %?\n %a \n SCHEDULED: %^T \n %^G \n"
+             :tree-type month
+             )
+
+            ("r" "Todo research some website/software" entry
+             (file+olp+datetree "~/Documents/Org/tasks.org")
+             "* TODO %?\n  SCHEDULED: %^T \n %^L \n"
+             :tree-type month
+             )
             ("l" "letter to Documents/letters/<datetime.org>"
              entry (file fschl/create-org-letter)
-             "* %? \n\n * \n\n ")
+             "* %? \n\n * \n\n "
+             )
+            ("m" "Schedule a meeting" entry
+             (file+headline "~/Documents/Org/tasks.org")
+             "* MEETING %?\n SCHEDULED: %^T\n %a"
+             )
 
-            ("m" "Schedule a meeting"
-             entry
-             (file+headline org-default-notes-file "Tasks")
-             "* MEETING %?\n SCHEDULED: %^T\n %a") ; template
-
-            ("p" "Schedule a phone call"
-             entry
-             (file org-default-notes-file "Tasks")
-             "* PHONE %?\n SCHEDULED: %^T\\n %a")
+            ("p" "Schedule a phone call" entry
+             (file+headline "~/Documents/Org/tasks.org")
+             "* PHONE %?\n SCHEDULED: %^T\\n %a"
+             )
 
             ("a" "Articles: keep notes of online articles"
              entry