diff --git a/bundle/bundle--org.el b/bundle/bundle--org.el
index 0afa2255..2e589e0c 100644
--- a/bundle/bundle--org.el
+++ b/bundle/bundle--org.el
@@ -51,6 +51,7 @@
    '((sequence "TODO" "DOING(!)" "DONE(!)")
      (sequence "RECRUIT" "INTERVIEW" "QDA" "DOC" "REVIEW")))
   (org-use-property-inheritance nil)
+  (org-attach-store-link-p 'attached)
   :config
   (when (eq system-type 'windows-nt)
     (setq org-babel-sqlite3-command "c:/msys64/mingw64/bin/sqlite3.exe"))
@@ -82,15 +83,15 @@
   (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\nEntered on %U\n%i\n- %a"))
+(add-to-list 'org-capture-templates '("n" "Note" entry (file "notes.org") "* %K\nEntered on %U\n\n%i\n- %a"))
 ;; Task driven life
-(add-to-list 'org-capture-templates '("t" "Task" entry (file "tasks.org") "* TODO %? :TASK:\nEntered on %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") "* %^{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))
+(add-to-list 'org-capture-templates '("w" "Training" entry (file "trainings.org") "* %^{Name} :TRAINING:\nEntered on %T" :clock-in t))
 ;; Log my activities
 (add-to-list 'org-capture-templates '("j" "Journal" entry (file "journal.org") "* %? :JOURNAL:\nEntered on %T\n\n" :empty-lines-after 1))
 ;; Log my activities