diff --git a/private/templates/org-mode/__contact.org b/private/templates/org-mode/__contact.org
index 067dd4d09..4637a52fd 100644
--- a/private/templates/org-mode/__contact.org
+++ b/private/templates/org-mode/__contact.org
@@ -1,14 +1,18 @@
-#+TITLE:${1:Firstname Lastname}
-Created `(format-time-string "<%Y-%m-%d>")`
+#+TITLE:${1:Contact Name}${2: 🏢}
+#+begin_src yaml
+created:  `(format-time-string "%Y-%m-%d")`
 
-| Contact | ${2:Firstname Lastname}  |
-| Email   | ${3:email@address.com} ([[mailto:$2][email]]) |
-| Address | ${4:PO Box 5, 2920}             |
-| City    | ${5:Charlottenlund}             |
-| Country | ${6:Denmark}                    |
+email:    ${3:email@address.com}
+address:  $4
+city:     $5
+country:  $6
+#+end_src
 
+* Associates
++ Associate's name :: associates@email.com
 * Projects [/]
-** $7 [/]
+** ACTIVE ... [/]
 * Invoices [/]
-** TODO ${0:YYMM-0000 1,000 USD}
-* Notes
\ No newline at end of file
+** PENDING YYMM-0000 *1,000 USD*
+* Notes
+* Correspondence
\ No newline at end of file
diff --git a/private/templates/org-mode/__invoice.org b/private/templates/org-mode/__invoice.org
new file mode 100644
index 000000000..d7f3102e5
--- /dev/null
+++ b/private/templates/org-mode/__invoice.org
@@ -0,0 +1,18 @@
+#+TITLE:${1:1234-5678}
+#+begin_src yaml
+created: `(format-time-string "%Y-%m-%d")`
+issued:  `(format-time-string "%Y-%m-%d")`
+currency: ${2:CAD|USD|GBP|DKK}
+contact:  ${3:email address}
+
+items:
+  - title: "$4"
+    body: "$5"
+    qty: ${6:1}
+    amount: ${7:1200.00}
+
+comments: "$0"
+#+end_src
+
+* Notes
+* Attachments [0/0]
\ No newline at end of file
diff --git a/private/templates/org-mode/__invoice.yml b/private/templates/org-mode/__invoice.yml
deleted file mode 100644
index f4940ddbd..000000000
--- a/private/templates/org-mode/__invoice.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-id: ${1:1234-5678}
-currency: ${2:CAD}
-date:
-  created: `(format-time-string "%Y-%m-%d")`
-  sent: `(format-time-string "%Y-%m-%d")`
-
-contact:
-  name: $3
-  email: $4
-  phone: $5
-  address: >-
-    $6
-
-items:
-  - name: $0
-    rate: 10.00
-    qty: 1
-    description: >-
-      ?
-
-notes: >-
-  ?
diff --git a/private/templates/org-mode/__project.org b/private/templates/org-mode/__project.org
index a0c6a3216..8139d5548 100644
--- a/private/templates/org-mode/__project.org
+++ b/private/templates/org-mode/__project.org
@@ -1,9 +1,10 @@
 #+TITLE:${1:Project Name}
-Created `(format-time-string "<%Y-%m-%d>")`
+#+begin_src yaml
+created: `(format-time-string "%Y-%m-%d")`
+contact: ${2:Contact id}
+#+end_src
 
-| Contact | [[contact:$2][${2:Contact Name}]] |
-
-${3:...}
+${3:Summary of project.}
 
 * Tasks [/]
 * Timeframe