diff --git a/org/config-org-capture.el b/org/config-org-capture.el
index 6b715cb..67b1ea4 100644
--- a/org/config-org-capture.el
+++ b/org/config-org-capture.el
@@ -41,7 +41,7 @@
     ("gd" "Destiny")
     ("gdc" "To Do - Crafted Gun"
         entry (id "65a28e9e-e484-4722-8a25-4fbf0a8dea2c")
-        (file "~/org/games/template_game_destiny_gun.org")
+        (file "~/org/_org-capture-templates/template_game_destiny_gun.org")
         :prepend t
         :immediate-finish "f"
         :jump-to-captured "t"
@@ -50,7 +50,7 @@
     ("gw" "Warframe")
     ("gwd" "Daily Reset"
         entry (file+headline "~/org/games/games_warframe.org" "Daily / Weekly Reset")
-        (file "~/org/games/template_game_warframe_daily_reset.org")
+        (file "~/org/_org-capture-templates/template_game_warframe_daily_reset.org")
         :prepend t
         :immediate-finish "f"
         :jump-to-captured "t"
@@ -58,7 +58,7 @@
     )
     ("gww" "Weekly Reset"
         entry (file+headline "~/org/games/games_warframe.org" "Daily / Weekly Reset")
-        (file "~/org/games/template_game_warframe_weekly_reset.org")
+        (file "~/org/_org-capture-templates/template_game_warframe_weekly_reset.org")
         :prepend t
         :immediate-finish "f"
         :jump-to-captured "t"
@@ -66,7 +66,7 @@
     )
     ("gwt" "To Do"
         entry (file+headline "~/org/games/games_warframe.org" "To Do")
-        "** TODO %^{Heading}\n%?"
+        "** TODO %^{Heading}\n:LOGBOOK:\n- Created: %U\n:END:%?"
         :immediate-finish "f"
         :jump-to-captured "t"
         :unnarrowed "t"
@@ -76,14 +76,14 @@
     ("hc" "Couples")
     ("hch" "Homework"
         entry (file+headline "~/org/health/health_couples.org" "Homework")
-        "** TODO %^{Heading} :health:couples:homework:\n%?"
+        "** TODO %^{Heading} :health:couples:homework:\n:LOGBOOK:\n- Created: %U\n:END:%?"
         :immediate-finish "f"
         :jump-to-captured "t"
         :unnarrowed "t"
     )
     ("hcl" "Log Entry"
         entry (file+datetree "~/org/health/health_couples.org" "Log")
-        "* %^{Timestamp}U %^{Text} :health:couples:log:%^g\n%?"
+        "* %^{Timestamp}U %^{Text} :health:couples:log:%^g\n:LOGBOOK:\n- Created: %U\n:END:%?"
         :time-prompt "t"
         :immediate-finish "f"
         :jump-to-captured "t"
@@ -91,7 +91,7 @@
     )
     ("hcd" "Appointment noteworthy developments / [time] in review"
         entry (file+headline "~/org/health/health_couples.org" "To Do")
-        "** READY [#A] %^{Heading} :health:couples:appointment:%^g\nDEADLINE: %^t\n%?"
+        "** READY [#A] %^{Heading} :health:couples:appointment:%^g\nDEADLINE: %^t\n:LOGBOOK:\n- Created: %U\n:END:%?"
         :immediate-finish "f"
         :jump-to-captured "t"
         :unnarrowed "t"
@@ -99,7 +99,7 @@
     )
     ("hca" "Appointment Notes"
         entry (file+datetree "~/org/health/health_couples.org" "Log")
-        "* %^{Timestamp}U %^{Text} :health:couples:appointment:%^g\n%?"
+        "* %^{Timestamp}U %^{Text} :health:couples:appointment:%^g\n:LOGBOOK:\n- Created: %U\n:END:%?"
         :time-prompt "t"
         :immediate-finish "f"
         :jump-to-captured "t"
@@ -108,14 +108,14 @@
     ("hm" "Mike")
     ("hmh" "Homework"
         entry (file+headline "~/org/health/health_mike.org" "Homework")
-        "** TODO %^{Heading} :health::homework:\n%?"
+        "** TODO %^{Heading} :health::homework:\n:LOGBOOK:\n- Created: %U\n:END:%?"
         :immediate-finish "f"
         :jump-to-captured "t"
         :unnarrowed "t"
     )
     ("hml" "Log Entry"
         entry (file+datetree "~/org/health/health_mike.org" "Log")
-        "* %^{Timestamp}U %^{Text} :health:log:%^g\n%?"
+        "* %^{Timestamp}U %^{Text} :health:log:%^g\n:LOGBOOK:\n- Created: %U\n:END:%?"
         :time-prompt "t"
         :immediate-finish "f"
         :jump-to-captured "t"
@@ -123,7 +123,7 @@
     )
     ("hmd" "Appointment noteworthy developments / [time] in review"
         entry (file+headline "~/org/health/health_mike.org" "To Do")
-        "** READY [#A] %^{Heading} :health:appointment:%^g\nDEADLINE: %^t\n%?"
+        "** READY [#A] %^{Heading} :health:appointment:%^g\nDEADLINE: %^t\n:LOGBOOK:\n- Created: %U\n:END:%?"
         :immediate-finish "f"
         :jump-to-captured "t"
         :unnarrowed "t"
@@ -131,48 +131,23 @@
     )
     ("hma" "Appointment Notes"
         entry (file+datetree "~/org/health/health_mike.org" "Log")
-        "* %^{Timestamp}U %^{Text} :health:appointment:%^g\n%?"
+        "* %^{Timestamp}U %^{Text} :health:appointment:%^g\n:LOGBOOK:\n- Created: %U\n:END:%?"
         :time-prompt "t"
         :immediate-finish "f"
         :jump-to-captured "t"
         :unnarrowed "t"
     )
-    ("hmw" "Weight"
-        entry (file+datetree "~/org/health/health_mike.org" "Log")
-        "* %^{Timestamp}U %^{Weight} lbs %?:weight:"
-        :time-prompt "t"
-        :immediate-finish "t"
-        :jump-to-captured "t"
-        :unnarrowed "t"
-    )
     ("hmx" "Anxiety Entry"
         entry (file+datetree "~/org/health/health_mike.org" "Log")
-        "* %^{Timestamp}U %^{Text} :panic:\n** Level (0-10/none-strong): %^{Level}\n** What brought on your feelings of anxiety or panic?\n%?\n** Anxiety and Panic Responses\n*** Physical Sensations\nlist the physical sensations you felt during your anxiety response\ne.g. dizziness, shortness of breath, blushing, sweating, muscle tension. Indicate three that frighten you the most.\n*** Thoughts and Images\nlist the thoughts you had when anticipating or experiencing your anxiety response\ne.g. 'im having a heart attack', 'im losign control', 'something terrible will happen'\n*** Behaviors and Actions\nlist the behaviors you exhibited or actions you took as a result of your anxiety response\n"
+        "* %^{Timestamp}U %^{Text} :panic:\n:LOGBOOK:\n- Created: %U\n:END:\n** Level (0-10/none-strong): %^{Level}\n** What brought on your feelings of anxiety or panic?\n%?\n** Anxiety and Panic Responses\n*** Physical Sensations\nlist the physical sensations you felt during your anxiety response\ne.g. dizziness, shortness of breath, blushing, sweating, muscle tension. Indicate three that frighten you the most.\n*** Thoughts and Images\nlist the thoughts you had when anticipating or experiencing your anxiety response\ne.g. 'im having a heart attack', 'im losign control', 'something terrible will happen'\n*** Behaviors and Actions\nlist the behaviors you exhibited or actions you took as a result of your anxiety response\n"
         :time-prompt "t"
         :immediate-finish "f"
         :jump-to-captured "t"
         :unnarrowed "t"
     )
-    ("hmj" "mmj")
-    ("hmjc" "mmj - sugar cube"
-        entry (file+datetree "~/org/health/health_mike.org" "Log")
-        "* %^{Timestamp}U Sugar Cube :mmj:\n   :PROPERTIES:\n   :THC: %^{THC}\n   :CBD: %^{CBD}\n   :Quantity: %^{Quantity}\n   :END:"
-        :time-prompt "t"
-        :immediate-finish "t"
-        :jump-to-captured "t"
-        :unnarrowed "t"
-    )
-    ("hmjf" "mmj - flower"
-        entry (file+datetree "~/org/health/health_mike.org" "Log")
-        "* %^{Timestamp}U Flower :mmj:\n   :PROPERTIES:\n   :THC: %^{THC}\n   :CBD: %^{CBD}\n   :Quantity: %^{Quantity}\n   :END:"
-        :time-prompt "t"
-        :immediate-finish "t"
-        :jump-to-captured "t"
-        :unnarrowed "t"
-    )
     ("m" "Music import (beets)" entry
         (file "~/org/orgzly/_slipbox.org")
-        (file "~/org/template_beets.org")
+        (file "~/org/_org-capture-templates/template_beets.org")
         :prepend t
         :immediate-finish "f"
         :jump-to-captured "t"
@@ -180,28 +155,28 @@
     ("p" "Photography")
     ("pt" "Theme (Film)" entry
         (file+headline "~/org/photography/film.org" "Themes - Active")
-        (file "~/org/photography/template_theme.org")
+        (file "~/org/_org-capture-templates/template_photog_theme.org")
         :empty-lines-before 1
     )
     ("pi" "Theme (Instant Film)" entry
         (file+headline "~/org/photography/instant_film.org" "Themes - Active")
-        (file "~/org/photography/template_instant_film_theme.org")
+        (file "~/org/_org-capture-templates/template_photog_instant_film_theme.org")
         :empty-lines-before 1
     )
     ("r" "Recipe")
     ("rs" "Standard" plain
         (file "~/org/culinary/_recipes.org")
-        (file "~/org/culinary/template_recipe.org")
+        (file "~/org/_org-capture-templates/template_culinary_recipe.org")
         :empty-lines-before 1
     )
     ("rb" "Budget Bytes" plain
         (file "~/org/culinary/_recipes.org")
-        (file "~/org/culinary/template_budget_bytes.org")
+        (file "~/org/_org-capture-templates/template_culinary_budget_bytes.org")
         :empty-lines-before 1
     )
     ("t" "Trip" entry
         (file+headline "~/org/trips.org" "Planned")
-        (file "~/org/template_trip.org")
+        (file "~/org/_org-capture-templates/template_trip.org")
         :empty-lines-before 1
     )
 ))