From b286a0f9e4e6b5cc14ee331f39deb98e916aaf5f Mon Sep 17 00:00:00 2001
From: Anton Mukhin <mcfly@mcflyer.ru>
Date: Mon, 13 Feb 2023 21:06:55 +0300
Subject: [PATCH] Migrated to KiCad7

---
 kicad/V0_McDisplay.kicad_pcb | 3768 ++++++++++++++++++++------------
 kicad/V0_McDisplay.kicad_pro |   31 +-
 kicad/V0_McDisplay.kicad_sch | 3995 ++++++++++++++++++++--------------
 kicad/sym-lib-table          |    1 +
 4 files changed, 4784 insertions(+), 3011 deletions(-)

diff --git a/kicad/V0_McDisplay.kicad_pcb b/kicad/V0_McDisplay.kicad_pcb
index eaacaec..629f8d3 100644
--- a/kicad/V0_McDisplay.kicad_pcb
+++ b/kicad/V0_McDisplay.kicad_pcb
@@ -1,4 +1,4 @@
-(kicad_pcb (version 20211014) (generator pcbnew)
+(kicad_pcb (version 20221018) (generator pcbnew)
 
   (general
     (thickness 1.6)
@@ -41,14 +41,15 @@
     (pad_to_mask_clearance 0)
     (pcbplotparams
       (layerselection 0x00010fc_ffffffff)
+      (plot_on_all_layers_selection 0x0000000_00000000)
       (disableapertmacros false)
       (usegerberextensions false)
       (usegerberattributes true)
       (usegerberadvancedattributes true)
       (creategerberjobfile true)
-      (svguseinch false)
+      (dashed_line_dash_ratio 12.000000)
+      (dashed_line_gap_ratio 3.000000)
       (svgprecision 6)
-      (excludeedgelayer true)
       (plotframeref false)
       (viasonmask false)
       (mode 1)
@@ -145,7 +146,7 @@
   (net 68 "unconnected-(U3-Pad46)")
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEF) (tstamp 043be729-9056-42dc-bfbf-74c7ea89e9e0)
+    (tstamp 043be729-9056-42dc-bfbf-74c7ea89e9e0)
     (at 75.1 47.3)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -154,27 +155,37 @@
     (path "/f5842af8-6c45-4a6a-a9c7-8cb81affa27d")
     (attr smd)
     (fp_text reference "C13" (at 0 -1.68) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 52cdfe25-2367-48f4-a73c-d2acc6055dea)
     )
     (fp_text value "100n" (at 0 1.68) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 3e88df48-a133-4eda-a166-1b4faf00bfc8)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp b3d95cb4-2edc-475a-a461-ea7fcb72da9a)
     )
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 790d1e70-c529-40c9-94d4-8a99179017ed))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "F.SilkS") (width 0.12) (tstamp f8be389a-4662-4f0b-bab3-976960e8e2b7))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 122ca23d-7445-4b56-b41d-d8044822cb55))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 2039d772-5d10-4271-86b3-dcb695d8f51d))
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 31a03d73-7440-4232-8c24-0998f4f584bc))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 43073aad-a02a-48ea-835b-92ef4f03ef02))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 583454d6-d59c-4193-9d3c-d5150f5204ee))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 8b589822-4a0b-44ab-b47f-76449dbeef5b))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp ee6d9362-5d92-4051-9359-e7e881f97ae0))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp f5209cdc-7420-4d82-a1d8-12aa7c065e05))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 790d1e70-c529-40c9-94d4-8a99179017ed))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f8be389a-4662-4f0b-bab3-976960e8e2b7))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2039d772-5d10-4271-86b3-dcb695d8f51d))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 43073aad-a02a-48ea-835b-92ef4f03ef02))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 122ca23d-7445-4b56-b41d-d8044822cb55))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 31a03d73-7440-4232-8c24-0998f4f584bc))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 583454d6-d59c-4193-9d3c-d5150f5204ee))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8b589822-4a0b-44ab-b47f-76449dbeef5b))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f5209cdc-7420-4d82-a1d8-12aa7c065e05))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ee6d9362-5d92-4051-9359-e7e881f97ae0))
     (pad "1" smd roundrect (at -1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
       (net 15 "KILL_SW") (pintype "passive") (tstamp 9eede947-a65a-4e84-84e9-62ed68d05108))
     (pad "2" smd roundrect (at 1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
@@ -187,7 +198,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEF) (tstamp 04f136f1-7824-4616-a0b2-1c9177b7b557)
+    (tstamp 04f136f1-7824-4616-a0b2-1c9177b7b557)
     (at 27.6625 2.9)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -196,27 +207,37 @@
     (path "/2be227d8-80ea-4637-8578-3495c1af24c8")
     (attr smd)
     (fp_text reference "C10" (at 0 -1.68) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp cf1901d4-55f6-4da7-9a1e-c8311378fd78)
     )
     (fp_text value "10u" (at 0 1.68) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 729920a6-bf1f-4f23-9479-e1735b079765)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 7de94786-0bc4-4dbe-b68e-38a2d63ddb69)
     )
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "F.SilkS") (width 0.12) (tstamp 096de76a-96e4-4695-91aa-c86ae8f269e1))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "F.SilkS") (width 0.12) (tstamp b984787b-5a7c-475f-b761-ea87fb27ed59))
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 6d9df7a7-78f2-4793-97b8-b96389a4bd77))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp aa2a6b9a-eef6-4ad9-8633-5f9c7894e28a))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp b2e15cbb-47df-4ab0-9f58-ca33d3a97cec))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp d227eb2f-26a3-41d9-b28c-d626e5c0c8e4))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 0cf591ef-394a-49e0-827d-0f75880b213d))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp c5ffc5f3-dee6-4e14-9151-edea9e98c797))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp cf74a701-6a02-454e-826f-00e11d390d0b))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp e4eb85ce-919c-46b0-9c70-fa960a998626))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b984787b-5a7c-475f-b761-ea87fb27ed59))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 096de76a-96e4-4695-91aa-c86ae8f269e1))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b2e15cbb-47df-4ab0-9f58-ca33d3a97cec))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp aa2a6b9a-eef6-4ad9-8633-5f9c7894e28a))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d227eb2f-26a3-41d9-b28c-d626e5c0c8e4))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6d9df7a7-78f2-4793-97b8-b96389a4bd77))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0cf591ef-394a-49e0-827d-0f75880b213d))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cf74a701-6a02-454e-826f-00e11d390d0b))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c5ffc5f3-dee6-4e14-9151-edea9e98c797))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e4eb85ce-919c-46b0-9c70-fa960a998626))
     (pad "1" smd roundrect (at -1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
       (net 13 "Net-(C10-Pad1)") (pintype "passive") (tstamp ec985fe0-c6a4-4a73-a79f-5d333f7eb322))
     (pad "2" smd roundrect (at 1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
@@ -229,7 +250,7 @@
   )
 
   (footprint "V0-Display:WS2812_5050_LED" (layer "F.Cu")
-    (tedit 5EF94139) (tstamp 04f7f47f-a719-4a5c-9e15-01a9e94424f3)
+    (tstamp 04f7f47f-a719-4a5c-9e15-01a9e94424f3)
     (at 78.7 33.6 90)
     (descr "https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf")
     (tags "LED RGB NeoPixel")
@@ -238,34 +259,47 @@
     (path "/c87e9e75-d199-43c4-8134-da78240736a9")
     (attr smd)
     (fp_text reference "D3" (at 0 -3.5 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp cb8b2c73-aebc-4dfa-b4a8-2e4e1107e902)
     )
     (fp_text value "WS2812B" (at 0 4 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 1bd71f0e-3b56-4b9d-a813-682fcf98818e)
     )
     (fp_text user "1" (at -4.15 -1.6 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp d264081f-ad15-4b6c-b234-38e121753478)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
-      (effects (font (size 0.8 0.8) (thickness 0.15)))
+        (effects (font (size 0.8 0.8) (thickness 0.15)))
       (tstamp ab3e693e-7277-4878-a788-c15a2950378b)
     )
-    (fp_line (start -3.65 -2.75) (end 3.65 -2.75) (layer "F.SilkS") (width 0.12) (tstamp 3901e6d6-8d61-4868-bced-b7123b9d650e))
-    (fp_line (start 3.65 2.75) (end 3.65 1.6) (layer "F.SilkS") (width 0.12) (tstamp 43e92442-53d9-427f-bbea-f221533d5e00))
-    (fp_line (start -3.65 2.75) (end 3.65 2.75) (layer "F.SilkS") (width 0.12) (tstamp 50a47331-2b16-4c70-acb7-bfb0de95f575))
-    (fp_line (start 3.45 2.75) (end 3.45 -2.75) (layer "F.CrtYd") (width 0.05) (tstamp 03130373-8af1-46ae-aa45-e0c698c55492))
-    (fp_line (start 3.45 -2.75) (end -3.45 -2.75) (layer "F.CrtYd") (width 0.05) (tstamp 3cf99a43-b9c5-4f05-af42-d2f82e5641e9))
-    (fp_line (start -3.45 2.75) (end 3.45 2.75) (layer "F.CrtYd") (width 0.05) (tstamp 68c5d2ae-0c63-4ad2-8166-2e49196c45b5))
-    (fp_line (start -3.45 -2.75) (end -3.45 2.75) (layer "F.CrtYd") (width 0.05) (tstamp c0cffccb-75a0-4f7e-92a4-f77cdf261017))
-    (fp_line (start 2.5 2.5) (end 2.5 -2.5) (layer "F.Fab") (width 0.1) (tstamp 0b97b152-a932-4f8e-8ea0-0abbf0251b69))
-    (fp_line (start -2.5 -2.5) (end -2.5 2.5) (layer "F.Fab") (width 0.1) (tstamp 2cb63b95-a997-49d5-8f5c-c4a8f8f15b86))
-    (fp_line (start 2.5 1.5) (end 1.5 2.5) (layer "F.Fab") (width 0.1) (tstamp 852b94ef-2ce8-4083-b952-f2d7817205cb))
-    (fp_line (start -2.5 2.5) (end 2.5 2.5) (layer "F.Fab") (width 0.1) (tstamp 991723a7-4bf4-4e87-8e0d-ee1112fdccdb))
-    (fp_line (start 2.5 -2.5) (end -2.5 -2.5) (layer "F.Fab") (width 0.1) (tstamp dbf6d2bc-2f56-4210-9baf-c1d68a49ba51))
-    (fp_circle (center 0 0) (end 0 -2) (layer "F.Fab") (width 0.1) (fill none) (tstamp 412163d6-b492-48ed-b75e-0a9799e9706f))
+    (fp_line (start -3.65 -2.75) (end 3.65 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3901e6d6-8d61-4868-bced-b7123b9d650e))
+    (fp_line (start -3.65 2.75) (end 3.65 2.75)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 50a47331-2b16-4c70-acb7-bfb0de95f575))
+    (fp_line (start 3.65 2.75) (end 3.65 1.6)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 43e92442-53d9-427f-bbea-f221533d5e00))
+    (fp_line (start -3.45 -2.75) (end -3.45 2.75)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c0cffccb-75a0-4f7e-92a4-f77cdf261017))
+    (fp_line (start -3.45 2.75) (end 3.45 2.75)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 68c5d2ae-0c63-4ad2-8166-2e49196c45b5))
+    (fp_line (start 3.45 -2.75) (end -3.45 -2.75)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3cf99a43-b9c5-4f05-af42-d2f82e5641e9))
+    (fp_line (start 3.45 2.75) (end 3.45 -2.75)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 03130373-8af1-46ae-aa45-e0c698c55492))
+    (fp_line (start -2.5 -2.5) (end -2.5 2.5)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2cb63b95-a997-49d5-8f5c-c4a8f8f15b86))
+    (fp_line (start -2.5 2.5) (end 2.5 2.5)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 991723a7-4bf4-4e87-8e0d-ee1112fdccdb))
+    (fp_line (start 2.5 -2.5) (end -2.5 -2.5)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dbf6d2bc-2f56-4210-9baf-c1d68a49ba51))
+    (fp_line (start 2.5 1.5) (end 1.5 2.5)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 852b94ef-2ce8-4083-b952-f2d7817205cb))
+    (fp_line (start 2.5 2.5) (end 2.5 -2.5)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0b97b152-a932-4f8e-8ea0-0abbf0251b69))
+    (fp_circle (center 0 0) (end 0 -2)
+      (stroke (width 0.1) (type solid)) (fill none) (layer "F.Fab") (tstamp 412163d6-b492-48ed-b75e-0a9799e9706f))
     (pad "1" smd rect (at -2.45 -1.6 90) (size 1.5 1) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 1 "VBUS") (pinfunction "VDD") (pintype "power_in") (tstamp d1d50571-4e98-4110-8ba1-0fc0293aff72))
     (pad "2" smd rect (at -2.45 1.6 90) (size 1.5 1) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -282,7 +316,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp 072a68d4-18cd-440e-97b6-03f5c691b71a)
+    (tstamp 072a68d4-18cd-440e-97b6-03f5c691b71a)
     (at 64.7 21.9 -90)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -291,27 +325,37 @@
     (path "/4ed11648-fc7e-4003-86ad-895d3d3704ac")
     (attr smd)
     (fp_text reference "R3" (at 0 -1.65 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 82b17136-9c5b-4111-a926-61a3a2e0c8ae)
     )
     (fp_text value "1k" (at 0 1.65 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 511865c5-792f-44b3-a5c3-dddb2521cfc2)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 9dcb90b9-1d79-4b9c-960d-4898c823faf3)
     )
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp 59e655f7-d27d-4a31-baf7-0dfdeab2382c))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 65ac757a-497e-40e5-9c36-db9c78af396c))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 47c0e4f3-d8d3-49ef-89f6-4faf139df99d))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp a17eb8c8-b318-4a48-87aa-06210ee85fae))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp cb20dc26-c6c0-44f8-98a9-e0618e412694))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp d8fd5415-b29f-4e7d-920f-d88507789257))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 25343317-1a94-44ae-9bee-9339970041a0))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 84678576-bc24-4374-b8e0-8293a695ce07))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 89321e26-b06f-43ca-8f1f-3c76960a9d60))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp cd9446c1-05e1-4824-a35c-0d1adf7b7ec6))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 65ac757a-497e-40e5-9c36-db9c78af396c))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 59e655f7-d27d-4a31-baf7-0dfdeab2382c))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d8fd5415-b29f-4e7d-920f-d88507789257))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 47c0e4f3-d8d3-49ef-89f6-4faf139df99d))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cb20dc26-c6c0-44f8-98a9-e0618e412694))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a17eb8c8-b318-4a48-87aa-06210ee85fae))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 84678576-bc24-4374-b8e0-8293a695ce07))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 89321e26-b06f-43ca-8f1f-3c76960a9d60))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 25343317-1a94-44ae-9bee-9339970041a0))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cd9446c1-05e1-4824-a35c-0d1adf7b7ec6))
     (pad "1" smd roundrect (at -1 0 270) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 23 "Net-(J4-Pad2)") (pintype "passive") (tstamp 2ec2d84e-56d5-4419-9f22-5d934bef4308))
     (pad "2" smd roundrect (at 1 0 270) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -324,7 +368,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp 078bdc82-3d5d-4f71-bf0a-990a8322dbdf)
+    (tstamp 078bdc82-3d5d-4f71-bf0a-990a8322dbdf)
     (at -21.3 16.1)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -333,27 +377,37 @@
     (path "/c9a6c936-034e-4e30-bfbd-7d979bef3718")
     (attr smd)
     (fp_text reference "R12" (at 0 -1.65) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 3850ec5a-b87d-41d0-a7e5-127bda9652dd)
     )
     (fp_text value "0" (at 0 1.65) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 96493bad-5ccb-47fa-aef9-bc7f96eb9add)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 52f30886-5ff9-486f-968f-e4abfb50ae3b)
     )
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp b1d4cdae-ae70-4209-88b3-93c2605ac78f))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp c0f65d64-efda-4035-bb12-ba7df1277e28))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 30537c97-5d84-4e42-8d98-cfc81af5ce12))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 74d70da6-f1ec-45d9-b667-c7e018ec2615))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 7e6a4866-b6b9-4ded-86eb-a79bea019087))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp a60e516d-8639-4142-9278-3919d30d19e2))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 22497a99-d01c-4e33-bdc1-866d09a3d0c6))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 25fea862-70d6-4b66-b478-ccbd94157801))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 561aab30-49f6-49c6-9a84-5d0589f4ec20))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 73d5078b-2d81-4ee8-99eb-2326b07bcf94))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c0f65d64-efda-4035-bb12-ba7df1277e28))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b1d4cdae-ae70-4209-88b3-93c2605ac78f))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 30537c97-5d84-4e42-8d98-cfc81af5ce12))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a60e516d-8639-4142-9278-3919d30d19e2))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 74d70da6-f1ec-45d9-b667-c7e018ec2615))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7e6a4866-b6b9-4ded-86eb-a79bea019087))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 561aab30-49f6-49c6-9a84-5d0589f4ec20))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 25fea862-70d6-4b66-b478-ccbd94157801))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 73d5078b-2d81-4ee8-99eb-2326b07bcf94))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 22497a99-d01c-4e33-bdc1-866d09a3d0c6))
     (pad "1" smd roundrect (at -1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 6 "GND") (pintype "passive") (tstamp 4f4a906f-ac48-4051-bffb-ed8580f11893))
     (pad "2" smd roundrect (at 1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -366,7 +420,7 @@
   )
 
   (footprint "V0-Display:SOT-23-5" (layer "F.Cu")
-    (tedit 5EB07606) (tstamp 0b0d412b-d0b9-4f50-80fd-0927af8635c0)
+    (tstamp 0b0d412b-d0b9-4f50-80fd-0927af8635c0)
     (at 77.7 27.9)
     (descr "5-pin SOT23 package")
     (tags "SOT-23-5")
@@ -375,36 +429,47 @@
     (path "/bd254e6b-22a6-4c62-a8d4-b6576707c115")
     (attr smd)
     (fp_text reference "U2" (at 0 -2.9) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 39e06cc1-1968-4ecc-9e0b-decba7ce9f11)
     )
     (fp_text value "74LVC1G17" (at 0 2.9) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 4ffb1f26-fb90-43cc-8f3f-a30e433b47d2)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.075)))
+        (effects (font (size 0.5 0.5) (thickness 0.075)))
       (tstamp 591eefcc-d5ec-4615-9863-61ff27f47517)
     )
-    (fp_line (start -0.9 1.61) (end 0.9 1.61) (layer "F.SilkS") (width 0.12) (tstamp 0ba5e9a0-e5c0-47b5-bf3d-d05820374fb8))
-    (fp_line (start 0.9 -1.61) (end -1.55 -1.61) (layer "F.SilkS") (width 0.12) (tstamp db0336e2-c37c-425e-a1a7-1ca37e5ad539))
-    (fp_line (start 1.9 1.8) (end -1.9 1.8) (layer "F.CrtYd") (width 0.05) (tstamp 2c8ed3a0-e1d7-4ce2-8b99-07fcc274d59f))
-    (fp_line (start -1.9 1.8) (end -1.9 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 6d9d2cf6-de79-4f7e-83a2-8e0258de1c83))
-    (fp_line (start -1.9 -1.8) (end 1.9 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 7bdadfe3-a2b2-40cf-93cf-78f9f2fae97c))
-    (fp_line (start 1.9 -1.8) (end 1.9 1.8) (layer "F.CrtYd") (width 0.05) (tstamp a9374e87-9a18-48b7-88a0-ff6dfd9f179e))
-    (fp_line (start -0.9 -0.9) (end -0.25 -1.55) (layer "F.Fab") (width 0.1) (tstamp 1f35cc0a-59b7-428f-9bfd-632e61385976))
-    (fp_line (start 0.9 1.55) (end -0.9 1.55) (layer "F.Fab") (width 0.1) (tstamp 4455bb1b-e04c-4a43-8f4c-576fd9833b96))
-    (fp_line (start -0.9 -0.9) (end -0.9 1.55) (layer "F.Fab") (width 0.1) (tstamp a56eadf1-baa5-47ad-b478-3faac6e78c95))
-    (fp_line (start 0.9 -1.55) (end 0.9 1.55) (layer "F.Fab") (width 0.1) (tstamp bc2299ed-8d0e-4247-94ca-1f4669a330f1))
-    (fp_line (start 0.9 -1.55) (end -0.25 -1.55) (layer "F.Fab") (width 0.1) (tstamp d3186605-d3c3-4351-804e-47dda28badba))
-    (pad "1" smd rect locked (at -1.1 -0.95) (size 1.06 0.65) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp f91225e8-383a-4f7b-8509-ad86cea51f4f))
-    (pad "2" smd rect locked (at -1.1 0) (size 1.06 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
+    (fp_line (start -0.9 1.61) (end 0.9 1.61)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0ba5e9a0-e5c0-47b5-bf3d-d05820374fb8))
+    (fp_line (start 0.9 -1.61) (end -1.55 -1.61)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp db0336e2-c37c-425e-a1a7-1ca37e5ad539))
+    (fp_line (start -1.9 -1.8) (end 1.9 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7bdadfe3-a2b2-40cf-93cf-78f9f2fae97c))
+    (fp_line (start -1.9 1.8) (end -1.9 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6d9d2cf6-de79-4f7e-83a2-8e0258de1c83))
+    (fp_line (start 1.9 -1.8) (end 1.9 1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a9374e87-9a18-48b7-88a0-ff6dfd9f179e))
+    (fp_line (start 1.9 1.8) (end -1.9 1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2c8ed3a0-e1d7-4ce2-8b99-07fcc274d59f))
+    (fp_line (start -0.9 -0.9) (end -0.9 1.55)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a56eadf1-baa5-47ad-b478-3faac6e78c95))
+    (fp_line (start -0.9 -0.9) (end -0.25 -1.55)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1f35cc0a-59b7-428f-9bfd-632e61385976))
+    (fp_line (start 0.9 -1.55) (end -0.25 -1.55)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d3186605-d3c3-4351-804e-47dda28badba))
+    (fp_line (start 0.9 -1.55) (end 0.9 1.55)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bc2299ed-8d0e-4247-94ca-1f4669a330f1))
+    (fp_line (start 0.9 1.55) (end -0.9 1.55)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4455bb1b-e04c-4a43-8f4c-576fd9833b96))
+    (pad "1" smd rect (at -1.1 -0.95) (size 1.06 0.65) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp f91225e8-383a-4f7b-8509-ad86cea51f4f))
+    (pad "2" smd rect (at -1.1 0) (size 1.06 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 55 "NEOPIXEL") (pintype "input") (tstamp 977f0646-ba70-4894-a82e-7ffd281afbbe))
-    (pad "3" smd rect locked (at -1.1 0.95) (size 1.06 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
+    (pad "3" smd rect (at -1.1 0.95) (size 1.06 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 6 "GND") (pinfunction "GND") (pintype "power_in") (tstamp 7282a61b-1649-4dbc-bda9-ede7528888bb))
-    (pad "4" smd rect locked (at 1.1 0.95) (size 1.06 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
+    (pad "4" smd rect (at 1.1 0.95) (size 1.06 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 18 "Net-(D3-Pad4)") (pintype "output") (tstamp fe35ccdf-f0b5-4b26-a56d-f8b44ba24312))
-    (pad "5" smd rect locked (at 1.1 -0.95) (size 1.06 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
+    (pad "5" smd rect (at 1.1 -0.95) (size 1.06 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 1 "VBUS") (pinfunction "VCC") (pintype "power_in") (tstamp 0ccef0a6-45bf-4707-a9a8-e2fc52ef036c))
     (model "${KIPRJMOD}/Library/3D_Packages/SOT-23-5.step"
       (offset (xyz 0 0 0))
@@ -414,7 +479,7 @@
   )
 
   (footprint "Connector_PinHeader_2.54mm:PinHeader_2x04_P2.54mm_Vertical" (layer "F.Cu")
-    (tedit 59FED5CC) (tstamp 0c1a92c7-95a0-4141-9110-06925c4363e0)
+    (tstamp 0c1a92c7-95a0-4141-9110-06925c4363e0)
     (at 92.725 26.8)
     (descr "Through hole straight pin header, 2x04, 2.54mm pitch, double rows")
     (tags "Through hole pin header THT 2x04 2.54mm double row")
@@ -423,49 +488,66 @@
     (path "/559659de-8fba-42aa-a4c2-5d8f603e64e9")
     (attr through_hole)
     (fp_text reference "J13" (at 1.27 -2.33) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 569ed254-8f00-41c1-a1b5-d1b5884624d4)
     )
     (fp_text value "GPIO" (at 1.27 9.95) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 32ffa207-4556-4418-a360-b3188225719b)
     )
     (fp_text user "${REFERENCE}" (at 1.27 3.81 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 69826a0f-f6d8-43e6-852f-a1601b62e203)
     )
-    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 13df6901-6009-4910-a2fd-bfd4e4493969))
-    (fp_line (start 3.87 -1.33) (end 3.87 8.95) (layer "F.SilkS") (width 0.12) (tstamp 1d48d0bb-f5bb-4006-80b6-b0af87a34ee2))
-    (fp_line (start -1.33 1.27) (end 1.27 1.27) (layer "F.SilkS") (width 0.12) (tstamp 7563465e-7dd4-4912-9068-357358d9ee73))
-    (fp_line (start 1.27 -1.33) (end 3.87 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 99dc2434-da67-4bda-b583-171fcfcde1a5))
-    (fp_line (start -1.33 8.95) (end 3.87 8.95) (layer "F.SilkS") (width 0.12) (tstamp 9aedf138-457f-4f7c-b434-97b1876b7150))
-    (fp_line (start -1.33 1.27) (end -1.33 8.95) (layer "F.SilkS") (width 0.12) (tstamp be8518c7-9dde-4676-ae42-849fff08f374))
-    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer "F.SilkS") (width 0.12) (tstamp e948307e-0a1e-41eb-b75b-e663df60d7ad))
-    (fp_line (start 1.27 1.27) (end 1.27 -1.33) (layer "F.SilkS") (width 0.12) (tstamp fd6d1ecf-2319-4ecd-a30f-6b3c01b34544))
-    (fp_line (start 4.35 9.4) (end 4.35 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 1c817043-ce3c-465a-b920-8b4256599c18))
-    (fp_line (start -1.8 9.4) (end 4.35 9.4) (layer "F.CrtYd") (width 0.05) (tstamp 30e20504-d569-44cf-a3b2-49fa80f12940))
-    (fp_line (start -1.8 -1.8) (end -1.8 9.4) (layer "F.CrtYd") (width 0.05) (tstamp badd1737-bee7-4804-bf50-87bb6f3976f9))
-    (fp_line (start 4.35 -1.8) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp c72281b5-27da-4c72-ab86-af5f31825c9f))
-    (fp_line (start -1.27 0) (end 0 -1.27) (layer "F.Fab") (width 0.1) (tstamp 07edb5e5-48f4-41de-b79e-94b1096d533b))
-    (fp_line (start 3.81 -1.27) (end 3.81 8.89) (layer "F.Fab") (width 0.1) (tstamp 11c1e78e-3c5a-485d-8837-6ae420adaf08))
-    (fp_line (start -1.27 8.89) (end -1.27 0) (layer "F.Fab") (width 0.1) (tstamp 6c182a68-5a8e-400e-9191-ee626c1b17e3))
-    (fp_line (start 0 -1.27) (end 3.81 -1.27) (layer "F.Fab") (width 0.1) (tstamp 8ee8d9dc-77f8-43d3-8096-c0944faba080))
-    (fp_line (start 3.81 8.89) (end -1.27 8.89) (layer "F.Fab") (width 0.1) (tstamp ab596e55-fc4c-4177-b1d8-24937e372e0c))
-    (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (fp_line (start -1.33 -1.33) (end 0 -1.33)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e948307e-0a1e-41eb-b75b-e663df60d7ad))
+    (fp_line (start -1.33 0) (end -1.33 -1.33)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 13df6901-6009-4910-a2fd-bfd4e4493969))
+    (fp_line (start -1.33 1.27) (end -1.33 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp be8518c7-9dde-4676-ae42-849fff08f374))
+    (fp_line (start -1.33 1.27) (end 1.27 1.27)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7563465e-7dd4-4912-9068-357358d9ee73))
+    (fp_line (start -1.33 8.95) (end 3.87 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9aedf138-457f-4f7c-b434-97b1876b7150))
+    (fp_line (start 1.27 -1.33) (end 3.87 -1.33)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 99dc2434-da67-4bda-b583-171fcfcde1a5))
+    (fp_line (start 1.27 1.27) (end 1.27 -1.33)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp fd6d1ecf-2319-4ecd-a30f-6b3c01b34544))
+    (fp_line (start 3.87 -1.33) (end 3.87 8.95)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1d48d0bb-f5bb-4006-80b6-b0af87a34ee2))
+    (fp_line (start -1.8 -1.8) (end -1.8 9.4)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp badd1737-bee7-4804-bf50-87bb6f3976f9))
+    (fp_line (start -1.8 9.4) (end 4.35 9.4)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 30e20504-d569-44cf-a3b2-49fa80f12940))
+    (fp_line (start 4.35 -1.8) (end -1.8 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c72281b5-27da-4c72-ab86-af5f31825c9f))
+    (fp_line (start 4.35 9.4) (end 4.35 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1c817043-ce3c-465a-b920-8b4256599c18))
+    (fp_line (start -1.27 0) (end 0 -1.27)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 07edb5e5-48f4-41de-b79e-94b1096d533b))
+    (fp_line (start -1.27 8.89) (end -1.27 0)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6c182a68-5a8e-400e-9191-ee626c1b17e3))
+    (fp_line (start 0 -1.27) (end 3.81 -1.27)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8ee8d9dc-77f8-43d3-8096-c0944faba080))
+    (fp_line (start 3.81 -1.27) (end 3.81 8.89)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 11c1e78e-3c5a-485d-8837-6ae420adaf08))
+    (fp_line (start 3.81 8.89) (end -1.27 8.89)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ab596e55-fc4c-4177-b1d8-24937e372e0c))
+    (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 40 "GPIO1") (pinfunction "Pin_1") (pintype "passive") (tstamp f3bb8106-4692-4662-908c-c4b8844464dd))
-    (pad "2" thru_hole oval (at 2.54 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 2.54 0) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 6 "GND") (pinfunction "Pin_2") (pintype "passive") (tstamp 46f95841-49f3-4d36-a0fb-7374b50755c4))
-    (pad "3" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 41 "GPIO2") (pinfunction "Pin_3") (pintype "passive") (tstamp 462cdb37-0e60-4731-b43b-2ff63103c024))
-    (pad "4" thru_hole oval (at 2.54 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 2.54 2.54) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 6 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp 3518caba-0703-4c7c-aaae-1f7eb15d6a84))
-    (pad "5" thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "5" thru_hole oval (at 0 5.08) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 42 "GPIO3") (pinfunction "Pin_5") (pintype "passive") (tstamp e7d58631-1e44-4354-ac98-6d6cf956889d))
-    (pad "6" thru_hole oval (at 2.54 5.08) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at 2.54 5.08) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 6 "GND") (pinfunction "Pin_6") (pintype "passive") (tstamp 15d46663-dd40-449b-bb47-8e34d02f34ea))
-    (pad "7" thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "7" thru_hole oval (at 0 7.62) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 43 "GPIO4") (pinfunction "Pin_7") (pintype "passive") (tstamp f65c1123-1b1d-4fa6-8263-7edf34dda1b6))
-    (pad "8" thru_hole oval (at 2.54 7.62) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "8" thru_hole oval (at 2.54 7.62) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 6 "GND") (pinfunction "Pin_8") (pintype "passive") (tstamp 9416becf-8350-4446-b7f0-3c42bdf5cdf3))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_2x04_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -475,7 +557,7 @@
   )
 
   (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu")
-    (tedit 59FED5CC) (tstamp 1012bb3f-562f-40b6-a6a3-d5097c7ea6f0)
+    (tstamp 1012bb3f-562f-40b6-a6a3-d5097c7ea6f0)
     (at 28.1 66.425)
     (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x02 2.54mm single row")
@@ -484,35 +566,50 @@
     (path "/b775e5ef-57ae-4408-a5e7-74c9bb086edd")
     (attr through_hole)
     (fp_text reference "J12" (at 0 -2.33) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 972d9f82-fc00-492e-96de-2e64d552b3b0)
     )
     (fp_text value "Conn_01x02" (at 0 4.87) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 039af6b6-b58c-4303-b36c-b3323ba242e5)
     )
     (fp_text user "${REFERENCE}" (at 0 1.27 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 0182e0ae-725a-4f5b-9308-352513780cda)
     )
-    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp 15d2d589-8542-4fed-8d8d-776bc7ac673b))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer "F.SilkS") (width 0.12) (tstamp 1c77e410-88fb-4c49-9268-061752a8b86c))
-    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer "F.SilkS") (width 0.12) (tstamp 226cd81f-ecdb-44cd-9eaf-c4ebe76836a4))
-    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp 914710e4-a7a0-48b2-9274-069369495da0))
-    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer "F.SilkS") (width 0.12) (tstamp a0e6503d-bab8-4513-b501-760c6de8273b))
-    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer "F.SilkS") (width 0.12) (tstamp bf438da9-3e4c-4070-a06f-558eb031b422))
-    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp 1aed417d-f4bf-4f37-bf6f-2426837ffa15))
-    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 414f8adf-762d-491b-b959-13211c13a0e8))
-    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer "F.CrtYd") (width 0.05) (tstamp 47853c00-7b1c-4c10-8fda-05f24456cfeb))
-    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer "F.CrtYd") (width 0.05) (tstamp 8d80c9d1-165f-4d71-81c5-62197a13d6c4))
-    (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 13490dc3-7817-460a-b409-71c7911cbdcf))
-    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 1b91c972-0d66-4fd4-a335-8c7f7fe02524))
-    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 737822bf-4dc5-431b-b4bc-6afae076a4a2))
-    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp ba7fb36a-b7d0-48b5-a5db-2406b23048d7))
-    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp c1a13c38-f0f5-4766-a07c-c5be7454859a))
-    (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (fp_line (start -1.33 -1.33) (end 0 -1.33)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp bf438da9-3e4c-4070-a06f-558eb031b422))
+    (fp_line (start -1.33 0) (end -1.33 -1.33)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 226cd81f-ecdb-44cd-9eaf-c4ebe76836a4))
+    (fp_line (start -1.33 1.27) (end -1.33 3.87)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a0e6503d-bab8-4513-b501-760c6de8273b))
+    (fp_line (start -1.33 1.27) (end 1.33 1.27)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1c77e410-88fb-4c49-9268-061752a8b86c))
+    (fp_line (start -1.33 3.87) (end 1.33 3.87)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 15d2d589-8542-4fed-8d8d-776bc7ac673b))
+    (fp_line (start 1.33 1.27) (end 1.33 3.87)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 914710e4-a7a0-48b2-9274-069369495da0))
+    (fp_line (start -1.8 -1.8) (end -1.8 4.35)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 47853c00-7b1c-4c10-8fda-05f24456cfeb))
+    (fp_line (start -1.8 4.35) (end 1.8 4.35)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1aed417d-f4bf-4f37-bf6f-2426837ffa15))
+    (fp_line (start 1.8 -1.8) (end -1.8 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 414f8adf-762d-491b-b959-13211c13a0e8))
+    (fp_line (start 1.8 4.35) (end 1.8 -1.8)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8d80c9d1-165f-4d71-81c5-62197a13d6c4))
+    (fp_line (start -1.27 -0.635) (end -0.635 -1.27)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1b91c972-0d66-4fd4-a335-8c7f7fe02524))
+    (fp_line (start -1.27 3.81) (end -1.27 -0.635)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c1a13c38-f0f5-4766-a07c-c5be7454859a))
+    (fp_line (start -0.635 -1.27) (end 1.27 -1.27)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 13490dc3-7817-460a-b409-71c7911cbdcf))
+    (fp_line (start 1.27 -1.27) (end 1.27 3.81)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ba7fb36a-b7d0-48b5-a5db-2406b23048d7))
+    (fp_line (start 1.27 3.81) (end -1.27 3.81)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 737822bf-4dc5-431b-b4bc-6afae076a4a2))
+    (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 12 "+3.3V") (pinfunction "Pin_1") (pintype "passive") (tstamp d82426ba-efdd-4212-b262-0bbb6ceec4a5))
-    (pad "2" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
       (net 39 "BOOT0") (pinfunction "Pin_2") (pintype "passive") (tstamp b018533f-6e9a-4e53-b587-002c7235e9c5))
     (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -522,7 +619,7 @@
   )
 
   (footprint "V0-Display:SW_PUSH_6mm" (layer "F.Cu")
-    (tedit 5EF9412A) (tstamp 16e65afe-3c66-4f62-bed9-8f0fd28b6f84)
+    (tstamp 16e65afe-3c66-4f62-bed9-8f0fd28b6f84)
     (at 76.65 38.95)
     (descr "https://www.omron.com/ecb/products/pdf/en-b3f.pdf")
     (tags "tact sw push 6mm")
@@ -531,47 +628,69 @@
     (path "/aae496e3-dea1-40e2-813d-d908db9cb4e1")
     (attr through_hole)
     (fp_text reference "SW1" (at 3.25 -2) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp bea94e8c-3904-432c-b93b-04d3e793e32e)
     )
     (fp_text value "Tact_switch" (at 3.75 6.7) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp a4cd6bf1-bf57-4bc5-bf59-66fbccb89d5b)
     )
     (fp_text user "${REFERENCE}" (at 3.25 2.25) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 3c1b5564-b4bd-4727-ba1c-68891d6790e7)
     )
-    (fp_line (start 5.5 -1) (end 1 -1) (layer "F.SilkS") (width 0.12) (tstamp 0101da6a-8bab-4612-9033-4bdb82c7b6f1))
-    (fp_line (start -0.25 1.5) (end -0.25 3) (layer "F.SilkS") (width 0.12) (tstamp 04858689-9429-411d-8a5a-8a870e2b97b2))
-    (fp_line (start 1 5.5) (end 5.5 5.5) (layer "F.SilkS") (width 0.12) (tstamp 3629bea9-2b4b-4f1e-b589-113c7d7ed2b0))
-    (fp_line (start 6.75 3) (end 6.75 1.5) (layer "F.SilkS") (width 0.12) (tstamp 64ed83e0-a04d-41e3-92b9-70232edbf366))
-    (fp_line (start -1.5 5.75) (end -1.5 6) (layer "F.CrtYd") (width 0.05) (tstamp 04b077cf-ddec-40a4-b90a-34f9cb10a29c))
-    (fp_line (start 7.75 6) (end -1.25 6) (layer "F.CrtYd") (width 0.05) (tstamp 190637d0-bb77-47e0-8247-5c3ded525f5b))
-    (fp_line (start 7.75 -1.5) (end 8 -1.5) (layer "F.CrtYd") (width 0.05) (tstamp 2511d466-969b-4b4c-9747-ad498ddd5ebb))
-    (fp_line (start -1.25 -1.5) (end 7.75 -1.5) (layer "F.CrtYd") (width 0.05) (tstamp 2c0794e2-cee0-4e99-87a4-1b92fdfd89a7))
-    (fp_line (start 8 6) (end 8 5.75) (layer "F.CrtYd") (width 0.05) (tstamp 503e4adb-4dfe-456d-834b-3179d137b83d))
-    (fp_line (start 8 -1.5) (end 8 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp 609ed665-e0ba-48e1-9b5e-424d2e8026fb))
-    (fp_line (start 7.75 6) (end 8 6) (layer "F.CrtYd") (width 0.05) (tstamp 787d9b69-cd48-49d6-8183-8adf587e14db))
-    (fp_line (start -1.5 5.75) (end -1.5 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp 9cf4610e-9e13-4f1a-88ea-16617e668730))
-    (fp_line (start -1.5 6) (end -1.25 6) (layer "F.CrtYd") (width 0.05) (tstamp afa4bb6b-3ade-4053-b86c-3b49dc84bbf2))
-    (fp_line (start 8 -1.25) (end 8 5.75) (layer "F.CrtYd") (width 0.05) (tstamp cae27ebb-57e7-4f92-996f-fdf954b8ea7f))
-    (fp_line (start -1.5 -1.5) (end -1.25 -1.5) (layer "F.CrtYd") (width 0.05) (tstamp cb4249ba-ddff-429d-b30a-13f426993623))
-    (fp_line (start -1.5 -1.25) (end -1.5 -1.5) (layer "F.CrtYd") (width 0.05) (tstamp efab33bf-d5e1-4a6f-9a61-783e6eceedc0))
-    (fp_line (start 0.25 5.25) (end 0.25 -0.75) (layer "F.Fab") (width 0.1) (tstamp 7eb219b6-b1b4-471f-bf8c-427ceab86699))
-    (fp_line (start 6.25 5.25) (end 0.25 5.25) (layer "F.Fab") (width 0.1) (tstamp ac883017-17f1-4996-b0c8-179647959ad9))
-    (fp_line (start 0.25 -0.75) (end 3.25 -0.75) (layer "F.Fab") (width 0.1) (tstamp c030617a-e4ad-4eb7-a7c6-5c4b023c3cf3))
-    (fp_line (start 6.25 -0.75) (end 6.25 5.25) (layer "F.Fab") (width 0.1) (tstamp c12ab690-57b4-49e5-acb3-2800632605fa))
-    (fp_line (start 3.25 -0.75) (end 6.25 -0.75) (layer "F.Fab") (width 0.1) (tstamp ccbb8ec6-4889-44b0-9c81-22183fccf238))
-    (fp_circle (center 3.25 2.25) (end 1.25 2.5) (layer "F.Fab") (width 0.1) (fill none) (tstamp 7ffdc979-185a-46a9-9a96-62b9cd270542))
-    (pad "1" thru_hole circle locked (at 6.5 0 90) (size 2 2) (drill 1.1) (layers *.Cu *.Mask)
-      (net 6 "GND") (pinfunction "A") (pintype "passive") (tstamp 5f0b68e2-d727-4495-b44b-628dcda0f448))
-    (pad "1" thru_hole circle locked (at 0 0 90) (size 2 2) (drill 1.1) (layers *.Cu *.Mask)
+    (fp_line (start -0.25 1.5) (end -0.25 3)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 04858689-9429-411d-8a5a-8a870e2b97b2))
+    (fp_line (start 1 5.5) (end 5.5 5.5)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3629bea9-2b4b-4f1e-b589-113c7d7ed2b0))
+    (fp_line (start 5.5 -1) (end 1 -1)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0101da6a-8bab-4612-9033-4bdb82c7b6f1))
+    (fp_line (start 6.75 3) (end 6.75 1.5)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 64ed83e0-a04d-41e3-92b9-70232edbf366))
+    (fp_line (start -1.5 -1.5) (end -1.25 -1.5)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cb4249ba-ddff-429d-b30a-13f426993623))
+    (fp_line (start -1.5 -1.25) (end -1.5 -1.5)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp efab33bf-d5e1-4a6f-9a61-783e6eceedc0))
+    (fp_line (start -1.5 5.75) (end -1.5 -1.25)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9cf4610e-9e13-4f1a-88ea-16617e668730))
+    (fp_line (start -1.5 5.75) (end -1.5 6)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 04b077cf-ddec-40a4-b90a-34f9cb10a29c))
+    (fp_line (start -1.5 6) (end -1.25 6)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp afa4bb6b-3ade-4053-b86c-3b49dc84bbf2))
+    (fp_line (start -1.25 -1.5) (end 7.75 -1.5)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2c0794e2-cee0-4e99-87a4-1b92fdfd89a7))
+    (fp_line (start 7.75 -1.5) (end 8 -1.5)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2511d466-969b-4b4c-9747-ad498ddd5ebb))
+    (fp_line (start 7.75 6) (end -1.25 6)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 190637d0-bb77-47e0-8247-5c3ded525f5b))
+    (fp_line (start 7.75 6) (end 8 6)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 787d9b69-cd48-49d6-8183-8adf587e14db))
+    (fp_line (start 8 -1.5) (end 8 -1.25)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 609ed665-e0ba-48e1-9b5e-424d2e8026fb))
+    (fp_line (start 8 -1.25) (end 8 5.75)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cae27ebb-57e7-4f92-996f-fdf954b8ea7f))
+    (fp_line (start 8 6) (end 8 5.75)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 503e4adb-4dfe-456d-834b-3179d137b83d))
+    (fp_line (start 0.25 -0.75) (end 3.25 -0.75)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c030617a-e4ad-4eb7-a7c6-5c4b023c3cf3))
+    (fp_line (start 0.25 5.25) (end 0.25 -0.75)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7eb219b6-b1b4-471f-bf8c-427ceab86699))
+    (fp_line (start 3.25 -0.75) (end 6.25 -0.75)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ccbb8ec6-4889-44b0-9c81-22183fccf238))
+    (fp_line (start 6.25 -0.75) (end 6.25 5.25)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c12ab690-57b4-49e5-acb3-2800632605fa))
+    (fp_line (start 6.25 5.25) (end 0.25 5.25)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ac883017-17f1-4996-b0c8-179647959ad9))
+    (fp_circle (center 3.25 2.25) (end 1.25 2.5)
+      (stroke (width 0.1) (type solid)) (fill none) (layer "F.Fab") (tstamp 7ffdc979-185a-46a9-9a96-62b9cd270542))
+    (pad "1" thru_hole circle (at 0 0 90) (size 2 2) (drill 1.1) (layers "*.Cu" "*.Mask")
       (net 6 "GND") (pinfunction "A") (pintype "passive") (tstamp 667e8c14-3e03-4e4a-a764-c145f8e7afe9))
-    (pad "2" thru_hole circle locked (at 6.5 4.5 90) (size 2 2) (drill 1.1) (layers *.Cu *.Mask)
-      (net 50 "Net-(R15-Pad1)") (pinfunction "B") (pintype "passive") (tstamp 5c1d6364-c8c1-441b-8c36-16b80efb6589))
-    (pad "2" thru_hole circle locked (at 0 4.5 90) (size 2 2) (drill 1.1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole circle (at 6.5 0 90) (size 2 2) (drill 1.1) (layers "*.Cu" "*.Mask")
+      (net 6 "GND") (pinfunction "A") (pintype "passive") (tstamp 5f0b68e2-d727-4495-b44b-628dcda0f448))
+    (pad "2" thru_hole circle (at 0 4.5 90) (size 2 2) (drill 1.1) (layers "*.Cu" "*.Mask")
       (net 50 "Net-(R15-Pad1)") (pinfunction "B") (pintype "passive") (tstamp bc6f50e3-ea77-4a99-8d69-aaf4693a271d))
+    (pad "2" thru_hole circle (at 6.5 4.5 90) (size 2 2) (drill 1.1) (layers "*.Cu" "*.Mask")
+      (net 50 "Net-(R15-Pad1)") (pinfunction "B") (pintype "passive") (tstamp 5c1d6364-c8c1-441b-8c36-16b80efb6589))
     (model "${KIPRJMOD}/Library/3D_Packages/SW_PUSH_6mm.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -580,7 +699,7 @@
   )
 
   (footprint "V0-Display:MountingHole_3.2mm_M3" (layer "F.Cu")
-    (tedit 56D1B4CB) (tstamp 24a5c04d-50df-4626-803d-0e64018ec999)
+    (tstamp 24a5c04d-50df-4626-803d-0e64018ec999)
     (at -3.55 55.65)
     (descr "Mounting Hole 3.2mm, no annular, M3")
     (tags "mounting hole 3.2mm no annular m3")
@@ -590,24 +709,26 @@
     (path "/ad539111-50b4-4775-902b-63ab9de8749f")
     (attr exclude_from_pos_files exclude_from_bom)
     (fp_text reference "H3" (at 0 -4.2) (layer "F.SilkS") hide
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp e2328dba-8114-4d37-b1bc-97dba882043c)
     )
     (fp_text value "M3" (at 0 4.2) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 27235a85-808b-4914-8014-6d09fee68923)
     )
     (fp_text user "${REFERENCE}" (at 0.3 0) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 0e024ecf-5504-4f31-9190-b6cb27c03236)
     )
-    (fp_circle (center 0 0) (end 3.2 0) (layer "Cmts.User") (width 0.15) (fill none) (tstamp c8cb5714-a7a4-490c-a466-4afdecf7ec1b))
-    (fp_circle (center 0 0) (end 3.45 0) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 767929b4-9fd0-4851-96ef-85a97d152fa8))
-    (pad "" np_thru_hole circle locked (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask) (tstamp 7e388f9f-3aac-4ed2-b6dd-8064aba1498f))
+    (fp_circle (center 0 0) (end 3.2 0)
+      (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp c8cb5714-a7a4-490c-a466-4afdecf7ec1b))
+    (fp_circle (center 0 0) (end 3.45 0)
+      (stroke (width 0.05) (type solid)) (fill none) (layer "F.CrtYd") (tstamp 767929b4-9fd0-4851-96ef-85a97d152fa8))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers "*.Cu" "*.Mask") (tstamp 7e388f9f-3aac-4ed2-b6dd-8064aba1498f))
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp 277f31bd-4dab-466c-a22a-b0e41fb0c044)
+    (tstamp 277f31bd-4dab-466c-a22a-b0e41fb0c044)
     (at 56.1 21.9 -90)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -616,27 +737,37 @@
     (path "/12cdaa58-9bee-42f2-86e7-35780a953e99")
     (attr smd)
     (fp_text reference "R7" (at 0 -1.65 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 390774a3-8793-4bfd-b92b-e04bc955eca6)
     )
     (fp_text value "1k" (at 0 1.65 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp c9ba473d-be31-439f-829a-fd95c5410bce)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 472a2895-7195-4678-a260-be0239dac964)
     )
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp 858ac12d-887c-4d7a-96a3-1200d59e6e99))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp b61f1a60-be56-4bfe-938a-c3067448e5df))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 305a95fa-39f7-4b0b-804c-74439851539b))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 4aab4206-2031-4f11-86af-855931d4e648))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 6c621aa6-5c84-41f1-b9c7-3ac24a8e6b32))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 937da7d5-4e73-4218-b306-418b2a6960b1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 05ad59d2-2fd9-41aa-ba11-5ebc16a217bb))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 32fc2ea0-d63e-43cc-81ee-fb526306eeb1))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 56999725-d67b-442f-9367-17ddb31d97d4))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp d4c17161-98b7-43d2-ae43-683bf883cb93))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b61f1a60-be56-4bfe-938a-c3067448e5df))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 858ac12d-887c-4d7a-96a3-1200d59e6e99))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6c621aa6-5c84-41f1-b9c7-3ac24a8e6b32))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4aab4206-2031-4f11-86af-855931d4e648))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 937da7d5-4e73-4218-b306-418b2a6960b1))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 305a95fa-39f7-4b0b-804c-74439851539b))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 05ad59d2-2fd9-41aa-ba11-5ebc16a217bb))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d4c17161-98b7-43d2-ae43-683bf883cb93))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 56999725-d67b-442f-9367-17ddb31d97d4))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 32fc2ea0-d63e-43cc-81ee-fb526306eeb1))
     (pad "1" smd roundrect (at -1 0 270) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 36 "Net-(J8-Pad2)") (pintype "passive") (tstamp aaed6544-c2af-4ed1-9cae-e5cae7ba0980))
     (pad "2" smd roundrect (at 1 0 270) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -649,7 +780,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp 2e58e007-7c5d-406a-8f35-1c093ac5d611)
+    (tstamp 2e58e007-7c5d-406a-8f35-1c093ac5d611)
     (at 73.3 21.9 -90)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -658,27 +789,37 @@
     (path "/b2fd770f-9ed4-4f7f-8811-d4b3053ec59e")
     (attr smd)
     (fp_text reference "R8" (at 0 -1.65 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 7c80c1ea-17cc-4ded-8ab8-8bbc93e4fe28)
     )
     (fp_text value "1k" (at 0 1.65 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp fdcace0d-e422-45c4-9c4e-088793079898)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 4067d091-440a-46b1-b3f3-1d0f78ee52d8)
     )
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp 1d596c03-c9a5-4a08-8741-dd807bbec9d6))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp b6afc1cf-beb1-4c77-8e17-ba9d7e8fe4e8))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 42a24960-b2df-4205-a22d-3a6ce74e633f))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 4566c69f-d8e1-4a7c-9bb5-cde35ac5ab53))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp a9953f74-d8f9-4a21-bc4c-9c483a2925a9))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp c2cdf233-efca-4d95-bd98-c4c53d10acd6))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 6152c9b8-2fc2-4f93-a7e3-5ec823bcd915))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 64cd347e-27eb-4430-96ec-2d0c86c89488))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp cb03b8ea-22cd-4fc9-ab77-8e922e11cfdb))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp d89b40a0-d01a-43f0-a735-b4a697398947))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b6afc1cf-beb1-4c77-8e17-ba9d7e8fe4e8))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1d596c03-c9a5-4a08-8741-dd807bbec9d6))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4566c69f-d8e1-4a7c-9bb5-cde35ac5ab53))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c2cdf233-efca-4d95-bd98-c4c53d10acd6))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a9953f74-d8f9-4a21-bc4c-9c483a2925a9))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 42a24960-b2df-4205-a22d-3a6ce74e633f))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6152c9b8-2fc2-4f93-a7e3-5ec823bcd915))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cb03b8ea-22cd-4fc9-ab77-8e922e11cfdb))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 64cd347e-27eb-4430-96ec-2d0c86c89488))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d89b40a0-d01a-43f0-a735-b4a697398947))
     (pad "1" smd roundrect (at -1 0 270) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 37 "Net-(J9-Pad2)") (pintype "passive") (tstamp 9100a97c-088a-4292-bdcf-4d3c9ac924e3))
     (pad "2" smd roundrect (at 1 0 270) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -691,7 +832,7 @@
   )
 
   (footprint "V0-Display:MountingHole_3.2mm_M3" (layer "F.Cu")
-    (tedit 56D1B4CB) (tstamp 3298fbd0-dae6-4ad8-9f0a-bfe4060274c6)
+    (tstamp 3298fbd0-dae6-4ad8-9f0a-bfe4060274c6)
     (at -11.5 55.65)
     (descr "Mounting Hole 3.2mm, no annular, M3")
     (tags "mounting hole 3.2mm no annular m3")
@@ -701,24 +842,26 @@
     (path "/7e89b309-b0a6-481a-bc25-5e051512a29e")
     (attr exclude_from_pos_files exclude_from_bom)
     (fp_text reference "H2" (at 0 -4.2) (layer "F.SilkS") hide
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 8bbc6dfd-3159-4241-b2ba-46de47001ba8)
     )
     (fp_text value "M3" (at 0 4.2) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 6ea23087-9a69-476a-ba92-6f01f3c2bff5)
     )
     (fp_text user "${REFERENCE}" (at 0.3 0) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 2c8a171a-d11c-456c-a03c-3a750e63534a)
     )
-    (fp_circle (center 0 0) (end 3.2 0) (layer "Cmts.User") (width 0.15) (fill none) (tstamp dffd8adf-aee4-4be4-b0d1-85ed27cb8779))
-    (fp_circle (center 0 0) (end 3.45 0) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 7318b7ab-8a13-43cf-91f1-50737423f1a5))
-    (pad "" np_thru_hole circle locked (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask) (tstamp 81a63429-8a5e-4c2e-aadc-4f01f2d73515))
+    (fp_circle (center 0 0) (end 3.2 0)
+      (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp dffd8adf-aee4-4be4-b0d1-85ed27cb8779))
+    (fp_circle (center 0 0) (end 3.45 0)
+      (stroke (width 0.05) (type solid)) (fill none) (layer "F.CrtYd") (tstamp 7318b7ab-8a13-43cf-91f1-50737423f1a5))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers "*.Cu" "*.Mask") (tstamp 81a63429-8a5e-4c2e-aadc-4f01f2d73515))
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEF) (tstamp 3539dbf5-5a25-4069-9d78-84c7980bf2d7)
+    (tstamp 3539dbf5-5a25-4069-9d78-84c7980bf2d7)
     (at 75.8 21.9 90)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -727,27 +870,37 @@
     (path "/55c18011-1439-45a8-b154-7ac20505faf8")
     (attr smd)
     (fp_text reference "C7" (at 0 -1.68 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp f78eeff8-d546-4acb-82c5-57f64d5ba734)
     )
     (fp_text value "100n" (at 0 1.68 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 77942973-b3f5-4eb6-b08a-83bc94157840)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 226ff6a4-0b20-4fb3-91a1-820ff0d18122)
     )
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "F.SilkS") (width 0.12) (tstamp 3c984b4e-d63b-45a2-a252-1ae8199c62fd))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 4516e1d7-a55f-4251-9995-12b36a6cebfe))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 0fec08aa-7dee-435b-a8be-4cc7bdbef51b))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 1dd582fb-bf4a-47c4-b51f-88e12e1828b8))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp b7963295-4b9b-4df3-81da-222d73d691c4))
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp ed04e4b5-e4b3-4c13-a045-36642794828a))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 1d1bbe29-ace4-4aa4-848b-cc149e493767))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 2277eb44-be4b-42ad-877e-d7d8e2d290bb))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp abc8e61b-efe8-4efc-a4c0-0177f13de8ee))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp c930637a-14da-4180-83d1-f2a2979c8204))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4516e1d7-a55f-4251-9995-12b36a6cebfe))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3c984b4e-d63b-45a2-a252-1ae8199c62fd))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1dd582fb-bf4a-47c4-b51f-88e12e1828b8))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b7963295-4b9b-4df3-81da-222d73d691c4))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0fec08aa-7dee-435b-a8be-4cc7bdbef51b))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ed04e4b5-e4b3-4c13-a045-36642794828a))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp abc8e61b-efe8-4efc-a4c0-0177f13de8ee))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2277eb44-be4b-42ad-877e-d7d8e2d290bb))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1d1bbe29-ace4-4aa4-848b-cc149e493767))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c930637a-14da-4180-83d1-f2a2979c8204))
     (pad "1" smd roundrect (at -1.0375 0 90) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
       (net 10 "KEY4") (pintype "passive") (tstamp 26068c96-b68d-4dd0-865c-8db478dcc1e1))
     (pad "2" smd roundrect (at 1.0375 0 90) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
@@ -760,7 +913,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEF) (tstamp 37950f4c-06ff-4941-a235-48eaf1d43a0e)
+    (tstamp 37950f4c-06ff-4941-a235-48eaf1d43a0e)
     (at 32.8 40.7)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -769,27 +922,37 @@
     (path "/71100107-b8b2-4f05-9bc3-d8fdf218ea0c")
     (attr smd)
     (fp_text reference "C5" (at 0 -1.68) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 3e017c59-d519-4027-9539-2427586b298b)
     )
     (fp_text value "4u7" (at 0 1.68) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 263cf673-572a-4398-8a27-30f2da98273f)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 23b867b3-3660-4f52-aaf7-c3571e73d5a2)
     )
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 313dd988-f5fb-49ed-bd20-686a3d0a809b))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "F.SilkS") (width 0.12) (tstamp 9f95f374-8d41-43d2-ba56-07d1a3672f91))
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 1d553f52-da39-48b0-8086-6ad72528d0e9))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 31b15af5-b959-4f6b-9d80-3756425a17b1))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp a2f4fd83-d122-4a61-a320-17d4e17dc4e7))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp cd97b49c-6b3d-439e-8697-dba362483046))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 286da2bb-9161-439a-ae03-9be7c7ffe09c))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 66f72755-62c6-4cbf-8720-7379846eeb50))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 7180de2b-8e1d-4d8b-8790-ca7df05fd7a0))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp df3a2138-9e8c-4eb0-9fa4-c775e46b131f))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 313dd988-f5fb-49ed-bd20-686a3d0a809b))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9f95f374-8d41-43d2-ba56-07d1a3672f91))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cd97b49c-6b3d-439e-8697-dba362483046))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a2f4fd83-d122-4a61-a320-17d4e17dc4e7))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 31b15af5-b959-4f6b-9d80-3756425a17b1))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1d553f52-da39-48b0-8086-6ad72528d0e9))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 286da2bb-9161-439a-ae03-9be7c7ffe09c))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 66f72755-62c6-4cbf-8720-7379846eeb50))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp df3a2138-9e8c-4eb0-9fa4-c775e46b131f))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7180de2b-8e1d-4d8b-8790-ca7df05fd7a0))
     (pad "1" smd roundrect (at -1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
       (net 1 "VBUS") (pintype "passive") (tstamp 694fb752-57f0-4b85-9547-0a1e9a320075))
     (pad "2" smd roundrect (at 1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
@@ -802,7 +965,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEF) (tstamp 46be41ca-ed2a-4c98-9d75-ba03ea99b668)
+    (tstamp 46be41ca-ed2a-4c98-9d75-ba03ea99b668)
     (at -13.845 11.51)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -811,27 +974,37 @@
     (path "/0182be02-3c04-4b29-8d23-d639ca1cffef")
     (attr smd)
     (fp_text reference "C12" (at 0 -1.68) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp d1088d0e-a0f9-465c-bd4b-9b26deee86be)
     )
     (fp_text value "10n" (at 0 1.68) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp a8c3da64-6d9d-4259-aa9a-1f7b1b4c2089)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 9a920320-2c31-45e1-9872-def0424c1bf4)
     )
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "F.SilkS") (width 0.12) (tstamp 1ddb32f5-803e-48c7-912c-48b0a4da2056))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 5468424b-4eeb-4de7-9f9d-b649b9199f4c))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 0ba7721b-5503-4159-b31d-c51230679571))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 3f101e8b-b748-4fa1-86fd-5de11c62dc28))
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp e6162b3e-a9f5-4062-84e9-e4756eec603a))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp fe6f338b-c070-46ce-a27e-2e2776408244))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 25dae0a4-9dae-4c62-afe6-d7b156597cc9))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 2cc115de-3905-4756-84e9-7e35fc4e50ec))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 75fda47e-86ba-4763-9f95-05bb7acbe98d))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp cfdb5532-c617-40f4-97be-f9d3fc239cd5))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 5468424b-4eeb-4de7-9f9d-b649b9199f4c))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 1ddb32f5-803e-48c7-912c-48b0a4da2056))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3f101e8b-b748-4fa1-86fd-5de11c62dc28))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fe6f338b-c070-46ce-a27e-2e2776408244))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0ba7721b-5503-4159-b31d-c51230679571))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e6162b3e-a9f5-4062-84e9-e4756eec603a))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 75fda47e-86ba-4763-9f95-05bb7acbe98d))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2cc115de-3905-4756-84e9-7e35fc4e50ec))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 25dae0a4-9dae-4c62-afe6-d7b156597cc9))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cfdb5532-c617-40f4-97be-f9d3fc239cd5))
     (pad "1" smd roundrect (at -1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
       (net 14 "+3.3VA") (pintype "passive") (tstamp 1ca4672f-8d6d-4485-bdf8-dcbbfa7b297b))
     (pad "2" smd roundrect (at 1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
@@ -844,7 +1017,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp 4d87ae20-ece1-4f6f-9f5f-28be3db57363)
+    (tstamp 4d87ae20-ece1-4f6f-9f5f-28be3db57363)
     (at 22.6 68.7)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -853,27 +1026,37 @@
     (path "/f093ea88-d206-4ea7-942c-9fb8678e2183")
     (attr smd)
     (fp_text reference "R14" (at 0 -1.65) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp d82e7ae2-12a2-48f8-b1b4-a5a5825786cd)
     )
     (fp_text value "10k" (at 0 1.65) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp b47db2f5-ed39-4ab5-a0ac-dedf71e4960d)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 5e2f478e-949c-4a41-bee5-220d5f57e3de)
     )
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 433e19e8-94b4-4400-80c4-3896d1929dd1))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp fd6ba30f-e0df-491d-856d-501a75064a25))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 001318d0-3298-4a61-9c0a-c7908061407c))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 192f7314-5ee5-40ae-8240-cf31c3b232fc))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 451cf762-b3ff-408e-8af6-fcf09cf40a36))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 9571a072-79f1-4c27-914a-e2c00cba66d6))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 3ce74584-8ac7-4bbf-9b71-de53fc546518))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 5124b899-307e-4a9b-b676-e4e92f81adda))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 73f9f274-c603-442a-8a15-f1ad436aa7a3))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp ab26bee3-96d0-4cba-bddb-a32fff385fd7))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 433e19e8-94b4-4400-80c4-3896d1929dd1))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp fd6ba30f-e0df-491d-856d-501a75064a25))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 001318d0-3298-4a61-9c0a-c7908061407c))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9571a072-79f1-4c27-914a-e2c00cba66d6))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 192f7314-5ee5-40ae-8240-cf31c3b232fc))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 451cf762-b3ff-408e-8af6-fcf09cf40a36))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ab26bee3-96d0-4cba-bddb-a32fff385fd7))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5124b899-307e-4a9b-b676-e4e92f81adda))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 73f9f274-c603-442a-8a15-f1ad436aa7a3))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3ce74584-8ac7-4bbf-9b71-de53fc546518))
     (pad "1" smd roundrect (at -1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 6 "GND") (pintype "passive") (tstamp 9d474994-aa7c-49ca-b4fe-db4aa9f28cc2))
     (pad "2" smd roundrect (at 1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -886,7 +1069,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp 55d838f4-ac38-47f1-b312-aac7860375ef)
+    (tstamp 55d838f4-ac38-47f1-b312-aac7860375ef)
     (at 27.7 7.9)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -895,27 +1078,37 @@
     (path "/c56ef126-34f0-4c7f-aa2f-5961df1a0cdb")
     (attr smd)
     (fp_text reference "R11" (at 0 -1.65) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 04c93c02-6f58-4aee-9369-9c09c714f777)
     )
     (fp_text value "22" (at 0 1.65) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 56e0b7d3-6478-437c-80a5-db457032dbb3)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 3d5b283b-b7e4-41af-b491-dc5c9c397569)
     )
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp b88e61a4-c62f-4c61-89cf-914e59c247ef))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp f6ca0c26-da6c-4366-8fef-d0f3c9610cd3))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 7472cc29-8a9f-4425-8934-2248a34b013f))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp a54bc2ea-af9c-4e82-98da-d5e0abe009c6))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp bcfb7c8c-85e7-4078-b9e0-b0c58ba29dd9))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp cf6ac8db-cb56-4593-b21f-59737507dc8c))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 246b7e9d-cd12-4cfa-ae3a-6384260892ee))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 54ee7215-adb9-4f59-889e-b811ffc3ebe4))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 5d10c128-5c77-4770-8a85-81377ecb21c4))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 7573ce01-82a3-462f-bfb6-6ba984098ca6))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f6ca0c26-da6c-4366-8fef-d0f3c9610cd3))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b88e61a4-c62f-4c61-89cf-914e59c247ef))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp bcfb7c8c-85e7-4078-b9e0-b0c58ba29dd9))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a54bc2ea-af9c-4e82-98da-d5e0abe009c6))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7472cc29-8a9f-4425-8934-2248a34b013f))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cf6ac8db-cb56-4593-b21f-59737507dc8c))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5d10c128-5c77-4770-8a85-81377ecb21c4))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7573ce01-82a3-462f-bfb6-6ba984098ca6))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 54ee7215-adb9-4f59-889e-b811ffc3ebe4))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 246b7e9d-cd12-4cfa-ae3a-6384260892ee))
     (pad "1" smd roundrect (at -1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 13 "Net-(C10-Pad1)") (pintype "passive") (tstamp 7585736b-13c3-4283-b7aa-403631579751))
     (pad "2" smd roundrect (at 1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -928,7 +1121,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp 574ebd94-9b6a-4503-b1e1-a919274d0491)
+    (tstamp 574ebd94-9b6a-4503-b1e1-a919274d0491)
     (at 12.5 6.8)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -937,27 +1130,37 @@
     (path "/4e14649c-4bdd-46c5-91bf-f5c4ac2529f5")
     (attr smd)
     (fp_text reference "R1" (at 0 -1.65) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp d302417b-b832-454e-baf4-9dcd404f4a4b)
     )
     (fp_text value "4k7" (at 0 1.65) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp fe90bd78-40ea-46bd-a9cb-7e9536ff6728)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 5dae3ae3-fbe4-4939-ab1b-b6f9919cad36)
     )
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 36a0ecd3-aab5-42ba-a508-8b77623d8a0c))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp a03c9372-935f-4740-87f6-52830bc1f8c9))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 08796647-ad50-4a09-9390-27a12ff97210))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 09e9a5b8-3dc8-49b7-afdb-dcccbe838ab3))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 3982a2e4-6c8b-4edc-baf1-5a7e1025146c))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 57e52e3a-e59b-49c3-800b-26d4c3913ae7))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 5ed9afc3-e76c-4635-a5a8-cd0bcd08363a))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 719a80d9-de30-4d7c-a110-d7286e8f75b5))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 9e815f4f-69ed-47c8-80d7-29f23ca27423))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp f6ec8720-783a-4f25-b9e3-51f85b31d102))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 36a0ecd3-aab5-42ba-a508-8b77623d8a0c))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a03c9372-935f-4740-87f6-52830bc1f8c9))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 57e52e3a-e59b-49c3-800b-26d4c3913ae7))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 09e9a5b8-3dc8-49b7-afdb-dcccbe838ab3))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 08796647-ad50-4a09-9390-27a12ff97210))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3982a2e4-6c8b-4edc-baf1-5a7e1025146c))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 719a80d9-de30-4d7c-a110-d7286e8f75b5))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f6ec8720-783a-4f25-b9e3-51f85b31d102))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9e815f4f-69ed-47c8-80d7-29f23ca27423))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5ed9afc3-e76c-4635-a5a8-cd0bcd08363a))
     (pad "1" smd roundrect (at -1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 14 "+3.3VA") (pintype "passive") (tstamp a8ff29dd-2d8f-460f-ad3c-e508ad9a6d7c))
     (pad "2" smd roundrect (at 1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -970,7 +1173,7 @@
   )
 
   (footprint "my_additions:Buzzer_5020" (layer "F.Cu")
-    (tedit 0) (tstamp 5758b0e6-6faa-4bc1-adbc-21bdbc30f297)
+    (tstamp 5758b0e6-6faa-4bc1-adbc-21bdbc30f297)
     (at 90 40.4)
     (descr "Buzzer 5x5x2mm 2-4v")
     (tags "buzzer 5020")
@@ -979,20 +1182,27 @@
     (path "/b44a8399-57cd-4ddf-965e-74b1b323dbfe")
     (attr smd)
     (fp_text reference "BZ1" (at -0.1 -3.5 unlocked) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp f3e13177-6b1b-4786-a00a-12f054d444ab)
     )
     (fp_text value "5020 buzzer" (at 0 3.7 unlocked) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 05424f51-97a2-451f-8b17-c3f149f487dd)
     )
-    (fp_line (start -2.6 2.6) (end 2.6 2.6) (layer "F.SilkS") (width 0.12) (tstamp 0f4856a3-65ec-43bf-83ff-61f45c811c91))
-    (fp_line (start 2.6 -1.6) (end 2.6 0.9) (layer "F.SilkS") (width 0.12) (tstamp 2bd2b6fc-9250-4691-b98c-17574329572b))
-    (fp_line (start -2.6 0.9) (end -2.6 -0.9) (layer "F.SilkS") (width 0.12) (tstamp 78c44db4-21f7-49fe-8af0-ab97e8fa7728))
-    (fp_line (start -2.6 -2.6) (end 1.6 -2.6) (layer "F.SilkS") (width 0.12) (tstamp bdba861b-8c54-47cb-a64c-84c3f464553c))
-    (fp_line (start 1.6 -2.6) (end 2.6 -1.6) (layer "F.SilkS") (width 0.12) (tstamp eb7c90f2-6870-4bf8-8a3c-7c48cc595b75))
-    (fp_circle (center 0 -1.15) (end 0.4 -1.15) (layer "F.SilkS") (width 0.12) (fill none) (tstamp 853ed5d1-15de-4c09-b9fe-4788c4869186))
-    (fp_rect (start -2.8 -2.8) (end 2.8 2.8) (layer "F.CrtYd") (width 0.12) (fill none) (tstamp 76c802f8-6131-47a9-9564-efdbfba45984))
+    (fp_line (start -2.6 -2.6) (end 1.6 -2.6)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp bdba861b-8c54-47cb-a64c-84c3f464553c))
+    (fp_line (start -2.6 0.9) (end -2.6 -0.9)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 78c44db4-21f7-49fe-8af0-ab97e8fa7728))
+    (fp_line (start -2.6 2.6) (end 2.6 2.6)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0f4856a3-65ec-43bf-83ff-61f45c811c91))
+    (fp_line (start 1.6 -2.6) (end 2.6 -1.6)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp eb7c90f2-6870-4bf8-8a3c-7c48cc595b75))
+    (fp_line (start 2.6 -1.6) (end 2.6 0.9)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2bd2b6fc-9250-4691-b98c-17574329572b))
+    (fp_circle (center 0 -1.15) (end 0.4 -1.15)
+      (stroke (width 0.12) (type solid)) (fill none) (layer "F.SilkS") (tstamp 853ed5d1-15de-4c09-b9fe-4788c4869186))
+    (fp_rect (start -2.8 -2.8) (end 2.8 2.8)
+      (stroke (width 0.12) (type solid)) (fill none) (layer "F.CrtYd") (tstamp 76c802f8-6131-47a9-9564-efdbfba45984))
     (pad "" smd rect (at -2.25 -1.75) (size 2.5 1.2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp f33f05f5-4518-43af-854c-a17f8c97b3ef))
     (pad "1" smd rect (at -2.25 1.75) (size 2.5 1.2) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 12 "+3.3V") (pinfunction "-") (pintype "passive") (tstamp 8afae9c6-6bd7-4d04-be23-c4dad8a88bcc))
@@ -1006,7 +1216,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp 579eaeaf-07a3-422b-bfb9-b08ae35dec74)
+    (tstamp 579eaeaf-07a3-422b-bfb9-b08ae35dec74)
     (at 68.9 61.8)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -1015,27 +1225,37 @@
     (path "/2203af60-7987-405b-aae5-f77eb2351ca4")
     (attr smd)
     (fp_text reference "R13" (at 0 -1.65) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp a97db2b6-4153-4034-91c4-de68a5a0c62e)
     )
     (fp_text value "10k" (at 0 1.65) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 819bea74-01ad-493f-873b-03b51a979dd7)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 205304b8-31df-4c6e-9e11-4e470c516d01)
     )
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp 07378a51-5782-4ede-b814-55d74aedf0e3))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp f7b7d6fe-55c0-418f-8dc9-d65b6ef2eb30))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 238504d4-6f69-4175-b104-f9c1f4a1e1c3))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 5716b04c-9700-47b1-900e-53c7bbd5f149))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 70a30369-96c9-4e2f-b2de-8a7a82c47266))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 98f7d741-238f-4951-8a86-857151df3b77))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 5d422056-c25e-45f4-9ef7-ae88eec6cd65))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 79ae806f-1414-4fa2-b2a8-c892433bc5dc))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 8d1e2efa-e147-4356-8c80-73b956182c13))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp ecf111bb-966b-4351-92da-61c76799a4ba))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f7b7d6fe-55c0-418f-8dc9-d65b6ef2eb30))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 07378a51-5782-4ede-b814-55d74aedf0e3))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5716b04c-9700-47b1-900e-53c7bbd5f149))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 238504d4-6f69-4175-b104-f9c1f4a1e1c3))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 98f7d741-238f-4951-8a86-857151df3b77))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 70a30369-96c9-4e2f-b2de-8a7a82c47266))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8d1e2efa-e147-4356-8c80-73b956182c13))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 79ae806f-1414-4fa2-b2a8-c892433bc5dc))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5d422056-c25e-45f4-9ef7-ae88eec6cd65))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ecf111bb-966b-4351-92da-61c76799a4ba))
     (pad "1" smd roundrect (at -1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 33 "RESET") (pintype "passive") (tstamp 76f30d9f-f947-4630-9140-29d8220d0398))
     (pad "2" smd roundrect (at 1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -1048,7 +1268,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEF) (tstamp 5b789105-ddfb-40e4-a559-37d24d535592)
+    (tstamp 5b789105-ddfb-40e4-a559-37d24d535592)
     (at 17.7625 2.3)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -1057,27 +1277,37 @@
     (path "/d6219088-e289-4805-b29d-6e612c2f5dbb")
     (attr smd)
     (fp_text reference "C1" (at 0 -1.68) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp a5ee17a4-aee1-4813-b359-02de719340e4)
     )
     (fp_text value "10u" (at 0 1.68) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp d18944dd-6965-4464-a2e9-24262658c8a4)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 12e0d041-bc4c-4545-99ce-bcb0e5a490ff)
     )
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "F.SilkS") (width 0.12) (tstamp 6a844129-7eb0-4316-8d54-889cd3a4e7bc))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 85f46488-622a-497e-aa8a-7a5f978efe92))
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 0d087af4-2441-47a5-9290-35bfe9304cdc))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 378da7e1-8cc4-4b25-b626-8a55c0a42f83))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 86911394-06bd-4b43-a3d9-135cf5b36fd6))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp c8d98095-cc55-4fea-ad4b-fe4c10425f49))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 183b2e20-a0f1-4307-851d-33ac732d80cf))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 6f1d91f2-7827-4d5b-b74f-78b8b5fc2119))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 8fdb0038-83d2-4a26-9122-7dff9d525e7b))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp fe39e996-96de-4b4d-bd06-e97d197f78c5))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 85f46488-622a-497e-aa8a-7a5f978efe92))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6a844129-7eb0-4316-8d54-889cd3a4e7bc))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c8d98095-cc55-4fea-ad4b-fe4c10425f49))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 86911394-06bd-4b43-a3d9-135cf5b36fd6))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 378da7e1-8cc4-4b25-b626-8a55c0a42f83))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0d087af4-2441-47a5-9290-35bfe9304cdc))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 183b2e20-a0f1-4307-851d-33ac732d80cf))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp fe39e996-96de-4b4d-bd06-e97d197f78c5))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8fdb0038-83d2-4a26-9122-7dff9d525e7b))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6f1d91f2-7827-4d5b-b74f-78b8b5fc2119))
     (pad "1" smd roundrect (at -1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
       (net 3 "Net-(C1-Pad1)") (pintype "passive") (tstamp 4d3b98d6-b43b-44f1-98b3-03d030848348))
     (pad "2" smd roundrect (at 1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
@@ -1090,7 +1320,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEF) (tstamp 5c3efc0a-1890-44dc-a2e7-2ebaa412bb75)
+    (tstamp 5c3efc0a-1890-44dc-a2e7-2ebaa412bb75)
     (at 93 21.9 90)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -1099,27 +1329,37 @@
     (path "/2634f930-c051-4253-98ff-1060e13d43a6")
     (attr smd)
     (fp_text reference "C8" (at 0 -1.68 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp b99ea08d-8ef7-4894-9c07-7acce5720a82)
     )
     (fp_text value "100n" (at 0 1.68 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 475e49b3-0ad4-4143-b64f-6e7808ea411a)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp a439c1ad-e37a-4ddc-8672-51958564fd5e)
     )
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "F.SilkS") (width 0.12) (tstamp 2d7cf184-661b-49a5-8c46-9c9fe7c4bcd3))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "F.SilkS") (width 0.12) (tstamp ae3e664d-eb44-4e2e-af86-6e94f0ad74b4))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 0215055e-4c0b-445f-af47-528836da779a))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 283124bf-88e9-4277-ac70-dcef25cdd2dd))
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 655612a2-f7e8-4018-b1c6-1998a3fa96b6))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 69c51a9f-5939-46e9-9522-7e307d10da89))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 26623a30-1c16-4357-8b0b-11ee87bea5b8))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 62009e60-503a-412d-8f46-a4a2d690ffcd))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp a74c7398-8f9f-46ad-9d9a-b41384a2915c))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp ad3b9838-187f-49ff-81c3-8fcd4c170962))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ae3e664d-eb44-4e2e-af86-6e94f0ad74b4))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2d7cf184-661b-49a5-8c46-9c9fe7c4bcd3))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 69c51a9f-5939-46e9-9522-7e307d10da89))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0215055e-4c0b-445f-af47-528836da779a))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 283124bf-88e9-4277-ac70-dcef25cdd2dd))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 655612a2-f7e8-4018-b1c6-1998a3fa96b6))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ad3b9838-187f-49ff-81c3-8fcd4c170962))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 26623a30-1c16-4357-8b0b-11ee87bea5b8))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a74c7398-8f9f-46ad-9d9a-b41384a2915c))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 62009e60-503a-412d-8f46-a4a2d690ffcd))
     (pad "1" smd roundrect (at -1.0375 0 90) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
       (net 11 "KEY6") (pintype "passive") (tstamp a8291219-6139-4aee-8e36-e1e94b2941bc))
     (pad "2" smd roundrect (at 1.0375 0 90) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
@@ -1132,7 +1372,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEF) (tstamp 69399db8-2bfe-4635-95c4-c77a006fcd22)
+    (tstamp 69399db8-2bfe-4635-95c4-c77a006fcd22)
     (at -18.655 11.51)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -1141,27 +1381,37 @@
     (path "/16c99d6e-8612-450a-8042-d10277374099")
     (attr smd)
     (fp_text reference "C11" (at 0 -1.68) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp d7ed672a-776a-4d37-8952-ac92e6d1ad90)
     )
     (fp_text value "100n" (at 0 1.68) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 197a5096-1b93-48db-bc67-b3dbbf7406e2)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 103b2804-9838-472c-bb86-22ecd22619d4)
     )
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "F.SilkS") (width 0.12) (tstamp 6b472084-9de1-4080-ae80-767caac949cf))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "F.SilkS") (width 0.12) (tstamp a95a58b1-7266-4b24-aae8-2662844c4c50))
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 0bd45334-8979-45a1-b2a6-3d6eafeacd5c))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp b2ec2940-4340-40e1-b614-a4825daeb345))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp d1ae91da-9726-433f-9041-43c60a84a71e))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp ee024f02-48c5-4f3c-b134-7c37caa76360))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 0b791192-a95b-4cd6-a280-a03ebeb25cc1))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 2d8a3729-ea37-4e6e-8ba2-1fb23de34da6))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 3c0bc5c0-4c5c-4b9a-bf02-f5ba89ed18db))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 994bc044-a341-41d5-ae90-cc5d7dabcd92))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a95a58b1-7266-4b24-aae8-2662844c4c50))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6b472084-9de1-4080-ae80-767caac949cf))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d1ae91da-9726-433f-9041-43c60a84a71e))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b2ec2940-4340-40e1-b614-a4825daeb345))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ee024f02-48c5-4f3c-b134-7c37caa76360))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0bd45334-8979-45a1-b2a6-3d6eafeacd5c))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2d8a3729-ea37-4e6e-8ba2-1fb23de34da6))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0b791192-a95b-4cd6-a280-a03ebeb25cc1))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3c0bc5c0-4c5c-4b9a-bf02-f5ba89ed18db))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 994bc044-a341-41d5-ae90-cc5d7dabcd92))
     (pad "1" smd roundrect (at -1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
       (net 14 "+3.3VA") (pintype "passive") (tstamp e08b54b7-7f39-4a79-b9f7-70fa177a8dad))
     (pad "2" smd roundrect (at 1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
@@ -1174,7 +1424,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEF) (tstamp 6f8eefca-d330-498f-a9da-6369551d6d57)
+    (tstamp 6f8eefca-d330-498f-a9da-6369551d6d57)
     (at 67.2 21.9 90)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -1183,27 +1433,37 @@
     (path "/6c384690-4e87-4670-9124-304909d7a075")
     (attr smd)
     (fp_text reference "C3" (at 0 -1.68 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 5e88866f-3802-4b50-96f3-c596d776b833)
     )
     (fp_text value "100n" (at 0 1.68 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 9749932b-6e8e-4382-8ada-9c04a04fc521)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "B.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+        (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
       (tstamp 4f559826-8d2b-44b4-a2a9-60e55be09370)
     )
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 13c38e2c-3c2c-40db-b481-7b84fb5f0076))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "F.SilkS") (width 0.12) (tstamp c152bf41-f1f0-4f1d-b693-b2d057c04bb5))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 04984350-6dcb-4ed4-ab98-c694b9c942c1))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 09f78d98-4041-4d55-bc74-a5dc0cbd6c3f))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 3a29dd21-4f62-4275-b015-cea09f825e77))
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp ae31b059-af3b-4fe2-9a2e-feb94ab23fcf))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 2f053783-15f2-4fa0-a83c-7babf5daf84d))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 7f2727e7-d5f7-407e-9d20-53b06b2a6500))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp c566d1c3-ad89-46ff-8135-e513dc7c7ab7))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp cd28a7d3-9b2b-4e07-b16e-9e1865ac6db6))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 13c38e2c-3c2c-40db-b481-7b84fb5f0076))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c152bf41-f1f0-4f1d-b693-b2d057c04bb5))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3a29dd21-4f62-4275-b015-cea09f825e77))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 04984350-6dcb-4ed4-ab98-c694b9c942c1))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 09f78d98-4041-4d55-bc74-a5dc0cbd6c3f))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ae31b059-af3b-4fe2-9a2e-feb94ab23fcf))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2f053783-15f2-4fa0-a83c-7babf5daf84d))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7f2727e7-d5f7-407e-9d20-53b06b2a6500))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c566d1c3-ad89-46ff-8135-e513dc7c7ab7))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cd28a7d3-9b2b-4e07-b16e-9e1865ac6db6))
     (pad "1" smd roundrect (at -1.0375 0 90) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
       (net 7 "KEY3") (pintype "passive") (tstamp e8d1dbed-2f5f-4413-ad66-c7b16cb86e70))
     (pad "2" smd roundrect (at 1.0375 0 90) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
@@ -1216,7 +1476,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp 84fe4c46-1d22-41ad-9f12-b73d1f351a86)
+    (tstamp 84fe4c46-1d22-41ad-9f12-b73d1f351a86)
     (at 91.1 52.8)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -1225,27 +1485,37 @@
     (path "/f57e89c9-260f-4d11-93b4-f2c294de59ac")
     (attr smd)
     (fp_text reference "R16" (at 0 -1.65) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 152b868f-80a1-4919-b78e-13d975c7e8c3)
     )
     (fp_text value "100" (at 0 1.65) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 614c9833-27b4-4a82-a113-1267c6447c6e)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp fadc8bbd-15a3-40c4-8dfd-8a22d71bde7e)
     )
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 23b86005-0877-4719-89ea-e914783d2721))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp 35f06cce-76ef-421d-b02b-999d268eabae))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 12c72b24-b635-4445-979a-e280624e9586))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 3c343b45-042d-4960-92a9-e806a2748f6c))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 5a429609-2046-4f42-ae7b-55b230dcce91))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 61a0fd88-9d91-4def-b6b7-64c4390e693b))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 05e57911-cd15-4d9f-ae24-b1db7ff7bdbc))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 56f90ff3-5aa0-422e-b9b0-983b8e06d5d1))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp a6ba9772-5536-44d2-a356-032fb5822271))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp c868a739-bd22-4ede-8181-fd79ca1cf5a4))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 23b86005-0877-4719-89ea-e914783d2721))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 35f06cce-76ef-421d-b02b-999d268eabae))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 61a0fd88-9d91-4def-b6b7-64c4390e693b))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 12c72b24-b635-4445-979a-e280624e9586))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5a429609-2046-4f42-ae7b-55b230dcce91))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3c343b45-042d-4960-92a9-e806a2748f6c))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 56f90ff3-5aa0-422e-b9b0-983b8e06d5d1))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a6ba9772-5536-44d2-a356-032fb5822271))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 05e57911-cd15-4d9f-ae24-b1db7ff7bdbc))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c868a739-bd22-4ede-8181-fd79ca1cf5a4))
     (pad "1" smd roundrect (at -1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 48 "Net-(Q1-Pad1)") (pintype "passive") (tstamp 05373c6d-7020-4666-ab2d-a852a0320f7b))
     (pad "2" smd roundrect (at 1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -1258,7 +1528,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp 87265739-37dd-4e7d-bcd4-5d6fd2c6038c)
+    (tstamp 87265739-37dd-4e7d-bcd4-5d6fd2c6038c)
     (at 90.5 21.9 -90)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -1267,27 +1537,37 @@
     (path "/13a2de41-44f2-40c7-9a2c-e9123f1d1d63")
     (attr smd)
     (fp_text reference "R9" (at 0 -1.65 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 5cfd65dc-6a16-4753-9e17-20434a943cf7)
     )
     (fp_text value "1k" (at 0 1.65 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 4dd256aa-dfb3-41a2-923e-8e921bcedb9a)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp f8e41ebf-aa3a-43a0-8cbe-444ebfc13f15)
     )
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp cb0a8d5b-0a72-4378-ae5e-1e483ca2a50f))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp cd76ec25-7dee-4973-ac86-0221386f4eb7))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 0336ea9e-5043-4c26-84c6-aea9dd89afab))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 04131029-f56d-417d-b146-81df563750ab))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 26d708f8-5045-4f3c-9d66-9962ee723e38))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp fb6871dc-3d29-42ae-b20a-532582318a38))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 19f57d18-7562-4033-b177-1bce185a5e26))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 73949bb6-6c78-4ad7-b322-25856bb8a253))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp d176fa6d-09d1-4d7c-bc9b-5da2bb2131a2))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp e8f7cde6-b84d-4475-b44f-ddc27c445f98))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cb0a8d5b-0a72-4378-ae5e-1e483ca2a50f))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cd76ec25-7dee-4973-ac86-0221386f4eb7))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 04131029-f56d-417d-b146-81df563750ab))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0336ea9e-5043-4c26-84c6-aea9dd89afab))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fb6871dc-3d29-42ae-b20a-532582318a38))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 26d708f8-5045-4f3c-9d66-9962ee723e38))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d176fa6d-09d1-4d7c-bc9b-5da2bb2131a2))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e8f7cde6-b84d-4475-b44f-ddc27c445f98))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 73949bb6-6c78-4ad7-b322-25856bb8a253))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 19f57d18-7562-4033-b177-1bce185a5e26))
     (pad "1" smd roundrect (at -1 0 270) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 38 "Net-(J10-Pad2)") (pintype "passive") (tstamp 010c677f-9e89-40e8-9eb2-690ce526eb53))
     (pad "2" smd roundrect (at 1 0 270) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -1300,7 +1580,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp 99cfed41-8a0a-4a3f-9466-236bd6f05ba7)
+    (tstamp 99cfed41-8a0a-4a3f-9466-236bd6f05ba7)
     (at 81.9 21.9 -90)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -1309,27 +1589,37 @@
     (path "/d6897c60-ac04-4f63-955e-286788cf3800")
     (attr smd)
     (fp_text reference "R4" (at 0 -1.65 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp aa6b91b2-6aff-4b21-a573-f80a291fdbd4)
     )
     (fp_text value "1k" (at 0 1.65 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp c88186bb-b529-426e-8700-a39067ec810b)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 7168e7cf-5918-478e-a782-240e4bce5d9d)
     )
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp 37080533-8c98-452b-bfd3-44e2ea5fdf7c))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 9019b1a9-9c3e-4e44-8ae7-ccf8c8ef77fe))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 443c0b6f-6728-4f1b-8edf-da365ee71e92))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 4be9c194-1c4f-48d7-8148-62a414678410))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 4f808a81-de0d-4009-8d7a-bc46db96b3ed))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp b334e167-f8fa-4380-a3b7-8cfc9080938f))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 47339166-f796-4e1b-9827-74629fef4ea5))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 76716519-00f7-4639-8187-d6540fd1f87e))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 7bfd5a75-6fea-47a8-90e1-47fdb9b58603))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp ba98e848-be16-45a8-8f7a-44198efda0d4))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9019b1a9-9c3e-4e44-8ae7-ccf8c8ef77fe))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 37080533-8c98-452b-bfd3-44e2ea5fdf7c))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 443c0b6f-6728-4f1b-8edf-da365ee71e92))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b334e167-f8fa-4380-a3b7-8cfc9080938f))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4be9c194-1c4f-48d7-8148-62a414678410))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4f808a81-de0d-4009-8d7a-bc46db96b3ed))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ba98e848-be16-45a8-8f7a-44198efda0d4))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 47339166-f796-4e1b-9827-74629fef4ea5))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7bfd5a75-6fea-47a8-90e1-47fdb9b58603))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 76716519-00f7-4639-8187-d6540fd1f87e))
     (pad "1" smd roundrect (at -1 0 270) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 24 "Net-(J5-Pad2)") (pintype "passive") (tstamp 44bf9f83-835d-4b13-a39a-704defbace67))
     (pad "2" smd roundrect (at 1 0 270) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -1342,7 +1632,7 @@
   )
 
   (footprint "V0-Display:SolderJumper-3_P1.3mm_Pad1.0x1.5mm" (layer "F.Cu")
-    (tedit 5C756B4C) (tstamp a4679c2f-5e35-4051-b213-7bf1b926d839)
+    (tstamp a4679c2f-5e35-4051-b213-7bf1b926d839)
     (at 40.3 24.1425 180)
     (descr "SMD Solder 3-pad Jumper, 1x1.5mm Pads, 0.3mm gap, pads 1-2 bridged with 1 copper strip")
     (tags "solder jumper open")
@@ -1351,24 +1641,35 @@
     (path "/02cf0e5d-3b8a-44f3-b588-08edbf2d8bed")
     (attr exclude_from_pos_files)
     (fp_text reference "JP1" (at 0 -1.8) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 1cee1fdc-f830-4db3-b366-3fb13becb1a9)
     )
     (fp_text value "Pin2" (at 0 2) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp bd6e6759-6a66-4027-9339-af59965c1e75)
     )
-    (fp_line (start -1.6 1.5) (end -1 1.5) (layer "F.SilkS") (width 0.12) (tstamp 069cdf25-c7ba-40bc-a319-5d3531175ad7))
-    (fp_line (start -1.3 1.2) (end -1.6 1.5) (layer "F.SilkS") (width 0.12) (tstamp 2cdf6428-bb3a-4f42-a8c4-1d1dfb4cfe41))
-    (fp_line (start 2.05 1) (end -2.05 1) (layer "F.SilkS") (width 0.12) (tstamp 6215f5a2-f127-4835-bd29-c374cebb3a3a))
-    (fp_line (start 2.05 -1) (end 2.05 1) (layer "F.SilkS") (width 0.12) (tstamp 691a13a2-bc68-45c6-bb90-2cb1659fed07))
-    (fp_line (start -1.3 1.2) (end -1 1.5) (layer "F.SilkS") (width 0.12) (tstamp 7d60911c-c917-457c-bf1e-4a7c432f6c09))
-    (fp_line (start -2.05 -1) (end 2.05 -1) (layer "F.SilkS") (width 0.12) (tstamp 7e464c96-bb36-4ce1-a4a8-eabbf6f65e14))
-    (fp_line (start -2.05 1) (end -2.05 -1) (layer "F.SilkS") (width 0.12) (tstamp 9c6c7931-fb7c-402d-8ff0-7c4693de152d))
-    (fp_line (start -2.3 -1.25) (end 2.3 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp 4fff5aab-07df-45e8-b1fa-9bfab4ff7464))
-    (fp_line (start 2.3 1.25) (end -2.3 1.25) (layer "F.CrtYd") (width 0.05) (tstamp 50bd5bbe-1e72-411c-a938-d3df181da577))
-    (fp_line (start -2.3 -1.25) (end -2.3 1.25) (layer "F.CrtYd") (width 0.05) (tstamp 5808edaa-ba94-4c56-87bd-34215371eb45))
-    (fp_line (start 2.3 1.25) (end 2.3 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp f4720ca5-a107-4b2a-a753-4f80a73bcb2c))
+    (fp_line (start -2.05 -1) (end 2.05 -1)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7e464c96-bb36-4ce1-a4a8-eabbf6f65e14))
+    (fp_line (start -2.05 1) (end -2.05 -1)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9c6c7931-fb7c-402d-8ff0-7c4693de152d))
+    (fp_line (start -1.6 1.5) (end -1 1.5)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 069cdf25-c7ba-40bc-a319-5d3531175ad7))
+    (fp_line (start -1.3 1.2) (end -1.6 1.5)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2cdf6428-bb3a-4f42-a8c4-1d1dfb4cfe41))
+    (fp_line (start -1.3 1.2) (end -1 1.5)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7d60911c-c917-457c-bf1e-4a7c432f6c09))
+    (fp_line (start 2.05 -1) (end 2.05 1)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 691a13a2-bc68-45c6-bb90-2cb1659fed07))
+    (fp_line (start 2.05 1) (end -2.05 1)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6215f5a2-f127-4835-bd29-c374cebb3a3a))
+    (fp_line (start -2.3 -1.25) (end -2.3 1.25)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5808edaa-ba94-4c56-87bd-34215371eb45))
+    (fp_line (start -2.3 -1.25) (end 2.3 -1.25)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4fff5aab-07df-45e8-b1fa-9bfab4ff7464))
+    (fp_line (start 2.3 1.25) (end -2.3 1.25)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 50bd5bbe-1e72-411c-a938-d3df181da577))
+    (fp_line (start 2.3 1.25) (end 2.3 -1.25)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f4720ca5-a107-4b2a-a753-4f80a73bcb2c))
     (pad "1" smd rect (at -1.3 0 180) (size 1 1.5) (layers "F.Cu" "F.Mask")
       (net 6 "GND") (pinfunction "A") (pintype "passive") (tstamp e1942a5a-fc94-4d7c-958e-9d53b7980bb4))
     (pad "2" smd rect (at 0 0 180) (size 1 1.5) (layers "F.Cu" "F.Mask")
@@ -1378,7 +1679,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp a74dda18-0aa9-46e7-85fe-86025888cdc3)
+    (tstamp a74dda18-0aa9-46e7-85fe-86025888cdc3)
     (at 86.2 52.6)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -1387,27 +1688,37 @@
     (path "/ecfaeb4b-64c0-4c8e-8b87-981ab5b8de12")
     (attr smd)
     (fp_text reference "R18" (at 0 -1.65) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 6fa005f3-6cf5-45a3-869f-80a6688d245f)
     )
     (fp_text value "10k" (at 0 1.65) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 2e45b9ac-99d1-4b64-9f2a-259f32508260)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 97fbad5b-71e4-4f6c-9c3d-3cdaeeb8d153)
     )
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp 5d593dc1-baab-4677-8bb9-868a4f0c8c65))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp faa19bf4-cb0e-4fcd-925d-cc312469e17b))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 526f01b9-cf87-4e19-be24-a41619e3c1d5))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 7d7338e1-85bd-458d-9c8f-3a66215c1f76))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 8f16a369-9989-4572-a69e-71ba1a9dcdef))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp dfec3f75-5c6d-47dc-87b6-69cef1108b63))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 5361a1da-f83a-41c8-8573-cc15b54fa755))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 573f8e27-0549-46c6-9822-9386a91db39b))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 70bec5f4-09d0-4b74-9644-6bdb0a59fe29))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp b6b5f1b3-37c3-4d77-a7e2-66f837131827))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp faa19bf4-cb0e-4fcd-925d-cc312469e17b))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 5d593dc1-baab-4677-8bb9-868a4f0c8c65))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 526f01b9-cf87-4e19-be24-a41619e3c1d5))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7d7338e1-85bd-458d-9c8f-3a66215c1f76))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8f16a369-9989-4572-a69e-71ba1a9dcdef))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp dfec3f75-5c6d-47dc-87b6-69cef1108b63))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 573f8e27-0549-46c6-9822-9386a91db39b))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b6b5f1b3-37c3-4d77-a7e2-66f837131827))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5361a1da-f83a-41c8-8573-cc15b54fa755))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 70bec5f4-09d0-4b74-9644-6bdb0a59fe29))
     (pad "1" smd roundrect (at -1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 6 "GND") (pintype "passive") (tstamp c00ffbeb-d773-4254-9cc1-083b18a35837))
     (pad "2" smd roundrect (at 1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -1420,7 +1731,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEF) (tstamp a8e21d38-f921-486e-ac1b-f7cd897e084e)
+    (tstamp a8e21d38-f921-486e-ac1b-f7cd897e084e)
     (at 58.6 21.9 90)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -1429,27 +1740,37 @@
     (path "/9ea55a84-3dae-4824-a2cb-3e37727771fe")
     (attr smd)
     (fp_text reference "C6" (at 0 -1.68 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 2532e2c8-f3ba-4611-a90e-a60927e47392)
     )
     (fp_text value "100n" (at 0 1.68 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp d5446387-985f-4ff3-b3bd-46c22c7cf1d1)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 9b2ed4b5-981b-49d6-8b02-9e4fd43875c6)
     )
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "F.SilkS") (width 0.12) (tstamp a1f3fe0b-a540-46b7-a3ac-f1ab87ff24d4))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "F.SilkS") (width 0.12) (tstamp bbd588ea-fdff-48c8-a978-851660a01f04))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 031f8e98-db6c-4f8d-abb6-426fe5755e5a))
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 3ce9de06-0531-4615-a837-f2e49925519d))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 7224fc0f-7d94-4fb7-b0fe-732d90b00b42))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 90b58d32-9aaf-443a-8a04-c2f5e563e1e3))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp a91e325a-dcff-405d-9573-bf631a4e3680))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp b7b68a7a-263d-43ea-8200-d3874963eea1))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp eac2bdf2-4b9c-4e72-8a6e-d10f7f744966))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp f19cb20e-fbf0-4ba1-81ce-22c647997007))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a1f3fe0b-a540-46b7-a3ac-f1ab87ff24d4))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp bbd588ea-fdff-48c8-a978-851660a01f04))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 90b58d32-9aaf-443a-8a04-c2f5e563e1e3))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7224fc0f-7d94-4fb7-b0fe-732d90b00b42))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 031f8e98-db6c-4f8d-abb6-426fe5755e5a))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3ce9de06-0531-4615-a837-f2e49925519d))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b7b68a7a-263d-43ea-8200-d3874963eea1))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp eac2bdf2-4b9c-4e72-8a6e-d10f7f744966))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f19cb20e-fbf0-4ba1-81ce-22c647997007))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a91e325a-dcff-405d-9573-bf631a4e3680))
     (pad "1" smd roundrect (at -1.0375 0 90) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
       (net 9 "KEY2") (pintype "passive") (tstamp a9be4eb9-5717-45ea-82d4-0924208ec488))
     (pad "2" smd roundrect (at 1.0375 0 90) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
@@ -1462,7 +1783,7 @@
   )
 
   (footprint "V0-Display:SW_PUSH_6mm" (layer "F.Cu")
-    (tedit 5EF9412A) (tstamp acb30847-477b-491e-bdbe-20a58afb72da)
+    (tstamp acb30847-477b-491e-bdbe-20a58afb72da)
     (at 63.05 51.55)
     (descr "https://www.omron.com/ecb/products/pdf/en-b3f.pdf")
     (tags "tact sw push 6mm")
@@ -1471,47 +1792,69 @@
     (path "/b37bd078-ee1e-467d-8fe9-806ea98d005c")
     (attr through_hole)
     (fp_text reference "SW2" (at 3.25 -2) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 8acda234-574c-4834-a501-30a7c8ab7d62)
     )
     (fp_text value "Tact_switch" (at 3.75 6.7) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp d894ffe8-1492-44f7-9501-b079fc2fa326)
     )
     (fp_text user "${REFERENCE}" (at 3.25 2.25) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 8c9bdb17-ddb8-4a60-b661-d40fc2b521d0)
     )
-    (fp_line (start -0.25 1.5) (end -0.25 3) (layer "F.SilkS") (width 0.12) (tstamp 21cd6b13-67a9-4043-80fb-fdcbe2c8f0ae))
-    (fp_line (start 1 5.5) (end 5.5 5.5) (layer "F.SilkS") (width 0.12) (tstamp 9598dc02-5daf-420c-8942-a9c984b85985))
-    (fp_line (start 5.5 -1) (end 1 -1) (layer "F.SilkS") (width 0.12) (tstamp 9f9cf02d-1b7c-49f9-83e5-31d0246c5cda))
-    (fp_line (start 6.75 3) (end 6.75 1.5) (layer "F.SilkS") (width 0.12) (tstamp c0a01f8e-183f-4116-a52d-0d6aee755d84))
-    (fp_line (start 8 -1.25) (end 8 5.75) (layer "F.CrtYd") (width 0.05) (tstamp 04569931-139a-4d6a-9a05-3a68be4ad627))
-    (fp_line (start -1.25 -1.5) (end 7.75 -1.5) (layer "F.CrtYd") (width 0.05) (tstamp 25115acc-df3e-4357-82ac-e1c386772153))
-    (fp_line (start -1.5 5.75) (end -1.5 6) (layer "F.CrtYd") (width 0.05) (tstamp 3247b083-23be-426c-922c-cf03cb50b4cf))
-    (fp_line (start -1.5 5.75) (end -1.5 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp 4c2541a5-cd2c-491c-9b48-0855f6af26ae))
-    (fp_line (start 8 6) (end 8 5.75) (layer "F.CrtYd") (width 0.05) (tstamp 605d6463-cf32-4d71-8a90-7139ae3ec529))
-    (fp_line (start 7.75 6) (end -1.25 6) (layer "F.CrtYd") (width 0.05) (tstamp 63f2f834-ffa3-4378-84dc-9ba8b18396c7))
-    (fp_line (start 7.75 6) (end 8 6) (layer "F.CrtYd") (width 0.05) (tstamp 96cfe384-cb13-478b-85c9-328207180b44))
-    (fp_line (start 7.75 -1.5) (end 8 -1.5) (layer "F.CrtYd") (width 0.05) (tstamp 978f4697-0adc-49c9-9d35-80fe3ece3956))
-    (fp_line (start 8 -1.5) (end 8 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp a5575a4e-54f7-4ab1-be37-d09ee814c158))
-    (fp_line (start -1.5 -1.5) (end -1.25 -1.5) (layer "F.CrtYd") (width 0.05) (tstamp e8aa2a93-5195-4752-8d69-84218e45bf5a))
-    (fp_line (start -1.5 6) (end -1.25 6) (layer "F.CrtYd") (width 0.05) (tstamp ea43b31c-688c-434b-9ece-3e4e3bf15f92))
-    (fp_line (start -1.5 -1.25) (end -1.5 -1.5) (layer "F.CrtYd") (width 0.05) (tstamp fed833a2-6664-4998-9675-234e452284ee))
-    (fp_line (start 0.25 -0.75) (end 3.25 -0.75) (layer "F.Fab") (width 0.1) (tstamp 9c2c986c-63c9-4a83-a06a-f86740e27ca0))
-    (fp_line (start 3.25 -0.75) (end 6.25 -0.75) (layer "F.Fab") (width 0.1) (tstamp 9fed9315-2185-48bf-b8d8-01b0c1c87a03))
-    (fp_line (start 6.25 5.25) (end 0.25 5.25) (layer "F.Fab") (width 0.1) (tstamp aa7da261-591f-428c-aae4-2d933cf5a254))
-    (fp_line (start 0.25 5.25) (end 0.25 -0.75) (layer "F.Fab") (width 0.1) (tstamp c7a8016d-a974-4335-a034-268f1c566608))
-    (fp_line (start 6.25 -0.75) (end 6.25 5.25) (layer "F.Fab") (width 0.1) (tstamp f5ea5822-32d4-47a9-9ed4-87eaddd353ac))
-    (fp_circle (center 3.25 2.25) (end 1.25 2.5) (layer "F.Fab") (width 0.1) (fill none) (tstamp beeec940-5302-4634-8a90-634c8df70fa5))
-    (pad "1" thru_hole circle locked (at 0 0 90) (size 2 2) (drill 1.1) (layers *.Cu *.Mask)
+    (fp_line (start -0.25 1.5) (end -0.25 3)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 21cd6b13-67a9-4043-80fb-fdcbe2c8f0ae))
+    (fp_line (start 1 5.5) (end 5.5 5.5)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9598dc02-5daf-420c-8942-a9c984b85985))
+    (fp_line (start 5.5 -1) (end 1 -1)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9f9cf02d-1b7c-49f9-83e5-31d0246c5cda))
+    (fp_line (start 6.75 3) (end 6.75 1.5)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c0a01f8e-183f-4116-a52d-0d6aee755d84))
+    (fp_line (start -1.5 -1.5) (end -1.25 -1.5)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e8aa2a93-5195-4752-8d69-84218e45bf5a))
+    (fp_line (start -1.5 -1.25) (end -1.5 -1.5)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fed833a2-6664-4998-9675-234e452284ee))
+    (fp_line (start -1.5 5.75) (end -1.5 -1.25)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4c2541a5-cd2c-491c-9b48-0855f6af26ae))
+    (fp_line (start -1.5 5.75) (end -1.5 6)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3247b083-23be-426c-922c-cf03cb50b4cf))
+    (fp_line (start -1.5 6) (end -1.25 6)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ea43b31c-688c-434b-9ece-3e4e3bf15f92))
+    (fp_line (start -1.25 -1.5) (end 7.75 -1.5)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 25115acc-df3e-4357-82ac-e1c386772153))
+    (fp_line (start 7.75 -1.5) (end 8 -1.5)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 978f4697-0adc-49c9-9d35-80fe3ece3956))
+    (fp_line (start 7.75 6) (end -1.25 6)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 63f2f834-ffa3-4378-84dc-9ba8b18396c7))
+    (fp_line (start 7.75 6) (end 8 6)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 96cfe384-cb13-478b-85c9-328207180b44))
+    (fp_line (start 8 -1.5) (end 8 -1.25)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a5575a4e-54f7-4ab1-be37-d09ee814c158))
+    (fp_line (start 8 -1.25) (end 8 5.75)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 04569931-139a-4d6a-9a05-3a68be4ad627))
+    (fp_line (start 8 6) (end 8 5.75)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 605d6463-cf32-4d71-8a90-7139ae3ec529))
+    (fp_line (start 0.25 -0.75) (end 3.25 -0.75)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9c2c986c-63c9-4a83-a06a-f86740e27ca0))
+    (fp_line (start 0.25 5.25) (end 0.25 -0.75)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c7a8016d-a974-4335-a034-268f1c566608))
+    (fp_line (start 3.25 -0.75) (end 6.25 -0.75)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9fed9315-2185-48bf-b8d8-01b0c1c87a03))
+    (fp_line (start 6.25 -0.75) (end 6.25 5.25)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f5ea5822-32d4-47a9-9ed4-87eaddd353ac))
+    (fp_line (start 6.25 5.25) (end 0.25 5.25)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp aa7da261-591f-428c-aae4-2d933cf5a254))
+    (fp_circle (center 3.25 2.25) (end 1.25 2.5)
+      (stroke (width 0.1) (type solid)) (fill none) (layer "F.Fab") (tstamp beeec940-5302-4634-8a90-634c8df70fa5))
+    (pad "1" thru_hole circle (at 0 0 90) (size 2 2) (drill 1.1) (layers "*.Cu" "*.Mask")
       (net 6 "GND") (pinfunction "A") (pintype "passive") (tstamp 069f6f51-a097-4fca-b87a-d2c3c95deea9))
-    (pad "1" thru_hole circle locked (at 6.5 0 90) (size 2 2) (drill 1.1) (layers *.Cu *.Mask)
+    (pad "1" thru_hole circle (at 6.5 0 90) (size 2 2) (drill 1.1) (layers "*.Cu" "*.Mask")
       (net 6 "GND") (pinfunction "A") (pintype "passive") (tstamp 616e3c4d-3d3a-4aa8-9bb4-57bb67d2c29c))
-    (pad "2" thru_hole circle locked (at 6.5 4.5 90) (size 2 2) (drill 1.1) (layers *.Cu *.Mask)
-      (net 33 "RESET") (pinfunction "B") (pintype "passive") (tstamp 43083f41-7992-435e-86bf-3b7c0757aa3c))
-    (pad "2" thru_hole circle locked (at 0 4.5 90) (size 2 2) (drill 1.1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole circle (at 0 4.5 90) (size 2 2) (drill 1.1) (layers "*.Cu" "*.Mask")
       (net 33 "RESET") (pinfunction "B") (pintype "passive") (tstamp ded50212-cad7-4d95-a861-1e232c966304))
+    (pad "2" thru_hole circle (at 6.5 4.5 90) (size 2 2) (drill 1.1) (layers "*.Cu" "*.Mask")
+      (net 33 "RESET") (pinfunction "B") (pintype "passive") (tstamp 43083f41-7992-435e-86bf-3b7c0757aa3c))
     (model "${KIPRJMOD}/Library/3D_Packages/SW_PUSH_6mm.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1520,7 +1863,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEF) (tstamp afff1b36-d66b-40a5-aaa4-32e65c6c9e49)
+    (tstamp afff1b36-d66b-40a5-aaa4-32e65c6c9e49)
     (at 50 21.9 90)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -1529,27 +1872,37 @@
     (path "/e68c3671-7821-46b7-a575-21d7ff80ddd7")
     (attr smd)
     (fp_text reference "C2" (at 0 -1.68 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 827a2375-0355-4905-91f6-d2bc44f01ebc)
     )
     (fp_text value "100n" (at 0 1.68 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 6e38201e-e6ec-4a12-ba87-d2c1b519a361)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 229cd023-c7e5-4ed9-ba6d-2605a7b0a026)
     )
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 2787f8ef-4ed1-4d1b-ac24-5c7b0d7f48e6))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "F.SilkS") (width 0.12) (tstamp fd261894-2219-414f-8dfd-88b0cdc3783d))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 6907576c-deb9-44d3-8593-0a8ca2a821a2))
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp b30d3eba-bd5c-49b7-ab9e-3ce1c3a3131b))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp beae68df-eef5-43c4-bf68-8ee524de5845))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp f8e07df8-2553-42cc-9464-3352c8720193))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 2fc0fa35-99b6-4a42-b670-e5ae07c600bf))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 7ff32aa8-d384-435f-8394-63cb555c462d))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 843687c8-f75b-4acb-8424-7c0bf9a18687))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp f5c95d17-e57a-49e8-b894-ae48b203b70f))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2787f8ef-4ed1-4d1b-ac24-5c7b0d7f48e6))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp fd261894-2219-414f-8dfd-88b0cdc3783d))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f8e07df8-2553-42cc-9464-3352c8720193))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6907576c-deb9-44d3-8593-0a8ca2a821a2))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp beae68df-eef5-43c4-bf68-8ee524de5845))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b30d3eba-bd5c-49b7-ab9e-3ce1c3a3131b))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 843687c8-f75b-4acb-8424-7c0bf9a18687))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7ff32aa8-d384-435f-8394-63cb555c462d))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f5c95d17-e57a-49e8-b894-ae48b203b70f))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2fc0fa35-99b6-4a42-b670-e5ae07c600bf))
     (pad "1" smd roundrect (at -1.0375 0 90) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
       (net 5 "KEY1") (pintype "passive") (tstamp c47163be-c48c-4eba-91a5-fb90504b563c))
     (pad "2" smd roundrect (at 1.0375 0 90) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
@@ -1562,7 +1915,7 @@
   )
 
   (footprint "V0-Display:MountingHole_3.2mm_M3" (layer "F.Cu")
-    (tedit 56D1B4CB) (tstamp bbc3f07d-d580-4f1b-b7d1-cee638f0a5a5)
+    (tstamp bbc3f07d-d580-4f1b-b7d1-cee638f0a5a5)
     (at -11.6 46.2)
     (descr "Mounting Hole 3.2mm, no annular, M3")
     (tags "mounting hole 3.2mm no annular m3")
@@ -1572,24 +1925,26 @@
     (path "/436a6066-0c35-4774-9203-93a1c5c83129")
     (attr exclude_from_pos_files exclude_from_bom)
     (fp_text reference "H1" (at 0 -4.2) (layer "F.SilkS") hide
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp ebd7de80-4e63-4781-a6ed-3dfc7bb4db06)
     )
     (fp_text value "M3" (at 0 4.2) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 46a21835-dbd2-4cd4-a6cc-dc42dd080888)
     )
     (fp_text user "${REFERENCE}" (at 0.3 0) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp f231e612-be58-477c-a88c-5869422b2696)
     )
-    (fp_circle (center 0 0) (end 3.2 0) (layer "Cmts.User") (width 0.15) (fill none) (tstamp d567c2f4-72a2-4e5f-acc2-1c07a89d7fbc))
-    (fp_circle (center 0 0) (end 3.45 0) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 2b13eaf9-49ac-47a2-ab85-5530ef916a93))
-    (pad "" np_thru_hole circle locked (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask) (tstamp 8a888616-73f1-4273-b6e2-b89a5f137a54))
+    (fp_circle (center 0 0) (end 3.2 0)
+      (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp d567c2f4-72a2-4e5f-acc2-1c07a89d7fbc))
+    (fp_circle (center 0 0) (end 3.45 0)
+      (stroke (width 0.05) (type solid)) (fill none) (layer "F.CrtYd") (tstamp 2b13eaf9-49ac-47a2-ab85-5530ef916a93))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers "*.Cu" "*.Mask") (tstamp 8a888616-73f1-4273-b6e2-b89a5f137a54))
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp bdf44929-68cc-4f5d-bdc3-c05d7d11e210)
+    (tstamp bdf44929-68cc-4f5d-bdc3-c05d7d11e210)
     (at 47.5 21.9 -90)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -1598,27 +1953,37 @@
     (path "/4896505e-a850-4bba-8318-6b86561646b4")
     (attr smd)
     (fp_text reference "R2" (at 0 -1.65 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp c4805153-bd76-4af3-bdf4-68a5984e1d1b)
     )
     (fp_text value "1k" (at 0 1.65 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp cbb890f3-913a-44bd-bdb7-3a22e4ff6c29)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 78270359-5932-4b0d-ab8d-7d6a8ec85599)
     )
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp b2382279-d31b-49ae-99f6-a41204d84f8b))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp e0b40dcf-2054-4ab5-bfc8-013a1a845105))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 08ca2e04-036a-4836-a5f1-84f0bb389363))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 16dac9a3-6cc5-4edd-a90b-70ad2ee24b57))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 63c20feb-9ad4-4ecc-bc5d-a7aebaa81d27))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp dbc21f4e-942f-4c82-90b1-5d2c147311aa))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 136e60d6-71fb-4797-a200-bcc60c1ded06))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 3ebf0d68-b3c3-48d6-9b3c-a779c47eaba7))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 88dfa922-e8a8-45dc-806e-3b7ef699c180))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp aad4388a-4079-443f-be95-602dac01f673))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b2382279-d31b-49ae-99f6-a41204d84f8b))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e0b40dcf-2054-4ab5-bfc8-013a1a845105))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 08ca2e04-036a-4836-a5f1-84f0bb389363))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 63c20feb-9ad4-4ecc-bc5d-a7aebaa81d27))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 16dac9a3-6cc5-4edd-a90b-70ad2ee24b57))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp dbc21f4e-942f-4c82-90b1-5d2c147311aa))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 88dfa922-e8a8-45dc-806e-3b7ef699c180))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3ebf0d68-b3c3-48d6-9b3c-a779c47eaba7))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 136e60d6-71fb-4797-a200-bcc60c1ded06))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp aad4388a-4079-443f-be95-602dac01f673))
     (pad "1" smd roundrect (at -1 0 270) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 22 "Net-(J3-Pad2)") (pintype "passive") (tstamp c2dee123-912a-45bd-a168-e17a54b98e79))
     (pad "2" smd roundrect (at 1 0 270) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -1631,7 +1996,7 @@
   )
 
   (footprint "V0-Display:MountingHole_3.2mm_M3" (layer "F.Cu")
-    (tedit 56D1B4CB) (tstamp c7b4dffe-8a4b-4d5b-b211-1c81d468703b)
+    (tstamp c7b4dffe-8a4b-4d5b-b211-1c81d468703b)
     (at -3.3 46)
     (descr "Mounting Hole 3.2mm, no annular, M3")
     (tags "mounting hole 3.2mm no annular m3")
@@ -1641,24 +2006,26 @@
     (path "/8226fe5a-0a78-4e74-94b9-228e9aed9f56")
     (attr exclude_from_pos_files exclude_from_bom)
     (fp_text reference "H4" (at 0 -4.2) (layer "F.SilkS") hide
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 3e9e4e10-4578-4641-8859-ba37c1ba9ff8)
     )
     (fp_text value "M3" (at 0 4.2) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp e352e0be-5933-4109-803b-231a26e0a0f8)
     )
     (fp_text user "${REFERENCE}" (at 0.3 0) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 96e1fbe5-98d6-4a86-a749-6b3ce9b092a4)
     )
-    (fp_circle (center 0 0) (end 3.2 0) (layer "Cmts.User") (width 0.15) (fill none) (tstamp 897ba254-10aa-41cc-9b24-3829e95b5147))
-    (fp_circle (center 0 0) (end 3.45 0) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 4858e181-e0cf-4416-823b-55426e3dea56))
-    (pad "" np_thru_hole circle locked (at 0 0) (size 3.2 3.2) (drill 3.2) (layers *.Cu *.Mask) (tstamp ab97e784-4ff9-459e-a008-579c5145223a))
+    (fp_circle (center 0 0) (end 3.2 0)
+      (stroke (width 0.15) (type solid)) (fill none) (layer "Cmts.User") (tstamp 897ba254-10aa-41cc-9b24-3829e95b5147))
+    (fp_circle (center 0 0) (end 3.45 0)
+      (stroke (width 0.05) (type solid)) (fill none) (layer "F.CrtYd") (tstamp 4858e181-e0cf-4416-823b-55426e3dea56))
+    (pad "" np_thru_hole circle (at 0 0) (size 3.2 3.2) (drill 3.2) (layers "*.Cu" "*.Mask") (tstamp ab97e784-4ff9-459e-a008-579c5145223a))
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp cbf2bd9f-7431-41cf-ab2f-9e891b6d4d14)
+    (tstamp cbf2bd9f-7431-41cf-ab2f-9e891b6d4d14)
     (at 16.8 6.9)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -1667,27 +2034,37 @@
     (path "/9e955eb1-fcc8-4549-ad26-449d91e1350f")
     (attr smd)
     (fp_text reference "R6" (at 0 -1.65) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 5499c0b5-d42f-4273-90b0-e4170734be9d)
     )
     (fp_text value "22" (at 0 1.65) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp e9722388-7bb9-4189-ad10-8f398c473641)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp a475fc65-fe7a-4518-b636-c52e030ab797)
     )
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp 3876732c-10dc-4e12-aa62-1c2bad2e693c))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp bfcde8d6-7d65-4636-a530-cc3b87e65048))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 0b41014c-72d1-4d50-95fe-f20b8edca399))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 59fb5e27-af2d-4df4-b845-57c7fb22f650))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp ad25675e-e468-46b0-8754-cf273c2e82a5))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp f8cde669-bc0f-414c-ac50-490ec5061f50))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 2128c8bc-1afe-4bd2-b365-92b9246da025))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 481f1a80-29ab-4101-9e6a-5d143905f33f))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 4d5ab807-f9e9-46db-9d0b-94e0fe0638ff))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp d21c34d7-1c0d-4b7b-a965-225833875313))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp bfcde8d6-7d65-4636-a530-cc3b87e65048))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3876732c-10dc-4e12-aa62-1c2bad2e693c))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f8cde669-bc0f-414c-ac50-490ec5061f50))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 59fb5e27-af2d-4df4-b845-57c7fb22f650))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ad25675e-e468-46b0-8754-cf273c2e82a5))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0b41014c-72d1-4d50-95fe-f20b8edca399))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2128c8bc-1afe-4bd2-b365-92b9246da025))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 481f1a80-29ab-4101-9e6a-5d143905f33f))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4d5ab807-f9e9-46db-9d0b-94e0fe0638ff))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d21c34d7-1c0d-4b7b-a965-225833875313))
     (pad "1" smd roundrect (at -1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 3 "Net-(C1-Pad1)") (pintype "passive") (tstamp 8321bac4-0b55-4185-a2ea-3645756254f7))
     (pad "2" smd roundrect (at 1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -1700,7 +2077,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp d6377571-8824-4b59-bfc4-12d180339785)
+    (tstamp d6377571-8824-4b59-bfc4-12d180339785)
     (at 96.6 49.6)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -1709,27 +2086,37 @@
     (path "/76a79e3d-c9c1-4992-849b-f73cc746eddc")
     (attr smd)
     (fp_text reference "R17" (at 0 -1.65) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp ec48cce2-375c-49f8-8cfd-6941c224e7e3)
     )
     (fp_text value "68" (at 0 1.65) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 63755cba-286a-48b1-9a74-1a43ebc1193f)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp d40964f1-de8d-4fe4-80b6-616fd142d3cc)
     )
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp 79e19902-6c21-4a1a-b287-6ad3a4dffc41))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 8d3b2d89-88b4-4b3e-a7f7-c70bd292ac1c))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 1b57cc9f-afc4-4134-8ec1-86cdde16fba2))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 242e263e-68c9-4a2f-89f9-3a63023f97ce))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 8b57d356-6495-4013-9132-b9e2088c7d84))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp d8f77273-b01d-4dbf-8f60-f205fd9cad5c))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 6a0d2cc3-2374-47c4-b619-e856420e5a0b))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp bde2ff3b-9c85-4e23-913a-927f5b08e562))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp e2ef11b5-4568-4848-aa9a-652ddd050ed7))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp f0480e04-5550-4c62-b4a1-9d436d93f073))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8d3b2d89-88b4-4b3e-a7f7-c70bd292ac1c))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 79e19902-6c21-4a1a-b287-6ad3a4dffc41))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 242e263e-68c9-4a2f-89f9-3a63023f97ce))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8b57d356-6495-4013-9132-b9e2088c7d84))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d8f77273-b01d-4dbf-8f60-f205fd9cad5c))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1b57cc9f-afc4-4134-8ec1-86cdde16fba2))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e2ef11b5-4568-4848-aa9a-652ddd050ed7))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6a0d2cc3-2374-47c4-b619-e856420e5a0b))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f0480e04-5550-4c62-b4a1-9d436d93f073))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bde2ff3b-9c85-4e23-913a-927f5b08e562))
     (pad "1" smd roundrect (at -1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 49 "Net-(Q1-Pad2)") (pintype "passive") (tstamp 772f9261-f92d-473e-841a-5666ec92a750))
     (pad "2" smd roundrect (at 1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -1742,7 +2129,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp e525c64d-b7f7-49be-ad92-d341ad332fa4)
+    (tstamp e525c64d-b7f7-49be-ad92-d341ad332fa4)
     (at -23.4 11.5)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -1751,27 +2138,37 @@
     (path "/2a1f8fb7-cee1-4cd8-abc3-39dd0b5cfc50")
     (attr smd)
     (fp_text reference "FB1" (at 0 -1.65) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 914d1262-3824-4422-ad75-ef30c705dad8)
     )
     (fp_text value "100@100MHz" (at 0 1.65) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 8b12863d-1b8c-4586-9754-a9b817e31c60)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 21e262d3-7ffb-48f1-acd3-bd3e6e03c20b)
     )
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 7b8dfb93-9e75-47c8-a8c7-d1881c1902c8))
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp 9e6830a2-5bd9-4c4b-a7fb-36a9978536db))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 130f6c43-4891-467c-b9e0-8c38dc9b468f))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 27fdb281-720b-40ac-b30f-72e6ae325344))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 3aa28e88-ac2b-4663-b4b1-39b90191a3b0))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 683cfbeb-4712-493e-863d-4ac847a5e860))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 05da0416-a7c1-42f1-a820-ac4ef90be62d))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 668da872-dd09-4392-ad79-3454b5015937))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 8a886e5e-dd64-4592-a919-65ceb135c544))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp dcf984b1-b072-42f3-a128-baf5f10a3121))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7b8dfb93-9e75-47c8-a8c7-d1881c1902c8))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9e6830a2-5bd9-4c4b-a7fb-36a9978536db))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 130f6c43-4891-467c-b9e0-8c38dc9b468f))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3aa28e88-ac2b-4663-b4b1-39b90191a3b0))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 27fdb281-720b-40ac-b30f-72e6ae325344))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 683cfbeb-4712-493e-863d-4ac847a5e860))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 668da872-dd09-4392-ad79-3454b5015937))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8a886e5e-dd64-4592-a919-65ceb135c544))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 05da0416-a7c1-42f1-a820-ac4ef90be62d))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dcf984b1-b072-42f3-a128-baf5f10a3121))
     (pad "1" smd roundrect (at -1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 12 "+3.3V") (pintype "passive") (tstamp f36ca72b-d125-4bc5-aa3e-b6514734d983))
     (pad "2" smd roundrect (at 1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -1784,7 +2181,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp e969eb3c-6bac-4f82-be0d-1afc3696bcb8)
+    (tstamp e969eb3c-6bac-4f82-be0d-1afc3696bcb8)
     (at 32.6 7.6)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -1793,27 +2190,37 @@
     (path "/b0c5f90e-c7ef-4422-9684-da26b11c77b8")
     (attr smd)
     (fp_text reference "R10" (at 0 -1.65) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 56e0865b-0589-47f6-9fae-e8c29cf105a4)
     )
     (fp_text value "4k7" (at 0 1.65) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp ca0acc3e-99c5-4a8e-9af3-1a095c175770)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp 7b4874c8-7de9-4ada-b02e-5058bcf8ed66)
     )
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp 23601da2-a5ef-499a-ac6e-c3f4dddd9253))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 30cc9fa5-07c9-4a67-ae1f-056d5793da81))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 2329b6b2-3000-483d-8a94-af000265b0d5))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 6a1b48f4-4721-468e-bbcc-565e6dbf903d))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 84f763ca-9b11-4bb9-931e-3e74aaf98c95))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 8f994a16-25fd-4b87-8618-96db932cc669))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 36918a45-122f-4976-9787-c6af8755d043))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 6826c0c8-49b9-48e6-a8e8-3370bb3dc3a7))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp ba0a8589-7c42-4923-bef0-489f941225fc))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp e4cbb623-698e-424b-b2f9-b164966754a9))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 30cc9fa5-07c9-4a67-ae1f-056d5793da81))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 23601da2-a5ef-499a-ac6e-c3f4dddd9253))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6a1b48f4-4721-468e-bbcc-565e6dbf903d))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8f994a16-25fd-4b87-8618-96db932cc669))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 84f763ca-9b11-4bb9-931e-3e74aaf98c95))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2329b6b2-3000-483d-8a94-af000265b0d5))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6826c0c8-49b9-48e6-a8e8-3370bb3dc3a7))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ba0a8589-7c42-4923-bef0-489f941225fc))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e4cbb623-698e-424b-b2f9-b164966754a9))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 36918a45-122f-4976-9787-c6af8755d043))
     (pad "1" smd roundrect (at -1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 14 "+3.3VA") (pintype "passive") (tstamp ba5bda53-f3db-4c87-bd40-a6fe0b616c21))
     (pad "2" smd roundrect (at 1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -1826,7 +2233,7 @@
   )
 
   (footprint "V0-Display:SolderJumper-3_P1.3mm_Pad1.0x1.5mm" (layer "F.Cu")
-    (tedit 5C756B4C) (tstamp ecaffe19-f5b4-43f4-996d-2d2317e26f1e)
+    (tstamp ecaffe19-f5b4-43f4-996d-2d2317e26f1e)
     (at 35.6 24.1425)
     (descr "SMD Solder 3-pad Jumper, 1x1.5mm Pads, 0.3mm gap, pads 1-2 bridged with 1 copper strip")
     (tags "solder jumper open")
@@ -1835,24 +2242,35 @@
     (path "/d05a7fb0-2f5e-494c-b173-a286443bfbe3")
     (attr exclude_from_pos_files)
     (fp_text reference "JP2" (at 0 -1.8) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 0ef6f14a-c29f-41da-b3df-0e97f7880dc7)
     )
     (fp_text value "Pin1" (at 0 2) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 8332c94c-fa2d-4ffc-af88-4b12c25ac821)
     )
-    (fp_line (start -1.3 1.2) (end -1 1.5) (layer "F.SilkS") (width 0.12) (tstamp 29e6e857-a39f-47f6-811e-a1bcced03b08))
-    (fp_line (start -1.3 1.2) (end -1.6 1.5) (layer "F.SilkS") (width 0.12) (tstamp 4fb32a5c-8309-4463-9964-f02c04e3b3a6))
-    (fp_line (start -2.05 1) (end -2.05 -1) (layer "F.SilkS") (width 0.12) (tstamp 717282d9-a53d-45b9-91ff-bbccd3957bbe))
-    (fp_line (start -1.6 1.5) (end -1 1.5) (layer "F.SilkS") (width 0.12) (tstamp 84686a73-750c-413a-a212-cdfa24193b68))
-    (fp_line (start 2.05 1) (end -2.05 1) (layer "F.SilkS") (width 0.12) (tstamp 97df66ec-db2b-4d39-b460-367e74791fcf))
-    (fp_line (start -2.05 -1) (end 2.05 -1) (layer "F.SilkS") (width 0.12) (tstamp d7cd8277-a4e3-4ba4-9026-29a6968b9080))
-    (fp_line (start 2.05 -1) (end 2.05 1) (layer "F.SilkS") (width 0.12) (tstamp f65b9e71-ffe9-457d-8d48-b3a9f75abcb7))
-    (fp_line (start 2.3 1.25) (end 2.3 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp 3fac064f-017d-4de0-ae6a-b922b01eb2dc))
-    (fp_line (start -2.3 -1.25) (end 2.3 -1.25) (layer "F.CrtYd") (width 0.05) (tstamp 838ebb7c-42ca-46ff-abd5-7844411119c5))
-    (fp_line (start -2.3 -1.25) (end -2.3 1.25) (layer "F.CrtYd") (width 0.05) (tstamp e0e101c7-c631-4065-9637-50cb74a80d4e))
-    (fp_line (start 2.3 1.25) (end -2.3 1.25) (layer "F.CrtYd") (width 0.05) (tstamp ff11c4b4-11aa-48d0-bbcc-51a44f3a42ed))
+    (fp_line (start -2.05 -1) (end 2.05 -1)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d7cd8277-a4e3-4ba4-9026-29a6968b9080))
+    (fp_line (start -2.05 1) (end -2.05 -1)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 717282d9-a53d-45b9-91ff-bbccd3957bbe))
+    (fp_line (start -1.6 1.5) (end -1 1.5)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 84686a73-750c-413a-a212-cdfa24193b68))
+    (fp_line (start -1.3 1.2) (end -1.6 1.5)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4fb32a5c-8309-4463-9964-f02c04e3b3a6))
+    (fp_line (start -1.3 1.2) (end -1 1.5)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 29e6e857-a39f-47f6-811e-a1bcced03b08))
+    (fp_line (start 2.05 -1) (end 2.05 1)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f65b9e71-ffe9-457d-8d48-b3a9f75abcb7))
+    (fp_line (start 2.05 1) (end -2.05 1)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 97df66ec-db2b-4d39-b460-367e74791fcf))
+    (fp_line (start -2.3 -1.25) (end -2.3 1.25)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp e0e101c7-c631-4065-9637-50cb74a80d4e))
+    (fp_line (start -2.3 -1.25) (end 2.3 -1.25)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 838ebb7c-42ca-46ff-abd5-7844411119c5))
+    (fp_line (start 2.3 1.25) (end -2.3 1.25)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ff11c4b4-11aa-48d0-bbcc-51a44f3a42ed))
+    (fp_line (start 2.3 1.25) (end 2.3 -1.25)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3fac064f-017d-4de0-ae6a-b922b01eb2dc))
     (pad "1" smd rect (at -1.3 0) (size 1 1.5) (layers "F.Cu" "F.Mask")
       (net 6 "GND") (pinfunction "A") (pintype "passive") (tstamp 537e3a2e-766a-474f-8ea9-3b554e7a3aa6))
     (pad "2" smd rect (at 0 0) (size 1 1.5) (layers "F.Cu" "F.Mask")
@@ -1862,7 +2280,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEF) (tstamp ef97aceb-4764-421d-80cd-46c36e53f312)
+    (tstamp ef97aceb-4764-421d-80cd-46c36e53f312)
     (at 33.0625 37.5)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -1871,27 +2289,37 @@
     (path "/13434b00-2a4f-4bb9-9455-d8c802f1239c")
     (attr smd)
     (fp_text reference "C9" (at 0 -1.68) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 8d6736c0-8186-4744-a909-4a5e067032f8)
     )
     (fp_text value "4u7" (at 0 1.68) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 7162a117-e99e-44a6-9667-8c671a134a50)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp e56089d0-00fa-45af-8e2a-adeddd1c71f3)
     )
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 4c23c2cc-f950-4861-aa3e-22ed2b3c3967))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "F.SilkS") (width 0.12) (tstamp ec895e4e-aeee-4811-9377-f264d35e6db8))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 5307cc14-d290-48f2-9619-dfa8c6c86b7a))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 6e9e9441-ec37-4e91-b1f8-de163c5e4bb2))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp a667753b-3827-464e-9b6f-a486317fcb5b))
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp f37f551f-f1af-48de-81c5-7dbf78bd88c2))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 16be85a0-5c91-4592-b662-7f0d0ea47f30))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 4f41a51a-194e-4d20-b7a1-803ab21b7cf0))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 54a053aa-b497-4631-a22d-b465d32684da))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 5f63dbb3-0ba0-4741-85e7-2f4f728bbe8d))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4c23c2cc-f950-4861-aa3e-22ed2b3c3967))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ec895e4e-aeee-4811-9377-f264d35e6db8))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5307cc14-d290-48f2-9619-dfa8c6c86b7a))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6e9e9441-ec37-4e91-b1f8-de163c5e4bb2))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a667753b-3827-464e-9b6f-a486317fcb5b))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f37f551f-f1af-48de-81c5-7dbf78bd88c2))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 54a053aa-b497-4631-a22d-b465d32684da))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5f63dbb3-0ba0-4741-85e7-2f4f728bbe8d))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4f41a51a-194e-4d20-b7a1-803ab21b7cf0))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 16be85a0-5c91-4592-b662-7f0d0ea47f30))
     (pad "1" smd roundrect (at -1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
       (net 12 "+3.3V") (pintype "passive") (tstamp 6dc8c2a3-fe6e-4df9-9f57-dbe36f11f8d0))
     (pad "2" smd roundrect (at 1.0375 0) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
@@ -1904,7 +2332,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp f03fa33e-1549-4a69-a94b-f09437559e17)
+    (tstamp f03fa33e-1549-4a69-a94b-f09437559e17)
     (at 80.3 47.3)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -1913,27 +2341,37 @@
     (path "/cd2b80ee-4278-4cc9-826d-1343b57a7f1b")
     (attr smd)
     (fp_text reference "R15" (at 0 -1.65) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp f0002776-35b2-41c9-b2d2-c0d5ec6293c6)
     )
     (fp_text value "1k" (at 0 1.65) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp a7c454a2-b04a-4a04-b257-26e9001a75e5)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp ad0ccc58-982e-4b15-b1e6-a3b82d9d1add)
     )
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp 8380d9ae-4680-4585-bd42-5fea4c5bb68c))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp 8c6531a9-586d-4be0-a029-67f53309a112))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 2455d769-664a-4242-a87a-ddeea9ad4f59))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 418f4069-3568-47af-a7c4-72509b17c70a))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp 50332dfe-2bfc-4a3d-a7d6-d0769b8e7fe2))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 64ad9dec-5bfb-495c-ae94-94d63c8a7f95))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 2e2e6b3a-25dc-4b27-9365-b0be12e84f7e))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp 8606a74e-76fd-46d2-b660-68042891c3cf))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp c371270f-726f-4e7e-a70b-abc8be26c1e6))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp f9e8baa9-dd5c-44f4-96f5-d154e44f703d))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8c6531a9-586d-4be0-a029-67f53309a112))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8380d9ae-4680-4585-bd42-5fea4c5bb68c))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 418f4069-3568-47af-a7c4-72509b17c70a))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 50332dfe-2bfc-4a3d-a7d6-d0769b8e7fe2))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2455d769-664a-4242-a87a-ddeea9ad4f59))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 64ad9dec-5bfb-495c-ae94-94d63c8a7f95))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2e2e6b3a-25dc-4b27-9365-b0be12e84f7e))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f9e8baa9-dd5c-44f4-96f5-d154e44f703d))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8606a74e-76fd-46d2-b660-68042891c3cf))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c371270f-726f-4e7e-a70b-abc8be26c1e6))
     (pad "1" smd roundrect (at -1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 50 "Net-(R15-Pad1)") (pintype "passive") (tstamp 6cacc426-aae5-4eea-901c-69ff65a46bfb))
     (pad "2" smd roundrect (at 1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -1946,7 +2384,7 @@
   )
 
   (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEE) (tstamp f07cc153-3bd3-4d0a-af07-afa9b1e64716)
+    (tstamp f07cc153-3bd3-4d0a-af07-afa9b1e64716)
     (at 57.5 46)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor handsolder")
@@ -1955,27 +2393,37 @@
     (path "/3f93c667-e38c-4973-afe0-6974a70fa51c")
     (attr smd)
     (fp_text reference "R5" (at 0 -1.65) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp f84a4249-e24e-48fb-b6c3-fc13db437b7e)
     )
     (fp_text value "100" (at 0 1.65) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp d867b820-dc4c-462e-90c1-3ec98a0813c2)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp ed28b41b-0a12-4d11-ba16-0a8d324b3b47)
     )
-    (fp_line (start -0.227064 0.735) (end 0.227064 0.735) (layer "F.SilkS") (width 0.12) (tstamp 749250a9-3af1-42ea-aa84-681a6e6ee38a))
-    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) (layer "F.SilkS") (width 0.12) (tstamp eb01b201-6789-46a6-861e-1eae1de9559f))
-    (fp_line (start 1.85 -0.95) (end 1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp 583e62b5-cb2d-4257-8396-2bc36b042c0e))
-    (fp_line (start -1.85 0.95) (end -1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp c3a16c53-8b4e-4a35-bed4-55a73abc78c2))
-    (fp_line (start 1.85 0.95) (end -1.85 0.95) (layer "F.CrtYd") (width 0.05) (tstamp d20ada32-c298-4236-b95c-4204efad4034))
-    (fp_line (start -1.85 -0.95) (end 1.85 -0.95) (layer "F.CrtYd") (width 0.05) (tstamp df8b5d7d-8b05-4ecd-a879-bdb1372637f2))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp 51de9396-27b7-494b-aa23-71ed655dff3d))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 6e1a3f0a-37d3-438f-ac99-91e72d7a6c33))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 7145b15e-473c-46c6-b2d3-906228d2b48b))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp dee55ace-130f-47b6-8532-e83cce770593))
+    (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp eb01b201-6789-46a6-861e-1eae1de9559f))
+    (fp_line (start -0.227064 0.735) (end 0.227064 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 749250a9-3af1-42ea-aa84-681a6e6ee38a))
+    (fp_line (start -1.85 -0.95) (end 1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp df8b5d7d-8b05-4ecd-a879-bdb1372637f2))
+    (fp_line (start -1.85 0.95) (end -1.85 -0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c3a16c53-8b4e-4a35-bed4-55a73abc78c2))
+    (fp_line (start 1.85 -0.95) (end 1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 583e62b5-cb2d-4257-8396-2bc36b042c0e))
+    (fp_line (start 1.85 0.95) (end -1.85 0.95)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d20ada32-c298-4236-b95c-4204efad4034))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7145b15e-473c-46c6-b2d3-906228d2b48b))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6e1a3f0a-37d3-438f-ac99-91e72d7a6c33))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dee55ace-130f-47b6-8532-e83cce770593))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 51de9396-27b7-494b-aa23-71ed655dff3d))
     (pad "1" smd roundrect (at -1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
       (net 32 "Net-(J7-Pad11)") (pintype "passive") (tstamp 39c02ef9-e2eb-42ba-aaaa-2f599331efc0))
     (pad "2" smd roundrect (at 1 0) (size 1.2 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.208333)
@@ -1988,31 +2436,35 @@
   )
 
   (footprint "V0-Display:1pt3in_OLED" (layer "F.Cu")
-    (tedit 5EF94037) (tstamp f5d55148-2617-43be-be3d-b03754152417)
+    (tstamp f5d55148-2617-43be-be3d-b03754152417)
     (at 38.31 17.6)
     (property "Sheetfile" "V0_McDisplay.kicad_sch")
     (property "Sheetname" "")
     (path "/67549766-f7ff-4908-a7d4-f34b917df88f")
     (attr through_hole)
     (fp_text reference "J14" (at 0 30.25) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 485a3941-6208-4c2d-ad24-29bb9084f431)
     )
     (fp_text value "Display" (at 0 -1.27) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp dc0f22ce-6d3c-4600-9652-53f07815b6f6)
     )
-    (fp_line (start -17.7 -2.2) (end 17.7 -2.2) (layer "F.SilkS") (width 0.15) (tstamp 1e3b3ab8-7e11-4ebe-a9c6-ea554888c405))
-    (fp_line (start -17.7 31.3) (end 17.7 31.3) (layer "F.SilkS") (width 0.15) (tstamp 2785f169-6222-4337-99cf-2aeaceb31a3d))
-    (fp_line (start 17.7 -2.2) (end 17.7 31.3) (layer "F.SilkS") (width 0.15) (tstamp 4bbe70b3-11f5-4ac2-9019-bf0314334c03))
-    (fp_line (start -17.7 -2.2) (end -17.7 31.3) (layer "F.SilkS") (width 0.15) (tstamp f665227d-4e76-4f12-89eb-47c552707489))
-    (pad "1" thru_hole circle locked (at -3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+    (fp_line (start -17.7 -2.2) (end -17.7 31.3)
+      (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp f665227d-4e76-4f12-89eb-47c552707489))
+    (fp_line (start -17.7 -2.2) (end 17.7 -2.2)
+      (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 1e3b3ab8-7e11-4ebe-a9c6-ea554888c405))
+    (fp_line (start -17.7 31.3) (end 17.7 31.3)
+      (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 2785f169-6222-4337-99cf-2aeaceb31a3d))
+    (fp_line (start 17.7 -2.2) (end 17.7 31.3)
+      (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 4bbe70b3-11f5-4ac2-9019-bf0314334c03))
+    (pad "1" thru_hole circle (at -3.81 0) (size 1.524 1.524) (drill 0.762) (layers "*.Cu" "*.Mask")
       (net 44 "PIN1") (pinfunction "Pin_1") (pintype "passive") (tstamp cd6fdddb-06c5-4a67-ad2d-fc8197bd174a))
-    (pad "2" thru_hole circle locked (at -1.27 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+    (pad "2" thru_hole circle (at -1.27 0) (size 1.524 1.524) (drill 0.762) (layers "*.Cu" "*.Mask")
       (net 45 "PIN2") (pinfunction "Pin_2") (pintype "passive") (tstamp 1a01a35a-04b9-4158-89b1-4bab49de9ff2))
-    (pad "3" thru_hole circle locked (at 1.27 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+    (pad "3" thru_hole circle (at 1.27 0) (size 1.524 1.524) (drill 0.762) (layers "*.Cu" "*.Mask")
       (net 46 "SCL") (pinfunction "Pin_3") (pintype "passive") (tstamp 36f59c02-d296-4142-8f2e-cd01d78696be))
-    (pad "4" thru_hole circle locked (at 3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
+    (pad "4" thru_hole circle (at 3.81 0) (size 1.524 1.524) (drill 0.762) (layers "*.Cu" "*.Mask")
       (net 47 "SDA") (pinfunction "Pin_4") (pintype "passive") (tstamp d54fe4f9-53ce-40c9-bfd6-e13267bfe8e8))
     (model "${KIPRJMOD}/Library/3D_Packages/1.3in_OLED_voron.step"
       (offset (xyz 0 -15.35 2.7))
@@ -2022,7 +2474,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "F.Cu")
-    (tedit 5F68FEEF) (tstamp fda579f2-9aad-4d07-96bf-8e00417bbdf5)
+    (tstamp fda579f2-9aad-4d07-96bf-8e00417bbdf5)
     (at 84.4 21.9 90)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -2031,27 +2483,37 @@
     (path "/d0366d65-1516-4260-b374-8b727245384f")
     (attr smd)
     (fp_text reference "C4" (at 0 -1.68 90) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 5356ca70-b844-4b84-b38c-19546bd2c5a5)
     )
     (fp_text value "100n" (at 0 1.68 90) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 36d4dd1c-96d9-45af-9a56-174f5e43ba8c)
     )
     (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp e61cf709-257f-433c-afbf-e48fa8c1ac84)
     )
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "F.SilkS") (width 0.12) (tstamp 30f0391f-58a7-458a-8da7-570a8c2517a0))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "F.SilkS") (width 0.12) (tstamp a7a46952-68fc-452c-b6ef-ec6d98905c64))
-    (fp_line (start 1.88 0.98) (end -1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp 3e86a1a3-1528-4361-9929-431443fc6f0c))
-    (fp_line (start -1.88 -0.98) (end 1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp 42bf9cfe-9490-45b4-8806-bcd8ac7e8696))
-    (fp_line (start -1.88 0.98) (end -1.88 -0.98) (layer "F.CrtYd") (width 0.05) (tstamp a4ba2e67-cbe6-42c1-bc78-e71bad667069))
-    (fp_line (start 1.88 -0.98) (end 1.88 0.98) (layer "F.CrtYd") (width 0.05) (tstamp a78eafcd-eea5-4a7c-a3a9-c4c8878ba18f))
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 56962ab3-91b6-4dde-bdb0-02b2a1fbc8ce))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer "F.Fab") (width 0.1) (tstamp 7c33b07e-e4fb-43c0-a67e-a058170cd610))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer "F.Fab") (width 0.1) (tstamp c3aa3916-cf1a-4ace-977a-d2a911e16b19))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer "F.Fab") (width 0.1) (tstamp d4bf8e42-9733-4b7d-8aa2-ae35ce3f4290))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a7a46952-68fc-452c-b6ef-ec6d98905c64))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 30f0391f-58a7-458a-8da7-570a8c2517a0))
+    (fp_line (start -1.88 -0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 42bf9cfe-9490-45b4-8806-bcd8ac7e8696))
+    (fp_line (start -1.88 0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a4ba2e67-cbe6-42c1-bc78-e71bad667069))
+    (fp_line (start 1.88 -0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a78eafcd-eea5-4a7c-a3a9-c4c8878ba18f))
+    (fp_line (start 1.88 0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3e86a1a3-1528-4361-9929-431443fc6f0c))
+    (fp_line (start -1 -0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7c33b07e-e4fb-43c0-a67e-a058170cd610))
+    (fp_line (start -1 0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 56962ab3-91b6-4dde-bdb0-02b2a1fbc8ce))
+    (fp_line (start 1 -0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c3aa3916-cf1a-4ace-977a-d2a911e16b19))
+    (fp_line (start 1 0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d4bf8e42-9733-4b7d-8aa2-ae35ce3f4290))
     (pad "1" smd roundrect (at -1.0375 0 90) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
       (net 8 "KEY5") (pintype "passive") (tstamp 5a6d43b6-697a-47c6-8878-c80f953b43ce))
     (pad "2" smd roundrect (at 1.0375 0 90) (size 1.175 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.212766)
@@ -2064,32 +2526,33 @@
   )
 
   (footprint "V0-Display:EN11_Encoder" (layer "F.Cu")
-    (tedit 5EF941E5) (tstamp fdd0605c-2742-4f0e-9fb2-face1b0b5948)
+    (tstamp fdd0605c-2742-4f0e-9fb2-face1b0b5948)
     (at 67 32.95)
     (property "Sheetfile" "V0_McDisplay.kicad_sch")
     (property "Sheetname" "")
     (path "/57762299-7792-4ff0-b6c4-c18e6bb441c3")
     (attr through_hole)
     (fp_text reference "SW3" (at 0 5.08) (layer "F.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 02eb394c-0c1f-46af-93cf-ba7c3b5ad578)
     )
     (fp_text value "RotaryEncoder_Switch" (at 0 -5.08) (layer "F.Fab")
-      (effects (font (size 1 1) (thickness 0.15)))
+        (effects (font (size 1 1) (thickness 0.15)))
       (tstamp ad78b441-bd2a-497f-8e67-1a7befae847f)
     )
-    (fp_circle (center 0 0) (end 3.75 0) (layer "F.SilkS") (width 0.15) (fill none) (tstamp 6b551a25-aa10-4615-b356-88b50a4658ee))
-    (pad "A" thru_hole circle locked (at -2.5 7.5) (size 2 2) (drill 1.1) (layers *.Cu *.Mask)
+    (fp_circle (center 0 0) (end 3.75 0)
+      (stroke (width 0.15) (type solid)) (fill none) (layer "F.SilkS") (tstamp 6b551a25-aa10-4615-b356-88b50a4658ee))
+    (pad "A" thru_hole circle (at -2.5 7.5) (size 2 2) (drill 1.1) (layers "*.Cu" "*.Mask")
       (net 52 "ENC_A") (pinfunction "A") (pintype "passive") (tstamp 0d1fe46d-607f-4b93-87c2-69e5ccf9e03b))
-    (pad "B" thru_hole circle locked (at 2.5 7.5) (size 2 2) (drill 1.1) (layers *.Cu *.Mask)
+    (pad "B" thru_hole circle (at 2.5 7.5) (size 2 2) (drill 1.1) (layers "*.Cu" "*.Mask")
       (net 53 "ENC_B") (pinfunction "B") (pintype "passive") (tstamp 345158c7-3a05-4401-832e-73143f747ce8))
-    (pad "C" thru_hole circle locked (at 0 7.5) (size 2 2) (drill 1.1) (layers *.Cu *.Mask)
+    (pad "C" thru_hole circle (at 0 7.5) (size 2 2) (drill 1.1) (layers "*.Cu" "*.Mask")
       (net 6 "GND") (pinfunction "C") (pintype "passive") (tstamp 5576e0ab-9ed5-4017-a61b-7389a97cc936))
-    (pad "MP" thru_hole oval locked (at -5.08 0) (size 2.5 4) (drill oval 2 3) (layers *.Cu *.Mask) (tstamp 055c15f3-7fb3-4253-9cf5-dccc19d171ff))
-    (pad "MP" thru_hole oval locked (at 5.08 0 180) (size 2.5 4) (drill oval 2 3) (layers *.Cu *.Mask) (tstamp 180ab778-110e-4a88-b0bb-7fcf11104e83))
-    (pad "S1" thru_hole circle locked (at -2.5 -7) (size 2 2) (drill 1.1) (layers *.Cu *.Mask)
+    (pad "MP" thru_hole oval (at -5.08 0) (size 2.5 4) (drill oval 2 3) (layers "*.Cu" "*.Mask") (tstamp 055c15f3-7fb3-4253-9cf5-dccc19d171ff))
+    (pad "MP" thru_hole oval (at 5.08 0 180) (size 2.5 4) (drill oval 2 3) (layers "*.Cu" "*.Mask") (tstamp 180ab778-110e-4a88-b0bb-7fcf11104e83))
+    (pad "S1" thru_hole circle (at -2.5 -7) (size 2 2) (drill 1.1) (layers "*.Cu" "*.Mask")
       (net 54 "ENC_SW") (pinfunction "S1") (pintype "passive") (tstamp a9aad0bc-1483-442a-8a29-3326ebcd14d2))
-    (pad "S2" thru_hole circle locked (at 2.5 -7) (size 2 2) (drill 1.1) (layers *.Cu *.Mask)
+    (pad "S2" thru_hole circle (at 2.5 -7) (size 2 2) (drill 1.1) (layers "*.Cu" "*.Mask")
       (net 6 "GND") (pinfunction "S2") (pintype "passive") (tstamp 1a63e8a4-806e-4d6c-93e8-6489f49dbcd0))
     (model "${KIPRJMOD}/Library/3D_Packages/en11-hsm1af15.STEP"
       (offset (xyz 0 0 0))
@@ -2099,7 +2562,7 @@
   )
 
   (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (layer "B.Cu")
-    (tedit 5C28146C) (tstamp 0e2de738-fb76-415c-aa60-ddd9d8ff7130)
+    (tstamp 0e2de738-fb76-415c-aa60-ddd9d8ff7130)
     (at 85.774999 27.95 -90)
     (descr "JST XH series connector, B2B-XH-A (http://www.jst-mfg.com/product/pdf/eng/eXH.pdf), generated with kicad-footprint-generator")
     (tags "connector JST XH vertical")
@@ -2108,54 +2571,88 @@
     (path "/54dc7b9c-e777-4dc4-b273-04ee9c36bf07")
     (attr through_hole)
     (fp_text reference "J15" (at 1.25 3.55 90) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 2739e4bd-fbf9-4202-9d69-da9d970ed975)
     )
     (fp_text value "PH2.54_02" (at 1.25 -4.6 90) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 0539a7c4-39fc-43ac-a222-ae20581ed6d7)
     )
     (fp_text user "${REFERENCE}" (at 1.25 -2.7 90) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 92483d71-9534-44da-9f18-599de1e3c555)
     )
-    (fp_line (start -2.55 0.2) (end -1.8 0.2) (layer "B.SilkS") (width 0.12) (tstamp 06cf1360-703d-4df7-a923-ce2ca35a207d))
-    (fp_line (start -2.55 2.45) (end -2.55 1.7) (layer "B.SilkS") (width 0.12) (tstamp 20ca0e5f-a9d5-4d1b-8943-3f592db11202))
-    (fp_line (start 0.75 1.7) (end 1.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 240d27e1-e9c0-43c4-970d-0d9f8d3a6de7))
-    (fp_line (start 1.75 2.45) (end 0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 310da9fd-a1a1-4df4-9ecb-f5e212eba3a6))
-    (fp_line (start 3.25 2.45) (end 3.25 1.7) (layer "B.SilkS") (width 0.12) (tstamp 36a80b6a-ed6d-4548-80b8-53fdb32a2245))
-    (fp_line (start -1.8 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 36e29066-25b8-4f8e-beee-6969a574fb87))
-    (fp_line (start -2.56 2.46) (end -2.56 -3.51) (layer "B.SilkS") (width 0.12) (tstamp 441f8c9b-afea-46ae-92b0-844d09796d0b))
-    (fp_line (start -1.6 2.75) (end -2.85 2.75) (layer "B.SilkS") (width 0.12) (tstamp 48cc9e2b-0a10-4d66-b307-ee8d34e134da))
-    (fp_line (start 5.06 2.46) (end -2.56 2.46) (layer "B.SilkS") (width 0.12) (tstamp 4df251e5-4dbf-4e03-bea3-d7fe3fe2b525))
-    (fp_line (start -0.75 1.7) (end -0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 5fe7401f-8cde-40ab-b2ba-384ed86b2eaf))
-    (fp_line (start 5.05 2.45) (end 3.25 2.45) (layer "B.SilkS") (width 0.12) (tstamp 790ed8a5-19ce-4555-b025-9205db92f380))
-    (fp_line (start 5.05 0.2) (end 4.3 0.2) (layer "B.SilkS") (width 0.12) (tstamp 7d28072f-5515-4283-8dcf-e9357f290937))
-    (fp_line (start -2.85 2.75) (end -2.85 1.5) (layer "B.SilkS") (width 0.12) (tstamp 87a34105-4cac-476a-a71b-f473fe08b263))
-    (fp_line (start 3.25 1.7) (end 5.05 1.7) (layer "B.SilkS") (width 0.12) (tstamp 94726bff-8c08-45e7-be88-80e4b6436364))
-    (fp_line (start 5.06 -3.51) (end 5.06 2.46) (layer "B.SilkS") (width 0.12) (tstamp 976a8679-e529-45b4-b408-77cfe180cc45))
-    (fp_line (start 4.3 0.2) (end 4.3 -2.75) (layer "B.SilkS") (width 0.12) (tstamp a4a54753-d9e0-4ad4-942e-8fd25a0d94f7))
-    (fp_line (start -1.8 0.2) (end -1.8 -2.75) (layer "B.SilkS") (width 0.12) (tstamp b3fd93a8-d6ce-44d1-a9a0-17a2472be18c))
-    (fp_line (start -2.56 -3.51) (end 5.06 -3.51) (layer "B.SilkS") (width 0.12) (tstamp b8cb210a-7a89-494b-a9d0-c63545159204))
-    (fp_line (start 4.3 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp bfd678a0-fb75-4b08-98f6-4a0f63c22174))
-    (fp_line (start 5.05 1.7) (end 5.05 2.45) (layer "B.SilkS") (width 0.12) (tstamp c0b02b1a-a2ed-44ce-b344-c428a04c9cf7))
-    (fp_line (start 1.75 1.7) (end 1.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp c349ce6f-e29f-43eb-979f-685431505164))
-    (fp_line (start 0.75 2.45) (end 0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp cd123766-2eea-4607-bcdb-2fb4707c8348))
-    (fp_line (start -2.55 1.7) (end -0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp d13e041d-065a-4e80-bf23-8004f139310c))
-    (fp_line (start -0.75 2.45) (end -2.55 2.45) (layer "B.SilkS") (width 0.12) (tstamp fe84a628-ffce-4c74-9390-ade5912e1061))
-    (fp_line (start 5.45 -3.9) (end 5.45 2.85) (layer "B.CrtYd") (width 0.05) (tstamp 0b10ba9d-6f5a-4a4d-9929-390da7048a6a))
-    (fp_line (start -2.95 -3.9) (end 5.45 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp b5886dd4-6086-4e89-9422-6aa518befe19))
-    (fp_line (start 5.45 2.85) (end -2.95 2.85) (layer "B.CrtYd") (width 0.05) (tstamp b89932ca-8f6f-4bf3-b020-1bd6466ed772))
-    (fp_line (start -2.95 2.85) (end -2.95 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp f53fd178-f09e-4443-a878-2e8b76219dc9))
-    (fp_line (start -0.625 2.35) (end 0 1.35) (layer "B.Fab") (width 0.1) (tstamp 9ce59e50-e8da-430f-a6bd-1d75fef44674))
-    (fp_line (start 4.95 -3.4) (end 4.95 2.35) (layer "B.Fab") (width 0.1) (tstamp 9de0446a-fda2-440d-9162-5db885fda5c4))
-    (fp_line (start 4.95 2.35) (end -2.45 2.35) (layer "B.Fab") (width 0.1) (tstamp 9df12e25-7bee-4b99-bc23-1e85637b783c))
-    (fp_line (start 0 1.35) (end 0.625 2.35) (layer "B.Fab") (width 0.1) (tstamp a8700fba-c647-4760-acec-bec7a825645a))
-    (fp_line (start -2.45 2.35) (end -2.45 -3.4) (layer "B.Fab") (width 0.1) (tstamp b86d3674-cf42-49fd-8261-3e3b4732e7d5))
-    (fp_line (start -2.45 -3.4) (end 4.95 -3.4) (layer "B.Fab") (width 0.1) (tstamp e6405466-65eb-4374-8a8d-2a956299dab8))
-    (pad "1" thru_hole roundrect (at 0 0 270) (size 1.7 2) (drill 1) (layers *.Cu *.Mask) (roundrect_rratio 0.147059)
+    (fp_line (start -2.85 2.75) (end -2.85 1.5)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 87a34105-4cac-476a-a71b-f473fe08b263))
+    (fp_line (start -2.56 -3.51) (end 5.06 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b8cb210a-7a89-494b-a9d0-c63545159204))
+    (fp_line (start -2.56 2.46) (end -2.56 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 441f8c9b-afea-46ae-92b0-844d09796d0b))
+    (fp_line (start -2.55 0.2) (end -1.8 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 06cf1360-703d-4df7-a923-ce2ca35a207d))
+    (fp_line (start -2.55 1.7) (end -0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d13e041d-065a-4e80-bf23-8004f139310c))
+    (fp_line (start -2.55 2.45) (end -2.55 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 20ca0e5f-a9d5-4d1b-8943-3f592db11202))
+    (fp_line (start -1.8 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 36e29066-25b8-4f8e-beee-6969a574fb87))
+    (fp_line (start -1.8 0.2) (end -1.8 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b3fd93a8-d6ce-44d1-a9a0-17a2472be18c))
+    (fp_line (start -1.6 2.75) (end -2.85 2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 48cc9e2b-0a10-4d66-b307-ee8d34e134da))
+    (fp_line (start -0.75 1.7) (end -0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5fe7401f-8cde-40ab-b2ba-384ed86b2eaf))
+    (fp_line (start -0.75 2.45) (end -2.55 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fe84a628-ffce-4c74-9390-ade5912e1061))
+    (fp_line (start 0.75 1.7) (end 1.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 240d27e1-e9c0-43c4-970d-0d9f8d3a6de7))
+    (fp_line (start 0.75 2.45) (end 0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp cd123766-2eea-4607-bcdb-2fb4707c8348))
+    (fp_line (start 1.75 1.7) (end 1.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c349ce6f-e29f-43eb-979f-685431505164))
+    (fp_line (start 1.75 2.45) (end 0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 310da9fd-a1a1-4df4-9ecb-f5e212eba3a6))
+    (fp_line (start 3.25 1.7) (end 5.05 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 94726bff-8c08-45e7-be88-80e4b6436364))
+    (fp_line (start 3.25 2.45) (end 3.25 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 36a80b6a-ed6d-4548-80b8-53fdb32a2245))
+    (fp_line (start 4.3 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bfd678a0-fb75-4b08-98f6-4a0f63c22174))
+    (fp_line (start 4.3 0.2) (end 4.3 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a4a54753-d9e0-4ad4-942e-8fd25a0d94f7))
+    (fp_line (start 5.05 0.2) (end 4.3 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7d28072f-5515-4283-8dcf-e9357f290937))
+    (fp_line (start 5.05 1.7) (end 5.05 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c0b02b1a-a2ed-44ce-b344-c428a04c9cf7))
+    (fp_line (start 5.05 2.45) (end 3.25 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 790ed8a5-19ce-4555-b025-9205db92f380))
+    (fp_line (start 5.06 -3.51) (end 5.06 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 976a8679-e529-45b4-b408-77cfe180cc45))
+    (fp_line (start 5.06 2.46) (end -2.56 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4df251e5-4dbf-4e03-bea3-d7fe3fe2b525))
+    (fp_line (start -2.95 -3.9) (end 5.45 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b5886dd4-6086-4e89-9422-6aa518befe19))
+    (fp_line (start -2.95 2.85) (end -2.95 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f53fd178-f09e-4443-a878-2e8b76219dc9))
+    (fp_line (start 5.45 -3.9) (end 5.45 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 0b10ba9d-6f5a-4a4d-9929-390da7048a6a))
+    (fp_line (start 5.45 2.85) (end -2.95 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b89932ca-8f6f-4bf3-b020-1bd6466ed772))
+    (fp_line (start -2.45 -3.4) (end 4.95 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e6405466-65eb-4374-8a8d-2a956299dab8))
+    (fp_line (start -2.45 2.35) (end -2.45 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b86d3674-cf42-49fd-8261-3e3b4732e7d5))
+    (fp_line (start -0.625 2.35) (end 0 1.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9ce59e50-e8da-430f-a6bd-1d75fef44674))
+    (fp_line (start 0 1.35) (end 0.625 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a8700fba-c647-4760-acec-bec7a825645a))
+    (fp_line (start 4.95 -3.4) (end 4.95 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9de0446a-fda2-440d-9162-5db885fda5c4))
+    (fp_line (start 4.95 2.35) (end -2.45 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9df12e25-7bee-4b99-bc23-1e85637b783c))
+    (pad "1" thru_hole roundrect (at 0 0 270) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask") (roundrect_rratio 0.147059)
       (net 19 "Net-(D3-Pad2)") (pinfunction "Pin_1") (pintype "passive") (tstamp a47a6efd-f9bc-4ce6-bf10-d519f238df0c))
-    (pad "2" thru_hole oval (at 2.5 0 270) (size 1.7 2) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 2.5 0 270) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask")
       (net 6 "GND") (pinfunction "Pin_2") (pintype "passive") (tstamp 1aa903f9-f607-485b-b17b-c85dcdeaea97))
     (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -2165,7 +2662,7 @@
   )
 
   (footprint "Connector_PinHeader_1.27mm:PinHeader_2x07_P1.27mm_Vertical_SMD" (layer "B.Cu")
-    (tedit 59FED6E3) (tstamp 0e39f242-85c0-470b-b9ad-200e4ef55492)
+    (tstamp 0e39f242-85c0-470b-b9ad-200e4ef55492)
     (at 49.7 44.1 90)
     (descr "surface-mounted straight pin header, 2x07, 1.27mm pitch, double rows")
     (tags "Surface mounted pin header SMD 2x07 1.27mm double row")
@@ -2174,75 +2671,133 @@
     (path "/3f5a68a1-4e2c-4487-9035-3bf6e51d839c")
     (attr smd)
     (fp_text reference "J7" (at 0 5.505 90) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp a73ea234-6627-4dba-9d8f-9e5f36021b9d)
     )
     (fp_text value "ST-Link V3" (at 0 -5.505 90) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp ab342379-6f9e-4f79-8c72-352ec3dd65b2)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp dc249603-c484-4377-80bd-ef298b82a0d8)
     )
-    (fp_line (start 1.765 4.505) (end 1.765 4.44) (layer "B.SilkS") (width 0.12) (tstamp 07e409d2-f43c-450c-9375-d38660443ac1))
-    (fp_line (start 1.765 -4.44) (end 1.765 -4.505) (layer "B.SilkS") (width 0.12) (tstamp 15705e23-5447-4920-b9d1-329eb0e62f04))
-    (fp_line (start -1.765 -4.44) (end -1.765 -4.505) (layer "B.SilkS") (width 0.12) (tstamp 1d549400-4057-4515-8a3e-207a9976568b))
-    (fp_line (start -1.765 4.505) (end 1.765 4.505) (layer "B.SilkS") (width 0.12) (tstamp 2f0bc06a-56c2-4c92-8935-cb9f6652c967))
-    (fp_line (start -1.765 4.505) (end -1.765 4.44) (layer "B.SilkS") (width 0.12) (tstamp 7d349585-3be2-47a4-ae24-bc0b32454aa8))
-    (fp_line (start -1.765 -4.505) (end 1.765 -4.505) (layer "B.SilkS") (width 0.12) (tstamp bf60eba0-8bfc-41bc-951a-6fb857a076a5))
-    (fp_line (start -3.09 4.44) (end -1.765 4.44) (layer "B.SilkS") (width 0.12) (tstamp fc256b37-04b7-4818-81bb-9a029c88418c))
-    (fp_line (start -4.3 -4.95) (end 4.3 -4.95) (layer "B.CrtYd") (width 0.05) (tstamp 1113fce2-8fa5-4685-a5ef-0aa8c7cbfcad))
-    (fp_line (start -4.3 4.95) (end -4.3 -4.95) (layer "B.CrtYd") (width 0.05) (tstamp 541979f8-d541-4daf-a2eb-b2c83ef3994e))
-    (fp_line (start 4.3 -4.95) (end 4.3 4.95) (layer "B.CrtYd") (width 0.05) (tstamp da1bf2e8-3cea-44a4-99cf-1eeaabfd3780))
-    (fp_line (start 4.3 4.95) (end -4.3 4.95) (layer "B.CrtYd") (width 0.05) (tstamp fbfee3cf-6e73-4236-82db-e91b122252bc))
-    (fp_line (start -1.705 -4.445) (end -1.705 4.01) (layer "B.Fab") (width 0.1) (tstamp 01a63460-82e6-4a57-9dba-675fb9e116a8))
-    (fp_line (start -2.75 -2.34) (end -2.75 -2.74) (layer "B.Fab") (width 0.1) (tstamp 0d9b2a71-0d12-4793-9e8a-db000a83a513))
-    (fp_line (start -2.75 -4.01) (end -1.705 -4.01) (layer "B.Fab") (width 0.1) (tstamp 0e72d5bd-7438-4b1e-a6bf-e8ca544ebca7))
-    (fp_line (start 2.75 -3.61) (end 2.75 -4.01) (layer "B.Fab") (width 0.1) (tstamp 100a2444-4259-45ad-8f0f-e8c022a135fe))
-    (fp_line (start -2.75 -3.61) (end -2.75 -4.01) (layer "B.Fab") (width 0.1) (tstamp 105f7e6e-4582-4c5c-830c-24df33c7ef23))
-    (fp_line (start -2.75 2.74) (end -2.75 2.34) (layer "B.Fab") (width 0.1) (tstamp 15f370be-afe4-4b69-9db6-418fc821892c))
-    (fp_line (start 1.705 0.2) (end 2.75 0.2) (layer "B.Fab") (width 0.1) (tstamp 177d10a3-ee17-4694-8676-e713d6a38776))
-    (fp_line (start -1.705 4.01) (end -1.27 4.445) (layer "B.Fab") (width 0.1) (tstamp 1b0ff2a6-d327-4bf9-9b47-22e09da39a79))
-    (fp_line (start -1.27 4.445) (end 1.705 4.445) (layer "B.Fab") (width 0.1) (tstamp 1da35961-61e9-4f42-a070-c57cc1335d76))
-    (fp_line (start 1.705 2.74) (end 2.75 2.74) (layer "B.Fab") (width 0.1) (tstamp 21e6e57c-8cce-458d-8a9a-2ef77b07a6c2))
-    (fp_line (start 1.705 -2.34) (end 2.75 -2.34) (layer "B.Fab") (width 0.1) (tstamp 21eed609-6fd2-4533-8993-505d21df0dde))
-    (fp_line (start 2.75 -0.2) (end 1.705 -0.2) (layer "B.Fab") (width 0.1) (tstamp 25f1a15a-8319-4182-9b78-d2bca99ef6b5))
-    (fp_line (start -2.75 0.2) (end -2.75 -0.2) (layer "B.Fab") (width 0.1) (tstamp 292a2703-6158-4758-aa9e-dc311f05c981))
-    (fp_line (start 2.75 -4.01) (end 1.705 -4.01) (layer "B.Fab") (width 0.1) (tstamp 33827655-8f25-42e7-a6ca-ba9b975e2bcb))
-    (fp_line (start -1.705 1.47) (end -2.75 1.47) (layer "B.Fab") (width 0.1) (tstamp 38619813-f3fb-4ce0-96f5-bd4afae64621))
-    (fp_line (start -2.75 -0.2) (end -1.705 -0.2) (layer "B.Fab") (width 0.1) (tstamp 3d2e9409-6c92-48eb-b581-5471dce9d5bf))
-    (fp_line (start -2.75 1.47) (end -2.75 1.07) (layer "B.Fab") (width 0.1) (tstamp 47b5bce8-fa28-4488-8b2c-1cb4f78accc5))
-    (fp_line (start -1.705 -2.34) (end -2.75 -2.34) (layer "B.Fab") (width 0.1) (tstamp 4eaa6d51-a383-4146-adc6-61463e198ce9))
-    (fp_line (start -2.75 1.07) (end -1.705 1.07) (layer "B.Fab") (width 0.1) (tstamp 4f667d54-63c0-4f29-8f60-9a02767c34f0))
-    (fp_line (start 2.75 0.2) (end 2.75 -0.2) (layer "B.Fab") (width 0.1) (tstamp 50783d0d-58cc-4517-93b7-d55057c5d2a0))
-    (fp_line (start -2.75 4.01) (end -2.75 3.61) (layer "B.Fab") (width 0.1) (tstamp 51ee2c40-dca6-4094-b34f-afe80b69367c))
-    (fp_line (start 2.75 2.34) (end 1.705 2.34) (layer "B.Fab") (width 0.1) (tstamp 52035d4c-5d79-4f65-8a3f-ee1c3a5df686))
-    (fp_line (start 2.75 1.47) (end 2.75 1.07) (layer "B.Fab") (width 0.1) (tstamp 6212f60f-3ac7-428b-bd6f-4a8639261b70))
-    (fp_line (start 1.705 1.47) (end 2.75 1.47) (layer "B.Fab") (width 0.1) (tstamp 630e526d-c26a-49ab-811d-fc259e05ce56))
-    (fp_line (start -1.705 0.2) (end -2.75 0.2) (layer "B.Fab") (width 0.1) (tstamp 6ba5356b-6707-4973-a7e4-477568faad64))
-    (fp_line (start 2.75 2.74) (end 2.75 2.34) (layer "B.Fab") (width 0.1) (tstamp 6d4b197f-2232-48b6-a8d2-bdd427939b0c))
-    (fp_line (start 1.705 4.445) (end 1.705 -4.445) (layer "B.Fab") (width 0.1) (tstamp 70dd43fe-5037-4e14-9d45-7014d4391385))
-    (fp_line (start 2.75 -2.34) (end 2.75 -2.74) (layer "B.Fab") (width 0.1) (tstamp 7e96698d-5db3-4e61-8394-22e7108067d5))
-    (fp_line (start 1.705 -4.445) (end -1.705 -4.445) (layer "B.Fab") (width 0.1) (tstamp 8cc26f40-701d-4a6e-9bc4-4caae812e1d8))
-    (fp_line (start 1.705 -3.61) (end 2.75 -3.61) (layer "B.Fab") (width 0.1) (tstamp 8e81c731-242e-4be0-8d81-6d30ee9e0004))
-    (fp_line (start -1.705 -1.07) (end -2.75 -1.07) (layer "B.Fab") (width 0.1) (tstamp 8fb661e7-413f-4b54-8228-3af0c9c94dfd))
-    (fp_line (start -1.705 4.01) (end -2.75 4.01) (layer "B.Fab") (width 0.1) (tstamp 905df7f2-bade-40aa-a744-f63d554694f9))
-    (fp_line (start 2.75 4.01) (end 2.75 3.61) (layer "B.Fab") (width 0.1) (tstamp 9890cc53-59a8-4e14-b30a-049b210a5b45))
-    (fp_line (start -2.75 -1.07) (end -2.75 -1.47) (layer "B.Fab") (width 0.1) (tstamp a6006f3c-a816-44d5-8366-8561d60326a7))
-    (fp_line (start -2.75 -1.47) (end -1.705 -1.47) (layer "B.Fab") (width 0.1) (tstamp af2a8008-bed5-42d1-80c4-356859b813d8))
-    (fp_line (start 2.75 1.07) (end 1.705 1.07) (layer "B.Fab") (width 0.1) (tstamp bf85879e-4cdc-46db-a9e8-f8cf14cfd357))
-    (fp_line (start 1.705 4.01) (end 2.75 4.01) (layer "B.Fab") (width 0.1) (tstamp c6d8dfc8-d737-4b8b-94b7-176d0c4322f3))
-    (fp_line (start 2.75 3.61) (end 1.705 3.61) (layer "B.Fab") (width 0.1) (tstamp c89d2e7b-3649-456e-bbdd-3535a3075db0))
-    (fp_line (start 2.75 -2.74) (end 1.705 -2.74) (layer "B.Fab") (width 0.1) (tstamp dbd953f6-56bb-4c66-926a-1c69e6a97b76))
-    (fp_line (start -2.75 -2.74) (end -1.705 -2.74) (layer "B.Fab") (width 0.1) (tstamp dec8d13d-8b6a-4105-92a0-2e726ba96275))
-    (fp_line (start -2.75 2.34) (end -1.705 2.34) (layer "B.Fab") (width 0.1) (tstamp def4cfe4-253a-4a90-9248-f0f7ff5464c9))
-    (fp_line (start 2.75 -1.47) (end 1.705 -1.47) (layer "B.Fab") (width 0.1) (tstamp e058e277-007e-44bd-a9db-041f0cd0cf8d))
-    (fp_line (start 1.705 -1.07) (end 2.75 -1.07) (layer "B.Fab") (width 0.1) (tstamp e904fae8-6d75-412b-a43e-30cfbd2d56f1))
-    (fp_line (start -2.75 3.61) (end -1.705 3.61) (layer "B.Fab") (width 0.1) (tstamp f2e21c8d-140e-49b0-af4f-21f3644151ff))
-    (fp_line (start -1.705 2.74) (end -2.75 2.74) (layer "B.Fab") (width 0.1) (tstamp f31dc490-ec78-47a6-a273-cb12a1e16bdf))
-    (fp_line (start -1.705 -3.61) (end -2.75 -3.61) (layer "B.Fab") (width 0.1) (tstamp f51b05d4-c001-4b4a-b4c0-5b4bceaa99af))
-    (fp_line (start 2.75 -1.07) (end 2.75 -1.47) (layer "B.Fab") (width 0.1) (tstamp f7018a2b-9134-4052-a320-0633aae1420f))
+    (fp_line (start -3.09 4.44) (end -1.765 4.44)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fc256b37-04b7-4818-81bb-9a029c88418c))
+    (fp_line (start -1.765 -4.505) (end 1.765 -4.505)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bf60eba0-8bfc-41bc-951a-6fb857a076a5))
+    (fp_line (start -1.765 -4.44) (end -1.765 -4.505)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1d549400-4057-4515-8a3e-207a9976568b))
+    (fp_line (start -1.765 4.505) (end -1.765 4.44)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7d349585-3be2-47a4-ae24-bc0b32454aa8))
+    (fp_line (start -1.765 4.505) (end 1.765 4.505)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2f0bc06a-56c2-4c92-8935-cb9f6652c967))
+    (fp_line (start 1.765 -4.44) (end 1.765 -4.505)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 15705e23-5447-4920-b9d1-329eb0e62f04))
+    (fp_line (start 1.765 4.505) (end 1.765 4.44)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 07e409d2-f43c-450c-9375-d38660443ac1))
+    (fp_line (start -4.3 -4.95) (end 4.3 -4.95)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1113fce2-8fa5-4685-a5ef-0aa8c7cbfcad))
+    (fp_line (start -4.3 4.95) (end -4.3 -4.95)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 541979f8-d541-4daf-a2eb-b2c83ef3994e))
+    (fp_line (start 4.3 -4.95) (end 4.3 4.95)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp da1bf2e8-3cea-44a4-99cf-1eeaabfd3780))
+    (fp_line (start 4.3 4.95) (end -4.3 4.95)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fbfee3cf-6e73-4236-82db-e91b122252bc))
+    (fp_line (start -2.75 -4.01) (end -1.705 -4.01)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0e72d5bd-7438-4b1e-a6bf-e8ca544ebca7))
+    (fp_line (start -2.75 -3.61) (end -2.75 -4.01)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 105f7e6e-4582-4c5c-830c-24df33c7ef23))
+    (fp_line (start -2.75 -2.74) (end -1.705 -2.74)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dec8d13d-8b6a-4105-92a0-2e726ba96275))
+    (fp_line (start -2.75 -2.34) (end -2.75 -2.74)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0d9b2a71-0d12-4793-9e8a-db000a83a513))
+    (fp_line (start -2.75 -1.47) (end -1.705 -1.47)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp af2a8008-bed5-42d1-80c4-356859b813d8))
+    (fp_line (start -2.75 -1.07) (end -2.75 -1.47)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a6006f3c-a816-44d5-8366-8561d60326a7))
+    (fp_line (start -2.75 -0.2) (end -1.705 -0.2)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3d2e9409-6c92-48eb-b581-5471dce9d5bf))
+    (fp_line (start -2.75 0.2) (end -2.75 -0.2)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 292a2703-6158-4758-aa9e-dc311f05c981))
+    (fp_line (start -2.75 1.07) (end -1.705 1.07)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4f667d54-63c0-4f29-8f60-9a02767c34f0))
+    (fp_line (start -2.75 1.47) (end -2.75 1.07)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 47b5bce8-fa28-4488-8b2c-1cb4f78accc5))
+    (fp_line (start -2.75 2.34) (end -1.705 2.34)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp def4cfe4-253a-4a90-9248-f0f7ff5464c9))
+    (fp_line (start -2.75 2.74) (end -2.75 2.34)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 15f370be-afe4-4b69-9db6-418fc821892c))
+    (fp_line (start -2.75 3.61) (end -1.705 3.61)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f2e21c8d-140e-49b0-af4f-21f3644151ff))
+    (fp_line (start -2.75 4.01) (end -2.75 3.61)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 51ee2c40-dca6-4094-b34f-afe80b69367c))
+    (fp_line (start -1.705 -4.445) (end -1.705 4.01)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 01a63460-82e6-4a57-9dba-675fb9e116a8))
+    (fp_line (start -1.705 -3.61) (end -2.75 -3.61)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f51b05d4-c001-4b4a-b4c0-5b4bceaa99af))
+    (fp_line (start -1.705 -2.34) (end -2.75 -2.34)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4eaa6d51-a383-4146-adc6-61463e198ce9))
+    (fp_line (start -1.705 -1.07) (end -2.75 -1.07)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8fb661e7-413f-4b54-8228-3af0c9c94dfd))
+    (fp_line (start -1.705 0.2) (end -2.75 0.2)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6ba5356b-6707-4973-a7e4-477568faad64))
+    (fp_line (start -1.705 1.47) (end -2.75 1.47)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 38619813-f3fb-4ce0-96f5-bd4afae64621))
+    (fp_line (start -1.705 2.74) (end -2.75 2.74)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f31dc490-ec78-47a6-a273-cb12a1e16bdf))
+    (fp_line (start -1.705 4.01) (end -2.75 4.01)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 905df7f2-bade-40aa-a744-f63d554694f9))
+    (fp_line (start -1.705 4.01) (end -1.27 4.445)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1b0ff2a6-d327-4bf9-9b47-22e09da39a79))
+    (fp_line (start -1.27 4.445) (end 1.705 4.445)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1da35961-61e9-4f42-a070-c57cc1335d76))
+    (fp_line (start 1.705 -4.445) (end -1.705 -4.445)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8cc26f40-701d-4a6e-9bc4-4caae812e1d8))
+    (fp_line (start 1.705 -3.61) (end 2.75 -3.61)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8e81c731-242e-4be0-8d81-6d30ee9e0004))
+    (fp_line (start 1.705 -2.34) (end 2.75 -2.34)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 21eed609-6fd2-4533-8993-505d21df0dde))
+    (fp_line (start 1.705 -1.07) (end 2.75 -1.07)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e904fae8-6d75-412b-a43e-30cfbd2d56f1))
+    (fp_line (start 1.705 0.2) (end 2.75 0.2)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 177d10a3-ee17-4694-8676-e713d6a38776))
+    (fp_line (start 1.705 1.47) (end 2.75 1.47)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 630e526d-c26a-49ab-811d-fc259e05ce56))
+    (fp_line (start 1.705 2.74) (end 2.75 2.74)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 21e6e57c-8cce-458d-8a9a-2ef77b07a6c2))
+    (fp_line (start 1.705 4.01) (end 2.75 4.01)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c6d8dfc8-d737-4b8b-94b7-176d0c4322f3))
+    (fp_line (start 1.705 4.445) (end 1.705 -4.445)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 70dd43fe-5037-4e14-9d45-7014d4391385))
+    (fp_line (start 2.75 -4.01) (end 1.705 -4.01)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 33827655-8f25-42e7-a6ca-ba9b975e2bcb))
+    (fp_line (start 2.75 -3.61) (end 2.75 -4.01)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 100a2444-4259-45ad-8f0f-e8c022a135fe))
+    (fp_line (start 2.75 -2.74) (end 1.705 -2.74)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dbd953f6-56bb-4c66-926a-1c69e6a97b76))
+    (fp_line (start 2.75 -2.34) (end 2.75 -2.74)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7e96698d-5db3-4e61-8394-22e7108067d5))
+    (fp_line (start 2.75 -1.47) (end 1.705 -1.47)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e058e277-007e-44bd-a9db-041f0cd0cf8d))
+    (fp_line (start 2.75 -1.07) (end 2.75 -1.47)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f7018a2b-9134-4052-a320-0633aae1420f))
+    (fp_line (start 2.75 -0.2) (end 1.705 -0.2)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 25f1a15a-8319-4182-9b78-d2bca99ef6b5))
+    (fp_line (start 2.75 0.2) (end 2.75 -0.2)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 50783d0d-58cc-4517-93b7-d55057c5d2a0))
+    (fp_line (start 2.75 1.07) (end 1.705 1.07)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bf85879e-4cdc-46db-a9e8-f8cf14cfd357))
+    (fp_line (start 2.75 1.47) (end 2.75 1.07)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6212f60f-3ac7-428b-bd6f-4a8639261b70))
+    (fp_line (start 2.75 2.34) (end 1.705 2.34)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 52035d4c-5d79-4f65-8a3f-ee1c3a5df686))
+    (fp_line (start 2.75 2.74) (end 2.75 2.34)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6d4b197f-2232-48b6-a8d2-bdd427939b0c))
+    (fp_line (start 2.75 3.61) (end 1.705 3.61)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c89d2e7b-3649-456e-bbdd-3535a3075db0))
+    (fp_line (start 2.75 4.01) (end 2.75 3.61)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9890cc53-59a8-4e14-b30a-049b210a5b45))
     (pad "1" smd rect (at -1.95 3.81 90) (size 2.4 0.74) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 25 "unconnected-(J7-Pad1)") (pinfunction "Pin_1") (pintype "passive+no_connect") (tstamp 87d8b0e7-fccc-4024-8348-648558552693))
     (pad "2" smd rect (at 1.95 3.81 90) (size 2.4 0.74) (layers "B.Cu" "B.Paste" "B.Mask")
@@ -2279,7 +2834,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "B.Cu")
-    (tedit 5F68FEEF) (tstamp 155f1c4e-4543-437c-9010-f2693e5305bd)
+    (tstamp 155f1c4e-4543-437c-9010-f2693e5305bd)
     (at 33.460952 57.15 180)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -2288,27 +2843,37 @@
     (path "/7b718e77-4a08-412b-a122-811508060752")
     (attr smd)
     (fp_text reference "C17" (at 0 1.68) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp c0463224-5c58-48e8-b477-b81b3c8cd16a)
     )
     (fp_text value "100n" (at 0 -1.68) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 40e50682-0913-4797-8c3e-5509f6a93cf7)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "B.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+        (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
       (tstamp 0f3d7338-d61f-4eb0-a7ab-d05ce56ae1db)
     )
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "B.SilkS") (width 0.12) (tstamp 1d6574d0-5aab-4d26-aaeb-0db30f3805a5))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "B.SilkS") (width 0.12) (tstamp ea02426e-f5df-487a-86e5-c6a17b65ddda))
-    (fp_line (start 1.88 0.98) (end 1.88 -0.98) (layer "B.CrtYd") (width 0.05) (tstamp 12354626-a56f-43c1-998a-1cf87017a573))
-    (fp_line (start 1.88 -0.98) (end -1.88 -0.98) (layer "B.CrtYd") (width 0.05) (tstamp 1e2cfd73-264d-4129-9569-22a8950e27c6))
-    (fp_line (start -1.88 -0.98) (end -1.88 0.98) (layer "B.CrtYd") (width 0.05) (tstamp 5af4ff68-6b9c-43f6-9a45-4614b578114c))
-    (fp_line (start -1.88 0.98) (end 1.88 0.98) (layer "B.CrtYd") (width 0.05) (tstamp 5b3413cd-5f17-43cd-a462-9479ca401e0d))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer "B.Fab") (width 0.1) (tstamp 033b61dc-f673-406c-a02b-9f498387d997))
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer "B.Fab") (width 0.1) (tstamp 358f801c-cc5f-4bc5-83a9-8252fbb96c44))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer "B.Fab") (width 0.1) (tstamp b74bcecc-6a43-489c-b855-e5a1927f9df7))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer "B.Fab") (width 0.1) (tstamp d60939d4-0a5f-42c1-98a8-858189602a57))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1d6574d0-5aab-4d26-aaeb-0db30f3805a5))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ea02426e-f5df-487a-86e5-c6a17b65ddda))
+    (fp_line (start -1.88 -0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5af4ff68-6b9c-43f6-9a45-4614b578114c))
+    (fp_line (start -1.88 0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5b3413cd-5f17-43cd-a462-9479ca401e0d))
+    (fp_line (start 1.88 -0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1e2cfd73-264d-4129-9569-22a8950e27c6))
+    (fp_line (start 1.88 0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 12354626-a56f-43c1-998a-1cf87017a573))
+    (fp_line (start -1 -0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 358f801c-cc5f-4bc5-83a9-8252fbb96c44))
+    (fp_line (start -1 0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d60939d4-0a5f-42c1-98a8-858189602a57))
+    (fp_line (start 1 -0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b74bcecc-6a43-489c-b855-e5a1927f9df7))
+    (fp_line (start 1 0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 033b61dc-f673-406c-a02b-9f498387d997))
     (pad "1" smd roundrect (at -1.0375 0 180) (size 1.175 1.45) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.212766)
       (net 12 "+3.3V") (pintype "passive") (tstamp 1301ba16-ac1c-4f26-8223-c46575131c81))
     (pad "2" smd roundrect (at 1.0375 0 180) (size 1.175 1.45) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.212766)
@@ -2321,7 +2886,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "B.Cu")
-    (tedit 5F68FEEF) (tstamp 272daf82-4ee9-4651-beda-ad272f5d1321)
+    (tstamp 272daf82-4ee9-4651-beda-ad272f5d1321)
     (at 41.960952 57.05 180)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -2330,27 +2895,37 @@
     (path "/86c9ce96-d2e4-4a3a-b1f3-2c8b3b5b4723")
     (attr smd)
     (fp_text reference "C16" (at 0 1.68) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 35c68413-7be3-4511-bec0-2225901410dc)
     )
     (fp_text value "100n" (at 0 -1.68) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp fc9393a1-8ade-40b6-856d-70e025466acc)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "B.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+        (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
       (tstamp e46659a8-76cc-4e76-92bb-64210d0b0a73)
     )
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "B.SilkS") (width 0.12) (tstamp 45168bdc-2fc3-47f5-b977-38ad82fe0a20))
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "B.SilkS") (width 0.12) (tstamp cc792223-ceed-4faa-926f-9e7676f5f68a))
-    (fp_line (start -1.88 -0.98) (end -1.88 0.98) (layer "B.CrtYd") (width 0.05) (tstamp 304eb092-51b1-4760-9b95-4368db213e6f))
-    (fp_line (start -1.88 0.98) (end 1.88 0.98) (layer "B.CrtYd") (width 0.05) (tstamp 817565c7-3ee3-4a15-a88c-13acaadd78b8))
-    (fp_line (start 1.88 0.98) (end 1.88 -0.98) (layer "B.CrtYd") (width 0.05) (tstamp a07935bf-8c21-4b5c-b10d-7e68ed6d6e2b))
-    (fp_line (start 1.88 -0.98) (end -1.88 -0.98) (layer "B.CrtYd") (width 0.05) (tstamp eba74ba6-dc82-467d-b0ad-693dcdb777a3))
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer "B.Fab") (width 0.1) (tstamp 8753bafa-ee6b-4b0b-95a0-dac61ebeda80))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer "B.Fab") (width 0.1) (tstamp bae5b2cc-f0e2-4cdb-a063-b682c7dcb325))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer "B.Fab") (width 0.1) (tstamp df581612-77d1-4527-ae3a-93348910cce0))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer "B.Fab") (width 0.1) (tstamp f3b22e01-ca88-4a6c-ab9f-8610f7d3f19c))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp cc792223-ceed-4faa-926f-9e7676f5f68a))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 45168bdc-2fc3-47f5-b977-38ad82fe0a20))
+    (fp_line (start -1.88 -0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 304eb092-51b1-4760-9b95-4368db213e6f))
+    (fp_line (start -1.88 0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 817565c7-3ee3-4a15-a88c-13acaadd78b8))
+    (fp_line (start 1.88 -0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp eba74ba6-dc82-467d-b0ad-693dcdb777a3))
+    (fp_line (start 1.88 0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a07935bf-8c21-4b5c-b10d-7e68ed6d6e2b))
+    (fp_line (start -1 -0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8753bafa-ee6b-4b0b-95a0-dac61ebeda80))
+    (fp_line (start -1 0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp bae5b2cc-f0e2-4cdb-a063-b682c7dcb325))
+    (fp_line (start 1 -0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp df581612-77d1-4527-ae3a-93348910cce0))
+    (fp_line (start 1 0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f3b22e01-ca88-4a6c-ab9f-8610f7d3f19c))
     (pad "1" smd roundrect (at -1.0375 0 180) (size 1.175 1.45) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.212766)
       (net 12 "+3.3V") (pintype "passive") (tstamp c1472802-16d7-4931-8d87-0cfc17cd483a))
     (pad "2" smd roundrect (at 1.0375 0 180) (size 1.175 1.45) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.212766)
@@ -2363,7 +2938,7 @@
   )
 
   (footprint "Package_QFP:LQFP-48_7x7mm_P0.5mm" (layer "B.Cu")
-    (tedit 5D9F72AF) (tstamp 33fa21cb-a289-449d-9bbe-49ab2960d44d)
+    (tstamp 33fa21cb-a289-449d-9bbe-49ab2960d44d)
     (at 43.3 32.9)
     (descr "LQFP, 48 Pin (https://www.analog.com/media/en/technical-documentation/data-sheets/ltc2358-16.pdf), generated with kicad-footprint-generator ipc_gullwing_generator.py")
     (tags "LQFP QFP")
@@ -2372,55 +2947,93 @@
     (path "/02ad564b-979f-4a86-b276-d8e620bb1976")
     (attr smd)
     (fp_text reference "U3" (at 0 5.85) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp e44e8f70-3446-4e71-8049-74f2d6ec0213)
     )
     (fp_text value "STM32F072C8Tx" (at 0 -5.85) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 00e02035-96b2-4fcc-8d9c-d4ed71215021)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp d0a12f68-c1ff-41a2-96a2-870e12a3e9e6)
     )
-    (fp_line (start -3.61 3.61) (end -3.61 3.16) (layer "B.SilkS") (width 0.12) (tstamp 27f4bf9b-d548-4f82-a2cd-62eecbaa1bb9))
-    (fp_line (start -3.16 -3.61) (end -3.61 -3.61) (layer "B.SilkS") (width 0.12) (tstamp 448474a2-c0b2-4c55-b2bd-616212268696))
-    (fp_line (start 3.61 3.61) (end 3.61 3.16) (layer "B.SilkS") (width 0.12) (tstamp 723dca64-a24d-437d-8c7d-d7729a86387f))
-    (fp_line (start 3.16 -3.61) (end 3.61 -3.61) (layer "B.SilkS") (width 0.12) (tstamp 764a401f-55ce-4f0d-a172-b165a3192cba))
-    (fp_line (start -3.16 3.61) (end -3.61 3.61) (layer "B.SilkS") (width 0.12) (tstamp 8874fdc1-2c5b-4e13-beb3-0063b6b475fc))
-    (fp_line (start -3.61 3.16) (end -4.9 3.16) (layer "B.SilkS") (width 0.12) (tstamp 9a06ece8-16e8-4ced-8530-887a4fcaa57a))
-    (fp_line (start 3.61 -3.61) (end 3.61 -3.16) (layer "B.SilkS") (width 0.12) (tstamp b8a1fb69-4b0b-4fa7-86d6-0a085b7baa8f))
-    (fp_line (start -3.61 -3.61) (end -3.61 -3.16) (layer "B.SilkS") (width 0.12) (tstamp d75d29e9-4046-4cd5-9043-f7037ac60242))
-    (fp_line (start 3.16 3.61) (end 3.61 3.61) (layer "B.SilkS") (width 0.12) (tstamp e05b7136-c427-461d-afde-5d91e8b4fda0))
-    (fp_line (start -3.15 5.15) (end -3.15 3.75) (layer "B.CrtYd") (width 0.05) (tstamp 16731219-7c1e-409c-bc17-afe7b8dd1360))
-    (fp_line (start 3.75 3.75) (end 3.75 3.15) (layer "B.CrtYd") (width 0.05) (tstamp 1f4d6b62-85ca-4e41-b72b-2d8c8c43b3fe))
-    (fp_line (start 3.75 -3.75) (end 3.75 -3.15) (layer "B.CrtYd") (width 0.05) (tstamp 28212d9f-a28f-4b92-aa70-5feaf8b264de))
-    (fp_line (start 0 5.15) (end 3.15 5.15) (layer "B.CrtYd") (width 0.05) (tstamp 3a00ae54-d243-417a-a135-5bc0c6fe0434))
-    (fp_line (start -3.75 -3.75) (end -3.75 -3.15) (layer "B.CrtYd") (width 0.05) (tstamp 3e5584dc-aa47-422e-b67e-b071a0e01d8e))
-    (fp_line (start 5.15 3.15) (end 5.15 0) (layer "B.CrtYd") (width 0.05) (tstamp 4646e388-481e-4d7a-be51-da9cda1118e5))
-    (fp_line (start 3.75 3.15) (end 5.15 3.15) (layer "B.CrtYd") (width 0.05) (tstamp 49af546d-938c-408b-bd12-3d2000dd3eec))
-    (fp_line (start 3.15 3.75) (end 3.75 3.75) (layer "B.CrtYd") (width 0.05) (tstamp 4dc6281d-0629-4c64-88c7-f3e07cb14082))
-    (fp_line (start 0 5.15) (end -3.15 5.15) (layer "B.CrtYd") (width 0.05) (tstamp 64b510da-5a39-473e-993a-f05d2833c11b))
-    (fp_line (start -3.15 -5.15) (end -3.15 -3.75) (layer "B.CrtYd") (width 0.05) (tstamp 6a442a0e-9e28-4c5e-a9de-99a7a5650cff))
-    (fp_line (start 5.15 -3.15) (end 5.15 0) (layer "B.CrtYd") (width 0.05) (tstamp 7c96defb-5d0a-40c4-b72e-c2474b00a701))
-    (fp_line (start -3.75 3.15) (end -5.15 3.15) (layer "B.CrtYd") (width 0.05) (tstamp 8af3ed98-276f-4f06-81d6-ea6796678dca))
-    (fp_line (start -3.15 3.75) (end -3.75 3.75) (layer "B.CrtYd") (width 0.05) (tstamp 8fa9e8f0-a937-4a2b-b97a-7da4d7b7985d))
-    (fp_line (start 3.15 -5.15) (end 3.15 -3.75) (layer "B.CrtYd") (width 0.05) (tstamp 945acd5c-09f9-489c-9ae9-c85ef486efff))
-    (fp_line (start 3.75 -3.15) (end 5.15 -3.15) (layer "B.CrtYd") (width 0.05) (tstamp adabbf1c-0b72-4585-bdfc-e14c130b0c65))
-    (fp_line (start 0 -5.15) (end 3.15 -5.15) (layer "B.CrtYd") (width 0.05) (tstamp ae647cd8-71e9-4061-a00e-994ddc79fb2d))
-    (fp_line (start -3.15 -3.75) (end -3.75 -3.75) (layer "B.CrtYd") (width 0.05) (tstamp b947e0d0-eae9-4cd3-997c-148dcbaf146e))
-    (fp_line (start 3.15 5.15) (end 3.15 3.75) (layer "B.CrtYd") (width 0.05) (tstamp bde0eed1-a32c-4ea2-8f96-fcb2db3993b3))
-    (fp_line (start 3.15 -3.75) (end 3.75 -3.75) (layer "B.CrtYd") (width 0.05) (tstamp bdf8cfc8-e2a7-4850-950e-8abffca25aeb))
-    (fp_line (start -3.75 -3.15) (end -5.15 -3.15) (layer "B.CrtYd") (width 0.05) (tstamp d6181c3a-d4bf-4261-b4e8-1743194d91d1))
-    (fp_line (start -3.75 3.75) (end -3.75 3.15) (layer "B.CrtYd") (width 0.05) (tstamp df62f690-53a7-4599-878a-9a8cde1fd566))
-    (fp_line (start 0 -5.15) (end -3.15 -5.15) (layer "B.CrtYd") (width 0.05) (tstamp dfc30f1e-aafc-47e2-94b1-825ffe0cdf7d))
-    (fp_line (start -5.15 -3.15) (end -5.15 0) (layer "B.CrtYd") (width 0.05) (tstamp f33677a2-6e0c-4260-81e2-66542dc760c1))
-    (fp_line (start -5.15 3.15) (end -5.15 0) (layer "B.CrtYd") (width 0.05) (tstamp f6131ddb-53fa-4ca4-bcc0-3066390f1b11))
-    (fp_line (start -3.5 -3.5) (end -3.5 2.5) (layer "B.Fab") (width 0.1) (tstamp 12540fbb-4367-46ba-b54d-b3a4db932d3a))
-    (fp_line (start 3.5 3.5) (end 3.5 -3.5) (layer "B.Fab") (width 0.1) (tstamp 5be3c8b8-b8c6-4ee7-87e9-56b1f58c9b10))
-    (fp_line (start 3.5 -3.5) (end -3.5 -3.5) (layer "B.Fab") (width 0.1) (tstamp 646927f8-e392-4ab3-aad4-9cb975e7ac51))
-    (fp_line (start -3.5 2.5) (end -2.5 3.5) (layer "B.Fab") (width 0.1) (tstamp 7c5b4a39-d084-49ad-83a7-cd4a544c5259))
-    (fp_line (start -2.5 3.5) (end 3.5 3.5) (layer "B.Fab") (width 0.1) (tstamp 868178ba-d860-49e7-a60b-6794595db6f7))
+    (fp_line (start -3.61 -3.61) (end -3.61 -3.16)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d75d29e9-4046-4cd5-9043-f7037ac60242))
+    (fp_line (start -3.61 3.16) (end -4.9 3.16)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 9a06ece8-16e8-4ced-8530-887a4fcaa57a))
+    (fp_line (start -3.61 3.61) (end -3.61 3.16)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 27f4bf9b-d548-4f82-a2cd-62eecbaa1bb9))
+    (fp_line (start -3.16 -3.61) (end -3.61 -3.61)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 448474a2-c0b2-4c55-b2bd-616212268696))
+    (fp_line (start -3.16 3.61) (end -3.61 3.61)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8874fdc1-2c5b-4e13-beb3-0063b6b475fc))
+    (fp_line (start 3.16 -3.61) (end 3.61 -3.61)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 764a401f-55ce-4f0d-a172-b165a3192cba))
+    (fp_line (start 3.16 3.61) (end 3.61 3.61)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e05b7136-c427-461d-afde-5d91e8b4fda0))
+    (fp_line (start 3.61 -3.61) (end 3.61 -3.16)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b8a1fb69-4b0b-4fa7-86d6-0a085b7baa8f))
+    (fp_line (start 3.61 3.61) (end 3.61 3.16)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 723dca64-a24d-437d-8c7d-d7729a86387f))
+    (fp_line (start -5.15 -3.15) (end -5.15 0)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f33677a2-6e0c-4260-81e2-66542dc760c1))
+    (fp_line (start -5.15 3.15) (end -5.15 0)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f6131ddb-53fa-4ca4-bcc0-3066390f1b11))
+    (fp_line (start -3.75 -3.75) (end -3.75 -3.15)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3e5584dc-aa47-422e-b67e-b071a0e01d8e))
+    (fp_line (start -3.75 -3.15) (end -5.15 -3.15)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d6181c3a-d4bf-4261-b4e8-1743194d91d1))
+    (fp_line (start -3.75 3.15) (end -5.15 3.15)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8af3ed98-276f-4f06-81d6-ea6796678dca))
+    (fp_line (start -3.75 3.75) (end -3.75 3.15)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp df62f690-53a7-4599-878a-9a8cde1fd566))
+    (fp_line (start -3.15 -5.15) (end -3.15 -3.75)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6a442a0e-9e28-4c5e-a9de-99a7a5650cff))
+    (fp_line (start -3.15 -3.75) (end -3.75 -3.75)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b947e0d0-eae9-4cd3-997c-148dcbaf146e))
+    (fp_line (start -3.15 3.75) (end -3.75 3.75)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8fa9e8f0-a937-4a2b-b97a-7da4d7b7985d))
+    (fp_line (start -3.15 5.15) (end -3.15 3.75)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 16731219-7c1e-409c-bc17-afe7b8dd1360))
+    (fp_line (start 0 -5.15) (end -3.15 -5.15)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp dfc30f1e-aafc-47e2-94b1-825ffe0cdf7d))
+    (fp_line (start 0 -5.15) (end 3.15 -5.15)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ae647cd8-71e9-4061-a00e-994ddc79fb2d))
+    (fp_line (start 0 5.15) (end -3.15 5.15)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 64b510da-5a39-473e-993a-f05d2833c11b))
+    (fp_line (start 0 5.15) (end 3.15 5.15)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3a00ae54-d243-417a-a135-5bc0c6fe0434))
+    (fp_line (start 3.15 -5.15) (end 3.15 -3.75)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 945acd5c-09f9-489c-9ae9-c85ef486efff))
+    (fp_line (start 3.15 -3.75) (end 3.75 -3.75)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bdf8cfc8-e2a7-4850-950e-8abffca25aeb))
+    (fp_line (start 3.15 3.75) (end 3.75 3.75)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4dc6281d-0629-4c64-88c7-f3e07cb14082))
+    (fp_line (start 3.15 5.15) (end 3.15 3.75)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bde0eed1-a32c-4ea2-8f96-fcb2db3993b3))
+    (fp_line (start 3.75 -3.75) (end 3.75 -3.15)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 28212d9f-a28f-4b92-aa70-5feaf8b264de))
+    (fp_line (start 3.75 -3.15) (end 5.15 -3.15)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp adabbf1c-0b72-4585-bdfc-e14c130b0c65))
+    (fp_line (start 3.75 3.15) (end 5.15 3.15)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 49af546d-938c-408b-bd12-3d2000dd3eec))
+    (fp_line (start 3.75 3.75) (end 3.75 3.15)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1f4d6b62-85ca-4e41-b72b-2d8c8c43b3fe))
+    (fp_line (start 5.15 -3.15) (end 5.15 0)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 7c96defb-5d0a-40c4-b72e-c2474b00a701))
+    (fp_line (start 5.15 3.15) (end 5.15 0)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4646e388-481e-4d7a-be51-da9cda1118e5))
+    (fp_line (start -3.5 -3.5) (end -3.5 2.5)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 12540fbb-4367-46ba-b54d-b3a4db932d3a))
+    (fp_line (start -3.5 2.5) (end -2.5 3.5)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7c5b4a39-d084-49ad-83a7-cd4a544c5259))
+    (fp_line (start -2.5 3.5) (end 3.5 3.5)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 868178ba-d860-49e7-a60b-6794595db6f7))
+    (fp_line (start 3.5 -3.5) (end -3.5 -3.5)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 646927f8-e392-4ab3-aad4-9cb975e7ac51))
+    (fp_line (start 3.5 3.5) (end 3.5 -3.5)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5be3c8b8-b8c6-4ee7-87e9-56b1f58c9b10))
     (pad "1" smd roundrect (at -4.1625 2.75) (size 1.475 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 12 "+3.3V") (pinfunction "VBAT") (pintype "power_in") (tstamp 4ea29910-d77e-4fd4-8e05-c7bcf3b9db41))
     (pad "2" smd roundrect (at -4.1625 2.25) (size 1.475 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
@@ -2525,7 +3138,7 @@
   )
 
   (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (layer "B.Cu")
-    (tedit 5C28146C) (tstamp 3f6649f8-04d4-4d72-aa22-0528991a7121)
+    (tstamp 3f6649f8-04d4-4d72-aa22-0528991a7121)
     (at 50 17.6 180)
     (descr "JST XH series connector, B2B-XH-A (http://www.jst-mfg.com/product/pdf/eng/eXH.pdf), generated with kicad-footprint-generator")
     (tags "connector JST XH vertical")
@@ -2534,54 +3147,88 @@
     (path "/92182580-bc35-4ca8-813d-528cee82c45f")
     (attr through_hole)
     (fp_text reference "J3" (at 1.25 3.55) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 615e5897-0895-49af-a171-9bbd79b29057)
     )
     (fp_text value "PH2.54_02" (at 1.25 -4.6) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp d720493b-f1b1-443e-8a61-288dddeb3c46)
     )
     (fp_text user "${REFERENCE}" (at 1.25 -2.7) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 2842cc8b-7942-45c1-b60a-c2d683710fec)
     )
-    (fp_line (start -0.75 1.7) (end -0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 00a13c92-1e8a-4316-a2a5-a50122024139))
-    (fp_line (start 5.05 2.45) (end 3.25 2.45) (layer "B.SilkS") (width 0.12) (tstamp 066926cd-ebea-458d-88b0-873acf99e095))
-    (fp_line (start -2.85 2.75) (end -2.85 1.5) (layer "B.SilkS") (width 0.12) (tstamp 0927e6a5-46dc-4a28-b7e6-b603feefef36))
-    (fp_line (start 4.3 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 1e4826a5-515c-4aa9-a2d2-ef735b81e232))
-    (fp_line (start 0.75 1.7) (end 1.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 20b86995-aaaa-4b19-a5b7-85608a18bd16))
-    (fp_line (start 5.05 1.7) (end 5.05 2.45) (layer "B.SilkS") (width 0.12) (tstamp 2bece33b-3aa2-40f7-87b3-b38ae9846d64))
-    (fp_line (start 3.25 1.7) (end 5.05 1.7) (layer "B.SilkS") (width 0.12) (tstamp 42c6bef8-81aa-4c5f-99e7-f0feba9e13d4))
-    (fp_line (start -2.55 0.2) (end -1.8 0.2) (layer "B.SilkS") (width 0.12) (tstamp 4c80caef-7058-486d-97cc-6cb7d37ec94e))
-    (fp_line (start -1.8 0.2) (end -1.8 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 4e538aef-4f4b-4194-a8d8-db085628a7e9))
-    (fp_line (start 0.75 2.45) (end 0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 598f76dc-9d59-4d6e-84c3-56551c12259e))
-    (fp_line (start 5.06 2.46) (end -2.56 2.46) (layer "B.SilkS") (width 0.12) (tstamp 5b1d2767-da95-421e-a22a-33095bda0f40))
-    (fp_line (start -2.55 1.7) (end -0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 61f40e5d-24db-4c56-8c89-67275a89627e))
-    (fp_line (start 1.75 1.7) (end 1.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 719b0ec0-243f-49bc-9068-a0e611fd867c))
-    (fp_line (start 1.75 2.45) (end 0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 720d5ea4-dad9-498c-9ca5-9feeb51f5e31))
-    (fp_line (start 4.3 0.2) (end 4.3 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 858688a4-2ca7-4206-b327-bb524cfd63ef))
-    (fp_line (start 3.25 2.45) (end 3.25 1.7) (layer "B.SilkS") (width 0.12) (tstamp 872c313b-ef94-4ed5-b850-684367692125))
-    (fp_line (start -2.56 2.46) (end -2.56 -3.51) (layer "B.SilkS") (width 0.12) (tstamp a00b1de0-97c9-457e-840a-35af3a59db29))
-    (fp_line (start -1.6 2.75) (end -2.85 2.75) (layer "B.SilkS") (width 0.12) (tstamp ba7c84b6-586f-44bb-a661-358d7c0bc3de))
-    (fp_line (start -2.56 -3.51) (end 5.06 -3.51) (layer "B.SilkS") (width 0.12) (tstamp c16d5926-69fa-4a5c-bc34-580307092fae))
-    (fp_line (start -1.8 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp d19b0d79-dcac-4091-83e0-bac57fda25b6))
-    (fp_line (start 5.06 -3.51) (end 5.06 2.46) (layer "B.SilkS") (width 0.12) (tstamp dfc3deac-dc34-43b7-9fef-103185e84671))
-    (fp_line (start -0.75 2.45) (end -2.55 2.45) (layer "B.SilkS") (width 0.12) (tstamp e2751274-4c9b-4c9e-b429-b170939d27e2))
-    (fp_line (start 5.05 0.2) (end 4.3 0.2) (layer "B.SilkS") (width 0.12) (tstamp e5206dc4-a650-42ce-9b39-7aeb81e8b989))
-    (fp_line (start -2.55 2.45) (end -2.55 1.7) (layer "B.SilkS") (width 0.12) (tstamp ebcef62b-0c7d-430b-9e18-95fb9a9ccb2b))
-    (fp_line (start 5.45 2.85) (end -2.95 2.85) (layer "B.CrtYd") (width 0.05) (tstamp 2341d51b-8c4a-4ebb-9e32-ee9804ebfb79))
-    (fp_line (start 5.45 -3.9) (end 5.45 2.85) (layer "B.CrtYd") (width 0.05) (tstamp 32fe6d5c-b25a-439d-8d6b-4aa80d008bde))
-    (fp_line (start -2.95 2.85) (end -2.95 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp ae102e77-72fa-441a-b463-8f7b06699562))
-    (fp_line (start -2.95 -3.9) (end 5.45 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp e7f74eb3-8821-45a7-b425-bfd5d3b2680e))
-    (fp_line (start 4.95 2.35) (end -2.45 2.35) (layer "B.Fab") (width 0.1) (tstamp 5cbb8152-4189-4dcc-b705-4d763eb5efc0))
-    (fp_line (start 0 1.35) (end 0.625 2.35) (layer "B.Fab") (width 0.1) (tstamp 8316675a-c023-46dc-b167-2eac07795ad1))
-    (fp_line (start -2.45 2.35) (end -2.45 -3.4) (layer "B.Fab") (width 0.1) (tstamp ad70003d-d80d-4092-9924-5a8248c509e0))
-    (fp_line (start -0.625 2.35) (end 0 1.35) (layer "B.Fab") (width 0.1) (tstamp c48d7eb8-aa25-4506-a28c-eb1b792cfd24))
-    (fp_line (start 4.95 -3.4) (end 4.95 2.35) (layer "B.Fab") (width 0.1) (tstamp cfbf4da6-2a85-4257-ac53-0ccb661290bc))
-    (fp_line (start -2.45 -3.4) (end 4.95 -3.4) (layer "B.Fab") (width 0.1) (tstamp e01122e9-2311-4d4a-96d2-3f670820f9eb))
-    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask) (roundrect_rratio 0.147059)
+    (fp_line (start -2.85 2.75) (end -2.85 1.5)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0927e6a5-46dc-4a28-b7e6-b603feefef36))
+    (fp_line (start -2.56 -3.51) (end 5.06 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c16d5926-69fa-4a5c-bc34-580307092fae))
+    (fp_line (start -2.56 2.46) (end -2.56 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a00b1de0-97c9-457e-840a-35af3a59db29))
+    (fp_line (start -2.55 0.2) (end -1.8 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4c80caef-7058-486d-97cc-6cb7d37ec94e))
+    (fp_line (start -2.55 1.7) (end -0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 61f40e5d-24db-4c56-8c89-67275a89627e))
+    (fp_line (start -2.55 2.45) (end -2.55 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ebcef62b-0c7d-430b-9e18-95fb9a9ccb2b))
+    (fp_line (start -1.8 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d19b0d79-dcac-4091-83e0-bac57fda25b6))
+    (fp_line (start -1.8 0.2) (end -1.8 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4e538aef-4f4b-4194-a8d8-db085628a7e9))
+    (fp_line (start -1.6 2.75) (end -2.85 2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ba7c84b6-586f-44bb-a661-358d7c0bc3de))
+    (fp_line (start -0.75 1.7) (end -0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 00a13c92-1e8a-4316-a2a5-a50122024139))
+    (fp_line (start -0.75 2.45) (end -2.55 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e2751274-4c9b-4c9e-b429-b170939d27e2))
+    (fp_line (start 0.75 1.7) (end 1.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 20b86995-aaaa-4b19-a5b7-85608a18bd16))
+    (fp_line (start 0.75 2.45) (end 0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 598f76dc-9d59-4d6e-84c3-56551c12259e))
+    (fp_line (start 1.75 1.7) (end 1.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 719b0ec0-243f-49bc-9068-a0e611fd867c))
+    (fp_line (start 1.75 2.45) (end 0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 720d5ea4-dad9-498c-9ca5-9feeb51f5e31))
+    (fp_line (start 3.25 1.7) (end 5.05 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 42c6bef8-81aa-4c5f-99e7-f0feba9e13d4))
+    (fp_line (start 3.25 2.45) (end 3.25 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 872c313b-ef94-4ed5-b850-684367692125))
+    (fp_line (start 4.3 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1e4826a5-515c-4aa9-a2d2-ef735b81e232))
+    (fp_line (start 4.3 0.2) (end 4.3 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 858688a4-2ca7-4206-b327-bb524cfd63ef))
+    (fp_line (start 5.05 0.2) (end 4.3 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e5206dc4-a650-42ce-9b39-7aeb81e8b989))
+    (fp_line (start 5.05 1.7) (end 5.05 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2bece33b-3aa2-40f7-87b3-b38ae9846d64))
+    (fp_line (start 5.05 2.45) (end 3.25 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 066926cd-ebea-458d-88b0-873acf99e095))
+    (fp_line (start 5.06 -3.51) (end 5.06 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp dfc3deac-dc34-43b7-9fef-103185e84671))
+    (fp_line (start 5.06 2.46) (end -2.56 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5b1d2767-da95-421e-a22a-33095bda0f40))
+    (fp_line (start -2.95 -3.9) (end 5.45 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e7f74eb3-8821-45a7-b425-bfd5d3b2680e))
+    (fp_line (start -2.95 2.85) (end -2.95 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ae102e77-72fa-441a-b463-8f7b06699562))
+    (fp_line (start 5.45 -3.9) (end 5.45 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 32fe6d5c-b25a-439d-8d6b-4aa80d008bde))
+    (fp_line (start 5.45 2.85) (end -2.95 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2341d51b-8c4a-4ebb-9e32-ee9804ebfb79))
+    (fp_line (start -2.45 -3.4) (end 4.95 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e01122e9-2311-4d4a-96d2-3f670820f9eb))
+    (fp_line (start -2.45 2.35) (end -2.45 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ad70003d-d80d-4092-9924-5a8248c509e0))
+    (fp_line (start -0.625 2.35) (end 0 1.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c48d7eb8-aa25-4506-a28c-eb1b792cfd24))
+    (fp_line (start 0 1.35) (end 0.625 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8316675a-c023-46dc-b167-2eac07795ad1))
+    (fp_line (start 4.95 -3.4) (end 4.95 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cfbf4da6-2a85-4257-ac53-0ccb661290bc))
+    (fp_line (start 4.95 2.35) (end -2.45 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5cbb8152-4189-4dcc-b705-4d763eb5efc0))
+    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask") (roundrect_rratio 0.147059)
       (net 6 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp 51971a00-b89f-4355-a503-e46b83e8c040))
-    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask")
       (net 22 "Net-(J3-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 91b46510-7cfa-4aa9-a4d9-08c1ec67bf13))
     (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -2591,7 +3238,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "B.Cu")
-    (tedit 5F68FEEF) (tstamp 53ede383-1e5d-43d8-bb30-500fad95fbc2)
+    (tstamp 53ede383-1e5d-43d8-bb30-500fad95fbc2)
     (at 48.860952 56.75 180)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -2600,27 +3247,37 @@
     (path "/f0c64b5f-8006-4371-a434-80e80a0de447")
     (attr smd)
     (fp_text reference "C15" (at 0 1.68) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 1b1d8ef4-ef25-4f56-b0c7-aad6d7b9c1dd)
     )
     (fp_text value "100n" (at 0 -1.68) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 0b978d69-b90f-4991-8b21-e019ff5cc942)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "B.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+        (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
       (tstamp d6f5ffce-6881-47a4-bf68-8bd3bac27f2b)
     )
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "B.SilkS") (width 0.12) (tstamp 1ba324c3-1ee1-4f41-baec-6f11eaf28232))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "B.SilkS") (width 0.12) (tstamp 5c747482-fa08-4cad-9700-ed3284975d85))
-    (fp_line (start 1.88 -0.98) (end -1.88 -0.98) (layer "B.CrtYd") (width 0.05) (tstamp 4b9ec94b-23a6-421a-8f7e-b650e994c4cf))
-    (fp_line (start -1.88 -0.98) (end -1.88 0.98) (layer "B.CrtYd") (width 0.05) (tstamp 50f60b73-61b7-4f70-aa8c-530179667fb6))
-    (fp_line (start -1.88 0.98) (end 1.88 0.98) (layer "B.CrtYd") (width 0.05) (tstamp 67601ea2-fdfe-4b98-bc71-dde2624bf634))
-    (fp_line (start 1.88 0.98) (end 1.88 -0.98) (layer "B.CrtYd") (width 0.05) (tstamp 916fa776-9a89-47e3-a91f-74273b587973))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer "B.Fab") (width 0.1) (tstamp 2998bd14-afbb-4d1c-9b96-6192a49cfd36))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer "B.Fab") (width 0.1) (tstamp a69d7b26-b164-47cc-b25b-2e7b2b24d4bd))
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer "B.Fab") (width 0.1) (tstamp b215b934-2561-40db-ab59-45fab94a88c9))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer "B.Fab") (width 0.1) (tstamp ea9c1d3a-08ed-4fb1-80b3-a452a7f1008f))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1ba324c3-1ee1-4f41-baec-6f11eaf28232))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5c747482-fa08-4cad-9700-ed3284975d85))
+    (fp_line (start -1.88 -0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 50f60b73-61b7-4f70-aa8c-530179667fb6))
+    (fp_line (start -1.88 0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 67601ea2-fdfe-4b98-bc71-dde2624bf634))
+    (fp_line (start 1.88 -0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4b9ec94b-23a6-421a-8f7e-b650e994c4cf))
+    (fp_line (start 1.88 0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 916fa776-9a89-47e3-a91f-74273b587973))
+    (fp_line (start -1 -0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b215b934-2561-40db-ab59-45fab94a88c9))
+    (fp_line (start -1 0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2998bd14-afbb-4d1c-9b96-6192a49cfd36))
+    (fp_line (start 1 -0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a69d7b26-b164-47cc-b25b-2e7b2b24d4bd))
+    (fp_line (start 1 0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ea9c1d3a-08ed-4fb1-80b3-a452a7f1008f))
     (pad "1" smd roundrect (at -1.0375 0 180) (size 1.175 1.45) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.212766)
       (net 12 "+3.3V") (pintype "passive") (tstamp 06fff45a-eef0-4cf8-80e2-0213da84e6c9))
     (pad "2" smd roundrect (at 1.0375 0 180) (size 1.175 1.45) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.212766)
@@ -2633,7 +3290,7 @@
   )
 
   (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (layer "B.Cu")
-    (tedit 5C28146C) (tstamp 6ab83242-12e0-4afe-a6ce-2dc42569df21)
+    (tstamp 6ab83242-12e0-4afe-a6ce-2dc42569df21)
     (at 84.4 17.6 180)
     (descr "JST XH series connector, B2B-XH-A (http://www.jst-mfg.com/product/pdf/eng/eXH.pdf), generated with kicad-footprint-generator")
     (tags "connector JST XH vertical")
@@ -2642,54 +3299,88 @@
     (path "/6603a291-e3a9-4705-a380-dff8176a1a61")
     (attr through_hole)
     (fp_text reference "J5" (at 1.25 3.55) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp b630f71b-467d-4127-bd84-828380ce27a8)
     )
     (fp_text value "PH2.54_02" (at 1.25 -4.6) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 2a368142-6927-4c43-8ce3-86ea65efd054)
     )
     (fp_text user "${REFERENCE}" (at 1.25 -2.7) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 72150555-059c-4c7b-98bd-1613959f2612)
     )
-    (fp_line (start 0.75 2.45) (end 0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 0305a3e2-9f68-44c1-ac69-b5565d40b52e))
-    (fp_line (start 3.25 1.7) (end 5.05 1.7) (layer "B.SilkS") (width 0.12) (tstamp 0a685468-668d-4914-8432-dafe20e29690))
-    (fp_line (start -1.6 2.75) (end -2.85 2.75) (layer "B.SilkS") (width 0.12) (tstamp 0adc752e-19c7-47bf-84a1-fe09d06e5200))
-    (fp_line (start -2.56 -3.51) (end 5.06 -3.51) (layer "B.SilkS") (width 0.12) (tstamp 28410033-fde0-4500-a1bc-dca1790d6b91))
-    (fp_line (start 1.75 1.7) (end 1.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 2f480312-052f-4923-a36c-92b8a969f438))
-    (fp_line (start -2.56 2.46) (end -2.56 -3.51) (layer "B.SilkS") (width 0.12) (tstamp 32a84ae6-3612-4f01-b771-a32b51224be1))
-    (fp_line (start -2.55 0.2) (end -1.8 0.2) (layer "B.SilkS") (width 0.12) (tstamp 3971c5c2-3475-4e6d-be6c-c3c13d445795))
-    (fp_line (start 0.75 1.7) (end 1.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 419a1966-cf27-4ca9-9b2d-4559fe1cf638))
-    (fp_line (start -2.55 2.45) (end -2.55 1.7) (layer "B.SilkS") (width 0.12) (tstamp 41a78cbb-6939-420f-bff2-e252b09ded80))
-    (fp_line (start -0.75 1.7) (end -0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 48c8a773-d4c0-4e31-8131-06c93c5fb5c6))
-    (fp_line (start 5.05 2.45) (end 3.25 2.45) (layer "B.SilkS") (width 0.12) (tstamp 48e2cf3d-e277-496b-9cc7-1cea76d4854f))
-    (fp_line (start 5.05 0.2) (end 4.3 0.2) (layer "B.SilkS") (width 0.12) (tstamp 5eeabf69-9c69-4ec9-953a-c387307c2af0))
-    (fp_line (start 4.3 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 5f9dd7ff-b45b-4afb-a98b-b73fc0b2872a))
-    (fp_line (start 5.06 2.46) (end -2.56 2.46) (layer "B.SilkS") (width 0.12) (tstamp 71bc263e-24ff-43f6-8ae4-7bc49aa7d468))
-    (fp_line (start -1.8 0.2) (end -1.8 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 73268517-378c-4427-8fe4-bd6232d81d71))
-    (fp_line (start -1.8 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 79b65e32-770a-4358-a22a-dd5d8322cbc0))
-    (fp_line (start -2.55 1.7) (end -0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 8f4402a9-9ad4-4a63-9aa3-ef63f7f3b074))
-    (fp_line (start 5.06 -3.51) (end 5.06 2.46) (layer "B.SilkS") (width 0.12) (tstamp a6e5a61f-c3f9-4d84-90ba-3dda48c22add))
-    (fp_line (start 1.75 2.45) (end 0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp a95bf4af-390a-4d46-b53b-83a97c49260a))
-    (fp_line (start -2.85 2.75) (end -2.85 1.5) (layer "B.SilkS") (width 0.12) (tstamp ab0f6548-e614-41c9-a3f9-bac5b640655f))
-    (fp_line (start -0.75 2.45) (end -2.55 2.45) (layer "B.SilkS") (width 0.12) (tstamp b5499060-002b-4dd3-a8bf-374c89f74106))
-    (fp_line (start 5.05 1.7) (end 5.05 2.45) (layer "B.SilkS") (width 0.12) (tstamp b7ae2ddc-88f6-4d91-b424-ede7400c5c39))
-    (fp_line (start 3.25 2.45) (end 3.25 1.7) (layer "B.SilkS") (width 0.12) (tstamp ea8f6a26-c93d-46fd-8788-beb738e4f92a))
-    (fp_line (start 4.3 0.2) (end 4.3 -2.75) (layer "B.SilkS") (width 0.12) (tstamp f017e42a-5dba-4601-9540-f2150676affe))
-    (fp_line (start 5.45 -3.9) (end 5.45 2.85) (layer "B.CrtYd") (width 0.05) (tstamp 457ea6db-0732-4c7d-a54d-a86428b182f8))
-    (fp_line (start -2.95 -3.9) (end 5.45 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp b68da475-34fc-451f-a211-abb90d2471e0))
-    (fp_line (start -2.95 2.85) (end -2.95 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp cd4281e5-3b22-4aff-813b-d69fb6a1c37b))
-    (fp_line (start 5.45 2.85) (end -2.95 2.85) (layer "B.CrtYd") (width 0.05) (tstamp f60a5d48-4663-4486-a67b-36eb1eea95a3))
-    (fp_line (start -2.45 2.35) (end -2.45 -3.4) (layer "B.Fab") (width 0.1) (tstamp 776e7cf4-d00c-440a-b12e-a56037f8842f))
-    (fp_line (start -2.45 -3.4) (end 4.95 -3.4) (layer "B.Fab") (width 0.1) (tstamp 88e08383-4251-40d8-964c-dad7eb7df07f))
-    (fp_line (start 4.95 -3.4) (end 4.95 2.35) (layer "B.Fab") (width 0.1) (tstamp 8a2442ed-39b8-48dc-a127-a2d8d82acc49))
-    (fp_line (start -0.625 2.35) (end 0 1.35) (layer "B.Fab") (width 0.1) (tstamp ba3512a0-c8e3-408b-88bc-771ecbc851ad))
-    (fp_line (start 0 1.35) (end 0.625 2.35) (layer "B.Fab") (width 0.1) (tstamp d5be7de3-bc29-4ee2-a0d1-0fa3f9fada37))
-    (fp_line (start 4.95 2.35) (end -2.45 2.35) (layer "B.Fab") (width 0.1) (tstamp fbe1c514-5296-41d5-aa62-517587cb591d))
-    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask) (roundrect_rratio 0.147059)
+    (fp_line (start -2.85 2.75) (end -2.85 1.5)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ab0f6548-e614-41c9-a3f9-bac5b640655f))
+    (fp_line (start -2.56 -3.51) (end 5.06 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 28410033-fde0-4500-a1bc-dca1790d6b91))
+    (fp_line (start -2.56 2.46) (end -2.56 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 32a84ae6-3612-4f01-b771-a32b51224be1))
+    (fp_line (start -2.55 0.2) (end -1.8 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3971c5c2-3475-4e6d-be6c-c3c13d445795))
+    (fp_line (start -2.55 1.7) (end -0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8f4402a9-9ad4-4a63-9aa3-ef63f7f3b074))
+    (fp_line (start -2.55 2.45) (end -2.55 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 41a78cbb-6939-420f-bff2-e252b09ded80))
+    (fp_line (start -1.8 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 79b65e32-770a-4358-a22a-dd5d8322cbc0))
+    (fp_line (start -1.8 0.2) (end -1.8 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 73268517-378c-4427-8fe4-bd6232d81d71))
+    (fp_line (start -1.6 2.75) (end -2.85 2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0adc752e-19c7-47bf-84a1-fe09d06e5200))
+    (fp_line (start -0.75 1.7) (end -0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 48c8a773-d4c0-4e31-8131-06c93c5fb5c6))
+    (fp_line (start -0.75 2.45) (end -2.55 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b5499060-002b-4dd3-a8bf-374c89f74106))
+    (fp_line (start 0.75 1.7) (end 1.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 419a1966-cf27-4ca9-9b2d-4559fe1cf638))
+    (fp_line (start 0.75 2.45) (end 0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0305a3e2-9f68-44c1-ac69-b5565d40b52e))
+    (fp_line (start 1.75 1.7) (end 1.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2f480312-052f-4923-a36c-92b8a969f438))
+    (fp_line (start 1.75 2.45) (end 0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a95bf4af-390a-4d46-b53b-83a97c49260a))
+    (fp_line (start 3.25 1.7) (end 5.05 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0a685468-668d-4914-8432-dafe20e29690))
+    (fp_line (start 3.25 2.45) (end 3.25 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ea8f6a26-c93d-46fd-8788-beb738e4f92a))
+    (fp_line (start 4.3 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5f9dd7ff-b45b-4afb-a98b-b73fc0b2872a))
+    (fp_line (start 4.3 0.2) (end 4.3 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f017e42a-5dba-4601-9540-f2150676affe))
+    (fp_line (start 5.05 0.2) (end 4.3 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5eeabf69-9c69-4ec9-953a-c387307c2af0))
+    (fp_line (start 5.05 1.7) (end 5.05 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b7ae2ddc-88f6-4d91-b424-ede7400c5c39))
+    (fp_line (start 5.05 2.45) (end 3.25 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 48e2cf3d-e277-496b-9cc7-1cea76d4854f))
+    (fp_line (start 5.06 -3.51) (end 5.06 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a6e5a61f-c3f9-4d84-90ba-3dda48c22add))
+    (fp_line (start 5.06 2.46) (end -2.56 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 71bc263e-24ff-43f6-8ae4-7bc49aa7d468))
+    (fp_line (start -2.95 -3.9) (end 5.45 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b68da475-34fc-451f-a211-abb90d2471e0))
+    (fp_line (start -2.95 2.85) (end -2.95 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp cd4281e5-3b22-4aff-813b-d69fb6a1c37b))
+    (fp_line (start 5.45 -3.9) (end 5.45 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 457ea6db-0732-4c7d-a54d-a86428b182f8))
+    (fp_line (start 5.45 2.85) (end -2.95 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f60a5d48-4663-4486-a67b-36eb1eea95a3))
+    (fp_line (start -2.45 -3.4) (end 4.95 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 88e08383-4251-40d8-964c-dad7eb7df07f))
+    (fp_line (start -2.45 2.35) (end -2.45 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 776e7cf4-d00c-440a-b12e-a56037f8842f))
+    (fp_line (start -0.625 2.35) (end 0 1.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ba3512a0-c8e3-408b-88bc-771ecbc851ad))
+    (fp_line (start 0 1.35) (end 0.625 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d5be7de3-bc29-4ee2-a0d1-0fa3f9fada37))
+    (fp_line (start 4.95 -3.4) (end 4.95 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8a2442ed-39b8-48dc-a127-a2d8d82acc49))
+    (fp_line (start 4.95 2.35) (end -2.45 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fbe1c514-5296-41d5-aa62-517587cb591d))
+    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask") (roundrect_rratio 0.147059)
       (net 6 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp 7d8a5d19-a8a6-4503-9f73-c97b0882b8e6))
-    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask")
       (net 24 "Net-(J5-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp c57fa362-b72e-4e96-81ae-abccc67238c9))
     (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -2699,7 +3390,7 @@
   )
 
   (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (layer "B.Cu")
-    (tedit 5C28146C) (tstamp 732a5740-d45a-4288-933b-37ed89550304)
+    (tstamp 732a5740-d45a-4288-933b-37ed89550304)
     (at 67.2 17.6 180)
     (descr "JST XH series connector, B2B-XH-A (http://www.jst-mfg.com/product/pdf/eng/eXH.pdf), generated with kicad-footprint-generator")
     (tags "connector JST XH vertical")
@@ -2708,54 +3399,88 @@
     (path "/e9f69746-91ca-45d5-8ab8-58fb0a568c85")
     (attr through_hole)
     (fp_text reference "J4" (at 1.25 3.55) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp e49802dd-10c3-45b5-934c-00610a5e1da0)
     )
     (fp_text value "PH2.54_02" (at 1.25 -4.6) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 83366a5c-7335-4373-aca7-d8c418352198)
     )
     (fp_text user "${REFERENCE}" (at 1.25 -2.7) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 85fbaf06-57b0-4a7a-8489-df17bb5a9c3b)
     )
-    (fp_line (start 3.25 1.7) (end 5.05 1.7) (layer "B.SilkS") (width 0.12) (tstamp 11583304-92ba-440e-9a41-15a7066619a6))
-    (fp_line (start -2.55 0.2) (end -1.8 0.2) (layer "B.SilkS") (width 0.12) (tstamp 1f83a8b9-3a10-453f-a575-efbf3ee9b1c3))
-    (fp_line (start 4.3 0.2) (end 4.3 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 24109f2e-e574-4fa2-9fd5-14523410aad4))
-    (fp_line (start 1.75 1.7) (end 1.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 2aa26dd9-9e71-4e55-b2cc-b229a085763b))
-    (fp_line (start -2.56 2.46) (end -2.56 -3.51) (layer "B.SilkS") (width 0.12) (tstamp 2d7dc222-dd87-499b-8f82-2b8ad1a213ed))
-    (fp_line (start -0.75 1.7) (end -0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 35943b7e-60a2-4aeb-bf23-8dc353971f02))
-    (fp_line (start 5.05 0.2) (end 4.3 0.2) (layer "B.SilkS") (width 0.12) (tstamp 3817494b-c8be-4116-bbca-eb4016b2eb87))
-    (fp_line (start -1.8 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 51b37268-7cab-4963-89d2-912979c55669))
-    (fp_line (start 5.06 -3.51) (end 5.06 2.46) (layer "B.SilkS") (width 0.12) (tstamp 57bf2aa0-f22f-47fb-b207-564087218e8d))
-    (fp_line (start 0.75 2.45) (end 0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 5ff2fc5a-0c20-486b-afb5-a0cf623e530c))
-    (fp_line (start 5.05 2.45) (end 3.25 2.45) (layer "B.SilkS") (width 0.12) (tstamp 6e05cf54-9971-4df7-be94-7284fb3e7ca6))
-    (fp_line (start -2.56 -3.51) (end 5.06 -3.51) (layer "B.SilkS") (width 0.12) (tstamp 7712dc86-38ee-4865-8e22-d6ab016b13b1))
-    (fp_line (start -0.75 2.45) (end -2.55 2.45) (layer "B.SilkS") (width 0.12) (tstamp 824c4e6b-44cc-4ef7-9b6f-cf4016d6b25e))
-    (fp_line (start -2.55 1.7) (end -0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 9be89d94-db95-409a-a62d-cc1f1d970d05))
-    (fp_line (start 5.06 2.46) (end -2.56 2.46) (layer "B.SilkS") (width 0.12) (tstamp bf6ef846-c491-4b17-a741-50d90f87d31d))
-    (fp_line (start 0.75 1.7) (end 1.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp c8b275ef-07cf-44d4-8ff9-8d0d7a2c5cc3))
-    (fp_line (start 1.75 2.45) (end 0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp d1a66f19-0798-4159-9c87-d3365e7e7cc9))
-    (fp_line (start -2.55 2.45) (end -2.55 1.7) (layer "B.SilkS") (width 0.12) (tstamp dc96dddc-29a0-4517-91fc-8b938866bfea))
-    (fp_line (start 5.05 1.7) (end 5.05 2.45) (layer "B.SilkS") (width 0.12) (tstamp e02c6643-e2d5-4e4c-8b4b-f523b3ad4ece))
-    (fp_line (start -2.85 2.75) (end -2.85 1.5) (layer "B.SilkS") (width 0.12) (tstamp e8490467-299f-4b20-b82d-1070799157df))
-    (fp_line (start -1.6 2.75) (end -2.85 2.75) (layer "B.SilkS") (width 0.12) (tstamp ea1d8842-34e3-46ab-b980-a83fe08fb46b))
-    (fp_line (start 3.25 2.45) (end 3.25 1.7) (layer "B.SilkS") (width 0.12) (tstamp ee2eef67-4e75-478d-a03b-89626383b59f))
-    (fp_line (start 4.3 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp f4ac4207-4551-4561-9e09-987bf75312ad))
-    (fp_line (start -1.8 0.2) (end -1.8 -2.75) (layer "B.SilkS") (width 0.12) (tstamp fa9c35aa-a8a9-485a-81a3-b34971508a6b))
-    (fp_line (start -2.95 2.85) (end -2.95 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp 0f3578e6-ef44-408a-9b6f-72bf2ee922ed))
-    (fp_line (start 5.45 -3.9) (end 5.45 2.85) (layer "B.CrtYd") (width 0.05) (tstamp 20a2373f-665d-4fb3-a3a0-ee79a4be4929))
-    (fp_line (start -2.95 -3.9) (end 5.45 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp 4275e2fb-1d06-44bb-be87-c38059a04fbe))
-    (fp_line (start 5.45 2.85) (end -2.95 2.85) (layer "B.CrtYd") (width 0.05) (tstamp f827497b-5a2a-4cda-9252-5cda0909c9b4))
-    (fp_line (start -2.45 2.35) (end -2.45 -3.4) (layer "B.Fab") (width 0.1) (tstamp 00dea9f7-1b0b-4634-b673-02627906ff94))
-    (fp_line (start 4.95 2.35) (end -2.45 2.35) (layer "B.Fab") (width 0.1) (tstamp 19c3e83c-2c29-41d5-8c76-255ae1c3ecaf))
-    (fp_line (start 0 1.35) (end 0.625 2.35) (layer "B.Fab") (width 0.1) (tstamp 61395f57-8750-4e76-ad15-c8a4666c3199))
-    (fp_line (start -2.45 -3.4) (end 4.95 -3.4) (layer "B.Fab") (width 0.1) (tstamp d3055f86-6024-4044-a78d-77a9ba0e2bcf))
-    (fp_line (start -0.625 2.35) (end 0 1.35) (layer "B.Fab") (width 0.1) (tstamp e40a3fe5-fbd1-4d08-9b71-061d7b8cc33f))
-    (fp_line (start 4.95 -3.4) (end 4.95 2.35) (layer "B.Fab") (width 0.1) (tstamp eafc3d05-4738-4985-88bc-af91fda798f0))
-    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask) (roundrect_rratio 0.147059)
+    (fp_line (start -2.85 2.75) (end -2.85 1.5)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e8490467-299f-4b20-b82d-1070799157df))
+    (fp_line (start -2.56 -3.51) (end 5.06 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7712dc86-38ee-4865-8e22-d6ab016b13b1))
+    (fp_line (start -2.56 2.46) (end -2.56 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2d7dc222-dd87-499b-8f82-2b8ad1a213ed))
+    (fp_line (start -2.55 0.2) (end -1.8 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1f83a8b9-3a10-453f-a575-efbf3ee9b1c3))
+    (fp_line (start -2.55 1.7) (end -0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 9be89d94-db95-409a-a62d-cc1f1d970d05))
+    (fp_line (start -2.55 2.45) (end -2.55 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp dc96dddc-29a0-4517-91fc-8b938866bfea))
+    (fp_line (start -1.8 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 51b37268-7cab-4963-89d2-912979c55669))
+    (fp_line (start -1.8 0.2) (end -1.8 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fa9c35aa-a8a9-485a-81a3-b34971508a6b))
+    (fp_line (start -1.6 2.75) (end -2.85 2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ea1d8842-34e3-46ab-b980-a83fe08fb46b))
+    (fp_line (start -0.75 1.7) (end -0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 35943b7e-60a2-4aeb-bf23-8dc353971f02))
+    (fp_line (start -0.75 2.45) (end -2.55 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 824c4e6b-44cc-4ef7-9b6f-cf4016d6b25e))
+    (fp_line (start 0.75 1.7) (end 1.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c8b275ef-07cf-44d4-8ff9-8d0d7a2c5cc3))
+    (fp_line (start 0.75 2.45) (end 0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5ff2fc5a-0c20-486b-afb5-a0cf623e530c))
+    (fp_line (start 1.75 1.7) (end 1.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2aa26dd9-9e71-4e55-b2cc-b229a085763b))
+    (fp_line (start 1.75 2.45) (end 0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d1a66f19-0798-4159-9c87-d3365e7e7cc9))
+    (fp_line (start 3.25 1.7) (end 5.05 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 11583304-92ba-440e-9a41-15a7066619a6))
+    (fp_line (start 3.25 2.45) (end 3.25 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ee2eef67-4e75-478d-a03b-89626383b59f))
+    (fp_line (start 4.3 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f4ac4207-4551-4561-9e09-987bf75312ad))
+    (fp_line (start 4.3 0.2) (end 4.3 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 24109f2e-e574-4fa2-9fd5-14523410aad4))
+    (fp_line (start 5.05 0.2) (end 4.3 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3817494b-c8be-4116-bbca-eb4016b2eb87))
+    (fp_line (start 5.05 1.7) (end 5.05 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e02c6643-e2d5-4e4c-8b4b-f523b3ad4ece))
+    (fp_line (start 5.05 2.45) (end 3.25 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6e05cf54-9971-4df7-be94-7284fb3e7ca6))
+    (fp_line (start 5.06 -3.51) (end 5.06 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 57bf2aa0-f22f-47fb-b207-564087218e8d))
+    (fp_line (start 5.06 2.46) (end -2.56 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp bf6ef846-c491-4b17-a741-50d90f87d31d))
+    (fp_line (start -2.95 -3.9) (end 5.45 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4275e2fb-1d06-44bb-be87-c38059a04fbe))
+    (fp_line (start -2.95 2.85) (end -2.95 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 0f3578e6-ef44-408a-9b6f-72bf2ee922ed))
+    (fp_line (start 5.45 -3.9) (end 5.45 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 20a2373f-665d-4fb3-a3a0-ee79a4be4929))
+    (fp_line (start 5.45 2.85) (end -2.95 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f827497b-5a2a-4cda-9252-5cda0909c9b4))
+    (fp_line (start -2.45 -3.4) (end 4.95 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d3055f86-6024-4044-a78d-77a9ba0e2bcf))
+    (fp_line (start -2.45 2.35) (end -2.45 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 00dea9f7-1b0b-4634-b673-02627906ff94))
+    (fp_line (start -0.625 2.35) (end 0 1.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e40a3fe5-fbd1-4d08-9b71-061d7b8cc33f))
+    (fp_line (start 0 1.35) (end 0.625 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 61395f57-8750-4e76-ad15-c8a4666c3199))
+    (fp_line (start 4.95 -3.4) (end 4.95 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp eafc3d05-4738-4985-88bc-af91fda798f0))
+    (fp_line (start 4.95 2.35) (end -2.45 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 19c3e83c-2c29-41d5-8c76-255ae1c3ecaf))
+    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask") (roundrect_rratio 0.147059)
       (net 6 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp 7b631a64-d13e-4d5a-9607-ccc29224ab4f))
-    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask")
       (net 23 "Net-(J4-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp ad044068-39b6-4bf1-8859-03e327e72cdc))
     (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -2765,7 +3490,7 @@
   )
 
   (footprint "Connector_JST:JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical" (layer "B.Cu")
-    (tedit 5C28146C) (tstamp 74f49361-fcd0-49bc-9387-f20d08a28ea3)
+    (tstamp 74f49361-fcd0-49bc-9387-f20d08a28ea3)
     (at 19.8875 41.049999 90)
     (descr "JST XH series connector, B4B-XH-A (http://www.jst-mfg.com/product/pdf/eng/eXH.pdf), generated with kicad-footprint-generator")
     (tags "connector JST XH vertical")
@@ -2774,58 +3499,92 @@
     (path "/3ceb50eb-c7c0-4a1e-91f3-5082c1c00912")
     (attr through_hole)
     (fp_text reference "J1" (at 3.75 3.55 90) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 484ecb49-675e-49ad-b797-0c378f7250c1)
     )
     (fp_text value "PH2.54_04" (at 3.75 -4.6 90) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp db77a6ac-ad32-4329-9b14-fb923307945f)
     )
     (fp_text user "${REFERENCE}" (at 3.75 -2.7 90) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 0ae0c1b8-3e5a-430b-bcaa-63e5199fc7d8)
     )
-    (fp_line (start 10.06 -3.51) (end 10.06 2.46) (layer "B.SilkS") (width 0.12) (tstamp 010d08fc-298f-4369-97d4-4c736f21ceb7))
-    (fp_line (start 9.3 0.2) (end 9.3 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 02d0d6ef-85cf-4cb9-a5c6-44bc87301793))
-    (fp_line (start -2.85 2.75) (end -2.85 1.5) (layer "B.SilkS") (width 0.12) (tstamp 123354ee-6a69-41cd-854b-86343a2ace5f))
-    (fp_line (start 0.75 2.45) (end 0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 1c5b80b5-4f82-4765-8da4-dca82511097c))
-    (fp_line (start 10.05 2.45) (end 8.25 2.45) (layer "B.SilkS") (width 0.12) (tstamp 25218b3c-eab7-4d88-92c7-ffcb1456151e))
-    (fp_line (start 0.75 1.7) (end 6.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 2c911cad-5c7a-4c8a-b68f-d76b5b44af7f))
-    (fp_line (start 10.05 1.7) (end 10.05 2.45) (layer "B.SilkS") (width 0.12) (tstamp 3a27d89d-fbd9-4045-85f7-126725c3b6ee))
-    (fp_line (start -2.55 1.7) (end -0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 50d123b4-c2d3-4f44-9d82-793c2acb5fc8))
-    (fp_line (start -2.56 -3.51) (end 10.06 -3.51) (layer "B.SilkS") (width 0.12) (tstamp 57894754-216e-438b-ac0f-0c99dd2bb74b))
-    (fp_line (start -2.55 2.45) (end -2.55 1.7) (layer "B.SilkS") (width 0.12) (tstamp 5dccab9c-950e-4157-afbb-a2f2e48b86f5))
-    (fp_line (start 8.25 2.45) (end 8.25 1.7) (layer "B.SilkS") (width 0.12) (tstamp 5e224243-38b1-43ed-9e5d-2550219a9a15))
-    (fp_line (start -2.56 2.46) (end -2.56 -3.51) (layer "B.SilkS") (width 0.12) (tstamp 8161e9f9-3225-4893-834a-67ee66c528db))
-    (fp_line (start 6.75 2.45) (end 0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp a3ed018f-0c54-4dcf-91a2-682dbc148a1c))
-    (fp_line (start -0.75 2.45) (end -2.55 2.45) (layer "B.SilkS") (width 0.12) (tstamp a54e336e-cf98-4663-837d-59b7e0cde3f2))
-    (fp_line (start -1.8 -2.75) (end 3.75 -2.75) (layer "B.SilkS") (width 0.12) (tstamp c8607987-0da8-4272-b78b-9d15f97b0751))
-    (fp_line (start 10.05 0.2) (end 9.3 0.2) (layer "B.SilkS") (width 0.12) (tstamp db33ace1-3da6-435d-af86-c4247ab350b1))
-    (fp_line (start -0.75 1.7) (end -0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp e193434e-9b63-4864-921c-ce9868a97f2b))
-    (fp_line (start -1.6 2.75) (end -2.85 2.75) (layer "B.SilkS") (width 0.12) (tstamp ea4a2498-444b-40e5-a5df-1a59c83eac90))
-    (fp_line (start -1.8 0.2) (end -1.8 -2.75) (layer "B.SilkS") (width 0.12) (tstamp ec502257-4153-4add-ac76-5eb6b69f6b62))
-    (fp_line (start 9.3 -2.75) (end 3.75 -2.75) (layer "B.SilkS") (width 0.12) (tstamp f0cee3b8-61b7-4858-8ebd-14eeb28142e8))
-    (fp_line (start 6.75 1.7) (end 6.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp f489a903-d1c5-42ff-92b0-ed67c538f01a))
-    (fp_line (start 8.25 1.7) (end 10.05 1.7) (layer "B.SilkS") (width 0.12) (tstamp fd0f31a0-fc68-401a-9641-51d08b654c83))
-    (fp_line (start -2.55 0.2) (end -1.8 0.2) (layer "B.SilkS") (width 0.12) (tstamp fd45384f-d2d7-495a-8a05-db6ed8e99c3e))
-    (fp_line (start 10.06 2.46) (end -2.56 2.46) (layer "B.SilkS") (width 0.12) (tstamp feb7da23-c97b-430a-ad3d-e14be9741b08))
-    (fp_line (start 10.45 2.85) (end -2.95 2.85) (layer "B.CrtYd") (width 0.05) (tstamp 031e766d-ba99-4ac5-b74d-8c2766f9a8a7))
-    (fp_line (start -2.95 2.85) (end -2.95 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp 4927fbfa-87f4-44db-90e6-cc1cf7007573))
-    (fp_line (start -2.95 -3.9) (end 10.45 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp b06d8cf8-6bdd-4670-ad16-ee618b19d1da))
-    (fp_line (start 10.45 -3.9) (end 10.45 2.85) (layer "B.CrtYd") (width 0.05) (tstamp dbb29c20-40e8-4801-85ec-5fd25242fae2))
-    (fp_line (start 0 1.35) (end 0.625 2.35) (layer "B.Fab") (width 0.1) (tstamp 274329df-acc4-46ae-ab02-0dc2753e4db8))
-    (fp_line (start 9.95 -3.4) (end 9.95 2.35) (layer "B.Fab") (width 0.1) (tstamp 388614e1-c348-42d8-8698-8d8e2afff083))
-    (fp_line (start -2.45 -3.4) (end 9.95 -3.4) (layer "B.Fab") (width 0.1) (tstamp 5ff2aa4c-36f7-4c63-b2b0-553df62571c7))
-    (fp_line (start -0.625 2.35) (end 0 1.35) (layer "B.Fab") (width 0.1) (tstamp ca1345f1-c5f1-4af0-b48c-3a23d28b96f1))
-    (fp_line (start 9.95 2.35) (end -2.45 2.35) (layer "B.Fab") (width 0.1) (tstamp e7ef8948-a944-4a80-a651-2148d18bf6be))
-    (fp_line (start -2.45 2.35) (end -2.45 -3.4) (layer "B.Fab") (width 0.1) (tstamp f5ed2a46-c147-40aa-9743-5bf3f1798519))
-    (pad "1" thru_hole roundrect (at 0 0 90) (size 1.7 1.95) (drill 0.95) (layers *.Cu *.Mask) (roundrect_rratio 0.147059)
+    (fp_line (start -2.85 2.75) (end -2.85 1.5)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 123354ee-6a69-41cd-854b-86343a2ace5f))
+    (fp_line (start -2.56 -3.51) (end 10.06 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 57894754-216e-438b-ac0f-0c99dd2bb74b))
+    (fp_line (start -2.56 2.46) (end -2.56 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8161e9f9-3225-4893-834a-67ee66c528db))
+    (fp_line (start -2.55 0.2) (end -1.8 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fd45384f-d2d7-495a-8a05-db6ed8e99c3e))
+    (fp_line (start -2.55 1.7) (end -0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 50d123b4-c2d3-4f44-9d82-793c2acb5fc8))
+    (fp_line (start -2.55 2.45) (end -2.55 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5dccab9c-950e-4157-afbb-a2f2e48b86f5))
+    (fp_line (start -1.8 -2.75) (end 3.75 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c8607987-0da8-4272-b78b-9d15f97b0751))
+    (fp_line (start -1.8 0.2) (end -1.8 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ec502257-4153-4add-ac76-5eb6b69f6b62))
+    (fp_line (start -1.6 2.75) (end -2.85 2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ea4a2498-444b-40e5-a5df-1a59c83eac90))
+    (fp_line (start -0.75 1.7) (end -0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e193434e-9b63-4864-921c-ce9868a97f2b))
+    (fp_line (start -0.75 2.45) (end -2.55 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a54e336e-cf98-4663-837d-59b7e0cde3f2))
+    (fp_line (start 0.75 1.7) (end 6.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2c911cad-5c7a-4c8a-b68f-d76b5b44af7f))
+    (fp_line (start 0.75 2.45) (end 0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1c5b80b5-4f82-4765-8da4-dca82511097c))
+    (fp_line (start 6.75 1.7) (end 6.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f489a903-d1c5-42ff-92b0-ed67c538f01a))
+    (fp_line (start 6.75 2.45) (end 0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a3ed018f-0c54-4dcf-91a2-682dbc148a1c))
+    (fp_line (start 8.25 1.7) (end 10.05 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fd0f31a0-fc68-401a-9641-51d08b654c83))
+    (fp_line (start 8.25 2.45) (end 8.25 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5e224243-38b1-43ed-9e5d-2550219a9a15))
+    (fp_line (start 9.3 -2.75) (end 3.75 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f0cee3b8-61b7-4858-8ebd-14eeb28142e8))
+    (fp_line (start 9.3 0.2) (end 9.3 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 02d0d6ef-85cf-4cb9-a5c6-44bc87301793))
+    (fp_line (start 10.05 0.2) (end 9.3 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp db33ace1-3da6-435d-af86-c4247ab350b1))
+    (fp_line (start 10.05 1.7) (end 10.05 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3a27d89d-fbd9-4045-85f7-126725c3b6ee))
+    (fp_line (start 10.05 2.45) (end 8.25 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 25218b3c-eab7-4d88-92c7-ffcb1456151e))
+    (fp_line (start 10.06 -3.51) (end 10.06 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 010d08fc-298f-4369-97d4-4c736f21ceb7))
+    (fp_line (start 10.06 2.46) (end -2.56 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp feb7da23-c97b-430a-ad3d-e14be9741b08))
+    (fp_line (start -2.95 -3.9) (end 10.45 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b06d8cf8-6bdd-4670-ad16-ee618b19d1da))
+    (fp_line (start -2.95 2.85) (end -2.95 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4927fbfa-87f4-44db-90e6-cc1cf7007573))
+    (fp_line (start 10.45 -3.9) (end 10.45 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp dbb29c20-40e8-4801-85ec-5fd25242fae2))
+    (fp_line (start 10.45 2.85) (end -2.95 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 031e766d-ba99-4ac5-b74d-8c2766f9a8a7))
+    (fp_line (start -2.45 -3.4) (end 9.95 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5ff2aa4c-36f7-4c63-b2b0-553df62571c7))
+    (fp_line (start -2.45 2.35) (end -2.45 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f5ed2a46-c147-40aa-9743-5bf3f1798519))
+    (fp_line (start -0.625 2.35) (end 0 1.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ca1345f1-c5f1-4af0-b48c-3a23d28b96f1))
+    (fp_line (start 0 1.35) (end 0.625 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 274329df-acc4-46ae-ab02-0dc2753e4db8))
+    (fp_line (start 9.95 -3.4) (end 9.95 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 388614e1-c348-42d8-8698-8d8e2afff083))
+    (fp_line (start 9.95 2.35) (end -2.45 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e7ef8948-a944-4a80-a651-2148d18bf6be))
+    (pad "1" thru_hole roundrect (at 0 0 90) (size 1.7 1.95) (drill 0.95) (layers "*.Cu" "*.Mask") (roundrect_rratio 0.147059)
       (net 1 "VBUS") (pinfunction "Pin_1") (pintype "passive") (tstamp 98f92498-7785-4fe0-abbe-5b6de26e0da1))
-    (pad "2" thru_hole oval (at 2.5 0 90) (size 1.7 1.95) (drill 0.95) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 2.5 0 90) (size 1.7 1.95) (drill 0.95) (layers "*.Cu" "*.Mask")
       (net 20 "D-") (pinfunction "Pin_2") (pintype "passive") (tstamp a6ed731c-40c4-4893-b0ee-80e9027e8e9a))
-    (pad "3" thru_hole oval (at 5 0 90) (size 1.7 1.95) (drill 0.95) (layers *.Cu *.Mask)
+    (pad "3" thru_hole oval (at 5 0 90) (size 1.7 1.95) (drill 0.95) (layers "*.Cu" "*.Mask")
       (net 21 "D+") (pinfunction "Pin_3") (pintype "passive") (tstamp 0eb2a327-55d4-410b-987e-cd7e008a013a))
-    (pad "4" thru_hole oval (at 7.5 0 90) (size 1.7 1.95) (drill 0.95) (layers *.Cu *.Mask)
+    (pad "4" thru_hole oval (at 7.5 0 90) (size 1.7 1.95) (drill 0.95) (layers "*.Cu" "*.Mask")
       (net 6 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp 143674f1-bb4d-43d1-a7cc-84cd2a52d5c7))
     (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -2835,7 +3594,7 @@
   )
 
   (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "B.Cu")
-    (tedit 5F68FEEF) (tstamp 757cd0f3-ae65-439a-be04-3566f93c43c4)
+    (tstamp 757cd0f3-ae65-439a-be04-3566f93c43c4)
     (at 55.500952 57.015 180)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor handsolder")
@@ -2844,27 +3603,37 @@
     (path "/3d4d9c10-d0b4-4743-a111-dd16933890cd")
     (attr smd)
     (fp_text reference "C14" (at 0 1.68) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 59b140e6-5595-4079-b584-84620e4ab6bd)
     )
     (fp_text value "4u7" (at 0 -1.68) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 2f947536-3680-4fec-8d0c-f821b18adde7)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "B.Fab")
-      (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
+        (effects (font (size 0.5 0.5) (thickness 0.08)) (justify mirror))
       (tstamp a9639e70-a716-4254-8d26-d414875b9a1e)
     )
-    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) (layer "B.SilkS") (width 0.12) (tstamp 04c93eea-6ffe-4729-9966-82ef9abb6d6b))
-    (fp_line (start -0.261252 0.735) (end 0.261252 0.735) (layer "B.SilkS") (width 0.12) (tstamp 74a08bfa-578d-4460-921d-024d88165b10))
-    (fp_line (start -1.88 0.98) (end 1.88 0.98) (layer "B.CrtYd") (width 0.05) (tstamp 10fc57cc-4c5a-4444-a8ce-c6c785e88271))
-    (fp_line (start 1.88 -0.98) (end -1.88 -0.98) (layer "B.CrtYd") (width 0.05) (tstamp 18c3030d-cf28-4091-8a80-f4d9bf57d4b6))
-    (fp_line (start 1.88 0.98) (end 1.88 -0.98) (layer "B.CrtYd") (width 0.05) (tstamp 39ac1aa2-148b-4518-8a9e-d400b303b41d))
-    (fp_line (start -1.88 -0.98) (end -1.88 0.98) (layer "B.CrtYd") (width 0.05) (tstamp dbf6d6f4-fac1-490c-8ed0-e2ae45aff393))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer "B.Fab") (width 0.1) (tstamp 276d4115-9be1-458b-a068-7c2f84d98813))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer "B.Fab") (width 0.1) (tstamp 2ad96972-d6e6-431c-8e65-24fb1ef52163))
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer "B.Fab") (width 0.1) (tstamp 97996c5e-94f3-4ff2-a194-3c2ea1a095da))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer "B.Fab") (width 0.1) (tstamp a7e4e74a-9c8b-495f-97a9-5b9bf18c97d8))
+    (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 04c93eea-6ffe-4729-9966-82ef9abb6d6b))
+    (fp_line (start -0.261252 0.735) (end 0.261252 0.735)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 74a08bfa-578d-4460-921d-024d88165b10))
+    (fp_line (start -1.88 -0.98) (end -1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp dbf6d6f4-fac1-490c-8ed0-e2ae45aff393))
+    (fp_line (start -1.88 0.98) (end 1.88 0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 10fc57cc-4c5a-4444-a8ce-c6c785e88271))
+    (fp_line (start 1.88 -0.98) (end -1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 18c3030d-cf28-4091-8a80-f4d9bf57d4b6))
+    (fp_line (start 1.88 0.98) (end 1.88 -0.98)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 39ac1aa2-148b-4518-8a9e-d400b303b41d))
+    (fp_line (start -1 -0.625) (end -1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 97996c5e-94f3-4ff2-a194-3c2ea1a095da))
+    (fp_line (start -1 0.625) (end 1 0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a7e4e74a-9c8b-495f-97a9-5b9bf18c97d8))
+    (fp_line (start 1 -0.625) (end -1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 2ad96972-d6e6-431c-8e65-24fb1ef52163))
+    (fp_line (start 1 0.625) (end 1 -0.625)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 276d4115-9be1-458b-a068-7c2f84d98813))
     (pad "1" smd roundrect (at -1.0375 0 180) (size 1.175 1.45) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.212766)
       (net 12 "+3.3V") (pintype "passive") (tstamp de0f6942-7e67-4bbf-800e-88b69569fbee))
     (pad "2" smd roundrect (at 1.0375 0 180) (size 1.175 1.45) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.212766)
@@ -2877,7 +3646,7 @@
   )
 
   (footprint "Package_TO_SOT_SMD:SOT-23" (layer "B.Cu")
-    (tedit 5FA16958) (tstamp 866b4775-395c-451a-97b4-55ae815b08e7)
+    (tstamp 866b4775-395c-451a-97b4-55ae815b08e7)
     (at 88.7 36.6 180)
     (descr "SOT, 3 Pin (https://www.jedec.org/system/files/docs/to-236h.pdf variant AB), generated with kicad-footprint-generator ipc_gullwing_generator.py")
     (tags "SOT TO_SOT_SMD")
@@ -2886,30 +3655,43 @@
     (path "/d1dfaf32-8f0b-4d8d-83e6-2c5c56dea190")
     (attr smd)
     (fp_text reference "Q1" (at 0 2.4) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp f1e9ea36-5233-42ae-8e84-919b3142d983)
     )
     (fp_text value "AO3400A" (at 0 -2.4) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp c3a9df69-b82f-42c4-ae54-f98db3e0d737)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "B.Fab")
-      (effects (font (size 0.32 0.32) (thickness 0.05)) (justify mirror))
+        (effects (font (size 0.32 0.32) (thickness 0.05)) (justify mirror))
       (tstamp d0db1f0e-fde9-46a2-b5e0-f5ce5269407c)
     )
-    (fp_line (start 0 -1.56) (end -0.65 -1.56) (layer "B.SilkS") (width 0.12) (tstamp 4b035eae-f067-4f26-adab-e53ebad2e749))
-    (fp_line (start 0 1.56) (end 0.65 1.56) (layer "B.SilkS") (width 0.12) (tstamp 64e3ae68-e13c-4a6c-af01-82241e5d4a95))
-    (fp_line (start 0 1.56) (end -1.675 1.56) (layer "B.SilkS") (width 0.12) (tstamp c15ba791-a71f-4780-a00e-df0befcd23cb))
-    (fp_line (start 0 -1.56) (end 0.65 -1.56) (layer "B.SilkS") (width 0.12) (tstamp d79d1b05-bdd2-4f9f-9f8b-135227c0447a))
-    (fp_line (start 1.92 -1.7) (end 1.92 1.7) (layer "B.CrtYd") (width 0.05) (tstamp 379c3c36-ee42-4ee8-a59e-b92a6908378b))
-    (fp_line (start -1.92 -1.7) (end 1.92 -1.7) (layer "B.CrtYd") (width 0.05) (tstamp 96f9ea1a-910f-40d3-9020-3816d95fbe58))
-    (fp_line (start -1.92 1.7) (end -1.92 -1.7) (layer "B.CrtYd") (width 0.05) (tstamp cf4c8294-20d8-4eea-9b49-53699832838d))
-    (fp_line (start 1.92 1.7) (end -1.92 1.7) (layer "B.CrtYd") (width 0.05) (tstamp ec8b26b9-6b28-4987-bc06-7827d7d9aea2))
-    (fp_line (start -0.65 -1.45) (end -0.65 1.125) (layer "B.Fab") (width 0.1) (tstamp 0af28da6-400d-48cd-9589-352cbefdda81))
-    (fp_line (start 0.65 1.45) (end 0.65 -1.45) (layer "B.Fab") (width 0.1) (tstamp 651694cc-1e9c-4686-8214-55a76b5265f3))
-    (fp_line (start -0.65 1.125) (end -0.325 1.45) (layer "B.Fab") (width 0.1) (tstamp 6b363435-a674-476b-a56f-25726d4132f9))
-    (fp_line (start -0.325 1.45) (end 0.65 1.45) (layer "B.Fab") (width 0.1) (tstamp 7dd0e0cc-72a0-45cc-9b08-527c8afa7fdc))
-    (fp_line (start 0.65 -1.45) (end -0.65 -1.45) (layer "B.Fab") (width 0.1) (tstamp e883573a-f0b3-479a-8162-9c7b4eec25f6))
+    (fp_line (start 0 -1.56) (end -0.65 -1.56)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4b035eae-f067-4f26-adab-e53ebad2e749))
+    (fp_line (start 0 -1.56) (end 0.65 -1.56)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d79d1b05-bdd2-4f9f-9f8b-135227c0447a))
+    (fp_line (start 0 1.56) (end -1.675 1.56)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c15ba791-a71f-4780-a00e-df0befcd23cb))
+    (fp_line (start 0 1.56) (end 0.65 1.56)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 64e3ae68-e13c-4a6c-af01-82241e5d4a95))
+    (fp_line (start -1.92 -1.7) (end 1.92 -1.7)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 96f9ea1a-910f-40d3-9020-3816d95fbe58))
+    (fp_line (start -1.92 1.7) (end -1.92 -1.7)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp cf4c8294-20d8-4eea-9b49-53699832838d))
+    (fp_line (start 1.92 -1.7) (end 1.92 1.7)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 379c3c36-ee42-4ee8-a59e-b92a6908378b))
+    (fp_line (start 1.92 1.7) (end -1.92 1.7)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ec8b26b9-6b28-4987-bc06-7827d7d9aea2))
+    (fp_line (start -0.65 -1.45) (end -0.65 1.125)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0af28da6-400d-48cd-9589-352cbefdda81))
+    (fp_line (start -0.65 1.125) (end -0.325 1.45)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6b363435-a674-476b-a56f-25726d4132f9))
+    (fp_line (start -0.325 1.45) (end 0.65 1.45)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7dd0e0cc-72a0-45cc-9b08-527c8afa7fdc))
+    (fp_line (start 0.65 -1.45) (end -0.65 -1.45)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e883573a-f0b3-479a-8162-9c7b4eec25f6))
+    (fp_line (start 0.65 1.45) (end 0.65 -1.45)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 651694cc-1e9c-4686-8214-55a76b5265f3))
     (pad "1" smd roundrect (at -0.9375 0.95 180) (size 1.475 0.6) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 48 "Net-(Q1-Pad1)") (pinfunction "G") (pintype "input") (tstamp 068fbfad-ab91-4c3a-8e0f-5da3b7dda0fa))
     (pad "2" smd roundrect (at -0.9375 -0.95 180) (size 1.475 0.6) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
@@ -2924,7 +3706,7 @@
   )
 
   (footprint "Package_TO_SOT_SMD:SOT-23" (layer "B.Cu")
-    (tedit 5FA16958) (tstamp 910a014e-db91-4a7a-8a54-4a2ad798f809)
+    (tstamp 910a014e-db91-4a7a-8a54-4a2ad798f809)
     (at 27.6 26.1 180)
     (descr "SOT, 3 Pin (https://www.jedec.org/system/files/docs/to-236h.pdf variant AB), generated with kicad-footprint-generator ipc_gullwing_generator.py")
     (tags "SOT TO_SOT_SMD")
@@ -2933,30 +3715,43 @@
     (path "/8232e863-da91-4663-8a63-93dbc5f10dcb")
     (attr smd)
     (fp_text reference "D2" (at 0 2.4) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 16872dee-666c-4c54-b7c7-85a2966e205e)
     )
     (fp_text value "BAV99" (at 0 -2.4) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp e3af8d13-b987-4b64-a2d5-2f07eafc91a6)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "B.Fab")
-      (effects (font (size 0.32 0.32) (thickness 0.05)) (justify mirror))
+        (effects (font (size 0.32 0.32) (thickness 0.05)) (justify mirror))
       (tstamp d2f7f89d-d628-40b6-bfb8-4d8e61399cde)
     )
-    (fp_line (start 0 -1.56) (end 0.65 -1.56) (layer "B.SilkS") (width 0.12) (tstamp 44f666cc-4cdc-4307-88b0-abad60bbcd9c))
-    (fp_line (start 0 1.56) (end -1.675 1.56) (layer "B.SilkS") (width 0.12) (tstamp 7d472e59-3527-4bbb-ab39-49b8cb38bf88))
-    (fp_line (start 0 -1.56) (end -0.65 -1.56) (layer "B.SilkS") (width 0.12) (tstamp c51bcb0f-1ff8-49c9-b032-ea2008b37d84))
-    (fp_line (start 0 1.56) (end 0.65 1.56) (layer "B.SilkS") (width 0.12) (tstamp d644262f-a10d-44da-8b87-813785a10cbe))
-    (fp_line (start 1.92 -1.7) (end 1.92 1.7) (layer "B.CrtYd") (width 0.05) (tstamp 19b13576-0e05-49e9-9aba-1946ca33ea53))
-    (fp_line (start -1.92 1.7) (end -1.92 -1.7) (layer "B.CrtYd") (width 0.05) (tstamp ac437210-3120-4002-808b-9126d50f07b7))
-    (fp_line (start -1.92 -1.7) (end 1.92 -1.7) (layer "B.CrtYd") (width 0.05) (tstamp fba36411-e8f8-40ad-b95f-85d92451755f))
-    (fp_line (start 1.92 1.7) (end -1.92 1.7) (layer "B.CrtYd") (width 0.05) (tstamp fc1e5b19-ae5a-4000-88af-1d9556f1604d))
-    (fp_line (start 0.65 1.45) (end 0.65 -1.45) (layer "B.Fab") (width 0.1) (tstamp 095a5323-cb37-48d2-ba9a-4e639beeb280))
-    (fp_line (start 0.65 -1.45) (end -0.65 -1.45) (layer "B.Fab") (width 0.1) (tstamp 53d9093d-1ee2-41db-9040-5f0c7221aa7a))
-    (fp_line (start -0.65 1.125) (end -0.325 1.45) (layer "B.Fab") (width 0.1) (tstamp 55cfb2ca-d2ee-41d6-9f8e-5f0c1cf7f2ab))
-    (fp_line (start -0.65 -1.45) (end -0.65 1.125) (layer "B.Fab") (width 0.1) (tstamp 7a41b4eb-1413-46dc-8499-29c3d73ebb2b))
-    (fp_line (start -0.325 1.45) (end 0.65 1.45) (layer "B.Fab") (width 0.1) (tstamp ddfca529-7776-40e2-bc77-4fd371ee4ce7))
+    (fp_line (start 0 -1.56) (end -0.65 -1.56)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c51bcb0f-1ff8-49c9-b032-ea2008b37d84))
+    (fp_line (start 0 -1.56) (end 0.65 -1.56)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 44f666cc-4cdc-4307-88b0-abad60bbcd9c))
+    (fp_line (start 0 1.56) (end -1.675 1.56)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7d472e59-3527-4bbb-ab39-49b8cb38bf88))
+    (fp_line (start 0 1.56) (end 0.65 1.56)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d644262f-a10d-44da-8b87-813785a10cbe))
+    (fp_line (start -1.92 -1.7) (end 1.92 -1.7)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fba36411-e8f8-40ad-b95f-85d92451755f))
+    (fp_line (start -1.92 1.7) (end -1.92 -1.7)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ac437210-3120-4002-808b-9126d50f07b7))
+    (fp_line (start 1.92 -1.7) (end 1.92 1.7)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 19b13576-0e05-49e9-9aba-1946ca33ea53))
+    (fp_line (start 1.92 1.7) (end -1.92 1.7)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fc1e5b19-ae5a-4000-88af-1d9556f1604d))
+    (fp_line (start -0.65 -1.45) (end -0.65 1.125)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7a41b4eb-1413-46dc-8499-29c3d73ebb2b))
+    (fp_line (start -0.65 1.125) (end -0.325 1.45)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 55cfb2ca-d2ee-41d6-9f8e-5f0c1cf7f2ab))
+    (fp_line (start -0.325 1.45) (end 0.65 1.45)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ddfca529-7776-40e2-bc77-4fd371ee4ce7))
+    (fp_line (start 0.65 -1.45) (end -0.65 -1.45)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 53d9093d-1ee2-41db-9040-5f0c7221aa7a))
+    (fp_line (start 0.65 1.45) (end 0.65 -1.45)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 095a5323-cb37-48d2-ba9a-4e639beeb280))
     (pad "1" smd roundrect (at -0.9375 0.95 180) (size 1.475 0.6) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 4 "GNDA") (pinfunction "K") (pintype "passive") (tstamp 6bde44f5-d1f4-4ed3-a54f-c0051781f661))
     (pad "2" smd roundrect (at -0.9375 -0.95 180) (size 1.475 0.6) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
@@ -2971,7 +3766,7 @@
   )
 
   (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (layer "B.Cu")
-    (tedit 5C28146C) (tstamp 93725b49-d87f-48fc-b1a9-c3d0cc9c3a4c)
+    (tstamp 93725b49-d87f-48fc-b1a9-c3d0cc9c3a4c)
     (at 58.6 17.6 180)
     (descr "JST XH series connector, B2B-XH-A (http://www.jst-mfg.com/product/pdf/eng/eXH.pdf), generated with kicad-footprint-generator")
     (tags "connector JST XH vertical")
@@ -2980,54 +3775,88 @@
     (path "/c59d2644-9a71-42de-8e8a-7677a25f1847")
     (attr through_hole)
     (fp_text reference "J8" (at 1.25 3.55) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 2d2d85c2-fb31-4880-b773-0e78758ba36a)
     )
     (fp_text value "PH2.54_02" (at 1.25 -4.6) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 6816f2d6-3c47-4043-9f9e-8e3e5976a92a)
     )
     (fp_text user "${REFERENCE}" (at 1.25 -2.7) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp ebd8cf58-6a57-4c38-9434-568e79855a27)
     )
-    (fp_line (start 5.05 0.2) (end 4.3 0.2) (layer "B.SilkS") (width 0.12) (tstamp 020eeb8a-3d77-4170-9a17-1a16fb9e76ff))
-    (fp_line (start 0.75 2.45) (end 0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 11e8d821-40d3-4020-a4c3-3b9ae6fc03e2))
-    (fp_line (start -2.56 2.46) (end -2.56 -3.51) (layer "B.SilkS") (width 0.12) (tstamp 212cdd75-2f0c-4e4b-bb26-793881fb808d))
-    (fp_line (start 5.06 2.46) (end -2.56 2.46) (layer "B.SilkS") (width 0.12) (tstamp 2e68c565-634d-4f08-816c-902495ebc00e))
-    (fp_line (start -1.8 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 30d760d2-aad3-4018-be6a-02bee47ef63c))
-    (fp_line (start -2.55 1.7) (end -0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 362b6d31-3696-49c8-8e15-d087e1859e0b))
-    (fp_line (start 4.3 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 49a9b92f-251f-4263-b6b1-9a280b5a6f43))
-    (fp_line (start 1.75 1.7) (end 1.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 5308fc59-e369-4aa2-9346-b5bde954c054))
-    (fp_line (start 1.75 2.45) (end 0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 57942293-1bf5-46a3-9b53-bc71203429b1))
-    (fp_line (start -1.8 0.2) (end -1.8 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 607056a5-f42a-4ab8-a182-8dc66cb9b64e))
-    (fp_line (start 5.05 2.45) (end 3.25 2.45) (layer "B.SilkS") (width 0.12) (tstamp 60eb41e1-e0ff-41fd-8da2-d26756875c34))
-    (fp_line (start 0.75 1.7) (end 1.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 78106f21-c63f-4025-92ba-3a38e0559743))
-    (fp_line (start 5.06 -3.51) (end 5.06 2.46) (layer "B.SilkS") (width 0.12) (tstamp 85fe64cc-9641-4915-8845-45d548e2af31))
-    (fp_line (start 5.05 1.7) (end 5.05 2.45) (layer "B.SilkS") (width 0.12) (tstamp 97a32ecb-ba45-4e0b-8a1c-f39b125bb10f))
-    (fp_line (start -0.75 1.7) (end -0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 98552bac-6aa7-46bc-87f7-b74cdef76417))
-    (fp_line (start 3.25 1.7) (end 5.05 1.7) (layer "B.SilkS") (width 0.12) (tstamp a0fe6dab-15e9-4ffd-bfbb-f2bb7f9d1253))
-    (fp_line (start -1.6 2.75) (end -2.85 2.75) (layer "B.SilkS") (width 0.12) (tstamp ac6d931f-397a-4579-9b15-0cab9f3932c4))
-    (fp_line (start 3.25 2.45) (end 3.25 1.7) (layer "B.SilkS") (width 0.12) (tstamp b3d2d935-5551-4a03-9fb5-a93aab823481))
-    (fp_line (start -2.85 2.75) (end -2.85 1.5) (layer "B.SilkS") (width 0.12) (tstamp c337a64a-4f6a-462b-8ee2-5ecb8b21ce9d))
-    (fp_line (start -2.56 -3.51) (end 5.06 -3.51) (layer "B.SilkS") (width 0.12) (tstamp d17a5917-25e2-40a5-bab3-d424056e7fc1))
-    (fp_line (start -2.55 0.2) (end -1.8 0.2) (layer "B.SilkS") (width 0.12) (tstamp dc56dd5b-990c-45fe-a05c-1da25c7b850e))
-    (fp_line (start 4.3 0.2) (end 4.3 -2.75) (layer "B.SilkS") (width 0.12) (tstamp e23eda8d-7c95-4eb2-be10-b3e0f5d99db4))
-    (fp_line (start -2.55 2.45) (end -2.55 1.7) (layer "B.SilkS") (width 0.12) (tstamp ee681208-289a-4529-93c5-6ff3dd61e85c))
-    (fp_line (start -0.75 2.45) (end -2.55 2.45) (layer "B.SilkS") (width 0.12) (tstamp f83a7208-6907-431d-8e92-d09a8e81ef7b))
-    (fp_line (start 5.45 2.85) (end -2.95 2.85) (layer "B.CrtYd") (width 0.05) (tstamp 019fad03-ce9a-4655-b6b5-1b331c2e57ed))
-    (fp_line (start -2.95 -3.9) (end 5.45 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp 2f4eef90-38de-429e-9fc1-36e434ca19d3))
-    (fp_line (start -2.95 2.85) (end -2.95 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp 5c0b4ce1-e648-4cc7-ad90-104f9718babb))
-    (fp_line (start 5.45 -3.9) (end 5.45 2.85) (layer "B.CrtYd") (width 0.05) (tstamp f7b6b719-ab15-4416-b061-94c483d8a2c3))
-    (fp_line (start 4.95 2.35) (end -2.45 2.35) (layer "B.Fab") (width 0.1) (tstamp 0239cb6f-df09-4f98-897c-ae33ad624f83))
-    (fp_line (start -2.45 2.35) (end -2.45 -3.4) (layer "B.Fab") (width 0.1) (tstamp 7a862d02-989f-4b25-8bfd-1db074f5c84c))
-    (fp_line (start -0.625 2.35) (end 0 1.35) (layer "B.Fab") (width 0.1) (tstamp 8b2cc667-3a31-4fd6-93f5-7131f8076abd))
-    (fp_line (start 4.95 -3.4) (end 4.95 2.35) (layer "B.Fab") (width 0.1) (tstamp a2719482-a3e7-442b-a303-3aea5ff8cb55))
-    (fp_line (start 0 1.35) (end 0.625 2.35) (layer "B.Fab") (width 0.1) (tstamp c124de90-3948-43ce-b01d-945ddf78000c))
-    (fp_line (start -2.45 -3.4) (end 4.95 -3.4) (layer "B.Fab") (width 0.1) (tstamp d2b36167-8002-418a-a74a-45ec2f29cf93))
-    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask) (roundrect_rratio 0.147059)
+    (fp_line (start -2.85 2.75) (end -2.85 1.5)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c337a64a-4f6a-462b-8ee2-5ecb8b21ce9d))
+    (fp_line (start -2.56 -3.51) (end 5.06 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d17a5917-25e2-40a5-bab3-d424056e7fc1))
+    (fp_line (start -2.56 2.46) (end -2.56 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 212cdd75-2f0c-4e4b-bb26-793881fb808d))
+    (fp_line (start -2.55 0.2) (end -1.8 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp dc56dd5b-990c-45fe-a05c-1da25c7b850e))
+    (fp_line (start -2.55 1.7) (end -0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 362b6d31-3696-49c8-8e15-d087e1859e0b))
+    (fp_line (start -2.55 2.45) (end -2.55 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ee681208-289a-4529-93c5-6ff3dd61e85c))
+    (fp_line (start -1.8 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 30d760d2-aad3-4018-be6a-02bee47ef63c))
+    (fp_line (start -1.8 0.2) (end -1.8 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 607056a5-f42a-4ab8-a182-8dc66cb9b64e))
+    (fp_line (start -1.6 2.75) (end -2.85 2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ac6d931f-397a-4579-9b15-0cab9f3932c4))
+    (fp_line (start -0.75 1.7) (end -0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 98552bac-6aa7-46bc-87f7-b74cdef76417))
+    (fp_line (start -0.75 2.45) (end -2.55 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f83a7208-6907-431d-8e92-d09a8e81ef7b))
+    (fp_line (start 0.75 1.7) (end 1.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 78106f21-c63f-4025-92ba-3a38e0559743))
+    (fp_line (start 0.75 2.45) (end 0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 11e8d821-40d3-4020-a4c3-3b9ae6fc03e2))
+    (fp_line (start 1.75 1.7) (end 1.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5308fc59-e369-4aa2-9346-b5bde954c054))
+    (fp_line (start 1.75 2.45) (end 0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 57942293-1bf5-46a3-9b53-bc71203429b1))
+    (fp_line (start 3.25 1.7) (end 5.05 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a0fe6dab-15e9-4ffd-bfbb-f2bb7f9d1253))
+    (fp_line (start 3.25 2.45) (end 3.25 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b3d2d935-5551-4a03-9fb5-a93aab823481))
+    (fp_line (start 4.3 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 49a9b92f-251f-4263-b6b1-9a280b5a6f43))
+    (fp_line (start 4.3 0.2) (end 4.3 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e23eda8d-7c95-4eb2-be10-b3e0f5d99db4))
+    (fp_line (start 5.05 0.2) (end 4.3 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 020eeb8a-3d77-4170-9a17-1a16fb9e76ff))
+    (fp_line (start 5.05 1.7) (end 5.05 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 97a32ecb-ba45-4e0b-8a1c-f39b125bb10f))
+    (fp_line (start 5.05 2.45) (end 3.25 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 60eb41e1-e0ff-41fd-8da2-d26756875c34))
+    (fp_line (start 5.06 -3.51) (end 5.06 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 85fe64cc-9641-4915-8845-45d548e2af31))
+    (fp_line (start 5.06 2.46) (end -2.56 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2e68c565-634d-4f08-816c-902495ebc00e))
+    (fp_line (start -2.95 -3.9) (end 5.45 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2f4eef90-38de-429e-9fc1-36e434ca19d3))
+    (fp_line (start -2.95 2.85) (end -2.95 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5c0b4ce1-e648-4cc7-ad90-104f9718babb))
+    (fp_line (start 5.45 -3.9) (end 5.45 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp f7b6b719-ab15-4416-b061-94c483d8a2c3))
+    (fp_line (start 5.45 2.85) (end -2.95 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 019fad03-ce9a-4655-b6b5-1b331c2e57ed))
+    (fp_line (start -2.45 -3.4) (end 4.95 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d2b36167-8002-418a-a74a-45ec2f29cf93))
+    (fp_line (start -2.45 2.35) (end -2.45 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7a862d02-989f-4b25-8bfd-1db074f5c84c))
+    (fp_line (start -0.625 2.35) (end 0 1.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8b2cc667-3a31-4fd6-93f5-7131f8076abd))
+    (fp_line (start 0 1.35) (end 0.625 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c124de90-3948-43ce-b01d-945ddf78000c))
+    (fp_line (start 4.95 -3.4) (end 4.95 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a2719482-a3e7-442b-a303-3aea5ff8cb55))
+    (fp_line (start 4.95 2.35) (end -2.45 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0239cb6f-df09-4f98-897c-ae33ad624f83))
+    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask") (roundrect_rratio 0.147059)
       (net 6 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp 12299444-837f-40df-9fe2-b3af7ef7d678))
-    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask")
       (net 36 "Net-(J8-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 7d184302-05c5-425e-810c-467a65cfaa52))
     (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -3037,7 +3866,7 @@
   )
 
   (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (layer "B.Cu")
-    (tedit 5C28146C) (tstamp a15d623b-b443-4872-98c0-9cb8cdfc59c9)
+    (tstamp a15d623b-b443-4872-98c0-9cb8cdfc59c9)
     (at 29.1 17.6 180)
     (descr "JST XH series connector, B2B-XH-A (http://www.jst-mfg.com/product/pdf/eng/eXH.pdf), generated with kicad-footprint-generator")
     (tags "connector JST XH vertical")
@@ -3046,54 +3875,88 @@
     (path "/c2ea99a3-6bde-4d0a-9bea-d3e250289ee4")
     (attr through_hole)
     (fp_text reference "J11" (at 1.25 3.55) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 53ef9825-152f-4a69-b93d-dd623802752b)
     )
     (fp_text value "PH2.54_02" (at 1.25 -4.6) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 8eab4c26-fea2-4bcd-bf51-43d5f357ae79)
     )
     (fp_text user "${REFERENCE}" (at 1.25 -2.7) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp eed93de1-4813-45d7-a790-b5a0daeba9ea)
     )
-    (fp_line (start 5.06 -3.51) (end 5.06 2.46) (layer "B.SilkS") (width 0.12) (tstamp 045834c2-c0e9-4b73-b9a7-cdf9af8ea138))
-    (fp_line (start -1.8 0.2) (end -1.8 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 249fd0e6-504a-4270-b076-1d97ec04b02a))
-    (fp_line (start 1.75 1.7) (end 1.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 2cd5c44d-36f0-4328-be48-f3122ebd0ada))
-    (fp_line (start -2.85 2.75) (end -2.85 1.5) (layer "B.SilkS") (width 0.12) (tstamp 2e41814e-5d7c-42f4-990f-ad5417794fe6))
-    (fp_line (start -0.75 2.45) (end -2.55 2.45) (layer "B.SilkS") (width 0.12) (tstamp 5350b705-a9b3-4a5e-9b44-f2284fb7b2d8))
-    (fp_line (start 1.75 2.45) (end 0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 5c422078-fd80-491a-96c0-12c674fd2724))
-    (fp_line (start 0.75 2.45) (end 0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 6d4cbeef-1708-48a5-8692-9742a2bc3093))
-    (fp_line (start 5.06 2.46) (end -2.56 2.46) (layer "B.SilkS") (width 0.12) (tstamp 744c6883-771a-479b-bd8d-3ef861200096))
-    (fp_line (start -2.55 2.45) (end -2.55 1.7) (layer "B.SilkS") (width 0.12) (tstamp 7bc34d88-c732-4cc5-a076-d5c2accf5c41))
-    (fp_line (start -1.6 2.75) (end -2.85 2.75) (layer "B.SilkS") (width 0.12) (tstamp 8142e085-e259-4ede-906a-e13bc60846b9))
-    (fp_line (start -2.56 2.46) (end -2.56 -3.51) (layer "B.SilkS") (width 0.12) (tstamp 912a776e-3ba2-472c-9b66-3054c2de7e7d))
-    (fp_line (start 0.75 1.7) (end 1.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 97e2f919-1e3a-470c-afa3-44fc2ba3edf9))
-    (fp_line (start 4.3 0.2) (end 4.3 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 9d8edc5f-1923-4a34-898e-5057fd8bff18))
-    (fp_line (start 5.05 2.45) (end 3.25 2.45) (layer "B.SilkS") (width 0.12) (tstamp a0007d17-95d2-465e-a9e1-8b4e7762db53))
-    (fp_line (start -2.55 1.7) (end -0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp a528b7b3-4842-449e-a15b-9ea8dfc08e1d))
-    (fp_line (start 3.25 2.45) (end 3.25 1.7) (layer "B.SilkS") (width 0.12) (tstamp ae31bb51-7f95-4f7e-a8c6-cff73f923357))
-    (fp_line (start -1.8 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp d7748beb-3620-42cc-904d-345c4481304b))
-    (fp_line (start 3.25 1.7) (end 5.05 1.7) (layer "B.SilkS") (width 0.12) (tstamp d7f16434-847c-4111-a1d5-10afcfc197ea))
-    (fp_line (start -2.56 -3.51) (end 5.06 -3.51) (layer "B.SilkS") (width 0.12) (tstamp da8b1afd-0007-4c29-9c2d-c979920d6c1e))
-    (fp_line (start 5.05 0.2) (end 4.3 0.2) (layer "B.SilkS") (width 0.12) (tstamp e2e36764-572e-4008-9df8-589633cae3d8))
-    (fp_line (start 5.05 1.7) (end 5.05 2.45) (layer "B.SilkS") (width 0.12) (tstamp e32e0b69-0a93-4cde-9434-f11a6cd9bd17))
-    (fp_line (start -0.75 1.7) (end -0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp f19f00e5-4dde-4610-affb-ea79d4516be3))
-    (fp_line (start -2.55 0.2) (end -1.8 0.2) (layer "B.SilkS") (width 0.12) (tstamp f590e650-1b8f-454e-89f3-75bf921cc74d))
-    (fp_line (start 4.3 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp fbe3eac1-2ca5-45a4-8562-03affc095603))
-    (fp_line (start 5.45 2.85) (end -2.95 2.85) (layer "B.CrtYd") (width 0.05) (tstamp 489c0ee6-cc99-4473-a291-c32fa371f410))
-    (fp_line (start 5.45 -3.9) (end 5.45 2.85) (layer "B.CrtYd") (width 0.05) (tstamp 60741116-7227-4560-a9d2-2b6c72c30db3))
-    (fp_line (start -2.95 2.85) (end -2.95 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp ba72b0b3-acba-4b16-8daa-c23bb9d3b996))
-    (fp_line (start -2.95 -3.9) (end 5.45 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp d75229f1-6d71-4975-ab67-921e7b6b0079))
-    (fp_line (start 0 1.35) (end 0.625 2.35) (layer "B.Fab") (width 0.1) (tstamp 11706043-4e8f-493a-a8de-554aa962c01f))
-    (fp_line (start 4.95 -3.4) (end 4.95 2.35) (layer "B.Fab") (width 0.1) (tstamp 5413d159-32fa-4e51-ad3b-cdf5490e039c))
-    (fp_line (start 4.95 2.35) (end -2.45 2.35) (layer "B.Fab") (width 0.1) (tstamp 63f2bd2b-570c-4b54-9989-edff9110d754))
-    (fp_line (start -2.45 -3.4) (end 4.95 -3.4) (layer "B.Fab") (width 0.1) (tstamp 7bd2ef1b-0129-4e92-85c6-1e6bab6fdce7))
-    (fp_line (start -0.625 2.35) (end 0 1.35) (layer "B.Fab") (width 0.1) (tstamp 8d351528-6729-465f-bfd2-c002290f5250))
-    (fp_line (start -2.45 2.35) (end -2.45 -3.4) (layer "B.Fab") (width 0.1) (tstamp d3d94166-8f59-45c0-a82d-24b86c6dcc8d))
-    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask) (roundrect_rratio 0.147059)
+    (fp_line (start -2.85 2.75) (end -2.85 1.5)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2e41814e-5d7c-42f4-990f-ad5417794fe6))
+    (fp_line (start -2.56 -3.51) (end 5.06 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp da8b1afd-0007-4c29-9c2d-c979920d6c1e))
+    (fp_line (start -2.56 2.46) (end -2.56 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 912a776e-3ba2-472c-9b66-3054c2de7e7d))
+    (fp_line (start -2.55 0.2) (end -1.8 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f590e650-1b8f-454e-89f3-75bf921cc74d))
+    (fp_line (start -2.55 1.7) (end -0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a528b7b3-4842-449e-a15b-9ea8dfc08e1d))
+    (fp_line (start -2.55 2.45) (end -2.55 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7bc34d88-c732-4cc5-a076-d5c2accf5c41))
+    (fp_line (start -1.8 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d7748beb-3620-42cc-904d-345c4481304b))
+    (fp_line (start -1.8 0.2) (end -1.8 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 249fd0e6-504a-4270-b076-1d97ec04b02a))
+    (fp_line (start -1.6 2.75) (end -2.85 2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8142e085-e259-4ede-906a-e13bc60846b9))
+    (fp_line (start -0.75 1.7) (end -0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f19f00e5-4dde-4610-affb-ea79d4516be3))
+    (fp_line (start -0.75 2.45) (end -2.55 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5350b705-a9b3-4a5e-9b44-f2284fb7b2d8))
+    (fp_line (start 0.75 1.7) (end 1.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 97e2f919-1e3a-470c-afa3-44fc2ba3edf9))
+    (fp_line (start 0.75 2.45) (end 0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6d4cbeef-1708-48a5-8692-9742a2bc3093))
+    (fp_line (start 1.75 1.7) (end 1.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2cd5c44d-36f0-4328-be48-f3122ebd0ada))
+    (fp_line (start 1.75 2.45) (end 0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5c422078-fd80-491a-96c0-12c674fd2724))
+    (fp_line (start 3.25 1.7) (end 5.05 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d7f16434-847c-4111-a1d5-10afcfc197ea))
+    (fp_line (start 3.25 2.45) (end 3.25 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ae31bb51-7f95-4f7e-a8c6-cff73f923357))
+    (fp_line (start 4.3 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fbe3eac1-2ca5-45a4-8562-03affc095603))
+    (fp_line (start 4.3 0.2) (end 4.3 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 9d8edc5f-1923-4a34-898e-5057fd8bff18))
+    (fp_line (start 5.05 0.2) (end 4.3 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e2e36764-572e-4008-9df8-589633cae3d8))
+    (fp_line (start 5.05 1.7) (end 5.05 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e32e0b69-0a93-4cde-9434-f11a6cd9bd17))
+    (fp_line (start 5.05 2.45) (end 3.25 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a0007d17-95d2-465e-a9e1-8b4e7762db53))
+    (fp_line (start 5.06 -3.51) (end 5.06 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 045834c2-c0e9-4b73-b9a7-cdf9af8ea138))
+    (fp_line (start 5.06 2.46) (end -2.56 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 744c6883-771a-479b-bd8d-3ef861200096))
+    (fp_line (start -2.95 -3.9) (end 5.45 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d75229f1-6d71-4975-ab67-921e7b6b0079))
+    (fp_line (start -2.95 2.85) (end -2.95 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ba72b0b3-acba-4b16-8daa-c23bb9d3b996))
+    (fp_line (start 5.45 -3.9) (end 5.45 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 60741116-7227-4560-a9d2-2b6c72c30db3))
+    (fp_line (start 5.45 2.85) (end -2.95 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 489c0ee6-cc99-4473-a291-c32fa371f410))
+    (fp_line (start -2.45 -3.4) (end 4.95 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 7bd2ef1b-0129-4e92-85c6-1e6bab6fdce7))
+    (fp_line (start -2.45 2.35) (end -2.45 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d3d94166-8f59-45c0-a82d-24b86c6dcc8d))
+    (fp_line (start -0.625 2.35) (end 0 1.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8d351528-6729-465f-bfd2-c002290f5250))
+    (fp_line (start 0 1.35) (end 0.625 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 11706043-4e8f-493a-a8de-554aa962c01f))
+    (fp_line (start 4.95 -3.4) (end 4.95 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5413d159-32fa-4e51-ad3b-cdf5490e039c))
+    (fp_line (start 4.95 2.35) (end -2.45 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 63f2bd2b-570c-4b54-9989-edff9110d754))
+    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask") (roundrect_rratio 0.147059)
       (net 4 "GNDA") (pinfunction "Pin_1") (pintype "passive") (tstamp 9a3d536e-4521-4f81-9948-6f08a3de5a19))
-    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask")
       (net 13 "Net-(C10-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp c328377a-d686-4b0a-b9aa-0f282aec4720))
     (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -3103,7 +3966,7 @@
   )
 
   (footprint "V0-Display:MolexVertical&Horizontal_MicroB" (layer "B.Cu")
-    (tedit 5EF9410C) (tstamp baa3f915-5cab-4467-b804-4821227c539b)
+    (tstamp baa3f915-5cab-4467-b804-4821227c539b)
     (at 11.9 37.4 90)
     (descr "http://www.molex.com/pdm_docs/sd/1050170001_sd.pdf")
     (tags "Micro-USB SMD Typ-B")
@@ -3112,71 +3975,93 @@
     (path "/e0a255e5-301a-4cfd-a068-f2cc35d9a04f")
     (attr smd)
     (fp_text reference "J6" (at 0 3.1125 90) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 78851291-c72e-4c0c-b9a9-12358d4da83d)
     )
     (fp_text value "USB_B_Micro" (at 0.3 -4.3375 90) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 39b3508c-bb6e-49dc-8d9e-69db49a1fb7b)
     )
     (fp_text user "PCB Edge" (at 0 -2.6875 90) (layer "Dwgs.User")
-      (effects (font (size 0.5 0.5) (thickness 0.08)))
+        (effects (font (size 0.5 0.5) (thickness 0.08)))
       (tstamp de1deb0e-a252-4a9a-9c15-633f09572db6)
     )
     (fp_text user "${REFERENCE}" (at 0 -0.8875 90) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 6024f358-44e5-41c9-875d-75de8d4eaefd)
     )
-    (fp_line (start -3.9 1.7625) (end -3.45 1.7625) (layer "B.SilkS") (width 0.12) (tstamp 00c8877e-2eb4-4965-a8c1-0bc685fe13d1))
-    (fp_line (start -3.9 -2.6375) (end -3.9 -2.3875) (layer "B.SilkS") (width 0.12) (tstamp 2fd7b3b5-ebdb-4c22-a942-5e051292c4e0))
-    (fp_line (start 3.9 -2.6375) (end 3.9 -2.3875) (layer "B.SilkS") (width 0.12) (tstamp 4bdd147e-4536-4bb7-a451-0b8ab31b001c))
-    (fp_line (start 3.9 1.7625) (end 3.45 1.7625) (layer "B.SilkS") (width 0.12) (tstamp 5516b1ea-02ec-4811-8c5d-48932aacd8e3))
-    (fp_line (start 3.9 -0.0875) (end 3.9 1.7625) (layer "B.SilkS") (width 0.12) (tstamp 6aa44ea1-90ed-48ce-97e1-4797853ec5a6))
-    (fp_line (start -3.9 -0.0875) (end -3.9 1.7625) (layer "B.SilkS") (width 0.12) (tstamp 6c57cce5-0d4a-4447-a23c-c38c2aa5935f))
-    (fp_line (start -1.7 2.3125) (end -1.7 1.8625) (layer "B.SilkS") (width 0.12) (tstamp d457e2bc-4aed-4654-b185-3a87b9630327))
-    (fp_line (start -1.7 2.3125) (end -1.25 2.3125) (layer "B.SilkS") (width 0.12) (tstamp ea5f4b8d-ead5-4302-8df5-751fb2bf2484))
-    (fp_line (start -4.4 2.46) (end 4.4 2.46) (layer "B.CrtYd") (width 0.05) (tstamp 6260d9fe-e8f0-41dd-915d-ec4e059e5d53))
-    (fp_line (start 4.4 2.46) (end 4.4 -3.64) (layer "B.CrtYd") (width 0.05) (tstamp 8643cb79-083a-4157-90b5-ce65c28f48d8))
-    (fp_line (start -4.4 -3.64) (end 4.4 -3.64) (layer "B.CrtYd") (width 0.05) (tstamp c5a779a6-7d03-4235-9aab-65480faa0d58))
-    (fp_line (start -4.4 -3.64) (end -4.4 2.46) (layer "B.CrtYd") (width 0.05) (tstamp ead2804a-2c4a-44fd-ba9b-63f05fe3cb76))
-    (fp_line (start -3 -2.689204) (end 3 -2.689204) (layer "B.Fab") (width 0.1) (tstamp 3afd4f02-be9e-4522-996a-91c1f0f8a21d))
-    (fp_line (start -1.1 1.9125) (end -1.3 1.7125) (layer "B.Fab") (width 0.1) (tstamp 447a6c1e-25c8-42fc-b796-1c3e06fc3932))
-    (fp_line (start -1.1 2.1225) (end -1.1 1.9125) (layer "B.Fab") (width 0.1) (tstamp 44db5c97-4507-44c1-a9ef-771e06d03094))
-    (fp_line (start -3.75 -3.3875) (end -3.75 1.6125) (layer "B.Fab") (width 0.1) (tstamp 4ea8010a-3435-4def-9f25-fc41822bc0bc))
-    (fp_line (start 3.75 -3.3875) (end 3.75 1.6125) (layer "B.Fab") (width 0.1) (tstamp 766c1d19-e336-4fc1-8c05-7eb0f803f488))
-    (fp_line (start -3.75 1.6125) (end 3.75 1.6125) (layer "B.Fab") (width 0.1) (tstamp 81535530-2d87-40c1-8ca6-466f01ecdb55))
-    (fp_line (start -1.3 1.7125) (end -1.5 1.9125) (layer "B.Fab") (width 0.1) (tstamp 9551edf5-9ae9-43a8-aeae-659ad8b88bf1))
-    (fp_line (start -1.5 2.1225) (end -1.5 1.9125) (layer "B.Fab") (width 0.1) (tstamp a13a92bd-facc-4e0d-aa9a-33d2c785354a))
-    (fp_line (start -1.5 2.1225) (end -1.1 2.1225) (layer "B.Fab") (width 0.1) (tstamp a7a15cb7-670d-4c45-a602-071f0337a894))
-    (fp_line (start -3.75 -3.389204) (end 3.75 -3.389204) (layer "B.Fab") (width 0.1) (tstamp ec1efb02-8846-4e3b-ab8e-1592598c3a5b))
-    (pad "1" smd rect locked (at -1.3 1.4625 90) (size 0.4 1.35) (layers "B.Cu" "B.Paste" "B.Mask")
+    (fp_line (start -3.9 -2.6375) (end -3.9 -2.3875)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2fd7b3b5-ebdb-4c22-a942-5e051292c4e0))
+    (fp_line (start -3.9 -0.0875) (end -3.9 1.7625)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6c57cce5-0d4a-4447-a23c-c38c2aa5935f))
+    (fp_line (start -3.9 1.7625) (end -3.45 1.7625)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 00c8877e-2eb4-4965-a8c1-0bc685fe13d1))
+    (fp_line (start -1.7 2.3125) (end -1.7 1.8625)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d457e2bc-4aed-4654-b185-3a87b9630327))
+    (fp_line (start -1.7 2.3125) (end -1.25 2.3125)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ea5f4b8d-ead5-4302-8df5-751fb2bf2484))
+    (fp_line (start 3.9 -2.6375) (end 3.9 -2.3875)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4bdd147e-4536-4bb7-a451-0b8ab31b001c))
+    (fp_line (start 3.9 -0.0875) (end 3.9 1.7625)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6aa44ea1-90ed-48ce-97e1-4797853ec5a6))
+    (fp_line (start 3.9 1.7625) (end 3.45 1.7625)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5516b1ea-02ec-4811-8c5d-48932aacd8e3))
+    (fp_line (start -4.4 -3.64) (end -4.4 2.46)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ead2804a-2c4a-44fd-ba9b-63f05fe3cb76))
+    (fp_line (start -4.4 -3.64) (end 4.4 -3.64)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c5a779a6-7d03-4235-9aab-65480faa0d58))
+    (fp_line (start -4.4 2.46) (end 4.4 2.46)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6260d9fe-e8f0-41dd-915d-ec4e059e5d53))
+    (fp_line (start 4.4 2.46) (end 4.4 -3.64)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8643cb79-083a-4157-90b5-ce65c28f48d8))
+    (fp_line (start -3.75 -3.389204) (end 3.75 -3.389204)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ec1efb02-8846-4e3b-ab8e-1592598c3a5b))
+    (fp_line (start -3.75 -3.3875) (end -3.75 1.6125)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4ea8010a-3435-4def-9f25-fc41822bc0bc))
+    (fp_line (start -3.75 1.6125) (end 3.75 1.6125)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 81535530-2d87-40c1-8ca6-466f01ecdb55))
+    (fp_line (start -3 -2.689204) (end 3 -2.689204)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3afd4f02-be9e-4522-996a-91c1f0f8a21d))
+    (fp_line (start -1.5 2.1225) (end -1.5 1.9125)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a13a92bd-facc-4e0d-aa9a-33d2c785354a))
+    (fp_line (start -1.5 2.1225) (end -1.1 2.1225)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a7a15cb7-670d-4c45-a602-071f0337a894))
+    (fp_line (start -1.3 1.7125) (end -1.5 1.9125)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 9551edf5-9ae9-43a8-aeae-659ad8b88bf1))
+    (fp_line (start -1.1 1.9125) (end -1.3 1.7125)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 447a6c1e-25c8-42fc-b796-1c3e06fc3932))
+    (fp_line (start -1.1 2.1225) (end -1.1 1.9125)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 44db5c97-4507-44c1-a9ef-771e06d03094))
+    (fp_line (start 3.75 -3.3875) (end 3.75 1.6125)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 766c1d19-e336-4fc1-8c05-7eb0f803f488))
+    (pad "1" smd rect (at -1.3 1.4625 90) (size 0.4 1.35) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 1 "VBUS") (pinfunction "VBUS") (pintype "power_out") (tstamp b104db55-4613-4f0e-a2bb-588597122640))
-    (pad "2" smd rect locked (at -0.65 1.4625 90) (size 0.4 1.35) (layers "B.Cu" "B.Paste" "B.Mask")
+    (pad "2" smd rect (at -0.65 1.4625 90) (size 0.4 1.35) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 20 "D-") (pinfunction "D-") (pintype "passive") (tstamp a36882bd-ae14-45ab-b1e6-4f01db971ab5))
-    (pad "3" smd rect locked (at 0 1.4625 90) (size 0.4 1.35) (layers "B.Cu" "B.Paste" "B.Mask")
+    (pad "3" smd rect (at 0 1.4625 90) (size 0.4 1.35) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 21 "D+") (pinfunction "D+") (pintype "passive") (tstamp 313798f8-977f-4d17-a1bc-7b55760eac6e))
-    (pad "4" smd rect locked (at 0.65 1.4625 90) (size 0.4 1.35) (layers "B.Cu" "B.Paste" "B.Mask")
+    (pad "4" smd rect (at 0.65 1.4625 90) (size 0.4 1.35) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 6 "GND") (pinfunction "ID") (pintype "passive") (tstamp d0d7196d-22fc-4ab5-a5cb-64b8f7f5d9be))
-    (pad "5" smd rect locked (at 1.3 1.4625 90) (size 0.4 1.35) (layers "B.Cu" "B.Paste" "B.Mask")
+    (pad "5" smd rect (at 1.3 1.4625 90) (size 0.4 1.35) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 6 "GND") (pinfunction "GND") (pintype "power_out") (tstamp 12d971f6-9b61-41c0-84a9-1edc9434b310))
-    (pad "6" smd rect locked (at -2.9 -1.2375 90) (size 1.2 1.9) (layers "B.Cu" "B.Mask")
-      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp 723481e3-837f-49dc-98e4-3cc482927d7a))
-    (pad "6" smd rect locked (at -1 -1.2375 90) (size 1.5 1.9) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp 7c7b3647-d91b-469b-bbbf-0b42e3e7c26b))
-    (pad "6" thru_hole oval locked (at 2.794 1.4625 90) (size 2 1.1) (drill oval 1.4 0.5) (layers *.Cu *.Mask)
-      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp 8fe3e32a-6052-4c21-ae07-a77fd8ef4446))
-    (pad "6" thru_hole oval locked (at 3.5 -1.2375 90) (size 1.2 1.9) (drill oval 0.6 1.3) (layers *.Cu *.Mask)
-      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp 939276ad-e721-46da-8814-04dedbf55008))
-    (pad "6" smd rect locked (at 2.9 -1.2375 90) (size 1.2 1.9) (layers "B.Cu" "B.Mask")
-      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp 99cf1905-aa48-40d7-9364-c83922cd5829))
-    (pad "6" thru_hole oval locked (at 0 -0.5695 90) (size 2.2 1.1) (drill oval 1.6 0.5) (layers *.Cu *.Mask)
-      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp b77d2c3e-9860-44ca-bbf6-d6a8984ed50c))
-    (pad "6" smd rect locked (at 1 -1.2375 90) (size 1.5 1.9) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp d3ccc6e7-e9e9-41b4-9812-502180cf85eb))
-    (pad "6" thru_hole oval locked (at -2.794 1.4625 90) (size 2 1.1) (drill oval 1.4 0.5) (layers *.Cu *.Mask)
-      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp d975565f-11d6-4f1d-9a1a-9302cadae119))
-    (pad "6" thru_hole oval locked (at -3.5 -1.2375 270) (size 1.2 1.9) (drill oval 0.6 1.3) (layers *.Cu *.Mask)
+    (pad "6" thru_hole oval (at -3.5 -1.2375 270) (size 1.2 1.9) (drill oval 0.6 1.3) (layers "*.Cu" "*.Mask")
       (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp eab1196e-f36e-4a3f-8543-38b0a064c202))
+    (pad "6" smd rect (at -2.9 -1.2375 90) (size 1.2 1.9) (layers "B.Cu" "B.Mask")
+      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp 723481e3-837f-49dc-98e4-3cc482927d7a))
+    (pad "6" thru_hole oval (at -2.794 1.4625 90) (size 2 1.1) (drill oval 1.4 0.5) (layers "*.Cu" "*.Mask")
+      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp d975565f-11d6-4f1d-9a1a-9302cadae119))
+    (pad "6" smd rect (at -1 -1.2375 90) (size 1.5 1.9) (layers "B.Cu" "B.Paste" "B.Mask")
+      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp 7c7b3647-d91b-469b-bbbf-0b42e3e7c26b))
+    (pad "6" thru_hole oval (at 0 -0.5695 90) (size 2.2 1.1) (drill oval 1.6 0.5) (layers "*.Cu" "*.Mask")
+      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp b77d2c3e-9860-44ca-bbf6-d6a8984ed50c))
+    (pad "6" smd rect (at 1 -1.2375 90) (size 1.5 1.9) (layers "B.Cu" "B.Paste" "B.Mask")
+      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp d3ccc6e7-e9e9-41b4-9812-502180cf85eb))
+    (pad "6" thru_hole oval (at 2.794 1.4625 90) (size 2 1.1) (drill oval 1.4 0.5) (layers "*.Cu" "*.Mask")
+      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp 8fe3e32a-6052-4c21-ae07-a77fd8ef4446))
+    (pad "6" smd rect (at 2.9 -1.2375 90) (size 1.2 1.9) (layers "B.Cu" "B.Mask")
+      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp 99cf1905-aa48-40d7-9364-c83922cd5829))
+    (pad "6" thru_hole oval (at 3.5 -1.2375 90) (size 1.2 1.9) (drill oval 0.6 1.3) (layers "*.Cu" "*.Mask")
+      (net 6 "GND") (pinfunction "Shield") (pintype "passive") (tstamp 939276ad-e721-46da-8814-04dedbf55008))
     (model "${KIPRJMOD}/Library/3D_Packages/Molex-1050170001.stp"
       (offset (xyz 0 -1 1.2))
       (scale (xyz 1 1 1))
@@ -3190,7 +4075,7 @@
   )
 
   (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (layer "B.Cu")
-    (tedit 5C28146C) (tstamp bfc5a793-851f-464a-9bff-1c112e09dbaf)
+    (tstamp bfc5a793-851f-464a-9bff-1c112e09dbaf)
     (at 20.5 17.6 180)
     (descr "JST XH series connector, B2B-XH-A (http://www.jst-mfg.com/product/pdf/eng/eXH.pdf), generated with kicad-footprint-generator")
     (tags "connector JST XH vertical")
@@ -3199,54 +4084,88 @@
     (path "/d029bffb-7f37-4e06-af6b-7fe2b7f86d08")
     (attr through_hole)
     (fp_text reference "J2" (at 1.25 3.55) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 067b384e-9c29-4777-81f5-bc295daadf86)
     )
     (fp_text value "PH2.54_02" (at 1.25 -4.6) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 4ba940fa-c0c1-44de-aaaa-544d61580a2b)
     )
     (fp_text user "${REFERENCE}" (at 1.25 -2.7) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 8d37bee4-1ae5-408c-aa19-320775f0cffb)
     )
-    (fp_line (start -1.8 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 0c596151-9295-41d1-898a-edcd2cf9d66a))
-    (fp_line (start -2.55 2.45) (end -2.55 1.7) (layer "B.SilkS") (width 0.12) (tstamp 11791cf6-1086-402e-9782-02baabdb7333))
-    (fp_line (start -2.56 -3.51) (end 5.06 -3.51) (layer "B.SilkS") (width 0.12) (tstamp 153e89e6-1207-4f5b-8899-edf3c81fa7b9))
-    (fp_line (start -2.56 2.46) (end -2.56 -3.51) (layer "B.SilkS") (width 0.12) (tstamp 2500e077-5c77-4903-86fd-d245990bb3f3))
-    (fp_line (start 4.3 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 462c48ea-d673-4a53-8f74-de4140345e91))
-    (fp_line (start -1.8 0.2) (end -1.8 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 55d3a2fb-305d-4153-a678-ba0b681c823a))
-    (fp_line (start 5.06 -3.51) (end 5.06 2.46) (layer "B.SilkS") (width 0.12) (tstamp 5a8a19ab-73da-442a-8d15-92b3ca005d26))
-    (fp_line (start -1.6 2.75) (end -2.85 2.75) (layer "B.SilkS") (width 0.12) (tstamp 5f3f94ec-7752-4792-a38a-51deba82ef4a))
-    (fp_line (start 1.75 2.45) (end 0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 6ec781ca-184c-409b-bcb6-7454a8cfa66f))
-    (fp_line (start 0.75 2.45) (end 0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 6f276e02-0fc6-4235-97a6-eb339e6714e0))
-    (fp_line (start -2.55 1.7) (end -0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 749529bb-93de-4bbe-99ea-93e737c34f0c))
-    (fp_line (start 5.05 0.2) (end 4.3 0.2) (layer "B.SilkS") (width 0.12) (tstamp 77c11238-de0b-417b-8a1a-98d06570d959))
-    (fp_line (start 3.25 1.7) (end 5.05 1.7) (layer "B.SilkS") (width 0.12) (tstamp 80de1682-9a34-4ef5-b5c5-8b59b4065805))
-    (fp_line (start 0.75 1.7) (end 1.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 86efd4ec-2339-4c74-bfd8-d852fb906367))
-    (fp_line (start 5.06 2.46) (end -2.56 2.46) (layer "B.SilkS") (width 0.12) (tstamp 8e88e9ce-fece-4ebf-a867-625d1148bed3))
-    (fp_line (start -0.75 1.7) (end -0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 92663b9f-286b-417e-b86f-0783c8de5496))
-    (fp_line (start -2.55 0.2) (end -1.8 0.2) (layer "B.SilkS") (width 0.12) (tstamp 9e363b78-f877-41e8-90e4-b468b146d438))
-    (fp_line (start -0.75 2.45) (end -2.55 2.45) (layer "B.SilkS") (width 0.12) (tstamp ad90e029-5e12-4d24-86ca-887a16520a19))
-    (fp_line (start -2.85 2.75) (end -2.85 1.5) (layer "B.SilkS") (width 0.12) (tstamp c5823bcf-ed7d-4c71-9d56-066849f00e3b))
-    (fp_line (start 5.05 2.45) (end 3.25 2.45) (layer "B.SilkS") (width 0.12) (tstamp ce2cdd4d-5e93-4b03-b895-09be498e77d6))
-    (fp_line (start 3.25 2.45) (end 3.25 1.7) (layer "B.SilkS") (width 0.12) (tstamp d06e2ca3-74e0-4a37-90b5-f47dec9a00ca))
-    (fp_line (start 1.75 1.7) (end 1.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp d513b710-8b9f-40ad-979f-8a4ca38435dc))
-    (fp_line (start 4.3 0.2) (end 4.3 -2.75) (layer "B.SilkS") (width 0.12) (tstamp e3a014de-bd9c-4838-8c7d-ecb8ef86a4c5))
-    (fp_line (start 5.05 1.7) (end 5.05 2.45) (layer "B.SilkS") (width 0.12) (tstamp ecb1db2b-2dbf-4db5-98c0-93eb82b394d3))
-    (fp_line (start 5.45 2.85) (end -2.95 2.85) (layer "B.CrtYd") (width 0.05) (tstamp 27ea1e29-2678-4273-861f-8a96be6b929a))
-    (fp_line (start -2.95 2.85) (end -2.95 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp 4b06dfee-7fcb-4b5a-92f7-e3d8274845ec))
-    (fp_line (start -2.95 -3.9) (end 5.45 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp 946a613c-f4e9-4d4d-b4aa-5ea87f10258c))
-    (fp_line (start 5.45 -3.9) (end 5.45 2.85) (layer "B.CrtYd") (width 0.05) (tstamp cfe94fc9-2da6-4459-812c-333487d6d22b))
-    (fp_line (start -0.625 2.35) (end 0 1.35) (layer "B.Fab") (width 0.1) (tstamp 264fc294-e8c5-4205-b1b8-434f537e0700))
-    (fp_line (start -2.45 2.35) (end -2.45 -3.4) (layer "B.Fab") (width 0.1) (tstamp 37e30be3-d357-49a8-8947-2ad4dc2860f3))
-    (fp_line (start -2.45 -3.4) (end 4.95 -3.4) (layer "B.Fab") (width 0.1) (tstamp 5a27ec0c-da48-4c36-844b-b7ce5ba943ed))
-    (fp_line (start 0 1.35) (end 0.625 2.35) (layer "B.Fab") (width 0.1) (tstamp 6eedfcc9-8ca2-4bf1-b203-0c2adf2fc282))
-    (fp_line (start 4.95 2.35) (end -2.45 2.35) (layer "B.Fab") (width 0.1) (tstamp aee3a0e5-e252-42d8-8676-f45d4bffa7af))
-    (fp_line (start 4.95 -3.4) (end 4.95 2.35) (layer "B.Fab") (width 0.1) (tstamp b7db37e4-3e56-4f00-bb22-fafb83a45eb3))
-    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask) (roundrect_rratio 0.147059)
+    (fp_line (start -2.85 2.75) (end -2.85 1.5)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c5823bcf-ed7d-4c71-9d56-066849f00e3b))
+    (fp_line (start -2.56 -3.51) (end 5.06 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 153e89e6-1207-4f5b-8899-edf3c81fa7b9))
+    (fp_line (start -2.56 2.46) (end -2.56 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2500e077-5c77-4903-86fd-d245990bb3f3))
+    (fp_line (start -2.55 0.2) (end -1.8 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 9e363b78-f877-41e8-90e4-b468b146d438))
+    (fp_line (start -2.55 1.7) (end -0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 749529bb-93de-4bbe-99ea-93e737c34f0c))
+    (fp_line (start -2.55 2.45) (end -2.55 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 11791cf6-1086-402e-9782-02baabdb7333))
+    (fp_line (start -1.8 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0c596151-9295-41d1-898a-edcd2cf9d66a))
+    (fp_line (start -1.8 0.2) (end -1.8 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 55d3a2fb-305d-4153-a678-ba0b681c823a))
+    (fp_line (start -1.6 2.75) (end -2.85 2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5f3f94ec-7752-4792-a38a-51deba82ef4a))
+    (fp_line (start -0.75 1.7) (end -0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 92663b9f-286b-417e-b86f-0783c8de5496))
+    (fp_line (start -0.75 2.45) (end -2.55 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ad90e029-5e12-4d24-86ca-887a16520a19))
+    (fp_line (start 0.75 1.7) (end 1.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 86efd4ec-2339-4c74-bfd8-d852fb906367))
+    (fp_line (start 0.75 2.45) (end 0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6f276e02-0fc6-4235-97a6-eb339e6714e0))
+    (fp_line (start 1.75 1.7) (end 1.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d513b710-8b9f-40ad-979f-8a4ca38435dc))
+    (fp_line (start 1.75 2.45) (end 0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6ec781ca-184c-409b-bcb6-7454a8cfa66f))
+    (fp_line (start 3.25 1.7) (end 5.05 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 80de1682-9a34-4ef5-b5c5-8b59b4065805))
+    (fp_line (start 3.25 2.45) (end 3.25 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp d06e2ca3-74e0-4a37-90b5-f47dec9a00ca))
+    (fp_line (start 4.3 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 462c48ea-d673-4a53-8f74-de4140345e91))
+    (fp_line (start 4.3 0.2) (end 4.3 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e3a014de-bd9c-4838-8c7d-ecb8ef86a4c5))
+    (fp_line (start 5.05 0.2) (end 4.3 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 77c11238-de0b-417b-8a1a-98d06570d959))
+    (fp_line (start 5.05 1.7) (end 5.05 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ecb1db2b-2dbf-4db5-98c0-93eb82b394d3))
+    (fp_line (start 5.05 2.45) (end 3.25 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ce2cdd4d-5e93-4b03-b895-09be498e77d6))
+    (fp_line (start 5.06 -3.51) (end 5.06 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5a8a19ab-73da-442a-8d15-92b3ca005d26))
+    (fp_line (start 5.06 2.46) (end -2.56 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8e88e9ce-fece-4ebf-a867-625d1148bed3))
+    (fp_line (start -2.95 -3.9) (end 5.45 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 946a613c-f4e9-4d4d-b4aa-5ea87f10258c))
+    (fp_line (start -2.95 2.85) (end -2.95 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4b06dfee-7fcb-4b5a-92f7-e3d8274845ec))
+    (fp_line (start 5.45 -3.9) (end 5.45 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp cfe94fc9-2da6-4459-812c-333487d6d22b))
+    (fp_line (start 5.45 2.85) (end -2.95 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 27ea1e29-2678-4273-861f-8a96be6b929a))
+    (fp_line (start -2.45 -3.4) (end 4.95 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5a27ec0c-da48-4c36-844b-b7ce5ba943ed))
+    (fp_line (start -2.45 2.35) (end -2.45 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 37e30be3-d357-49a8-8947-2ad4dc2860f3))
+    (fp_line (start -0.625 2.35) (end 0 1.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 264fc294-e8c5-4205-b1b8-434f537e0700))
+    (fp_line (start 0 1.35) (end 0.625 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6eedfcc9-8ca2-4bf1-b203-0c2adf2fc282))
+    (fp_line (start 4.95 -3.4) (end 4.95 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b7db37e4-3e56-4f00-bb22-fafb83a45eb3))
+    (fp_line (start 4.95 2.35) (end -2.45 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp aee3a0e5-e252-42d8-8676-f45d4bffa7af))
+    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask") (roundrect_rratio 0.147059)
       (net 4 "GNDA") (pinfunction "Pin_1") (pintype "passive") (tstamp de43557b-1abc-4bf7-a6d2-06bc6c8f4516))
-    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask")
       (net 3 "Net-(C1-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp 0dcbb076-2f87-4f97-be28-e59d95a561ab))
     (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -3256,7 +4175,7 @@
   )
 
   (footprint "Package_TO_SOT_SMD:SOT-89-3" (layer "B.Cu")
-    (tedit 5C33D6E8) (tstamp c96d560b-283c-4902-9824-43fb69bb454c)
+    (tstamp c96d560b-283c-4902-9824-43fb69bb454c)
     (at 27 38.9 180)
     (descr "SOT-89-3, http://ww1.microchip.com/downloads/en/DeviceDoc/3L_SOT-89_MB_C04-029C.pdf")
     (tags "SOT-89-3")
@@ -3265,45 +4184,63 @@
     (path "/9d5f2293-24a3-4a32-a382-b3910273b4b1")
     (attr smd)
     (fp_text reference "U1" (at 0.3 3.5) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 2ae97db9-48fb-4fea-8820-9cb73ffcf005)
     )
     (fp_text value "HT7533" (at 0.3 -3.5) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp d36db21c-ebfc-47e4-b40f-7c53f8d6df18)
     )
     (fp_text user "${REFERENCE}" (at 0.5 0 90) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp e9fc745d-a0f2-43e8-b5c9-49bb0117e81d)
     )
-    (fp_line (start 1.66 -2.36) (end -1.06 -2.36) (layer "B.SilkS") (width 0.12) (tstamp 0e180a4b-cb15-47a2-a9df-e9484f852c74))
-    (fp_line (start 1.66 2.36) (end 1.66 1.05) (layer "B.SilkS") (width 0.12) (tstamp 44c6f0d9-6986-4108-b99e-1dfd823608a7))
-    (fp_line (start -1.06 -2.36) (end -1.06 -2.13) (layer "B.SilkS") (width 0.12) (tstamp 73780f14-0ec0-4a82-8236-08fa778964ad))
-    (fp_line (start 1.66 -1.05) (end 1.66 -2.36) (layer "B.SilkS") (width 0.12) (tstamp 7fad35b2-6896-4d89-8bf5-55e317000649))
-    (fp_line (start -1.06 2.36) (end -1.06 2.13) (layer "B.SilkS") (width 0.12) (tstamp adacd01d-4133-463a-8f6f-bfb551f8013f))
-    (fp_line (start -2.2 2.13) (end -1.06 2.13) (layer "B.SilkS") (width 0.12) (tstamp ca0ded90-8f44-4b12-9e52-d56a842d635e))
-    (fp_line (start -1.06 2.36) (end 1.66 2.36) (layer "B.SilkS") (width 0.12) (tstamp defa8ef1-79b7-49f3-85f4-fa2afc693739))
-    (fp_line (start 2.55 2.5) (end 2.55 -2.5) (layer "B.CrtYd") (width 0.05) (tstamp 5f42c57a-0a1d-42ff-86d3-a57679c17f04))
-    (fp_line (start -2.55 -2.5) (end 2.55 -2.5) (layer "B.CrtYd") (width 0.05) (tstamp 79c0dca2-6f6a-488b-941d-370fa072c566))
-    (fp_line (start 2.55 2.5) (end -2.55 2.5) (layer "B.CrtYd") (width 0.05) (tstamp b2907a7d-1756-4e49-b261-cf89bc7554be))
-    (fp_line (start -2.55 -2.5) (end -2.55 2.5) (layer "B.CrtYd") (width 0.05) (tstamp c72a6a9a-99ca-45bf-96a3-ddba4940bb90))
-    (fp_line (start 0.05 2.25) (end 1.55 2.25) (layer "B.Fab") (width 0.1) (tstamp 337e846e-5cd3-4e38-bda9-c27e8ade3810))
-    (fp_line (start 1.55 2.25) (end 1.55 -2.25) (layer "B.Fab") (width 0.1) (tstamp 44353423-0f68-440c-a274-17e948ffa94b))
-    (fp_line (start -0.95 -2.25) (end -0.95 1.25) (layer "B.Fab") (width 0.1) (tstamp 6dfcd9ba-0db1-4b3e-be3c-18a5b3a33f6e))
-    (fp_line (start 1.55 -2.25) (end -0.95 -2.25) (layer "B.Fab") (width 0.1) (tstamp d9358a18-3925-467a-b5f4-38803868a8aa))
-    (fp_line (start -0.95 1.25) (end 0.05 2.25) (layer "B.Fab") (width 0.1) (tstamp ddc9f018-bb2b-4c6f-a57c-272b75b833b2))
+    (fp_line (start -2.2 2.13) (end -1.06 2.13)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ca0ded90-8f44-4b12-9e52-d56a842d635e))
+    (fp_line (start -1.06 -2.36) (end -1.06 -2.13)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 73780f14-0ec0-4a82-8236-08fa778964ad))
+    (fp_line (start -1.06 2.36) (end -1.06 2.13)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp adacd01d-4133-463a-8f6f-bfb551f8013f))
+    (fp_line (start -1.06 2.36) (end 1.66 2.36)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp defa8ef1-79b7-49f3-85f4-fa2afc693739))
+    (fp_line (start 1.66 -2.36) (end -1.06 -2.36)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0e180a4b-cb15-47a2-a9df-e9484f852c74))
+    (fp_line (start 1.66 -1.05) (end 1.66 -2.36)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7fad35b2-6896-4d89-8bf5-55e317000649))
+    (fp_line (start 1.66 2.36) (end 1.66 1.05)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 44c6f0d9-6986-4108-b99e-1dfd823608a7))
+    (fp_line (start -2.55 -2.5) (end -2.55 2.5)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c72a6a9a-99ca-45bf-96a3-ddba4940bb90))
+    (fp_line (start -2.55 -2.5) (end 2.55 -2.5)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 79c0dca2-6f6a-488b-941d-370fa072c566))
+    (fp_line (start 2.55 2.5) (end -2.55 2.5)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp b2907a7d-1756-4e49-b261-cf89bc7554be))
+    (fp_line (start 2.55 2.5) (end 2.55 -2.5)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5f42c57a-0a1d-42ff-86d3-a57679c17f04))
+    (fp_line (start -0.95 -2.25) (end -0.95 1.25)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6dfcd9ba-0db1-4b3e-be3c-18a5b3a33f6e))
+    (fp_line (start -0.95 1.25) (end 0.05 2.25)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ddc9f018-bb2b-4c6f-a57c-272b75b833b2))
+    (fp_line (start 0.05 2.25) (end 1.55 2.25)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 337e846e-5cd3-4e38-bda9-c27e8ade3810))
+    (fp_line (start 1.55 -2.25) (end -0.95 -2.25)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d9358a18-3925-467a-b5f4-38803868a8aa))
+    (fp_line (start 1.55 2.25) (end 1.55 -2.25)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 44353423-0f68-440c-a274-17e948ffa94b))
     (pad "1" smd rect (at -1.65 1.5 180) (size 1.3 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 6 "GND") (pinfunction "GND") (pintype "power_in") (tstamp 4b2dc10e-eb21-4d00-af1e-5c4c339e38a3))
     (pad "2" smd custom (at -1.5625 0 180) (size 1.475 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 1 "VBUS") (pinfunction "VIN") (pintype "power_in") (zone_connect 2)
+      (net 1 "VBUS") (pinfunction "VIN") (pintype "power_in") (zone_connect 2) (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
-        (gr_poly (pts
+        (gr_poly
+          (pts
             (xy 3.8625 -0.8665)
             (xy 0.7375 -0.8665)
             (xy 0.7375 0.8665)
             (xy 3.8625 0.8665)
-          ) (width 0) (fill yes))
+          )
+          (width 0) (fill yes))
       ) (tstamp 0c916a5a-dd9e-4f0d-8f9f-8067ea3ee9a9))
     (pad "3" smd rect (at -1.65 -1.5 180) (size 1.3 0.9) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 12 "+3.3V") (pinfunction "VOUT") (pintype "power_out") (tstamp da44f219-8424-4fb8-a340-48ea9e586bd4))
@@ -3315,7 +4252,7 @@
   )
 
   (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (layer "B.Cu")
-    (tedit 5C28146C) (tstamp eca7ad72-dc5f-443b-87bf-2a157da6bbb1)
+    (tstamp eca7ad72-dc5f-443b-87bf-2a157da6bbb1)
     (at 75.8 17.6 180)
     (descr "JST XH series connector, B2B-XH-A (http://www.jst-mfg.com/product/pdf/eng/eXH.pdf), generated with kicad-footprint-generator")
     (tags "connector JST XH vertical")
@@ -3324,54 +4261,88 @@
     (path "/01b11df2-b039-4c5d-bda9-af5a93868787")
     (attr through_hole)
     (fp_text reference "J9" (at 1.25 3.55) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 3b31e208-1c54-4d55-86b3-f884ee1c8d77)
     )
     (fp_text value "PH2.54_02" (at 1.25 -4.6) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp acb88d60-491f-494e-97df-25aee94c8d66)
     )
     (fp_text user "${REFERENCE}" (at 1.25 -2.7) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 3182a64a-4e2b-4d59-8b82-38b3124ecb24)
     )
-    (fp_line (start 0.75 1.7) (end 1.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 0bf9fd69-8b55-4c12-a540-ae9d6fb2172c))
-    (fp_line (start -2.55 2.45) (end -2.55 1.7) (layer "B.SilkS") (width 0.12) (tstamp 1a742c6b-be00-49dd-876e-a4738a66bb17))
-    (fp_line (start 5.05 0.2) (end 4.3 0.2) (layer "B.SilkS") (width 0.12) (tstamp 1bc9a7a8-bc5c-4895-b9ac-446cc76370e5))
-    (fp_line (start 1.75 1.7) (end 1.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 28df5ae3-ab94-45a7-a389-fff5905afa5d))
-    (fp_line (start -0.75 1.7) (end -0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 3290af91-0db9-4466-ac08-054613d204b8))
-    (fp_line (start -1.8 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 3736a35f-6ecb-4ff3-a7ea-3cf2e1e288ec))
-    (fp_line (start 5.05 1.7) (end 5.05 2.45) (layer "B.SilkS") (width 0.12) (tstamp 3e9a09ab-6e66-4bb2-bdc8-39f208b718e6))
-    (fp_line (start 5.05 2.45) (end 3.25 2.45) (layer "B.SilkS") (width 0.12) (tstamp 4213308f-24ac-4308-8a00-e433950eec5c))
-    (fp_line (start 3.25 1.7) (end 5.05 1.7) (layer "B.SilkS") (width 0.12) (tstamp 423e0a26-6a83-40db-811c-7e83ea4e2866))
-    (fp_line (start -2.55 0.2) (end -1.8 0.2) (layer "B.SilkS") (width 0.12) (tstamp 6eac16ab-0d00-4ed8-ae19-4cabbe5ce0c4))
-    (fp_line (start -2.85 2.75) (end -2.85 1.5) (layer "B.SilkS") (width 0.12) (tstamp 7976b220-1909-4c73-ba99-1990cb38db08))
-    (fp_line (start -1.8 0.2) (end -1.8 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 7b222c26-f95d-4699-b536-167f5faaa9fe))
-    (fp_line (start 4.3 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 81e10f3f-d60d-4d1c-80f1-c16558f4365d))
-    (fp_line (start 3.25 2.45) (end 3.25 1.7) (layer "B.SilkS") (width 0.12) (tstamp 952ea869-04f0-4ac1-848f-6234d27aeca1))
-    (fp_line (start 1.75 2.45) (end 0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 98ec7b54-b15b-4e2b-b201-31df2a4643ab))
-    (fp_line (start 0.75 2.45) (end 0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp a86d8e35-aeff-4d78-a643-e2679b4bb799))
-    (fp_line (start 5.06 2.46) (end -2.56 2.46) (layer "B.SilkS") (width 0.12) (tstamp a9101adb-e0e9-4219-b0a2-f08060f2a5ec))
-    (fp_line (start -2.56 2.46) (end -2.56 -3.51) (layer "B.SilkS") (width 0.12) (tstamp aa78e9cd-5ab2-4646-a554-e9bfaa5bfce0))
-    (fp_line (start -1.6 2.75) (end -2.85 2.75) (layer "B.SilkS") (width 0.12) (tstamp c2ad5512-08a1-485a-ada3-697adfac136d))
-    (fp_line (start -0.75 2.45) (end -2.55 2.45) (layer "B.SilkS") (width 0.12) (tstamp ce1afd71-232b-4359-acfb-c5c42678699a))
-    (fp_line (start 4.3 0.2) (end 4.3 -2.75) (layer "B.SilkS") (width 0.12) (tstamp db45e1e9-8e08-47eb-99b9-52788edec758))
-    (fp_line (start 5.06 -3.51) (end 5.06 2.46) (layer "B.SilkS") (width 0.12) (tstamp e255cd46-8ca0-4a3b-8e5e-9c593a4f347d))
-    (fp_line (start -2.56 -3.51) (end 5.06 -3.51) (layer "B.SilkS") (width 0.12) (tstamp e5a59093-5a1b-4517-b8c9-caa33edde339))
-    (fp_line (start -2.55 1.7) (end -0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp fdb9bdc6-e027-4ce6-9265-1b2913adc09a))
-    (fp_line (start -2.95 -3.9) (end 5.45 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp 6224afce-348a-4094-a93d-80c1a9e3f287))
-    (fp_line (start 5.45 -3.9) (end 5.45 2.85) (layer "B.CrtYd") (width 0.05) (tstamp 626b6e72-039b-4902-a910-6e077a61ef51))
-    (fp_line (start -2.95 2.85) (end -2.95 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp 8740d300-ae37-4f0a-94bf-3d151207dd5c))
-    (fp_line (start 5.45 2.85) (end -2.95 2.85) (layer "B.CrtYd") (width 0.05) (tstamp ba8e72a9-98b2-4973-a22b-6ffb066a32ab))
-    (fp_line (start 0 1.35) (end 0.625 2.35) (layer "B.Fab") (width 0.1) (tstamp 14018321-746c-4028-a56b-952d21b1b8ff))
-    (fp_line (start -2.45 2.35) (end -2.45 -3.4) (layer "B.Fab") (width 0.1) (tstamp 322c1efb-f901-408c-b54a-e54770c65ff0))
-    (fp_line (start -2.45 -3.4) (end 4.95 -3.4) (layer "B.Fab") (width 0.1) (tstamp 3a476408-c87c-42e1-81d3-dbcb207101f5))
-    (fp_line (start -0.625 2.35) (end 0 1.35) (layer "B.Fab") (width 0.1) (tstamp 91675d25-ab2c-4383-845e-c1c63afd8be9))
-    (fp_line (start 4.95 -3.4) (end 4.95 2.35) (layer "B.Fab") (width 0.1) (tstamp c47d26a1-7cba-4854-932e-962b7a9a1f22))
-    (fp_line (start 4.95 2.35) (end -2.45 2.35) (layer "B.Fab") (width 0.1) (tstamp f3615a04-f9e7-4517-bed4-56971f71dbc7))
-    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask) (roundrect_rratio 0.147059)
+    (fp_line (start -2.85 2.75) (end -2.85 1.5)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7976b220-1909-4c73-ba99-1990cb38db08))
+    (fp_line (start -2.56 -3.51) (end 5.06 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e5a59093-5a1b-4517-b8c9-caa33edde339))
+    (fp_line (start -2.56 2.46) (end -2.56 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp aa78e9cd-5ab2-4646-a554-e9bfaa5bfce0))
+    (fp_line (start -2.55 0.2) (end -1.8 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6eac16ab-0d00-4ed8-ae19-4cabbe5ce0c4))
+    (fp_line (start -2.55 1.7) (end -0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fdb9bdc6-e027-4ce6-9265-1b2913adc09a))
+    (fp_line (start -2.55 2.45) (end -2.55 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1a742c6b-be00-49dd-876e-a4738a66bb17))
+    (fp_line (start -1.8 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3736a35f-6ecb-4ff3-a7ea-3cf2e1e288ec))
+    (fp_line (start -1.8 0.2) (end -1.8 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7b222c26-f95d-4699-b536-167f5faaa9fe))
+    (fp_line (start -1.6 2.75) (end -2.85 2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c2ad5512-08a1-485a-ada3-697adfac136d))
+    (fp_line (start -0.75 1.7) (end -0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3290af91-0db9-4466-ac08-054613d204b8))
+    (fp_line (start -0.75 2.45) (end -2.55 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ce1afd71-232b-4359-acfb-c5c42678699a))
+    (fp_line (start 0.75 1.7) (end 1.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0bf9fd69-8b55-4c12-a540-ae9d6fb2172c))
+    (fp_line (start 0.75 2.45) (end 0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a86d8e35-aeff-4d78-a643-e2679b4bb799))
+    (fp_line (start 1.75 1.7) (end 1.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 28df5ae3-ab94-45a7-a389-fff5905afa5d))
+    (fp_line (start 1.75 2.45) (end 0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 98ec7b54-b15b-4e2b-b201-31df2a4643ab))
+    (fp_line (start 3.25 1.7) (end 5.05 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 423e0a26-6a83-40db-811c-7e83ea4e2866))
+    (fp_line (start 3.25 2.45) (end 3.25 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 952ea869-04f0-4ac1-848f-6234d27aeca1))
+    (fp_line (start 4.3 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 81e10f3f-d60d-4d1c-80f1-c16558f4365d))
+    (fp_line (start 4.3 0.2) (end 4.3 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp db45e1e9-8e08-47eb-99b9-52788edec758))
+    (fp_line (start 5.05 0.2) (end 4.3 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1bc9a7a8-bc5c-4895-b9ac-446cc76370e5))
+    (fp_line (start 5.05 1.7) (end 5.05 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3e9a09ab-6e66-4bb2-bdc8-39f208b718e6))
+    (fp_line (start 5.05 2.45) (end 3.25 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 4213308f-24ac-4308-8a00-e433950eec5c))
+    (fp_line (start 5.06 -3.51) (end 5.06 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e255cd46-8ca0-4a3b-8e5e-9c593a4f347d))
+    (fp_line (start 5.06 2.46) (end -2.56 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a9101adb-e0e9-4219-b0a2-f08060f2a5ec))
+    (fp_line (start -2.95 -3.9) (end 5.45 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 6224afce-348a-4094-a93d-80c1a9e3f287))
+    (fp_line (start -2.95 2.85) (end -2.95 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8740d300-ae37-4f0a-94bf-3d151207dd5c))
+    (fp_line (start 5.45 -3.9) (end 5.45 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 626b6e72-039b-4902-a910-6e077a61ef51))
+    (fp_line (start 5.45 2.85) (end -2.95 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ba8e72a9-98b2-4973-a22b-6ffb066a32ab))
+    (fp_line (start -2.45 -3.4) (end 4.95 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3a476408-c87c-42e1-81d3-dbcb207101f5))
+    (fp_line (start -2.45 2.35) (end -2.45 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 322c1efb-f901-408c-b54a-e54770c65ff0))
+    (fp_line (start -0.625 2.35) (end 0 1.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 91675d25-ab2c-4383-845e-c1c63afd8be9))
+    (fp_line (start 0 1.35) (end 0.625 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 14018321-746c-4028-a56b-952d21b1b8ff))
+    (fp_line (start 4.95 -3.4) (end 4.95 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c47d26a1-7cba-4854-932e-962b7a9a1f22))
+    (fp_line (start 4.95 2.35) (end -2.45 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f3615a04-f9e7-4517-bed4-56971f71dbc7))
+    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask") (roundrect_rratio 0.147059)
       (net 6 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp 71c947ae-c7aa-49d2-b8dc-df84621c4405))
-    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask")
       (net 37 "Net-(J9-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 2acd0f5d-0e76-452b-bb88-9f1e451fd473))
     (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -3381,7 +4352,7 @@
   )
 
   (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (layer "B.Cu")
-    (tedit 5C28146C) (tstamp ef9cd75b-62af-471e-82d7-903247607c8c)
+    (tstamp ef9cd75b-62af-471e-82d7-903247607c8c)
     (at 93 17.6 180)
     (descr "JST XH series connector, B2B-XH-A (http://www.jst-mfg.com/product/pdf/eng/eXH.pdf), generated with kicad-footprint-generator")
     (tags "connector JST XH vertical")
@@ -3390,54 +4361,88 @@
     (path "/e0ebb204-90ee-4fd3-ab25-7ab5d555d19a")
     (attr through_hole)
     (fp_text reference "J10" (at 1.25 3.55) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp ef864305-840a-4844-a7c0-7464bfc25abe)
     )
     (fp_text value "PH2.54_02" (at 1.25 -4.6) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 06a5ff4b-80c0-478d-91b9-a739e5862621)
     )
     (fp_text user "${REFERENCE}" (at 1.25 -2.7) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp de614e17-b3dc-4c82-9466-f2dcc4f5cd50)
     )
-    (fp_line (start 1.75 2.45) (end 0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 07880d32-2ba5-47b2-b2dd-c3642390f340))
-    (fp_line (start -2.56 2.46) (end -2.56 -3.51) (layer "B.SilkS") (width 0.12) (tstamp 084a764b-765e-47f8-9a09-6b11c959dd48))
-    (fp_line (start 0.75 1.7) (end 1.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 0c893961-440f-4e35-9f6a-ed95d910f374))
-    (fp_line (start -1.6 2.75) (end -2.85 2.75) (layer "B.SilkS") (width 0.12) (tstamp 14a9e99a-bdec-420b-a94d-5fb23f7550e6))
-    (fp_line (start -2.55 1.7) (end -0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp 1aa759c6-1a8f-46cd-bb29-25f83fb74685))
-    (fp_line (start 5.06 -3.51) (end 5.06 2.46) (layer "B.SilkS") (width 0.12) (tstamp 202d35ba-680b-441c-a530-6210d2f18476))
-    (fp_line (start -0.75 1.7) (end -0.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 223a4bfc-74f9-4479-8245-aa03cbb055ef))
-    (fp_line (start -1.8 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 22a31a42-6630-4283-942f-5bc259c90dc5))
-    (fp_line (start 4.3 -2.75) (end 1.25 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 2a75b363-be63-4e20-8a87-dbe13ddf05cd))
-    (fp_line (start 1.75 1.7) (end 1.75 2.45) (layer "B.SilkS") (width 0.12) (tstamp 30b151c6-0841-4d5f-a25b-1c7424680f01))
-    (fp_line (start 5.05 1.7) (end 5.05 2.45) (layer "B.SilkS") (width 0.12) (tstamp 33168077-2806-4d61-b4a4-5f4301408c1d))
-    (fp_line (start 5.06 2.46) (end -2.56 2.46) (layer "B.SilkS") (width 0.12) (tstamp 376e2d68-2f78-4c9c-8c3b-ae4394e388e4))
-    (fp_line (start 5.05 0.2) (end 4.3 0.2) (layer "B.SilkS") (width 0.12) (tstamp 5717f8bc-d92b-438a-8dd8-5d48367e7799))
-    (fp_line (start 3.25 1.7) (end 5.05 1.7) (layer "B.SilkS") (width 0.12) (tstamp 72f2564a-fc22-4d5b-8864-ee2b22b42bb6))
-    (fp_line (start -1.8 0.2) (end -1.8 -2.75) (layer "B.SilkS") (width 0.12) (tstamp 7ea167aa-76a5-478f-9012-f8be9fd3042b))
-    (fp_line (start -2.56 -3.51) (end 5.06 -3.51) (layer "B.SilkS") (width 0.12) (tstamp 835f76b2-d730-4d77-be72-36d82588453b))
-    (fp_line (start -0.75 2.45) (end -2.55 2.45) (layer "B.SilkS") (width 0.12) (tstamp 99738e4c-4eed-4295-9945-814e547815d4))
-    (fp_line (start 4.3 0.2) (end 4.3 -2.75) (layer "B.SilkS") (width 0.12) (tstamp a1d49c30-454f-48db-ba77-fc5245975cb5))
-    (fp_line (start -2.55 0.2) (end -1.8 0.2) (layer "B.SilkS") (width 0.12) (tstamp c97b74cd-ddfb-45da-8f0d-35856f2eb9db))
-    (fp_line (start 0.75 2.45) (end 0.75 1.7) (layer "B.SilkS") (width 0.12) (tstamp ccea5ecd-a9b2-4f78-93ff-073e2de4efbb))
-    (fp_line (start -2.85 2.75) (end -2.85 1.5) (layer "B.SilkS") (width 0.12) (tstamp e4d822b0-284d-4eac-9751-4d573fda2d20))
-    (fp_line (start 5.05 2.45) (end 3.25 2.45) (layer "B.SilkS") (width 0.12) (tstamp e6345528-1622-4c9b-929b-35d112e200be))
-    (fp_line (start 3.25 2.45) (end 3.25 1.7) (layer "B.SilkS") (width 0.12) (tstamp e9587683-ff55-41ca-b9b5-b4d474dec86b))
-    (fp_line (start -2.55 2.45) (end -2.55 1.7) (layer "B.SilkS") (width 0.12) (tstamp f5c7769d-decb-4b74-8053-be4903908b65))
-    (fp_line (start -2.95 -3.9) (end 5.45 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp 614c4e75-e7cf-4b7e-9955-d12f9303b466))
-    (fp_line (start 5.45 -3.9) (end 5.45 2.85) (layer "B.CrtYd") (width 0.05) (tstamp 95665b8b-a78c-4c2d-9de4-b00767f8c854))
-    (fp_line (start -2.95 2.85) (end -2.95 -3.9) (layer "B.CrtYd") (width 0.05) (tstamp d25c6a4c-fdf1-45ec-a00e-e9cd3acde2d6))
-    (fp_line (start 5.45 2.85) (end -2.95 2.85) (layer "B.CrtYd") (width 0.05) (tstamp d847c5f0-8f90-48d4-ab80-4246b2d9d857))
-    (fp_line (start 0 1.35) (end 0.625 2.35) (layer "B.Fab") (width 0.1) (tstamp 0a8588be-14a1-4b7b-94e5-a3fcd1d2059e))
-    (fp_line (start -0.625 2.35) (end 0 1.35) (layer "B.Fab") (width 0.1) (tstamp 0f20c87b-963b-4498-aea9-4cab4678a4e0))
-    (fp_line (start 4.95 -3.4) (end 4.95 2.35) (layer "B.Fab") (width 0.1) (tstamp 3b727a80-337d-4de2-8acc-b1597359a1f3))
-    (fp_line (start -2.45 -3.4) (end 4.95 -3.4) (layer "B.Fab") (width 0.1) (tstamp 8556042b-a882-4ba0-b3f4-29371f0fc026))
-    (fp_line (start 4.95 2.35) (end -2.45 2.35) (layer "B.Fab") (width 0.1) (tstamp a90188a9-274c-4753-a49c-2579fecddaa1))
-    (fp_line (start -2.45 2.35) (end -2.45 -3.4) (layer "B.Fab") (width 0.1) (tstamp afc446a9-feac-422c-a8b0-54fddb031b03))
-    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask) (roundrect_rratio 0.147059)
+    (fp_line (start -2.85 2.75) (end -2.85 1.5)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e4d822b0-284d-4eac-9751-4d573fda2d20))
+    (fp_line (start -2.56 -3.51) (end 5.06 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 835f76b2-d730-4d77-be72-36d82588453b))
+    (fp_line (start -2.56 2.46) (end -2.56 -3.51)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 084a764b-765e-47f8-9a09-6b11c959dd48))
+    (fp_line (start -2.55 0.2) (end -1.8 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c97b74cd-ddfb-45da-8f0d-35856f2eb9db))
+    (fp_line (start -2.55 1.7) (end -0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1aa759c6-1a8f-46cd-bb29-25f83fb74685))
+    (fp_line (start -2.55 2.45) (end -2.55 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f5c7769d-decb-4b74-8053-be4903908b65))
+    (fp_line (start -1.8 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 22a31a42-6630-4283-942f-5bc259c90dc5))
+    (fp_line (start -1.8 0.2) (end -1.8 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7ea167aa-76a5-478f-9012-f8be9fd3042b))
+    (fp_line (start -1.6 2.75) (end -2.85 2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 14a9e99a-bdec-420b-a94d-5fb23f7550e6))
+    (fp_line (start -0.75 1.7) (end -0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 223a4bfc-74f9-4479-8245-aa03cbb055ef))
+    (fp_line (start -0.75 2.45) (end -2.55 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 99738e4c-4eed-4295-9945-814e547815d4))
+    (fp_line (start 0.75 1.7) (end 1.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0c893961-440f-4e35-9f6a-ed95d910f374))
+    (fp_line (start 0.75 2.45) (end 0.75 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp ccea5ecd-a9b2-4f78-93ff-073e2de4efbb))
+    (fp_line (start 1.75 1.7) (end 1.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 30b151c6-0841-4d5f-a25b-1c7424680f01))
+    (fp_line (start 1.75 2.45) (end 0.75 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 07880d32-2ba5-47b2-b2dd-c3642390f340))
+    (fp_line (start 3.25 1.7) (end 5.05 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 72f2564a-fc22-4d5b-8864-ee2b22b42bb6))
+    (fp_line (start 3.25 2.45) (end 3.25 1.7)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e9587683-ff55-41ca-b9b5-b4d474dec86b))
+    (fp_line (start 4.3 -2.75) (end 1.25 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2a75b363-be63-4e20-8a87-dbe13ddf05cd))
+    (fp_line (start 4.3 0.2) (end 4.3 -2.75)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a1d49c30-454f-48db-ba77-fc5245975cb5))
+    (fp_line (start 5.05 0.2) (end 4.3 0.2)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5717f8bc-d92b-438a-8dd8-5d48367e7799))
+    (fp_line (start 5.05 1.7) (end 5.05 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 33168077-2806-4d61-b4a4-5f4301408c1d))
+    (fp_line (start 5.05 2.45) (end 3.25 2.45)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e6345528-1622-4c9b-929b-35d112e200be))
+    (fp_line (start 5.06 -3.51) (end 5.06 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 202d35ba-680b-441c-a530-6210d2f18476))
+    (fp_line (start 5.06 2.46) (end -2.56 2.46)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 376e2d68-2f78-4c9c-8c3b-ae4394e388e4))
+    (fp_line (start -2.95 -3.9) (end 5.45 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 614c4e75-e7cf-4b7e-9955-d12f9303b466))
+    (fp_line (start -2.95 2.85) (end -2.95 -3.9)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d25c6a4c-fdf1-45ec-a00e-e9cd3acde2d6))
+    (fp_line (start 5.45 -3.9) (end 5.45 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 95665b8b-a78c-4c2d-9de4-b00767f8c854))
+    (fp_line (start 5.45 2.85) (end -2.95 2.85)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d847c5f0-8f90-48d4-ab80-4246b2d9d857))
+    (fp_line (start -2.45 -3.4) (end 4.95 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8556042b-a882-4ba0-b3f4-29371f0fc026))
+    (fp_line (start -2.45 2.35) (end -2.45 -3.4)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp afc446a9-feac-422c-a8b0-54fddb031b03))
+    (fp_line (start -0.625 2.35) (end 0 1.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0f20c87b-963b-4498-aea9-4cab4678a4e0))
+    (fp_line (start 0 1.35) (end 0.625 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 0a8588be-14a1-4b7b-94e5-a3fcd1d2059e))
+    (fp_line (start 4.95 -3.4) (end 4.95 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3b727a80-337d-4de2-8acc-b1597359a1f3))
+    (fp_line (start 4.95 2.35) (end -2.45 2.35)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp a90188a9-274c-4753-a49c-2579fecddaa1))
+    (pad "1" thru_hole roundrect (at 0 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask") (roundrect_rratio 0.147059)
       (net 6 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp 52b9e808-edd2-40f6-830f-f898eb7a3067))
-    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers *.Cu *.Mask)
+    (pad "2" thru_hole oval (at 2.5 0 180) (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask")
       (net 38 "Net-(J10-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp f7b95e83-6377-451a-bd04-8fbe3880ca65))
     (model "${KICAD6_3DMODEL_DIR}/Connector_JST.3dshapes/JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical.wrl"
       (offset (xyz 0 0 0))
@@ -3447,7 +4452,7 @@
   )
 
   (footprint "Package_TO_SOT_SMD:SOT-23" (layer "B.Cu")
-    (tedit 5FA16958) (tstamp fc8f053c-f8e1-4bdb-a93e-56ca42f6694a)
+    (tstamp fc8f053c-f8e1-4bdb-a93e-56ca42f6694a)
     (at 19.3 26.1 180)
     (descr "SOT, 3 Pin (https://www.jedec.org/system/files/docs/to-236h.pdf variant AB), generated with kicad-footprint-generator ipc_gullwing_generator.py")
     (tags "SOT TO_SOT_SMD")
@@ -3456,30 +4461,43 @@
     (path "/fc9d589d-8e6e-4fdd-ac02-8efa14c63e2c")
     (attr smd)
     (fp_text reference "D1" (at 0 2.4) (layer "B.SilkS")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 721965ef-bcff-4b0b-9f18-886aff52c652)
     )
     (fp_text value "BAV99" (at 0 -2.4) (layer "B.Fab")
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+        (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
       (tstamp 5d240986-a552-44d4-9c90-4f88fc7dbf8e)
     )
     (fp_text user "${REFERENCE}" (at 0 0) (layer "B.Fab")
-      (effects (font (size 0.32 0.32) (thickness 0.05)) (justify mirror))
+        (effects (font (size 0.32 0.32) (thickness 0.05)) (justify mirror))
       (tstamp 94a03427-6eb9-4a07-8a6b-27abc6f6b2ad)
     )
-    (fp_line (start 0 -1.56) (end -0.65 -1.56) (layer "B.SilkS") (width 0.12) (tstamp 03fbe47f-683a-490d-ab71-93adf850dace))
-    (fp_line (start 0 1.56) (end 0.65 1.56) (layer "B.SilkS") (width 0.12) (tstamp 1a97f9a5-08da-4d5e-89f6-d7d6217e9810))
-    (fp_line (start 0 -1.56) (end 0.65 -1.56) (layer "B.SilkS") (width 0.12) (tstamp 70ea817a-5989-43d7-beb5-2c2bfe615bab))
-    (fp_line (start 0 1.56) (end -1.675 1.56) (layer "B.SilkS") (width 0.12) (tstamp b266ffe7-b3bc-4fc5-8a8f-b1f30a84c96c))
-    (fp_line (start 1.92 1.7) (end -1.92 1.7) (layer "B.CrtYd") (width 0.05) (tstamp 035fd731-6789-4634-82f8-3b0e1020c0f8))
-    (fp_line (start -1.92 1.7) (end -1.92 -1.7) (layer "B.CrtYd") (width 0.05) (tstamp 42a95a88-0483-464a-940d-a7371fcd4cc9))
-    (fp_line (start -1.92 -1.7) (end 1.92 -1.7) (layer "B.CrtYd") (width 0.05) (tstamp dbad60b8-33ad-469a-94e5-d791212062b1))
-    (fp_line (start 1.92 -1.7) (end 1.92 1.7) (layer "B.CrtYd") (width 0.05) (tstamp e53f2fb4-f62d-4acc-b17e-3d7acddcab3f))
-    (fp_line (start -0.65 -1.45) (end -0.65 1.125) (layer "B.Fab") (width 0.1) (tstamp 33184279-b7f9-44cd-a21e-468289424966))
-    (fp_line (start 0.65 -1.45) (end -0.65 -1.45) (layer "B.Fab") (width 0.1) (tstamp 353558fb-06d8-437f-8303-0dcda7e90cf2))
-    (fp_line (start -0.325 1.45) (end 0.65 1.45) (layer "B.Fab") (width 0.1) (tstamp 52a0aba3-f41a-49a0-b14f-1336259274b8))
-    (fp_line (start 0.65 1.45) (end 0.65 -1.45) (layer "B.Fab") (width 0.1) (tstamp 8c606945-fd96-4ac5-b1c1-fea14ac7c5cf))
-    (fp_line (start -0.65 1.125) (end -0.325 1.45) (layer "B.Fab") (width 0.1) (tstamp c7107177-2910-43dc-9e77-270f52dd3064))
+    (fp_line (start 0 -1.56) (end -0.65 -1.56)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 03fbe47f-683a-490d-ab71-93adf850dace))
+    (fp_line (start 0 -1.56) (end 0.65 -1.56)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 70ea817a-5989-43d7-beb5-2c2bfe615bab))
+    (fp_line (start 0 1.56) (end -1.675 1.56)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b266ffe7-b3bc-4fc5-8a8f-b1f30a84c96c))
+    (fp_line (start 0 1.56) (end 0.65 1.56)
+      (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1a97f9a5-08da-4d5e-89f6-d7d6217e9810))
+    (fp_line (start -1.92 -1.7) (end 1.92 -1.7)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp dbad60b8-33ad-469a-94e5-d791212062b1))
+    (fp_line (start -1.92 1.7) (end -1.92 -1.7)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 42a95a88-0483-464a-940d-a7371fcd4cc9))
+    (fp_line (start 1.92 -1.7) (end 1.92 1.7)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e53f2fb4-f62d-4acc-b17e-3d7acddcab3f))
+    (fp_line (start 1.92 1.7) (end -1.92 1.7)
+      (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 035fd731-6789-4634-82f8-3b0e1020c0f8))
+    (fp_line (start -0.65 -1.45) (end -0.65 1.125)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 33184279-b7f9-44cd-a21e-468289424966))
+    (fp_line (start -0.65 1.125) (end -0.325 1.45)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c7107177-2910-43dc-9e77-270f52dd3064))
+    (fp_line (start -0.325 1.45) (end 0.65 1.45)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 52a0aba3-f41a-49a0-b14f-1336259274b8))
+    (fp_line (start 0.65 -1.45) (end -0.65 -1.45)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 353558fb-06d8-437f-8303-0dcda7e90cf2))
+    (fp_line (start 0.65 1.45) (end 0.65 -1.45)
+      (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 8c606945-fd96-4ac5-b1c1-fea14ac7c5cf))
     (pad "1" smd roundrect (at -0.9375 0.95 180) (size 1.475 0.6) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 4 "GNDA") (pinfunction "K") (pintype "passive") (tstamp c1a990bb-2ce0-493e-9442-2c985dc1d5c5))
     (pad "2" smd roundrect (at -0.9375 -0.95 180) (size 1.475 0.6) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
diff --git a/kicad/V0_McDisplay.kicad_pro b/kicad/V0_McDisplay.kicad_pro
index 88bc8cd..469252e 100644
--- a/kicad/V0_McDisplay.kicad_pro
+++ b/kicad/V0_McDisplay.kicad_pro
@@ -1,5 +1,6 @@
 {
   "board": {
+    "3dviewports": [],
     "design_settings": {
       "defaults": {
         "board_outline_line_width": 0.09999999999999999,
@@ -117,7 +118,8 @@
       "zones_allow_external_fillets": false,
       "zones_use_no_outline": true
     },
-    "layer_presets": []
+    "layer_presets": [],
+    "viewports": []
   },
   "boards": [],
   "cvpcb": {
@@ -125,7 +127,8 @@
   },
   "erc": {
     "erc_exclusions": [
-      "multiple_net_names|1441450|1047750|b322beb1-62dc-4ba1-93dc-f6ce50a4a220|edd95a4f-aaee-4165-b558-a5ad612bed56"
+      "multiple_net_names|1441450|1047750|b322beb1-62dc-4ba1-93dc-f6ce50a4a220|edd95a4f-aaee-4165-b558-a5ad612bed56|||",
+      "multiple_net_names|1441450|1047750|d69faecf-9608-4ee3-b84a-978650ca5e60|edd95a4f-aaee-4165-b558-a5ad612bed56|||"
     ],
     "meta": {
       "version": 0
@@ -303,18 +306,23 @@
     "rule_severities": {
       "bus_definition_conflict": "error",
       "bus_entry_needed": "error",
-      "bus_label_syntax": "error",
       "bus_to_bus_conflict": "error",
       "bus_to_net_conflict": "error",
+      "conflicting_netclasses": "error",
       "different_unit_footprint": "error",
       "different_unit_net": "error",
       "duplicate_reference": "error",
       "duplicate_sheet_names": "error",
+      "endpoint_off_grid": "warning",
       "extra_units": "error",
       "global_label_dangling": "warning",
       "hier_label_mismatch": "error",
       "label_dangling": "error",
       "lib_symbol_issues": "warning",
+      "missing_bidi_pin": "warning",
+      "missing_input_pin": "warning",
+      "missing_power_pin": "error",
+      "missing_unit": "warning",
       "multiple_net_names": "warning",
       "net_not_bus_member": "warning",
       "no_connect_connected": "warning",
@@ -324,6 +332,7 @@
       "pin_to_pin": "warning",
       "power_pin_not_driven": "error",
       "similar_labels": "warning",
+      "simulation_model_issue": "error",
       "unannotated": "error",
       "unit_value_mismatch": "error",
       "unresolved_variable": "error",
@@ -341,7 +350,7 @@
   "net_settings": {
     "classes": [
       {
-        "bus_width": 12.0,
+        "bus_width": 12,
         "clearance": 0.2,
         "diff_pair_gap": 0.25,
         "diff_pair_via_gap": 0.25,
@@ -355,13 +364,15 @@
         "track_width": 0.25,
         "via_diameter": 0.8,
         "via_drill": 0.4,
-        "wire_width": 6.0
+        "wire_width": 6
       }
     ],
     "meta": {
-      "version": 2
+      "version": 3
     },
-    "net_colors": null
+    "net_colors": null,
+    "netclass_assignments": null,
+    "netclass_patterns": []
   },
   "pcbnew": {
     "last_paths": {
@@ -377,6 +388,8 @@
   "schematic": {
     "annotate_start_num": 0,
     "drawing": {
+      "dashed_lines_dash_length_ratio": 12.0,
+      "dashed_lines_gap_length_ratio": 3.0,
       "default_line_thickness": 6.0,
       "default_text_size": 50.0,
       "field_names": [],
@@ -408,7 +421,11 @@
     "page_layout_descr_file": "",
     "plot_directory": "",
     "spice_adjust_passive_values": false,
+    "spice_current_sheet_as_root": false,
     "spice_external_command": "spice \"%I\"",
+    "spice_model_current_sheet_as_root": true,
+    "spice_save_all_currents": false,
+    "spice_save_all_voltages": false,
     "subpart_first_id": 65,
     "subpart_id_separator": 0
   },
diff --git a/kicad/V0_McDisplay.kicad_sch b/kicad/V0_McDisplay.kicad_sch
index 05ef1e5..dec8b5d 100644
--- a/kicad/V0_McDisplay.kicad_sch
+++ b/kicad/V0_McDisplay.kicad_sch
@@ -1,4 +1,4 @@
-(kicad_sch (version 20211123) (generator eeschema)
+(kicad_sch (version 20230121) (generator eeschema)
 
   (uuid 79976d84-8f91-4d37-9c84-30893cab9eeb)
 
@@ -12,38 +12,38 @@
 
   (lib_symbols
     (symbol "Connector_Generic:Conn_01x02" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 0 2.54 0)
+      (property "Reference" "J" (at 0 2.54 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "Conn_01x02" (id 1) (at 0 -5.08 0)
+      (property "Value" "Conn_01x02" (at 0 -5.08 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "~" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "connector" (id 4) (at 0 0 0)
+      (property "ki_keywords" "connector" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Generic connector, single row, 01x02, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
+      (property "ki_description" "Generic connector, single row, 01x02, script generated (kicad-library-utils/schlib/autogen/connector/)" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "Connector*:*_1x??_*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "Connector*:*_1x??_*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "Conn_01x02_1_1"
         (rectangle (start -1.27 -2.413) (end 0 -2.667)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 0.127) (end 0 -0.127)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 1.27) (end 1.27 -3.81)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type background))
         )
         (pin passive line (at -5.08 0 0) (length 3.81)
@@ -57,46 +57,46 @@
       )
     )
     (symbol "Connector_Generic:Conn_01x04" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 0 5.08 0)
+      (property "Reference" "J" (at 0 5.08 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "Conn_01x04" (id 1) (at 0 -7.62 0)
+      (property "Value" "Conn_01x04" (at 0 -7.62 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "~" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "connector" (id 4) (at 0 0 0)
+      (property "ki_keywords" "connector" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Generic connector, single row, 01x04, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
+      (property "ki_description" "Generic connector, single row, 01x04, script generated (kicad-library-utils/schlib/autogen/connector/)" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "Connector*:*_1x??_*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "Connector*:*_1x??_*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "Conn_01x04_1_1"
         (rectangle (start -1.27 -4.953) (end 0 -5.207)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 -2.413) (end 0 -2.667)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 0.127) (end 0 -0.127)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 2.667) (end 0 2.413)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 3.81) (end 1.27 -6.35)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type background))
         )
         (pin passive line (at -5.08 2.54 0) (length 3.81)
@@ -118,62 +118,62 @@
       )
     )
     (symbol "Connector_Generic:Conn_02x04_Odd_Even" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 1.27 5.08 0)
+      (property "Reference" "J" (at 1.27 5.08 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "Conn_02x04_Odd_Even" (id 1) (at 1.27 -7.62 0)
+      (property "Value" "Conn_02x04_Odd_Even" (at 1.27 -7.62 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "~" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "connector" (id 4) (at 0 0 0)
+      (property "ki_keywords" "connector" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Generic connector, double row, 02x04, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
+      (property "ki_description" "Generic connector, double row, 02x04, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "Connector*:*_2x??_*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "Connector*:*_2x??_*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "Conn_02x04_Odd_Even_1_1"
         (rectangle (start -1.27 -4.953) (end 0 -5.207)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 -2.413) (end 0 -2.667)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 0.127) (end 0 -0.127)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 2.667) (end 0 2.413)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 3.81) (end 3.81 -6.35)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type background))
         )
         (rectangle (start 3.81 -4.953) (end 2.54 -5.207)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start 3.81 -2.413) (end 2.54 -2.667)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start 3.81 0.127) (end 2.54 -0.127)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start 3.81 2.667) (end 2.54 2.413)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (pin passive line (at -5.08 2.54 0) (length 3.81)
@@ -211,86 +211,86 @@
       )
     )
     (symbol "Connector_Generic:Conn_02x07_Odd_Even" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 1.27 10.16 0)
+      (property "Reference" "J" (at 1.27 10.16 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "Conn_02x07_Odd_Even" (id 1) (at 1.27 -10.16 0)
+      (property "Value" "Conn_02x07_Odd_Even" (at 1.27 -10.16 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "~" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "connector" (id 4) (at 0 0 0)
+      (property "ki_keywords" "connector" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Generic connector, double row, 02x07, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
+      (property "ki_description" "Generic connector, double row, 02x07, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "Connector*:*_2x??_*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "Connector*:*_2x??_*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "Conn_02x07_Odd_Even_1_1"
         (rectangle (start -1.27 -7.493) (end 0 -7.747)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 -4.953) (end 0 -5.207)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 -2.413) (end 0 -2.667)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 0.127) (end 0 -0.127)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 2.667) (end 0 2.413)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 5.207) (end 0 4.953)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 7.747) (end 0 7.493)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start -1.27 8.89) (end 3.81 -8.89)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type background))
         )
         (rectangle (start 3.81 -7.493) (end 2.54 -7.747)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start 3.81 -4.953) (end 2.54 -5.207)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start 3.81 -2.413) (end 2.54 -2.667)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start 3.81 0.127) (end 2.54 -0.127)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start 3.81 2.667) (end 2.54 2.413)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start 3.81 5.207) (end 2.54 4.953)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (rectangle (start 3.81 7.747) (end 2.54 7.493)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (pin passive line (at -5.08 7.62 0) (length 3.81)
@@ -352,30 +352,30 @@
       )
     )
     (symbol "Device:Buzzer" (pin_names (offset 0.0254) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "BZ" (id 0) (at 3.81 1.27 0)
+      (property "Reference" "BZ" (at 3.81 1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "Buzzer" (id 1) (at 3.81 -1.27 0)
+      (property "Value" "Buzzer" (at 3.81 -1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Footprint" "" (id 2) (at -0.635 2.54 90)
+      (property "Footprint" "" (at -0.635 2.54 90)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at -0.635 2.54 90)
+      (property "Datasheet" "~" (at -0.635 2.54 90)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "quartz resonator ceramic" (id 4) (at 0 0 0)
+      (property "ki_keywords" "quartz resonator ceramic" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Buzzer, polarized" (id 5) (at 0 0 0)
+      (property "ki_description" "Buzzer, polarized" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "*Buzzer*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "*Buzzer*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "Buzzer_0_1"
-        (arc (start 0 -3.175) (mid 3.175 0) (end 0 3.175)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+        (arc (start 0 -3.175) (mid 3.1612 0) (end 0 3.175)
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -383,7 +383,7 @@
             (xy -1.651 1.905)
             (xy -1.143 1.905)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -391,7 +391,7 @@
             (xy -1.397 2.159)
             (xy -1.397 1.651)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -399,7 +399,7 @@
             (xy 0 3.175)
             (xy 0 -3.175)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
       )
@@ -415,25 +415,25 @@
       )
     )
     (symbol "Device:C_Small" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "C" (id 0) (at 0.254 1.778 0)
+      (property "Reference" "C" (at 0.254 1.778 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "C_Small" (id 1) (at 0.254 -2.032 0)
+      (property "Value" "C_Small" (at 0.254 -2.032 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "~" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "capacitor cap" (id 4) (at 0 0 0)
+      (property "ki_keywords" "capacitor cap" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Unpolarized capacitor, small symbol" (id 5) (at 0 0 0)
+      (property "ki_description" "Unpolarized capacitor, small symbol" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "C_*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "C_*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "C_Small_0_1"
@@ -442,7 +442,7 @@
             (xy -1.524 -0.508)
             (xy 1.524 -0.508)
           )
-          (stroke (width 0.3302) (type default) (color 0 0 0 0))
+          (stroke (width 0.3302) (type default))
           (fill (type none))
         )
         (polyline
@@ -450,7 +450,7 @@
             (xy -1.524 0.508)
             (xy 1.524 0.508)
           )
-          (stroke (width 0.3048) (type default) (color 0 0 0 0))
+          (stroke (width 0.3048) (type default))
           (fill (type none))
         )
       )
@@ -466,25 +466,25 @@
       )
     )
     (symbol "Device:FerriteBead_Small" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
-      (property "Reference" "FB" (id 0) (at 1.905 1.27 0)
+      (property "Reference" "FB" (at 1.905 1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "FerriteBead_Small" (id 1) (at 1.905 -1.27 0)
+      (property "Value" "FerriteBead_Small" (at 1.905 -1.27 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Footprint" "" (id 2) (at -1.778 0 90)
+      (property "Footprint" "" (at -1.778 0 90)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "~" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "L ferrite bead inductor filter" (id 4) (at 0 0 0)
+      (property "ki_keywords" "L ferrite bead inductor filter" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Ferrite bead, small symbol" (id 5) (at 0 0 0)
+      (property "ki_description" "Ferrite bead, small symbol" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "Inductor_* L_* *Ferrite*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "Inductor_* L_* *Ferrite*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "FerriteBead_Small_0_1"
@@ -493,7 +493,7 @@
             (xy 0 -1.27)
             (xy 0 -0.7874)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -501,7 +501,7 @@
             (xy 0 0.889)
             (xy 0 1.2954)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -512,7 +512,7 @@
             (xy 1.1176 -1.4224)
             (xy -1.8288 0.2794)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
       )
@@ -528,30 +528,30 @@
       )
     )
     (symbol "Device:R_Small" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "R" (id 0) (at 0.762 0.508 0)
+      (property "Reference" "R" (at 0.762 0.508 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "R_Small" (id 1) (at 0.762 -1.016 0)
+      (property "Value" "R_Small" (at 0.762 -1.016 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "~" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "R resistor" (id 4) (at 0 0 0)
+      (property "ki_keywords" "R resistor" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Resistor, small symbol" (id 5) (at 0 0 0)
+      (property "ki_description" "Resistor, small symbol" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "R_*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "R_*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "R_Small_0_1"
         (rectangle (start -0.762 1.778) (end 0.762 -1.778)
-          (stroke (width 0.2032) (type default) (color 0 0 0 0))
+          (stroke (width 0.2032) (type default))
           (fill (type none))
         )
       )
@@ -567,42 +567,42 @@
       )
     )
     (symbol "Device:RotaryEncoder_Switch" (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "SW" (id 0) (at 0 6.604 0)
+      (property "Reference" "SW" (at 0 6.604 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "RotaryEncoder_Switch" (id 1) (at 0 -6.604 0)
+      (property "Value" "RotaryEncoder_Switch" (at 0 -6.604 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at -3.81 4.064 0)
+      (property "Footprint" "" (at -3.81 4.064 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 6.604 0)
+      (property "Datasheet" "~" (at 0 6.604 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "rotary switch encoder switch push button" (id 4) (at 0 0 0)
+      (property "ki_keywords" "rotary switch encoder switch push button" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Rotary encoder, dual channel, incremental quadrate outputs, with switch" (id 5) (at 0 0 0)
+      (property "ki_description" "Rotary encoder, dual channel, incremental quadrate outputs, with switch" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "RotaryEncoder*Switch*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "RotaryEncoder*Switch*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "RotaryEncoder_Switch_0_1"
         (rectangle (start -5.08 5.08) (end 5.08 -5.08)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type background))
         )
         (circle (center -3.81 0) (radius 0.254)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type outline))
         )
-        (arc (start -0.381 -2.794) (mid 2.3622 -0.0508) (end -0.381 2.667)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+        (circle (center -0.381 0) (radius 1.905)
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
-        (circle (center -0.381 0) (radius 1.905)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+        (arc (start -0.381 2.667) (mid -3.0988 -0.0635) (end -0.381 -2.794)
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -610,7 +610,7 @@
             (xy -0.635 -1.778)
             (xy -0.635 1.778)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -618,7 +618,7 @@
             (xy -0.381 -1.778)
             (xy -0.381 1.778)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -626,7 +626,7 @@
             (xy -0.127 1.778)
             (xy -0.127 -1.778)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -634,7 +634,7 @@
             (xy 3.81 0)
             (xy 3.429 0)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -642,7 +642,7 @@
             (xy 3.81 1.016)
             (xy 3.81 -1.016)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -651,7 +651,7 @@
             (xy -3.81 -2.54)
             (xy -3.81 -2.032)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -660,7 +660,7 @@
             (xy -3.81 2.54)
             (xy -3.81 2.032)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -669,7 +669,7 @@
             (xy -0.508 -2.794)
             (xy 0.127 -2.413)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -678,7 +678,7 @@
             (xy -0.508 2.667)
             (xy 0.127 2.286)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -687,7 +687,7 @@
             (xy 4.318 -2.54)
             (xy 4.318 -1.016)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -696,7 +696,7 @@
             (xy 4.318 2.54)
             (xy 4.318 1.016)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -706,7 +706,7 @@
             (xy -3.81 -1.016)
             (xy -3.302 -2.032)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -716,15 +716,15 @@
             (xy -3.81 1.016)
             (xy -3.302 2.032)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (circle (center 4.318 -1.016) (radius 0.127)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (circle (center 4.318 1.016) (radius 0.127)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
       )
@@ -752,59 +752,59 @@
       )
     )
     (symbol "Mechanical:MountingHole" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
-      (property "Reference" "H" (id 0) (at 0 5.08 0)
+      (property "Reference" "H" (at 0 5.08 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "MountingHole" (id 1) (at 0 3.175 0)
+      (property "Value" "MountingHole" (at 0 3.175 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "~" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "mounting hole" (id 4) (at 0 0 0)
+      (property "ki_keywords" "mounting hole" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Mounting Hole without connection" (id 5) (at 0 0 0)
+      (property "ki_description" "Mounting Hole without connection" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "MountingHole*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "MountingHole*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "MountingHole_0_1"
         (circle (center 0 0) (radius 1.27)
-          (stroke (width 1.27) (type default) (color 0 0 0 0))
+          (stroke (width 1.27) (type default))
           (fill (type none))
         )
       )
     )
     (symbol "Regulator_Linear:HT75xx-1-SOT89" (in_bom yes) (on_board yes)
-      (property "Reference" "U" (id 0) (at -5.08 -3.81 0)
+      (property "Reference" "U" (at -5.08 -3.81 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "HT75xx-1-SOT89" (id 1) (at 0 6.35 0)
+      (property "Value" "HT75xx-1-SOT89" (at 0 6.35 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "Package_TO_SOT_SMD:SOT-89-3" (id 2) (at 0 8.255 0)
+      (property "Footprint" "Package_TO_SOT_SMD:SOT-89-3" (at 0 8.255 0)
         (effects (font (size 1.27 1.27) italic) hide)
       )
-      (property "Datasheet" "https://www.holtek.com/documents/10179/116711/HT75xx-1v250.pdf" (id 3) (at 0 2.54 0)
+      (property "Datasheet" "https://www.holtek.com/documents/10179/116711/HT75xx-1v250.pdf" (at 0 2.54 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "100mA LDO Regulator Fixed Positive" (id 4) (at 0 0 0)
+      (property "ki_keywords" "100mA LDO Regulator Fixed Positive" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "100mA Low Dropout Voltage Regulator, Fixed Output, SOT89" (id 5) (at 0 0 0)
+      (property "ki_description" "100mA Low Dropout Voltage Regulator, Fixed Output, SOT89" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "SOT?89*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "SOT?89*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "HT75xx-1-SOT89_0_1"
         (rectangle (start -5.08 5.08) (end 5.08 -2.54)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type background))
         )
       )
@@ -824,25 +824,25 @@
       )
     )
     (symbol "Transistor_FET:AO3400A" (pin_names hide) (in_bom yes) (on_board yes)
-      (property "Reference" "Q" (id 0) (at 5.08 1.905 0)
+      (property "Reference" "Q" (at 5.08 1.905 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "AO3400A" (id 1) (at 5.08 0 0)
+      (property "Value" "AO3400A" (at 5.08 0 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 5.08 -1.905 0)
+      (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (at 5.08 -1.905 0)
         (effects (font (size 1.27 1.27) italic) (justify left) hide)
       )
-      (property "Datasheet" "http://www.aosmd.com/pdfs/datasheet/AO3400A.pdf" (id 3) (at 0 0 0)
+      (property "Datasheet" "http://www.aosmd.com/pdfs/datasheet/AO3400A.pdf" (at 0 0 0)
         (effects (font (size 1.27 1.27)) (justify left) hide)
       )
-      (property "ki_keywords" "N-Channel MOSFET" (id 4) (at 0 0 0)
+      (property "ki_keywords" "N-Channel MOSFET" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "30V Vds, 5.7A Id, N-Channel MOSFET, SOT-23" (id 5) (at 0 0 0)
+      (property "ki_description" "30V Vds, 5.7A Id, N-Channel MOSFET, SOT-23" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "SOT?23*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "SOT?23*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "AO3400A_0_1"
@@ -851,7 +851,7 @@
             (xy 0.254 0)
             (xy -2.54 0)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -859,7 +859,7 @@
             (xy 0.254 1.905)
             (xy 0.254 -1.905)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -867,7 +867,7 @@
             (xy 0.762 -1.27)
             (xy 0.762 -2.286)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -875,7 +875,7 @@
             (xy 0.762 0.508)
             (xy 0.762 -0.508)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -883,7 +883,7 @@
             (xy 0.762 2.286)
             (xy 0.762 1.27)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -891,7 +891,7 @@
             (xy 2.54 2.54)
             (xy 2.54 1.778)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -900,7 +900,7 @@
             (xy 2.54 0)
             (xy 0.762 0)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -910,7 +910,7 @@
             (xy 3.302 1.778)
             (xy 0.762 1.778)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -920,7 +920,7 @@
             (xy 2.032 -0.381)
             (xy 1.016 0)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type outline))
         )
         (polyline
@@ -930,7 +930,7 @@
             (xy 3.683 0.381)
             (xy 3.81 0.254)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -940,19 +940,19 @@
             (xy 3.683 -0.254)
             (xy 3.302 0.381)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (circle (center 1.651 0) (radius 2.794)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (circle (center 2.54 -1.778) (radius 0.254)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type outline))
         )
         (circle (center 2.54 1.778) (radius 0.254)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type outline))
         )
       )
@@ -972,25 +972,25 @@
       )
     )
     (symbol "V0-Display:74LVC1G17" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
-      (property "Reference" "U" (id 0) (at -2.54 3.81 0)
+      (property "Reference" "U" (at -2.54 3.81 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "74LVC1G17" (id 1) (at 0 -3.81 0)
+      (property "Value" "74LVC1G17" (at 0 -3.81 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf" (id 3) (at 0 0 0)
+      (property "Datasheet" "http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "Single Gate Buff Schmitt LVC CMOS" (id 4) (at 0 0 0)
+      (property "ki_keywords" "Single Gate Buff Schmitt LVC CMOS" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Single Schmitt Buffer Gate, Low-Voltage CMOS" (id 5) (at 0 0 0)
+      (property "ki_description" "Single Schmitt Buffer Gate, Low-Voltage CMOS" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "SOT* SG-*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "SOT* SG-*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "74LVC1G17_0_1"
@@ -1000,7 +1000,7 @@
             (xy -1.905 0.635)
             (xy -1.905 -0.635)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1010,7 +1010,7 @@
             (xy 2.54 0)
             (xy -3.81 2.54)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -1020,7 +1020,7 @@
             (xy -2.54 -0.635)
             (xy -1.27 -0.635)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
       )
@@ -1044,27 +1044,27 @@
       )
     )
     (symbol "V0-Display:SW_SPST" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "SW" (id 0) (at 0 3.175 0)
+      (property "Reference" "SW" (at 0 3.175 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "SW_SPST" (id 1) (at 0 -2.54 0)
+      (property "Value" "SW_SPST" (at 0 -2.54 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "~" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "switch lever" (id 4) (at 0 0 0)
+      (property "ki_keywords" "switch lever" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Single Pole Single Throw (SPST) switch" (id 5) (at 0 0 0)
+      (property "ki_description" "Single Pole Single Throw (SPST) switch" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "SW_SPST_0_0"
         (circle (center -2.032 0) (radius 0.508)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1072,11 +1072,11 @@
             (xy -1.524 0.254)
             (xy 1.524 1.778)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (circle (center 2.032 0) (radius 0.508)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
       )
@@ -1092,38 +1092,38 @@
       )
     )
     (symbol "V0-Display:SolderJumper_3" (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "JP" (id 0) (at -2.54 -2.54 0)
+      (property "Reference" "JP" (at -2.54 -2.54 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "SolderJumper_3" (id 1) (at 0 2.794 0)
+      (property "Value" "SolderJumper_3" (at 0 2.794 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "~" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "Solder Jumper SPDT" (id 4) (at 0 0 0)
+      (property "ki_keywords" "Solder Jumper SPDT" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "3-pole Solder Jumper" (id 5) (at 0 0 0)
+      (property "ki_description" "3-pole Solder Jumper" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "SolderJumper*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "SolderJumper*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "SolderJumper_3_0_1"
-        (arc (start -1.016 1.016) (mid -2.032 0) (end -1.016 -1.016)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+        (arc (start -1.016 1.016) (mid -2.0276 0) (end -1.016 -1.016)
+          (stroke (width 0) (type default))
           (fill (type none))
         )
-        (arc (start -1.016 1.016) (mid -2.032 0) (end -1.016 -1.016)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+        (arc (start -1.016 1.016) (mid -2.0276 0) (end -1.016 -1.016)
+          (stroke (width 0) (type default))
           (fill (type outline))
         )
         (rectangle (start -0.508 1.016) (end 0.508 -1.016)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type outline))
         )
         (polyline
@@ -1131,7 +1131,7 @@
             (xy -2.54 0)
             (xy -2.032 0)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1139,7 +1139,7 @@
             (xy -1.016 1.016)
             (xy -1.016 -1.016)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1147,7 +1147,7 @@
             (xy 0 -1.27)
             (xy 0 -1.016)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1155,7 +1155,7 @@
             (xy 1.016 1.016)
             (xy 1.016 -1.016)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1163,15 +1163,15 @@
             (xy 2.54 0)
             (xy 2.032 0)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
-        (arc (start 1.016 -1.016) (mid 2.032 0) (end 1.016 1.016)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+        (arc (start 1.016 -1.016) (mid 2.0276 0) (end 1.016 1.016)
+          (stroke (width 0) (type default))
           (fill (type none))
         )
-        (arc (start 1.016 -1.016) (mid 2.032 0) (end 1.016 1.016)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+        (arc (start 1.016 -1.016) (mid 2.0276 0) (end 1.016 1.016)
+          (stroke (width 0) (type default))
           (fill (type outline))
         )
       )
@@ -1191,42 +1191,42 @@
       )
     )
     (symbol "V0-Display:USB_B_Micro" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at -5.08 11.43 0)
+      (property "Reference" "J" (at -5.08 11.43 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "USB_B_Micro" (id 1) (at -5.08 8.89 0)
+      (property "Value" "USB_B_Micro" (at -5.08 8.89 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Footprint" "" (id 2) (at 3.81 -1.27 0)
+      (property "Footprint" "" (at 3.81 -1.27 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 3.81 -1.27 0)
+      (property "Datasheet" "~" (at 3.81 -1.27 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "connector USB micro" (id 4) (at 0 0 0)
+      (property "ki_keywords" "connector USB micro" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "USB Micro Type B connector" (id 5) (at 0 0 0)
+      (property "ki_description" "USB Micro Type B connector" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "USB*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "USB*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "USB_B_Micro_0_1"
         (rectangle (start -5.08 -7.62) (end 5.08 7.62)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type background))
         )
         (circle (center -3.81 2.159) (radius 0.635)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type outline))
         )
         (circle (center -0.635 3.429) (radius 0.381)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type outline))
         )
         (rectangle (start -0.127 -7.62) (end 0.127 -6.858)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1234,7 +1234,7 @@
             (xy -1.905 2.159)
             (xy 0.635 2.159)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -1244,7 +1244,7 @@
             (xy -1.27 3.429)
             (xy -0.635 3.429)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -1254,7 +1254,7 @@
             (xy -1.27 0.889)
             (xy 0 0.889)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
@@ -1264,7 +1264,7 @@
             (xy 1.905 2.159)
             (xy 0.635 2.794)
           )
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type outline))
         )
         (polyline
@@ -1275,7 +1275,7 @@
             (xy -4.064 4.826)
             (xy -4.318 5.588)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type outline))
         )
         (polyline
@@ -1290,27 +1290,27 @@
             (xy -1.397 5.842)
             (xy -4.699 5.842)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (rectangle (start 0.254 1.27) (end -0.508 0.508)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type outline))
         )
         (rectangle (start 5.08 -5.207) (end 4.318 -4.953)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (rectangle (start 5.08 -2.667) (end 4.318 -2.413)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (rectangle (start 5.08 -0.127) (end 4.318 0.127)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (rectangle (start 5.08 4.953) (end 4.318 5.207)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
       )
@@ -1342,25 +1342,25 @@
       )
     )
     (symbol "V0-Display:WS2812B" (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
-      (property "Reference" "D" (id 0) (at 5.08 5.715 0)
+      (property "Reference" "D" (at 5.08 5.715 0)
         (effects (font (size 1.27 1.27)) (justify right bottom))
       )
-      (property "Value" "WS2812B" (id 1) (at 1.27 -5.715 0)
+      (property "Value" "WS2812B" (at 1.27 -5.715 0)
         (effects (font (size 1.27 1.27)) (justify left top))
       )
-      (property "Footprint" "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm" (id 2) (at 1.27 -7.62 0)
+      (property "Footprint" "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm" (at 1.27 -7.62 0)
         (effects (font (size 1.27 1.27)) (justify left top) hide)
       )
-      (property "Datasheet" "https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf" (id 3) (at 2.54 -9.525 0)
+      (property "Datasheet" "https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf" (at 2.54 -9.525 0)
         (effects (font (size 1.27 1.27)) (justify left top) hide)
       )
-      (property "ki_keywords" "RGB LED NeoPixel addressable" (id 4) (at 0 0 0)
+      (property "ki_keywords" "RGB LED NeoPixel addressable" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "RGB LED with integrated controller" (id 5) (at 0 0 0)
+      (property "ki_description" "RGB LED with integrated controller" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "LED*WS2812*PLCC*5.0x5.0mm*P3.2mm*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "LED*WS2812*PLCC*5.0x5.0mm*P3.2mm*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "WS2812B_0_0"
@@ -1374,7 +1374,7 @@
             (xy 1.27 -3.556)
             (xy 1.778 -3.556)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1382,7 +1382,7 @@
             (xy 1.27 -2.54)
             (xy 1.778 -2.54)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1390,7 +1390,7 @@
             (xy 4.699 -3.556)
             (xy 2.667 -3.556)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1399,7 +1399,7 @@
             (xy 1.27 -3.556)
             (xy 1.27 -3.048)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1408,7 +1408,7 @@
             (xy 1.27 -2.54)
             (xy 1.27 -2.032)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1417,7 +1417,7 @@
             (xy 3.683 -3.556)
             (xy 3.683 -4.064)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1427,11 +1427,11 @@
             (xy 3.683 -3.556)
             (xy 4.699 -1.524)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (rectangle (start 5.08 5.08) (end -5.08 -5.08)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (stroke (width 0.254) (type default))
           (fill (type background))
         )
       )
@@ -1455,25 +1455,25 @@
       )
     )
     (symbol "my_additions:BAV99_Small" (pin_names hide) (in_bom yes) (on_board yes)
-      (property "Reference" "D" (id 0) (at 0 5.08 0)
+      (property "Reference" "D" (at 0 5.08 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "BAV99_Small" (id 1) (at 0 2.54 0)
+      (property "Value" "BAV99_Small" (at 0 2.54 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 0 -5.08 0)
+      (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (at 0 -5.08 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" (id 3) (at 0 -6.985 0)
+      (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" (at 0 -6.985 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "diode" (id 4) (at 0 0 0)
+      (property "ki_keywords" "diode" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "BAV99 High-speed switching diodes, SOT-23" (id 5) (at 0 0 0)
+      (property "ki_description" "BAV99 High-speed switching diodes, SOT-23" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "SOT?23*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "SOT?23*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "BAV99_Small_0_1"
@@ -1482,7 +1482,7 @@
             (xy -0.635 -0.635)
             (xy -0.635 0.635)
           )
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (polyline
@@ -1490,7 +1490,7 @@
             (xy -0.635 0)
             (xy 0.635 0)
           )
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (polyline
@@ -1498,7 +1498,7 @@
             (xy 1.905 -0.635)
             (xy 1.905 0.635)
           )
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (polyline
@@ -1508,7 +1508,7 @@
             (xy -0.635 0)
             (xy -1.905 -0.635)
           )
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
         (polyline
@@ -1518,13 +1518,13 @@
             (xy 1.905 0)
             (xy 0.635 0.635)
           )
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (stroke (width 0.1524) (type default))
           (fill (type none))
         )
       )
       (symbol "BAV99_Small_1_1"
         (circle (center 0 0) (radius 0.254)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type outline))
         )
         (pin passive line (at -4.445 0 0) (length 2.54)
@@ -1542,30 +1542,30 @@
       )
     )
     (symbol "my_additions:STM32F072C8Tx" (in_bom yes) (on_board yes)
-      (property "Reference" "U" (id 0) (at -13.97 37.465 0)
+      (property "Reference" "U" (at -13.97 37.465 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Value" "STM32F072C8Tx" (id 1) (at -8.255 0 0)
+      (property "Value" "STM32F072C8Tx" (at -8.255 0 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
-      (property "Footprint" "Package_QFP:LQFP-48_7x7mm_P0.5mm" (id 2) (at -6.985 -34.29 0)
+      (property "Footprint" "Package_QFP:LQFP-48_7x7mm_P0.5mm" (at -6.985 -34.29 0)
         (effects (font (size 1.27 1.27)) (justify right) hide)
       )
-      (property "Datasheet" "" (id 3) (at 45.72 -66.04 0)
+      (property "Datasheet" "" (at 45.72 -66.04 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "ARM Cortex STM32F0 STM32F0x2" (id 4) (at 0 0 0)
+      (property "ki_keywords" "ARM Cortex STM32F0 STM32F0x2" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "ARM Cortex-M0 MCU, 64KB flash, 16KB RAM, 48MHz, 2-3.6V, 37 GPIO, LQFP-48" (id 5) (at 0 0 0)
+      (property "ki_description" "ARM Cortex-M0 MCU, 64KB flash, 16KB RAM, 48MHz, 2-3.6V, 37 GPIO, LQFP-48" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "LQFP-48*7x7mm*P0.5mm*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "LQFP-48*7x7mm*P0.5mm*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "STM32F072C8Tx_0_1"
         (rectangle (start -13.97 36.195) (end 13.335 -33.02)
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type background))
         )
       )
@@ -1765,22 +1765,22 @@
       )
     )
     (symbol "power:+3.3V" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
-      (property "Reference" "#PWR" (id 0) (at 0 -3.81 0)
+      (property "Reference" "#PWR" (at 0 -3.81 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Value" "+3.3V" (id 1) (at 0 3.556 0)
+      (property "Value" "+3.3V" (at 0 3.556 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "" (id 3) (at 0 0 0)
+      (property "Datasheet" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "global power" (id 4) (at 0 0 0)
+      (property "ki_keywords" "global power" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Power symbol creates a global label with name \"+3.3V\"" (id 5) (at 0 0 0)
+      (property "ki_description" "Power symbol creates a global label with name \"+3.3V\"" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "+3.3V_0_1"
@@ -1789,7 +1789,7 @@
             (xy -0.762 1.27)
             (xy 0 2.54)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1797,7 +1797,7 @@
             (xy 0 0)
             (xy 0 2.54)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1805,7 +1805,7 @@
             (xy 0 2.54)
             (xy 0.762 1.27)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
       )
@@ -1817,22 +1817,22 @@
       )
     )
     (symbol "power:+3.3VA" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
-      (property "Reference" "#PWR" (id 0) (at 0 -3.81 0)
+      (property "Reference" "#PWR" (at 0 -3.81 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Value" "+3.3VA" (id 1) (at 0 3.556 0)
+      (property "Value" "+3.3VA" (at 0 3.556 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "" (id 3) (at 0 0 0)
+      (property "Datasheet" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "global power" (id 4) (at 0 0 0)
+      (property "ki_keywords" "global power" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Power symbol creates a global label with name \"+3.3VA\"" (id 5) (at 0 0 0)
+      (property "ki_description" "Power symbol creates a global label with name \"+3.3VA\"" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "+3.3VA_0_1"
@@ -1841,7 +1841,7 @@
             (xy -0.762 1.27)
             (xy 0 2.54)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1849,7 +1849,7 @@
             (xy 0 0)
             (xy 0 2.54)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
@@ -1857,7 +1857,7 @@
             (xy 0 2.54)
             (xy 0.762 1.27)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
       )
@@ -1869,22 +1869,22 @@
       )
     )
     (symbol "power:GND" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
-      (property "Reference" "#PWR" (id 0) (at 0 -6.35 0)
+      (property "Reference" "#PWR" (at 0 -6.35 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Value" "GND" (id 1) (at 0 -3.81 0)
+      (property "Value" "GND" (at 0 -3.81 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "" (id 3) (at 0 0 0)
+      (property "Datasheet" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "global power" (id 4) (at 0 0 0)
+      (property "ki_keywords" "global power" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Power symbol creates a global label with name \"GND\" , ground" (id 5) (at 0 0 0)
+      (property "ki_description" "Power symbol creates a global label with name \"GND\" , ground" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "GND_0_1"
@@ -1897,7 +1897,7 @@
             (xy -1.27 -1.27)
             (xy 0 -1.27)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
       )
@@ -1909,22 +1909,22 @@
       )
     )
     (symbol "power:GNDA" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
-      (property "Reference" "#PWR" (id 0) (at 0 -6.35 0)
+      (property "Reference" "#PWR" (at 0 -6.35 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Value" "GNDA" (id 1) (at 0 -3.81 0)
+      (property "Value" "GNDA" (at 0 -3.81 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "" (id 3) (at 0 0 0)
+      (property "Datasheet" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "global power" (id 4) (at 0 0 0)
+      (property "ki_keywords" "global power" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Power symbol creates a global label with name \"GNDA\" , analog ground" (id 5) (at 0 0 0)
+      (property "ki_description" "Power symbol creates a global label with name \"GNDA\" , analog ground" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "GNDA_0_1"
@@ -1937,7 +1937,7 @@
             (xy -1.27 -1.27)
             (xy 0 -1.27)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
       )
@@ -1949,22 +1949,22 @@
       )
     )
     (symbol "power:PWR_FLAG" (power) (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "#FLG" (id 0) (at 0 1.905 0)
+      (property "Reference" "#FLG" (at 0 1.905 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Value" "PWR_FLAG" (id 1) (at 0 3.81 0)
+      (property "Value" "PWR_FLAG" (at 0 3.81 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 0 0 0)
+      (property "Footprint" "" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (property "Datasheet" "~" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "flag power" (id 4) (at 0 0 0)
+      (property "ki_keywords" "flag power" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0)
+      (property "ki_description" "Special symbol for telling ERC where power comes from" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "PWR_FLAG_0_0"
@@ -1983,7 +1983,7 @@
             (xy 1.016 1.905)
             (xy 0 1.27)
           )
-          (stroke (width 0) (type default) (color 0 0 0 0))
+          (stroke (width 0) (type default))
           (fill (type none))
         )
       )
@@ -2155,1603 +2155,1639 @@
   (no_connect (at 207.645 118.11) (uuid ef48bc89-1cec-4ae2-9214-5f156911e127))
 
   (wire (pts (xy 56.515 151.13) (xy 56.515 146.05))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 00aabeca-3174-4cb9-8b63-9311f87a2519)
   )
   (wire (pts (xy 130.81 45.085) (xy 130.81 45.72))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 01b63df4-bcf8-4968-ad09-3368cf3b115c)
   )
   (wire (pts (xy 212.725 30.48) (xy 212.725 31.115))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 021e8c16-b0af-4324-a079-b999f807ffa1)
   )
   (wire (pts (xy 147.32 142.875) (xy 148.59 142.875))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 02d767e2-5ab8-44f0-b0ee-1d0e511b3c7c)
   )
   (wire (pts (xy 212.725 24.13) (xy 212.725 24.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 03c649f5-b11e-43e2-a539-ed7852c858af)
   )
   (wire (pts (xy 135.255 99.06) (xy 144.145 99.06))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 03d7cc02-9062-4a09-abbf-33c005ca66e0)
   )
   (wire (pts (xy 206.375 80.01) (xy 207.645 80.01))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 046d6c41-efa4-4999-85e6-6fd5cd3478ef)
   )
   (wire (pts (xy 70.485 24.765) (xy 70.485 23.495))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 06c9acf6-f83a-4c32-9c70-a57e22c3ab14)
   )
   (wire (pts (xy 147.32 40.005) (xy 148.59 40.005))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 08c87024-df76-46c5-926b-29691ebcf535)
   )
   (wire (pts (xy 206.375 82.55) (xy 207.645 82.55))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 08f5f3a3-ee13-4d0d-ae72-8ab5e5ce62ee)
   )
   (wire (pts (xy 86.995 140.335) (xy 86.995 143.51))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 0ba227ec-cee6-4808-b77a-67d51f76ca46)
   )
   (wire (pts (xy 40.005 83.82) (xy 41.275 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 0bf8eebe-c7a8-454e-a2b8-7f46feda5415)
   )
   (wire (pts (xy 62.865 106.68) (xy 64.135 106.68))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 0c21edeb-7ff6-4933-aaee-997617952b55)
   )
   (wire (pts (xy 225.425 123.19) (xy 225.425 124.46))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 0cfca638-9d9e-4a13-a246-bf3cc545108a)
   )
   (wire (pts (xy 95.25 31.75) (xy 98.425 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 0e656df1-fef5-44a8-a974-9bc1f8f766ee)
   )
   (wire (pts (xy 221.615 47.625) (xy 219.075 47.625))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 11033c76-88a1-42ef-a12b-7e31b7525ee6)
   )
   (wire (pts (xy 159.385 99.06) (xy 159.385 99.695))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 118fdd3a-d1d1-483b-9575-36c6e27d230e)
   )
   (wire (pts (xy 56.515 132.715) (xy 56.515 127.635))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 11a676fc-2ee1-4aa7-9b31-f558837f6d85)
   )
   (wire (pts (xy 31.75 34.925) (xy 31.75 41.275))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 12d5da01-dcbc-409d-b0bd-60c00a9e1ce9)
   )
   (wire (pts (xy 151.765 186.055) (xy 151.765 187.325))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 13516da1-d289-4fee-b1f8-a714983cccd4)
   )
   (wire (pts (xy 159.385 69.215) (xy 160.655 69.215))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 1516340c-7813-4a23-bbe1-1364bc48cbf3)
   )
   (wire (pts (xy 147.32 145.415) (xy 148.59 145.415))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 152d4deb-72c2-491a-80f3-da2efca39d0f)
   )
   (wire (pts (xy 100.33 160.02) (xy 101.6 160.02))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 16599dcc-d9b2-4414-89cc-bc8feadaa67c)
   )
   (wire (pts (xy 168.275 109.855) (xy 169.545 109.855))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 1693e165-b331-4c8c-80c4-6d74ffd6fdb4)
   )
   (wire (pts (xy 100.33 162.56) (xy 100.33 163.83))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 180eaed8-3566-44f3-941c-4e8d6df4da33)
   )
   (wire (pts (xy 206.375 115.57) (xy 207.645 115.57))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 1b7945da-f2cb-405b-8ce4-75ca1c5dba8d)
   )
   (wire (pts (xy 41.275 83.82) (xy 42.545 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 1b97dcc5-6d24-41cc-9821-60d5638274a7)
   )
   (wire (pts (xy 219.71 24.13) (xy 219.71 24.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 1c340598-46cc-45de-b09e-f51246f1b002)
   )
   (wire (pts (xy 27.94 127.635) (xy 26.67 127.635))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 1c82b0cf-11d7-4dab-b51e-50e8e9f270b5)
   )
   (wire (pts (xy 240.03 97.79) (xy 241.3 97.79))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 1cde744e-d5fb-4c01-8fb5-dc22837192c1)
   )
   (wire (pts (xy 71.12 83.82) (xy 71.12 85.09))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 1ce5e46d-d17b-42d3-bc2e-3159b655447f)
   )
   (wire (pts (xy 206.375 100.33) (xy 207.645 100.33))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 1d711b5b-b94d-46fc-8f84-5bdfe01eeb9e)
   )
   (wire (pts (xy 33.655 83.82) (xy 33.655 85.09))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 1d95f8af-053d-4b84-94c6-f74e3f50b624)
   )
   (wire (pts (xy 100.33 168.91) (xy 100.33 170.18))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 1db89d6d-f3d5-4f5e-aa52-9c73ba0dbe6b)
   )
   (wire (pts (xy 232.41 30.48) (xy 226.06 30.48))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 1dc3c819-dcd6-4034-a0fc-910db6593c04)
   )
   (wire (pts (xy 27.94 86.36) (xy 26.67 86.36))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 2141d0e8-0ffb-4aeb-b1c6-507c3374d574)
   )
   (wire (pts (xy 55.245 125.095) (xy 57.785 125.095))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 2165b140-beb7-48c5-8daa-df559a08d00d)
   )
   (wire (pts (xy 95.25 24.765) (xy 95.25 26.035))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 219ba52f-2629-4b1e-9012-306fabb59b94)
   )
   (wire (pts (xy 161.29 137.795) (xy 162.56 137.795))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 23f6d062-eead-4cf2-9a36-bbe73de45fa3)
   )
   (wire (pts (xy 30.48 24.765) (xy 31.75 24.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 23f975c0-4069-4c4f-b1de-bf62b26e0d78)
   )
   (wire (pts (xy 206.375 113.03) (xy 207.645 113.03))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 24a9ac84-a8b4-4cf6-a350-8e2d538324da)
   )
   (wire (pts (xy 82.55 88.265) (xy 82.55 90.805))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 24f07cd3-df17-41f9-b143-cc323af6c316)
   )
   (wire (pts (xy 225.425 124.46) (xy 222.885 124.46))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 25e0f18e-4555-413c-a81a-bb1f754916eb)
   )
   (wire (pts (xy 26.67 83.82) (xy 27.94 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 2681f51b-083f-4b94-8b32-8bccb2f00249)
   )
   (wire (pts (xy 24.765 59.055) (xy 26.035 59.055))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 268bc98c-80ff-4e4b-8b45-ac54d922a201)
   )
   (wire (pts (xy 35.56 168.275) (xy 35.56 170.18))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 280ce43a-4105-4c4d-9ced-e036b6d70130)
   )
   (wire (pts (xy 56.515 114.3) (xy 56.515 109.22))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 2836baa8-807c-4552-b0a9-d3943126877f)
   )
   (wire (pts (xy 97.155 107.315) (xy 98.425 107.315))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 29612022-cc21-4e75-8766-4227fbf2d742)
   )
   (wire (pts (xy 226.06 24.13) (xy 219.71 24.13))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 2a0a124b-518b-4a56-992d-43b1c877b734)
   )
   (wire (pts (xy 151.765 168.275) (xy 153.035 168.275))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 2a4310d4-aff4-4d4c-aa5d-ff74a665613c)
   )
   (wire (pts (xy 45.085 76.835) (xy 45.085 79.375))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 2ae59b7c-229a-4977-916a-99b283b9c4cb)
   )
   (wire (pts (xy 95.25 31.115) (xy 95.25 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 2c47e52f-a6a1-40f9-9968-f6eacb1522e8)
   )
   (wire (pts (xy 159.385 114.935) (xy 159.385 115.57))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 2cd74a8a-d8f1-4017-9676-9bf784579ff8)
   )
   (wire (pts (xy 101.6 31.75) (xy 106.68 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 2d32e6ae-a04b-4858-8e07-fd7dfdee221a)
   )
   (wire (pts (xy 219.075 46.355) (xy 219.075 47.625))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 2dd1b0aa-f5d1-4c78-9f9d-1992313d4807)
   )
   (wire (pts (xy 212.725 29.845) (xy 212.725 30.48))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 307309ad-2c17-4e55-85b2-8b250accd7be)
   )
   (wire (pts (xy 34.29 143.51) (xy 35.56 143.51))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 32254d0c-c6d4-4f95-a72b-dfea6c960aa2)
   )
   (wire (pts (xy 151.13 115.57) (xy 159.385 115.57))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 33157e89-635c-4885-8e8a-eae0e64712da)
   )
   (wire (pts (xy 159.385 74.295) (xy 160.655 74.295))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 334abcb6-acc8-4fbe-bafa-50f679165a99)
   )
   (wire (pts (xy 26.67 125.095) (xy 29.21 125.095))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 337d04ff-9611-494a-9ff6-8613e8153ef7)
   )
   (wire (pts (xy 35.56 131.445) (xy 35.56 132.715))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 36ba9318-8ec5-49f6-9a56-91bb281532e1)
   )
   (wire (pts (xy 27.94 76.835) (xy 27.94 77.47))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 390a2deb-dd82-4a43-8d34-8aa8f2aa1681)
   )
   (wire (pts (xy 88.265 140.335) (xy 86.995 140.335))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 391d46db-304d-4c28-80cf-6eaf2d8797a8)
   )
   (wire (pts (xy 240.03 105.41) (xy 241.3 105.41))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 3be6c0b5-d520-4f88-826e-b60907e542b6)
   )
   (wire (pts (xy 35.56 149.86) (xy 35.56 151.13))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 3c526efa-6be6-4ca0-a42e-c1e29230ee42)
   )
   (wire (pts (xy 222.885 124.46) (xy 220.345 124.46))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 3ca9d6be-2bdd-454e-abc4-750d40012096)
   )
   (wire (pts (xy 60.325 33.655) (xy 70.485 33.655))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 3d884453-9654-4117-8c8b-a16b71a905dc)
   )
   (wire (pts (xy 164.465 44.45) (xy 165.735 44.45))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 3dc8d9da-6ba8-4d4a-8b6a-59c5fe0a08ba)
   )
   (wire (pts (xy 219.71 24.13) (xy 212.725 24.13))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 3e5ccf94-ce8c-4f63-ac33-afe9427cf37d)
   )
   (wire (pts (xy 65.405 86.36) (xy 64.135 86.36))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 3ead846c-f429-46d3-9064-3a23995362a8)
   )
   (wire (pts (xy 50.165 24.765) (xy 52.705 24.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 3ef09023-9351-4d1b-938f-89c4850dff93)
   )
   (wire (pts (xy 206.375 90.17) (xy 207.645 90.17))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 3fceab2e-8476-40cf-b52c-54c3b09e33f5)
   )
   (wire (pts (xy 64.135 131.445) (xy 64.135 132.715))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 418b711d-52a2-4b0c-8d80-8628c25f8a1e)
   )
   (wire (pts (xy 45.085 88.265) (xy 45.085 90.805))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 4192b171-6552-4f65-b89b-28512cb973d2)
   )
   (wire (pts (xy 137.16 45.72) (xy 137.16 46.355))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 41ba74a1-5360-4d58-85f1-860bb5a77053)
   )
   (wire (pts (xy 64.135 113.03) (xy 64.135 114.3))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 41efdb02-fe34-4850-ad89-0c9cc2924464)
   )
   (wire (pts (xy 64.135 83.82) (xy 65.405 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 42dd3600-27df-4809-92a2-8c1b55e59759)
   )
   (wire (pts (xy 30.48 34.925) (xy 31.75 34.925))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 44f8ea39-e982-4e42-8e2f-cb14d45fbdc7)
   )
   (wire (pts (xy 35.56 187.325) (xy 35.56 186.69))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 452beeda-56e6-4b93-818a-c6c373b3c46a)
   )
   (wire (pts (xy 85.09 34.29) (xy 85.09 33.02))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 45535240-17b2-4531-95e0-849431087235)
   )
   (wire (pts (xy 50.165 180.34) (xy 51.435 180.34))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 46201563-2b66-4f1c-9755-a2c66502f7c5)
   )
   (wire (pts (xy 99.695 139.065) (xy 99.695 140.335))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 46bc22f5-81d4-4eba-a6f5-94e1ce7936d4)
   )
   (wire (pts (xy 35.56 143.51) (xy 36.83 143.51))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 473c07b8-9010-4ddd-98bc-f1fc33d3553c)
   )
   (wire (pts (xy 70.485 24.765) (xy 70.485 26.035))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 4770858a-4110-4d30-943c-3e16420fea33)
   )
   (wire (pts (xy 144.145 99.06) (xy 159.385 99.06))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 47e41fbc-b26f-4826-80ae-89d415cf8fa8)
   )
   (wire (pts (xy 35.56 180.34) (xy 35.56 181.61))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 492c05ec-9dae-40d4-b09c-021bdc8c0d6f)
   )
   (wire (pts (xy 86.995 107.315) (xy 85.725 107.315))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 4b79c396-726d-47e5-ac89-c689dfa80357)
   )
   (wire (pts (xy 22.86 40.005) (xy 22.86 41.275))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 4c57f90b-d23f-4063-b5df-3678aedd4149)
   )
   (wire (pts (xy 48.895 24.765) (xy 50.165 24.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 4e825871-7ae8-4943-a004-0e5cd3635a1f)
   )
   (wire (pts (xy 95.885 162.56) (xy 100.33 162.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 50385451-c8ab-433c-96d7-a522e14ca2cd)
   )
   (wire (pts (xy 143.51 34.29) (xy 143.51 34.925))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 50e60928-bcef-4125-8419-aca8993baab1)
   )
   (wire (pts (xy 135.255 107.315) (xy 136.525 107.315))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 51d675be-6262-4e1c-a4b5-ac31c5e640fc)
   )
   (wire (pts (xy 27.94 109.22) (xy 26.67 109.22))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 51dd4a4c-4473-4516-9b6e-1848bdcf028f)
   )
   (wire (pts (xy 24.765 53.975) (xy 26.035 53.975))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 52796064-5773-4861-b780-3aa841d35fe8)
   )
   (wire (pts (xy 24.765 51.435) (xy 26.035 51.435))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 52e0cdc5-336d-4d3b-9a3b-f6929f0e4a11)
   )
   (wire (pts (xy 125.73 40.005) (xy 127 40.005))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 53b377d8-988c-4948-a51c-1f6e86e871f8)
   )
   (wire (pts (xy 35.56 170.18) (xy 37.465 170.18))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 53e899c8-a6ba-4491-868d-e1d29f09fb3c)
   )
   (wire (pts (xy 64.135 143.51) (xy 65.405 143.51))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 54d7eb13-830b-46cb-b5a2-8c1154e99919)
   )
   (wire (pts (xy 41.275 82.55) (xy 41.275 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 55b23cbf-d6e3-43e0-9024-6b1e78e3e7eb)
   )
   (wire (pts (xy 24.765 56.515) (xy 26.035 56.515))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 571b94f7-c0d6-401a-82fc-6e02088e37b3)
   )
   (wire (pts (xy 64.135 143.51) (xy 64.135 144.78))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 5750b0de-c1cf-475c-bbce-10a0b194a478)
   )
   (wire (pts (xy 64.135 125.095) (xy 65.405 125.095))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 577edfab-a079-4c0a-b0ff-6234c418dff2)
   )
   (wire (pts (xy 62.865 125.095) (xy 64.135 125.095))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 586a5b9b-d927-4c7c-b2a3-cbf42c0bf7f3)
   )
   (wire (pts (xy 56.515 127.635) (xy 55.245 127.635))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 58e4ae1d-1be2-41df-a04d-77f670794a04)
   )
   (wire (pts (xy 78.74 82.55) (xy 78.74 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 5a4c159c-b118-415a-989b-87fcd60df9c0)
   )
   (wire (pts (xy 220.345 123.19) (xy 220.345 124.46))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 5ae57af6-e538-46d4-8152-bf201c02b1f3)
   )
   (wire (pts (xy 162.56 145.415) (xy 162.56 146.685))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 5b6a8682-dade-413c-b319-d38f65513a78)
   )
   (wire (pts (xy 95.25 24.765) (xy 98.425 24.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 5c038e8c-304d-45bd-b4c6-5d39a553fce5)
   )
   (wire (pts (xy 219.075 47.625) (xy 219.075 48.895))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 5c26b5c4-9073-4a66-9942-fc790e58d8f1)
   )
   (wire (pts (xy 64.135 149.86) (xy 64.135 151.13))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 5c8fa4ac-7abc-4d73-a97c-4d3c46915f76)
   )
   (wire (pts (xy 35.56 106.68) (xy 36.83 106.68))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 5d1e1a5f-3c57-42dd-bde9-c81ae2441190)
   )
   (wire (pts (xy 55.245 106.68) (xy 57.785 106.68))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 5dc83004-ff4a-4ff0-b0e5-55d1e0a460f2)
   )
   (wire (pts (xy 220.345 124.46) (xy 220.345 125.73))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 5ea1bab6-088d-47e8-9f23-cfe2c7dd9ab0)
   )
   (wire (pts (xy 67.945 24.765) (xy 70.485 24.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 5f94c688-5598-4f4e-928b-38ee2aaf3137)
   )
   (wire (pts (xy 70.485 33.655) (xy 70.485 31.115))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 60349bb6-d2e0-4c3c-8e88-cfb2f5782a9c)
   )
   (wire (pts (xy 206.375 87.63) (xy 207.645 87.63))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 60c3aedd-1d62-4e80-aa04-323b3e332939)
   )
   (wire (pts (xy 161.29 142.875) (xy 162.56 142.875))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 60df6a75-4189-4a8f-84ed-d5e7c1b57845)
   )
   (wire (pts (xy 206.375 95.25) (xy 207.645 95.25))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 61a4d53d-5613-4fd2-81bc-ae6ed358f2c7)
   )
   (wire (pts (xy 31.75 41.275) (xy 31.75 42.545))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 61c001b0-8d1e-457b-abb7-18b62d0098ff)
   )
   (wire (pts (xy 226.695 47.625) (xy 224.155 47.625))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 646503b2-e708-41db-ad47-a61a3e1b430e)
   )
   (wire (pts (xy 164.465 36.83) (xy 165.735 36.83))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 64a06435-5c13-47bc-856f-bdcb862f93e6)
   )
   (wire (pts (xy 55.245 143.51) (xy 57.785 143.51))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 64c42771-05b1-4466-ad11-b61d1edfbf4c)
   )
   (wire (pts (xy 142.875 174.625) (xy 144.145 174.625))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 6522ca2c-b2b8-434f-a4b1-4637aefc53f0)
   )
   (wire (pts (xy 31.75 172.72) (xy 31.75 175.26))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 66180810-a7e8-444b-900f-5f1f0a805983)
   )
   (wire (pts (xy 33.655 90.17) (xy 33.655 90.805))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 67fe45c3-aba1-44c4-a340-39a02cdd485a)
   )
   (wire (pts (xy 64.135 106.68) (xy 65.405 106.68))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 68a9d5a6-ce44-481c-8a38-6a0ab7aea8c6)
   )
   (wire (pts (xy 144.145 71.755) (xy 132.08 71.755))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 68c991b6-a074-4ec5-a19b-bb43e0b3231c)
   )
   (wire (pts (xy 93.98 24.765) (xy 95.25 24.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 6a41b91a-dfbe-43ac-aae9-2f892d097f55)
   )
   (wire (pts (xy 222.885 123.19) (xy 222.885 124.46))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 6a8cd4fd-fa79-41c7-b922-eb6c8822f98c)
   )
   (wire (pts (xy 212.725 23.495) (xy 212.725 24.13))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 6ac484f6-f3a1-41bb-8a03-8c4da4c8d97d)
   )
   (wire (pts (xy 56.515 109.22) (xy 55.245 109.22))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 6b2795d5-10ce-4474-94e5-c5b74bfc8372)
   )
   (wire (pts (xy 34.29 106.68) (xy 35.56 106.68))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 6bb98df9-716c-4eeb-8d00-3a3495eadfc3)
   )
   (wire (pts (xy 153.035 163.195) (xy 151.765 163.195))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 6bbd7d0f-dfac-4027-8b23-de4789556c1e)
   )
   (wire (pts (xy 65.405 82.55) (xy 65.405 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 6bbe0912-ae11-4b19-82a9-6e1830652d5e)
   )
   (wire (pts (xy 27.94 90.805) (xy 27.94 86.36))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 6d941b4a-e8a5-461f-b016-aba781e29410)
   )
   (wire (pts (xy 62.865 143.51) (xy 64.135 143.51))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 6e7f55f8-8ec6-4093-b499-15f6ad510ba6)
   )
   (wire (pts (xy 226.06 30.48) (xy 219.71 30.48))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 6edcc29c-c4bb-4e8f-8f38-052b351959ae)
   )
   (wire (pts (xy 240.03 69.85) (xy 241.3 69.85))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 6f7df446-68fa-486a-a2e4-239bc5865572)
   )
   (wire (pts (xy 137.16 34.29) (xy 143.51 34.29))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 711dd3dc-50aa-4833-930c-981b2bbae5a4)
   )
   (wire (pts (xy 64.135 125.095) (xy 64.135 126.365))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 725f3228-109c-4209-b90c-126dcd76532c)
   )
   (wire (pts (xy 206.375 92.71) (xy 207.645 92.71))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 750872b4-c85e-42d1-a0c8-4e28b27fb0b0)
   )
   (wire (pts (xy 65.405 76.835) (xy 65.405 77.47))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 76095016-d2d4-43d8-804b-246f228291e5)
   )
   (wire (pts (xy 161.29 145.415) (xy 162.56 145.415))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 7633f42b-f97b-4052-b63a-ce40cb525d85)
   )
   (wire (pts (xy 240.03 102.87) (xy 241.3 102.87))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 764297be-c8d9-434c-9266-ef13c08cc1da)
   )
   (wire (pts (xy 64.135 106.68) (xy 64.135 107.95))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 78b130b8-8c32-43b0-a001-65869d6bbf80)
   )
   (wire (pts (xy 167.005 107.315) (xy 169.545 107.315))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 79bbf529-ee18-4d6c-899c-2f40492fb0e1)
   )
   (wire (pts (xy 104.775 107.315) (xy 106.045 107.315))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 7a275359-79dc-435e-8254-b13fd02e7a84)
   )
   (wire (pts (xy 142.875 69.215) (xy 144.145 69.215))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 7ba7679b-79e7-45e3-8d74-d1f0c709bcdf)
   )
   (wire (pts (xy 27.94 146.05) (xy 26.67 146.05))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 7bbafd1a-b41e-420b-9624-6bf180d91e1d)
   )
   (wire (pts (xy 27.94 151.13) (xy 27.94 146.05))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 7bcccb2e-7d36-4d71-a596-8c890d829e94)
   )
   (wire (pts (xy 240.03 107.95) (xy 241.3 107.95))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 7c98eb49-7cc6-43be-9c28-b1f4f5c9b003)
   )
   (wire (pts (xy 224.155 47.625) (xy 224.155 48.895))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 7dbc06df-11b3-4707-8b25-e8c18055faab)
   )
   (wire (pts (xy 31.75 187.325) (xy 33.655 187.325))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 7fa33881-ad3f-4fcb-a62e-590a3ca87f75)
   )
   (wire (pts (xy 240.03 72.39) (xy 241.3 72.39))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 80bd9b29-b680-4326-bbc5-21a2080d9aaf)
   )
   (wire (pts (xy 33.655 187.325) (xy 33.655 187.96))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 817c15cb-4371-4c5a-8c93-2d941d901964)
   )
   (wire (pts (xy 22.86 41.275) (xy 31.75 41.275))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 82445fc5-8b5f-446f-9548-d31a1ec4f30d)
   )
   (wire (pts (xy 65.405 83.82) (xy 71.12 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 84faf49c-b5b6-4b6e-a4ac-1c322eb2f352)
   )
   (wire (pts (xy 26.67 106.68) (xy 29.21 106.68))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 852803e2-c097-40d1-a0d6-7743903059db)
   )
   (wire (pts (xy 144.145 115.57) (xy 151.13 115.57))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 86410d8c-4ba6-4a8c-ac71-d1a20044ca2c)
   )
   (wire (pts (xy 206.375 107.95) (xy 207.645 107.95))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 878dd9f3-237f-4500-8487-03e757350b86)
   )
   (wire (pts (xy 98.425 140.335) (xy 99.695 140.335))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 8826f282-c6b7-4786-9332-f9682f40c731)
   )
   (wire (pts (xy 219.71 29.845) (xy 219.71 30.48))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 89daee5c-bfd1-4945-b368-3d13a0c0fc8d)
   )
   (wire (pts (xy 130.81 34.925) (xy 130.81 34.29))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 8ae05c43-7a06-41ea-85f1-29163a007398)
   )
   (wire (pts (xy 130.81 45.72) (xy 137.16 45.72))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 8b652a5d-25bc-4789-a811-4da2b7eb31c9)
   )
   (wire (pts (xy 98.425 31.75) (xy 101.6 31.75))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 8b69b48d-d196-41e0-8d29-9db2bc072db0)
   )
   (wire (pts (xy 33.655 83.82) (xy 34.925 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 8c5d9f72-3b98-4fd7-8d22-a0fb41e487f7)
   )
   (wire (pts (xy 60.325 32.385) (xy 60.325 33.655))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 8d1998da-36cb-4e02-8790-5a857dba4dc5)
   )
   (wire (pts (xy 144.145 109.855) (xy 144.145 115.57))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 8d785f4f-f616-442b-b774-23060c93bbb7)
   )
   (wire (pts (xy 162.56 140.335) (xy 162.56 142.875))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 8e1a90ab-5a1f-4de8-bb84-5af2defc17a3)
   )
   (wire (pts (xy 30.48 29.845) (xy 31.75 29.845))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 8e668beb-2069-4469-a859-3781727abb05)
   )
   (wire (pts (xy 168.275 115.57) (xy 168.275 109.855))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 8e6b8422-588e-442d-817f-47677a48a413)
   )
   (wire (pts (xy 151.765 169.545) (xy 151.765 168.275))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 8e834334-137e-4cda-a394-042da25e6a61)
   )
   (wire (pts (xy 35.56 106.68) (xy 35.56 107.95))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 8f3f70ea-434b-46d1-aa09-b79903b78f9b)
   )
   (wire (pts (xy 159.385 115.57) (xy 168.275 115.57))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 8f61db54-db59-4631-b5fa-2013669b099c)
   )
   (wire (pts (xy 27.94 83.82) (xy 33.655 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 90f50a2d-7776-41cf-ade0-526134b66151)
   )
   (wire (pts (xy 206.375 57.15) (xy 207.645 57.15))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 912948c7-f05d-4b83-8301-4acd2988ed1f)
   )
   (wire (pts (xy 92.71 33.02) (xy 91.44 33.02))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 932f644a-ffe1-44cf-b45d-feed8ead1ba9)
   )
   (wire (pts (xy 27.94 132.715) (xy 27.94 127.635))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 97807684-8fd4-4b2b-a655-c7a50fac93f3)
   )
   (wire (pts (xy 37.465 172.72) (xy 31.75 172.72))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 97e625f7-d3dd-4892-86f8-bed90d95bcfd)
   )
   (wire (pts (xy 206.375 54.61) (xy 207.645 54.61))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 988b2b0c-b17e-4f5f-9f8e-2ab6c95c6c29)
   )
   (wire (pts (xy 50.165 24.765) (xy 50.165 26.035))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 9a5e085b-54d9-483a-af51-c3c6318a3b95)
   )
   (wire (pts (xy 104.775 113.665) (xy 104.775 114.935))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid 9e914300-de24-4789-8128-2e0dbb334c7a)
   )
   (wire (pts (xy 151.765 179.705) (xy 151.765 180.975))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid a639c123-38e7-4ff6-a822-e1066cae13c7)
   )
   (wire (pts (xy 99.695 140.335) (xy 100.965 140.335))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid a9fd13b3-2af5-4369-9b7b-9b69fffeca87)
   )
   (wire (pts (xy 85.09 33.02) (xy 86.36 33.02))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid aab81cb0-95c3-417b-a4a4-488b3b1ee518)
   )
   (wire (pts (xy 161.29 140.335) (xy 162.56 140.335))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid abea7b4c-52c1-4143-80db-2e865bb322dd)
   )
   (wire (pts (xy 50.165 172.72) (xy 51.435 172.72))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid ad3eb13b-30e3-4fe2-ba13-58b97d21b924)
   )
   (wire (pts (xy 206.375 97.79) (xy 207.645 97.79))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid ae67120d-963d-42d4-8aff-f815cde85357)
   )
   (wire (pts (xy 101.6 24.765) (xy 106.68 24.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid aed270cf-14bf-40ed-bb29-8a474db4982f)
   )
   (wire (pts (xy 240.03 100.33) (xy 241.3 100.33))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid b2931cef-150c-4a23-91a2-efb54bddde78)
   )
   (wire (pts (xy 135.89 174.625) (xy 137.795 174.625))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid b3893c1e-8203-4ccd-9413-08d1b18d323c)
   )
   (wire (pts (xy 135.89 186.055) (xy 135.89 187.325))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid b3a1be80-daa8-46ad-a3a8-022f793e2018)
   )
   (wire (pts (xy 221.615 47.625) (xy 221.615 48.895))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid b49f987c-ce27-4c3b-bd88-51ca11b11ca9)
   )
   (wire (pts (xy 50.165 170.18) (xy 51.435 170.18))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid b8b1baf6-f030-4e10-be94-31de5bac56e5)
   )
   (wire (pts (xy 143.51 45.72) (xy 143.51 45.085))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid b8debde1-fb64-4350-873a-21be1aafc54b)
   )
   (wire (pts (xy 35.56 125.095) (xy 35.56 126.365))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid b94c48a0-6da5-4608-be45-ba95007ad9bd)
   )
   (wire (pts (xy 35.56 125.095) (xy 36.83 125.095))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid bc49e852-8cfd-4c2e-92ea-8d4a23e57200)
   )
   (wire (pts (xy 71.12 90.17) (xy 71.12 90.805))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid bddb7ab8-e9a3-4881-aa44-4d5ab0a9c767)
   )
   (wire (pts (xy 151.13 115.57) (xy 151.13 116.84))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid c021b4f3-f397-41c0-9314-d3b66c378a64)
   )
   (wire (pts (xy 103.505 107.315) (xy 104.775 107.315))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid c11982f4-df1c-4f59-9109-222fd0b6824a)
   )
   (wire (pts (xy 33.655 187.325) (xy 35.56 187.325))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid c1b6f4c6-05f0-4464-8c9b-eb6be801b617)
   )
   (wire (pts (xy 98.425 31.75) (xy 98.425 32.385))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid c244255f-3c30-4831-a5f2-4b8f135bb8ba)
   )
   (wire (pts (xy 142.875 74.295) (xy 144.145 74.295))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid c36a1727-65fb-41d4-9d76-a3a03e4452b2)
   )
   (wire (pts (xy 35.56 143.51) (xy 35.56 144.78))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid c4deaeb4-fa62-4138-a16f-a12e12101ec3)
   )
   (wire (pts (xy 50.165 31.115) (xy 50.165 33.655))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid c5883fec-10fa-4a75-b6ca-8aa159d85a27)
   )
   (wire (pts (xy 162.56 137.795) (xy 162.56 140.335))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid c5b3f382-96e7-48b4-9703-eaca7dc06fbe)
   )
   (wire (pts (xy 219.71 30.48) (xy 212.725 30.48))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid c5b54cbe-8ee8-4e8d-ac2f-0a34c572dee7)
   )
   (wire (pts (xy 35.56 113.03) (xy 35.56 114.3))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid c89e25ad-77cd-4944-9758-56aa3048ce57)
   )
   (wire (pts (xy 130.81 34.29) (xy 137.16 34.29))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid c904cb80-1c86-49d2-b17b-28063b6dda98)
   )
   (wire (pts (xy 135.89 174.625) (xy 135.89 180.975))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid cbb92735-e4e7-4d61-99a2-9dc3cfe88078)
   )
   (wire (pts (xy 31.75 175.26) (xy 31.75 187.325))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid cce412a9-d839-4c04-9aaf-e85c9ad4af12)
   )
   (wire (pts (xy 151.765 163.195) (xy 151.765 160.655))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid cd785017-a984-4d25-885b-c5cdb6e71d4e)
   )
   (wire (pts (xy 144.145 99.06) (xy 144.145 104.775))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid cd9849f2-233a-47d3-83d3-db29f132a18a)
   )
   (wire (pts (xy 232.41 24.765) (xy 232.41 24.13))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid ce27825a-94ce-46eb-94be-512983503342)
   )
   (wire (pts (xy 71.12 83.82) (xy 72.39 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid ce3a9522-661c-4f40-8a2a-58f400e6f873)
   )
   (wire (pts (xy 31.75 175.26) (xy 37.465 175.26))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid ce5e5b31-3295-4a4d-8a27-580883cc43b8)
   )
   (wire (pts (xy 99.695 132.715) (xy 99.695 133.985))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid cefe7853-d988-4b45-9520-7b716df3d034)
   )
   (wire (pts (xy 77.47 83.82) (xy 78.74 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid cfa470f5-4252-4dd8-bc3c-f9bfbb36ecbb)
   )
   (wire (pts (xy 30.48 32.385) (xy 31.75 32.385))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid cfaf893a-a98c-4ce2-a16a-481235d73733)
   )
   (wire (pts (xy 85.725 107.315) (xy 85.725 110.49))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid cff82105-99d4-435d-9f7e-e927f4b01e53)
   )
   (wire (pts (xy 226.695 48.895) (xy 226.695 47.625))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid d1561d71-f60f-4223-9104-41c6e1d757ab)
   )
   (wire (pts (xy 232.41 24.13) (xy 226.06 24.13))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid d1e326ab-4267-4285-acbb-6cc2019043ba)
   )
   (wire (pts (xy 137.16 45.72) (xy 143.51 45.72))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid d207a8f5-362f-4bd8-a017-1074a5a659c6)
   )
   (wire (pts (xy 101.6 31.75) (xy 101.6 31.115))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid d3215203-e807-4b62-ba8b-be6a3b3be8cb)
   )
   (wire (pts (xy 104.775 107.315) (xy 104.775 108.585))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid d3de45f8-89ea-4dca-8827-5ac86cf1e580)
   )
   (wire (pts (xy 226.06 24.13) (xy 226.06 24.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid d4770119-ad29-4dc5-8ef8-44ceb4008ed3)
   )
   (wire (pts (xy 206.375 85.09) (xy 207.645 85.09))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid d4b1b102-7f7a-4540-af0d-546c7dcf4eda)
   )
   (wire (pts (xy 98.425 23.495) (xy 98.425 24.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid d8516b7e-4fce-4634-a3eb-0faa020b586f)
   )
   (wire (pts (xy 150.495 107.315) (xy 151.765 107.315))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid da8dedf6-cad8-4768-b423-cc66fd13b941)
   )
   (wire (pts (xy 147.32 137.795) (xy 148.59 137.795))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid db32f0a6-57c1-4c64-a372-16acd502145d)
   )
   (wire (pts (xy 240.03 95.25) (xy 241.3 95.25))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid dc1e6e9c-4479-49f1-aefb-d1e0816f3740)
   )
   (wire (pts (xy 162.56 142.875) (xy 162.56 145.415))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid dcd3a6e5-11ac-455b-93fd-321c812ce020)
   )
   (wire (pts (xy 92.71 34.29) (xy 92.71 33.02))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid deb5f8e6-48c6-4015-b589-511e140269df)
   )
   (wire (pts (xy 147.32 140.335) (xy 148.59 140.335))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e194529a-e739-4628-8019-455439a8e9ee)
   )
   (wire (pts (xy 26.67 143.51) (xy 29.21 143.51))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e1fa18f9-a947-4548-92fc-b168fe28609d)
   )
   (wire (pts (xy 56.515 146.05) (xy 55.245 146.05))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e28610f8-453f-4ad0-85b7-c74a0ae36af5)
   )
   (wire (pts (xy 232.41 29.845) (xy 232.41 30.48))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e29a1208-da51-43c6-a200-7798edfea2a2)
   )
   (wire (pts (xy 82.55 76.835) (xy 82.55 79.375))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e2f77e0d-5327-4001-9a21-e062841e6b47)
   )
   (wire (pts (xy 100.33 162.56) (xy 101.6 162.56))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e404c0e7-f8b1-416b-a702-9af5d8cf0441)
   )
   (wire (pts (xy 240.03 74.93) (xy 241.3 74.93))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e42774a5-44ca-4538-9b97-e647996a613b)
   )
   (wire (pts (xy 86.995 24.765) (xy 86.995 23.495))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e4707b6a-318b-4193-b6ef-5f2d697e019f)
   )
   (wire (pts (xy 100.33 158.75) (xy 100.33 160.02))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e5be682c-fb58-4282-b144-7eaeb87327ce)
   )
   (wire (pts (xy 137.16 33.655) (xy 137.16 34.29))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e717dee0-f072-48a0-a9e1-6165fe91c5af)
   )
   (wire (pts (xy 132.08 71.755) (xy 132.08 75.565))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e724471e-9acb-45e9-9dea-63ad215b888b)
   )
   (wire (pts (xy 60.325 33.655) (xy 60.325 34.925))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e7f8f386-db75-4f73-9a55-dc29dd429934)
   )
   (wire (pts (xy 78.74 83.82) (xy 80.01 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e841997c-772c-4d09-ab31-ea0dfbac2840)
   )
   (wire (pts (xy 101.6 24.765) (xy 101.6 26.035))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e8ba6d18-9ad8-41da-9932-eaff7b1636ad)
   )
   (wire (pts (xy 20.32 41.275) (xy 22.86 41.275))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid e94b1dd1-9d3b-443c-a122-fd17fa7112b4)
   )
   (wire (pts (xy 50.165 33.655) (xy 60.325 33.655))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid ea8e46d1-1661-4821-a35f-8abc88580e0b)
   )
   (wire (pts (xy 227.965 123.19) (xy 227.965 125.73))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid edb82aa8-20d4-477e-9e21-e03b6a793809)
   )
   (wire (pts (xy 65.405 90.805) (xy 65.405 86.36))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid eeb67424-824d-4910-981f-f2ef9ab45c4e)
   )
   (wire (pts (xy 34.29 125.095) (xy 35.56 125.095))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid efb324db-7345-45e3-83cd-d514cd86dc9a)
   )
   (wire (pts (xy 37.465 180.34) (xy 35.56 180.34))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid f02540ac-d2af-4b01-a6ad-8cd30a2f9d4b)
   )
   (wire (pts (xy 26.035 59.055) (xy 26.035 60.325))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid f03220f0-df17-435a-b87c-f339ce28f64b)
   )
   (wire (pts (xy 164.465 39.37) (xy 165.735 39.37))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid f2156f7a-5753-4fea-a2f2-8a6c23550505)
   )
   (wire (pts (xy 206.375 110.49) (xy 207.645 110.49))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid f24484df-21b0-4f96-b453-b756e4a0ff1a)
   )
   (wire (pts (xy 226.06 29.845) (xy 226.06 30.48))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid f2b327a6-e2f6-40fc-abbd-37af90511c6a)
   )
   (wire (pts (xy 20.32 40.005) (xy 20.32 41.275))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid f38be447-2a47-4f1a-a1fc-827cbca6b4bc)
   )
   (wire (pts (xy 98.425 24.765) (xy 101.6 24.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid f5beec21-639d-45bf-a0ff-78744db85ede)
   )
   (wire (pts (xy 240.03 87.63) (xy 241.3 87.63))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid f725e907-d45c-4a29-b075-09641867df35)
   )
   (wire (pts (xy 164.465 41.91) (xy 165.735 41.91))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid f9299859-ea87-418a-801b-9ea00ed7a718)
   )
   (wire (pts (xy 160.655 74.295) (xy 160.655 75.565))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid fa8cb0e5-ae0e-436e-a49a-380eb64fe11e)
   )
   (wire (pts (xy 229.235 46.355) (xy 229.235 48.895))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid fa92dcd9-a432-4b11-a3d1-9ea6c4f48a5b)
   )
   (wire (pts (xy 133.35 174.625) (xy 135.89 174.625))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid fad5f93e-adee-47ba-abb0-6f8e929599b1)
   )
   (wire (pts (xy 88.9 24.765) (xy 86.995 24.765))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid fad7e750-fdc0-4fb3-b028-126d72abf585)
   )
   (wire (pts (xy 240.03 85.09) (xy 241.3 85.09))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid fb27db09-9fd6-431d-ac9f-0b13bb88a151)
   )
   (wire (pts (xy 27.94 114.3) (xy 27.94 109.22))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid fbabffea-409b-49aa-b129-fd97d6310417)
   )
   (wire (pts (xy 224.155 47.625) (xy 221.615 47.625))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid fcf0d2d2-8794-4661-a9c1-9e90d5951268)
   )
   (wire (pts (xy 27.94 82.55) (xy 27.94 83.82))
-    (stroke (width 0) (type default) (color 0 0 0 0))
+    (stroke (width 0) (type default))
     (uuid fe5bb1ce-19dc-4f31-9f15-ec568e4cf72c)
   )
 
   (global_label "BUZZER" (shape input) (at 206.375 100.33 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 03246f72-a279-4a00-8646-c29dfdd72f4f)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 196.5233 100.2506 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 196.5233 100.2506 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "D+" (shape input) (at 26.035 56.515 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 09f001ba-901b-4c86-834e-75189d97e9e7)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 31.2905 56.4356 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 31.2905 56.4356 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "TH1" (shape input) (at 41.275 82.55 90) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 0a63d10d-b4d1-4f29-a5bd-f52564b12c9d)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 41.1956 76.6293 90)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 41.1956 76.6293 90)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "KILL_SW" (shape input) (at 106.045 107.315 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 0ad7e191-ff52-4633-b10f-542cbfbea3cd)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 116.0176 107.2356 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 116.0176 107.2356 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "SWDIO" (shape input) (at 206.375 113.03 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 0c83d374-2443-487f-9e32-097137434dd4)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 198.0957 112.9506 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 198.0957 112.9506 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "VBUS" (shape input) (at 31.75 24.765 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 0e211a61-37cf-427f-b714-1de5743d7b60)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 39.0617 24.6856 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 39.0617 24.6856 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "NEOPIXEL" (shape input) (at 135.255 107.315 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 0e31b8eb-0018-44c4-ad59-947a44787628)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 123.7705 107.2356 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 123.7705 107.2356 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "GPIO3" (shape input) (at 241.3 105.41 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 10f82a14-a25d-42e1-8fb9-29b7b5b5cb50)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 249.3979 105.3306 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 249.3979 105.3306 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "KEY1" (shape input) (at 36.83 106.68 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 1173cce1-dd67-4bb7-afc8-1e9b3bfd69d8)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 43.9602 106.6006 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 43.9602 106.6006 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "SDA" (shape input) (at 164.465 36.83 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 160fac1f-9e68-4921-b6fe-07405f6e896f)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 158.4838 36.7506 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 158.4838 36.7506 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "D+" (shape input) (at 31.75 29.845 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 1cc6b99e-efe8-451e-b2f2-d302b4434d23)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 37.0055 29.7656 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 37.0055 29.7656 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "PIN1" (shape input) (at 164.465 44.45 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 25cdb8ec-cd8c-4152-872a-f89bebeb6a72)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 157.6371 44.3706 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 157.6371 44.3706 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "ENC_SW" (shape input) (at 160.655 69.215 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 2775a622-b789-4122-8339-e0bb84bdabc7)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 170.4462 69.1356 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 170.4462 69.1356 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "KEY3" (shape input) (at 36.83 125.095 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 2c06e596-e1a9-4db5-a1c9-a72eb761061d)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 43.9602 125.0156 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 43.9602 125.0156 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "ENC_SW" (shape input) (at 241.3 69.85 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 2cbf31b9-26a1-4351-b2e8-477da761811a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 251.0912 69.7706 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 251.0912 69.7706 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "SCL" (shape input) (at 164.465 39.37 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 2eca2dbe-d828-4c03-89dc-aa502a472e4b)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 158.5443 39.2906 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 158.5443 39.2906 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "KEY4" (shape input) (at 206.375 92.71 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 2f1e690f-0622-4825-9c8f-d7966bfca886)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 199.2448 92.6306 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 199.2448 92.6306 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "GPIO4" (shape input) (at 241.3 107.95 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 3f14c43d-6c9f-4e0e-9305-a7c2761122a3)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 249.3979 107.8706 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 249.3979 107.8706 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "PIN2" (shape input) (at 164.465 41.91 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 4274100b-f066-450c-bc47-cac337fcdf7a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 157.6371 41.8306 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 157.6371 41.8306 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "GPIO1" (shape input) (at 241.3 100.33 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 4562bb85-a030-4747-a151-f0a3062624bc)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 249.3979 100.2506 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 249.3979 100.2506 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "D+" (shape input) (at 206.375 110.49 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 49c58756-8bc1-4d0a-ac7d-288699275a24)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 201.1195 110.4106 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 201.1195 110.4106 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "GPIO4" (shape input) (at 147.32 145.415 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 4cbad385-0543-444b-b015-014f7fc7c6f9)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 139.2221 145.3356 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 139.2221 145.3356 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "KEY2" (shape input) (at 65.405 106.68 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 54c2e8d2-857a-4786-85f3-ee909b99135f)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 72.5352 106.6006 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 72.5352 106.6006 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "SWCLK" (shape input) (at 206.375 115.57 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 579089a8-f938-41ae-b8bd-64670789564c)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 197.7329 115.4906 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 197.7329 115.4906 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "D-" (shape input) (at 206.375 107.95 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 60d2ae27-2164-45e8-bc34-e309881784ae)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 201.1195 107.8706 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 201.1195 107.8706 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "ENC_A" (shape input) (at 142.875 69.215 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 62219fba-8f96-4d6c-baec-8b78086f73fa)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 134.6562 69.1356 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 134.6562 69.1356 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "KILL_SW" (shape input) (at 241.3 97.79 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 6399a606-7d14-43d6-b37a-2699449ef90f)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 251.2726 97.7106 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 251.2726 97.7106 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "RESET" (shape input) (at 206.375 57.15 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 69348b01-3464-43ac-aeac-ab77cdbae1d8)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 198.2167 57.2294 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 198.2167 57.2294 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "SCL" (shape input) (at 241.3 85.09 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 711b5c72-45c0-40a4-a59f-9fc2bca8f8a7)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 247.2207 85.0106 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 247.2207 85.0106 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "ENC_B" (shape input) (at 241.3 74.93 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 74bff451-f358-4dc7-9785-4b85aee3df58)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 249.7002 74.8506 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 249.7002 74.8506 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "KEY2" (shape input) (at 206.375 87.63 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 777af99f-0091-492f-bdf1-2a7ea3a45714)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 199.2448 87.5506 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 199.2448 87.5506 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "KEY1" (shape input) (at 206.375 85.09 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 7aa3203f-b15d-42e2-ae46-f0b1bcf2672e)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 199.2448 85.0106 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 199.2448 85.0106 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "TH2" (shape input) (at 206.375 82.55 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 7b93c2fe-1d26-4329-bdf7-b881a6bca1e6)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 200.4543 82.4706 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 200.4543 82.4706 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "BUZZER" (shape input) (at 133.35 174.625 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 9b0bea3a-58ff-4326-ba7f-193fe09b8bf1)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 123.4983 174.5456 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 123.4983 174.5456 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "KEY3" (shape input) (at 206.375 90.17 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid a4a85d1a-5223-4779-8eeb-608b3d6d96fb)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 199.2448 90.0906 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 199.2448 90.0906 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "TH2" (shape input) (at 78.74 82.55 90) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid a7527c3b-4b9d-4a94-9029-7dd1795916e6)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 78.6606 76.6293 90)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 78.6606 76.6293 90)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "KEY5" (shape input) (at 36.83 143.51 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid aa54f449-db1b-49e8-af82-3c7e303e49d5)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 43.9602 143.4306 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 43.9602 143.4306 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "ENC_A" (shape input) (at 241.3 72.39 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid aaf86ba1-5105-47e0-8ee8-425fc87ded2a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 249.5188 72.3106 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 249.5188 72.3106 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "KEY6" (shape input) (at 206.375 97.79 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid ac047f74-8b35-4c3a-96ec-4534fc2afb4d)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 199.2448 97.7106 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 199.2448 97.7106 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "ENC_B" (shape input) (at 142.875 74.295 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid ae3b32d6-133f-45ab-a3ab-d6799ac004bc)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 134.4748 74.2156 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 134.4748 74.2156 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "GPIO3" (shape input) (at 147.32 142.875 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid b0c24828-7cc9-4c42-bf3a-4a07eda5f4bf)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 139.2221 142.7956 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 139.2221 142.7956 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "VBUS" (shape input) (at 48.895 24.765 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid b24e4ba2-70c7-4352-9b1c-2a5c392b8fb2)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 41.5833 24.6856 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 41.5833 24.6856 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "VBUS" (shape input) (at 26.035 51.435 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid b322beb1-62dc-4ba1-93dc-f6ce50a4a220)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 33.3467 51.3556 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 33.3467 51.3556 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "D-" (shape input) (at 31.75 32.385 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid ba2a6d06-ed3f-4148-9ce4-1b5b22011ba8)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 37.0055 32.3056 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 37.0055 32.3056 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "KEY4" (shape input) (at 65.405 125.095 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid c3c80354-7f95-40e8-9aea-2948c437d498)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 72.5352 125.0156 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 72.5352 125.0156 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "SDA" (shape input) (at 241.3 87.63 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid c4009817-ad2c-4016-a95a-68e605033a7d)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 247.2812 87.5506 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 247.2812 87.5506 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "RESET" (shape input) (at 51.435 180.34 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid c5114f57-4e0b-4762-bf9f-a454ab17cf62)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 59.5933 180.2606 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 59.5933 180.2606 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "KEY5" (shape input) (at 206.375 95.25 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid c7b6805e-049d-4a08-9093-a32dea23b4f4)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 199.2448 95.1706 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 199.2448 95.1706 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "BOOT0" (shape input) (at 95.885 162.56 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid c7ba112a-1c34-43d2-9d28-ae56e80646a5)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 87.3638 162.4806 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 87.3638 162.4806 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "TH1" (shape input) (at 206.375 80.01 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid d0b55f6d-b23e-4c7a-b8ff-1e71f3390c54)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 200.4543 80.0894 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 200.4543 80.0894 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "GPIO1" (shape input) (at 147.32 137.795 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid d4a3442c-b854-467f-9cb6-993df60c4799)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 139.2221 137.7156 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 139.2221 137.7156 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "D-" (shape input) (at 26.035 53.975 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid d68d1a79-b35b-45fe-9b91-cdd4026346f2)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 31.2905 53.8956 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 31.2905 53.8956 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "VBUS" (shape input) (at 135.255 99.06 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid d69faecf-9608-4ee3-b84a-978650ca5e60)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 127.9433 98.9806 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 127.9433 98.9806 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "SWDIO" (shape input) (at 51.435 170.18 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid d6f968b2-66fd-4e54-bb48-c5d81ad4c1c6)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 59.7143 170.1006 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 59.7143 170.1006 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "SWCLK" (shape input) (at 51.435 172.72 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid dc3e8106-fdfe-45a4-94c3-c37c2d462843)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 60.0771 172.6406 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 60.0771 172.6406 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "KEY6" (shape input) (at 65.405 143.51 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid de4464b0-b58d-45c8-b320-871b97d1e129)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 72.5352 143.4306 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 72.5352 143.4306 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "NEOPIXEL" (shape input) (at 241.3 95.25 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid e3bcb09a-9956-409f-909b-c4d5779c72a5)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 252.7845 95.1706 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 252.7845 95.1706 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "PIN1" (shape input) (at 148.59 40.005 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid e3cfc9af-9a96-4d16-857b-940fbd955142)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 155.4179 39.9256 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 155.4179 39.9256 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "RESET" (shape input) (at 100.965 140.335 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid e41a7a12-e7c0-4b4b-941c-ff26a999fcd5)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 109.1233 140.2556 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 109.1233 140.2556 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
   (global_label "PIN2" (shape input) (at 125.73 40.005 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid e44466bf-2dbb-427a-ba17-24173beb608c)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 118.9021 39.9256 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 118.9021 39.9256 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "BOOT0" (shape input) (at 206.375 54.61 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid e6b953d1-642c-4c4d-9059-df4368b25d30)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 197.8538 54.5306 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 197.8538 54.5306 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "GPIO2" (shape input) (at 147.32 140.335 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid f0c6db86-adac-4d0c-b9f3-1795846050bf)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 139.2221 140.2556 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 139.2221 140.2556 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
   )
   (global_label "GPIO2" (shape input) (at 241.3 102.87 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid f48fe98e-4e34-400f-b58c-d496d23b9b93)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 249.3979 102.7906 0)
+    (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 249.3979 102.7906 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
   )
 
   (symbol (lib_id "power:GND") (at 26.035 60.325 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 0012680c-df0a-43a1-b282-4d19764431c9)
-    (property "Reference" "#PWR01" (id 0) (at 26.035 66.675 0)
+    (property "Reference" "#PWR01" (at 26.035 66.675 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 26.035 64.135 0))
-    (property "Footprint" "" (id 2) (at 26.035 60.325 0)
+    (property "Value" "GND" (at 26.035 64.135 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 26.035 60.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 26.035 60.325 0)
+    (property "Datasheet" "" (at 26.035 60.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e5ed0667-a82d-4a8d-925b-35f4753e7c3b))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR01") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 101.6 28.575 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 0182be02-3c04-4b29-8d23-d639ca1cffef)
-    (property "Reference" "C12" (id 0) (at 102.1673 27.0466 0)
+    (property "Reference" "C12" (at 102.1673 27.0466 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10n" (id 1) (at 102.235 30.48 0)
+    (property "Value" "10n" (at 102.235 30.48 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 101.6 28.575 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 101.6 28.575 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 101.6 28.575 0)
+    (property "Datasheet" "~" (at 101.6 28.575 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 10097f75-33e3-4eec-8e6e-01ad2d5e9096))
     (pin "2" (uuid ee6aa49c-40ca-4242-8cf9-e9c6b0720d7a))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C12") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 220.345 125.73 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 018a983b-efc0-4ff5-a291-397509fd4164)
-    (property "Reference" "#PWR050" (id 0) (at 220.345 132.08 0)
+    (property "Reference" "#PWR050" (at 220.345 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 220.345 129.54 0))
-    (property "Footprint" "" (id 2) (at 220.345 125.73 0)
+    (property "Value" "GND" (at 220.345 129.54 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 220.345 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 220.345 125.73 0)
+    (property "Datasheet" "" (at 220.345 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ac983282-b348-48bd-a292-3bdd02be9344))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR050") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 50.165 127.635 180) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 01b11df2-b039-4c5d-bda9-af5a93868787)
-    (property "Reference" "J9" (id 0) (at 50.165 122.555 0))
-    (property "Value" "PH2.54_02" (id 1) (at 47.625 126.365 90))
-    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (id 2) (at 50.165 127.635 0)
+    (property "Reference" "J9" (at 50.165 122.555 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "PH2.54_02" (at 47.625 126.365 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (at 50.165 127.635 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 50.165 127.635 0)
+    (property "Datasheet" "~" (at 50.165 127.635 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 000727d4-4802-4ae8-a96a-5273dd24659f))
     (pin "2" (uuid acd39ee3-ed27-4aca-9417-2bfc3a9bdbd9))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J9") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "my_additions:STM32F072C8Tx") (at 224.155 87.63 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 02ad564b-979f-4a86-b276-d8e620bb1976)
-    (property "Reference" "U3" (id 0) (at 210.185 50.165 0)
+    (property "Reference" "U3" (at 210.185 50.165 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "STM32F072C8Tx" (id 1) (at 216.535 87.63 0)
+    (property "Value" "STM32F072C8Tx" (at 216.535 87.63 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Package_QFP:LQFP-48_7x7mm_P0.5mm" (id 2) (at 217.17 121.92 0)
+    (property "Footprint" "Package_QFP:LQFP-48_7x7mm_P0.5mm" (at 217.17 121.92 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
-    (property "Datasheet" "" (id 3) (at 269.875 153.67 0)
+    (property "Datasheet" "" (at 269.875 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 02973785-93e0-4b6d-9cb9-a44cc854e3ab))
@@ -3802,497 +3838,767 @@
     (pin "7" (uuid 6c26dd88-3500-4a59-9258-a4ee819e9503))
     (pin "8" (uuid 30d3d8b7-18c6-4b08-9040-7082cc7fbc79))
     (pin "9" (uuid 97f3f77e-bf21-4bf6-9696-9296da81793e))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "U3") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "V0-Display:SolderJumper_3") (at 130.81 40.005 270) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 02cf0e5d-3b8a-44f3-b588-08edbf2d8bed)
-    (property "Reference" "JP1" (id 0) (at 132.461 39.1703 90)
+    (property "Reference" "JP1" (at 132.461 39.1703 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "Pin2" (id 1) (at 132.461 41.7072 90)
+    (property "Value" "Pin2" (at 132.461 41.7072 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "V0-Display:SolderJumper-3_P1.3mm_Pad1.0x1.5mm" (id 2) (at 130.81 40.005 0)
+    (property "Footprint" "V0-Display:SolderJumper-3_P1.3mm_Pad1.0x1.5mm" (at 130.81 40.005 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 130.81 40.005 0)
+    (property "Datasheet" "~" (at 130.81 40.005 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d3ba3b8b-ad41-4d51-b527-4518f22ca9e7))
     (pin "2" (uuid 9b38bff3-1e2d-4b52-b46e-c73561431a62))
     (pin "3" (uuid 414f0d1c-e181-4bec-9100-5e2483c432d4))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "JP1") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GNDA") (at 45.085 90.805 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 0300a7f0-b2c7-4e6f-b482-28eb7bfab058)
-    (property "Reference" "#PWR015" (id 0) (at 45.085 97.155 0)
+    (property "Reference" "#PWR015" (at 45.085 97.155 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 45.085 94.615 0))
-    (property "Footprint" "" (id 2) (at 45.085 90.805 0)
+    (property "Value" "GNDA" (at 45.085 94.615 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 45.085 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 45.085 90.805 0)
+    (property "Datasheet" "" (at 45.085 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 10ad6296-85ab-48ad-950c-392215188d92))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR015") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3V") (at 99.695 132.715 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 04e8ace2-f286-448e-a5c0-ab970ab8d169)
-    (property "Reference" "#PWR036" (id 0) (at 99.695 136.525 0)
+    (property "Reference" "#PWR036" (at 99.695 136.525 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 99.695 129.1392 0))
-    (property "Footprint" "" (id 2) (at 99.695 132.715 0)
+    (property "Value" "+3.3V" (at 99.695 129.1392 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 99.695 132.715 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 99.695 132.715 0)
+    (property "Datasheet" "" (at 99.695 132.715 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f56d0f10-62e9-4007-a9cf-995b762eb791))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR036") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3VA") (at 82.55 76.835 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 04e9504e-0a4d-441b-a6a8-6fe978c99d47)
-    (property "Reference" "#PWR027" (id 0) (at 82.55 80.645 0)
+    (property "Reference" "#PWR027" (at 82.55 80.645 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3VA" (id 1) (at 82.55 73.2592 0))
-    (property "Footprint" "" (id 2) (at 82.55 76.835 0)
+    (property "Value" "+3.3VA" (at 82.55 73.2592 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 82.55 76.835 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 82.55 76.835 0)
+    (property "Datasheet" "" (at 82.55 76.835 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 61487ae9-ad2f-40f0-8dcf-a9ef8dac37db))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR027") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 64.135 114.3 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 05d0381b-d416-4708-bdb9-b1a947e130ed)
-    (property "Reference" "#PWR020" (id 0) (at 64.135 120.65 0)
+    (property "Reference" "#PWR020" (at 64.135 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 64.135 118.11 0))
-    (property "Footprint" "" (id 2) (at 64.135 114.3 0)
+    (property "Value" "GND" (at 64.135 118.11 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 64.135 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 64.135 114.3 0)
+    (property "Datasheet" "" (at 64.135 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2355fdb7-d07e-402f-84ad-00c8720d015c))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR020") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 60.325 34.925 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 0accd64e-36df-44c8-88a9-2d287e4200af)
-    (property "Reference" "#PWR019" (id 0) (at 60.325 41.275 0)
+    (property "Reference" "#PWR019" (at 60.325 41.275 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 60.325 38.735 0))
-    (property "Footprint" "" (id 2) (at 60.325 34.925 0)
+    (property "Value" "GND" (at 60.325 38.735 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 60.325 34.925 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 60.325 34.925 0)
+    (property "Datasheet" "" (at 60.325 34.925 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a020132f-645d-4b18-b915-5cc015531f99))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR019") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GNDA") (at 98.425 32.385 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 1124b591-f5e1-4d56-aa77-3cc3658b0f82)
-    (property "Reference" "#PWR035" (id 0) (at 98.425 38.735 0)
+    (property "Reference" "#PWR035" (at 98.425 38.735 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 98.425 36.195 0))
-    (property "Footprint" "" (id 2) (at 98.425 32.385 0)
+    (property "Value" "GNDA" (at 98.425 36.195 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 98.425 32.385 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 98.425 32.385 0)
+    (property "Datasheet" "" (at 98.425 32.385 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d47142b9-ca40-4e29-b16d-63ec9f5592a7))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR035") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 60.325 106.68 90) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 12cdaa58-9bee-42f2-86e7-35780a953e99)
-    (property "Reference" "R7" (id 0) (at 59.69 102.87 90))
-    (property "Value" "1k" (id 1) (at 60.325 104.775 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 60.325 106.68 0)
+    (property "Reference" "R7" (at 59.69 102.87 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "1k" (at 60.325 104.775 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 60.325 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 60.325 106.68 0)
+    (property "Datasheet" "~" (at 60.325 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5f4a8431-f612-460e-bc95-c79663b63b95))
     (pin "2" (uuid e599d6f2-f3a1-4143-82fa-c476f4c1e210))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R7") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 70.485 28.575 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 13434b00-2a4f-4bb9-9455-d8c802f1239c)
-    (property "Reference" "C9" (id 0) (at 71.0417 27.0039 0)
+    (property "Reference" "C9" (at 71.0417 27.0039 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "4u7" (id 1) (at 71.12 30.48 0)
+    (property "Value" "4u7" (at 71.12 30.48 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 70.485 28.575 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 70.485 28.575 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 70.485 28.575 0)
+    (property "Datasheet" "~" (at 70.485 28.575 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 03e5cfad-5c29-4866-8a32-76f76ea76f55))
     (pin "2" (uuid b3a8feb2-7204-4ece-97f2-80294f099e06))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C9") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 60.325 143.51 90) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 13a2de41-44f2-40c7-9a2c-e9123f1d1d63)
-    (property "Reference" "R9" (id 0) (at 59.69 139.7 90))
-    (property "Value" "1k" (id 1) (at 60.325 141.605 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 60.325 143.51 0)
+    (property "Reference" "R9" (at 59.69 139.7 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "1k" (at 60.325 141.605 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 60.325 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 60.325 143.51 0)
+    (property "Datasheet" "~" (at 60.325 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9b263433-fd16-4f69-a7cb-62da63ee9849))
     (pin "2" (uuid 7aaf9fac-701b-46ba-b0c1-fd4c18195678))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R9") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GNDA") (at 227.965 125.73 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 14ee3afb-a53e-42d9-9a50-e102d97b860b)
-    (property "Reference" "#PWR051" (id 0) (at 227.965 132.08 0)
+    (property "Reference" "#PWR051" (at 227.965 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 227.965 129.54 0))
-    (property "Footprint" "" (id 2) (at 227.965 125.73 0)
+    (property "Value" "GNDA" (at 227.965 129.54 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 227.965 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 227.965 125.73 0)
+    (property "Datasheet" "" (at 227.965 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9cc87128-2792-4c87-a321-fc38a9b81919))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR051") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 95.25 28.575 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 16c99d6e-8612-450a-8042-d10277374099)
-    (property "Reference" "C11" (id 0) (at 95.8173 27.0466 0)
+    (property "Reference" "C11" (at 95.8173 27.0466 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100n" (id 1) (at 95.885 30.48 0)
+    (property "Value" "100n" (at 95.885 30.48 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 95.25 28.575 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 95.25 28.575 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 95.25 28.575 0)
+    (property "Datasheet" "~" (at 95.25 28.575 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 81ef9477-2be4-4308-a543-cc03e551ea33))
     (pin "2" (uuid caa55003-7f36-497e-9455-8384b686460f))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C11") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3VA") (at 65.405 76.835 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 1b0fcda0-1cb0-4bf0-b757-f9503aa02789)
-    (property "Reference" "#PWR023" (id 0) (at 65.405 80.645 0)
+    (property "Reference" "#PWR023" (at 65.405 80.645 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3VA" (id 1) (at 65.405 73.2592 0))
-    (property "Footprint" "" (id 2) (at 65.405 76.835 0)
+    (property "Value" "+3.3VA" (at 65.405 73.2592 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 65.405 76.835 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 65.405 76.835 0)
+    (property "Datasheet" "" (at 65.405 76.835 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 02695604-12b1-4c78-9ca2-36b69a9ad4a6))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR023") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GNDA") (at 92.71 34.29 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 1b40b74c-cf2f-425e-9249-12baa74687fe)
-    (property "Reference" "#PWR033" (id 0) (at 92.71 40.64 0)
+    (property "Reference" "#PWR033" (at 92.71 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 92.71 38.1 0))
-    (property "Footprint" "" (id 2) (at 92.71 34.29 0)
+    (property "Value" "GNDA" (at 92.71 38.1 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 92.71 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 92.71 34.29 0)
+    (property "Datasheet" "" (at 92.71 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9a43cbbe-ab1f-4af4-9fa7-5e7cd53313b8))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR033") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 64.135 132.715 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 1f66c137-d377-42c8-a789-6948927d7567)
-    (property "Reference" "#PWR021" (id 0) (at 64.135 139.065 0)
+    (property "Reference" "#PWR021" (at 64.135 139.065 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 64.135 136.525 0))
-    (property "Footprint" "" (id 2) (at 64.135 132.715 0)
+    (property "Value" "GND" (at 64.135 136.525 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 64.135 132.715 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 64.135 132.715 0)
+    (property "Datasheet" "" (at 64.135 132.715 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2e272e82-3710-4a17-876a-3a25ce6d6048))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR021") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3V") (at 86.995 23.495 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 21e7ce63-9b97-4a46-bf1a-386a3a6b6a4e)
-    (property "Reference" "#PWR030" (id 0) (at 86.995 27.305 0)
+    (property "Reference" "#PWR030" (at 86.995 27.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 86.995 19.9192 0))
-    (property "Footprint" "" (id 2) (at 86.995 23.495 0)
+    (property "Value" "+3.3V" (at 86.995 19.9192 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 86.995 23.495 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 86.995 23.495 0)
+    (property "Datasheet" "" (at 86.995 23.495 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4e060fbb-66de-4561-9a09-0f0c617cf68b))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR030") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 99.695 136.525 180) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 2203af60-7987-405b-aae5-f77eb2351ca4)
-    (property "Reference" "R13" (id 0) (at 97.79 137.16 90))
-    (property "Value" "10k" (id 1) (at 101.6 136.525 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 99.695 136.525 0)
+    (property "Reference" "R13" (at 97.79 137.16 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "10k" (at 101.6 136.525 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 99.695 136.525 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 99.695 136.525 0)
+    (property "Datasheet" "~" (at 99.695 136.525 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid fce96481-6d6f-4e53-b2c0-66356bbaade5))
     (pin "2" (uuid 07fd0b10-5f17-424c-bef7-6a4a64411b19))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R13") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 64.135 147.32 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 2634f930-c051-4253-98ff-1060e13d43a6)
-    (property "Reference" "C8" (id 0) (at 61.595 148.59 90)
+    (property "Reference" "C8" (at 61.595 148.59 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100n" (id 1) (at 66.04 147.32 0)
+    (property "Value" "100n" (at 66.04 147.32 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 64.135 147.32 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 64.135 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 64.135 147.32 0)
+    (property "Datasheet" "~" (at 64.135 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e356c7f7-503b-4439-891e-082ca6ca3309))
     (pin "2" (uuid 2afe060d-b9ff-45f9-9da3-236621981e75))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C8") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3V") (at 100.33 158.75 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 28f1c391-4443-417a-8e35-a8c09c48effc)
-    (property "Reference" "#PWR037" (id 0) (at 100.33 162.56 0)
+    (property "Reference" "#PWR037" (at 100.33 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 100.33 155.1742 0))
-    (property "Footprint" "" (id 2) (at 100.33 158.75 0)
+    (property "Value" "+3.3V" (at 100.33 155.1742 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 100.33 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 100.33 158.75 0)
+    (property "Datasheet" "" (at 100.33 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0d807d08-e75b-49f3-8d03-f662bcf92314))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR037") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:FerriteBead_Small") (at 91.44 24.765 90) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 2a1f8fb7-cee1-4cd8-abc3-39dd0b5cfc50)
-    (property "Reference" "FB1" (id 0) (at 86.995 26.035 90))
-    (property "Value" "100@100MHz" (id 1) (at 86.995 27.94 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 91.44 26.543 90)
+    (property "Reference" "FB1" (at 86.995 26.035 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "100@100MHz" (at 86.995 27.94 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 91.44 26.543 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 91.44 24.765 0)
+    (property "Datasheet" "~" (at 91.44 24.765 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8a290113-e8c9-4019-881b-b36e0e9b845d))
     (pin "2" (uuid 2845ec08-12de-4275-9df0-f5cc6c100d0f))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "FB1") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 71.12 87.63 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 2be227d8-80ea-4637-8578-3495c1af24c8)
-    (property "Reference" "C10" (id 0) (at 68.58 88.9 90)
+    (property "Reference" "C10" (at 68.58 88.9 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10u" (id 1) (at 73.025 87.63 0)
+    (property "Value" "10u" (at 73.025 87.63 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 71.12 87.63 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 71.12 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 71.12 87.63 0)
+    (property "Datasheet" "~" (at 71.12 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1cacc661-6310-48c0-8236-7f5774354a1d))
     (pin "2" (uuid 51e6641d-7aa5-406d-ba66-16fe3975309b))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C10") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3VA") (at 27.94 76.835 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 2c3451a1-b3d4-486d-9601-e6cc6b7b1931)
-    (property "Reference" "#PWR02" (id 0) (at 27.94 80.645 0)
+    (property "Reference" "#PWR02" (at 27.94 80.645 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3VA" (id 1) (at 27.94 73.2592 0))
-    (property "Footprint" "" (id 2) (at 27.94 76.835 0)
+    (property "Value" "+3.3VA" (at 27.94 73.2592 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 27.94 76.835 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 27.94 76.835 0)
+    (property "Datasheet" "" (at 27.94 76.835 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0e716a6c-2bd0-4dd0-8d20-a5bd1c03140a))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR02") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 35.56 151.13 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 2c44cf0a-fc29-4920-bb00-1a8d3b209f88)
-    (property "Reference" "#PWR012" (id 0) (at 35.56 157.48 0)
+    (property "Reference" "#PWR012" (at 35.56 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 35.56 154.94 0))
-    (property "Footprint" "" (id 2) (at 35.56 151.13 0)
+    (property "Value" "GND" (at 35.56 154.94 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 35.56 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 35.56 151.13 0)
+    (property "Datasheet" "" (at 35.56 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b00a3f90-d5da-457d-9bf2-e3d0f9a65b5e))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR012") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3V") (at 219.075 46.355 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 31c038de-1d67-4127-a2ac-6c565136c7eb)
-    (property "Reference" "#PWR049" (id 0) (at 219.075 50.165 0)
+    (property "Reference" "#PWR049" (at 219.075 50.165 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 219.075 42.7792 0))
-    (property "Footprint" "" (id 2) (at 219.075 46.355 0)
+    (property "Value" "+3.3V" (at 219.075 42.7792 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 219.075 46.355 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 219.075 46.355 0)
+    (property "Datasheet" "" (at 219.075 46.355 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c876dd88-9b32-490a-a754-147d4489cb3e))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR049") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 151.13 116.84 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 34f82032-6164-4356-9921-20b9dbecbafc)
-    (property "Reference" "#PWR043" (id 0) (at 151.13 123.19 0)
+    (property "Reference" "#PWR043" (at 151.13 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 151.13 120.65 0))
-    (property "Footprint" "" (id 2) (at 151.13 116.84 0)
+    (property "Value" "GND" (at 151.13 120.65 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 151.13 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 151.13 116.84 0)
+    (property "Datasheet" "" (at 151.13 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4bb5d4f4-e117-41c8-abca-aba712bd208d))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR043") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 64.135 151.13 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 3c80aef9-1180-4ec2-a35a-a3ccd0ff599f)
-    (property "Reference" "#PWR022" (id 0) (at 64.135 157.48 0)
+    (property "Reference" "#PWR022" (at 64.135 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 64.135 154.94 0))
-    (property "Footprint" "" (id 2) (at 64.135 151.13 0)
+    (property "Value" "GND" (at 64.135 154.94 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 64.135 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 64.135 151.13 0)
+    (property "Datasheet" "" (at 64.135 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e62a6807-31f1-4f81-8289-09611d899447))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR022") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x04") (at 19.685 53.975 0) (mirror y) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 3ceb50eb-c7c0-4a1e-91f3-5082c1c00912)
-    (property "Reference" "J1" (id 0) (at 19.685 48.895 0))
-    (property "Value" "PH2.54_04" (id 1) (at 17.145 55.245 90))
-    (property "Footprint" "Connector_JST:JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical" (id 2) (at 19.685 53.975 0)
+    (property "Reference" "J1" (at 19.685 48.895 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "PH2.54_04" (at 17.145 55.245 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Connector_JST:JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical" (at 19.685 53.975 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 19.685 53.975 0)
+    (property "Datasheet" "~" (at 19.685 53.975 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9b510ecb-ca8b-4348-bfc1-371e14aae679))
     (pin "2" (uuid 9b334741-9199-481b-b451-dcbc505cc1cb))
     (pin "3" (uuid 85580af9-77c3-49fe-aaee-b0c42269d88e))
     (pin "4" (uuid 25e8f3a4-0108-4eda-94e6-71edd0aa3556))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J1") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 212.725 27.305 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 3d4d9c10-d0b4-4743-a111-dd16933890cd)
-    (property "Reference" "C14" (id 0) (at 213.2923 25.7766 0)
+    (property "Reference" "C14" (at 213.2923 25.7766 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "4u7" (id 1) (at 213.36 29.21 0)
+    (property "Value" "4u7" (at 213.36 29.21 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 212.725 27.305 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 212.725 27.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 212.725 27.305 0)
+    (property "Datasheet" "~" (at 212.725 27.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 07a297e3-becb-4c4c-970f-c6ae25bfb888))
     (pin "2" (uuid 819d14d8-8d43-4967-a615-6edc5f213ce5))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C14") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3V") (at 151.765 160.655 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 3e2b7895-80cb-45c1-a065-ff11a5e1341f)
-    (property "Reference" "#PWR054" (id 0) (at 151.765 164.465 0)
+    (property "Reference" "#PWR054" (at 151.765 164.465 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 151.765 157.0792 0))
-    (property "Footprint" "" (id 2) (at 151.765 160.655 0)
+    (property "Value" "+3.3V" (at 151.765 157.0792 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 151.765 160.655 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 151.765 160.655 0)
+    (property "Datasheet" "" (at 151.765 160.655 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4e6d44c7-fd27-46ac-96bf-2e6188c433aa))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR054") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_02x07_Odd_Even") (at 42.545 175.26 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 3f5a68a1-4e2c-4487-9035-3bf6e51d839c)
-    (property "Reference" "J7" (id 0) (at 43.815 165.1 0))
-    (property "Value" "ST-Link V3" (id 1) (at 43.815 175.26 90))
-    (property "Footprint" "Connector_PinHeader_1.27mm:PinHeader_2x07_P1.27mm_Vertical_SMD" (id 2) (at 42.545 175.26 0)
+    (property "Reference" "J7" (at 43.815 165.1 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "ST-Link V3" (at 43.815 175.26 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Connector_PinHeader_1.27mm:PinHeader_2x07_P1.27mm_Vertical_SMD" (at 42.545 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 42.545 175.26 0)
+    (property "Datasheet" "~" (at 42.545 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8a889117-f39e-4086-b228-531ee9b0f39a))
@@ -4309,229 +4615,357 @@
     (pin "7" (uuid 3b8b53c9-090e-43aa-8604-6ae7f32124cc))
     (pin "8" (uuid 1bf5e940-126c-41de-bc42-1f503fe8e314))
     (pin "9" (uuid 8d1705e4-2031-4024-8645-1d7a1bdcd37a))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J7") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 35.56 184.15 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 3f93c667-e38c-4973-afe0-6974a70fa51c)
-    (property "Reference" "R5" (id 0) (at 33.655 185.42 90)
+    (property "Reference" "R5" (at 33.655 185.42 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100" (id 1) (at 35.56 186.055 90)
+    (property "Value" "100" (at 35.56 186.055 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 35.56 184.15 0)
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 35.56 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 35.56 184.15 0)
+    (property "Datasheet" "~" (at 35.56 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d14e1d85-5130-45ee-8198-c2f538c89f30))
     (pin "2" (uuid 2256053c-9443-4719-b9ba-aac58d3b58c5))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R5") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Mechanical:MountingHole") (at 277.495 146.05 0) (unit 1)
-    (in_bom no) (on_board yes) (fields_autoplaced)
+    (in_bom no) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 436a6066-0c35-4774-9203-93a1c5c83129)
-    (property "Reference" "H1" (id 0) (at 280.035 145.2153 0)
+    (property "Reference" "H1" (at 280.035 145.2153 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "M3" (id 1) (at 280.035 147.7522 0)
+    (property "Value" "M3" (at 280.035 147.7522 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "V0-Display:MountingHole_3.2mm_M3" (id 2) (at 277.495 146.05 0)
+    (property "Footprint" "V0-Display:MountingHole_3.2mm_M3" (at 277.495 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 277.495 146.05 0)
+    (property "Datasheet" "~" (at 277.495 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "H1") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3VA") (at 98.425 23.495 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 444f9fd5-d0a7-4574-b06a-d54a1ca4f29b)
-    (property "Reference" "#PWR034" (id 0) (at 98.425 27.305 0)
+    (property "Reference" "#PWR034" (at 98.425 27.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3VA" (id 1) (at 98.425 19.9192 0))
-    (property "Footprint" "" (id 2) (at 98.425 23.495 0)
+    (property "Value" "+3.3VA" (at 98.425 19.9192 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 98.425 23.495 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 98.425 23.495 0)
+    (property "Datasheet" "" (at 98.425 23.495 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 70fd3301-92f4-4e0b-a176-45f5f8d06001))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR034") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 31.75 106.68 90) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 4896505e-a850-4bba-8318-6b86561646b4)
-    (property "Reference" "R2" (id 0) (at 31.115 102.87 90))
-    (property "Value" "1k" (id 1) (at 31.75 104.775 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 31.75 106.68 0)
+    (property "Reference" "R2" (at 31.115 102.87 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "1k" (at 31.75 104.775 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 31.75 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 31.75 106.68 0)
+    (property "Datasheet" "~" (at 31.75 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 69471411-99c9-45a6-9532-29b749389974))
     (pin "2" (uuid bb3dff69-aabb-40b9-9219-0c5dc3c7a2ff))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R2") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3VA") (at 229.235 46.355 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 49785aa4-eb66-401f-afca-b7774f4bdd23)
-    (property "Reference" "#PWR052" (id 0) (at 229.235 50.165 0)
+    (property "Reference" "#PWR052" (at 229.235 50.165 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3VA" (id 1) (at 229.235 42.7792 0))
-    (property "Footprint" "" (id 2) (at 229.235 46.355 0)
+    (property "Value" "+3.3VA" (at 229.235 42.7792 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 229.235 46.355 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 229.235 46.355 0)
+    (property "Datasheet" "" (at 229.235 46.355 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid fd0637ae-0bf9-421a-9a3f-aca7e4f84a43))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR052") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 86.995 143.51 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 4bcf78be-eaf2-425e-9c2c-6e9f4eb5d5c5)
-    (property "Reference" "#PWR032" (id 0) (at 86.995 149.86 0)
+    (property "Reference" "#PWR032" (at 86.995 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 86.995 147.32 0))
-    (property "Footprint" "" (id 2) (at 86.995 143.51 0)
+    (property "Value" "GND" (at 86.995 147.32 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 86.995 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 86.995 143.51 0)
+    (property "Datasheet" "" (at 86.995 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 32f4f9af-ec13-42dc-bfcf-fdce5ebd4057))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR032") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 27.94 80.01 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 4e14649c-4bdd-46c5-91bf-f5c4ac2529f5)
-    (property "Reference" "R1" (id 0) (at 26.035 81.28 90)
+    (property "Reference" "R1" (at 26.035 81.28 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "4k7" (id 1) (at 29.845 81.915 90)
+    (property "Value" "4k7" (at 29.845 81.915 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 27.94 80.01 0)
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 27.94 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 27.94 80.01 0)
+    (property "Datasheet" "~" (at 27.94 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 57ee9912-1297-48ba-b04a-bd8f253be365))
     (pin "2" (uuid c407f413-1026-4224-8d5c-3238ca1c8a13))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R1") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 31.75 125.095 90) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 4ed11648-fc7e-4003-86ad-895d3d3704ac)
-    (property "Reference" "R3" (id 0) (at 31.115 121.285 90))
-    (property "Value" "1k" (id 1) (at 31.75 123.19 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 31.75 125.095 0)
+    (property "Reference" "R3" (at 31.115 121.285 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "1k" (at 31.75 123.19 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 31.75 125.095 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 31.75 125.095 0)
+    (property "Datasheet" "~" (at 31.75 125.095 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid bafeab05-d827-4d80-ac39-1cb74e910833))
     (pin "2" (uuid 7c15c3cc-2dd9-4302-b86c-bffafb223f40))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R3") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 27.94 151.13 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 4f5765d9-c2ff-4398-8847-2000f68e640e)
-    (property "Reference" "#PWR06" (id 0) (at 27.94 157.48 0)
+    (property "Reference" "#PWR06" (at 27.94 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 27.94 154.94 0))
-    (property "Footprint" "" (id 2) (at 27.94 151.13 0)
+    (property "Value" "GND" (at 27.94 154.94 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 27.94 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 27.94 151.13 0)
+    (property "Datasheet" "" (at 27.94 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 19004932-a10b-43d7-8f73-b39862379c63))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR06") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GNDA") (at 65.405 90.805 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 504404ff-eaae-4e1c-9d27-dfa681e76755)
-    (property "Reference" "#PWR024" (id 0) (at 65.405 97.155 0)
+    (property "Reference" "#PWR024" (at 65.405 97.155 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 65.405 94.615 0))
-    (property "Footprint" "" (id 2) (at 65.405 90.805 0)
+    (property "Value" "GNDA" (at 65.405 94.615 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 65.405 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 65.405 90.805 0)
+    (property "Datasheet" "" (at 65.405 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4ca6b1d2-1ac3-487a-be70-72ddc229a170))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR024") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 27.94 132.715 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 53c020e9-e1b3-46a9-9f2f-a8f53069a25f)
-    (property "Reference" "#PWR05" (id 0) (at 27.94 139.065 0)
+    (property "Reference" "#PWR05" (at 27.94 139.065 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 27.94 136.525 0))
-    (property "Footprint" "" (id 2) (at 27.94 132.715 0)
+    (property "Value" "GND" (at 27.94 136.525 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 27.94 132.715 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 27.94 132.715 0)
+    (property "Datasheet" "" (at 27.94 132.715 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5e3984fc-966b-4dab-a481-3629631762fc))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR05") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 174.625 107.315 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 54dc7b9c-e777-4dc4-b273-04ee9c36bf07)
-    (property "Reference" "J15" (id 0) (at 173.355 104.775 0))
-    (property "Value" "PH2.54_02" (id 1) (at 177.165 108.585 90))
-    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (id 2) (at 174.625 107.315 0)
+    (property "Reference" "J15" (at 173.355 104.775 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "PH2.54_02" (at 177.165 108.585 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (at 174.625 107.315 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 174.625 107.315 0)
+    (property "Datasheet" "~" (at 174.625 107.315 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3a5b9c9f-61df-424f-bb6d-b45e74c4bd7f))
     (pin "2" (uuid c6554712-4763-43fd-805c-aa7931110b32))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J15") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 33.655 187.96 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 558b1aa4-5b1a-4a10-83fa-27ba4beaaa4a)
-    (property "Reference" "#PWR09" (id 0) (at 33.655 194.31 0)
+    (property "Reference" "#PWR09" (at 33.655 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 33.655 191.77 0))
-    (property "Footprint" "" (id 2) (at 33.655 187.96 0)
+    (property "Value" "GND" (at 33.655 191.77 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 33.655 187.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 33.655 187.96 0)
+    (property "Datasheet" "" (at 33.655 187.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 82413416-f7b1-447a-97f4-00fc930a9fcd))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR09") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_02x04_Odd_Even") (at 153.67 140.335 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 559659de-8fba-42aa-a4c2-5d8f603e64e9)
-    (property "Reference" "J13" (id 0) (at 154.94 135.255 0))
-    (property "Value" "GPIO" (id 1) (at 154.94 141.605 90))
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_2x04_P2.54mm_Vertical" (id 2) (at 153.67 140.335 0)
+    (property "Reference" "J13" (at 154.94 135.255 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "GPIO" (at 154.94 141.605 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_2x04_P2.54mm_Vertical" (at 153.67 140.335 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 153.67 140.335 0)
+    (property "Datasheet" "~" (at 153.67 140.335 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b21c01d1-1d6e-42b9-af4d-32f3580d22ca))
@@ -4542,36 +4976,54 @@
     (pin "6" (uuid 03774084-b44d-48ad-aefb-9f0d5241da3c))
     (pin "7" (uuid 5c115d86-67a5-4198-b36b-1c033e52a79a))
     (pin "8" (uuid b00a692d-6ff3-4dbd-8e09-70686c786e09))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J13") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 64.135 128.905 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 55c18011-1439-45a8-b154-7ac20505faf8)
-    (property "Reference" "C7" (id 0) (at 61.595 130.175 90)
+    (property "Reference" "C7" (at 61.595 130.175 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100n" (id 1) (at 66.04 128.905 0)
+    (property "Value" "100n" (at 66.04 128.905 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 64.135 128.905 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 64.135 128.905 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 64.135 128.905 0)
+    (property "Datasheet" "~" (at 64.135 128.905 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid fd0155c1-a54c-4c0a-8b1b-08421286c64d))
     (pin "2" (uuid 2c4e0dc0-939b-4001-9919-93b198772719))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C7") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:RotaryEncoder_Switch") (at 151.765 71.755 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 57762299-7792-4ff0-b6c4-c18e6bb441c3)
-    (property "Reference" "SW3" (id 0) (at 151.765 62.9752 0))
-    (property "Value" "RotaryEncoder_Switch" (id 1) (at 151.765 65.5121 0))
-    (property "Footprint" "V0-Display:EN11_Encoder" (id 2) (at 147.955 67.691 0)
+    (property "Reference" "SW3" (at 151.765 62.9752 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "RotaryEncoder_Switch" (at 151.765 65.5121 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "V0-Display:EN11_Encoder" (at 147.955 67.691 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 151.765 65.151 0)
+    (property "Datasheet" "~" (at 151.765 65.151 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "A" (uuid d32928e2-9a0b-4c1a-8373-77d0f27b3da3))
@@ -4579,971 +5031,1491 @@
     (pin "C" (uuid c656fc9b-05db-4a1b-a6b6-c0e67273ee3f))
     (pin "S1" (uuid 3d6ca664-15de-4b08-a916-2b5dd7cf776d))
     (pin "S2" (uuid b576f620-10dc-4876-b982-8bfd7d079e50))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "SW3") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 160.655 75.565 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 59dfded5-f8f5-4a40-9362-d6270a9ce48a)
-    (property "Reference" "#PWR045" (id 0) (at 160.655 81.915 0)
+    (property "Reference" "#PWR045" (at 160.655 81.915 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 160.655 79.375 0))
-    (property "Footprint" "" (id 2) (at 160.655 75.565 0)
+    (property "Value" "GND" (at 160.655 79.375 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 160.655 75.565 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 160.655 75.565 0)
+    (property "Datasheet" "" (at 160.655 75.565 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 32b40e4e-9e08-4143-8f07-1569de3d3776))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR045") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3V") (at 70.485 23.495 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 59f52f80-f648-4da8-b7ad-d84b2ec7b65a)
-    (property "Reference" "#PWR025" (id 0) (at 70.485 27.305 0)
+    (property "Reference" "#PWR025" (at 70.485 27.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 70.485 19.9192 0))
-    (property "Footprint" "" (id 2) (at 70.485 23.495 0)
+    (property "Value" "+3.3V" (at 70.485 19.9192 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 70.485 23.495 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 70.485 23.495 0)
+    (property "Datasheet" "" (at 70.485 23.495 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9820cfa1-5b03-4d5c-87a5-5ef8ca8c003e))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR025") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3V") (at 137.16 33.655 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 6057eba2-06da-4cd2-9385-322f09fb49f1)
-    (property "Reference" "#PWR041" (id 0) (at 137.16 37.465 0)
+    (property "Reference" "#PWR041" (at 137.16 37.465 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 137.16 30.0792 0))
-    (property "Footprint" "" (id 2) (at 137.16 33.655 0)
+    (property "Value" "+3.3V" (at 137.16 30.0792 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 137.16 33.655 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 137.16 33.655 0)
+    (property "Datasheet" "" (at 137.16 33.655 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d1408041-7dc4-44fa-b47a-6bc36066fbca))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR041") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GNDA") (at 71.12 90.805 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 61269e13-8bcf-4692-ac02-f481239ef2f5)
-    (property "Reference" "#PWR026" (id 0) (at 71.12 97.155 0)
+    (property "Reference" "#PWR026" (at 71.12 97.155 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 71.12 94.615 0))
-    (property "Footprint" "" (id 2) (at 71.12 90.805 0)
+    (property "Value" "GNDA" (at 71.12 94.615 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 71.12 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 71.12 90.805 0)
+    (property "Datasheet" "" (at 71.12 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid bc2eed0f-a64a-499f-84b7-550628b2c78f))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR026") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 21.59 146.05 180) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 6603a291-e3a9-4705-a380-dff8176a1a61)
-    (property "Reference" "J5" (id 0) (at 21.59 140.97 0))
-    (property "Value" "PH2.54_02" (id 1) (at 19.05 144.78 90))
-    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (id 2) (at 21.59 146.05 0)
+    (property "Reference" "J5" (at 21.59 140.97 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "PH2.54_02" (at 19.05 144.78 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (at 21.59 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 21.59 146.05 0)
+    (property "Datasheet" "~" (at 21.59 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b72bd61d-ac26-4ae9-b76c-6da7c9faa8b6))
     (pin "2" (uuid b2549fe1-2329-41f6-b0f2-89fdf04df1bd))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J5") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x04") (at 170.815 41.91 0) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 67549766-f7ff-4908-a7d4-f34b917df88f)
-    (property "Reference" "J14" (id 0) (at 169.545 34.29 0)
+    (property "Reference" "J14" (at 169.545 34.29 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "Display" (id 1) (at 173.355 37.465 90)
+    (property "Value" "Display" (at 173.355 37.465 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "V0-Display:1pt3in_OLED" (id 2) (at 170.815 41.91 0)
+    (property "Footprint" "V0-Display:1pt3in_OLED" (at 170.815 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 170.815 41.91 0)
+    (property "Datasheet" "~" (at 170.815 41.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7869e7ed-949a-49ee-b58a-0c4fe2f9c756))
     (pin "2" (uuid eeaefcc8-f816-458e-808b-080bcd93f65f))
     (pin "3" (uuid 4649db6a-284b-4d45-acb2-23cd266b49fa))
     (pin "4" (uuid 99cbb207-5c21-4040-bfbb-0a5afa6f770a))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J14") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 162.56 146.685 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 6951bf28-a326-4f9b-8cf1-5e181d29f4ee)
-    (property "Reference" "#PWR046" (id 0) (at 162.56 153.035 0)
+    (property "Reference" "#PWR046" (at 162.56 153.035 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 162.56 150.495 0))
-    (property "Footprint" "" (id 2) (at 162.56 146.685 0)
+    (property "Value" "GND" (at 162.56 150.495 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 162.56 146.685 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 162.56 146.685 0)
+    (property "Datasheet" "" (at 162.56 146.685 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8047873d-6d84-4659-87e6-12eade87c31c))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR046") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3VA") (at 45.085 76.835 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 6c1f9f1d-ea16-4caf-8e6b-6274d9f91821)
-    (property "Reference" "#PWR014" (id 0) (at 45.085 80.645 0)
+    (property "Reference" "#PWR014" (at 45.085 80.645 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3VA" (id 1) (at 45.085 73.2592 0))
-    (property "Footprint" "" (id 2) (at 45.085 76.835 0)
+    (property "Value" "+3.3VA" (at 45.085 73.2592 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 45.085 76.835 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 45.085 76.835 0)
+    (property "Datasheet" "" (at 45.085 76.835 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a4dbef53-b598-44b2-a725-3a2f15b6c16d))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR014") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 56.515 114.3 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 6c2c4791-c787-4cf5-a07a-f71afa741cc6)
-    (property "Reference" "#PWR016" (id 0) (at 56.515 120.65 0)
+    (property "Reference" "#PWR016" (at 56.515 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 56.515 118.11 0))
-    (property "Footprint" "" (id 2) (at 56.515 114.3 0)
+    (property "Value" "GND" (at 56.515 118.11 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 56.515 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 56.515 114.3 0)
+    (property "Datasheet" "" (at 56.515 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5ca0b585-0f75-423e-93f9-1c61b602dc37))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR016") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 35.56 128.905 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 6c384690-4e87-4670-9124-304909d7a075)
-    (property "Reference" "C3" (id 0) (at 33.02 130.175 90)
+    (property "Reference" "C3" (at 33.02 130.175 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100n" (id 1) (at 37.465 128.905 0)
+    (property "Value" "100n" (at 37.465 128.905 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 35.56 128.905 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 35.56 128.905 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 35.56 128.905 0)
+    (property "Datasheet" "~" (at 35.56 128.905 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid bb4d62a3-eb37-4106-af6d-5e6a4f5dc283))
     (pin "2" (uuid 53fbb6ae-06a6-4ee6-9ab5-39c1282b195c))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C3") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 56.515 132.715 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 6e0c4926-ea8f-4bba-bcb7-8e17a776a921)
-    (property "Reference" "#PWR017" (id 0) (at 56.515 139.065 0)
+    (property "Reference" "#PWR017" (at 56.515 139.065 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 56.515 136.525 0))
-    (property "Footprint" "" (id 2) (at 56.515 132.715 0)
+    (property "Value" "GND" (at 56.515 136.525 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 56.515 132.715 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 56.515 132.715 0)
+    (property "Datasheet" "" (at 56.515 132.715 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ee1674cb-e3fb-45c0-afbc-5e7e8fe9fd3e))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR017") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3V") (at 35.56 168.275 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 70ea0e4b-4537-44bb-a679-1af603f0bbee)
-    (property "Reference" "#PWR013" (id 0) (at 35.56 172.085 0)
+    (property "Reference" "#PWR013" (at 35.56 172.085 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 35.56 164.6992 0))
-    (property "Footprint" "" (id 2) (at 35.56 168.275 0)
+    (property "Value" "+3.3V" (at 35.56 164.6992 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 35.56 168.275 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 35.56 168.275 0)
+    (property "Datasheet" "" (at 35.56 168.275 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 95c60c3d-59c9-4e55-9c83-8703b958f1f4))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR013") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 50.165 28.575 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 71100107-b8b2-4f05-9bc3-d8fdf218ea0c)
-    (property "Reference" "C5" (id 0) (at 50.7323 27.0466 0)
+    (property "Reference" "C5" (at 50.7323 27.0466 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "4u7" (id 1) (at 50.8 30.48 0)
+    (property "Value" "4u7" (at 50.8 30.48 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 50.165 28.575 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 50.165 28.575 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 50.165 28.575 0)
+    (property "Datasheet" "~" (at 50.165 28.575 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 722bbd7e-07bd-4192-b91b-13cee5e44a1c))
     (pin "2" (uuid e0aa0836-9929-451e-9168-72b281239dbb))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C5") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 151.765 183.515 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 76a79e3d-c9c1-4992-849b-f73cc746eddc)
-    (property "Reference" "R17" (id 0) (at 149.86 185.42 90)
+    (property "Reference" "R17" (at 149.86 185.42 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "68" (id 1) (at 153.67 183.515 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 151.765 183.515 0)
+    (property "Value" "68" (at 153.67 183.515 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 151.765 183.515 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 151.765 183.515 0)
+    (property "Datasheet" "~" (at 151.765 183.515 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1501799b-b70e-4d5f-8b09-a8e88921c2ef))
     (pin "2" (uuid 04696432-fee0-4089-8aff-49af8a8679c5))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R17") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 212.725 31.115 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 770757e1-04da-45b7-8388-e1104d335ba3)
-    (property "Reference" "#PWR048" (id 0) (at 212.725 37.465 0)
+    (property "Reference" "#PWR048" (at 212.725 37.465 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 212.725 34.925 0))
-    (property "Footprint" "" (id 2) (at 212.725 31.115 0)
+    (property "Value" "GND" (at 212.725 34.925 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 212.725 31.115 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 212.725 31.115 0)
+    (property "Datasheet" "" (at 212.725 31.115 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b4900e76-f12d-48f9-bd55-d08645a193c8))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR048") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 31.75 42.545 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 7751bb92-1369-4559-8492-1ba2a312c77a)
-    (property "Reference" "#PWR07" (id 0) (at 31.75 48.895 0)
+    (property "Reference" "#PWR07" (at 31.75 48.895 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 31.75 46.355 0))
-    (property "Footprint" "" (id 2) (at 31.75 42.545 0)
+    (property "Value" "GND" (at 31.75 46.355 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 31.75 42.545 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 31.75 42.545 0)
+    (property "Datasheet" "" (at 31.75 42.545 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid eb81c83b-b41e-433d-8e75-d94e2302cdab))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR07") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 85.09 34.29 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 77b2d59d-eb81-4ba0-88d6-69c5c7f51d8d)
-    (property "Reference" "#PWR029" (id 0) (at 85.09 40.64 0)
+    (property "Reference" "#PWR029" (at 85.09 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 85.09 38.1 0))
-    (property "Footprint" "" (id 2) (at 85.09 34.29 0)
+    (property "Value" "GND" (at 85.09 38.1 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 85.09 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 85.09 34.29 0)
+    (property "Datasheet" "" (at 85.09 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b76e9c02-5fc9-4a94-b8ad-177632c40ea6))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR029") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 232.41 27.305 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 7b718e77-4a08-412b-a122-811508060752)
-    (property "Reference" "C17" (id 0) (at 232.9773 25.7766 0)
+    (property "Reference" "C17" (at 232.9773 25.7766 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100n" (id 1) (at 233.045 29.21 0)
+    (property "Value" "100n" (at 233.045 29.21 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 232.41 27.305 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 232.41 27.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 232.41 27.305 0)
+    (property "Datasheet" "~" (at 232.41 27.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f81bf72d-346f-4adf-ac43-949009b0a362))
     (pin "2" (uuid 74476e46-dfb2-47ce-8190-1a924a3597a6))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C17") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Mechanical:MountingHole") (at 277.495 151.13 0) (unit 1)
-    (in_bom no) (on_board yes) (fields_autoplaced)
+    (in_bom no) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 7e89b309-b0a6-481a-bc25-5e051512a29e)
-    (property "Reference" "H2" (id 0) (at 280.035 150.2953 0)
+    (property "Reference" "H2" (at 280.035 150.2953 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "M3" (id 1) (at 280.035 152.8322 0)
+    (property "Value" "M3" (at 280.035 152.8322 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "V0-Display:MountingHole_3.2mm_M3" (id 2) (at 277.495 151.13 0)
+    (property "Footprint" "V0-Display:MountingHole_3.2mm_M3" (at 277.495 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 277.495 151.13 0)
+    (property "Datasheet" "~" (at 277.495 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "H2") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Mechanical:MountingHole") (at 277.495 161.29 0) (unit 1)
-    (in_bom no) (on_board yes) (fields_autoplaced)
+    (in_bom no) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 8226fe5a-0a78-4e74-94b9-228e9aed9f56)
-    (property "Reference" "H4" (id 0) (at 280.035 160.4553 0)
+    (property "Reference" "H4" (at 280.035 160.4553 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "M3" (id 1) (at 280.035 162.9922 0)
+    (property "Value" "M3" (at 280.035 162.9922 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "V0-Display:MountingHole_3.2mm_M3" (id 2) (at 277.495 161.29 0)
+    (property "Footprint" "V0-Display:MountingHole_3.2mm_M3" (at 277.495 161.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 277.495 161.29 0)
+    (property "Datasheet" "~" (at 277.495 161.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "H4") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "my_additions:BAV99_Small") (at 82.55 83.82 270) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 8232e863-da91-4663-8a63-93dbc5f10dcb)
-    (property "Reference" "D2" (id 0) (at 83.82 82.55 90)
+    (property "Reference" "D2" (at 83.82 82.55 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "BAV99" (id 1) (at 83.82 85.09 90)
+    (property "Value" "BAV99" (at 83.82 85.09 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 77.47 83.82 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (at 77.47 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" (id 3) (at 75.565 83.82 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" (at 75.565 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 606d94d0-c8bb-4991-b2e2-50daf871efc1))
     (pin "2" (uuid 857bebce-7039-4d23-8d5b-8ce40dcaf6b5))
     (pin "3" (uuid bdf64c75-0a2f-468a-bcb3-8e22f6d1f1cf))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "D2") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 137.16 46.355 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 8267c927-12ba-47d6-884b-ae707f4c9b20)
-    (property "Reference" "#PWR042" (id 0) (at 137.16 52.705 0)
+    (property "Reference" "#PWR042" (at 137.16 52.705 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 137.16 50.165 0))
-    (property "Footprint" "" (id 2) (at 137.16 46.355 0)
+    (property "Value" "GND" (at 137.16 50.165 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 137.16 46.355 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 137.16 46.355 0)
+    (property "Datasheet" "" (at 137.16 46.355 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9d7f17af-5fed-4ed5-ae72-81703214abdb))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR042") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GNDA") (at 33.655 90.805 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 83d22f92-6296-4701-b1a5-8dc601584ce3)
-    (property "Reference" "#PWR08" (id 0) (at 33.655 97.155 0)
+    (property "Reference" "#PWR08" (at 33.655 97.155 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 33.655 94.615 0))
-    (property "Footprint" "" (id 2) (at 33.655 90.805 0)
+    (property "Value" "GNDA" (at 33.655 94.615 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 33.655 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 33.655 90.805 0)
+    (property "Datasheet" "" (at 33.655 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid fa74c4b8-5258-464d-8ee4-f9428c4daa0c))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR08") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 226.06 27.305 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 86c9ce96-d2e4-4a3a-b1f3-2c8b3b5b4723)
-    (property "Reference" "C16" (id 0) (at 226.6273 25.7766 0)
+    (property "Reference" "C16" (at 226.6273 25.7766 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100n" (id 1) (at 226.695 29.21 0)
+    (property "Value" "100n" (at 226.695 29.21 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 226.06 27.305 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 226.06 27.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 226.06 27.305 0)
+    (property "Datasheet" "~" (at 226.06 27.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7c1a09e6-0b15-4c9f-98f9-b70cee36cd91))
     (pin "2" (uuid 1f4436d6-3568-4ccb-979e-248b5250e929))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C16") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 21.59 109.22 180) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 92182580-bc35-4ca8-813d-528cee82c45f)
-    (property "Reference" "J3" (id 0) (at 21.59 104.14 0))
-    (property "Value" "PH2.54_02" (id 1) (at 19.05 107.95 90))
-    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (id 2) (at 21.59 109.22 0)
+    (property "Reference" "J3" (at 21.59 104.14 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "PH2.54_02" (at 19.05 107.95 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (at 21.59 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 21.59 109.22 0)
+    (property "Datasheet" "~" (at 21.59 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c4c6dd99-89ee-4dbf-b44c-5304b0a3e20b))
     (pin "2" (uuid 9f83c062-03fa-4ce0-bb0a-c6833d04ba56))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J3") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:+3.3V") (at 212.725 23.495 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 9971d12c-7178-4b50-9cf2-81730b3fad8b)
-    (property "Reference" "#PWR047" (id 0) (at 212.725 27.305 0)
+    (property "Reference" "#PWR047" (at 212.725 27.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (id 1) (at 212.725 19.9192 0))
-    (property "Footprint" "" (id 2) (at 212.725 23.495 0)
+    (property "Value" "+3.3V" (at 212.725 19.9192 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 212.725 23.495 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 212.725 23.495 0)
+    (property "Datasheet" "" (at 212.725 23.495 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 00968059-538f-4411-a2d7-566f654f6af3))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR047") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 132.08 75.565 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 99769f36-bdec-4e17-8fb8-66068b95b5ec)
-    (property "Reference" "#PWR040" (id 0) (at 132.08 81.915 0)
+    (property "Reference" "#PWR040" (at 132.08 81.915 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 132.08 79.375 0))
-    (property "Footprint" "" (id 2) (at 132.08 75.565 0)
+    (property "Value" "GND" (at 132.08 79.375 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 132.08 75.565 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 132.08 75.565 0)
+    (property "Datasheet" "" (at 132.08 75.565 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 932b068b-cdc4-480a-ad2e-447f76ab6cfb))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR040") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GNDA") (at 82.55 90.805 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 9a930cd5-d327-4d9b-ba2c-c364d86c9828)
-    (property "Reference" "#PWR028" (id 0) (at 82.55 97.155 0)
+    (property "Reference" "#PWR028" (at 82.55 97.155 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 82.55 94.615 0))
-    (property "Footprint" "" (id 2) (at 82.55 90.805 0)
+    (property "Value" "GNDA" (at 82.55 94.615 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 82.55 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 82.55 90.805 0)
+    (property "Datasheet" "" (at 82.55 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 92fa47db-29fc-4930-abfe-8330ae66d5f5))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR028") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Regulator_Linear:HT75xx-1-SOT89") (at 60.325 27.305 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 9d5f2293-24a3-4a32-a382-b3910273b4b1)
-    (property "Reference" "U1" (id 0) (at 60.325 19.05 0))
-    (property "Value" "HT7533" (id 1) (at 60.325 21.0621 0))
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-89-3" (id 2) (at 60.325 19.05 0)
+    (property "Reference" "U1" (at 60.325 19.05 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "HT7533" (at 60.325 21.0621 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-89-3" (at 60.325 19.05 0)
       (effects (font (size 1.27 1.27) italic) hide)
     )
-    (property "Datasheet" "https://www.holtek.com/documents/10179/116711/HT75xx-1v250.pdf" (id 3) (at 60.325 24.765 0)
+    (property "Datasheet" "https://www.holtek.com/documents/10179/116711/HT75xx-1v250.pdf" (at 60.325 24.765 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 574751a4-6504-4426-88a1-df3365743e9a))
     (pin "2" (uuid 6c0c13ce-33cb-4699-86a4-c9800f1556f4))
     (pin "3" (uuid c32ffcbc-8aed-40d8-9c61-348e2e386d87))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "U1") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 37.465 83.82 90) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 9e955eb1-fcc8-4549-ad26-449d91e1350f)
-    (property "Reference" "R6" (id 0) (at 36.83 80.01 90))
-    (property "Value" "22" (id 1) (at 37.465 81.915 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 37.465 83.82 0)
+    (property "Reference" "R6" (at 36.83 80.01 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "22" (at 37.465 81.915 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 37.465 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 37.465 83.82 0)
+    (property "Datasheet" "~" (at 37.465 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid cfca34d5-215e-43ab-b083-1ce583d742e6))
     (pin "2" (uuid 9fe190b6-16f0-4f45-bad8-774977d3090f))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R6") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 64.135 110.49 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 9ea55a84-3dae-4824-a2cb-3e37727771fe)
-    (property "Reference" "C6" (id 0) (at 61.595 111.76 90)
+    (property "Reference" "C6" (at 61.595 111.76 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100n" (id 1) (at 66.04 110.49 0)
+    (property "Value" "100n" (at 66.04 110.49 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 64.135 110.49 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 64.135 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 64.135 110.49 0)
+    (property "Datasheet" "~" (at 64.135 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid fd80d23b-43b0-4bda-b7e3-e12d8e195193))
     (pin "2" (uuid 48e736b6-5d39-47fc-a14a-7b4150f5ec26))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C6") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:PWR_FLAG") (at 106.68 24.765 270) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid a2d9b30e-9488-44a2-b271-4366e5242ae6)
-    (property "Reference" "#FLG0101" (id 0) (at 108.585 24.765 0)
+    (property "Reference" "#FLG0101" (at 108.585 24.765 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "PWR_FLAG" (id 1) (at 109.855 25.1988 90)
+    (property "Value" "PWR_FLAG" (at 109.855 25.1988 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 106.68 24.765 0)
+    (property "Footprint" "" (at 106.68 24.765 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 106.68 24.765 0)
+    (property "Datasheet" "~" (at 106.68 24.765 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3de2dece-adb9-4da1-9c1a-50ce944e98f1))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#FLG0101") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "V0-Display:SW_SPST") (at 92.075 107.315 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid aae496e3-dea1-40e2-813d-d908db9cb4e1)
-    (property "Reference" "SW1" (id 0) (at 92.075 104.14 0))
-    (property "Value" "Tact_switch" (id 1) (at 92.075 109.855 0))
-    (property "Footprint" "V0-Display:SW_PUSH_6mm" (id 2) (at 92.075 107.315 0)
+    (property "Reference" "SW1" (at 92.075 104.14 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "Tact_switch" (at 92.075 109.855 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "V0-Display:SW_PUSH_6mm" (at 92.075 107.315 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 92.075 107.315 0)
+    (property "Datasheet" "~" (at 92.075 107.315 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b8b11185-c51a-4f44-be11-832f0a4945b0))
     (pin "2" (uuid c3b4d3f5-3902-45d7-9da5-7d8aabcda25b))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "SW1") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Mechanical:MountingHole") (at 277.495 156.21 0) (unit 1)
-    (in_bom no) (on_board yes) (fields_autoplaced)
+    (in_bom no) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid ad539111-50b4-4775-902b-63ab9de8749f)
-    (property "Reference" "H3" (id 0) (at 280.035 155.3753 0)
+    (property "Reference" "H3" (at 280.035 155.3753 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "M3" (id 1) (at 280.035 157.9122 0)
+    (property "Value" "M3" (at 280.035 157.9122 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "V0-Display:MountingHole_3.2mm_M3" (id 2) (at 277.495 156.21 0)
+    (property "Footprint" "V0-Display:MountingHole_3.2mm_M3" (at 277.495 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 277.495 156.21 0)
+    (property "Datasheet" "~" (at 277.495 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "H3") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 65.405 80.01 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid b0c5f90e-c7ef-4422-9684-da26b11c77b8)
-    (property "Reference" "R10" (id 0) (at 63.5 81.28 90)
+    (property "Reference" "R10" (at 63.5 81.28 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "4k7" (id 1) (at 67.31 81.915 90)
+    (property "Value" "4k7" (at 67.31 81.915 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 65.405 80.01 0)
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 65.405 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 65.405 80.01 0)
+    (property "Datasheet" "~" (at 65.405 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 45b5effc-1966-48a4-a198-95bb38d99a44))
     (pin "2" (uuid cfbcff74-060b-406e-aaa4-910fb3014cfe))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R10") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 104.775 114.935 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid b0f3c15e-6291-46dc-977c-894f41f8928e)
-    (property "Reference" "#PWR039" (id 0) (at 104.775 121.285 0)
+    (property "Reference" "#PWR039" (at 104.775 121.285 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 104.775 118.745 0))
-    (property "Footprint" "" (id 2) (at 104.775 114.935 0)
+    (property "Value" "GND" (at 104.775 118.745 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 104.775 114.935 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 104.775 114.935 0)
+    (property "Datasheet" "" (at 104.775 114.935 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0208a1b6-af31-437e-bdb4-4aa314496918))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR039") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 60.325 125.095 90) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid b2fd770f-9ed4-4f7f-8811-d4b3053ec59e)
-    (property "Reference" "R8" (id 0) (at 59.69 121.285 90))
-    (property "Value" "1k" (id 1) (at 60.325 123.19 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 60.325 125.095 0)
+    (property "Reference" "R8" (at 59.69 121.285 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "1k" (at 60.325 123.19 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 60.325 125.095 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 60.325 125.095 0)
+    (property "Datasheet" "~" (at 60.325 125.095 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9fe2e13c-dc8a-4551-9c7a-59229e20ada1))
     (pin "2" (uuid 81f08002-13ae-4ac0-a607-d8c140096a80))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R8") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "V0-Display:SW_SPST") (at 93.345 140.335 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid b37bd078-ee1e-467d-8fe9-806ea98d005c)
-    (property "Reference" "SW2" (id 0) (at 93.345 137.16 0))
-    (property "Value" "Tact_switch" (id 1) (at 93.345 142.875 0))
-    (property "Footprint" "V0-Display:SW_PUSH_6mm" (id 2) (at 93.345 140.335 0)
+    (property "Reference" "SW2" (at 93.345 137.16 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "Tact_switch" (at 93.345 142.875 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "V0-Display:SW_PUSH_6mm" (at 93.345 140.335 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 93.345 140.335 0)
+    (property "Datasheet" "~" (at 93.345 140.335 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0fc15203-a4f5-4458-8243-eedc6847799f))
     (pin "2" (uuid 804ab8b9-93ee-4e16-9b0d-48e64780c716))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "SW2") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:Buzzer") (at 155.575 165.735 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid b44a8399-57cd-4ddf-965e-74b1b323dbfe)
-    (property "Reference" "BZ1" (id 0) (at 159.385 164.9003 0)
+    (property "Reference" "BZ1" (at 159.385 164.9003 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "5020 buzzer" (id 1) (at 159.385 167.4372 0)
+    (property "Value" "5020 buzzer" (at 159.385 167.4372 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "my_additions:Buzzer_5020" (id 2) (at 154.94 163.195 90)
+    (property "Footprint" "my_additions:Buzzer_5020" (at 154.94 163.195 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 154.94 163.195 90)
+    (property "Datasheet" "~" (at 154.94 163.195 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 22ab62e5-c304-4274-a139-0a6460fe82c4))
     (pin "2" (uuid 9cb61338-4c4d-4e88-b122-56124cc29b28))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "BZ1") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 106.68 160.02 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid b775e5ef-57ae-4408-a5e7-74c9bb086edd)
-    (property "Reference" "J12" (id 0) (at 108.712 160.4553 0)
+    (property "Reference" "J12" (at 108.712 160.4553 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "Conn_01x02" (id 1) (at 108.712 162.9922 0)
+    (property "Value" "Conn_01x02" (at 108.712 162.9922 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (id 2) (at 106.68 160.02 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (at 106.68 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 106.68 160.02 0)
+    (property "Datasheet" "~" (at 106.68 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0e1a13a7-ff65-493d-801e-49624bc829d3))
     (pin "2" (uuid 605de1d6-6acc-42e8-bdbc-a4d1ccc5b2fd))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J12") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 35.56 114.3 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid bca0788c-ec37-42bf-8127-c4506c9e094c)
-    (property "Reference" "#PWR010" (id 0) (at 35.56 120.65 0)
+    (property "Reference" "#PWR010" (at 35.56 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 35.56 118.11 0))
-    (property "Footprint" "" (id 2) (at 35.56 114.3 0)
+    (property "Value" "GND" (at 35.56 118.11 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 35.56 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 35.56 114.3 0)
+    (property "Datasheet" "" (at 35.56 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 47b2bb3c-6334-4fd4-923b-fb532e4ee23c))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR010") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "V0-Display:74LVC1G17") (at 144.145 107.315 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid bd254e6b-22a6-4c62-a8d4-b6576707c115)
-    (property "Reference" "U2" (id 0) (at 137.795 101.6 0))
-    (property "Value" "74LVC1G17" (id 1) (at 137.795 103.505 0))
-    (property "Footprint" "V0-Display:SOT-23-5" (id 2) (at 144.145 107.315 0)
+    (property "Reference" "U2" (at 137.795 101.6 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "74LVC1G17" (at 137.795 103.505 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "V0-Display:SOT-23-5" (at 144.145 107.315 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf" (id 3) (at 144.145 107.315 0)
+    (property "Datasheet" "http://www.ti.com/lit/sg/scyt129e/scyt129e.pdf" (at 144.145 107.315 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "2" (uuid 5d8fcf2d-7af2-4896-8680-0469a889b239))
     (pin "3" (uuid f0ddc671-dfba-4b1e-a1ae-ebcf27e8b2e0))
     (pin "4" (uuid 8e421737-1e56-47a6-a4a8-76776a8f6bfd))
     (pin "5" (uuid edd95a4f-aaee-4165-b558-a5ad612bed56))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "U2") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 27.94 114.3 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid c1d09a23-803c-4de6-85c3-4aedad7969ee)
-    (property "Reference" "#PWR04" (id 0) (at 27.94 120.65 0)
+    (property "Reference" "#PWR04" (at 27.94 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 27.94 118.11 0))
-    (property "Footprint" "" (id 2) (at 27.94 114.3 0)
+    (property "Value" "GND" (at 27.94 118.11 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 27.94 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 27.94 114.3 0)
+    (property "Datasheet" "" (at 27.94 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f957933e-1bda-4b39-b63a-be56f0530d81))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR04") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 59.055 86.36 180) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid c2ea99a3-6bde-4d0a-9bea-d3e250289ee4)
-    (property "Reference" "J11" (id 0) (at 59.055 81.28 0))
-    (property "Value" "PH2.54_02" (id 1) (at 56.515 85.09 90))
-    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (id 2) (at 59.055 86.36 0)
+    (property "Reference" "J11" (at 59.055 81.28 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "PH2.54_02" (at 56.515 85.09 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (at 59.055 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 59.055 86.36 0)
+    (property "Datasheet" "~" (at 59.055 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ffd4ffd7-01c8-44b4-8562-b6d961d37b8c))
     (pin "2" (uuid 989f5d4e-1e08-4e11-9c65-6623a38f4b0a))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J11") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 74.93 83.82 90) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid c56ef126-34f0-4c7f-aa2f-5961df1a0cdb)
-    (property "Reference" "R11" (id 0) (at 74.295 80.01 90))
-    (property "Value" "22" (id 1) (at 74.93 81.915 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 74.93 83.82 0)
+    (property "Reference" "R11" (at 74.295 80.01 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "22" (at 74.93 81.915 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 74.93 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 74.93 83.82 0)
+    (property "Datasheet" "~" (at 74.93 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ed681bf4-e750-4d6e-b5ad-2aa49138518a))
     (pin "2" (uuid 58151230-afcb-4516-a2c4-8fbb0136c5d7))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R11") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 50.165 109.22 180) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid c59d2644-9a71-42de-8e8a-7677a25f1847)
-    (property "Reference" "J8" (id 0) (at 50.165 104.14 0))
-    (property "Value" "PH2.54_02" (id 1) (at 47.625 107.95 90))
-    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (id 2) (at 50.165 109.22 0)
+    (property "Reference" "J8" (at 50.165 104.14 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "PH2.54_02" (at 47.625 107.95 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (at 50.165 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 50.165 109.22 0)
+    (property "Datasheet" "~" (at 50.165 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a7261e10-d398-4b6c-8f75-ebc35d3a2070))
     (pin "2" (uuid d6b95ae8-f23d-4b8a-8c84-bca3f0f2c56f))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J8") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "V0-Display:WS2812B") (at 159.385 107.315 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid c87e9e75-d199-43c4-8134-da78240736a9)
-    (property "Reference" "D3" (id 0) (at 162.56 99.06 0))
-    (property "Value" "WS2812B" (id 1) (at 165.735 100.965 0))
-    (property "Footprint" "V0-Display:WS2812_5050_LED" (id 2) (at 160.655 114.935 0)
+    (property "Reference" "D3" (at 162.56 99.06 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "WS2812B" (at 165.735 100.965 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "V0-Display:WS2812_5050_LED" (at 160.655 114.935 0)
       (effects (font (size 1.27 1.27)) (justify left top) hide)
     )
-    (property "Datasheet" "https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf" (id 3) (at 161.925 116.84 0)
+    (property "Datasheet" "https://cdn-shop.adafruit.com/datasheets/WS2812B.pdf" (at 161.925 116.84 0)
       (effects (font (size 1.27 1.27)) (justify left top) hide)
     )
     (pin "1" (uuid 1495ee93-fe60-462b-b653-4d7cbb86dd58))
     (pin "2" (uuid 09db581c-6575-45f9-bba8-ce2962560993))
     (pin "3" (uuid efbc38fc-bc69-447c-8263-c98d932fb118))
     (pin "4" (uuid e215396a-8b39-49cb-9083-ea3c8c715e2e))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "D3") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 88.9 33.02 90) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid c9a6c936-034e-4e30-bfbd-7d979bef3718)
-    (property "Reference" "R12" (id 0) (at 88.265 31.115 90))
-    (property "Value" "0" (id 1) (at 88.9 33.02 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 88.9 33.02 0)
+    (property "Reference" "R12" (at 88.265 31.115 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "0" (at 88.9 33.02 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 88.9 33.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 88.9 33.02 0)
+    (property "Datasheet" "~" (at 88.9 33.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d820ddd9-c670-4dec-bdbe-523b63fb879e))
     (pin "2" (uuid 1b31a9ca-e1a0-48a4-a09f-67e940cbe31b))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R12") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 100.965 107.315 90) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid cd2b80ee-4278-4cc9-826d-1343b57a7f1b)
-    (property "Reference" "R15" (id 0) (at 100.33 103.505 90))
-    (property "Value" "1k" (id 1) (at 100.965 105.41 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 100.965 107.315 0)
+    (property "Reference" "R15" (at 100.33 103.505 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "1k" (at 100.965 105.41 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 100.965 107.315 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 100.965 107.315 0)
+    (property "Datasheet" "~" (at 100.965 107.315 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0462e62e-4b37-481e-8dbf-f5eb801b4d91))
     (pin "2" (uuid c9b5a5a6-7200-4ed4-9a68-b5d153f891af))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R15") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 21.59 86.36 180) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid d029bffb-7f37-4e06-af6b-7fe2b7f86d08)
-    (property "Reference" "J2" (id 0) (at 21.59 81.28 0))
-    (property "Value" "PH2.54_02" (id 1) (at 19.05 85.09 90))
-    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (id 2) (at 21.59 86.36 0)
+    (property "Reference" "J2" (at 21.59 81.28 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "PH2.54_02" (at 19.05 85.09 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (at 21.59 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 21.59 86.36 0)
+    (property "Datasheet" "~" (at 21.59 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9d4a8030-40ce-4f70-93aa-8de8cc1d860c))
     (pin "2" (uuid 856563ef-b30d-4d2c-8e32-4d2ebccdc6b8))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J2") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 35.56 147.32 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid d0366d65-1516-4260-b374-8b727245384f)
-    (property "Reference" "C4" (id 0) (at 33.02 148.59 90)
+    (property "Reference" "C4" (at 33.02 148.59 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100n" (id 1) (at 37.465 147.32 0)
+    (property "Value" "100n" (at 37.465 147.32 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 35.56 147.32 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 35.56 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 35.56 147.32 0)
+    (property "Datasheet" "~" (at 35.56 147.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 19b8dcf4-1435-46c2-892e-6597d2c35803))
     (pin "2" (uuid f7b7503c-9cac-46ee-b352-e4d150b38217))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C4") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "V0-Display:SolderJumper_3") (at 143.51 40.005 90) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid d05a7fb0-2f5e-494c-b173-a286443bfbe3)
-    (property "Reference" "JP2" (id 0) (at 141.8591 39.1703 90)
+    (property "Reference" "JP2" (at 141.8591 39.1703 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "Pin1" (id 1) (at 141.8591 41.7072 90)
+    (property "Value" "Pin1" (at 141.8591 41.7072 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "V0-Display:SolderJumper-3_P1.3mm_Pad1.0x1.5mm" (id 2) (at 143.51 40.005 0)
+    (property "Footprint" "V0-Display:SolderJumper-3_P1.3mm_Pad1.0x1.5mm" (at 143.51 40.005 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 143.51 40.005 0)
+    (property "Datasheet" "~" (at 143.51 40.005 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid bacb0cb7-0f71-4382-b6af-078630f27b71))
     (pin "2" (uuid e1e1e2bf-3bee-454d-83af-b19ede887729))
     (pin "3" (uuid 40b8e4f0-c5ae-445d-97ec-669fac15c7d1))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "JP2") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Transistor_FET:AO3400A") (at 149.225 174.625 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid d1dfaf32-8f0b-4d8d-83e6-2c5c56dea190)
-    (property "Reference" "Q1" (id 0) (at 154.432 173.7903 0)
+    (property "Reference" "Q1" (at 154.432 173.7903 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "AO3400A" (id 1) (at 154.432 176.3272 0)
+    (property "Value" "AO3400A" (at 154.432 176.3272 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 154.305 176.53 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (at 154.305 176.53 0)
       (effects (font (size 1.27 1.27) italic) (justify left) hide)
     )
-    (property "Datasheet" "http://www.aosmd.com/pdfs/datasheet/AO3400A.pdf" (id 3) (at 149.225 174.625 0)
+    (property "Datasheet" "http://www.aosmd.com/pdfs/datasheet/AO3400A.pdf" (at 149.225 174.625 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
     (pin "1" (uuid c5e8908e-1b59-460e-acfd-8521aaf3b2cc))
     (pin "2" (uuid 8c6cb0bc-1ba6-4bad-ace4-5b4aeaf1da3c))
     (pin "3" (uuid e26cf291-2fbf-4365-8253-48d6b9ff9db0))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "Q1") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 85.725 110.49 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid d3af136c-970c-41bf-aef7-9cfdcbf40957)
-    (property "Reference" "#PWR031" (id 0) (at 85.725 116.84 0)
+    (property "Reference" "#PWR031" (at 85.725 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 85.725 114.3 0))
-    (property "Footprint" "" (id 2) (at 85.725 110.49 0)
+    (property "Value" "GND" (at 85.725 114.3 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 85.725 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 85.725 110.49 0)
+    (property "Datasheet" "" (at 85.725 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0419d330-b85f-4e7e-b8f7-511654d9d785))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR031") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 33.655 87.63 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid d6219088-e289-4805-b29d-6e612c2f5dbb)
-    (property "Reference" "C1" (id 0) (at 31.115 88.9 90)
+    (property "Reference" "C1" (at 31.115 88.9 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "10u" (id 1) (at 35.56 87.63 0)
+    (property "Value" "10u" (at 35.56 87.63 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 33.655 87.63 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 33.655 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 33.655 87.63 0)
+    (property "Datasheet" "~" (at 33.655 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 31743aa9-2f85-4966-a768-9fe41426c8d0))
     (pin "2" (uuid ff136470-5d4b-461d-a9f8-416d1b0d7381))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C1") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 31.75 143.51 90) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid d6897c60-ac04-4f63-955e-286788cf3800)
-    (property "Reference" "R4" (id 0) (at 31.115 139.7 90))
-    (property "Value" "1k" (id 1) (at 31.75 141.605 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 31.75 143.51 0)
+    (property "Reference" "R4" (at 31.115 139.7 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "1k" (at 31.75 141.605 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 31.75 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 31.75 143.51 0)
+    (property "Datasheet" "~" (at 31.75 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b2f17259-b79f-4b84-82c3-b9d887cd79ad))
     (pin "2" (uuid 49408c1d-affa-4d73-b8b6-c9245f0a9a1c))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R4") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 56.515 151.13 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid df3e773c-6ad5-49f8-a04e-cdf832394648)
-    (property "Reference" "#PWR018" (id 0) (at 56.515 157.48 0)
+    (property "Reference" "#PWR018" (at 56.515 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 56.515 154.94 0))
-    (property "Footprint" "" (id 2) (at 56.515 151.13 0)
+    (property "Value" "GND" (at 56.515 154.94 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 56.515 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 56.515 151.13 0)
+    (property "Datasheet" "" (at 56.515 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a8a051ad-8459-4bf8-a35f-56365083d1d2))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR018") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "V0-Display:USB_B_Micro") (at 22.86 29.845 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid e0a255e5-301a-4cfd-a068-f2cc35d9a04f)
-    (property "Reference" "J6" (id 0) (at 22.86 19.05 0))
-    (property "Value" "USB_B_Micro" (id 1) (at 22.86 21.0621 0))
-    (property "Footprint" "V0-Display:MolexVertical&Horizontal_MicroB" (id 2) (at 26.67 31.115 0)
+    (property "Reference" "J6" (at 22.86 19.05 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "USB_B_Micro" (at 22.86 21.0621 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "V0-Display:MolexVertical&Horizontal_MicroB" (at 26.67 31.115 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 26.67 31.115 0)
+    (property "Datasheet" "~" (at 26.67 31.115 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8901aab8-5621-4c9b-8c76-2254e4e6557b))
@@ -5552,636 +6524,401 @@
     (pin "4" (uuid e6cc954f-d86b-4582-a481-df1f8692a1d0))
     (pin "5" (uuid 9617b02c-165a-4f7b-9566-ac844a8bd814))
     (pin "6" (uuid a121fc48-18d7-436b-9b47-59b981fe0bca))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J6") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 50.165 146.05 180) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid e0ebb204-90ee-4fd3-ab25-7ab5d555d19a)
-    (property "Reference" "J10" (id 0) (at 50.165 140.97 0))
-    (property "Value" "PH2.54_02" (id 1) (at 47.625 144.78 90))
-    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (id 2) (at 50.165 146.05 0)
+    (property "Reference" "J10" (at 50.165 140.97 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "PH2.54_02" (at 47.625 144.78 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (at 50.165 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 50.165 146.05 0)
+    (property "Datasheet" "~" (at 50.165 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 07c9abac-9e3a-421a-9a64-99a1d82dca5d))
     (pin "2" (uuid 79d7d95e-40c8-41b4-8e93-59f49b72fe79))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J10") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 35.56 110.49 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid e68c3671-7821-46b7-a575-21d7ff80ddd7)
-    (property "Reference" "C2" (id 0) (at 33.02 111.76 90)
+    (property "Reference" "C2" (at 33.02 111.76 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100n" (id 1) (at 37.465 110.49 0)
+    (property "Value" "100n" (at 37.465 110.49 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 35.56 110.49 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 35.56 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 35.56 110.49 0)
+    (property "Datasheet" "~" (at 35.56 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 73fc0b5f-c667-4cad-a694-83427f937896))
     (pin "2" (uuid 13e3cd3f-e0b4-4f85-bbb1-b92e2a8f6ce2))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C2") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Connector_Generic:Conn_01x02") (at 21.59 127.635 180) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid e9f69746-91ca-45d5-8ab8-58fb0a568c85)
-    (property "Reference" "J4" (id 0) (at 21.59 122.555 0))
-    (property "Value" "PH2.54_02" (id 1) (at 19.05 126.365 90))
-    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (id 2) (at 21.59 127.635 0)
+    (property "Reference" "J4" (at 21.59 122.555 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "PH2.54_02" (at 19.05 126.365 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical" (at 21.59 127.635 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 21.59 127.635 0)
+    (property "Datasheet" "~" (at 21.59 127.635 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b3e5f61e-85c7-4810-b26b-6537076e75a1))
     (pin "2" (uuid 21a9fd7f-e106-4849-9787-82f4e3c1b397))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "J4") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:PWR_FLAG") (at 106.68 31.75 270) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid ec0a2dd0-1c77-4b21-8f90-96ffa30500bf)
-    (property "Reference" "#FLG0102" (id 0) (at 108.585 31.75 0)
+    (property "Reference" "#FLG0102" (at 108.585 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "PWR_FLAG" (id 1) (at 109.855 32.1838 90)
+    (property "Value" "PWR_FLAG" (at 109.855 32.1838 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 106.68 31.75 0)
+    (property "Footprint" "" (at 106.68 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 106.68 31.75 0)
+    (property "Datasheet" "~" (at 106.68 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 93c827c4-5211-4079-90ff-eb0910fbd5d6))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#FLG0102") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 135.89 187.325 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid ec3e3234-3724-4ca6-a7e3-27d223b9105e)
-    (property "Reference" "#PWR053" (id 0) (at 135.89 193.675 0)
+    (property "Reference" "#PWR053" (at 135.89 193.675 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 135.89 191.135 0))
-    (property "Footprint" "" (id 2) (at 135.89 187.325 0)
+    (property "Value" "GND" (at 135.89 191.135 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 135.89 187.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 135.89 187.325 0)
+    (property "Datasheet" "" (at 135.89 187.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 11811edf-2587-4f6f-9e5a-a10260cf1340))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR053") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 135.89 183.515 180) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid ecfaeb4b-64c0-4c8e-8b87-981ab5b8de12)
-    (property "Reference" "R18" (id 0) (at 133.985 183.515 90))
-    (property "Value" "10k" (id 1) (at 137.795 183.515 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 135.89 183.515 0)
+    (property "Reference" "R18" (at 133.985 183.515 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "10k" (at 137.795 183.515 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 135.89 183.515 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 135.89 183.515 0)
+    (property "Datasheet" "~" (at 135.89 183.515 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9fece885-8dcb-4912-89b0-548726af09b2))
     (pin "2" (uuid 86c1f903-f268-48fe-9c17-30a6a3d84808))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R18") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GNDA") (at 27.94 90.805 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid efb02f2d-5c8b-417c-8ada-e0a7211fe807)
-    (property "Reference" "#PWR03" (id 0) (at 27.94 97.155 0)
+    (property "Reference" "#PWR03" (at 27.94 97.155 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GNDA" (id 1) (at 27.94 94.615 0))
-    (property "Footprint" "" (id 2) (at 27.94 90.805 0)
+    (property "Value" "GNDA" (at 27.94 94.615 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 27.94 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 27.94 90.805 0)
+    (property "Datasheet" "" (at 27.94 90.805 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c07b880b-5be6-42d6-b3fa-80b0697f2155))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR03") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 100.33 166.37 180) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid f093ea88-d206-4ea7-942c-9fb8678e2183)
-    (property "Reference" "R14" (id 0) (at 98.425 167.005 90))
-    (property "Value" "10k" (id 1) (at 102.235 166.37 90))
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 100.33 166.37 0)
+    (property "Reference" "R14" (at 98.425 167.005 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "10k" (at 102.235 166.37 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 100.33 166.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 100.33 166.37 0)
+    (property "Datasheet" "~" (at 100.33 166.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e873b2be-ec7d-4eb9-a4c8-e753945f702b))
     (pin "2" (uuid edbd3970-58ec-409f-9cf5-41b26529e2f7))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R14") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 219.71 27.305 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid f0c64b5f-8006-4371-a434-80e80a0de447)
-    (property "Reference" "C15" (id 0) (at 220.2773 25.7766 0)
+    (property "Reference" "C15" (at 220.2773 25.7766 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100n" (id 1) (at 220.345 29.21 0)
+    (property "Value" "100n" (at 220.345 29.21 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 219.71 27.305 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 219.71 27.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 219.71 27.305 0)
+    (property "Datasheet" "~" (at 219.71 27.305 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e5f3ae0a-5266-4fcd-9889-4019ed3738e7))
     (pin "2" (uuid b4605bfe-fa46-4fbe-91bb-d69eeb6c5239))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C15") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 35.56 132.715 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid f14ed543-0f6b-451b-adac-8cfcbf82598b)
-    (property "Reference" "#PWR011" (id 0) (at 35.56 139.065 0)
+    (property "Reference" "#PWR011" (at 35.56 139.065 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 35.56 136.525 0))
-    (property "Footprint" "" (id 2) (at 35.56 132.715 0)
+    (property "Value" "GND" (at 35.56 136.525 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 35.56 132.715 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 35.56 132.715 0)
+    (property "Datasheet" "" (at 35.56 132.715 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3baef43a-5db9-42ff-b9c6-2e76a07d368b))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR011") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 100.33 170.18 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid f3e7d28f-9592-43fe-bc6f-2de00db5f66b)
-    (property "Reference" "#PWR038" (id 0) (at 100.33 176.53 0)
+    (property "Reference" "#PWR038" (at 100.33 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 100.33 173.99 0))
-    (property "Footprint" "" (id 2) (at 100.33 170.18 0)
+    (property "Value" "GND" (at 100.33 173.99 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 100.33 170.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 100.33 170.18 0)
+    (property "Datasheet" "" (at 100.33 170.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 94752c0a-e768-44a2-9218-91e644ec9355))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR038") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:R_Small") (at 140.335 174.625 270) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid f57e89c9-260f-4d11-93b4-f2c294de59ac)
-    (property "Reference" "R16" (id 0) (at 140.335 172.72 90))
-    (property "Value" "100" (id 1) (at 138.43 176.53 90)
+    (property "Reference" "R16" (at 140.335 172.72 90)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "100" (at 138.43 176.53 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (id 2) (at 140.335 174.625 0)
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (at 140.335 174.625 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 140.335 174.625 0)
+    (property "Datasheet" "~" (at 140.335 174.625 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0c3377c8-ae90-4e72-ab3f-87312cb60bd4))
     (pin "2" (uuid c1751843-9faa-4e73-8f78-9c6ccde97f0a))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "R16") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "Device:C_Small") (at 104.775 111.125 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid f5842af8-6c45-4a6a-a9c7-8cb81affa27d)
-    (property "Reference" "C13" (id 0) (at 102.235 112.395 90)
+    (property "Reference" "C13" (at 102.235 112.395 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "100n" (id 1) (at 106.68 111.125 0)
+    (property "Value" "100n" (at 106.68 111.125 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (id 2) (at 104.775 111.125 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (at 104.775 111.125 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 104.775 111.125 0)
+    (property "Datasheet" "~" (at 104.775 111.125 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 093765ac-acc9-4d94-8b66-6286a12f7957))
     (pin "2" (uuid 5a1ab896-259b-4070-999a-0e1d81a9132e))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "C13") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "my_additions:BAV99_Small") (at 45.085 83.82 270) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid fc9d589d-8e6e-4fdd-ac02-8efa14c63e2c)
-    (property "Reference" "D1" (id 0) (at 46.355 82.55 90)
+    (property "Reference" "D1" (at 46.355 82.55 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "BAV99" (id 1) (at 46.355 85.09 90)
+    (property "Value" "BAV99" (at 46.355 85.09 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (id 2) (at 40.005 83.82 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23" (at 40.005 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" (id 3) (at 38.1 83.82 0)
+    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" (at 38.1 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c608d2f3-af91-4195-b645-d16a5c185035))
     (pin "2" (uuid 0ba296ba-9889-4c4a-9484-343d2c8e0dbe))
     (pin "3" (uuid 13b935b1-0633-40e2-a679-8ffa4e6ad221))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "D1") (unit 1)
+        )
+      )
+    )
   )
 
   (symbol (lib_id "power:GND") (at 151.765 187.325 0) (unit 1)
-    (in_bom yes) (on_board yes)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid fcffe770-3879-4fec-877f-40b65a85d157)
-    (property "Reference" "#PWR044" (id 0) (at 151.765 193.675 0)
+    (property "Reference" "#PWR044" (at 151.765 193.675 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 151.765 191.135 0))
-    (property "Footprint" "" (id 2) (at 151.765 187.325 0)
+    (property "Value" "GND" (at 151.765 191.135 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "" (at 151.765 187.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 151.765 187.325 0)
+    (property "Datasheet" "" (at 151.765 187.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2689b5d6-d39d-40c9-8483-18df87599bdd))
+    (instances
+      (project "V0_McDisplay"
+        (path "/79976d84-8f91-4d37-9c84-30893cab9eeb"
+          (reference "#PWR044") (unit 1)
+        )
+      )
+    )
   )
 
   (sheet_instances
     (path "/" (page "1"))
   )
-
-  (symbol_instances
-    (path "/a2d9b30e-9488-44a2-b271-4366e5242ae6"
-      (reference "#FLG0101") (unit 1) (value "PWR_FLAG") (footprint "")
-    )
-    (path "/ec0a2dd0-1c77-4b21-8f90-96ffa30500bf"
-      (reference "#FLG0102") (unit 1) (value "PWR_FLAG") (footprint "")
-    )
-    (path "/0012680c-df0a-43a1-b282-4d19764431c9"
-      (reference "#PWR01") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/2c3451a1-b3d4-486d-9601-e6cc6b7b1931"
-      (reference "#PWR02") (unit 1) (value "+3.3VA") (footprint "")
-    )
-    (path "/efb02f2d-5c8b-417c-8ada-e0a7211fe807"
-      (reference "#PWR03") (unit 1) (value "GNDA") (footprint "")
-    )
-    (path "/c1d09a23-803c-4de6-85c3-4aedad7969ee"
-      (reference "#PWR04") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/53c020e9-e1b3-46a9-9f2f-a8f53069a25f"
-      (reference "#PWR05") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/4f5765d9-c2ff-4398-8847-2000f68e640e"
-      (reference "#PWR06") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/7751bb92-1369-4559-8492-1ba2a312c77a"
-      (reference "#PWR07") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/83d22f92-6296-4701-b1a5-8dc601584ce3"
-      (reference "#PWR08") (unit 1) (value "GNDA") (footprint "")
-    )
-    (path "/558b1aa4-5b1a-4a10-83fa-27ba4beaaa4a"
-      (reference "#PWR09") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/bca0788c-ec37-42bf-8127-c4506c9e094c"
-      (reference "#PWR010") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/f14ed543-0f6b-451b-adac-8cfcbf82598b"
-      (reference "#PWR011") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/2c44cf0a-fc29-4920-bb00-1a8d3b209f88"
-      (reference "#PWR012") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/70ea0e4b-4537-44bb-a679-1af603f0bbee"
-      (reference "#PWR013") (unit 1) (value "+3.3V") (footprint "")
-    )
-    (path "/6c1f9f1d-ea16-4caf-8e6b-6274d9f91821"
-      (reference "#PWR014") (unit 1) (value "+3.3VA") (footprint "")
-    )
-    (path "/0300a7f0-b2c7-4e6f-b482-28eb7bfab058"
-      (reference "#PWR015") (unit 1) (value "GNDA") (footprint "")
-    )
-    (path "/6c2c4791-c787-4cf5-a07a-f71afa741cc6"
-      (reference "#PWR016") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/6e0c4926-ea8f-4bba-bcb7-8e17a776a921"
-      (reference "#PWR017") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/df3e773c-6ad5-49f8-a04e-cdf832394648"
-      (reference "#PWR018") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/0accd64e-36df-44c8-88a9-2d287e4200af"
-      (reference "#PWR019") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/05d0381b-d416-4708-bdb9-b1a947e130ed"
-      (reference "#PWR020") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/1f66c137-d377-42c8-a789-6948927d7567"
-      (reference "#PWR021") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/3c80aef9-1180-4ec2-a35a-a3ccd0ff599f"
-      (reference "#PWR022") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/1b0fcda0-1cb0-4bf0-b757-f9503aa02789"
-      (reference "#PWR023") (unit 1) (value "+3.3VA") (footprint "")
-    )
-    (path "/504404ff-eaae-4e1c-9d27-dfa681e76755"
-      (reference "#PWR024") (unit 1) (value "GNDA") (footprint "")
-    )
-    (path "/59f52f80-f648-4da8-b7ad-d84b2ec7b65a"
-      (reference "#PWR025") (unit 1) (value "+3.3V") (footprint "")
-    )
-    (path "/61269e13-8bcf-4692-ac02-f481239ef2f5"
-      (reference "#PWR026") (unit 1) (value "GNDA") (footprint "")
-    )
-    (path "/04e9504e-0a4d-441b-a6a8-6fe978c99d47"
-      (reference "#PWR027") (unit 1) (value "+3.3VA") (footprint "")
-    )
-    (path "/9a930cd5-d327-4d9b-ba2c-c364d86c9828"
-      (reference "#PWR028") (unit 1) (value "GNDA") (footprint "")
-    )
-    (path "/77b2d59d-eb81-4ba0-88d6-69c5c7f51d8d"
-      (reference "#PWR029") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/21e7ce63-9b97-4a46-bf1a-386a3a6b6a4e"
-      (reference "#PWR030") (unit 1) (value "+3.3V") (footprint "")
-    )
-    (path "/d3af136c-970c-41bf-aef7-9cfdcbf40957"
-      (reference "#PWR031") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/4bcf78be-eaf2-425e-9c2c-6e9f4eb5d5c5"
-      (reference "#PWR032") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/1b40b74c-cf2f-425e-9249-12baa74687fe"
-      (reference "#PWR033") (unit 1) (value "GNDA") (footprint "")
-    )
-    (path "/444f9fd5-d0a7-4574-b06a-d54a1ca4f29b"
-      (reference "#PWR034") (unit 1) (value "+3.3VA") (footprint "")
-    )
-    (path "/1124b591-f5e1-4d56-aa77-3cc3658b0f82"
-      (reference "#PWR035") (unit 1) (value "GNDA") (footprint "")
-    )
-    (path "/04e8ace2-f286-448e-a5c0-ab970ab8d169"
-      (reference "#PWR036") (unit 1) (value "+3.3V") (footprint "")
-    )
-    (path "/28f1c391-4443-417a-8e35-a8c09c48effc"
-      (reference "#PWR037") (unit 1) (value "+3.3V") (footprint "")
-    )
-    (path "/f3e7d28f-9592-43fe-bc6f-2de00db5f66b"
-      (reference "#PWR038") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/b0f3c15e-6291-46dc-977c-894f41f8928e"
-      (reference "#PWR039") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/99769f36-bdec-4e17-8fb8-66068b95b5ec"
-      (reference "#PWR040") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/6057eba2-06da-4cd2-9385-322f09fb49f1"
-      (reference "#PWR041") (unit 1) (value "+3.3V") (footprint "")
-    )
-    (path "/8267c927-12ba-47d6-884b-ae707f4c9b20"
-      (reference "#PWR042") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/34f82032-6164-4356-9921-20b9dbecbafc"
-      (reference "#PWR043") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/fcffe770-3879-4fec-877f-40b65a85d157"
-      (reference "#PWR044") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/59dfded5-f8f5-4a40-9362-d6270a9ce48a"
-      (reference "#PWR045") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/6951bf28-a326-4f9b-8cf1-5e181d29f4ee"
-      (reference "#PWR046") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/9971d12c-7178-4b50-9cf2-81730b3fad8b"
-      (reference "#PWR047") (unit 1) (value "+3.3V") (footprint "")
-    )
-    (path "/770757e1-04da-45b7-8388-e1104d335ba3"
-      (reference "#PWR048") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/31c038de-1d67-4127-a2ac-6c565136c7eb"
-      (reference "#PWR049") (unit 1) (value "+3.3V") (footprint "")
-    )
-    (path "/018a983b-efc0-4ff5-a291-397509fd4164"
-      (reference "#PWR050") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/14ee3afb-a53e-42d9-9a50-e102d97b860b"
-      (reference "#PWR051") (unit 1) (value "GNDA") (footprint "")
-    )
-    (path "/49785aa4-eb66-401f-afca-b7774f4bdd23"
-      (reference "#PWR052") (unit 1) (value "+3.3VA") (footprint "")
-    )
-    (path "/ec3e3234-3724-4ca6-a7e3-27d223b9105e"
-      (reference "#PWR053") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/3e2b7895-80cb-45c1-a065-ff11a5e1341f"
-      (reference "#PWR054") (unit 1) (value "+3.3V") (footprint "")
-    )
-    (path "/b44a8399-57cd-4ddf-965e-74b1b323dbfe"
-      (reference "BZ1") (unit 1) (value "5020 buzzer") (footprint "my_additions:Buzzer_5020")
-    )
-    (path "/d6219088-e289-4805-b29d-6e612c2f5dbb"
-      (reference "C1") (unit 1) (value "10u") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/e68c3671-7821-46b7-a575-21d7ff80ddd7"
-      (reference "C2") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/6c384690-4e87-4670-9124-304909d7a075"
-      (reference "C3") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/d0366d65-1516-4260-b374-8b727245384f"
-      (reference "C4") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/71100107-b8b2-4f05-9bc3-d8fdf218ea0c"
-      (reference "C5") (unit 1) (value "4u7") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/9ea55a84-3dae-4824-a2cb-3e37727771fe"
-      (reference "C6") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/55c18011-1439-45a8-b154-7ac20505faf8"
-      (reference "C7") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/2634f930-c051-4253-98ff-1060e13d43a6"
-      (reference "C8") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/13434b00-2a4f-4bb9-9455-d8c802f1239c"
-      (reference "C9") (unit 1) (value "4u7") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/2be227d8-80ea-4637-8578-3495c1af24c8"
-      (reference "C10") (unit 1) (value "10u") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/16c99d6e-8612-450a-8042-d10277374099"
-      (reference "C11") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/0182be02-3c04-4b29-8d23-d639ca1cffef"
-      (reference "C12") (unit 1) (value "10n") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/f5842af8-6c45-4a6a-a9c7-8cb81affa27d"
-      (reference "C13") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/3d4d9c10-d0b4-4743-a111-dd16933890cd"
-      (reference "C14") (unit 1) (value "4u7") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/f0c64b5f-8006-4371-a434-80e80a0de447"
-      (reference "C15") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/86c9ce96-d2e4-4a3a-b1f3-2c8b3b5b4723"
-      (reference "C16") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/7b718e77-4a08-412b-a122-811508060752"
-      (reference "C17") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder")
-    )
-    (path "/fc9d589d-8e6e-4fdd-ac02-8efa14c63e2c"
-      (reference "D1") (unit 1) (value "BAV99") (footprint "Package_TO_SOT_SMD:SOT-23")
-    )
-    (path "/8232e863-da91-4663-8a63-93dbc5f10dcb"
-      (reference "D2") (unit 1) (value "BAV99") (footprint "Package_TO_SOT_SMD:SOT-23")
-    )
-    (path "/c87e9e75-d199-43c4-8134-da78240736a9"
-      (reference "D3") (unit 1) (value "WS2812B") (footprint "V0-Display:WS2812_5050_LED")
-    )
-    (path "/2a1f8fb7-cee1-4cd8-abc3-39dd0b5cfc50"
-      (reference "FB1") (unit 1) (value "100@100MHz") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/436a6066-0c35-4774-9203-93a1c5c83129"
-      (reference "H1") (unit 1) (value "M3") (footprint "V0-Display:MountingHole_3.2mm_M3")
-    )
-    (path "/7e89b309-b0a6-481a-bc25-5e051512a29e"
-      (reference "H2") (unit 1) (value "M3") (footprint "V0-Display:MountingHole_3.2mm_M3")
-    )
-    (path "/ad539111-50b4-4775-902b-63ab9de8749f"
-      (reference "H3") (unit 1) (value "M3") (footprint "V0-Display:MountingHole_3.2mm_M3")
-    )
-    (path "/8226fe5a-0a78-4e74-94b9-228e9aed9f56"
-      (reference "H4") (unit 1) (value "M3") (footprint "V0-Display:MountingHole_3.2mm_M3")
-    )
-    (path "/3ceb50eb-c7c0-4a1e-91f3-5082c1c00912"
-      (reference "J1") (unit 1) (value "PH2.54_04") (footprint "Connector_JST:JST_XH_B4B-XH-A_1x04_P2.50mm_Vertical")
-    )
-    (path "/d029bffb-7f37-4e06-af6b-7fe2b7f86d08"
-      (reference "J2") (unit 1) (value "PH2.54_02") (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical")
-    )
-    (path "/92182580-bc35-4ca8-813d-528cee82c45f"
-      (reference "J3") (unit 1) (value "PH2.54_02") (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical")
-    )
-    (path "/e9f69746-91ca-45d5-8ab8-58fb0a568c85"
-      (reference "J4") (unit 1) (value "PH2.54_02") (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical")
-    )
-    (path "/6603a291-e3a9-4705-a380-dff8176a1a61"
-      (reference "J5") (unit 1) (value "PH2.54_02") (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical")
-    )
-    (path "/e0a255e5-301a-4cfd-a068-f2cc35d9a04f"
-      (reference "J6") (unit 1) (value "USB_B_Micro") (footprint "V0-Display:MolexVertical&Horizontal_MicroB")
-    )
-    (path "/3f5a68a1-4e2c-4487-9035-3bf6e51d839c"
-      (reference "J7") (unit 1) (value "ST-Link V3") (footprint "Connector_PinHeader_1.27mm:PinHeader_2x07_P1.27mm_Vertical_SMD")
-    )
-    (path "/c59d2644-9a71-42de-8e8a-7677a25f1847"
-      (reference "J8") (unit 1) (value "PH2.54_02") (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical")
-    )
-    (path "/01b11df2-b039-4c5d-bda9-af5a93868787"
-      (reference "J9") (unit 1) (value "PH2.54_02") (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical")
-    )
-    (path "/e0ebb204-90ee-4fd3-ab25-7ab5d555d19a"
-      (reference "J10") (unit 1) (value "PH2.54_02") (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical")
-    )
-    (path "/c2ea99a3-6bde-4d0a-9bea-d3e250289ee4"
-      (reference "J11") (unit 1) (value "PH2.54_02") (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical")
-    )
-    (path "/b775e5ef-57ae-4408-a5e7-74c9bb086edd"
-      (reference "J12") (unit 1) (value "Conn_01x02") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical")
-    )
-    (path "/559659de-8fba-42aa-a4c2-5d8f603e64e9"
-      (reference "J13") (unit 1) (value "GPIO") (footprint "Connector_PinHeader_2.54mm:PinHeader_2x04_P2.54mm_Vertical")
-    )
-    (path "/67549766-f7ff-4908-a7d4-f34b917df88f"
-      (reference "J14") (unit 1) (value "Display") (footprint "V0-Display:1pt3in_OLED")
-    )
-    (path "/54dc7b9c-e777-4dc4-b273-04ee9c36bf07"
-      (reference "J15") (unit 1) (value "PH2.54_02") (footprint "Connector_JST:JST_XH_B2B-XH-A_1x02_P2.50mm_Vertical")
-    )
-    (path "/02cf0e5d-3b8a-44f3-b588-08edbf2d8bed"
-      (reference "JP1") (unit 1) (value "Pin2") (footprint "V0-Display:SolderJumper-3_P1.3mm_Pad1.0x1.5mm")
-    )
-    (path "/d05a7fb0-2f5e-494c-b173-a286443bfbe3"
-      (reference "JP2") (unit 1) (value "Pin1") (footprint "V0-Display:SolderJumper-3_P1.3mm_Pad1.0x1.5mm")
-    )
-    (path "/d1dfaf32-8f0b-4d8d-83e6-2c5c56dea190"
-      (reference "Q1") (unit 1) (value "AO3400A") (footprint "Package_TO_SOT_SMD:SOT-23")
-    )
-    (path "/4e14649c-4bdd-46c5-91bf-f5c4ac2529f5"
-      (reference "R1") (unit 1) (value "4k7") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/4896505e-a850-4bba-8318-6b86561646b4"
-      (reference "R2") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/4ed11648-fc7e-4003-86ad-895d3d3704ac"
-      (reference "R3") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/d6897c60-ac04-4f63-955e-286788cf3800"
-      (reference "R4") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/3f93c667-e38c-4973-afe0-6974a70fa51c"
-      (reference "R5") (unit 1) (value "100") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/9e955eb1-fcc8-4549-ad26-449d91e1350f"
-      (reference "R6") (unit 1) (value "22") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/12cdaa58-9bee-42f2-86e7-35780a953e99"
-      (reference "R7") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/b2fd770f-9ed4-4f7f-8811-d4b3053ec59e"
-      (reference "R8") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/13a2de41-44f2-40c7-9a2c-e9123f1d1d63"
-      (reference "R9") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/b0c5f90e-c7ef-4422-9684-da26b11c77b8"
-      (reference "R10") (unit 1) (value "4k7") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/c56ef126-34f0-4c7f-aa2f-5961df1a0cdb"
-      (reference "R11") (unit 1) (value "22") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/c9a6c936-034e-4e30-bfbd-7d979bef3718"
-      (reference "R12") (unit 1) (value "0") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/2203af60-7987-405b-aae5-f77eb2351ca4"
-      (reference "R13") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/f093ea88-d206-4ea7-942c-9fb8678e2183"
-      (reference "R14") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/cd2b80ee-4278-4cc9-826d-1343b57a7f1b"
-      (reference "R15") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/f57e89c9-260f-4d11-93b4-f2c294de59ac"
-      (reference "R16") (unit 1) (value "100") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/76a79e3d-c9c1-4992-849b-f73cc746eddc"
-      (reference "R17") (unit 1) (value "68") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/ecfaeb4b-64c0-4c8e-8b87-981ab5b8de12"
-      (reference "R18") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder")
-    )
-    (path "/aae496e3-dea1-40e2-813d-d908db9cb4e1"
-      (reference "SW1") (unit 1) (value "Tact_switch") (footprint "V0-Display:SW_PUSH_6mm")
-    )
-    (path "/b37bd078-ee1e-467d-8fe9-806ea98d005c"
-      (reference "SW2") (unit 1) (value "Tact_switch") (footprint "V0-Display:SW_PUSH_6mm")
-    )
-    (path "/57762299-7792-4ff0-b6c4-c18e6bb441c3"
-      (reference "SW3") (unit 1) (value "RotaryEncoder_Switch") (footprint "V0-Display:EN11_Encoder")
-    )
-    (path "/9d5f2293-24a3-4a32-a382-b3910273b4b1"
-      (reference "U1") (unit 1) (value "HT7533") (footprint "Package_TO_SOT_SMD:SOT-89-3")
-    )
-    (path "/bd254e6b-22a6-4c62-a8d4-b6576707c115"
-      (reference "U2") (unit 1) (value "74LVC1G17") (footprint "V0-Display:SOT-23-5")
-    )
-    (path "/02ad564b-979f-4a86-b276-d8e620bb1976"
-      (reference "U3") (unit 1) (value "STM32F072C8Tx") (footprint "Package_QFP:LQFP-48_7x7mm_P0.5mm")
-    )
-  )
 )
diff --git a/kicad/sym-lib-table b/kicad/sym-lib-table
index 081f00c..d4fdde0 100644
--- a/kicad/sym-lib-table
+++ b/kicad/sym-lib-table
@@ -1,3 +1,4 @@
 (sym_lib_table
+  (version 7)
   (lib (name "V0-Display")(type "KiCad")(uri "${KIPRJMOD}/Library/V0-Display.kicad_sym")(options "")(descr ""))
 )