From 73b25efb64dd4ff2654fd9bb6f1df1296a203084 Mon Sep 17 00:00:00 2001
From: Marc Poulhiès <dkm@kataplop.net>
Date: Thu, 19 May 2022 21:55:43 +0200
Subject: New revision for PouetPouet board

What is changing:
 - Cherry-MX hotswap sockets for all 60 switches
 - Per switch RGB LED (SK6812-MiniE)

What is not changing:
 - Size (exact same board cutout)
 - overall components (mcu stmf072)

Even if these are small changes, I had to reroute everything, so the pcb has
been remade from scratch. The electrial schema has been kept really close to
initial version.

This should match the version sent to manufacturing, but you can really check
the aisler-order-220612 tag (should be the same files, only git history has
been cleaned/squashed).
---
 pcb/kicad/pouetpouet/pouetpouet.kicad_sch | 1616 ++++++++++++++++++-----------
 1 file changed, 1028 insertions(+), 588 deletions(-)

(limited to 'pcb/kicad/pouetpouet/pouetpouet.kicad_sch')

diff --git a/pcb/kicad/pouetpouet/pouetpouet.kicad_sch b/pcb/kicad/pouetpouet/pouetpouet.kicad_sch
index 6bcf634..d9a11f1 100644
--- a/pcb/kicad/pouetpouet/pouetpouet.kicad_sch
+++ b/pcb/kicad/pouetpouet/pouetpouet.kicad_sch
@@ -142,6 +142,41 @@
         )
       )
     )
+    (symbol "Connector:TestPoint" (pin_numbers hide) (pin_names (offset 0.762) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "TP" (id 0) (at 0 6.858 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Value" "TestPoint" (id 1) (at 0 5.08 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (id 2) (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "~" (id 3) (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "test point tp" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "test point" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "Pin* Test*" (id 6) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "TestPoint_0_1"
+        (circle (center 0 3.302) (radius 0.762)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+      )
+      (symbol "TestPoint_1_1"
+        (pin passive line (at 0 0 90) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "Connector:USB_C_Receptacle_USB2.0" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
       (property "Reference" "J" (id 0) (at -10.16 19.05 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -806,11 +841,11 @@
         )
       )
     )
-    (symbol "Mechanical:MountingHole_Pad" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "H" (id 0) (at 0 6.35 0)
+    (symbol "Mechanical:MountingHole" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
+      (property "Reference" "H" (id 0) (at 0 5.08 0)
         (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "MountingHole_Pad" (id 1) (at 0 4.445 0)
+      (property "Value" "MountingHole" (id 1) (at 0 3.175 0)
         (effects (font (size 1.27 1.27)))
       )
       (property "Footprint" "" (id 2) (at 0 0 0)
@@ -822,24 +857,18 @@
       (property "ki_keywords" "mounting hole" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Mounting Hole with connection" (id 5) (at 0 0 0)
+      (property "ki_description" "Mounting Hole without connection" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "MountingHole*Pad*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "MountingHole*" (id 6) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "MountingHole_Pad_0_1"
-        (circle (center 0 1.27) (radius 1.27)
+      (symbol "MountingHole_0_1"
+        (circle (center 0 0) (radius 1.27)
           (stroke (width 1.27) (type default) (color 0 0 0 0))
           (fill (type none))
         )
       )
-      (symbol "MountingHole_Pad_1_1"
-        (pin input line (at 0 -2.54 90) (length 2.54)
-          (name "1" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-      )
     )
     (symbol "Power_Protection:PRTR5V0U2X" (pin_names (offset 0)) (in_bom yes) (on_board yes)
       (property "Reference" "D" (id 0) (at 2.794 8.636 0)
@@ -1420,8 +1449,8 @@
   (junction (at 39.37 30.48) (diameter 0) (color 0 0 0 0)
     (uuid 4c0bc959-9f92-4e82-b500-e21031fce8b4)
   )
-  (junction (at 180.34 203.2) (diameter 0) (color 0 0 0 0)
-    (uuid 4d49c78c-fd0e-4050-82e0-9a8cb921086d)
+  (junction (at 309.88 143.51) (diameter 0) (color 0 0 0 0)
+    (uuid 4db08798-dc62-4b28-8101-d72a155ff530)
   )
   (junction (at 157.48 30.48) (diameter 0) (color 0 0 0 0)
     (uuid 4e58ca7f-a87b-4256-88d4-242988a8b916)
@@ -1486,6 +1515,9 @@
   (junction (at 276.86 60.96) (diameter 0) (color 0 0 0 0)
     (uuid 8521dc3b-2c34-430e-82f0-acd8670b7183)
   )
+  (junction (at 304.8 143.51) (diameter 0) (color 0 0 0 0)
+    (uuid 8729d3e4-daf7-4c96-9512-7833a50c2405)
+  )
   (junction (at 189.23 151.13) (diameter 0) (color 0 0 0 0)
     (uuid 8b3eebe4-eed2-4d94-8f7d-36c1da50982c)
   )
@@ -1519,12 +1551,6 @@
   (junction (at 154.94 30.48) (diameter 0) (color 0 0 0 0)
     (uuid b4438f7e-990d-4693-8079-a711ab14d2b6)
   )
-  (junction (at 204.47 203.2) (diameter 0) (color 0 0 0 0)
-    (uuid b677031a-e0ea-47f9-98eb-57db93b30741)
-  )
-  (junction (at 156.21 203.2) (diameter 0) (color 0 0 0 0)
-    (uuid bbab019c-7df0-4748-b665-4fee0a39913f)
-  )
   (junction (at 156.21 22.86) (diameter 0) (color 0 0 0 0)
     (uuid bcc0db37-b9ce-4362-95eb-59dc583cd888)
   )
@@ -1537,9 +1563,6 @@
   (junction (at 273.05 60.96) (diameter 0) (color 0 0 0 0)
     (uuid c1aaa231-60e7-4080-9cc1-f7727274edc0)
   )
-  (junction (at 118.11 203.2) (diameter 0) (color 0 0 0 0)
-    (uuid c4bd6a7f-38cd-427b-bffb-828c02ee06d5)
-  )
   (junction (at 266.7 140.97) (diameter 0) (color 0 0 0 0)
     (uuid c75dbb42-7ac6-4770-b601-12d378a4711f)
   )
@@ -1549,9 +1572,6 @@
   (junction (at 73.66 161.29) (diameter 0) (color 0 0 0 0)
     (uuid ce5b5ce1-ce41-42d1-a9cb-d08433d0b7e0)
   )
-  (junction (at 133.35 203.2) (diameter 0) (color 0 0 0 0)
-    (uuid d3d41c4a-ada5-40e9-bad0-c75d6a23d9b2)
-  )
   (junction (at 227.33 149.86) (diameter 0) (color 0 0 0 0)
     (uuid d4b7f99b-b072-48dd-a9ff-430f0e5d0b65)
   )
@@ -1570,6 +1590,9 @@
   (junction (at 39.37 151.13) (diameter 0) (color 0 0 0 0)
     (uuid ebad1e7c-b369-4460-8828-ea2cc42fa4b0)
   )
+  (junction (at 330.2 132.08) (diameter 0) (color 0 0 0 0)
+    (uuid f1edf95b-0ebf-47fa-955c-e655e8c2c0c5)
+  )
   (junction (at 180.34 22.86) (diameter 0) (color 0 0 0 0)
     (uuid fb5a60c6-8645-4dd0-a78e-770f03a93df9)
   )
@@ -1589,22 +1612,26 @@
     (uuid ff3482ec-170d-4ca7-8e63-61fbd80bbe2b)
   )
 
-  (no_connect (at 170.18 71.12) (uuid 0d40a063-45d6-47ae-98ec-792f86e5360b))
   (no_connect (at 257.81 50.8) (uuid 157fb692-340a-4534-aa85-d3c40f6817e8))
   (no_connect (at 137.16 48.26) (uuid 2d1a021d-bd06-442a-bf1d-1e35594cc751))
+  (no_connect (at 170.18 83.82) (uuid 3b7d40dc-0bf3-4554-b533-d56a8e323a82))
+  (no_connect (at 170.18 86.36) (uuid 3b7d40dc-0bf3-4554-b533-d56a8e323a83))
+  (no_connect (at 170.18 66.04) (uuid 6d18d06c-9ff2-4d10-b42c-ad56db34e788))
   (no_connect (at 170.18 78.74) (uuid 6fc0f5ec-ed5a-4c0a-a693-eb53fa1df1a5))
-  (no_connect (at 170.18 83.82) (uuid 783522db-eaf1-4329-972c-718686140f28))
+  (no_connect (at 170.18 71.12) (uuid 7ceeafc1-28a4-4028-95d2-4bd0523d473e))
+  (no_connect (at 170.18 68.58) (uuid 7ceeafc1-28a4-4028-95d2-4bd0523d473f))
   (no_connect (at 137.16 45.72) (uuid 7e51cdf3-9721-4740-a942-236244a5116a))
   (no_connect (at 170.18 76.2) (uuid 85e0d28f-4b98-4895-96bc-c21f8df6717f))
-  (no_connect (at 170.18 88.9) (uuid 92711fc8-27e9-4777-bd45-eb494ec2a330))
   (no_connect (at 137.16 58.42) (uuid cc3ed888-45e7-42b1-b00d-a3397d62af2b))
-  (no_connect (at 170.18 68.58) (uuid d58c114a-e77e-4a3f-83d5-12fe4a0419a9))
   (no_connect (at 137.16 55.88) (uuid e4bdf7fa-f220-4441-9477-0275b7b6f454))
   (no_connect (at 170.18 73.66) (uuid e50d7211-10ad-46b7-8426-085315677fce))
   (no_connect (at 257.81 53.34) (uuid e920dab7-d910-492a-86f5-592e19da7ae3))
-  (no_connect (at 170.18 86.36) (uuid f62e968e-48e6-46ba-946f-d47f975690d8))
   (no_connect (at 137.16 53.34) (uuid fc06e5aa-2f8c-4391-a425-9ff8290251b9))
 
+  (wire (pts (xy 299.72 125.73) (xy 299.72 143.51))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 001b39d0-93d7-4176-9004-f4cb31f6aa23)
+  )
   (wire (pts (xy 38.1 105.41) (xy 38.1 115.57))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0181d30c-397c-4c96-8b32-e67ae80af0a1)
@@ -1705,10 +1732,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2ffcd804-6107-4c85-bf4b-c2aa03d2eab6)
   )
-  (wire (pts (xy 118.11 203.2) (xy 111.76 203.2))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 306c7a7d-a4ac-4445-b539-57e06da4341f)
-  )
   (wire (pts (xy 227.33 149.86) (xy 227.33 160.02))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 315abe7a-694a-4f3c-9928-e1f4556786b3)
@@ -1789,6 +1812,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 537a428f-353f-4460-8ca1-83662343be33)
   )
+  (wire (pts (xy 330.2 132.08) (xy 330.2 143.51))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 54daf8d1-fc63-42fe-a1b5-b03415f35ca6)
+  )
   (wire (pts (xy 39.37 130.81) (xy 39.37 140.97))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 5516ab2c-9994-4451-8333-972bed4179b3)
@@ -1821,6 +1848,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 641ea930-726f-4bc1-98ca-fb287c4df061)
   )
+  (wire (pts (xy 340.36 124.46) (xy 330.2 124.46))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 674eb17b-ac0f-4446-95ad-4dbaced7019f)
+  )
   (wire (pts (xy 73.66 40.64) (xy 73.66 50.8))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 690ce19f-a6f0-4782-86ec-7cdc7de5cfdc)
@@ -1845,6 +1876,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 716cff8c-650a-4e9e-8288-15b24ea4360b)
   )
+  (wire (pts (xy 309.88 143.51) (xy 330.2 143.51))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 73239d33-68bf-4c2e-9f60-8eb942bc5312)
+  )
   (wire (pts (xy 219.71 22.86) (xy 217.17 22.86))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 734942be-ab4c-4f75-8ff8-e06ca72ed9f3)
@@ -1865,10 +1900,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7a54286c-7af8-4291-81ba-06302571a3e7)
   )
-  (wire (pts (xy 133.35 203.2) (xy 118.11 203.2))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 7c557dc0-3ad2-4b83-98e5-c4c8e4fda1a3)
-  )
   (wire (pts (xy 39.37 20.32) (xy 39.37 30.48))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7c73ac6d-6405-4668-a98e-07d390301576)
@@ -1929,6 +1960,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 93d75035-d90b-4e69-b16e-0122407b8398)
   )
+  (wire (pts (xy 299.72 143.51) (xy 304.8 143.51))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 945bf93c-b10c-40dd-b03d-eb8ce2be5846)
+  )
   (wire (pts (xy 113.03 25.4) (xy 128.27 25.4))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 9c34e904-099b-44f4-8855-4e602a16ae83)
@@ -1981,13 +2016,17 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a7703ce6-c561-445c-8ad9-5f4fb8b4d938)
   )
+  (wire (pts (xy 309.88 125.73) (xy 309.88 143.51))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid a7d40e8f-7367-4297-8721-d04f70dc1ee3)
+  )
   (wire (pts (xy 138.43 35.56) (xy 137.16 35.56))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid aa2dc8f2-7735-45ff-bcc3-53550906a188)
   )
-  (wire (pts (xy 226.06 203.2) (xy 204.47 203.2))
+  (wire (pts (xy 330.2 124.46) (xy 330.2 132.08))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid abcc312b-81c1-4d8f-9d72-47ea633b30d3)
+    (uuid ab2702f7-c9cc-4146-98c0-44d371f8edbe)
   )
   (wire (pts (xy 152.4 106.68) (xy 152.4 115.57))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -2001,18 +2040,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b4004bd4-81e3-449e-b70b-69a0202059d0)
   )
-  (wire (pts (xy 156.21 203.2) (xy 133.35 203.2))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b4d6a9a2-d0f6-440d-929b-bddd72233915)
-  )
   (wire (pts (xy 180.34 15.24) (xy 193.04 15.24))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b7bfd689-af1c-4c98-a33e-34682e8e8136)
   )
-  (wire (pts (xy 180.34 203.2) (xy 156.21 203.2))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b895a39d-7c1a-4768-a476-db19b83bf5c9)
-  )
   (wire (pts (xy 73.66 50.8) (xy 73.66 60.96))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b949808a-6187-4716-bc29-dc2d3b46e25c)
