diff --git a/micromelon_default/micromelon_default.kicad_pcb b/micromelon_default/micromelon_default.kicad_pcb
index bb7e6b5..208c1d4 100644
--- a/micromelon_default/micromelon_default.kicad_pcb
+++ b/micromelon_default/micromelon_default.kicad_pcb
@@ -6,8 +6,9 @@
 
   (paper "A4")
   (title_block
-    (title "<INSERT TITLE HERE>")
-    (rev "$REV$")
+    (title "${title}")
+    (date "${date}")
+    (rev "${rev}")
     (company "Micromelon Robotics")
   )
 
@@ -81,6 +82,9 @@
     )
   )
 
+  (property "rev" "")
+  (property "title" "")
+
   (net 0 "")
 
 )
diff --git a/micromelon_default/micromelon_default.kicad_pro b/micromelon_default/micromelon_default.kicad_pro
index fa2499e..e0824aa 100644
--- a/micromelon_default/micromelon_default.kicad_pro
+++ b/micromelon_default/micromelon_default.kicad_pro
@@ -377,7 +377,7 @@
       "no_connect_dangling": "warning",
       "pin_not_connected": "error",
       "pin_not_driven": "error",
-      "pin_to_pin": "warning",
+      "pin_to_pin": "error",
       "power_pin_not_driven": "error",
       "similar_labels": "warning",
       "simulation_model_issue": "error",
@@ -473,5 +473,9 @@
       ""
     ]
   ],
-  "text_variables": {}
+  "text_variables": {
+    "date": "",
+    "rev": "",
+    "title": ""
+  }
 }
diff --git a/micromelon_default/micromelon_default.kicad_sch b/micromelon_default/micromelon_default.kicad_sch
index b96a327..cb424c5 100644
--- a/micromelon_default/micromelon_default.kicad_sch
+++ b/micromelon_default/micromelon_default.kicad_sch
@@ -5,8 +5,9 @@
   (paper "A4")
 
   (title_block
-    (title "<INSERT PROJECT NAME HERE>")
-    (rev "$REV$")
+    (title "${title}")
+    (date "${date}")
+    (rev "${rev}")
     (company "Micromelon Robotics")
   )
 
diff --git a/tcs_default/tcs_default.kicad_pcb b/tcs_default/tcs_default.kicad_pcb
index 3b06344..b7113ae 100644
--- a/tcs_default/tcs_default.kicad_pcb
+++ b/tcs_default/tcs_default.kicad_pcb
@@ -5,6 +5,12 @@
   )
 
   (paper "A4")
+  (title_block
+    (title "${title}")
+    (date "${date}")
+    (rev "${rev}")
+  )
+
   (layers
     (0 "F.Cu" signal)
     (31 "B.Cu" signal)
@@ -75,6 +81,9 @@
     )
   )
 
+  (property "rev" "")
+  (property "title" "")
+
   (net 0 "")
 
 )
diff --git a/tcs_default/tcs_default.kicad_pro b/tcs_default/tcs_default.kicad_pro
index 2df0319..f23f7db 100644
--- a/tcs_default/tcs_default.kicad_pro
+++ b/tcs_default/tcs_default.kicad_pro
@@ -377,7 +377,7 @@
       "no_connect_dangling": "warning",
       "pin_not_connected": "error",
       "pin_not_driven": "error",
-      "pin_to_pin": "warning",
+      "pin_to_pin": "error",
       "power_pin_not_driven": "error",
       "similar_labels": "warning",
       "simulation_model_issue": "error",
@@ -473,5 +473,9 @@
       ""
     ]
   ],
-  "text_variables": {}
+  "text_variables": {
+    "date": "",
+    "rev": "",
+    "title": ""
+  }
 }
diff --git a/tcs_default/tcs_default.kicad_sch b/tcs_default/tcs_default.kicad_sch
index 480a6cc..239bfbf 100644
--- a/tcs_default/tcs_default.kicad_sch
+++ b/tcs_default/tcs_default.kicad_sch
@@ -4,6 +4,12 @@
 
   (paper "A4")
 
+  (title_block
+    (title "${title}")
+    (date "${date}")
+    (rev "${rev}")
+  )
+
   (lib_symbols
   )