diff --git a/bundle/bundle--org.el b/bundle/bundle--org.el
index 177813c9..0afa2255 100644
--- a/bundle/bundle--org.el
+++ b/bundle/bundle--org.el
@@ -82,13 +82,13 @@
   (add-hook 'org-agenda-finalize-hook #'org-agenda-log-mode-colorize-block))
 
 ;; Just make a note
-(add-to-list 'org-capture-templates '("n" "Note" entry (file "notes.org") "* %k%?\n%U\n- %l"))
+(add-to-list 'org-capture-templates '("n" "Note" entry (file "notes.org") "* %K\nEntered on %U\n%i\n- %a"))
 ;; Task driven life
-(add-to-list 'org-capture-templates '("t" "Task" entry (file "tasks.org") "* TODO %? :TASK:\n%u"))
+(add-to-list 'org-capture-templates '("t" "Task" entry (file "tasks.org") "* TODO %? :TASK:\nEntered on %u"))
 ;; Recurring appointments
 (add-to-list 'org-capture-templates '("a" "Appointment" entry (file "appointments.org") "* %? :APPOINTMENT:\n%T\n"))
 ;; Capture a meeting
-(add-to-list 'org-capture-templates '("m" "Meeting" entry (file "meetings.org") "* %? :MEETING:\n%T" :clock-in t))
+(add-to-list 'org-capture-templates '("m" "Meeting" entry (file "meetings.org") "* %^{Topic} :MEETING:\n%T" :clock-in t))
 ;; Capture a training
 (add-to-list 'org-capture-templates '("w" "Training" entry (file "trainings.org") "* %? :TRAINING:\n%T" :clock-in t))
 ;; Log my activities