@@ -2033,10 +2064,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bce3580d-1c41-4dfa-bca0-cc83a5731ba3)
   )
-  (wire (pts (xy 204.47 203.2) (xy 180.34 203.2))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid c1dbfea1-139d-4f5e-9124-8b0b5143ed09)
-  )
   (wire (pts (xy 231.14 49.53) (xy 227.33 49.53))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid c624b432-5230-4f54-a616-fdad6b945810)
@@ -2065,6 +2092,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d0543093-3e99-454d-a182-4ed73eae3e6e)
   )
+  (wire (pts (xy 340.36 132.08) (xy 330.2 132.08))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d071514e-72d6-4c8b-a559-a0b2e36029ec)
+  )
   (wire (pts (xy 254 43.18) (xy 254 53.34))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d11ae781-e27b-4e4a-b553-3ecf5ae9c41f)
@@ -2081,6 +2112,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid d8097d7d-f729-4a61-8bbc-d492b086aacc)
   )
+  (wire (pts (xy 304.8 143.51) (xy 309.88 143.51))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid d9bb7b33-3753-422a-a73c-66f18bbe4587)
+  )
   (wire (pts (xy 38.1 74.93) (xy 38.1 85.09))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid dc56c7eb-c0f0-4f6b-a19c-f05d47b31cc3)
@@ -2155,10 +2190,10 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
-  (global_label "COL7" (shape input) (at 137.16 101.6 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
+  (global_label "COL7" (shape input) (at 170.18 88.9 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
     (uuid 07c0e51c-bc6d-4ec3-9c64-de3992317ac5)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 0 0 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 307.34 190.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -2218,10 +2253,10 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
-  (global_label "COL11" (shape input) (at 170.18 66.04 0) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify left))
+  (global_label "COL11" (shape input) (at 137.16 93.98 180) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right))
     (uuid 1aa8c2d9-dd2d-418f-947f-3c9bfa356897)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 0 0 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 307.34 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -2232,6 +2267,13 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
+  (global_label "SPI1_MOSI_PA7" (shape input) (at 316.23 106.68 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid 24239ae0-d7d7-4190-ac35-cce8435bcda6)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 387.35 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
   (global_label "COL11" (shape input) (at 227.33 119.38 0) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 26ec95e5-74d6-41db-aaac-cf2fc6f05a41)
@@ -2526,10 +2568,10 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
-  (global_label "COL9" (shape input) (at 137.16 93.98 180) (fields_autoplaced)
+  (global_label "COL9" (shape input) (at 137.16 99.06 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 85d5be9c-8b88-4195-b374-bd7ddf4b511a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 0 0 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 0 5.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
@@ -2708,6 +2750,13 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
+  (global_label "SK6812_IN" (shape input) (at 316.23 110.49 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
+    (uuid cd039ca7-e16e-442a-94a9-19d4758f0485)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 328.7747 110.4106 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+  )
   (global_label "ROW4" (shape input) (at 91.44 161.29 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid ce88044d-ecea-4f23-8869-c303de7a80b0)
@@ -2757,13 +2806,20 @@
       (effects (font (size 1.27 1.27)) hide)
     )
   )
-  (global_label "COL8" (shape input) (at 137.16 99.06 180) (fields_autoplaced)
+  (global_label "COL8" (shape input) (at 137.16 101.6 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid da07d4c0-a63c-4cb3-971e-5a45cbde941a)
-    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 0 0 0)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 0 2.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
   )
+  (global_label "SK6812_PWR" (shape input) (at 229.87 22.86 270) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify right))
+    (uuid db2101c1-0c4c-408a-9524-0ee3fd97a7b1)
+    (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 229.7906 37.4609 90)
+      (effects (font (size 1.27 1.27)) (justify right) hide)
+    )
+  )
   (global_label "ROW4" (shape input) (at 209.55 149.86 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid ddbeb031-fcc4-4df7-9f60-828801a879f7)
@@ -2860,8 +2916,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005dec39df)
     (property "Reference" "U1" (id 0) (at 153.67 108.8644 0))
-    (property "Value" "" (id 1) (at 153.67 111.1758 0))
-    (property "Footprint" "" (id 2) (at 139.7 104.14 0)
+    (property "Value" "STM32" (id 1) (at 153.67 111.1758 0))
+    (property "Footprint" "Package_QFP:LQFP-48_7x7mm_P0.5mm" (id 2) (at 139.7 104.14 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
     (property "Datasheet" "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00090510.pdf" (id 3) (at 154.94 68.58 0)
@@ -2923,10 +2979,10 @@
     (property "Reference" "C2" (id 0) (at 147.701 17.8816 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "" (id 1) (at 147.701 20.193 0)
+    (property "Value" "100nF" (id 1) (at 147.701 20.193 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 145.7452 22.86 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 145.7452 22.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 144.78 19.05 0)
@@ -2942,10 +2998,10 @@
     (property "Reference" "C3" (id 0) (at 159.131 17.8816 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "" (id 1) (at 159.131 20.193 0)
+    (property "Value" "100nF" (id 1) (at 159.131 20.193 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 157.1752 22.86 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 157.1752 22.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 156.21 19.05 0)
@@ -2961,10 +3017,10 @@
     (property "Reference" "C4" (id 0) (at 170.561 17.8816 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "" (id 1) (at 170.561 20.193 0)
+    (property "Value" "100nF" (id 1) (at 170.561 20.193 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 168.6052 22.86 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 168.6052 22.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 167.64 19.05 0)
@@ -2980,10 +3036,10 @@
     (property "Reference" "C5" (id 0) (at 183.261 17.8816 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "" (id 1) (at 183.261 20.193 0)
+    (property "Value" "100nF" (id 1) (at 183.261 20.193 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 181.3052 22.86 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 181.3052 22.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 180.34 19.05 0)
@@ -2999,10 +3055,10 @@
     (property "Reference" "C7" (id 0) (at 222.631 17.8816 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "" (id 1) (at 222.631 20.193 0)
+    (property "Value" "4.7µF" (id 1) (at 222.631 20.193 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 220.6752 22.86 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 220.6752 22.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 219.71 19.05 0)
@@ -3018,7 +3074,7 @@
     (property "Reference" "#PWR0101" (id 0) (at 152.4 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 152.527 119.9642 0))
+    (property "Value" "GND" (id 1) (at 152.527 119.9642 0))
     (property "Footprint" "" (id 2) (at 152.4 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3034,7 +3090,7 @@
     (property "Reference" "#PWR0102" (id 0) (at 125.73 21.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 125.857 19.6342 0))
+    (property "Value" "GND" (id 1) (at 125.857 19.6342 0))
     (property "Footprint" "" (id 2) (at 125.73 15.24 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3050,10 +3106,10 @@
     (property "Reference" "C1" (id 0) (at 131.191 28.0416 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "" (id 1) (at 131.191 30.353 0)
+    (property "Value" "100nF" (id 1) (at 131.191 30.353 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 129.2352 33.02 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 129.2352 33.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 128.27 29.21 0)
@@ -3069,10 +3125,10 @@
     (property "Reference" "SWRST1" (id 0) (at 116.7892 29.3116 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "" (id 1) (at 116.7892 31.623 90)
+    (property "Value" "RESET" (id 1) (at 116.7892 31.623 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 118.11 30.48 0)
+    (property "Footprint" "Button_Switch_SMD:SW_SPST_CK_RS282G05A3" (id 2) (at 118.11 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 118.11 30.48 0)
@@ -3088,7 +3144,7 @@
     (property "Reference" "#PWR0103" (id 0) (at 105.41 31.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 105.537 29.7942 0))
+    (property "Value" "GND" (id 1) (at 105.537 29.7942 0))
     (property "Footprint" "" (id 2) (at 105.41 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3102,8 +3158,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005dece105)
     (property "Reference" "SWBOOT1" (id 0) (at 106.68 35.941 0))
-    (property "Value" "" (id 1) (at 106.68 38.2524 0))
-    (property "Footprint" "" (id 2) (at 106.68 45.72 0)
+    (property "Value" "BOOT" (id 1) (at 106.68 38.2524 0))
+    (property "Footprint" "Button_Switch_SMD:SW_SPST_CK_RS282G05A3" (id 2) (at 106.68 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 106.68 45.72 0)
@@ -3119,10 +3175,10 @@
     (property "Reference" "R1" (id 0) (at 114.808 43.2816 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "" (id 1) (at 114.808 45.593 0)
+    (property "Value" "5.1k" (id 1) (at 114.808 45.593 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 111.252 44.45 90)
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 111.252 44.45 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 113.03 44.45 0)
@@ -3138,7 +3194,7 @@
     (property "Reference" "#PWR0104" (id 0) (at 113.03 54.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 113.157 52.6542 0))
+    (property "Value" "GND" (id 1) (at 113.157 52.6542 0))
     (property "Footprint" "" (id 2) (at 113.03 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3154,7 +3210,7 @@
     (property "Reference" "#PWR0105" (id 0) (at 273.05 67.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 273.177 65.3542 0))
+    (property "Value" "GND" (id 1) (at 273.177 65.3542 0))
     (property "Footprint" "" (id 2) (at 273.05 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3168,8 +3224,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005dedea73)
     (property "Reference" "R7" (id 0) (at 254 22.6822 90))
-    (property "Value" "" (id 1) (at 254 24.9936 90))
-    (property "Footprint" "" (id 2) (at 254 26.162 90)
+    (property "Value" "5.1k" (id 1) (at 254 24.9936 90))
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 254 26.162 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 254 27.94 0)
@@ -3183,8 +3239,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005dedeae6)
     (property "Reference" "R6" (id 0) (at 241.3 25.2222 90))
-    (property "Value" "" (id 1) (at 241.3 27.5336 90))
-    (property "Footprint" "" (id 2) (at 241.3 32.258 90)
+    (property "Value" "5.1k" (id 1) (at 241.3 27.5336 90))
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 241.3 32.258 90)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 241.3 30.48 0)
@@ -3200,7 +3256,7 @@
     (property "Reference" "#PWR0106" (id 0) (at 234.95 36.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 235.077 34.8742 0))
+    (property "Value" "GND" (id 1) (at 235.077 34.8742 0))
     (property "Footprint" "" (id 2) (at 234.95 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3216,10 +3272,10 @@
     (property "Reference" "C6" (id 0) (at 195.961 17.8816 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "" (id 1) (at 195.961 20.193 0)
+    (property "Value" "4.7µF" (id 1) (at 195.961 20.193 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 194.0052 22.86 0)
+    (property "Footprint" "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 194.0052 22.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 193.04 19.05 0)
@@ -3235,10 +3291,10 @@
     (property "Reference" "J1" (id 0) (at 283.972 39.5986 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "" (id 1) (at 283.972 41.91 0)
+    (property "Value" "USB_C_Receptacle_USB2.0" (id 1) (at 283.972 41.91 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 269.24 38.1 0)
+    (property "Footprint" "kicad-usb:USB_C_Receptacle_HRO_TYPE-C-31-M-12" (id 2) (at 269.24 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" (id 3) (at 269.24 38.1 0)
@@ -3269,10 +3325,10 @@
     (property "Reference" "J3" (id 0) (at 210.2358 93.3958 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "" (id 1) (at 210.2358 95.7072 0)
+    (property "Value" "Conn_01x07_Male" (id 1) (at 210.2358 95.7072 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 209.55 92.71 0)
+    (property "Footprint" "kicad-harwin:Harwin_M20-89007xx_1x07_P2.54mm_Horizontal" (id 2) (at 209.55 92.71 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 209.55 92.71 0)
@@ -3293,7 +3349,7 @@
     (property "Reference" "#PWR0109" (id 0) (at 198.12 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 201.2188 95.377 90)
+    (property "Value" "GND" (id 1) (at 201.2188 95.377 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Footprint" "" (id 2) (at 204.47 95.25 0)
@@ -3309,8 +3365,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f68106b)
     (property "Reference" "SW1" (id 0) (at 34.29 27.559 0))
-    (property "Value" "" (id 1) (at 34.29 25.2476 0))
-    (property "Footprint" "" (id 2) (at 34.29 25.4 0)
+    (property "Value" "SW_Push" (id 1) (at 34.29 25.2476 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 34.29 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 34.29 25.4 0)
@@ -3324,8 +3380,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f681075)
     (property "Reference" "D11" (id 0) (at 25.4 13.589 0))
-    (property "Value" "" (id 1) (at 25.4 15.9004 0))
-    (property "Footprint" "" (id 2) (at 25.4 20.32 0)
+    (property "Value" "D1.1" (id 1) (at 25.4 15.9004 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 25.4 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 25.4 20.32 0)
@@ -3339,8 +3395,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f68107f)
     (property "Reference" "SW2" (id 0) (at 34.29 37.719 0))
-    (property "Value" "" (id 1) (at 34.29 35.4076 0))
-    (property "Footprint" "" (id 2) (at 34.29 35.56 0)
+    (property "Value" "SW_Push" (id 1) (at 34.29 35.4076 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 34.29 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 34.29 35.56 0)
@@ -3354,8 +3410,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f681089)
     (property "Reference" "D21" (id 0) (at 25.4 23.749 0))
-    (property "Value" "" (id 1) (at 25.4 26.0604 0))
-    (property "Footprint" "" (id 2) (at 25.4 30.48 0)
+    (property "Value" "D2.1" (id 1) (at 25.4 26.0604 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 25.4 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 25.4 30.48 0)
@@ -3369,8 +3425,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f681093)
     (property "Reference" "SW4" (id 0) (at 34.29 58.039 0))
-    (property "Value" "" (id 1) (at 34.29 55.7276 0))
-    (property "Footprint" "" (id 2) (at 34.29 55.88 0)
+    (property "Value" "SW_Push" (id 1) (at 34.29 55.7276 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 34.29 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 34.29 55.88 0)
@@ -3384,8 +3440,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f68109d)
     (property "Reference" "D41" (id 0) (at 25.4 44.069 0))
-    (property "Value" "" (id 1) (at 25.4 46.3804 0))
-    (property "Footprint" "" (id 2) (at 25.4 50.8 0)
+    (property "Value" "D4.1" (id 1) (at 25.4 46.3804 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 25.4 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 25.4 50.8 0)
@@ -3399,8 +3455,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f6810a7)
     (property "Reference" "SW3" (id 0) (at 34.29 47.879 0))
-    (property "Value" "" (id 1) (at 34.29 45.5676 0))
-    (property "Footprint" "" (id 2) (at 34.29 45.72 0)
+    (property "Value" "SW_Push" (id 1) (at 34.29 45.5676 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 34.29 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 34.29 45.72 0)
@@ -3414,8 +3470,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f6810b1)
     (property "Reference" "D31" (id 0) (at 25.4 33.909 0))
-    (property "Value" "" (id 1) (at 25.4 36.2204 0))
-    (property "Footprint" "" (id 2) (at 25.4 40.64 0)
+    (property "Value" "D3.1" (id 1) (at 25.4 36.2204 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 25.4 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 25.4 40.64 0)
@@ -3431,7 +3487,7 @@
     (property "Reference" "#FLG0102" (id 0) (at 276.86 59.055 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 276.86 56.5658 0))
+    (property "Value" "PWR_FLAG" (id 1) (at 276.86 56.5658 0))
     (property "Footprint" "" (id 2) (at 276.86 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3447,7 +3503,7 @@
     (property "Reference" "#PWR0107" (id 0) (at 165.1 34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 165.481 26.0858 0))
+    (property "Value" "+3.3V" (id 1) (at 165.481 26.0858 0))
     (property "Footprint" "" (id 2) (at 165.1 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3463,7 +3519,7 @@
     (property "Reference" "#PWR06" (id 0) (at 96.52 43.18 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 96.901 34.9758 0))
+    (property "Value" "+3.3V" (id 1) (at 96.901 34.9758 0))
     (property "Footprint" "" (id 2) (at 96.52 39.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3477,8 +3533,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f6f35e2)
     (property "Reference" "F1" (id 0) (at 250.19 13.335 90))
-    (property "Value" "" (id 1) (at 250.19 15.6464 90))
-    (property "Footprint" "" (id 2) (at 245.11 20.32 0)
+    (property "Value" "500mA" (id 1) (at 250.19 15.6464 90))
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (id 2) (at 245.11 20.32 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
     )
     (property "Datasheet" "~" (id 3) (at 250.19 19.05 0)
@@ -3494,7 +3550,7 @@
     (property "Reference" "#PWR0108" (id 0) (at 238.76 26.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 239.141 18.4658 0))
+    (property "Value" "+5V" (id 1) (at 239.141 18.4658 0))
     (property "Footprint" "" (id 2) (at 238.76 22.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3510,7 +3566,7 @@
     (property "Reference" "#FLG0101" (id 0) (at 242.57 13.335 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 242.57 10.8458 0))
+    (property "Value" "PWR_FLAG" (id 1) (at 242.57 10.8458 0))
     (property "Footprint" "" (id 2) (at 242.57 15.24 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -3524,8 +3580,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f728054)
     (property "Reference" "SW5" (id 0) (at 34.29 68.199 0))
-    (property "Value" "" (id 1) (at 34.29 65.8876 0))
-    (property "Footprint" "" (id 2) (at 34.29 66.04 0)
+    (property "Value" "SW_Push" (id 1) (at 34.29 65.8876 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 34.29 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 34.29 66.04 0)
@@ -3539,8 +3595,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f72805e)
     (property "Reference" "D51" (id 0) (at 25.4 54.229 0))
-    (property "Value" "" (id 1) (at 25.4 56.5404 0))
-    (property "Footprint" "" (id 2) (at 25.4 60.96 0)
+    (property "Value" "D5.1" (id 1) (at 25.4 56.5404 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 25.4 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 25.4 60.96 0)
@@ -3554,8 +3610,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f73134e)
     (property "Reference" "SW6" (id 0) (at 68.58 27.559 0))
-    (property "Value" "" (id 1) (at 68.58 25.2476 0))
-    (property "Footprint" "" (id 2) (at 68.58 25.4 0)
+    (property "Value" "SW_Push" (id 1) (at 68.58 25.2476 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 68.58 25.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 68.58 25.4 0)
@@ -3569,8 +3625,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f731358)
     (property "Reference" "D12" (id 0) (at 59.69 13.589 0))
-    (property "Value" "" (id 1) (at 59.69 15.9004 0))
-    (property "Footprint" "" (id 2) (at 59.69 20.32 0)
+    (property "Value" "D1.2" (id 1) (at 59.69 15.9004 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 59.69 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 59.69 20.32 0)
@@ -3584,8 +3640,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f731362)
     (property "Reference" "SW7" (id 0) (at 68.58 37.719 0))
-    (property "Value" "" (id 1) (at 68.58 35.4076 0))
-    (property "Footprint" "" (id 2) (at 68.58 35.56 0)
+    (property "Value" "SW_Push" (id 1) (at 68.58 35.4076 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 68.58 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 68.58 35.56 0)
@@ -3599,8 +3655,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f73136c)
     (property "Reference" "D22" (id 0) (at 59.69 23.749 0))
-    (property "Value" "" (id 1) (at 59.69 26.0604 0))
-    (property "Footprint" "" (id 2) (at 59.69 30.48 0)
+    (property "Value" "D2.2" (id 1) (at 59.69 26.0604 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 59.69 30.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 59.69 30.48 0)
@@ -3614,8 +3670,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f731376)
     (property "Reference" "SW9" (id 0) (at 68.58 58.039 0))
-    (property "Value" "" (id 1) (at 68.58 55.7276 0))
-    (property "Footprint" "" (id 2) (at 68.58 55.88 0)
+    (property "Value" "SW_Push" (id 1) (at 68.58 55.7276 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 68.58 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 68.58 55.88 0)
@@ -3629,8 +3685,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f731380)
     (property "Reference" "D42" (id 0) (at 59.69 44.069 0))
-    (property "Value" "" (id 1) (at 59.69 46.3804 0))
-    (property "Footprint" "" (id 2) (at 59.69 50.8 0)
+    (property "Value" "D4.2" (id 1) (at 59.69 46.3804 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 59.69 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 59.69 50.8 0)
@@ -3644,8 +3700,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f73138a)
     (property "Reference" "SW8" (id 0) (at 68.58 47.879 0))
-    (property "Value" "" (id 1) (at 68.58 45.5676 0))
-    (property "Footprint" "" (id 2) (at 68.58 45.72 0)
+    (property "Value" "SW_Push" (id 1) (at 68.58 45.5676 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 68.58 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 68.58 45.72 0)
@@ -3659,8 +3715,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f731394)
     (property "Reference" "D32" (id 0) (at 59.69 33.909 0))
-    (property "Value" "" (id 1) (at 59.69 36.2204 0))
-    (property "Footprint" "" (id 2) (at 59.69 40.64 0)
+    (property "Value" "D3.2" (id 1) (at 59.69 36.2204 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 59.69 40.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 59.69 40.64 0)
@@ -3674,8 +3730,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7313a0)
     (property "Reference" "SW10" (id 0) (at 68.58 68.199 0))
-    (property "Value" "" (id 1) (at 68.58 65.8876 0))
-    (property "Footprint" "" (id 2) (at 68.58 66.04 0)
+    (property "Value" "SW_Push" (id 1) (at 68.58 65.8876 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 68.58 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 68.58 66.04 0)
@@ -3689,8 +3745,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7313aa)
     (property "Reference" "D52" (id 0) (at 59.69 54.229 0))
-    (property "Value" "" (id 1) (at 59.69 56.5404 0))
-    (property "Footprint" "" (id 2) (at 59.69 60.96 0)
+    (property "Value" "D5.2" (id 1) (at 59.69 56.5404 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 59.69 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 59.69 60.96 0)
@@ -3704,8 +3760,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7440d1)
     (property "Reference" "SW11" (id 0) (at 33.02 82.169 0))
-    (property "Value" "" (id 1) (at 33.02 79.8576 0))
-    (property "Footprint" "" (id 2) (at 33.02 80.01 0)
+    (property "Value" "SW_Push" (id 1) (at 33.02 79.8576 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 33.02 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 33.02 80.01 0)
@@ -3719,8 +3775,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7440db)
     (property "Reference" "D13" (id 0) (at 24.13 68.199 0))
-    (property "Value" "" (id 1) (at 24.13 70.5104 0))
-    (property "Footprint" "" (id 2) (at 24.13 74.93 0)
+    (property "Value" "D1.3" (id 1) (at 24.13 70.5104 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 24.13 74.93 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 24.13 74.93 0)
@@ -3734,8 +3790,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7440e5)
     (property "Reference" "SW12" (id 0) (at 33.02 92.329 0))
-    (property "Value" "" (id 1) (at 33.02 90.0176 0))
-    (property "Footprint" "" (id 2) (at 33.02 90.17 0)
+    (property "Value" "SW_Push" (id 1) (at 33.02 90.0176 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 33.02 90.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 33.02 90.17 0)
@@ -3749,8 +3805,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7440ef)
     (property "Reference" "D23" (id 0) (at 24.13 78.359 0))
-    (property "Value" "" (id 1) (at 24.13 80.6704 0))
-    (property "Footprint" "" (id 2) (at 24.13 85.09 0)
+    (property "Value" "D2.3" (id 1) (at 24.13 80.6704 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 24.13 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 24.13 85.09 0)
@@ -3764,8 +3820,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7440f9)
     (property "Reference" "SW14" (id 0) (at 33.02 112.649 0))
-    (property "Value" "" (id 1) (at 33.02 110.3376 0))
-    (property "Footprint" "" (id 2) (at 33.02 110.49 0)
+    (property "Value" "SW_Push" (id 1) (at 33.02 110.3376 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 33.02 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 33.02 110.49 0)
@@ -3779,8 +3835,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f744103)
     (property "Reference" "D43" (id 0) (at 24.13 98.679 0))
-    (property "Value" "" (id 1) (at 24.13 100.9904 0))
-    (property "Footprint" "" (id 2) (at 24.13 105.41 0)
+    (property "Value" "D4.3" (id 1) (at 24.13 100.9904 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 24.13 105.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 24.13 105.41 0)
@@ -3794,8 +3850,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f74410d)
     (property "Reference" "SW13" (id 0) (at 33.02 102.489 0))
-    (property "Value" "" (id 1) (at 33.02 100.1776 0))
-    (property "Footprint" "" (id 2) (at 33.02 100.33 0)
+    (property "Value" "SW_Push" (id 1) (at 33.02 100.1776 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 33.02 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 33.02 100.33 0)
@@ -3809,8 +3865,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f744117)
     (property "Reference" "D33" (id 0) (at 24.13 88.519 0))
-    (property "Value" "" (id 1) (at 24.13 90.8304 0))
-    (property "Footprint" "" (id 2) (at 24.13 95.25 0)
+    (property "Value" "D3.3" (id 1) (at 24.13 90.8304 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 24.13 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 24.13 95.25 0)
@@ -3824,8 +3880,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f744123)
     (property "Reference" "SW15" (id 0) (at 33.02 122.809 0))
-    (property "Value" "" (id 1) (at 33.02 120.4976 0))
-    (property "Footprint" "" (id 2) (at 33.02 120.65 0)
+    (property "Value" "SW_Push" (id 1) (at 33.02 120.4976 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 33.02 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 33.02 120.65 0)
@@ -3839,8 +3895,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f74412d)
     (property "Reference" "D53" (id 0) (at 24.13 108.839 0))
-    (property "Value" "" (id 1) (at 24.13 111.1504 0))
-    (property "Footprint" "" (id 2) (at 24.13 115.57 0)
+    (property "Value" "D5.3" (id 1) (at 24.13 111.1504 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 24.13 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 24.13 115.57 0)
@@ -3854,8 +3910,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7587a5)
     (property "Reference" "U2" (id 0) (at 209.55 34.2646 0))
-    (property "Value" "" (id 1) (at 209.55 36.576 0))
-    (property "Footprint" "" (id 2) (at 209.55 36.195 0)
+    (property "Value" "TLV70233_SOT23-5" (id 1) (at 209.55 36.576 0))
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23-5" (id 2) (at 209.55 36.195 0)
       (effects (font (size 1.27 1.27) italic) hide)
     )
     (property "Datasheet" "http://www.ti.com/lit/ds/symlink/tlv702.pdf" (id 3) (at 209.55 29.21 0)
@@ -3872,8 +3928,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f75dcd9)
     (property "Reference" "SW16" (id 0) (at 67.31 82.169 0))
-    (property "Value" "" (id 1) (at 67.31 79.8576 0))
-    (property "Footprint" "" (id 2) (at 67.31 80.01 0)
+    (property "Value" "SW_Push" (id 1) (at 67.31 79.8576 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 67.31 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 67.31 80.01 0)
@@ -3887,8 +3943,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f75dce3)
     (property "Reference" "D14" (id 0) (at 58.42 68.199 0))
-    (property "Value" "" (id 1) (at 58.42 70.5104 0))
-    (property "Footprint" "" (id 2) (at 58.42 74.93 0)
+    (property "Value" "D1.4" (id 1) (at 58.42 70.5104 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 58.42 74.93 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 58.42 74.93 0)
@@ -3902,8 +3958,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f75dced)
     (property "Reference" "SW17" (id 0) (at 67.31 92.329 0))
-    (property "Value" "" (id 1) (at 67.31 90.0176 0))
-    (property "Footprint" "" (id 2) (at 67.31 90.17 0)
+    (property "Value" "SW_Push" (id 1) (at 67.31 90.0176 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 67.31 90.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 67.31 90.17 0)
@@ -3917,8 +3973,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f75dcf7)
     (property "Reference" "D24" (id 0) (at 58.42 78.359 0))
-    (property "Value" "" (id 1) (at 58.42 80.6704 0))
-    (property "Footprint" "" (id 2) (at 58.42 85.09 0)
+    (property "Value" "D2.4" (id 1) (at 58.42 80.6704 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 58.42 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 58.42 85.09 0)
@@ -3932,8 +3988,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f75dd01)
     (property "Reference" "SW19" (id 0) (at 67.31 112.649 0))
-    (property "Value" "" (id 1) (at 67.31 110.3376 0))
-    (property "Footprint" "" (id 2) (at 67.31 110.49 0)
+    (property "Value" "SW_Push" (id 1) (at 67.31 110.3376 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 67.31 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 67.31 110.49 0)
@@ -3947,8 +4003,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f75dd0b)
     (property "Reference" "D44" (id 0) (at 58.42 98.679 0))
-    (property "Value" "" (id 1) (at 58.42 100.9904 0))
-    (property "Footprint" "" (id 2) (at 58.42 105.41 0)
+    (property "Value" "D4.4" (id 1) (at 58.42 100.9904 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 58.42 105.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 58.42 105.41 0)
@@ -3962,8 +4018,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f75dd15)
     (property "Reference" "SW18" (id 0) (at 67.31 102.489 0))
-    (property "Value" "" (id 1) (at 67.31 100.1776 0))
-    (property "Footprint" "" (id 2) (at 67.31 100.33 0)
+    (property "Value" "SW_Push" (id 1) (at 67.31 100.1776 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 67.31 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 67.31 100.33 0)
@@ -3977,8 +4033,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f75dd1f)
     (property "Reference" "D34" (id 0) (at 58.42 88.519 0))
-    (property "Value" "" (id 1) (at 58.42 90.8304 0))
-    (property "Footprint" "" (id 2) (at 58.42 95.25 0)
+    (property "Value" "D3.4" (id 1) (at 58.42 90.8304 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 58.42 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 58.42 95.25 0)
@@ -3992,8 +4048,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f75dd2b)
     (property "Reference" "SW20" (id 0) (at 67.31 122.809 0))
-    (property "Value" "" (id 1) (at 67.31 120.4976 0))
-    (property "Footprint" "" (id 2) (at 67.31 120.65 0)
+    (property "Value" "SW_Push" (id 1) (at 67.31 120.4976 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 67.31 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 67.31 120.65 0)
@@ -4007,8 +4063,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f75dd35)
     (property "Reference" "D54" (id 0) (at 58.42 108.839 0))
-    (property "Value" "" (id 1) (at 58.42 111.1504 0))
-    (property "Footprint" "" (id 2) (at 58.42 115.57 0)
+    (property "Value" "D5.4" (id 1) (at 58.42 111.1504 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 58.42 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 58.42 115.57 0)
@@ -4024,7 +4080,7 @@
     (property "Reference" "#PWR0111" (id 0) (at 209.55 13.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 209.423 15.9258 0))
+    (property "Value" "GND" (id 1) (at 209.423 15.9258 0))
     (property "Footprint" "" (id 2) (at 209.55 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -4038,8 +4094,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f771ed4)
     (property "Reference" "SW21" (id 0) (at 102.87 82.169 0))
-    (property "Value" "" (id 1) (at 102.87 79.8576 0))
-    (property "Footprint" "" (id 2) (at 102.87 80.01 0)
+    (property "Value" "SW_Push" (id 1) (at 102.87 79.8576 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 102.87 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 102.87 80.01 0)
@@ -4053,8 +4109,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f771ede)
     (property "Reference" "D15" (id 0) (at 93.98 68.199 0))
-    (property "Value" "" (id 1) (at 93.98 70.5104 0))
-    (property "Footprint" "" (id 2) (at 93.98 74.93 0)
+    (property "Value" "D1.5" (id 1) (at 93.98 70.5104 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 93.98 74.93 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 93.98 74.93 0)
@@ -4068,8 +4124,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f771ee8)
     (property "Reference" "SW22" (id 0) (at 102.87 92.329 0))
-    (property "Value" "" (id 1) (at 102.87 90.0176 0))
-    (property "Footprint" "" (id 2) (at 102.87 90.17 0)
+    (property "Value" "SW_Push" (id 1) (at 102.87 90.0176 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 102.87 90.17 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 102.87 90.17 0)
@@ -4083,8 +4139,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f771ef2)
     (property "Reference" "D25" (id 0) (at 93.98 78.359 0))
-    (property "Value" "" (id 1) (at 93.98 80.6704 0))
-    (property "Footprint" "" (id 2) (at 93.98 85.09 0)
+    (property "Value" "D2.5" (id 1) (at 93.98 80.6704 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 93.98 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 93.98 85.09 0)
@@ -4098,8 +4154,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f771efc)
     (property "Reference" "SW24" (id 0) (at 102.87 112.649 0))
-    (property "Value" "" (id 1) (at 102.87 110.3376 0))
-    (property "Footprint" "" (id 2) (at 102.87 110.49 0)
+    (property "Value" "SW_Push" (id 1) (at 102.87 110.3376 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 102.87 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 102.87 110.49 0)
@@ -4113,8 +4169,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f771f06)
     (property "Reference" "D45" (id 0) (at 93.98 98.679 0))
-    (property "Value" "" (id 1) (at 93.98 100.9904 0))
-    (property "Footprint" "" (id 2) (at 93.98 105.41 0)
+    (property "Value" "D4.5" (id 1) (at 93.98 100.9904 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 93.98 105.41 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 93.98 105.41 0)
@@ -4128,8 +4184,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f771f10)
     (property "Reference" "SW23" (id 0) (at 102.87 102.489 0))
-    (property "Value" "" (id 1) (at 102.87 100.1776 0))
-    (property "Footprint" "" (id 2) (at 102.87 100.33 0)
+    (property "Value" "SW_Push" (id 1) (at 102.87 100.1776 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 102.87 100.33 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 102.87 100.33 0)
@@ -4143,8 +4199,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f771f1a)
     (property "Reference" "D35" (id 0) (at 93.98 88.519 0))
-    (property "Value" "" (id 1) (at 93.98 90.8304 0))
-    (property "Footprint" "" (id 2) (at 93.98 95.25 0)
+    (property "Value" "D3.5" (id 1) (at 93.98 90.8304 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 93.98 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 93.98 95.25 0)
@@ -4158,8 +4214,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f771f26)
     (property "Reference" "SW25" (id 0) (at 102.87 122.809 0))
-    (property "Value" "" (id 1) (at 102.87 120.4976 0))
-    (property "Footprint" "" (id 2) (at 102.87 120.65 0)
+    (property "Value" "SW_Push" (id 1) (at 102.87 120.4976 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 102.87 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 102.87 120.65 0)
@@ -4173,8 +4229,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f771f30)
     (property "Reference" "D55" (id 0) (at 93.98 108.839 0))
-    (property "Value" "" (id 1) (at 93.98 111.1504 0))
-    (property "Footprint" "" (id 2) (at 93.98 115.57 0)
+    (property "Value" "D5.5" (id 1) (at 93.98 111.1504 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 93.98 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 93.98 115.57 0)
@@ -4188,8 +4244,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793b90)
     (property "Reference" "SW26" (id 0) (at 34.29 138.049 0))
-    (property "Value" "" (id 1) (at 34.29 135.7376 0))
-    (property "Footprint" "" (id 2) (at 34.29 135.89 0)
+    (property "Value" "SW_Push" (id 1) (at 34.29 135.7376 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 34.29 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 34.29 135.89 0)
@@ -4203,8 +4259,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793b9a)
     (property "Reference" "D16" (id 0) (at 25.4 124.079 0))
-    (property "Value" "" (id 1) (at 25.4 126.3904 0))
-    (property "Footprint" "" (id 2) (at 25.4 130.81 0)
+    (property "Value" "D1.6" (id 1) (at 25.4 126.3904 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 25.4 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 25.4 130.81 0)
@@ -4218,8 +4274,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793ba4)
     (property "Reference" "SW27" (id 0) (at 34.29 148.209 0))
-    (property "Value" "" (id 1) (at 34.29 145.8976 0))
-    (property "Footprint" "" (id 2) (at 34.29 146.05 0)
+    (property "Value" "SW_Push" (id 1) (at 34.29 145.8976 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 34.29 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 34.29 146.05 0)
@@ -4233,8 +4289,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793bae)
     (property "Reference" "D26" (id 0) (at 25.4 134.239 0))
-    (property "Value" "" (id 1) (at 25.4 136.5504 0))
-    (property "Footprint" "" (id 2) (at 25.4 140.97 0)
+    (property "Value" "D2.6" (id 1) (at 25.4 136.5504 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 25.4 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 25.4 140.97 0)
@@ -4248,8 +4304,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793bb8)
     (property "Reference" "SW29" (id 0) (at 34.29 168.529 0))
-    (property "Value" "" (id 1) (at 34.29 166.2176 0))
-    (property "Footprint" "" (id 2) (at 34.29 166.37 0)
+    (property "Value" "SW_Push" (id 1) (at 34.29 166.2176 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 34.29 166.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 34.29 166.37 0)
@@ -4263,8 +4319,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793bc2)
     (property "Reference" "D46" (id 0) (at 25.4 154.559 0))
-    (property "Value" "" (id 1) (at 25.4 156.8704 0))
-    (property "Footprint" "" (id 2) (at 25.4 161.29 0)
+    (property "Value" "D4.6" (id 1) (at 25.4 156.8704 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 25.4 161.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 25.4 161.29 0)
@@ -4278,8 +4334,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793bcc)
     (property "Reference" "SW28" (id 0) (at 34.29 158.369 0))
-    (property "Value" "" (id 1) (at 34.29 156.0576 0))
-    (property "Footprint" "" (id 2) (at 34.29 156.21 0)
+    (property "Value" "SW_Push" (id 1) (at 34.29 156.0576 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 34.29 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 34.29 156.21 0)
@@ -4293,8 +4349,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793bd6)
     (property "Reference" "D36" (id 0) (at 25.4 144.399 0))
-    (property "Value" "" (id 1) (at 25.4 146.7104 0))
-    (property "Footprint" "" (id 2) (at 25.4 151.13 0)
+    (property "Value" "D3.6" (id 1) (at 25.4 146.7104 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 25.4 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 25.4 151.13 0)
@@ -4308,8 +4364,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793be2)
     (property "Reference" "SW30" (id 0) (at 34.29 178.689 0))
-    (property "Value" "" (id 1) (at 34.29 176.3776 0))
-    (property "Footprint" "" (id 2) (at 34.29 176.53 0)
+    (property "Value" "SW_Push" (id 1) (at 34.29 176.3776 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 34.29 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 34.29 176.53 0)
@@ -4323,8 +4379,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793bec)
     (property "Reference" "D56" (id 0) (at 25.4 164.719 0))
-    (property "Value" "" (id 1) (at 25.4 167.0304 0))
-    (property "Footprint" "" (id 2) (at 25.4 171.45 0)
+    (property "Value" "D5.6" (id 1) (at 25.4 167.0304 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 25.4 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 25.4 171.45 0)
@@ -4338,8 +4394,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c01)
     (property "Reference" "SW31" (id 0) (at 68.58 138.049 0))
-    (property "Value" "" (id 1) (at 68.58 135.7376 0))
-    (property "Footprint" "" (id 2) (at 68.58 135.89 0)
+    (property "Value" "SW_Push" (id 1) (at 68.58 135.7376 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 68.58 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 68.58 135.89 0)
@@ -4353,8 +4409,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c0b)
     (property "Reference" "D17" (id 0) (at 59.69 124.079 0))
-    (property "Value" "" (id 1) (at 59.69 126.3904 0))
-    (property "Footprint" "" (id 2) (at 59.69 130.81 0)
+    (property "Value" "D1.7" (id 1) (at 59.69 126.3904 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 59.69 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 59.69 130.81 0)
@@ -4368,8 +4424,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c15)
     (property "Reference" "SW32" (id 0) (at 68.58 148.209 0))
-    (property "Value" "" (id 1) (at 68.58 145.8976 0))
-    (property "Footprint" "" (id 2) (at 68.58 146.05 0)
+    (property "Value" "SW_Push" (id 1) (at 68.58 145.8976 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 68.58 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 68.58 146.05 0)
@@ -4383,8 +4439,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c1f)
     (property "Reference" "D27" (id 0) (at 59.69 134.239 0))
-    (property "Value" "" (id 1) (at 59.69 136.5504 0))
-    (property "Footprint" "" (id 2) (at 59.69 140.97 0)
+    (property "Value" "D2.7" (id 1) (at 59.69 136.5504 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 59.69 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 59.69 140.97 0)
@@ -4398,8 +4454,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c29)
     (property "Reference" "SW34" (id 0) (at 68.58 168.529 0))
-    (property "Value" "" (id 1) (at 68.58 166.2176 0))
-    (property "Footprint" "" (id 2) (at 68.58 166.37 0)
+    (property "Value" "SW_Push" (id 1) (at 68.58 166.2176 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 68.58 166.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 68.58 166.37 0)
@@ -4413,8 +4469,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c33)
     (property "Reference" "D47" (id 0) (at 59.69 154.559 0))
-    (property "Value" "" (id 1) (at 59.69 156.8704 0))
-    (property "Footprint" "" (id 2) (at 59.69 161.29 0)
+    (property "Value" "D4.7" (id 1) (at 59.69 156.8704 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 59.69 161.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 59.69 161.29 0)
@@ -4428,8 +4484,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c3d)
     (property "Reference" "SW33" (id 0) (at 68.58 158.369 0))
-    (property "Value" "" (id 1) (at 68.58 156.0576 0))
-    (property "Footprint" "" (id 2) (at 68.58 156.21 0)
+    (property "Value" "SW_Push" (id 1) (at 68.58 156.0576 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 68.58 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 68.58 156.21 0)
@@ -4443,8 +4499,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c47)
     (property "Reference" "D37" (id 0) (at 59.69 144.399 0))
-    (property "Value" "" (id 1) (at 59.69 146.7104 0))
-    (property "Footprint" "" (id 2) (at 59.69 151.13 0)
+    (property "Value" "D3.7" (id 1) (at 59.69 146.7104 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 59.69 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 59.69 151.13 0)
@@ -4458,8 +4514,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c53)
     (property "Reference" "SW35" (id 0) (at 68.58 178.689 0))
-    (property "Value" "" (id 1) (at 68.58 176.3776 0))
-    (property "Footprint" "" (id 2) (at 68.58 176.53 0)
+    (property "Value" "SW_Push" (id 1) (at 68.58 176.3776 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 68.58 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 68.58 176.53 0)
@@ -4473,8 +4529,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c5d)
     (property "Reference" "D57" (id 0) (at 59.69 164.719 0))
-    (property "Value" "" (id 1) (at 59.69 167.0304 0))
-    (property "Footprint" "" (id 2) (at 59.69 171.45 0)
+    (property "Value" "D5.7" (id 1) (at 59.69 167.0304 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 59.69 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 59.69 171.45 0)
@@ -4488,8 +4544,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c72)
     (property "Reference" "SW36" (id 0) (at 104.14 138.049 0))
-    (property "Value" "" (id 1) (at 104.14 135.7376 0))
-    (property "Footprint" "" (id 2) (at 104.14 135.89 0)
+    (property "Value" "SW_Push" (id 1) (at 104.14 135.7376 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 104.14 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 104.14 135.89 0)
@@ -4503,8 +4559,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c7c)
     (property "Reference" "D18" (id 0) (at 95.25 124.079 0))
-    (property "Value" "" (id 1) (at 95.25 126.3904 0))
-    (property "Footprint" "" (id 2) (at 95.25 130.81 0)
+    (property "Value" "D1.8" (id 1) (at 95.25 126.3904 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 95.25 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 95.25 130.81 0)
@@ -4518,8 +4574,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c86)
     (property "Reference" "SW37" (id 0) (at 104.14 148.209 0))
-    (property "Value" "" (id 1) (at 104.14 145.8976 0))
-    (property "Footprint" "" (id 2) (at 104.14 146.05 0)
+    (property "Value" "SW_Push" (id 1) (at 104.14 145.8976 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 104.14 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 104.14 146.05 0)
@@ -4533,8 +4589,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c90)
     (property "Reference" "D28" (id 0) (at 95.25 134.239 0))
-    (property "Value" "" (id 1) (at 95.25 136.5504 0))
-    (property "Footprint" "" (id 2) (at 95.25 140.97 0)
+    (property "Value" "D2.8" (id 1) (at 95.25 136.5504 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 95.25 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 95.25 140.97 0)
@@ -4548,8 +4604,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793c9a)
     (property "Reference" "SW39" (id 0) (at 104.14 168.529 0))
-    (property "Value" "" (id 1) (at 104.14 166.2176 0))
-    (property "Footprint" "" (id 2) (at 104.14 166.37 0)
+    (property "Value" "SW_Push" (id 1) (at 104.14 166.2176 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 104.14 166.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 104.14 166.37 0)
@@ -4563,8 +4619,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793ca4)
     (property "Reference" "D48" (id 0) (at 95.25 154.559 0))
-    (property "Value" "" (id 1) (at 95.25 156.8704 0))
-    (property "Footprint" "" (id 2) (at 95.25 161.29 0)
+    (property "Value" "D4.8" (id 1) (at 95.25 156.8704 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 95.25 161.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 95.25 161.29 0)
@@ -4578,8 +4634,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793cae)
     (property "Reference" "SW38" (id 0) (at 104.14 158.369 0))
-    (property "Value" "" (id 1) (at 104.14 156.0576 0))
-    (property "Footprint" "" (id 2) (at 104.14 156.21 0)
+    (property "Value" "SW_Push" (id 1) (at 104.14 156.0576 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 104.14 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 104.14 156.21 0)
@@ -4593,8 +4649,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793cb8)
     (property "Reference" "D38" (id 0) (at 95.25 144.399 0))
-    (property "Value" "" (id 1) (at 95.25 146.7104 0))
-    (property "Footprint" "" (id 2) (at 95.25 151.13 0)
+    (property "Value" "D3.8" (id 1) (at 95.25 146.7104 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 95.25 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 95.25 151.13 0)
@@ -4608,8 +4664,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793cc4)
     (property "Reference" "SW40" (id 0) (at 104.14 178.689 0))
-    (property "Value" "" (id 1) (at 104.14 176.3776 0))
-    (property "Footprint" "" (id 2) (at 104.14 176.53 0)
+    (property "Value" "SW_Push" (id 1) (at 104.14 176.3776 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 104.14 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 104.14 176.53 0)
@@ -4623,8 +4679,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f793cce)
     (property "Reference" "D58" (id 0) (at 95.25 164.719 0))
-    (property "Value" "" (id 1) (at 95.25 167.0304 0))
-    (property "Footprint" "" (id 2) (at 95.25 171.45 0)
+    (property "Value" "D5.8" (id 1) (at 95.25 167.0304 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 95.25 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 95.25 171.45 0)
@@ -4638,8 +4694,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5c8b)
     (property "Reference" "SW41" (id 0) (at 142.24 138.049 0))
-    (property "Value" "" (id 1) (at 142.24 135.7376 0))
-    (property "Footprint" "" (id 2) (at 142.24 135.89 0)
+    (property "Value" "SW_Push" (id 1) (at 142.24 135.7376 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 142.24 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 142.24 135.89 0)
@@ -4653,8 +4709,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5c95)
     (property "Reference" "D19" (id 0) (at 133.35 124.079 0))
-    (property "Value" "" (id 1) (at 133.35 126.3904 0))
-    (property "Footprint" "" (id 2) (at 133.35 130.81 0)
+    (property "Value" "D1.9" (id 1) (at 133.35 126.3904 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 133.35 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 133.35 130.81 0)
@@ -4668,8 +4724,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5c9f)
     (property "Reference" "SW42" (id 0) (at 142.24 148.209 0))
-    (property "Value" "" (id 1) (at 142.24 145.8976 0))
-    (property "Footprint" "" (id 2) (at 142.24 146.05 0)
+    (property "Value" "SW_Push" (id 1) (at 142.24 145.8976 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 142.24 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 142.24 146.05 0)
@@ -4683,8 +4739,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5ca9)
     (property "Reference" "D29" (id 0) (at 133.35 134.239 0))
-    (property "Value" "" (id 1) (at 133.35 136.5504 0))
-    (property "Footprint" "" (id 2) (at 133.35 140.97 0)
+    (property "Value" "D2.9" (id 1) (at 133.35 136.5504 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 133.35 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 133.35 140.97 0)
@@ -4698,8 +4754,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5cb3)
     (property "Reference" "SW44" (id 0) (at 142.24 168.529 0))
-    (property "Value" "" (id 1) (at 142.24 166.2176 0))
-    (property "Footprint" "" (id 2) (at 142.24 166.37 0)
+    (property "Value" "SW_Push" (id 1) (at 142.24 166.2176 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 142.24 166.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 142.24 166.37 0)
@@ -4713,8 +4769,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5cbd)
     (property "Reference" "D49" (id 0) (at 133.35 154.559 0))
-    (property "Value" "" (id 1) (at 133.35 156.8704 0))
-    (property "Footprint" "" (id 2) (at 133.35 161.29 0)
+    (property "Value" "D4.9" (id 1) (at 133.35 156.8704 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 133.35 161.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 133.35 161.29 0)
@@ -4728,8 +4784,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5cc7)
     (property "Reference" "SW43" (id 0) (at 142.24 158.369 0))
-    (property "Value" "" (id 1) (at 142.24 156.0576 0))
-    (property "Footprint" "" (id 2) (at 142.24 156.21 0)
+    (property "Value" "SW_Push" (id 1) (at 142.24 156.0576 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 142.24 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 142.24 156.21 0)
@@ -4743,8 +4799,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5cd1)
     (property "Reference" "D39" (id 0) (at 133.35 144.399 0))
-    (property "Value" "" (id 1) (at 133.35 146.7104 0))
-    (property "Footprint" "" (id 2) (at 133.35 151.13 0)
+    (property "Value" "D3.9" (id 1) (at 133.35 146.7104 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 133.35 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 133.35 151.13 0)
@@ -4758,8 +4814,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5cdd)
     (property "Reference" "SW45" (id 0) (at 142.24 178.689 0))
-    (property "Value" "" (id 1) (at 142.24 176.3776 0))
-    (property "Footprint" "" (id 2) (at 142.24 176.53 0)
+    (property "Value" "SW_Push" (id 1) (at 142.24 176.3776 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 142.24 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 142.24 176.53 0)
@@ -4773,8 +4829,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5ce7)
     (property "Reference" "D59" (id 0) (at 133.35 164.719 0))
-    (property "Value" "" (id 1) (at 133.35 167.0304 0))
-    (property "Footprint" "" (id 2) (at 133.35 171.45 0)
+    (property "Value" "D5.9" (id 1) (at 133.35 167.0304 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 133.35 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 133.35 171.45 0)
@@ -4788,8 +4844,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5cfc)
     (property "Reference" "SW46" (id 0) (at 184.15 127.889 0))
-    (property "Value" "" (id 1) (at 184.15 125.5776 0))
-    (property "Footprint" "" (id 2) (at 184.15 125.73 0)
+    (property "Value" "SW_Push" (id 1) (at 184.15 125.5776 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 184.15 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 184.15 125.73 0)
@@ -4803,8 +4859,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d06)
     (property "Reference" "D110" (id 0) (at 175.26 113.919 0))
-    (property "Value" "" (id 1) (at 175.26 116.2304 0))
-    (property "Footprint" "" (id 2) (at 175.26 120.65 0)
+    (property "Value" "D1.10" (id 1) (at 175.26 116.2304 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 175.26 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 175.26 120.65 0)
@@ -4818,8 +4874,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d10)
     (property "Reference" "SW47" (id 0) (at 184.15 138.049 0))
-    (property "Value" "" (id 1) (at 184.15 135.7376 0))
-    (property "Footprint" "" (id 2) (at 184.15 135.89 0)
+    (property "Value" "SW_Push" (id 1) (at 184.15 135.7376 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 184.15 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 184.15 135.89 0)
@@ -4833,8 +4889,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d1a)
     (property "Reference" "D210" (id 0) (at 175.26 124.079 0))
-    (property "Value" "" (id 1) (at 175.26 126.3904 0))
-    (property "Footprint" "" (id 2) (at 175.26 130.81 0)
+    (property "Value" "D2.10" (id 1) (at 175.26 126.3904 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 175.26 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 175.26 130.81 0)
@@ -4848,8 +4904,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d24)
     (property "Reference" "SW49" (id 0) (at 184.15 158.369 0))
-    (property "Value" "" (id 1) (at 184.15 156.0576 0))
-    (property "Footprint" "" (id 2) (at 184.15 156.21 0)
+    (property "Value" "SW_Push" (id 1) (at 184.15 156.0576 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 184.15 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 184.15 156.21 0)
@@ -4863,8 +4919,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d2e)
     (property "Reference" "D410" (id 0) (at 175.26 144.399 0))
-    (property "Value" "" (id 1) (at 175.26 146.7104 0))
-    (property "Footprint" "" (id 2) (at 175.26 151.13 0)
+    (property "Value" "D4.10" (id 1) (at 175.26 146.7104 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 175.26 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 175.26 151.13 0)
@@ -4878,8 +4934,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d38)
     (property "Reference" "SW48" (id 0) (at 184.15 148.209 0))
-    (property "Value" "" (id 1) (at 184.15 145.8976 0))
-    (property "Footprint" "" (id 2) (at 184.15 146.05 0)
+    (property "Value" "SW_Push" (id 1) (at 184.15 145.8976 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 184.15 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 184.15 146.05 0)
@@ -4893,8 +4949,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d42)
     (property "Reference" "D310" (id 0) (at 175.26 134.239 0))
-    (property "Value" "" (id 1) (at 175.26 136.5504 0))
-    (property "Footprint" "" (id 2) (at 175.26 140.97 0)
+    (property "Value" "D3.10" (id 1) (at 175.26 136.5504 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 175.26 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 175.26 140.97 0)
@@ -4908,8 +4964,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d4e)
     (property "Reference" "SW50" (id 0) (at 184.15 168.529 0))
-    (property "Value" "" (id 1) (at 184.15 166.2176 0))
-    (property "Footprint" "" (id 2) (at 184.15 166.37 0)
+    (property "Value" "SW_Push" (id 1) (at 184.15 166.2176 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 184.15 166.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 184.15 166.37 0)
@@ -4923,8 +4979,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d58)
     (property "Reference" "D510" (id 0) (at 175.26 154.559 0))
-    (property "Value" "" (id 1) (at 175.26 156.8704 0))
-    (property "Footprint" "" (id 2) (at 175.26 161.29 0)
+    (property "Value" "D5.10" (id 1) (at 175.26 156.8704 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 175.26 161.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 175.26 161.29 0)
@@ -4938,8 +4994,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d6d)
     (property "Reference" "SW51" (id 0) (at 222.25 126.619 0))
-    (property "Value" "" (id 1) (at 222.25 124.3076 0))
-    (property "Footprint" "" (id 2) (at 222.25 124.46 0)
+    (property "Value" "SW_Push" (id 1) (at 222.25 124.3076 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 222.25 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 222.25 124.46 0)
@@ -4953,8 +5009,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d77)
     (property "Reference" "D111" (id 0) (at 213.36 112.649 0))
-    (property "Value" "" (id 1) (at 213.36 114.9604 0))
-    (property "Footprint" "" (id 2) (at 213.36 119.38 0)
+    (property "Value" "D1.11" (id 1) (at 213.36 114.9604 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 213.36 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 213.36 119.38 0)
@@ -4968,8 +5024,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d81)
     (property "Reference" "SW52" (id 0) (at 222.25 136.779 0))
-    (property "Value" "" (id 1) (at 222.25 134.4676 0))
-    (property "Footprint" "" (id 2) (at 222.25 134.62 0)
+    (property "Value" "SW_Push" (id 1) (at 222.25 134.4676 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 222.25 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 222.25 134.62 0)
@@ -4983,8 +5039,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d8b)
     (property "Reference" "D211" (id 0) (at 213.36 122.809 0))
-    (property "Value" "" (id 1) (at 213.36 125.1204 0))
-    (property "Footprint" "" (id 2) (at 213.36 129.54 0)
+    (property "Value" "D2.11" (id 1) (at 213.36 125.1204 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 213.36 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 213.36 129.54 0)
@@ -4998,8 +5054,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d95)
     (property "Reference" "SW54" (id 0) (at 222.25 157.099 0))
-    (property "Value" "" (id 1) (at 222.25 154.7876 0))
-    (property "Footprint" "" (id 2) (at 222.25 154.94 0)
+    (property "Value" "SW_Push" (id 1) (at 222.25 154.7876 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 222.25 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 222.25 154.94 0)
@@ -5013,8 +5069,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5d9f)
     (property "Reference" "D411" (id 0) (at 213.36 143.129 0))
-    (property "Value" "" (id 1) (at 213.36 145.4404 0))
-    (property "Footprint" "" (id 2) (at 213.36 149.86 0)
+    (property "Value" "D4.11" (id 1) (at 213.36 145.4404 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 213.36 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 213.36 149.86 0)
@@ -5028,8 +5084,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5da9)
     (property "Reference" "SW53" (id 0) (at 222.25 146.939 0))
-    (property "Value" "" (id 1) (at 222.25 144.6276 0))
-    (property "Footprint" "" (id 2) (at 222.25 144.78 0)
+    (property "Value" "SW_Push" (id 1) (at 222.25 144.6276 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 222.25 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 222.25 144.78 0)
@@ -5043,8 +5099,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5db3)
     (property "Reference" "D311" (id 0) (at 213.36 132.969 0))
-    (property "Value" "" (id 1) (at 213.36 135.2804 0))
-    (property "Footprint" "" (id 2) (at 213.36 139.7 0)
+    (property "Value" "D3.11" (id 1) (at 213.36 135.2804 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 213.36 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 213.36 139.7 0)
@@ -5058,8 +5114,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5dbf)
     (property "Reference" "SW55" (id 0) (at 222.25 167.259 0))
-    (property "Value" "" (id 1) (at 222.25 164.9476 0))
-    (property "Footprint" "" (id 2) (at 222.25 165.1 0)
+    (property "Value" "SW_Push" (id 1) (at 222.25 164.9476 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 222.25 165.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 222.25 165.1 0)
@@ -5073,8 +5129,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f7e5dc9)
     (property "Reference" "D511" (id 0) (at 213.36 153.289 0))
-    (property "Value" "" (id 1) (at 213.36 155.6004 0))
-    (property "Footprint" "" (id 2) (at 213.36 160.02 0)
+    (property "Value" "D5.11" (id 1) (at 213.36 155.6004 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 213.36 160.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 213.36 160.02 0)
@@ -5090,7 +5146,7 @@
     (property "Reference" "#PWR0117" (id 0) (at 204.47 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 204.851 80.6958 0))
+    (property "Value" "+3.3V" (id 1) (at 204.851 80.6958 0))
     (property "Footprint" "" (id 2) (at 204.47 85.09 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -5106,10 +5162,10 @@
     (property "Reference" "D20" (id 0) (at 255.1176 77.5716 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "" (id 1) (at 255.1176 79.883 0)
+    (property "Value" "PRTR5V0U2X" (id 1) (at 255.1176 79.883 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (id 2) (at 242.824 78.74 0)
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-143" (id 2) (at 242.824 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/PRTR5V0U2X.pdf" (id 3) (at 242.824 78.74 0)
@@ -5127,7 +5183,7 @@
     (property "Reference" "#PWR09" (id 0) (at 241.3 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 241.427 95.8342 0))
+    (property "Value" "GND" (id 1) (at 241.427 95.8342 0))
     (property "Footprint" "" (id 2) (at 241.3 91.44 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -5143,7 +5199,7 @@
     (property "Reference" "#PWR0110" (id 0) (at 200.66 26.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 201.041 18.4658 0))
+    (property "Value" "+3.3V" (id 1) (at 201.041 18.4658 0))
     (property "Footprint" "" (id 2) (at 200.66 22.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -5153,136 +5209,12 @@
     (pin "1" (uuid 683b340e-ed18-45b9-b892-416137cab0b6))
   )
 
-  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 204.47 200.66 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005f8deee6)
-    (property "Reference" "H5" (id 0) (at 207.01 199.4154 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "" (id 1) (at 207.01 201.7268 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 204.47 200.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 204.47 200.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid e107538c-c736-4988-b174-8134ebfaa572))
-  )
-
-  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 226.06 200.66 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005f8dfb89)
-    (property "Reference" "H6" (id 0) (at 228.6 199.4154 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "" (id 1) (at 228.6 201.7268 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 226.06 200.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 226.06 200.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 1ba7e8ce-2b88-4172-9849-3fca3b77528f))
-  )
-
-  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 156.21 200.66 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005f8e00d7)
-    (property "Reference" "H3" (id 0) (at 158.75 199.4154 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "" (id 1) (at 158.75 201.7268 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 156.21 200.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 156.21 200.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid b6619f34-63b0-4cbd-8f69-1f185ac38548))
-  )
-
-  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 111.76 200.66 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005f8e034b)
-    (property "Reference" "H1" (id 0) (at 114.3 199.4154 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "" (id 1) (at 114.3 201.7268 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 111.76 200.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 111.76 200.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 96383d92-212a-4d03-92fb-b9c39bbbf894))
-  )
-
-  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 133.35 200.66 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005f8e0476)
-    (property "Reference" "H2" (id 0) (at 135.89 199.4154 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "" (id 1) (at 135.89 201.7268 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 133.35 200.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 133.35 200.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid acedafd7-326d-4c5b-aec9-dfd2c6fac964))
-  )
-
-  (symbol (lib_id "Mechanical:MountingHole_Pad") (at 180.34 200.66 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005f8e05b4)
-    (property "Reference" "H4" (id 0) (at 182.88 199.4154 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "" (id 1) (at 182.88 201.7268 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 180.34 200.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (id 3) (at 180.34 200.66 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 6f6456e3-8df8-4a9d-a0e3-421508f4e9f1))
-  )
-
-  (symbol (lib_id "power:GND") (at 118.11 203.2 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 00000000-0000-0000-0000-00005f90046f)
-    (property "Reference" "#PWR07" (id 0) (at 118.11 209.55 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "" (id 1) (at 118.237 207.5942 0))
-    (property "Footprint" "" (id 2) (at 118.11 203.2 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 118.11 203.2 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid fa2ae00b-e5de-49ba-a7ca-b0e750ec47c4))
-  )
-
   (symbol (lib_id "Switch:SW_Push") (at 261.62 120.65 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f955c72)
     (property "Reference" "SW56" (id 0) (at 261.62 127.889 0))
-    (property "Value" "" (id 1) (at 261.62 125.5776 0))
-    (property "Footprint" "" (id 2) (at 261.62 125.73 0)
+    (property "Value" "SW_Push" (id 1) (at 261.62 125.5776 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 261.62 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 261.62 125.73 0)
@@ -5296,8 +5228,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f955c7c)
     (property "Reference" "D112" (id 0) (at 252.73 113.919 0))
-    (property "Value" "" (id 1) (at 252.73 116.2304 0))
-    (property "Footprint" "" (id 2) (at 252.73 120.65 0)
+    (property "Value" "D1.12" (id 1) (at 252.73 116.2304 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 252.73 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 252.73 120.65 0)
@@ -5311,8 +5243,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f955c86)
     (property "Reference" "SW57" (id 0) (at 261.62 138.049 0))
-    (property "Value" "" (id 1) (at 261.62 135.7376 0))
-    (property "Footprint" "" (id 2) (at 261.62 135.89 0)
+    (property "Value" "SW_Push" (id 1) (at 261.62 135.7376 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 261.62 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 261.62 135.89 0)
@@ -5326,8 +5258,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f955c90)
     (property "Reference" "D212" (id 0) (at 252.73 124.079 0))
-    (property "Value" "" (id 1) (at 252.73 126.3904 0))
-    (property "Footprint" "" (id 2) (at 252.73 130.81 0)
+    (property "Value" "D2.12" (id 1) (at 252.73 126.3904 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 252.73 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 252.73 130.81 0)
@@ -5341,8 +5273,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f955c9a)
     (property "Reference" "SW59" (id 0) (at 261.62 158.369 0))
-    (property "Value" "" (id 1) (at 261.62 156.0576 0))
-    (property "Footprint" "" (id 2) (at 261.62 156.21 0)
+    (property "Value" "SW_Push" (id 1) (at 261.62 156.0576 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 261.62 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 261.62 156.21 0)
@@ -5356,8 +5288,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f955ca4)
     (property "Reference" "D412" (id 0) (at 252.73 144.399 0))
-    (property "Value" "" (id 1) (at 252.73 146.7104 0))
-    (property "Footprint" "" (id 2) (at 252.73 151.13 0)
+    (property "Value" "D4.12" (id 1) (at 252.73 146.7104 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 252.73 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 252.73 151.13 0)
@@ -5371,8 +5303,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f955cae)
     (property "Reference" "SW58" (id 0) (at 261.62 148.209 0))
-    (property "Value" "" (id 1) (at 261.62 145.8976 0))
-    (property "Footprint" "" (id 2) (at 261.62 146.05 0)
+    (property "Value" "SW_Push" (id 1) (at 261.62 145.8976 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 261.62 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 261.62 146.05 0)
@@ -5386,8 +5318,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f955cb8)
     (property "Reference" "D312" (id 0) (at 252.73 134.239 0))
-    (property "Value" "" (id 1) (at 252.73 136.5504 0))
-    (property "Footprint" "" (id 2) (at 252.73 140.97 0)
+    (property "Value" "D3.12" (id 1) (at 252.73 136.5504 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 252.73 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 252.73 140.97 0)
@@ -5401,8 +5333,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f955cc4)
     (property "Reference" "SW60" (id 0) (at 261.62 168.529 0))
-    (property "Value" "" (id 1) (at 261.62 166.2176 0))
-    (property "Footprint" "" (id 2) (at 261.62 166.37 0)
+    (property "Value" "SW_Push" (id 1) (at 261.62 166.2176 0))
+    (property "Footprint" "custom:CherryMX_Hotswap" (id 2) (at 261.62 166.37 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "" (id 3) (at 261.62 166.37 0)
@@ -5416,8 +5348,8 @@
     (in_bom yes) (on_board yes)
     (uuid 00000000-0000-0000-0000-00005f955cce)
     (property "Reference" "D512" (id 0) (at 252.73 154.559 0))
-    (property "Value" "" (id 1) (at 252.73 156.8704 0))
-    (property "Footprint" "" (id 2) (at 252.73 161.29 0)
+    (property "Value" "D5.12" (id 1) (at 252.73 156.8704 0))
+    (property "Footprint" "Diode_SMD:D_SOD-323" (id 2) (at 252.73 161.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 252.73 161.29 0)
@@ -5433,7 +5365,7 @@
     (property "Reference" "#PWR0113" (id 0) (at 262.89 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 263.271 12.1158 0))
+    (property "Value" "VCC" (id 1) (at 263.271 12.1158 0))
     (property "Footprint" "" (id 2) (at 262.89 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -5449,7 +5381,7 @@
     (property "Reference" "#PWR0118" (id 0) (at 241.3 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 241.681 61.6458 0))
+    (property "Value" "VCC" (id 1) (at 241.681 61.6458 0))
     (property "Footprint" "" (id 2) (at 241.3 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -5465,7 +5397,7 @@
     (property "Reference" "#FLG0103" (id 0) (at 267.97 14.605 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "" (id 1) (at 267.97 12.1158 0))
+    (property "Value" "PWR_FLAG" (id 1) (at 267.97 12.1158 0))
     (property "Footprint" "" (id 2) (at 267.97 16.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -5475,6 +5407,280 @@
     (pin "1" (uuid 8ceb7fe5-ed1a-4361-b00f-cc063b15bb3b))
   )
 
+  (symbol (lib_id "Connector:TestPoint") (at 316.23 102.87 90) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 0bcbc3fa-6655-44c5-92e2-7195226a52fe)
+    (property "Reference" "TP2" (id 0) (at 307.34 102.87 90))
+    (property "Value" "3.3" (id 1) (at 298.45 102.87 90))
+    (property "Footprint" "TestPoint:TestPoint_Pad_D1.0mm" (id 2) (at 316.23 97.79 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 316.23 97.79 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 0be3e0a5-8608-446a-9fb8-88dfd04b806d))
+  )
+
+  (symbol (lib_id "Connector:TestPoint") (at 316.23 110.49 90) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 290a434f-1e8d-4b9f-9a30-84d84e38e021)
+    (property "Reference" "TP4" (id 0) (at 307.34 110.49 90))
+    (property "Value" "SK6812_IN" (id 1) (at 298.45 110.49 90))
+    (property "Footprint" "TestPoint:TestPoint_Pad_D1.0mm" (id 2) (at 316.23 105.41 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 316.23 105.41 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 4995d9ed-13cd-4f7d-bf31-d091445cde87))
+  )
+
+  (symbol (lib_id "Mechanical:MountingHole") (at 299.72 138.43 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 4368b4f3-b93e-4f05-ab5a-d00049c651fb)
+    (property "Reference" "H3" (id 0) (at 302.26 137.2616 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M2" (id 1) (at 302.26 139.573 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "MountingHole:MountingHole_2.2mm_M2" (id 2) (at 299.72 138.43 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 299.72 138.43 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
+
+  (symbol (lib_id "Mechanical:MountingHole") (at 309.88 138.43 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 4f359618-ac49-4b39-8750-b4f2a3bf7f12)
+    (property "Reference" "H6" (id 0) (at 312.42 137.2616 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M2" (id 1) (at 312.42 139.573 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "MountingHole:MountingHole_2.2mm_M2" (id 2) (at 309.88 138.43 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 309.88 138.43 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
+
+  (symbol (lib_id "Mechanical:MountingHole") (at 340.36 124.46 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 506ea515-a66c-4985-a682-725b7362ed37)
+    (property "Reference" "H8" (id 0) (at 342.9 123.2916 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M2" (id 1) (at 342.9 125.603 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "MountingHole:MountingHole_2.2mm_M2" (id 2) (at 340.36 124.46 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 340.36 124.46 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
+
+  (symbol (lib_id "Mechanical:MountingHole") (at 299.72 132.08 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 58aefd51-0999-4927-8f31-7c1acc7df8e4)
+    (property "Reference" "H2" (id 0) (at 302.26 130.9116 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M2" (id 1) (at 302.26 133.223 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "MountingHole:MountingHole_2.2mm_M2" (id 2) (at 299.72 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 299.72 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
+
+  (symbol (lib_id "power:GND") (at 304.8 143.51 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 5902e2a5-7228-44eb-a602-a3ca387614f0)
+    (property "Reference" "#PWR0119" (id 0) (at 304.8 149.86 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GND" (id 1) (at 304.8 148.59 0))
+    (property "Footprint" "" (id 2) (at 304.8 143.51 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 304.8 143.51 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid bbbbb06d-4bbd-4843-afe4-72059daa8ed6))
+  )
+
+  (symbol (lib_id "Mechanical:MountingHole") (at 330.2 124.46 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 6710e305-0636-46c9-9c66-3145ddf4806c)
+    (property "Reference" "H7" (id 0) (at 332.74 123.2916 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M2" (id 1) (at 332.74 125.603 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "MountingHole:MountingHole_2.2mm_M2" (id 2) (at 330.2 124.46 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 330.2 124.46 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
+
+  (symbol (lib_id "Mechanical:MountingHole") (at 330.2 132.08 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 973d64c4-48c8-45bf-9030-9a49e7620ff2)
+    (property "Reference" "H9" (id 0) (at 332.74 130.9116 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M2" (id 1) (at 332.74 133.223 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "MountingHole:MountingHole_2.2mm_M2" (id 2) (at 330.2 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 330.2 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
+
+  (symbol (lib_id "Connector:TestPoint") (at 316.23 96.52 90) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 97448a71-b3fb-4c6e-9d2e-89a50a4c4b8d)
+    (property "Reference" "TP1" (id 0) (at 307.34 96.52 90))
+    (property "Value" "VBUS" (id 1) (at 298.45 96.52 90))
+    (property "Footprint" "TestPoint:TestPoint_Pad_D1.0mm" (id 2) (at 316.23 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 316.23 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid d6f11734-09ab-4c67-b4d1-de931f8c2f31))
+  )
+
+  (symbol (lib_id "Mechanical:MountingHole") (at 309.88 132.08 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid a290f7d2-1e0e-41a3-80af-b220c1cf0757)
+    (property "Reference" "H5" (id 0) (at 312.42 130.9116 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M2" (id 1) (at 312.42 133.223 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "MountingHole:MountingHole_2.2mm_M2" (id 2) (at 309.88 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 309.88 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
+
+  (symbol (lib_id "power:VCC") (at 316.23 96.52 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid a3589771-726c-47e3-943c-5174ade90ba4)
+    (property "Reference" "#PWR0112" (id 0) (at 316.23 100.33 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "VCC" (id 1) (at 316.23 91.44 0))
+    (property "Footprint" "" (id 2) (at 316.23 96.52 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 316.23 96.52 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 1325b5b7-137a-4015-97c4-52f04b2fc237))
+  )
+
+  (symbol (lib_id "Connector:TestPoint") (at 316.23 106.68 90) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid afe64cce-5d95-4be6-977c-588b5fe4bbaf)
+    (property "Reference" "TP3" (id 0) (at 307.34 106.68 90))
+    (property "Value" "SPI_MOSI" (id 1) (at 298.45 106.68 90))
+    (property "Footprint" "TestPoint:TestPoint_Pad_D1.0mm" (id 2) (at 316.23 101.6 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 316.23 101.6 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid ff0f0f4f-5f8d-4ac9-b195-7f8527a0b55e))
+  )
+
+  (symbol (lib_id "power:+3.3V") (at 316.23 102.87 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid bb559f17-71c3-44c3-a70c-4451aec418d4)
+    (property "Reference" "#PWR0114" (id 0) (at 316.23 106.68 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "+3.3V" (id 1) (at 316.611 98.4758 0))
+    (property "Footprint" "" (id 2) (at 316.23 102.87 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 316.23 102.87 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid bd254b62-e4b7-45cd-b992-12bd6d338418))
+  )
+
+  (symbol (lib_id "Mechanical:MountingHole") (at 299.72 125.73 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid bbf28a37-3b30-42cb-afd8-1534657d5fc6)
+    (property "Reference" "H1" (id 0) (at 302.26 124.5616 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M2" (id 1) (at 302.26 126.873 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "MountingHole:MountingHole_2.2mm_M2" (id 2) (at 299.72 125.73 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 299.72 125.73 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
+
+  (symbol (lib_id "Mechanical:MountingHole") (at 309.88 125.73 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid d675c177-cd88-4d8d-ad78-6493401b4fc7)
+    (property "Reference" "H4" (id 0) (at 312.42 124.5616 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M2" (id 1) (at 312.42 126.873 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "MountingHole:MountingHole_2.2mm_M2" (id 2) (at 309.88 125.73 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 309.88 125.73 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
+
+  (symbol (lib_id "Mechanical:MountingHole") (at 340.36 132.08 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid f75e1adc-8f5f-4065-b251-4f4307ca6bc7)
+    (property "Reference" "H10" (id 0) (at 342.9 130.9116 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "M2" (id 1) (at 342.9 133.223 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "MountingHole:MountingHole_2.2mm_M2" (id 2) (at 340.36 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 340.36 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
+
   (sheet (at 306.07 50.8) (size 41.91 21.59) (fields_autoplaced)
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (fill (color 0 0 0 0.0000))
@@ -5502,15 +5708,24 @@
     (path "/00000000-0000-0000-0000-00005fb188cd"
       (reference "#FLG0103") (unit 1) (value "PWR_FLAG") (footprint "")
     )
-    (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f6ca4dd"
-      (reference "#PWR05") (unit 1) (value "+5V") (footprint "")
+    (path "/00000000-0000-0000-0000-00005f7975a8/0b93a2d5-808f-40e6-9f7a-c9b66d556c65"
+      (reference "#PWR01") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/fdd76ab2-6ce0-4e2a-845d-11f51f1d0230"
+      (reference "#PWR02") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/4006d76f-6e24-4072-bbf1-72b4b7273391"
+      (reference "#PWR03") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/de12f840-c018-42e2-a535-6c3e41f63c5b"
+      (reference "#PWR04") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/f156089d-1626-49a5-91ef-bd14468db22d"
+      (reference "#PWR05") (unit 1) (value "GND") (footprint "")
     )
     (path "/00000000-0000-0000-0000-00005f6ecce1"
       (reference "#PWR06") (unit 1) (value "+3.3V") (footprint "")
     )
-    (path "/00000000-0000-0000-0000-00005f90046f"
-      (reference "#PWR07") (unit 1) (value "GND") (footprint "")
-    )
     (path "/00000000-0000-0000-0000-00005f860520"
       (reference "#PWR09") (unit 1) (value "GND") (footprint "")
     )
@@ -5547,11 +5762,14 @@
     (path "/00000000-0000-0000-0000-00005f763fff"
       (reference "#PWR0111") (unit 1) (value "GND") (footprint "")
     )
+    (path "/a3589771-726c-47e3-943c-5174ade90ba4"
+      (reference "#PWR0112") (unit 1) (value "VCC") (footprint "")
+    )
     (path "/00000000-0000-0000-0000-00005faf45b5"
       (reference "#PWR0113") (unit 1) (value "VCC") (footprint "")
     )
-    (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f7b7ce0"
-      (reference "#PWR0114") (unit 1) (value "GND") (footprint "")
+    (path "/bb559f17-71c3-44c3-a70c-4451aec418d4"
+      (reference "#PWR0114") (unit 1) (value "+3.3V") (footprint "")
     )
     (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f7be04e"
       (reference "#PWR0115") (unit 1) (value "+5V") (footprint "")
@@ -5565,6 +5783,27 @@
     (path "/00000000-0000-0000-0000-00005faf704c"
       (reference "#PWR0118") (unit 1) (value "VCC") (footprint "")
     )
+    (path "/5902e2a5-7228-44eb-a602-a3ca387614f0"
+      (reference "#PWR0119") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/914f93c6-a5fc-4273-bf4a-81662787745f"
+      (reference "#PWR0122") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/a5b14659-cb93-46dd-adb2-80fcf0ebf4b1"
+      (reference "#PWR0123") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/a8507a0d-0c2e-43d6-8b9e-e5f65d88966a"
+      (reference "#PWR0124") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/b7159fdb-a7ae-47d5-80a5-de2d471a8cb2"
+      (reference "#PWR0126") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/d2cfdf70-2536-4c87-b198-8f44779ab843"
+      (reference "#PWR0127") (unit 1) (value "GND") (footprint "")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/bff9e2cb-6802-4481-b3af-e6b1793ff61f"
+      (reference "#PWR0129") (unit 1) (value "GND") (footprint "")
+    )
     (path "/00000000-0000-0000-0000-00005dec9db9"
       (reference "C1") (unit 1) (value "100nF") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder")
     )
@@ -5586,35 +5825,20 @@
     (path "/00000000-0000-0000-0000-00005dec3df1"
       (reference "C7") (unit 1) (value "4.7µF") (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder")
     )
-    (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f7b7cb2"
-      (reference "D1") (unit 1) (value "WS2812B") (footprint "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm")
-    )
-    (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f7b7ca6"
-      (reference "D2") (unit 1) (value "WS2812B") (footprint "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm")
-    )
-    (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f7b7cac"
-      (reference "D3") (unit 1) (value "WS2812B") (footprint "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm")
+    (path "/00000000-0000-0000-0000-00005f7975a8/7360ff08-2b43-4afd-b655-2429e9272337"
+      (reference "C10") (unit 1) (value "0.1nF") (footprint "Resistor_SMD:R_0805_2012Metric")
     )
-    (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f7b7cbe"
-      (reference "D4") (unit 1) (value "WS2812B") (footprint "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm")
+    (path "/00000000-0000-0000-0000-00005f7975a8/2a2f5c45-98ce-48c8-85c3-d7c372dbccad"
+      (reference "C11") (unit 1) (value "0.1nF") (footprint "Resistor_SMD:R_0805_2012Metric")
     )
-    (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f7b7cd0"
-      (reference "D5") (unit 1) (value "WS2812B") (footprint "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm")
+    (path "/00000000-0000-0000-0000-00005f7975a8/689b65b2-edef-4754-8315-5ed345ea1167"
+      (reference "C12") (unit 1) (value "0.1nF") (footprint "Resistor_SMD:R_0805_2012Metric")
     )
-    (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f7b7cc4"
-      (reference "D6") (unit 1) (value "WS2812B") (footprint "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm")
+    (path "/00000000-0000-0000-0000-00005f7975a8/dd364f15-d9df-407f-aeb5-3067fb91910f"
+      (reference "C13") (unit 1) (value "0.1nF") (footprint "Resistor_SMD:R_0805_2012Metric")
     )
-    (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f7b7cca"
-      (reference "D7") (unit 1) (value "WS2812B") (footprint "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm")
-    )
-    (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f7b7cd6"
-      (reference "D8") (unit 1) (value "WS2812B") (footprint "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm")
-    )
-    (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f7b7cb8"
-      (reference "D9") (unit 1) (value "WS2812B") (footprint "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm")
-    )
-    (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f7b7cec"
-      (reference "D10") (unit 1) (value "WS2812B") (footprint "LED_SMD:LED_WS2812B_PLCC4_5.0x5.0mm_P3.2mm")
+    (path "/00000000-0000-0000-0000-00005f7975a8/2ad48ca0-1810-4405-8c04-d490495ef24d"
+      (reference "C14") (unit 1) (value "0.1nF") (footprint "Resistor_SMD:R_0805_2012Metric")
     )
     (path "/00000000-0000-0000-0000-00005f681075"
       (reference "D11") (unit 1) (value "D1.1") (footprint "Diode_SMD:D_SOD-323")
@@ -5802,23 +6026,35 @@
     (path "/00000000-0000-0000-0000-00005f6f35e2"
       (reference "F1") (unit 1) (value "500mA") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder")
     )
-    (path "/00000000-0000-0000-0000-00005f8e034b"
-      (reference "H1") (unit 1) (value "MountingHole_Pad") (footprint "MountingHole:MountingHole_2.2mm_M2_Pad")
+    (path "/bbf28a37-3b30-42cb-afd8-1534657d5fc6"
+      (reference "H1") (unit 1) (value "M2") (footprint "MountingHole:MountingHole_2.2mm_M2")
+    )
+    (path "/58aefd51-0999-4927-8f31-7c1acc7df8e4"
+      (reference "H2") (unit 1) (value "M2") (footprint "MountingHole:MountingHole_2.2mm_M2")
+    )
+    (path "/4368b4f3-b93e-4f05-ab5a-d00049c651fb"
+      (reference "H3") (unit 1) (value "M2") (footprint "MountingHole:MountingHole_2.2mm_M2")
+    )
+    (path "/d675c177-cd88-4d8d-ad78-6493401b4fc7"
+      (reference "H4") (unit 1) (value "M2") (footprint "MountingHole:MountingHole_2.2mm_M2")
+    )
+    (path "/a290f7d2-1e0e-41a3-80af-b220c1cf0757"
+      (reference "H5") (unit 1) (value "M2") (footprint "MountingHole:MountingHole_2.2mm_M2")
     )
-    (path "/00000000-0000-0000-0000-00005f8e0476"
-      (reference "H2") (unit 1) (value "MountingHole_Pad") (footprint "MountingHole:MountingHole_2.2mm_M2_Pad")
+    (path "/4f359618-ac49-4b39-8750-b4f2a3bf7f12"
+      (reference "H6") (unit 1) (value "M2") (footprint "MountingHole:MountingHole_2.2mm_M2")
     )
-    (path "/00000000-0000-0000-0000-00005f8e00d7"
-      (reference "H3") (unit 1) (value "MountingHole_Pad") (footprint "MountingHole:MountingHole_2.2mm_M2_Pad")
+    (path "/6710e305-0636-46c9-9c66-3145ddf4806c"
+      (reference "H7") (unit 1) (value "M2") (footprint "MountingHole:MountingHole_2.2mm_M2")
     )
-    (path "/00000000-0000-0000-0000-00005f8e05b4"
-      (reference "H4") (unit 1) (value "MountingHole_Pad") (footprint "MountingHole:MountingHole_2.2mm_M2_Pad")
+    (path "/506ea515-a66c-4985-a682-725b7362ed37"
+      (reference "H8") (unit 1) (value "M2") (footprint "MountingHole:MountingHole_2.2mm_M2")
     )
-    (path "/00000000-0000-0000-0000-00005f8deee6"
-      (reference "H5") (unit 1) (value "MountingHole_Pad") (footprint "MountingHole:MountingHole_2.2mm_M2_Pad")
+    (path "/973d64c4-48c8-45bf-9030-9a49e7620ff2"
+      (reference "H9") (unit 1) (value "M2") (footprint "MountingHole:MountingHole_2.2mm_M2")
     )
-    (path "/00000000-0000-0000-0000-00005f8dfb89"
-      (reference "H6") (unit 1) (value "MountingHole_Pad") (footprint "MountingHole:MountingHole_2.2mm_M2_Pad")
+    (path "/f75e1adc-8f5f-4065-b251-4f4307ca6bc7"
+      (reference "H10") (unit 1) (value "M2") (footprint "MountingHole:MountingHole_2.2mm_M2")
     )
     (path "/00000000-0000-0000-0000-00005e037a53"
       (reference "J1") (unit 1) (value "USB_C_Receptacle_USB2.0") (footprint "kicad-usb:USB_C_Receptacle_HRO_TYPE-C-31-M-12")
@@ -5838,185 +6074,377 @@
     (path "/00000000-0000-0000-0000-00005dedea73"
       (reference "R7") (unit 1) (value "5.1k") (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder")
     )
+    (path "/00000000-0000-0000-0000-00005f7975a8/6cb161aa-fa95-4192-913c-4d4fe8559ca5"
+      (reference "SKR1C1") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/5e06b83b-7d40-423c-9a6a-0cc8441bd43f"
+      (reference "SKR1C2") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/be07ae0d-0c18-478d-80e8-bcbab3c4b219"
+      (reference "SKR1C3") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/6e1c8d22-a3c2-4739-8080-cc2499cbf0c3"
+      (reference "SKR1C4") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/f9135800-400e-4c0f-b8ef-39cd4c7532ee"
+      (reference "SKR1C5") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/26705a52-90a6-4b50-88bb-1cd28bc6dbbd"
+      (reference "SKR1C6") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/9d2bd03d-0cb5-4ae3-9d1b-b465fee9967b"
+      (reference "SKR1C7") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/5fe182c6-521a-4fe2-a67d-490060532c80"
+      (reference "SKR1C8") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/28b8b0ff-3318-419b-bc8d-9f067a678e27"
+      (reference "SKR1C9") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/d1502067-f7b7-49f0-92bc-f97c9bed11ec"
+      (reference "SKR1C10") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/6db08262-60fc-47be-a61e-ae628d4b1e61"
+      (reference "SKR1C11") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/6577f2c7-24e4-47db-9344-172052c866ea"
+      (reference "SKR1C12") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/d73d8c56-ac9e-4e49-814e-215c866a1bd2"
+      (reference "SKR2C1") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/5573ca00-4318-4972-a7b7-d69737ed90a8"
+      (reference "SKR2C2") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/7a565c04-da3c-4b92-8807-aac3613a3481"
+      (reference "SKR2C3") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/9e167585-a0f1-412c-b78a-0bf74745252e"
+      (reference "SKR2C4") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/4178c677-961d-462e-9787-3b8d60bd672e"
+      (reference "SKR2C5") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/48de1101-72ce-4bdb-a813-03bc9684df86"
+      (reference "SKR2C6") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/49e10186-f0f7-47df-9e2c-6ee78864f6bd"
+      (reference "SKR2C7") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/100d098f-5928-4cfe-9681-e8eadd80292c"
+      (reference "SKR2C8") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/8d65068c-f8da-4a07-a7bb-427ec740be7e"
+      (reference "SKR2C9") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/ca1edcf1-79e0-4375-9c85-feb93ed8817d"
+      (reference "SKR2C10") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/4e001f91-0a00-4273-97cd-8adfe0dd1dd4"
+      (reference "SKR2C11") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/421105d8-4bc4-4033-8fe0-ebe74ea70e4c"
+      (reference "SKR2C12") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/a7d8fc20-7a3d-46f6-8849-c166839edc1a"
+      (reference "SKR3C1") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/2dacc0eb-02af-486e-8300-e3a35df803f0"
+      (reference "SKR3C2") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/895f049d-dfe1-420b-8631-33ccfbc7fc20"
+      (reference "SKR3C3") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/dc3bb96e-aeec-4be4-976d-e1fcb2094571"
+      (reference "SKR3C4") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/976e2ae6-a17e-495e-89f5-de9dffcf92a5"
+      (reference "SKR3C5") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/4211947d-8fe8-4603-b6e0-0325b429e5dc"
+      (reference "SKR3C6") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/d7f5900f-b5d9-4575-bf05-db9b99edf4f4"
+      (reference "SKR3C7") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/a669f68b-d545-4f3e-83a9-c28f6a9a6bbe"
+      (reference "SKR3C8") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/4977b607-11ec-4d17-a0f3-ad0dbd15165e"
+      (reference "SKR3C9") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/4c7e7288-a989-48c8-8a45-4d5ccb25309f"
+      (reference "SKR3C10") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/91b9f20c-1fdf-4ecc-a95a-98c77e8154bb"
+      (reference "SKR3C11") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/5058395b-6706-41d5-ba04-04a64c11298c"
+      (reference "SKR3C12") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/ec4f19d0-7319-4196-bc91-006e0e31b0a5"
+      (reference "SKR4C1") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/2e45e1ac-8a8a-419e-b147-210f72f9635b"
+      (reference "SKR4C2") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/7e3c782d-b524-4f78-8237-1d4519ce1b20"
+      (reference "SKR4C3") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/9518226d-6fdb-4205-b4fa-f80d914f12ed"
+      (reference "SKR4C4") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/3a230671-17af-42f4-896d-4c5cc92809b0"
+      (reference "SKR4C5") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/0ee3b882-c646-47eb-9546-20ce739f1620"
+      (reference "SKR4C6") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/d9e9690b-5bdd-4a05-a80d-ed95f5c8922e"
+      (reference "SKR4C7") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/04789141-7bf9-4c30-9a8d-e0f9f65ecb6f"
+      (reference "SKR4C8") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/b7273935-9f6c-4c1c-80f5-a4808a3b4f6d"
+      (reference "SKR4C9") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/5d8fcfa2-4966-4bf3-970f-25575d0445f8"
+      (reference "SKR4C10") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/cf9a17f2-439b-4772-8b7b-6b0841fc5185"
+      (reference "SKR4C11") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/a19de8a8-2a8d-4fc6-b88e-bd2ede20e910"
+      (reference "SKR4C12") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/2d8b16da-7039-46d1-b3e0-d51ad5b27623"
+      (reference "SKR5C1") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/5c7dc561-06ab-4c79-a748-9af43f1ba892"
+      (reference "SKR5C2") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/045c9e32-21c2-4bad-99f1-03adb6373c30"
+      (reference "SKR5C3") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/4703acbc-aa4e-4105-8098-4af98d57aee5"
+      (reference "SKR5C4") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/471ee13c-74b1-425d-8b3c-917839184fee"
+      (reference "SKR5C5") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/c797a51f-5eb3-488f-a1e2-1c260b723ed1"
+      (reference "SKR5C6") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/99ae23b1-d4fe-486a-930e-719f7e84090d"
+      (reference "SKR5C7") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/40b4e136-36df-4d0a-bcc1-0637bc99a07f"
+      (reference "SKR5C8") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/176ea9bd-d9c7-4c0b-8b28-8e6d1fe71054"
+      (reference "SKR5C9") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/73a8a813-c1fc-4c04-924e-383d7639954c"
+      (reference "SKR5C10") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/1c95f31f-e3ec-4cda-a258-add836e08edd"
+      (reference "SKR5C11") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/6faa2590-1d42-4174-8e98-c3500d6e0fe5"
+      (reference "SKR5C12") (unit 1) (value "SK6812MINI") (footprint "custom:SK6812Mini-E-BACK-BIS")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/26b12e7a-2a67-41f1-87e8-3ebfe3d1102a"
+      (reference "STAT1") (unit 1) (value "SK6812MINI") (footprint "LED_SMD:LED_SK6812MINI_PLCC4_3.5x3.5mm_P1.75mm")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/d9b4dc48-ac96-42ec-8d98-b5733f5aae50"
+      (reference "STAT2") (unit 1) (value "~") (footprint "LED_SMD:LED_SK6812MINI_PLCC4_3.5x3.5mm_P1.75mm")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/5fd47f40-2699-4fd2-b914-591c066568e5"
+      (reference "STAT3") (unit 1) (value "~") (footprint "LED_SMD:LED_SK6812MINI_PLCC4_3.5x3.5mm_P1.75mm")
+    )
+    (path "/00000000-0000-0000-0000-00005f7975a8/439ff28a-eea4-4c67-8583-01bc31c1a92a"
+      (reference "STAT4") (unit 1) (value "~") (footprint "LED_SMD:LED_SK6812MINI_PLCC4_3.5x3.5mm_P1.75mm")
+    )
     (path "/00000000-0000-0000-0000-00005f68106b"
-      (reference "SW1") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW1") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f68107f"
-      (reference "SW2") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW2") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f6810a7"
-      (reference "SW3") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW3") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f681093"
-      (reference "SW4") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW4") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f728054"
-      (reference "SW5") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW5") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f73134e"
-      (reference "SW6") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW6") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f731362"
-      (reference "SW7") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW7") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f73138a"
-      (reference "SW8") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW8") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f731376"
-      (reference "SW9") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW9") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7313a0"
-      (reference "SW10") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW10") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7440d1"
-      (reference "SW11") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW11") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7440e5"
-      (reference "SW12") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW12") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f74410d"
-      (reference "SW13") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW13") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7440f9"
-      (reference "SW14") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW14") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f744123"
-      (reference "SW15") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW15") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f75dcd9"
-      (reference "SW16") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW16") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f75dced"
-      (reference "SW17") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW17") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f75dd15"
-      (reference "SW18") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW18") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f75dd01"
-      (reference "SW19") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW19") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f75dd2b"
-      (reference "SW20") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW20") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f771ed4"
-      (reference "SW21") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW21") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f771ee8"
-      (reference "SW22") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW22") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f771f10"
-      (reference "SW23") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW23") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f771efc"
-      (reference "SW24") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW24") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f771f26"
-      (reference "SW25") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW25") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793b90"
-      (reference "SW26") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW26") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793ba4"
-      (reference "SW27") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW27") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793bcc"
-      (reference "SW28") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW28") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793bb8"
-      (reference "SW29") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW29") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793be2"
-      (reference "SW30") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW30") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793c01"
-      (reference "SW31") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW31") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793c15"
-      (reference "SW32") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW32") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793c3d"
-      (reference "SW33") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW33") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793c29"
-      (reference "SW34") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW34") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793c53"
-      (reference "SW35") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW35") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793c72"
-      (reference "SW36") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW36") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793c86"
-      (reference "SW37") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW37") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793cae"
-      (reference "SW38") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW38") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793c9a"
-      (reference "SW39") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW39") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f793cc4"
-      (reference "SW40") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW40") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5c8b"
-      (reference "SW41") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW41") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5c9f"
-      (reference "SW42") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW42") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5cc7"
-      (reference "SW43") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW43") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5cb3"
-      (reference "SW44") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW44") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5cdd"
-      (reference "SW45") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW45") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5cfc"
-      (reference "SW46") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW46") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5d10"
-      (reference "SW47") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW47") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5d38"
-      (reference "SW48") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW48") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5d24"
-      (reference "SW49") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW49") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5d4e"
-      (reference "SW50") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW50") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5d6d"
-      (reference "SW51") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW51") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5d81"
-      (reference "SW52") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW52") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5da9"
-      (reference "SW53") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW53") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5d95"
-      (reference "SW54") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW54") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f7e5dbf"
-      (reference "SW55") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW55") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f955c72"
-      (reference "SW56") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW56") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f955c86"
-      (reference "SW57") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW57") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f955cae"
-      (reference "SW58") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW58") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f955c9a"
-      (reference "SW59") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW59") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005f955cc4"
-      (reference "SW60") (unit 1) (value "SW_Push") (footprint "Button_Switch_Keyboard:SW_Cherry_MX_1.00u_PCB")
+      (reference "SW60") (unit 1) (value "SW_Push") (footprint "custom:CherryMX_Hotswap")
     )
     (path "/00000000-0000-0000-0000-00005dece105"
       (reference "SWBOOT1") (unit 1) (value "BOOT") (footprint "Button_Switch_SMD:SW_SPST_CK_RS282G05A3")
@@ -6024,6 +6452,18 @@
     (path "/00000000-0000-0000-0000-00005deca090"
       (reference "SWRST1") (unit 1) (value "RESET") (footprint "Button_Switch_SMD:SW_SPST_CK_RS282G05A3")
     )
+    (path "/97448a71-b3fb-4c6e-9d2e-89a50a4c4b8d"
+      (reference "TP1") (unit 1) (value "VBUS") (footprint "TestPoint:TestPoint_Pad_D1.0mm")
+    )
+    (path "/0bcbc3fa-6655-44c5-92e2-7195226a52fe"
+      (reference "TP2") (unit 1) (value "3.3") (footprint "TestPoint:TestPoint_Pad_D1.0mm")
+    )
+    (path "/afe64cce-5d95-4be6-977c-588b5fe4bbaf"
+      (reference "TP3") (unit 1) (value "SPI_MOSI") (footprint "TestPoint:TestPoint_Pad_D1.0mm")
+    )
+    (path "/290a434f-1e8d-4b9f-9a30-84d84e38e021"
+      (reference "TP4") (unit 1) (value "SK6812_IN") (footprint "TestPoint:TestPoint_Pad_D1.0mm")
+    )
     (path "/00000000-0000-0000-0000-00005dec39df"
       (reference "U1") (unit 1) (value "STM32") (footprint "Package_QFP:LQFP-48_7x7mm_P0.5mm")
     )
@@ -6031,7 +6471,7 @@
       (reference "U2") (unit 1) (value "TLV70233_SOT23-5") (footprint "Package_TO_SOT_SMD:SOT-23-5")
     )
     (path "/00000000-0000-0000-0000-00005f7975a8/00000000-0000-0000-0000-00005f7bc305"
-      (reference "U3") (unit 1) (value "74LVC1G34") (footprint "Package_TO_SOT_SMD:SOT-353_SC-70-5")
+      (reference "U3") (unit 1) (value "74LVC1G34") (footprint "Package_TO_SOT_SMD:SOT-23-5")
     )
   )
 )
-- 
cgit v1.2.3