diff --git a/hardware/common/mounting-hardware.kicad_sym b/hardware/common/mounting-hardware.kicad_sym
index b22d8f6..d48bf86 100644
--- a/hardware/common/mounting-hardware.kicad_sym
+++ b/hardware/common/mounting-hardware.kicad_sym
@@ -1,5 +1,5 @@
 (kicad_symbol_lib (version 20220914) (generator kicad_symbol_editor)
-  (symbol "MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+  (symbol "MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
     (property "Reference" "BOLT" (at 0 3.048 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
@@ -81,6 +81,9 @@
     (property "Standards Version" "1.1" (at -25.654 -75.692 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at -10.16 -7.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (property "ki_keywords" "spacer mounting #4" (at 0 0 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -177,7 +180,7 @@
       )
     )
   )
-  (symbol "MNT McMaster Bolt, #4-40, 7/16{dblquote} Long, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+  (symbol "MNT McMaster Bolt, #4-40, 7/16{dblquote} Long, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
     (property "Reference" "BOLT" (at 0 3.048 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
@@ -259,6 +262,9 @@
     (property "Standards Version" "1.1" (at -25.654 -75.692 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at -2.54 -5.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (property "ki_keywords" "spacer mounting #4" (at 0 0 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -355,7 +361,7 @@
       )
     )
   )
-  (symbol "MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+  (symbol "MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
     (property "Reference" "WASHER" (at 0 3.048 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
@@ -437,6 +443,9 @@
     (property "Standards Version" "1.1" (at -25.654 -75.692 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at -5.08 -5.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (property "ki_keywords" "lockwasher mounting #4" (at 0 0 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -497,7 +506,7 @@
       )
     )
   )
-  (symbol "MNT McMaster Nut, #4-40, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+  (symbol "MNT McMaster Nut, #4-40, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
     (property "Reference" "NUT" (at 0 3.048 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
@@ -579,6 +588,9 @@
     (property "Standards Version" "1.1" (at -25.654 -75.692 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 10.16 -2.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (property "ki_keywords" "nut mounting #4" (at 0 0 0)
       (effects (font (size 1.27 1.27)) hide)
     )
@@ -609,7 +621,7 @@
       )
     )
   )
-  (symbol "MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+  (symbol "MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
     (property "Reference" "SPACER" (at 0 3.048 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
@@ -691,6 +703,9 @@
     (property "Standards Version" "1.1" (at -25.654 -75.692 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at -12.7 -12.7 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (property "ki_keywords" "spacer mounting #4" (at 0 0 0)
       (effects (font (size 1.27 1.27)) hide)
     )
diff --git a/hardware/common/unikbd.kicad_sym b/hardware/common/unikbd.kicad_sym
index 95bda5f..6cddd0d 100644
--- a/hardware/common/unikbd.kicad_sym
+++ b/hardware/common/unikbd.kicad_sym
@@ -2156,13 +2156,13 @@
     )
   )
   (symbol "LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-    (property "Reference" "LED" (at 5.461 1.27 0)
+    (property "Reference" "LED" (at 5.08 2.54 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT" (at -59.69 -27.94 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
-    (property "Footprint" "LED_THT:LED_D2.0mm_W4.8mm_H2.5mm_FlatTop" (at -50.8 -34.29 0)
+    (property "Footprint" "LED_THT:LED_D3.0mm" (at -50.8 -34.29 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at -50.8 -34.29 0)
@@ -2231,59 +2231,59 @@
     (symbol "LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT_0_1"
       (polyline
         (pts
-          (xy -1.27 -1.27)
-          (xy -1.27 1.27)
+          (xy 2.54 -1.27)
+          (xy 2.54 1.27)
         )
         (stroke (width 0.254) (type default))
         (fill (type none))
       )
       (polyline
         (pts
-          (xy -1.27 0)
-          (xy 1.27 0)
+          (xy 2.54 0)
+          (xy 5.08 0)
         )
         (stroke (width 0) (type default))
         (fill (type none))
       )
       (polyline
         (pts
-          (xy 1.27 -1.27)
-          (xy 1.27 1.27)
-          (xy -1.27 0)
-          (xy 1.27 -1.27)
+          (xy 5.08 -1.27)
+          (xy 5.08 1.27)
+          (xy 2.54 0)
+          (xy 5.08 -1.27)
         )
         (stroke (width 0.254) (type default))
         (fill (type none))
       )
       (polyline
         (pts
-          (xy -3.048 -0.762)
-          (xy -4.572 -2.286)
-          (xy -3.81 -2.286)
-          (xy -4.572 -2.286)
-          (xy -4.572 -1.524)
+          (xy 0.762 -0.762)
+          (xy -0.762 -2.286)
+          (xy 0 -2.286)
+          (xy -0.762 -2.286)
+          (xy -0.762 -1.524)
         )
         (stroke (width 0) (type default))
         (fill (type none))
       )
       (polyline
         (pts
-          (xy -1.778 -0.762)
-          (xy -3.302 -2.286)
-          (xy -2.54 -2.286)
-          (xy -3.302 -2.286)
-          (xy -3.302 -1.524)
+          (xy 2.032 -0.762)
+          (xy 0.508 -2.286)
+          (xy 1.27 -2.286)
+          (xy 0.508 -2.286)
+          (xy 0.508 -1.524)
         )
         (stroke (width 0) (type default))
         (fill (type none))
       )
     )
     (symbol "LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT_1_1"
-      (pin passive line (at -3.81 0 0) (length 2.54)
+      (pin passive line (at 0 0 0) (length 2.54)
         (name "K" (effects (font (size 1.27 1.27))))
         (number "1" (effects (font (size 1.27 1.27))))
       )
-      (pin passive line (at 3.81 0 180) (length 2.54)
+      (pin passive line (at 7.62 0 180) (length 2.54)
         (name "A" (effects (font (size 1.27 1.27))))
         (number "2" (effects (font (size 1.27 1.27))))
       )
@@ -3054,6 +3054,202 @@
       )
     )
   )
+  (symbol "SW Cherry MX/Futaba 1U LED Style A" (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+    (property "Reference" "SW" (at -2.54 5.08 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Key" (at -27.94 -34.798 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "unikbd:Key_MX_LED" (at -40.64 -17.78 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://www.mouser.com/datasheet/2/71/chcp_s_a0002957244_1-2263075.pdf" (at -26.162 -29.464 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "Key" (at -38.1 -12.7 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at -22.098 -39.624 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "Cherry" (at -26.162 -18.288 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at -23.368 -24.892 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at -23.114 -64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer PN" "MX1A-11NN" (at -23.876 -21.844 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at -26.416 -61.976 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at -26.67 -67.818 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Fitted" "Yes" (at -25.654 -72.644 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at -26.162 -70.104 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "" (at 5.08 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Switch" (at -4.572 -36.83 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "" (at 5.08 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 5.08 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "2" (at -22.098 -42.164 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "" (at -22.098 -44.196 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-40C/+170C" (at -21.844 -46.736 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at -21.844 -49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at -21.844 -52.07 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "10 mA" (at -21.844 -54.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at -21.844 -56.896 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at -21.844 -59.182 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at -25.654 -75.692 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_keywords" "switch futaba cherry mx 1U" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_description" "Combined Cherry MX / Futaba 1U LED" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_fp_filters" "C_*" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (symbol "SW Cherry MX/Futaba 1U LED Style A_0_0"
+      (polyline
+        (pts
+          (xy 0.635 -1.27)
+          (xy 0.635 -3.81)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 2.54 -4.445)
+          (xy 1.27 -3.175)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 2.54 -2.54)
+          (xy -2.54 -2.54)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 3.81 -4.445)
+          (xy 2.54 -3.175)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 2.54 -3.81)
+          (xy 2.54 -4.445)
+          (xy 1.905 -4.445)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 3.81 -3.81)
+          (xy 3.81 -4.445)
+          (xy 3.175 -4.445)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0.635 -2.54)
+          (xy -1.27 -1.27)
+          (xy -1.27 -3.81)
+          (xy 0.635 -2.54)
+        )
+        (stroke (width 0) (type default))
+        (fill (type outline))
+      )
+    )
+    (symbol "SW Cherry MX/Futaba 1U LED Style A_0_1"
+      (circle (center -2.032 0) (radius 0.508)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy -2.54 1.27)
+          (xy 2.54 1.27)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 0 1.27)
+          (xy 0 3.048)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (circle (center 2.032 0) (radius 0.508)
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (pin passive line (at 5.08 0 180) (length 2.54)
+        (name "1" (effects (font (size 1.27 1.27))))
+        (number "1" (effects (font (size 1.27 1.27))))
+      )
+      (pin passive line (at -5.08 0 0) (length 2.54)
+        (name "2" (effects (font (size 1.27 1.27))))
+        (number "2" (effects (font (size 1.27 1.27))))
+      )
+      (pin passive line (at -5.08 -2.54 0) (length 2.54)
+        (name "3" (effects (font (size 1.27 1.27))))
+        (number "3" (effects (font (size 1.27 1.27))))
+      )
+      (pin passive line (at 5.08 -2.54 180) (length 2.54)
+        (name "4" (effects (font (size 1.27 1.27))))
+        (number "4" (effects (font (size 1.27 1.27))))
+      )
+    )
+  )
   (symbol "SW Cherry MX/Futaba 1U Style A" (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
     (property "Reference" "SW" (at -2.54 5.08 0)
       (effects (font (size 1.27 1.27)) (justify left))
@@ -4087,7 +4283,137 @@
       )
     )
   )
-  (symbol "diode-combined" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+  (symbol "diode-combined" (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+    (property "Reference" "D**" (at 0.635 2.54 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Value" "1N914/MMBD914" (at -27.94 -34.798 0)
+      (effects (font (size 1.27 1.27)) (justify left) hide)
+    )
+    (property "Footprint" "unikbd:diode-combined" (at -48.26 -17.78 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at -26.162 -29.464 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 9.144 4.826 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at -22.098 -39.624 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "Diodes, Inc." (at -26.162 -18.288 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at -23.368 -24.892 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at -23.114 -64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer PN" "MMBD914-7-F" (at -23.876 -21.844 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at -26.416 -61.976 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at -26.67 -67.818 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Fitted" "Yes" (at -25.654 -72.644 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at -26.162 -70.104 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at -27.94 -30.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at -4.572 -36.83 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at -48.26 -12.7 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at -22.098 -42.164 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at -22.098 -44.196 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at -21.844 -46.736 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at -21.844 -49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at -21.844 -52.07 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at -21.844 -54.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at -21.844 -56.896 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at -21.844 -59.182 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at -25.654 -75.692 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_keywords" "diode switching combined" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_fp_filters" "C_*" (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (symbol "diode-combined_0_1"
+      (polyline
+        (pts
+          (xy 2.54 1.27)
+          (xy 2.54 -1.27)
+        )
+        (stroke (width 0.254) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 5.08 0)
+          (xy 2.54 0)
+        )
+        (stroke (width 0) (type default))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy 5.08 1.27)
+          (xy 5.08 -1.27)
+          (xy 2.54 0)
+          (xy 5.08 1.27)
+        )
+        (stroke (width 0.254) (type default))
+        (fill (type none))
+      )
+    )
+    (symbol "diode-combined_1_1"
+      (pin passive line (at 0 0 0) (length 2.54)
+        (name "K" (effects (font (size 1.27 1.27))))
+        (number "1" (effects (font (size 1.27 1.27))))
+      )
+      (pin passive line (at 7.62 0 180) (length 2.54)
+        (name "A" (effects (font (size 1.27 1.27))))
+        (number "2" (effects (font (size 1.27 1.27))))
+      )
+    )
+  )
+  (symbol "diode-combined-no-part" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
     (property "Reference" "D" (at 0 2.54 0)
       (effects (font (size 1.27 1.27)))
     )
@@ -4109,40 +4435,40 @@
     (property "ki_fp_filters" "D*DO?35*" (at 0 0 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (symbol "diode-combined_0_1"
+    (symbol "diode-combined-no-part_0_1"
       (polyline
         (pts
-          (xy -1.27 1.27)
-          (xy -1.27 -1.27)
+          (xy 2.54 1.27)
+          (xy 2.54 -1.27)
         )
         (stroke (width 0.254) (type default))
         (fill (type none))
       )
       (polyline
         (pts
-          (xy 1.27 0)
-          (xy -1.27 0)
+          (xy 5.08 0)
+          (xy 2.54 0)
         )
         (stroke (width 0) (type default))
         (fill (type none))
       )
       (polyline
         (pts
-          (xy 1.27 1.27)
-          (xy 1.27 -1.27)
-          (xy -1.27 0)
-          (xy 1.27 1.27)
+          (xy 5.08 1.27)
+          (xy 5.08 -1.27)
+          (xy 2.54 0)
+          (xy 5.08 1.27)
         )
         (stroke (width 0.254) (type default))
         (fill (type none))
       )
     )
-    (symbol "diode-combined_1_1"
-      (pin passive line (at -3.81 0 0) (length 2.54)
+    (symbol "diode-combined-no-part_1_1"
+      (pin passive line (at 0 0 0) (length 2.54)
         (name "K" (effects (font (size 1.27 1.27))))
         (number "1" (effects (font (size 1.27 1.27))))
       )
-      (pin passive line (at 3.81 0 180) (length 2.54)
+      (pin passive line (at 7.62 0 180) (length 2.54)
         (name "A" (effects (font (size 1.27 1.27))))
         (number "2" (effects (font (size 1.27 1.27))))
       )
diff --git a/hardware/keyboard-classic/kbd-classic.kicad_pcb b/hardware/keyboard-classic/kbd-classic.kicad_pcb
index e13388a..03bac4e 100644
--- a/hardware/keyboard-classic/kbd-classic.kicad_pcb
+++ b/hardware/keyboard-classic/kbd-classic.kicad_pcb
@@ -78,56 +78,56 @@
   (net 1 "/Row3")
   (net 2 "/Row0")
   (net 3 "/Row1")
-  (net 4 "Net-(D5-Pad2)")
-  (net 5 "Net-(D7-Pad2)")
-  (net 6 "Net-(D8-Pad2)")
-  (net 7 "Net-(D9-Pad2)")
-  (net 8 "Net-(D10-Pad2)")
-  (net 9 "Net-(D11-Pad2)")
-  (net 10 "Net-(D12-Pad2)")
-  (net 11 "Net-(D13-Pad2)")
-  (net 12 "Net-(D14-Pad2)")
-  (net 13 "Net-(D15-Pad2)")
-  (net 14 "Net-(D16-Pad2)")
-  (net 15 "Net-(D18-Pad2)")
-  (net 16 "Net-(D19-Pad2)")
-  (net 17 "Net-(D20-Pad2)")
-  (net 18 "Net-(D22-Pad2)")
-  (net 19 "Net-(D23-Pad2)")
-  (net 20 "Net-(D24-Pad2)")
-  (net 21 "Net-(D25-Pad2)")
-  (net 22 "Net-(D26-Pad2)")
-  (net 23 "Net-(D27-Pad2)")
-  (net 24 "Net-(D28-Pad2)")
-  (net 25 "Net-(D29-Pad2)")
-  (net 26 "Net-(D30-Pad2)")
-  (net 27 "Net-(D31-Pad2)")
-  (net 28 "Net-(D32-Pad2)")
-  (net 29 "Net-(D34-Pad2)")
-  (net 30 "Net-(D36-Pad2)")
+  (net 4 "Net-(D1-A)")
+  (net 5 "Net-(D2-A)")
+  (net 6 "Net-(D3-A)")
+  (net 7 "Net-(D4-A)")
+  (net 8 "Net-(D5-A)")
+  (net 9 "Net-(D6-A)")
+  (net 10 "Net-(D7-A)")
+  (net 11 "Net-(D8-A)")
+  (net 12 "Net-(D9-A)")
+  (net 13 "Net-(D10-A)")
+  (net 14 "Net-(D11-A)")
+  (net 15 "Net-(D12-A)")
+  (net 16 "Net-(D13-A)")
+  (net 17 "Net-(D14-A)")
+  (net 18 "Net-(D15-A)")
+  (net 19 "Net-(D16-A)")
+  (net 20 "Net-(D17-A)")
+  (net 21 "Net-(D18-A)")
+  (net 22 "Net-(D19-A)")
+  (net 23 "Net-(D20-A)")
+  (net 24 "Net-(D21-A)")
+  (net 25 "Net-(D22-A)")
+  (net 26 "Net-(D23-A)")
+  (net 27 "Net-(D24-A)")
+  (net 28 "Net-(D25-A)")
+  (net 29 "Net-(D26-A)")
+  (net 30 "Net-(D27-A)")
   (net 31 "/Row4")
   (net 32 "/Row5")
   (net 33 "/Row7")
-  (net 34 "Net-(D41-Pad2)")
-  (net 35 "Net-(D42-Pad2)")
-  (net 36 "Net-(D43-Pad2)")
-  (net 37 "Net-(D45-Pad2)")
-  (net 38 "Net-(D46-Pad2)")
-  (net 39 "Net-(D47-Pad2)")
-  (net 40 "Net-(D48-Pad2)")
-  (net 41 "Net-(D49-Pad2)")
-  (net 42 "Net-(D50-Pad2)")
-  (net 43 "Net-(D51-Pad2)")
-  (net 44 "Net-(D52-Pad2)")
-  (net 45 "Net-(D53-Pad2)")
-  (net 46 "Net-(D54-Pad2)")
-  (net 47 "Net-(D55-Pad2)")
-  (net 48 "Net-(D56-Pad2)")
-  (net 49 "Net-(D57-Pad2)")
-  (net 50 "Net-(D58-Pad2)")
-  (net 51 "Net-(D59-Pad2)")
-  (net 52 "Net-(D60-Pad2)")
-  (net 53 "Net-(D61-Pad2)")
+  (net 34 "Net-(D28-A)")
+  (net 35 "Net-(D29-A)")
+  (net 36 "Net-(D30-A)")
+  (net 37 "Net-(D31-A)")
+  (net 38 "Net-(D32-A)")
+  (net 39 "Net-(D34-A)")
+  (net 40 "Net-(D35-A)")
+  (net 41 "Net-(D36-A)")
+  (net 42 "Net-(D37-A)")
+  (net 43 "Net-(D38-A)")
+  (net 44 "Net-(D39-A)")
+  (net 45 "Net-(D40-A)")
+  (net 46 "Net-(D41-A)")
+  (net 47 "Net-(D42-A)")
+  (net 48 "Net-(D43-A)")
+  (net 49 "Net-(D44-A)")
+  (net 50 "Net-(D45-A)")
+  (net 51 "Net-(D46-A)")
+  (net 52 "Net-(D47-A)")
+  (net 53 "Net-(D48-A)")
   (net 54 "/Col0")
   (net 55 "/Col1")
   (net 56 "/Col2")
@@ -138,50 +138,78 @@
   (net 61 "/Col7")
   (net 62 "/Row6")
   (net 63 "/Row2")
-  (net 64 "Net-(J1-Pad40)")
-  (net 65 "Net-(J1-Pad39)")
-  (net 66 "Net-(J1-Pad38)")
-  (net 67 "Net-(J1-Pad37)")
-  (net 68 "Net-(J1-Pad36)")
-  (net 69 "Net-(J1-Pad35)")
-  (net 70 "Net-(J1-Pad34)")
-  (net 71 "Net-(J1-Pad33)")
-  (net 72 "Net-(D2-Pad2)")
-  (net 73 "Net-(D3-Pad2)")
-  (net 74 "Net-(D4-Pad2)")
-  (net 75 "Net-(D6-Pad2)")
-  (net 76 "Net-(D17-Pad2)")
-  (net 77 "Net-(D21-Pad2)")
-  (net 78 "Net-(D37-Pad2)")
-  (net 79 "Net-(D38-Pad2)")
-  (net 80 "Net-(D39-Pad2)")
-  (net 81 "Net-(D40-Pad2)")
-  (net 82 "Net-(D44-Pad2)")
-  (net 83 "Net-(J1-Pad6)")
-  (net 84 "Net-(J1-Pad10)")
-  (net 85 "Net-(J1-Pad12)")
-  (net 86 "Net-(J1-Pad18)")
-  (net 87 "Net-(J1-Pad20)")
-  (net 88 "Net-(J1-Pad26)")
-  (net 89 "Net-(J1-Pad28)")
-  (net 90 "Net-(J1-Pad30)")
-  (net 91 "Net-(J1-Pad32)")
-  (net 92 "Net-(J1-Pad2)")
-  (net 93 "Net-(J1-Pad4)")
-  (net 94 "Net-(D1-Pad2)")
-  (net 95 "Net-(D35-Pad2)")
-  (net 96 "Net-(D33-Pad2)")
-  (net 97 "Net-(D33-Pad1)")
-  (net 98 "Net-(J1-Pad22)")
-  (net 99 "Net-(J1-Pad14)")
-  (net 100 "Net-(D62-Pad2)")
-  (net 101 "Net-(D62-Pad1)")
-  (net 102 "Net-(D63-Pad2)")
-  (net 103 "Net-(D63-Pad1)")
+  (net 64 "Net-(D49-A)")
+  (net 65 "Net-(D50-A)")
+  (net 66 "Net-(D51-A)")
+  (net 67 "Net-(D52-A)")
+  (net 68 "Net-(D53-A)")
+  (net 69 "Net-(D54-A)")
+  (net 70 "Net-(D55-A)")
+  (net 71 "Net-(D56-A)")
+  (net 72 "Net-(D57-A)")
+  (net 73 "Net-(D58-A)")
+  (net 74 "Net-(D59-A)")
+  (net 75 "Net-(D60-A)")
+  (net 76 "Net-(D61-A)")
+  (net 77 "unconnected-(J1-Pin_40-Pad40)")
+  (net 78 "unconnected-(J1-Pin_39-Pad39)")
+  (net 79 "unconnected-(J1-Pin_38-Pad38)")
+  (net 80 "unconnected-(J1-Pin_37-Pad37)")
+  (net 81 "unconnected-(J1-Pin_36-Pad36)")
+  (net 82 "unconnected-(J1-Pin_35-Pad35)")
+  (net 83 "unconnected-(J1-Pin_34-Pad34)")
+  (net 84 "unconnected-(J1-Pin_33-Pad33)")
+  (net 85 "unconnected-(J1-Pin_32-Pad32)")
+  (net 86 "unconnected-(J1-Pin_30-Pad30)")
+  (net 87 "unconnected-(J1-Pin_28-Pad28)")
+  (net 88 "unconnected-(J1-Pin_26-Pad26)")
+  (net 89 "Net-(J1-Pin_24)")
+  (net 90 "Net-(J1-Pin_22)")
+  (net 91 "Net-(J1-Pin_20)")
+  (net 92 "Net-(J1-Pin_18)")
+  (net 93 "Net-(J1-Pin_16)")
+  (net 94 "Net-(J1-Pin_14)")
+  (net 95 "Net-(J1-Pin_12)")
+  (net 96 "Net-(J1-Pin_10)")
+  (net 97 "Net-(J1-Pin_8)")
+  (net 98 "Net-(J1-Pin_6)")
+  (net 99 "Net-(J1-Pin_4)")
+  (net 100 "Net-(J1-Pin_2)")
+  (net 101 "Net-(LED1-A)")
+  (net 102 "Net-(LED2-A)")
+  (net 103 "Net-(LED3-A)")
 
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d791f)
     (at 354.32238 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "Yes")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6ced6")
     (attr through_hole)
     (fp_text reference "SW33" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -207,22 +235,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 13be213a-5cd2-4772-92af-c36e18b5742b))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 54 "/Col0") (thermal_bridge_angle 45)
+      (net 54 "/Col0") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp b1ebc2ad-9727-4ba2-9de9-2c4400f0e829))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 54 "/Col0") (tstamp 57be9ae8-c3c6-49b9-bf8d-61dbccf36b71))
+      (net 54 "/Col0") (pinfunction "1") (pintype "passive") (tstamp 57be9ae8-c3c6-49b9-bf8d-61dbccf36b71))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 29 "Net-(D34-Pad2)") (thermal_bridge_angle 45)
+      (net 39 "Net-(D34-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 2924d160-0300-45ef-b0a0-f235458fab51))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 29 "Net-(D34-Pad2)") (tstamp 22e691e2-1b94-4255-8b3f-edbf62052864))
+      (net 39 "Net-(D34-A)") (pinfunction "2") (pintype "passive") (tstamp 22e691e2-1b94-4255-8b3f-edbf62052864))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -233,6 +261,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7aff)
     (at 349.55988 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "NO")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf30f")
     (attr through_hole)
     (fp_text reference "SW1" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -258,22 +315,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 50be5528-87b4-4a72-bdb4-4f923aec82ae))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 54 "/Col0") (thermal_bridge_angle 45)
+      (net 54 "/Col0") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp ba2d03fe-e7e5-4378-bc80-7ffb0838aa7f))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 54 "/Col0") (tstamp 65a3692b-0d5d-4eba-9548-34274c3d8b47))
+      (net 54 "/Col0") (pinfunction "1") (pintype "passive") (tstamp 65a3692b-0d5d-4eba-9548-34274c3d8b47))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 72 "Net-(D2-Pad2)") (thermal_bridge_angle 45)
+      (net 5 "Net-(D2-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp a494c400-0159-4154-818b-e3407fb381b0))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 72 "Net-(D2-Pad2)") (tstamp ecff23ef-f063-4d91-8391-35aa9f427584))
+      (net 5 "Net-(D2-A)") (pinfunction "2") (pintype "passive") (tstamp ecff23ef-f063-4d91-8391-35aa9f427584))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -284,6 +341,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7b1f)
     (at 354.32238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "NO")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf3ef")
     (attr through_hole)
     (fp_text reference "SW3" (at 6.61162 -5.21716) (layer "F.SilkS")
@@ -309,22 +395,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp e16fbbbb-1d5e-4796-8e07-9002963eaf53))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 54 "/Col0") (thermal_bridge_angle 45)
+      (net 54 "/Col0") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp b0e32705-7a00-4336-8216-bcca2b6fbc9e))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 54 "/Col0") (tstamp b1ae6e2f-3ac1-406d-b85a-53c8d929d27f))
+      (net 54 "/Col0") (pinfunction "1") (pintype "passive") (tstamp b1ae6e2f-3ac1-406d-b85a-53c8d929d27f))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 74 "Net-(D4-Pad2)") (thermal_bridge_angle 45)
+      (net 7 "Net-(D4-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 17a02232-4a7f-4a57-91d8-85be3e3a0cff))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 74 "Net-(D4-Pad2)") (tstamp 9756674a-ad3f-405a-8a2b-2c37dab2280b))
+      (net 7 "Net-(D4-A)") (pinfunction "2") (pintype "passive") (tstamp 9756674a-ad3f-405a-8a2b-2c37dab2280b))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -335,6 +421,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7b6f)
     (at 201.92238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf466")
     (attr through_hole)
     (fp_text reference "SW7" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -360,22 +476,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 3bf21519-ae3a-43ee-bd43-9db1ebb121cd))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (thermal_bridge_angle 45)
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 3067383c-a84b-4581-a6a7-bcc796936994))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (tstamp c273a199-85ed-4baa-b5c4-e74401c323a0))
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive") (tstamp c273a199-85ed-4baa-b5c4-e74401c323a0))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 6 "Net-(D8-Pad2)") (thermal_bridge_angle 45)
+      (net 11 "Net-(D8-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 6d2b17f4-f0f9-4e75-a6b3-e70b2955c471))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 6 "Net-(D8-Pad2)") (tstamp 0b151ac5-389a-4838-93d0-9fa7a11fa3a8))
+      (net 11 "Net-(D8-A)") (pinfunction "2") (pintype "passive") (tstamp 0b151ac5-389a-4838-93d0-9fa7a11fa3a8))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -386,6 +502,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7baf)
     (at 182.87238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf474")
     (attr through_hole)
     (fp_text reference "SW11" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -411,22 +557,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp ed1bb741-b8cc-4907-a050-eb75f28096a4))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (thermal_bridge_angle 45)
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp fbfc6803-643c-4c06-82e0-0b64828c65b8))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (tstamp 2fde4eba-728c-47ca-a7d6-fe8b43407597))
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive") (tstamp 2fde4eba-728c-47ca-a7d6-fe8b43407597))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 10 "Net-(D12-Pad2)") (thermal_bridge_angle 45)
+      (net 15 "Net-(D12-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 7a2cba99-d714-401e-b102-522691332f5c))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 10 "Net-(D12-Pad2)") (tstamp a604b46b-26bc-46e3-a3df-e78d9426bc70))
+      (net 15 "Net-(D12-A)") (pinfunction "2") (pintype "passive") (tstamp a604b46b-26bc-46e3-a3df-e78d9426bc70))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -437,6 +583,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7bdf)
     (at 297.17238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf3fd")
     (attr through_hole)
     (fp_text reference "SW14" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -462,22 +638,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 707ff64a-c680-445f-ba2e-c4fe77832802))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (thermal_bridge_angle 45)
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp eedfee09-9137-4a42-9648-eab092cf3ad3))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (tstamp d37caa1d-0c16-440b-a1aa-0aca12164ed0))
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive") (tstamp d37caa1d-0c16-440b-a1aa-0aca12164ed0))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 13 "Net-(D15-Pad2)") (thermal_bridge_angle 45)
+      (net 18 "Net-(D15-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp e2ac6af3-d06a-4756-b00d-a49af401df0b))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 13 "Net-(D15-Pad2)") (tstamp 8200067c-6e02-4053-9ac3-5204ccd20263))
+      (net 18 "Net-(D15-A)") (pinfunction "2") (pintype "passive") (tstamp 8200067c-6e02-4053-9ac3-5204ccd20263))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -488,6 +664,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7bef)
     (at 163.82238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf46d")
     (attr through_hole)
     (fp_text reference "SW15" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -513,22 +719,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 881dab79-bba0-4e50-81c2-f44a131faca7))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (thermal_bridge_angle 45)
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 3490f860-db63-4d00-a09d-253e211cb051))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (tstamp 1d7488df-4d66-45e4-bb05-c437e5c4f308))
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive") (tstamp 1d7488df-4d66-45e4-bb05-c437e5c4f308))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 14 "Net-(D16-Pad2)") (thermal_bridge_angle 45)
+      (net 19 "Net-(D16-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 5977c5b1-573d-4607-a442-518302daa640))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 14 "Net-(D16-Pad2)") (tstamp 377300e3-20ea-4094-9133-334ce409b166))
+      (net 19 "Net-(D16-A)") (pinfunction "2") (pintype "passive") (tstamp 377300e3-20ea-4094-9133-334ce409b166))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -539,6 +745,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7c1f)
     (at 278.12238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf40b")
     (attr through_hole)
     (fp_text reference "SW18" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -564,22 +800,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 4af9f24d-045a-41ec-be7c-0b39ef752490))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (thermal_bridge_angle 45)
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 9df29514-99c4-4835-8ccc-3c0129f02b40))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (tstamp 2a8883f2-2ddd-4f77-becb-478ce1d6fefb))
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive") (tstamp 2a8883f2-2ddd-4f77-becb-478ce1d6fefb))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 16 "Net-(D19-Pad2)") (thermal_bridge_angle 45)
+      (net 22 "Net-(D19-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 6cd480ac-c93e-40a6-b2c6-59a2dd4d97f3))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 16 "Net-(D19-Pad2)") (tstamp 5f5de21d-9de1-4f81-bc15-5675afdf4352))
+      (net 22 "Net-(D19-A)") (pinfunction "2") (pintype "passive") (tstamp 5f5de21d-9de1-4f81-bc15-5675afdf4352))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -590,6 +826,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7c2f)
     (at 144.77238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf47b")
     (attr through_hole)
     (fp_text reference "SW19" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -615,22 +881,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 4d86c6c2-9cb2-4295-8ba4-b1acf8b17efa))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (thermal_bridge_angle 45)
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 1df7a9fb-62ad-47cc-83a8-593b93ba02d9))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (tstamp 4126f42a-1f04-4e97-9f94-245ee8dcca68))
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive") (tstamp 4126f42a-1f04-4e97-9f94-245ee8dcca68))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 17 "Net-(D20-Pad2)") (thermal_bridge_angle 45)
+      (net 23 "Net-(D20-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 59b97acc-465f-4a94-98bb-3f47e9089830))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 17 "Net-(D20-Pad2)") (tstamp c438381c-605c-408c-9b21-673afb245c57))
+      (net 23 "Net-(D20-A)") (pinfunction "2") (pintype "passive") (tstamp c438381c-605c-408c-9b21-673afb245c57))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -641,6 +907,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7c4f)
     (at 249.54738 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf3a2")
     (attr through_hole)
     (fp_text reference "SW21" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -666,22 +962,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 6756518d-669d-4d41-90b7-5c528c5aa777))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (thermal_bridge_angle 45)
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp c4bc54bb-d918-426d-89c9-5ed3cadb7871))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (tstamp 05627066-8ed5-46c1-b65b-d960e663a07c))
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive") (tstamp 05627066-8ed5-46c1-b65b-d960e663a07c))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 18 "Net-(D22-Pad2)") (thermal_bridge_angle 45)
+      (net 25 "Net-(D22-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp f8e97610-639a-4ba4-a6c4-58f94f69d661))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 18 "Net-(D22-Pad2)") (tstamp 28170caf-e499-4ec9-a85e-155e4d6796e0))
+      (net 25 "Net-(D22-A)") (pinfunction "2") (pintype "passive") (tstamp 28170caf-e499-4ec9-a85e-155e4d6796e0))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -692,6 +988,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7c6f)
     (at 125.72238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf482")
     (attr through_hole)
     (fp_text reference "SW23" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -717,22 +1043,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp a6363917-030c-42ca-b9dc-7d288fd70004))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (thermal_bridge_angle 45)
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 4f5d18fa-0d6c-4553-92a0-cb8643ba2c39))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (tstamp ac39a1c1-4143-48ff-8ebf-b12d197d7c78))
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive") (tstamp ac39a1c1-4143-48ff-8ebf-b12d197d7c78))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 20 "Net-(D24-Pad2)") (thermal_bridge_angle 45)
+      (net 27 "Net-(D24-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp c49434bd-03be-4a3b-a144-95f92e9f77b0))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 20 "Net-(D24-Pad2)") (tstamp ccec0973-ba46-42df-b65f-e7ac9a0f9513))
+      (net 27 "Net-(D24-A)") (pinfunction "2") (pintype "passive") (tstamp ccec0973-ba46-42df-b65f-e7ac9a0f9513))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -743,6 +1069,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7c9f)
     (at 240.02238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf420")
     (attr through_hole)
     (fp_text reference "SW26" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -768,22 +1124,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp b6563041-2588-4e12-93c9-0bf8d4fb7c14))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (thermal_bridge_angle 45)
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 611069bb-e269-48ab-88e2-6d57b46bde30))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (tstamp 6507e907-fb51-4386-9ccf-84a6e0333492))
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive") (tstamp 6507e907-fb51-4386-9ccf-84a6e0333492))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 23 "Net-(D27-Pad2)") (thermal_bridge_angle 45)
+      (net 30 "Net-(D27-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp f152527c-1ea2-4c1d-ab33-74dd428dd349))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 23 "Net-(D27-Pad2)") (tstamp 87a17f1c-c19d-46a0-9ee5-1feb67269d75))
+      (net 30 "Net-(D27-A)") (pinfunction "2") (pintype "passive") (tstamp 87a17f1c-c19d-46a0-9ee5-1feb67269d75))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -794,6 +1150,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7caf)
     (at 106.67238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf490")
     (attr through_hole)
     (fp_text reference "SW27" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -819,22 +1205,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 4cc73a39-ec8a-4ca8-9c97-e9d96c5ddc50))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (thermal_bridge_angle 45)
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp c4117efc-6c07-4b7f-81e8-0cc1b0ff884c))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (tstamp fa9cf7fe-2f29-463b-a29d-6108cb894280))
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive") (tstamp fa9cf7fe-2f29-463b-a29d-6108cb894280))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 24 "Net-(D28-Pad2)") (thermal_bridge_angle 45)
+      (net 34 "Net-(D28-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 957f28f5-ddc6-4f00-b0e9-af41d53ffc73))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 24 "Net-(D28-Pad2)") (tstamp c21ba448-6efa-4151-a433-18f8ac7bca89))
+      (net 34 "Net-(D28-A)") (pinfunction "2") (pintype "passive") (tstamp c21ba448-6efa-4151-a433-18f8ac7bca89))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -845,6 +1231,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7cdf)
     (at 220.97238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf419")
     (attr through_hole)
     (fp_text reference "SW30" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -870,22 +1286,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 82f7aa57-425c-435c-b807-53d701a3a9b5))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (thermal_bridge_angle 45)
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 65404ad4-d684-4786-add1-d470b5ccb16c))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (tstamp 9d8b35ee-9533-451a-b8f3-3db91dd48517))
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive") (tstamp 9d8b35ee-9533-451a-b8f3-3db91dd48517))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 27 "Net-(D31-Pad2)") (thermal_bridge_angle 45)
+      (net 37 "Net-(D31-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp ea3c9df3-a9ca-4238-a2b3-115f45518b16))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 27 "Net-(D31-Pad2)") (tstamp f0d76b1d-232d-475e-b073-b084ddf4ff77))
+      (net 37 "Net-(D31-A)") (pinfunction "2") (pintype "passive") (tstamp f0d76b1d-232d-475e-b073-b084ddf4ff77))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -896,6 +1312,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0d7cef)
     (at 87.62238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf489")
     (attr through_hole)
     (fp_text reference "SW31" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -921,22 +1367,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp b26c8011-2982-4350-829b-221671b30ffd))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (thermal_bridge_angle 45)
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp d791c496-2b4f-48c9-ae40-0a67376fca07))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (tstamp b625fabb-df46-4d18-9b86-bfebaa46d2bd))
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive") (tstamp b625fabb-df46-4d18-9b86-bfebaa46d2bd))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 28 "Net-(D32-Pad2)") (thermal_bridge_angle 45)
+      (net 38 "Net-(D32-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 6e559ed6-f64d-4dfc-893f-9cb2e78635c0))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 28 "Net-(D32-Pad2)") (tstamp 6d5b81cc-59c0-411b-9852-27a4fd33d4bf))
+      (net 38 "Net-(D32-A)") (pinfunction "2") (pintype "passive") (tstamp 6d5b81cc-59c0-411b-9852-27a4fd33d4bf))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -947,6 +1393,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0f200e)
     (at 349.55988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "NO")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf386")
     (attr through_hole)
     (fp_text reference "SW5" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -972,22 +1447,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp ccf3fe06-77ce-412b-a2e4-6d3bc8008992))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (thermal_bridge_angle 45)
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp ea16aae4-4938-418b-aec0-b7e54b203306))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (tstamp 64a7fd6f-9fe8-4ffb-a53b-d4b9b3fd3422))
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive") (tstamp 64a7fd6f-9fe8-4ffb-a53b-d4b9b3fd3422))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 75 "Net-(D6-Pad2)") (thermal_bridge_angle 45)
+      (net 9 "Net-(D6-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 38a83bcd-87d5-4f13-aab6-cdadcf23fde1))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 75 "Net-(D6-Pad2)") (tstamp 0b0f19b6-c3f4-4416-81d5-e2804041e8c4))
+      (net 9 "Net-(D6-A)") (pinfunction "2") (pintype "passive") (tstamp 0b0f19b6-c3f4-4416-81d5-e2804041e8c4))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -998,6 +1473,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0f6109)
     (at 330.50988 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "NO")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf37f")
     (attr through_hole)
     (fp_text reference "SW2" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1023,22 +1527,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 0ee9c310-5213-4123-9103-bbfab648a005))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 54 "/Col0") (thermal_bridge_angle 45)
+      (net 54 "/Col0") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 15d08bed-0658-4476-a011-834fa6946b9a))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 54 "/Col0") (tstamp 7ae3b6a5-0ba5-4f80-8e04-e408eeebed42))
+      (net 54 "/Col0") (pinfunction "1") (pintype "passive") (tstamp 7ae3b6a5-0ba5-4f80-8e04-e408eeebed42))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 73 "Net-(D3-Pad2)") (thermal_bridge_angle 45)
+      (net 6 "Net-(D3-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 69f52974-67df-4061-9f9f-ed353649acec))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 73 "Net-(D3-Pad2)") (tstamp 222601fb-a86b-47f3-93bb-fde2e7cf06d5))
+      (net 6 "Net-(D3-A)") (pinfunction "2") (pintype "passive") (tstamp 222601fb-a86b-47f3-93bb-fde2e7cf06d5))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1049,6 +1553,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0f9d16)
     (at 230.49738 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf316")
     (attr through_hole)
     (fp_text reference "SW4" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1074,22 +1608,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 250abd0a-7bfc-41bf-8c6e-5bba8977d0c9))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (thermal_bridge_angle 45)
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp da34d2b4-38ea-4b49-8c48-26522ad5b483))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (tstamp d8439902-1974-4e59-833c-2f4a10e5a6e1))
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive") (tstamp d8439902-1974-4e59-833c-2f4a10e5a6e1))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 4 "Net-(D5-Pad2)") (thermal_bridge_angle 45)
+      (net 8 "Net-(D5-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp f6184e62-277b-443b-9065-f9b53e6fc17b))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 4 "Net-(D5-Pad2)") (tstamp 3c9df539-0ecd-4030-a4dd-7a33e699c1a1))
+      (net 8 "Net-(D5-A)") (pinfunction "2") (pintype "passive") (tstamp 3c9df539-0ecd-4030-a4dd-7a33e699c1a1))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1100,6 +1634,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0f9d88)
     (at 173.34738 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf32b")
     (attr through_hole)
     (fp_text reference "SW16" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1125,22 +1689,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp a65d2667-91d9-4fde-9232-1f4403c6208f))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (thermal_bridge_angle 45)
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 581e2f41-f8a1-441a-b9b6-918b41566aa6))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (tstamp 5428d3a6-0316-4532-9e4b-cf16cf78d563))
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive") (tstamp 5428d3a6-0316-4532-9e4b-cf16cf78d563))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 76 "Net-(D17-Pad2)") (thermal_bridge_angle 45)
+      (net 20 "Net-(D17-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 8d65ec60-9171-4610-9a2a-4b8b2fc7a763))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 76 "Net-(D17-Pad2)") (tstamp 5dd24868-d692-43ca-ae8d-c7cba18fec82))
+      (net 20 "Net-(D17-A)") (pinfunction "2") (pintype "passive") (tstamp 5dd24868-d692-43ca-ae8d-c7cba18fec82))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1151,6 +1715,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0f9dc1)
     (at 211.44738 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf324")
     (attr through_hole)
     (fp_text reference "SW8" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1176,22 +1770,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp c05fc7a2-6d2b-4dcc-b87e-7671e1f6059e))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (thermal_bridge_angle 45)
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 0255ffbe-3051-4648-96bc-8d50ab1d8135))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (tstamp 02981f1e-9af7-4ce0-aaf3-8a30f9ee4b03))
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive") (tstamp 02981f1e-9af7-4ce0-aaf3-8a30f9ee4b03))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 7 "Net-(D9-Pad2)") (thermal_bridge_angle 45)
+      (net 12 "Net-(D9-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 7aa35165-285c-4de3-82f5-b39c5bd7c944))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 7 "Net-(D9-Pad2)") (tstamp ed4f7981-c196-4875-a2b2-8ef4c2b9ac41))
+      (net 12 "Net-(D9-A)") (pinfunction "2") (pintype "passive") (tstamp ed4f7981-c196-4875-a2b2-8ef4c2b9ac41))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1202,6 +1796,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0f9dfa)
     (at 192.39738 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf31d")
     (attr through_hole)
     (fp_text reference "SW12" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1227,22 +1851,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp bc4ebbc9-4180-42bd-840b-f5e2fa04579d))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (thermal_bridge_angle 45)
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 5ef08919-a3d2-45ba-aed9-947b5a71c1bb))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (tstamp a099fa29-ed8f-4217-8135-83311245175c))
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive") (tstamp a099fa29-ed8f-4217-8135-83311245175c))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 11 "Net-(D13-Pad2)") (thermal_bridge_angle 45)
+      (net 16 "Net-(D13-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 1ae5e03d-cf69-4e8e-8609-09f202fe03c5))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 11 "Net-(D13-Pad2)") (tstamp fc60a359-470c-417e-abc7-c08a6b470508))
+      (net 16 "Net-(D13-A)") (pinfunction "2") (pintype "passive") (tstamp fc60a359-470c-417e-abc7-c08a6b470508))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1253,6 +1877,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0f9e6c)
     (at 154.29738 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf332")
     (attr through_hole)
     (fp_text reference "SW20" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1278,22 +1932,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 7961fb5d-fff4-454b-b47c-007235bc72e7))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (thermal_bridge_angle 45)
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp f8fa8a49-8c5e-4c49-9603-e5b6bc9f0ef9))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (tstamp 6e2c7f07-3fe8-4b5b-b185-81d8349c1968))
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive") (tstamp 6e2c7f07-3fe8-4b5b-b185-81d8349c1968))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 77 "Net-(D21-Pad2)") (thermal_bridge_angle 45)
+      (net 24 "Net-(D21-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 102cf622-0e29-49e8-949f-c9de87721890))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 77 "Net-(D21-Pad2)") (tstamp fc4e565a-d6fe-42d6-be49-c09995780109))
+      (net 24 "Net-(D21-A)") (pinfunction "2") (pintype "passive") (tstamp fc4e565a-d6fe-42d6-be49-c09995780109))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1304,6 +1958,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0f9ea5)
     (at 135.24738 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf340")
     (attr through_hole)
     (fp_text reference "SW24" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1329,22 +2013,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 2ba3427b-a916-4c3a-8526-88e25a4d536b))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (thermal_bridge_angle 45)
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 319ace49-cc47-4726-8f39-3d43f2cebb21))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (tstamp e53dd797-3415-4e23-80c8-68981c9d5d8a))
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive") (tstamp e53dd797-3415-4e23-80c8-68981c9d5d8a))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 21 "Net-(D25-Pad2)") (thermal_bridge_angle 45)
+      (net 28 "Net-(D25-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 42bb41b9-8bde-4b51-950a-1438aa5aeb77))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 21 "Net-(D25-Pad2)") (tstamp 4c181957-af37-4467-b4b5-8ec4b3e16823))
+      (net 28 "Net-(D25-A)") (pinfunction "2") (pintype "passive") (tstamp 4c181957-af37-4467-b4b5-8ec4b3e16823))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1355,6 +2039,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0f9ede)
     (at 116.19738 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf339")
     (attr through_hole)
     (fp_text reference "SW28" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1380,22 +2094,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp c077020a-d718-4a7a-aa27-4149293baf01))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (thermal_bridge_angle 45)
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp aa2017a2-3656-49d2-89c7-ba15c1404371))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (tstamp 9c50374a-0b49-4af0-aa72-890c694e8af6))
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive") (tstamp 9c50374a-0b49-4af0-aa72-890c694e8af6))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 25 "Net-(D29-Pad2)") (thermal_bridge_angle 45)
+      (net 35 "Net-(D29-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 6a3ad9fd-bb6d-4298-90fd-4417903b0065))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 25 "Net-(D29-Pad2)") (tstamp c3abe637-46e4-47e5-be50-d67c08b03597))
+      (net 35 "Net-(D29-A)") (pinfunction "2") (pintype "passive") (tstamp c3abe637-46e4-47e5-be50-d67c08b03597))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1406,6 +2120,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fa2f5)
     (at 78.09738 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc3ff69")
     (attr through_hole)
     (fp_text reference "SW49" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1431,22 +2174,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp b3095925-05ac-45a5-86f6-ed0d3e9c145a))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (thermal_bridge_angle 45)
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp fac4ce8f-f405-4586-9a82-691f7a8f0ac7))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (tstamp 20b19380-57f0-4bc8-9c21-78764b222e83))
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive") (tstamp 20b19380-57f0-4bc8-9c21-78764b222e83))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 42 "Net-(D50-Pad2)") (thermal_bridge_angle 45)
+      (net 65 "Net-(D50-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 80e14a8c-0422-49f1-a01c-fe88f62b50d5))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 42 "Net-(D50-Pad2)") (tstamp edc5ecfe-6d4d-4d4d-9f29-164904e6f1d3))
+      (net 65 "Net-(D50-A)") (pinfunction "2") (pintype "passive") (tstamp edc5ecfe-6d4d-4d4d-9f29-164904e6f1d3))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1457,6 +2200,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fa32e)
     (at 268.59738 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cd5d")
     (attr through_hole)
     (fp_text reference "SW36" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1482,22 +2254,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 150b97c4-cd35-4ddf-91da-e749386a7bfd))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (thermal_bridge_angle 45)
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 5f62e3a0-a8ae-4f07-ab88-d58857b34a42))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (tstamp de32c29f-34d3-4cba-a74d-4fff4d331ad0))
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive") (tstamp de32c29f-34d3-4cba-a74d-4fff4d331ad0))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 78 "Net-(D37-Pad2)") (thermal_bridge_angle 45)
+      (net 42 "Net-(D37-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 3a3dfd31-eb0a-4abd-8750-a38f865fdb5d))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 78 "Net-(D37-Pad2)") (tstamp de07ce18-eceb-43d1-be6e-c1f6df6e2064))
+      (net 42 "Net-(D37-A)") (pinfunction "2") (pintype "passive") (tstamp de07ce18-eceb-43d1-be6e-c1f6df6e2064))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1508,6 +2280,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0faadc)
     (at 101.90988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cd87")
     (attr through_hole)
     (fp_text reference "SW54" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1533,22 +2334,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp a503a7a9-b5f0-49f4-95bd-e6fb9cad3f67))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (thermal_bridge_angle 45)
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 7389b625-708f-40dc-b336-f882b0ce554e))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (tstamp 70def9e0-92a5-4efd-821d-7f2f1730cedc))
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive") (tstamp 70def9e0-92a5-4efd-821d-7f2f1730cedc))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 47 "Net-(D55-Pad2)") (thermal_bridge_angle 45)
+      (net 70 "Net-(D55-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp c13e0771-6929-48ca-a254-256e84255866))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 47 "Net-(D55-Pad2)") (tstamp 3d601ea4-43d1-4204-89ac-81b6ca545fcc))
+      (net 70 "Net-(D55-A)") (pinfunction "2") (pintype "passive") (tstamp 3d601ea4-43d1-4204-89ac-81b6ca545fcc))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1559,6 +2360,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fab15)
     (at 140.00988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d0d7")
     (attr through_hole)
     (fp_text reference "SW56" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1584,22 +2414,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 1ca17e89-7a96-4318-b373-4db44eda946c))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (thermal_bridge_angle 45)
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp e13bb75c-8ca6-452e-9a5f-c05772e7d22b))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (tstamp b7875d61-8869-408f-8b9a-510488ce3c5c))
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive") (tstamp b7875d61-8869-408f-8b9a-510488ce3c5c))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 49 "Net-(D57-Pad2)") (thermal_bridge_angle 45)
+      (net 72 "Net-(D57-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp f2e461d3-ebb0-49c9-a266-8fe3a49b1963))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 49 "Net-(D57-Pad2)") (tstamp 1c1a9a13-4ca8-4968-8f36-15e37e878094))
+      (net 72 "Net-(D57-A)") (pinfunction "2") (pintype "passive") (tstamp 1c1a9a13-4ca8-4968-8f36-15e37e878094))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1610,6 +2440,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fab4e)
     (at 120.95988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d0d0")
     (attr through_hole)
     (fp_text reference "SW60" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1635,22 +2494,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 71fe072a-2c50-422e-b1b8-f69b03adcf4b))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (thermal_bridge_angle 45)
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 30646ecf-c141-4793-bd6d-7dc1e37b0b71))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (tstamp deccd9f4-b4ba-4bf6-98c6-4425527e6650))
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive") (tstamp deccd9f4-b4ba-4bf6-98c6-4425527e6650))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 53 "Net-(D61-Pad2)") (thermal_bridge_angle 45)
+      (net 76 "Net-(D61-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp b4ee4d60-bc91-476d-83d5-833b478fe843))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 53 "Net-(D61-Pad2)") (tstamp 7276f516-990a-43c3-a3f1-d1d3e3d07ef5))
+      (net 76 "Net-(D61-A)") (pinfunction "2") (pintype "passive") (tstamp 7276f516-990a-43c3-a3f1-d1d3e3d07ef5))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1661,6 +2520,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fab87)
     (at 254.30988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf3b0")
     (attr through_hole)
     (fp_text reference "SW25" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1686,22 +2575,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 6815945d-bd04-46ce-bf8d-fac11ddd34cf))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (thermal_bridge_angle 45)
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 645b772a-8341-4f69-a8e9-18f957d62097))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (tstamp 393f0221-96dd-4c40-a079-afe1bfbb8b31))
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive") (tstamp 393f0221-96dd-4c40-a079-afe1bfbb8b31))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 22 "Net-(D26-Pad2)") (thermal_bridge_angle 45)
+      (net 29 "Net-(D26-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 3c7917c1-2358-4935-ba26-bc0b35c194d7))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 22 "Net-(D26-Pad2)") (tstamp 66488cca-6144-4f34-bfe0-d597c326805a))
+      (net 29 "Net-(D26-A)") (pinfunction "2") (pintype "passive") (tstamp 66488cca-6144-4f34-bfe0-d597c326805a))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1712,6 +2601,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0faf44)
     (at 82.85988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc3ff77")
     (attr through_hole)
     (fp_text reference "SW53" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1737,22 +2655,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 68d77d04-4cc5-408b-b94a-7ed203db4de2))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (thermal_bridge_angle 45)
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 15359f37-018b-40ce-a98e-1e9c68c12cce))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (tstamp e6a79a5f-1a74-43ad-87c2-0cbbb06b2d78))
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive") (tstamp e6a79a5f-1a74-43ad-87c2-0cbbb06b2d78))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 46 "Net-(D54-Pad2)") (thermal_bridge_angle 45)
+      (net 69 "Net-(D54-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 39cfaa01-4508-45ff-a7c6-216c69634efe))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 46 "Net-(D54-Pad2)") (tstamp 80682923-6ce6-4024-bc5f-c4a6281b1b05))
+      (net 69 "Net-(D54-A)") (pinfunction "2") (pintype "passive") (tstamp 80682923-6ce6-4024-bc5f-c4a6281b1b05))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1763,6 +2681,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fb031)
     (at 273.35988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cd6b")
     (attr through_hole)
     (fp_text reference "SW40" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1788,22 +2735,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 9fd54581-2bce-44e9-8922-985371866f52))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (thermal_bridge_angle 45)
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 2aa153f4-5255-438d-ba87-f8eb8b5b51f8))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (tstamp d4f7c3a7-7471-4a3e-b2b4-8a1f3cc93239))
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive") (tstamp d4f7c3a7-7471-4a3e-b2b4-8a1f3cc93239))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 34 "Net-(D41-Pad2)") (thermal_bridge_angle 45)
+      (net 46 "Net-(D41-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 147b9bb2-7247-416e-91f5-1d60fb68c396))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 34 "Net-(D41-Pad2)") (tstamp 73eaccfe-1c66-498d-888b-8caa86c52bb2))
+      (net 46 "Net-(D41-A)") (pinfunction "2") (pintype "passive") (tstamp 73eaccfe-1c66-498d-888b-8caa86c52bb2))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1814,6 +2761,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fb06a)
     (at 235.25988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d0ad")
     (attr through_hole)
     (fp_text reference "SW38" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1839,22 +2815,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 8dc85d61-f4ca-4930-8bb0-a1de1100c344))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (thermal_bridge_angle 45)
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp f83745de-4edb-47b6-adac-85d2f16ebcc9))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (tstamp 13d47db1-2a47-485d-be81-43fe1fb12e57))
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive") (tstamp 13d47db1-2a47-485d-be81-43fe1fb12e57))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 80 "Net-(D39-Pad2)") (thermal_bridge_angle 45)
+      (net 44 "Net-(D39-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 687073ab-dfd1-4a69-a24b-6f9806820114))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 80 "Net-(D39-Pad2)") (tstamp 6737251d-0957-4ec5-9337-0a17011f65b0))
+      (net 44 "Net-(D39-A)") (pinfunction "2") (pintype "passive") (tstamp 6737251d-0957-4ec5-9337-0a17011f65b0))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1865,6 +2841,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fb0a3)
     (at 159.05988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d0c9")
     (attr through_hole)
     (fp_text reference "SW52" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1890,22 +2895,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 8f7412c0-d579-4cff-9e4c-b933ff40f070))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (thermal_bridge_angle 45)
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp dbc7442c-8691-4352-bcc3-c3a6af369b60))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (tstamp 4738c9e6-a87e-4a99-a349-713ecc8eabac))
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive") (tstamp 4738c9e6-a87e-4a99-a349-713ecc8eabac))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 45 "Net-(D53-Pad2)") (thermal_bridge_angle 45)
+      (net 68 "Net-(D53-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 201ec521-0c98-4950-aefc-abd0fc8449e2))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 45 "Net-(D53-Pad2)") (tstamp 729fd098-cff3-4208-ae9b-7ae9f3279d59))
+      (net 68 "Net-(D53-A)") (pinfunction "2") (pintype "passive") (tstamp 729fd098-cff3-4208-ae9b-7ae9f3279d59))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1916,6 +2921,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fb115)
     (at 178.10988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d0c2")
     (attr through_hole)
     (fp_text reference "SW48" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1941,22 +2975,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 6fb615db-c59a-4009-a7ce-6c1bf1671a65))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (thermal_bridge_angle 45)
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 9361845d-411b-4878-a83c-5e40f24840fa))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (tstamp 052fb935-24af-40bc-b732-19867f06eb72))
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive") (tstamp 052fb935-24af-40bc-b732-19867f06eb72))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 41 "Net-(D49-Pad2)") (thermal_bridge_angle 45)
+      (net 64 "Net-(D49-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 00f45969-921f-4ad1-acde-92d2bfd78050))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 41 "Net-(D49-Pad2)") (tstamp 47866693-1fa1-455e-ac4e-573864cb3302))
+      (net 64 "Net-(D49-A)") (pinfunction "2") (pintype "passive") (tstamp 47866693-1fa1-455e-ac4e-573864cb3302))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1967,6 +3001,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fb14e)
     (at 216.20988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d0bb")
     (attr through_hole)
     (fp_text reference "SW42" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -1992,22 +3055,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp bd28bd1d-57eb-41b4-a22a-7c14b0a7796d))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (thermal_bridge_angle 45)
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 08151a64-ca80-4fb2-a70f-141d50157f18))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (tstamp e31c987c-1465-475a-b2c2-b7a10bc6ff6a))
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive") (tstamp e31c987c-1465-475a-b2c2-b7a10bc6ff6a))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 36 "Net-(D43-Pad2)") (thermal_bridge_angle 45)
+      (net 48 "Net-(D43-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp aa675e31-e51c-45db-97c1-00becb14251c))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 36 "Net-(D43-Pad2)") (tstamp aa3ee17d-4db5-4510-a43d-324c580748bf))
+      (net 48 "Net-(D43-A)") (pinfunction "2") (pintype "passive") (tstamp aa3ee17d-4db5-4510-a43d-324c580748bf))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2018,6 +3081,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fb187)
     (at 197.15988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d0b4")
     (attr through_hole)
     (fp_text reference "SW45" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2043,22 +3135,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 6656fde4-581f-4504-ad98-30d193bc910d))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (thermal_bridge_angle 45)
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp bc041d54-a029-490d-a58b-24ae42faff24))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (tstamp 34855fa5-31c2-4e10-ba7e-33e15ee242c1))
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive") (tstamp 34855fa5-31c2-4e10-ba7e-33e15ee242c1))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 38 "Net-(D46-Pad2)") (thermal_bridge_angle 45)
+      (net 51 "Net-(D46-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp f4d6c40d-77b4-4298-96b9-e502169e28e6))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 38 "Net-(D46-Pad2)") (tstamp 92726b5f-97f4-401c-9f7a-5cbe794c95f2))
+      (net 51 "Net-(D46-A)") (pinfunction "2") (pintype "passive") (tstamp 92726b5f-97f4-401c-9f7a-5cbe794c95f2))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2069,6 +3161,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fb659)
     (at 149.53488 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cf07")
     (attr through_hole)
     (fp_text reference "SW55" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2094,22 +3215,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 5729b88c-1211-48af-b2cc-4539d763ffba))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (thermal_bridge_angle 45)
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 31f0b906-f949-4387-a7b1-e9cbbac07ae1))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (tstamp 0472cb37-29a9-4e10-bbc3-d898cf2f3f1c))
+      (net 60 "/Col6") (pinfunction "1") (pintype "passive") (tstamp 0472cb37-29a9-4e10-bbc3-d898cf2f3f1c))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 48 "Net-(D56-Pad2)") (thermal_bridge_angle 45)
+      (net 71 "Net-(D56-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 4a66af36-2efc-4e53-95a6-570449e0c919))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 48 "Net-(D56-Pad2)") (tstamp 0dd553bd-8226-4a31-b16f-40904afdc321))
+      (net 71 "Net-(D56-A)") (pinfunction "2") (pintype "passive") (tstamp 0dd553bd-8226-4a31-b16f-40904afdc321))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2120,6 +3241,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fb692)
     (at 130.48488 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cf00")
     (attr through_hole)
     (fp_text reference "SW59" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2145,22 +3295,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 802d97e7-cbcb-43df-bf43-eef10913f2f7))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (thermal_bridge_angle 45)
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 34c32f43-5922-4be9-ae51-013dac4d1519))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (tstamp 5f89a6da-1280-45e8-87ee-268318d261f3))
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive") (tstamp 5f89a6da-1280-45e8-87ee-268318d261f3))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 52 "Net-(D60-Pad2)") (thermal_bridge_angle 45)
+      (net 75 "Net-(D60-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 1930e170-2e1e-4067-a875-baf6af654ee4))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 52 "Net-(D60-Pad2)") (tstamp d00e5118-bd8a-4523-b897-91c7c438b0f7))
+      (net 75 "Net-(D60-A)") (pinfunction "2") (pintype "passive") (tstamp d00e5118-bd8a-4523-b897-91c7c438b0f7))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2171,6 +3321,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fbb3c)
     (at 187.63488 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cef2")
     (attr through_hole)
     (fp_text reference "SW47" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2196,22 +3375,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp a31eb070-37a2-4745-8f51-5fb5a359f5cd))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (thermal_bridge_angle 45)
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 60dcca78-c73c-41e3-be45-b2884dc3806b))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (tstamp 5904fe37-c6ac-409a-ad37-1b96050ea59c))
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive") (tstamp 5904fe37-c6ac-409a-ad37-1b96050ea59c))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 40 "Net-(D48-Pad2)") (thermal_bridge_angle 45)
+      (net 53 "Net-(D48-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp df3f19cd-956d-49c7-8d32-5fa283c4110e))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 40 "Net-(D48-Pad2)") (tstamp 1e14d70e-55a9-4d0f-ac37-79ae5f9cb2ed))
+      (net 53 "Net-(D48-A)") (pinfunction "2") (pintype "passive") (tstamp 1e14d70e-55a9-4d0f-ac37-79ae5f9cb2ed))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2222,6 +3401,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fbb75)
     (at 87.62238 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "1.5U ")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc3fe57")
     (attr through_hole)
     (fp_text reference "SW39" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2247,22 +3455,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 299e4652-f9b0-4f07-b01c-5a2b85829fea))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (thermal_bridge_angle 45)
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 51ab11ab-bfd2-4928-a397-fa20eddc34ce))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (tstamp a443d74a-fa72-4327-8fe4-d607f40eeba9))
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive") (tstamp a443d74a-fa72-4327-8fe4-d607f40eeba9))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 81 "Net-(D40-Pad2)") (thermal_bridge_angle 45)
+      (net 45 "Net-(D40-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp ad77bbe0-cc7f-4b19-88b9-2e115b642230))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 81 "Net-(D40-Pad2)") (tstamp 05082a36-b971-41cf-8207-091d8255410a))
+      (net 45 "Net-(D40-A)") (pinfunction "2") (pintype "passive") (tstamp 05082a36-b971-41cf-8207-091d8255410a))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2273,6 +3481,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fbbe7)
     (at 244.78488 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cedd")
     (attr through_hole)
     (fp_text reference "SW37" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2298,22 +3535,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 26d560a7-de0a-400d-8b46-97885bb527a3))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (thermal_bridge_angle 45)
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 2b5ec158-9fd9-4d3a-b212-d0db2032b27b))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (tstamp ee4cbce6-9a44-4243-97b5-0313a6961693))
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive") (tstamp ee4cbce6-9a44-4243-97b5-0313a6961693))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 79 "Net-(D38-Pad2)") (thermal_bridge_angle 45)
+      (net 43 "Net-(D38-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp dc89b117-dccf-4741-91ce-436f2b2543c3))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 79 "Net-(D38-Pad2)") (tstamp 6ac20cf2-7bfe-41b3-ab35-cbd1de167b3a))
+      (net 43 "Net-(D38-A)") (pinfunction "2") (pintype "passive") (tstamp 6ac20cf2-7bfe-41b3-ab35-cbd1de167b3a))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2324,6 +3561,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fbc20)
     (at 206.68488 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cee4")
     (attr through_hole)
     (fp_text reference "SW44" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2349,22 +3615,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 498e9c03-0211-4e10-b235-99befabe03ff))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (thermal_bridge_angle 45)
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 977dc62c-556d-4d66-9235-03158915922f))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (tstamp 4dba61d1-2979-4b0d-b89f-8474e3f04e51))
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive") (tstamp 4dba61d1-2979-4b0d-b89f-8474e3f04e51))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 37 "Net-(D45-Pad2)") (thermal_bridge_angle 45)
+      (net 50 "Net-(D45-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp e8c7c64d-d8ed-459e-9033-64a4b7b097d5))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 37 "Net-(D45-Pad2)") (tstamp 38949180-6ac4-43a3-98d4-828465f804da))
+      (net 50 "Net-(D45-A)") (pinfunction "2") (pintype "passive") (tstamp 38949180-6ac4-43a3-98d4-828465f804da))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2375,6 +3641,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fbc59)
     (at 111.43488 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cd79")
     (attr through_hole)
     (fp_text reference "SW50" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2400,22 +3695,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 28cc0fe0-3b0f-431d-baff-ed92b6d48ae8))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (thermal_bridge_angle 45)
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp e3e19ed1-5a45-44d1-8bc5-74cd03754f28))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (tstamp c5ef7d88-130d-45fc-a553-a04479bcf6a3))
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive") (tstamp c5ef7d88-130d-45fc-a553-a04479bcf6a3))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 43 "Net-(D51-Pad2)") (thermal_bridge_angle 45)
+      (net 66 "Net-(D51-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp dbd867eb-2a12-45ed-afdb-f0a47b5a0eaa))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 43 "Net-(D51-Pad2)") (tstamp 7cdf28d4-15fa-474c-ada5-640c3156a233))
+      (net 66 "Net-(D51-A)") (pinfunction "2") (pintype "passive") (tstamp 7cdf28d4-15fa-474c-ada5-640c3156a233))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2426,6 +3721,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fbc92)
     (at 225.73488 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6ceeb")
     (attr through_hole)
     (fp_text reference "SW41" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2451,22 +3775,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp cac0a762-fb54-42be-9815-f978333cd64a))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (thermal_bridge_angle 45)
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp ca10f80f-5efb-4e9f-a56b-0f945db408f7))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (tstamp 23a82f3a-73bd-42c2-8b7f-9df3ac35053c))
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive") (tstamp 23a82f3a-73bd-42c2-8b7f-9df3ac35053c))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 35 "Net-(D42-Pad2)") (thermal_bridge_angle 45)
+      (net 47 "Net-(D42-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 5445ecae-e36d-40d1-a29e-b390bad5c4ff))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 35 "Net-(D42-Pad2)") (tstamp 662bb3d4-b69d-4953-ad66-50d6b8bf5fd7))
+      (net 47 "Net-(D42-A)") (pinfunction "2") (pintype "passive") (tstamp 662bb3d4-b69d-4953-ad66-50d6b8bf5fd7))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2477,6 +3801,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fbccb)
     (at 168.58488 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cef9")
     (attr through_hole)
     (fp_text reference "SW51" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2502,22 +3855,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 909f088f-949d-4b85-88d4-ef23b5ca2df3))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (thermal_bridge_angle 45)
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 387a46ea-5ebf-43fa-ad2c-c8b3e24f5988))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (tstamp ca781450-ba03-43db-a0c0-50fe2b3df205))
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive") (tstamp ca781450-ba03-43db-a0c0-50fe2b3df205))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 44 "Net-(D52-Pad2)") (thermal_bridge_angle 45)
+      (net 67 "Net-(D52-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 825eea76-900b-45a4-a070-49c35e7c9e0d))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 44 "Net-(D52-Pad2)") (tstamp 61089419-6b11-4705-815c-4f9daa35cba8))
+      (net 67 "Net-(D52-A)") (pinfunction "2") (pintype "passive") (tstamp 61089419-6b11-4705-815c-4f9daa35cba8))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2528,6 +3881,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d0fbd04)
     (at 306.69738 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "1.5U")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc3fd26")
     (attr through_hole)
     (fp_text reference "SW35" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2553,22 +3935,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 17de5742-8be4-428a-b495-bfeea42d6337))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (thermal_bridge_angle 45)
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 6adb4978-e973-4a44-8e43-ed8a589679c9))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (tstamp 39a13f00-5368-4a5d-863c-243cf0ca3371))
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive") (tstamp 39a13f00-5368-4a5d-863c-243cf0ca3371))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 30 "Net-(D36-Pad2)") (thermal_bridge_angle 45)
+      (net 41 "Net-(D36-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp b0a50365-dc2e-4ff6-86c0-c2b8f8dae583))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 30 "Net-(D36-Pad2)") (tstamp 20809355-8fd7-4a50-9669-9567146aa6ca))
+      (net 41 "Net-(D36-A)") (pinfunction "2") (pintype "passive") (tstamp 20809355-8fd7-4a50-9669-9567146aa6ca))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2579,6 +3961,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d105de3)
     (at 316.22238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf404")
     (attr through_hole)
     (fp_text reference "SW10" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2604,22 +4016,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp ed93fe83-fe0e-4617-ac77-a672637a2565))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (thermal_bridge_angle 45)
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 1945ecb0-a5a2-40bf-aa21-532e99903ab6))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (tstamp b3561db4-8f00-4ba2-8448-437eeaccc839))
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive") (tstamp b3561db4-8f00-4ba2-8448-437eeaccc839))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 9 "Net-(D11-Pad2)") (thermal_bridge_angle 45)
+      (net 14 "Net-(D11-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 3ab90f68-a817-4111-b0db-39d352c00986))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 9 "Net-(D11-Pad2)") (tstamp 1adf3669-e3b1-4e6e-974a-5d2e1cf36b7f))
+      (net 14 "Net-(D11-A)") (pinfunction "2") (pintype "passive") (tstamp 1adf3669-e3b1-4e6e-974a-5d2e1cf36b7f))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2630,6 +4042,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d105e93)
     (at 335.27238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "NO")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf3f6")
     (attr through_hole)
     (fp_text reference "SW6" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2655,22 +4096,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp fb9c3a6b-0623-4a91-8855-d04fef25dfc4))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (thermal_bridge_angle 45)
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 788dcc68-9454-45ce-8d51-9a8eced629af))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (tstamp dffc0b3b-fe96-4696-b1b0-abf24c1c73ae))
+      (net 55 "/Col1") (pinfunction "1") (pintype "passive") (tstamp dffc0b3b-fe96-4696-b1b0-abf24c1c73ae))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 5 "Net-(D7-Pad2)") (thermal_bridge_angle 45)
+      (net 10 "Net-(D7-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 844563d5-7a51-48c5-b988-53200dfc2510))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 5 "Net-(D7-Pad2)") (tstamp b8bad59b-8ced-44be-a507-b238bfc51e6b))
+      (net 10 "Net-(D7-A)") (pinfunction "2") (pintype "passive") (tstamp b8bad59b-8ced-44be-a507-b238bfc51e6b))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2681,6 +4122,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d10f44a)
     (at 311.45988 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "1.5U")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf38d")
     (attr through_hole)
     (fp_text reference "SW13" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2706,22 +4177,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp a28fe146-6fe5-4dd2-9a8b-ef88df6ce55e))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (thermal_bridge_angle 45)
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp ac616824-705a-4df6-8408-2a71946e1341))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (tstamp 6789554d-6753-42b8-a0a3-7885385cff84))
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive") (tstamp 6789554d-6753-42b8-a0a3-7885385cff84))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 12 "Net-(D14-Pad2)") (thermal_bridge_angle 45)
+      (net 17 "Net-(D14-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp b2358be2-664b-420b-b7f8-044294ead8c2))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 12 "Net-(D14-Pad2)") (tstamp fb64a770-80ca-43db-a5d4-02eb0e2593fc))
+      (net 17 "Net-(D14-A)") (pinfunction "2") (pintype "passive") (tstamp fb64a770-80ca-43db-a5d4-02eb0e2593fc))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2732,6 +4203,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d633858)
     (at 259.07238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf412")
     (attr through_hole)
     (fp_text reference "SW22" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2757,22 +4258,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 1ecc8472-54c1-4549-a211-9e5f491d1081))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (thermal_bridge_angle 45)
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp a19ec3c2-e034-44ca-a4de-0b8fa767a946))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (tstamp 34e860d8-f2b7-4dbe-9d0f-683c5714b470))
+      (net 59 "/Col5") (pinfunction "1") (pintype "passive") (tstamp 34e860d8-f2b7-4dbe-9d0f-683c5714b470))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 19 "Net-(D23-Pad2)") (thermal_bridge_angle 45)
+      (net 26 "Net-(D23-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 1d2c220c-4d7a-41ca-b6db-57fc960586cf))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 19 "Net-(D23-Pad2)") (tstamp 23cb52d7-8621-4e09-b7f8-c1e8755142e0))
+      (net 26 "Net-(D23-A)") (pinfunction "2") (pintype "passive") (tstamp 23cb52d7-8621-4e09-b7f8-c1e8755142e0))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2783,6 +4284,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d633b5c)
     (at 311.45988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc3ff70")
     (attr through_hole)
     (fp_text reference "SW57" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2808,22 +4338,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 89532c85-11bb-47cc-9eca-11cb886edea3))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (thermal_bridge_angle 45)
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 22f0b894-92d0-437f-89bd-fd96d4738944))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (tstamp 84c0d36f-1826-45b8-a9c8-796c56135106))
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive") (tstamp 84c0d36f-1826-45b8-a9c8-796c56135106))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 50 "Net-(D58-Pad2)") (thermal_bridge_angle 45)
+      (net 73 "Net-(D58-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 075a1e8d-a9c8-495b-82a5-9b93b86a5984))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 50 "Net-(D58-Pad2)") (tstamp baf056e1-3277-497c-9389-25338f7f7a14))
+      (net 73 "Net-(D58-A)") (pinfunction "2") (pintype "passive") (tstamp baf056e1-3277-497c-9389-25338f7f7a14))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2834,6 +4364,36 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005d633eae)
     (at 263.83488 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Manufacturer Part Number" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf3a9")
     (attr through_hole)
     (fp_text reference "SW29" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2859,22 +4419,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp eb29c34d-65b4-458e-a832-c6c254b39fdf))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (thermal_bridge_angle 45)
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 1b312ddd-ae43-4535-baf4-4b4f9d9078e8))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (tstamp b76f469d-0b11-4fdb-a5a2-1dfd36d4d025))
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive") (tstamp b76f469d-0b11-4fdb-a5a2-1dfd36d4d025))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 26 "Net-(D30-Pad2)") (thermal_bridge_angle 45)
+      (net 36 "Net-(D30-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 10d94b42-de9f-47e1-bf83-33265d5dbe75))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 26 "Net-(D30-Pad2)") (tstamp 7664fac2-d9c5-40c6-9176-8b154cc55842))
+      (net 36 "Net-(D30-A)") (pinfunction "2") (pintype "passive") (tstamp 7664fac2-d9c5-40c6-9176-8b154cc55842))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2935,6 +4495,34 @@
   (footprint "unikbd:Key_MX_LED" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005df2ab34)
     (at 335.27238 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "NO")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U LED")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005df7d21e")
     (attr through_hole)
     (fp_text reference "SW9" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -2972,31 +4560,60 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 399c9284-a8bd-4277-b2ac-1e9f2f607155))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (thermal_bridge_angle 45)
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 0) (end 2.54 -0.8763) (width 0.2))
       ) (tstamp 9dace9ba-94fd-4f86-93bf-8d9ff074e7ad))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (tstamp a4f1cf04-0030-4504-b5cd-6a2f83eee371))
+      (net 56 "/Col2") (pinfunction "1") (pintype "passive") (tstamp a4f1cf04-0030-4504-b5cd-6a2f83eee371))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 8 "Net-(D10-Pad2)") (thermal_bridge_angle 45)
+      (net 13 "Net-(D10-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 1.1176) (end 1.016 4.8768) (width 0.2))
         (gr_line (start 1.016 4.8768) (end 3.81 6.3373) (width 0.2))
       ) (tstamp 5ba86e20-5ee3-40c5-91b7-2fcd2a1e5d6f))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 1.651 1.651) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 8 "Net-(D10-Pad2)") (tstamp 4ccf3280-0079-4002-84a1-c3b15fe21199))
+      (net 13 "Net-(D10-A)") (pinfunction "2") (pintype "passive") (tstamp 4ccf3280-0079-4002-84a1-c3b15fe21199))
     (pad "3" thru_hole circle locked (at -1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers "*.Cu" "*.Mask")
-      (net 102 "Net-(D63-Pad2)") (tstamp b334c034-0e39-42c6-9439-a2d3ad24f857))
+      (net 102 "Net-(LED2-A)") (pinfunction "3") (pintype "passive") (tstamp b334c034-0e39-42c6-9439-a2d3ad24f857))
     (pad "4" thru_hole circle locked (at 1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers "*.Cu" "*.Mask")
-      (net 103 "Net-(D63-Pad1)") (tstamp a1a93763-6992-46c0-9db1-c776b238185f))
+      (net 89 "Net-(J1-Pin_24)") (pinfunction "4") (pintype "passive") (tstamp a1a93763-6992-46c0-9db1-c776b238185f))
   )
 
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005e078b96)
     (at 330.50988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005d6c3751")
     (attr through_hole)
     (fp_text reference "SW34" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -3022,22 +4639,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp f9a802e3-2e20-47e2-8833-c6a1306102ec))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 86 "Net-(J1-Pad18)") (thermal_bridge_angle 45)
+      (net 92 "Net-(J1-Pin_18)") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp ee6b7286-329e-45f1-bcb1-539ee675bf3e))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 86 "Net-(J1-Pad18)") (tstamp 6938583f-c7b1-4729-9060-dc35afecba7c))
+      (net 92 "Net-(J1-Pin_18)") (pinfunction "1") (pintype "passive") (tstamp 6938583f-c7b1-4729-9060-dc35afecba7c))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 87 "Net-(J1-Pad20)") (thermal_bridge_angle 45)
+      (net 91 "Net-(J1-Pin_20)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp d6d97bcc-e9ed-454c-a71f-14e79564a8f8))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 87 "Net-(J1-Pad20)") (tstamp 1104b22a-8876-4497-a244-61cb694ffc15))
+      (net 91 "Net-(J1-Pin_20)") (pinfunction "2") (pintype "passive") (tstamp 1104b22a-8876-4497-a244-61cb694ffc15))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3048,6 +4665,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005e078cc4)
     (at 97.14738 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cd80")
     (attr through_hole)
     (fp_text reference "SW58" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -3073,22 +4719,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp a3d074cf-9541-4055-9fe4-c1df7be749e0))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (thermal_bridge_angle 45)
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 35441997-4fd3-498b-8939-3ce3a75a9d0b))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (tstamp ce5c7cc1-72c0-449f-bf62-d5b7948ad2c0))
+      (net 61 "/Col7") (pinfunction "1") (pintype "passive") (tstamp ce5c7cc1-72c0-449f-bf62-d5b7948ad2c0))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 51 "Net-(D59-Pad2)") (thermal_bridge_angle 45)
+      (net 74 "Net-(D59-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp 2f5199f9-eca4-4024-855e-80fb11897c76))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 51 "Net-(D59-Pad2)") (tstamp b479ecfb-9a0e-4e29-af6a-f0f641fb3658))
+      (net 74 "Net-(D59-A)") (pinfunction "2") (pintype "passive") (tstamp b479ecfb-9a0e-4e29-af6a-f0f641fb3658))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3099,6 +4745,34 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005e0a4767)
     (at 68.57238 89.79916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "Yes")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005e0ac938")
     (attr through_hole)
     (fp_text reference "SW62" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -3124,22 +4798,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp c5e7fbb8-b428-4beb-9994-89edb3d53299))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (thermal_bridge_angle 45)
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp f9f14c90-8a13-471a-99a7-bfa5ece4641d))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (tstamp 6b9974b9-8935-4db6-8411-53c4dedcb6ca))
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive") (tstamp 6b9974b9-8935-4db6-8411-53c4dedcb6ca))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 94 "Net-(D1-Pad2)") (thermal_bridge_angle 45)
+      (net 4 "Net-(D1-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp ee0c0084-fe59-4941-89e7-2a886f67e10f))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 94 "Net-(D1-Pad2)") (tstamp 1d984e07-6086-4c10-8922-2090fd1013ad))
+      (net 4 "Net-(D1-A)") (pinfunction "2") (pintype "passive") (tstamp 1d984e07-6086-4c10-8922-2090fd1013ad))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3150,6 +4824,34 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005e175e04)
     (at 368.60988 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "Yes")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005e423211")
     (attr through_hole)
     (fp_text reference "SW63" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -3175,22 +4877,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp c69cda1a-643c-4a8e-a4ae-ca2edcee7d42))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 54 "/Col0") (thermal_bridge_angle 45)
+      (net 54 "/Col0") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp a910e588-7eee-4dac-b3a5-005e9286e8ab))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 54 "/Col0") (tstamp cb0d659a-b5c2-4d72-b2ee-7b04ebac0e8a))
+      (net 54 "/Col0") (pinfunction "1") (pintype "passive") (tstamp cb0d659a-b5c2-4d72-b2ee-7b04ebac0e8a))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 95 "Net-(D35-Pad2)") (thermal_bridge_angle 45)
+      (net 40 "Net-(D35-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp d1a78444-e038-4708-98b3-c8cb89d6820d))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 95 "Net-(D35-Pad2)") (tstamp f93491e5-b46d-401b-91e7-4347aaf23503))
+      (net 40 "Net-(D35-A)") (pinfunction "2") (pintype "passive") (tstamp f93491e5-b46d-401b-91e7-4347aaf23503))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3203,6 +4905,15 @@
     (at 69.85 152.4 -90)
     (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
     (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
+    (property "Comment" "If R1-R3 installed, then DNP R4-R6")
+    (property "Fitted" "NO")
+    (property "Manufacturer" "Generic Through hole")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Substitution OK" " YES ")
+    (property "ki_description" "Resistor, US symbol")
+    (property "ki_keywords" "R res resistor")
+    (property "tolerance" "1%")
     (path "/00000000-0000-0000-0000-00005fed4095")
     (attr through_hole)
     (fp_text reference "R1" (at 5.08 -2.37 90) (layer "F.SilkS")
@@ -3250,9 +4961,9 @@
     (fp_line (start 10.16 0) (end 8.23 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 704fbe86-cd8d-495b-9cbb-accc17739285))
     (pad "1" thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 100 "Net-(D62-Pad2)") (tstamp a4c88900-42f2-438c-a88a-389c83b68b65))
+      (net 101 "Net-(LED1-A)") (pintype "passive") (tstamp a4c88900-42f2-438c-a88a-389c83b68b65))
     (pad "2" thru_hole oval (at 10.16 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 83 "Net-(J1-Pad6)") (tstamp 89f0dde7-3ced-4177-8f11-e06a95f212f0))
+      (net 98 "Net-(J1-Pin_6)") (pintype "passive") (tstamp 89f0dde7-3ced-4177-8f11-e06a95f212f0))
     (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3265,6 +4976,15 @@
     (at 368.046 116.84 90)
     (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
     (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
+    (property "Comment" "If R1-R3 installed, then DNP R4-R6")
+    (property "Fitted" "NO")
+    (property "Manufacturer" "Generic Through hole")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Substitution OK" " YES ")
+    (property "ki_description" "Resistor, US symbol")
+    (property "ki_keywords" "R res resistor")
+    (property "tolerance" "1%")
     (path "/00000000-0000-0000-0000-00005fed3098")
     (attr through_hole)
     (fp_text reference "R3" (at -2.2606 0.1778 90) (layer "F.SilkS")
@@ -3312,9 +5032,9 @@
     (fp_line (start 10.16 0) (end 8.23 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8bb41c34-da6c-49e5-9401-3560a5594c18))
     (pad "1" thru_hole circle (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 98 "Net-(J1-Pad22)") (tstamp e51289e7-7a65-4386-b21d-32fc44923e33))
+      (net 90 "Net-(J1-Pin_22)") (pintype "passive") (tstamp e51289e7-7a65-4386-b21d-32fc44923e33))
     (pad "2" thru_hole oval (at 10.16 0 90) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 102 "Net-(D63-Pad2)") (tstamp 5c59d9b3-f07d-4b56-abc6-ed429d8694fb))
+      (net 102 "Net-(LED2-A)") (pintype "passive") (tstamp 5c59d9b3-f07d-4b56-abc6-ed429d8694fb))
     (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3325,6 +5045,35 @@
   (footprint "unikbd:Key_MX_Spacebar_5.25" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005ee2c342)
     (at 197.15988 165.99916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "8U spacebar")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 8U Spacebar")
+    (property "ki_keywords" "switch futaba cherry mx 8U spacebar")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cd72")
     (attr through_hole)
     (fp_text reference "SW46" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -3356,22 +5105,22 @@
     (pad "" np_thru_hole oval locked (at 66.675 -0.1016) (size 5 2) (drill oval 5 2) (layers "*.Cu" "*.Mask") (tstamp 0fcfa896-0ee4-4647-8395-b18c78a4d260))
     (pad "" np_thru_hole circle locked (at 66.675 8.3566) (size 3.9878 3.9878) (drill 3.9878) (layers "*.Cu" "*.Mask") (tstamp 956bbea5-0be8-4570-ab25-47931015acb5))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (thermal_bridge_angle 45)
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 0) (end 2.54 -0.8763) (width 0.2))
       ) (tstamp ea8e2760-6304-4628-a1a0-dd09199441de))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (tstamp 4f9378b0-a680-4ece-a9ef-6930d4340454))
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive") (tstamp 4f9378b0-a680-4ece-a9ef-6930d4340454))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 39 "Net-(D47-Pad2)") (thermal_bridge_angle 45)
+      (net 52 "Net-(D47-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 0) (end 1.27 4.9784) (width 0.2))
         (gr_line (start 1.27 4.9784) (end 3.81 6.3373) (width 0.2))
       ) (tstamp 0b9fb3aa-c930-4da6-94ff-bc0b412df60b))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 39 "Net-(D47-Pad2)") (tstamp 4712f1f9-ffcc-4308-819c-853bd8e145f7))
+      (net 52 "Net-(D47-A)") (pinfunction "2") (pintype "passive") (tstamp 4712f1f9-ffcc-4308-819c-853bd8e145f7))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3497,54 +5246,77 @@
     (at 84.14258 175.54194 180)
     (descr "LED, Round, FlatTop,  Rectangular size 4.8x2.5mm^2 diameter 2.0mm, 2 pins, http://www.kingbright.com/attachments/file/psearch/000/00/00/L-13GD(Ver.11B).pdf")
     (tags "LED Round FlatTop  Rectangular size 4.8x2.5mm^2 diameter 2.0mm 2 pins")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Install into switch")
+    (property "Comment" "3mm Through-hole LED, 0.1\" spacing")
+    (property "Component Type" "LED")
+    (property "Component Value" "Amber")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Lumex")
+    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD")
+    (property "Manufacturer PN" "SSL-LX3044AD")
+    (property "Manufacturer Part Number" "SSL-LX3044AD")
+    (property "Number of Pins" "2")
+    (property "Package" "T-1 (3mm)")
+    (property "Power Rating" "105mW")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-40C/+85C")
+    (property "Tracking" "No")
+    (property "ki_description" "Light emitting diode")
+    (property "ki_keywords" "LED diode")
     (path "/00000000-0000-0000-0000-00005ee7a83e")
     (attr through_hole)
-    (fp_text reference "D62" (at 1.27 -2.31) (layer "F.SilkS")
+    (fp_text reference "LED1" (at 1.27 -2.31 180) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 24580101-c9f8-474b-b28a-459d04661b12)
+      (tstamp 230dfd23-c622-4bfc-ac89-96279c6d8ce1)
     )
-    (fp_text value "LED" (at 1.27 2.31) (layer "F.Fab")
+    (fp_text value "LED" (at 1.27 2.31 180) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp d07c15e4-6c22-43f4-817c-cf677b284d91)
+      (tstamp 321c67ab-e98e-4540-aa66-f1a570f03a87)
     )
     (fp_line (start -1.19 -1.31) (end -1.19 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 73559865-489f-4566-8c0a-076490436894))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e6308288-1c7b-45e7-a637-3c472612d9a8))
     (fp_line (start -1.19 -1.31) (end 3.73 -1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 2c196165-37e3-4c18-8aa2-2317da620fcb))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b002d646-1b59-4a8d-b6a8-cc4f29ed7c0a))
     (fp_line (start -1.19 1.31) (end 3.73 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6d689b18-8a22-4f08-bb96-ab330e99e367))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4b42ea97-6443-402f-a548-ba414a059d01))
     (fp_line (start -1.07 -1.31) (end -1.07 -1.08)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6498ab98-9249-4992-a9ec-e35000c25082))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 729c535d-b56e-410d-ba74-e964f7c5ccb0))
     (fp_line (start -1.07 1.08) (end -1.07 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp dfd6e0d1-6531-4ec7-bea4-05b1f54dca47))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4737d67f-b8bf-4da8-9945-0a543790b6eb))
     (fp_line (start -0.95 -1.31) (end -0.95 -1.08)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a4ea2448-8137-4cef-a443-447af4efe367))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp bedb12cb-3f66-4f15-bd59-70ad2386f3a5))
     (fp_line (start -0.95 1.08) (end -0.95 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 08646e32-15d0-4623-aa89-9c7b7f23505d))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ad2c0281-28a8-47d3-8640-87a1f2f7c6db))
     (fp_line (start 3.73 -1.31) (end 3.73 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 69457e44-3ee8-4a14-bc1e-c810c53666ce))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d77a2fb8-be5c-4c0b-9e2d-fa4fb99e270c))
     (fp_line (start -1.45 -1.6) (end -1.45 1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ffa4426f-95b2-4179-9b0c-0444ebcbefcb))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 822910b8-47c8-497e-9ac5-b7ea44a395c4))
     (fp_line (start -1.45 1.6) (end 4 1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0ce5ec70-cc1f-46e6-95ea-67a457d41991))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp dbc06e6d-3586-4ef1-9a5c-afa7ab290c62))
     (fp_line (start 4 -1.6) (end -1.45 -1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp affaa418-bd6a-4bd2-ae23-4971bc903a79))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp aa50bbc0-385b-4f62-89f4-6502f8c7353d))
     (fp_line (start 4 1.6) (end 4 -1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 86f113c7-b87e-43ca-a88c-b7253555a89e))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0e36ad72-ed43-4897-9be2-34f817d4759c))
     (fp_line (start -1.13 -1.25) (end -1.13 1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 91b0e2bf-0f77-42d7-89e8-b2e69db4c05d))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 68e6d0f8-09bf-4b34-9146-ebea3755b38a))
     (fp_line (start -1.13 1.25) (end 3.67 1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 59dc9520-3f58-4bfc-a9cb-ad4ef2b59f7d))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a5f31ab1-f619-481a-907f-313f1412955e))
     (fp_line (start 3.67 -1.25) (end -1.13 -1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b9cbb45a-07c9-40ab-b4f1-48d0c73811e2))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4d5e6366-009b-46a8-990c-bae6d57d2799))
     (fp_line (start 3.67 1.25) (end 3.67 -1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 37b2c3c3-4b80-48ef-a724-88b89e9b293c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0f187bd5-e8aa-46b7-b1a4-372a1c3e1459))
     (fp_circle (center 1.27 0) (end 2.27 0)
-      (stroke (width 0.1) (type solid)) (fill none) (layer "F.Fab") (tstamp 0b3c2a3d-00ab-459c-a21d-b8a6acf20365))
+      (stroke (width 0.1) (type solid)) (fill none) (layer "F.Fab") (tstamp 87ffcda8-06db-4ffe-93be-22213a5a1829))
     (pad "1" thru_hole rect (at 0 0 180) (size 1.8 1.8) (drill 0.9) (layers "*.Cu" "*.Mask")
-      (net 101 "Net-(D62-Pad1)") (tstamp 1e0c9b5b-af05-4404-a705-468ecc79eecc))
+      (net 97 "Net-(J1-Pin_8)") (pinfunction "K") (pintype "passive") (tstamp 38e519b7-066a-41f6-a0b7-ae3c6eb14aec))
     (pad "2" thru_hole circle (at 2.54 0 180) (size 1.8 1.8) (drill 0.9) (layers "*.Cu" "*.Mask")
-      (net 100 "Net-(D62-Pad2)") (tstamp 3ac45a88-cf61-49d9-bb8f-af5a233f1bae))
+      (net 101 "Net-(LED1-A)") (pinfunction "A") (pintype "passive") (tstamp 099f9f4e-989a-4179-8ca1-de916a027cdb))
     (model "${KICAD6_3DMODEL_DIR}/LED_THT.3dshapes/LED_D2.0mm_W4.8mm_H2.5mm_FlatTop.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3555,6 +5327,34 @@
   (footprint "unikbd:Key_MX_LED" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005ee36bd8)
     (at 82.85988 165.99916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "Yes")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U LED")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005ee9ea4f")
     (attr through_hole)
     (fp_text reference "SW61" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -3592,26 +5392,26 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp ecd59a97-8e2b-48e6-a3b9-e557ba93600c))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 92 "Net-(J1-Pad2)") (thermal_bridge_angle 45)
+      (net 100 "Net-(J1-Pin_2)") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 0) (end 2.54 -0.8763) (width 0.2))
       ) (tstamp f5c0494b-6f06-4b90-9b90-90afdac8376f))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 92 "Net-(J1-Pad2)") (tstamp 1dfba657-583f-40b4-a152-fdbd5cd2b301))
+      (net 100 "Net-(J1-Pin_2)") (pinfunction "1") (pintype "passive") (tstamp 1dfba657-583f-40b4-a152-fdbd5cd2b301))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 93 "Net-(J1-Pad4)") (thermal_bridge_angle 45)
+      (net 99 "Net-(J1-Pin_4)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 1.1176) (end 1.016 4.8768) (width 0.2))
         (gr_line (start 1.016 4.8768) (end 3.81 6.3373) (width 0.2))
       ) (tstamp 9f95e60f-1ec8-451d-8e1a-ca2bef07324e))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 1.651 1.651) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 93 "Net-(J1-Pad4)") (tstamp 1c8f5893-5ba6-42a8-b036-dc6800ac617c))
+      (net 99 "Net-(J1-Pin_4)") (pinfunction "2") (pintype "passive") (tstamp 1c8f5893-5ba6-42a8-b036-dc6800ac617c))
     (pad "3" thru_hole circle locked (at -1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers "*.Cu" "*.Mask")
-      (net 100 "Net-(D62-Pad2)") (tstamp 62b515b9-1895-4eb9-9eea-33469b7a6a1d))
+      (net 101 "Net-(LED1-A)") (pinfunction "3") (pintype "passive") (tstamp 62b515b9-1895-4eb9-9eea-33469b7a6a1d))
     (pad "4" thru_hole circle locked (at 1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers "*.Cu" "*.Mask")
-      (net 101 "Net-(D62-Pad1)") (tstamp d97c11b2-97d6-4c25-afb2-67d6136186f3))
+      (net 97 "Net-(J1-Pin_8)") (pinfunction "4") (pintype "passive") (tstamp d97c11b2-97d6-4c25-afb2-67d6136186f3))
   )
 
   (footprint "LED_THT:LED_D2.0mm_W4.8mm_H2.5mm_FlatTop" (layer "F.Cu")
@@ -3619,54 +5419,77 @@
     (at 293.67988 137.43432 180)
     (descr "LED, Round, FlatTop,  Rectangular size 4.8x2.5mm^2 diameter 2.0mm, 2 pins, http://www.kingbright.com/attachments/file/psearch/000/00/00/L-13GD(Ver.11B).pdf")
     (tags "LED Round FlatTop  Rectangular size 4.8x2.5mm^2 diameter 2.0mm 2 pins")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Install into switch")
+    (property "Comment" "3mm Through-hole LED, 0.1\" spacing")
+    (property "Component Type" "LED")
+    (property "Component Value" "Amber")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Lumex")
+    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD")
+    (property "Manufacturer PN" "SSL-LX3044AD")
+    (property "Manufacturer Part Number" "SSL-LX3044AD")
+    (property "Number of Pins" "2")
+    (property "Package" "T-1 (3mm)")
+    (property "Power Rating" "105mW")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-40C/+85C")
+    (property "Tracking" "No")
+    (property "ki_description" "Light emitting diode")
+    (property "ki_keywords" "LED diode")
     (path "/00000000-0000-0000-0000-00005ee9df56")
     (attr through_hole)
-    (fp_text reference "D64" (at 1.27 -2.31) (layer "F.SilkS")
+    (fp_text reference "LED3" (at 1.27 -2.31 180) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 8b517821-f84f-46b2-b0c2-2273c16b8aad)
+      (tstamp cc9836c5-f4e2-4220-9e9d-c1139122d4ab)
     )
-    (fp_text value "LED" (at 1.27 2.31) (layer "F.Fab")
+    (fp_text value "LED" (at 1.27 2.31 180) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 06b77cd2-ffac-46b2-b8e8-5878f1be549a)
+      (tstamp 1238d6ab-9bff-4b17-aa69-6e26a9eb2c88)
     )
     (fp_line (start -1.19 -1.31) (end -1.19 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a9bb2d73-fc9c-4752-a2c1-b827cc610c10))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a0531425-395b-44f4-9b42-2dfd33a51f76))
     (fp_line (start -1.19 -1.31) (end 3.73 -1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 037bdf02-47c6-4b83-9102-961e5a4845db))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 023b7c72-f704-455a-814b-5ea8bdb88832))
     (fp_line (start -1.19 1.31) (end 3.73 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b7dffa58-73f1-46a9-a421-f22c0fdae1ec))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 27481a33-62d1-40e9-a3d7-852feb8462d4))
     (fp_line (start -1.07 -1.31) (end -1.07 -1.08)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c811db3d-0d3e-4228-b930-a0cca9d4a97f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4646cfb9-11ca-4eca-a78a-afa110cdb3c5))
     (fp_line (start -1.07 1.08) (end -1.07 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6174a1c8-53ee-4720-afc8-836678e3fcfa))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 91b36d4d-b3fa-4b7e-b4cd-7f74e9ee72fb))
     (fp_line (start -0.95 -1.31) (end -0.95 -1.08)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c5ca36b4-8e01-430b-bf37-3f0bb4c227db))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 436f842b-4eaf-49be-8863-3610cd46069b))
     (fp_line (start -0.95 1.08) (end -0.95 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp de991a9a-1679-406e-b4ab-56f88e1bb716))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 506e7894-79f9-46eb-b8b2-6efcbcac8a99))
     (fp_line (start 3.73 -1.31) (end 3.73 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8a2c386d-8b5f-4828-b83b-f93bbdbced66))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7c633024-9eb6-4008-a442-4a8a1b769b77))
     (fp_line (start -1.45 -1.6) (end -1.45 1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c5def1e4-3fec-4dbf-badd-66d9791deb84))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f23debba-5f68-416e-b929-87e7679d30d9))
     (fp_line (start -1.45 1.6) (end 4 1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b8f63d4b-cf3c-403f-a252-46fc92579181))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5063ea28-259c-42c5-a70a-7541f8409059))
     (fp_line (start 4 -1.6) (end -1.45 -1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7295eace-1294-475e-a689-f3edc1723e3c))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7b290859-5287-4525-a8a5-10242c9c00bc))
     (fp_line (start 4 1.6) (end 4 -1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3a3718e2-6006-4f0d-928c-d2a073459cb5))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0fd876cb-0a00-42fa-bef8-112b934bf117))
     (fp_line (start -1.13 -1.25) (end -1.13 1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b4a2c21f-338b-4a07-8041-92a6fe6598cf))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c946d90a-35ab-41df-8808-8e3de22bd164))
     (fp_line (start -1.13 1.25) (end 3.67 1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 71702a10-921f-4ac3-ab79-d5a4334b173c))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e5806de8-3edd-4aa9-a96b-a059fdd6ea08))
     (fp_line (start 3.67 -1.25) (end -1.13 -1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 63263bcf-9925-49ac-9a32-624b32f01ed6))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e6b44b42-790b-4312-a39c-fe3db369d3f4))
     (fp_line (start 3.67 1.25) (end 3.67 -1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9950e8c4-eec7-45f5-a7c3-7b930dd57418))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 935bf34a-fc85-4eb6-87b5-b535ad7714ae))
     (fp_circle (center 1.27 0) (end 2.27 0)
-      (stroke (width 0.1) (type solid)) (fill none) (layer "F.Fab") (tstamp 718722d0-650a-46a8-b02f-f98ad97c2822))
+      (stroke (width 0.1) (type solid)) (fill none) (layer "F.Fab") (tstamp f83c6988-1226-4e3b-bb58-fe38c4f1d7ce))
     (pad "1" thru_hole rect (at 0 0 180) (size 1.8 1.8) (drill 0.9) (layers "*.Cu" "*.Mask")
-      (net 97 "Net-(D33-Pad1)") (tstamp 6b1bb18c-6300-4b22-9a39-8d481231eba1))
+      (net 93 "Net-(J1-Pin_16)") (pinfunction "K") (pintype "passive") (tstamp c7d5c8bf-4370-4e55-a759-519f6393d330))
     (pad "2" thru_hole circle (at 2.54 0 180) (size 1.8 1.8) (drill 0.9) (layers "*.Cu" "*.Mask")
-      (net 96 "Net-(D33-Pad2)") (tstamp eea788e2-4219-4714-a63b-1e60512d24d0))
+      (net 103 "Net-(LED3-A)") (pinfunction "A") (pintype "passive") (tstamp 35e962c6-7379-465e-a8b8-a59dd6090961))
     (model "${KICAD6_3DMODEL_DIR}/LED_THT.3dshapes/LED_D2.0mm_W4.8mm_H2.5mm_FlatTop.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3677,6 +5500,35 @@
   (footprint "unikbd:Key_MX_LED" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005ee80cfc)
     (at 287.64738 108.84916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U LED")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005ee923f1")
     (attr through_hole)
     (fp_text reference "SW17" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -3714,26 +5566,26 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp b12662f8-0d60-46a8-904c-0b7574d17c69))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (thermal_bridge_angle 45)
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 0) (end 2.54 -0.8763) (width 0.2))
       ) (tstamp dea53395-028a-4b2b-b972-dbda402e963a))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (tstamp 64e29d88-68a9-4bf0-8aef-26d6fbcdd0dd))
+      (net 58 "/Col4") (pinfunction "1") (pintype "passive") (tstamp 64e29d88-68a9-4bf0-8aef-26d6fbcdd0dd))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 15 "Net-(D18-Pad2)") (thermal_bridge_angle 45)
+      (net 21 "Net-(D18-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 1.1176) (end 1.016 4.8768) (width 0.2))
         (gr_line (start 1.016 4.8768) (end 3.81 6.3373) (width 0.2))
       ) (tstamp 4e1d9224-4618-42a5-85ec-89b201292faa))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 1.651 1.651) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 15 "Net-(D18-Pad2)") (tstamp a33c31e1-dff0-49f1-af50-1fc5489374eb))
+      (net 21 "Net-(D18-A)") (pinfunction "2") (pintype "passive") (tstamp a33c31e1-dff0-49f1-af50-1fc5489374eb))
     (pad "3" thru_hole circle locked (at -1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers "*.Cu" "*.Mask")
-      (net 102 "Net-(D63-Pad2)") (tstamp 397f57ce-8e1d-407c-ace2-850db587e48d))
+      (net 102 "Net-(LED2-A)") (pinfunction "3") (pintype "passive") (tstamp 397f57ce-8e1d-407c-ace2-850db587e48d))
     (pad "4" thru_hole circle locked (at 1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers "*.Cu" "*.Mask")
-      (net 103 "Net-(D63-Pad1)") (tstamp c175a3c1-4d2a-4ec2-87e9-948e764ce202))
+      (net 89 "Net-(J1-Pin_24)") (pinfunction "4") (pintype "passive") (tstamp c175a3c1-4d2a-4ec2-87e9-948e764ce202))
   )
 
   (footprint "LED_THT:LED_D2.0mm_W4.8mm_H2.5mm_FlatTop" locked (layer "F.Cu")
@@ -3741,54 +5593,77 @@
     (at 289.052 118.35892 180)
     (descr "LED, Round, FlatTop,  Rectangular size 4.8x2.5mm^2 diameter 2.0mm, 2 pins, http://www.kingbright.com/attachments/file/psearch/000/00/00/L-13GD(Ver.11B).pdf")
     (tags "LED Round FlatTop  Rectangular size 4.8x2.5mm^2 diameter 2.0mm 2 pins")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Install into switch")
+    (property "Comment" "3mm Through-hole LED, 0.1\" spacing")
+    (property "Component Type" "LED")
+    (property "Component Value" "Amber")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Lumex")
+    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD")
+    (property "Manufacturer PN" "SSL-LX3044AD")
+    (property "Manufacturer Part Number" "SSL-LX3044AD")
+    (property "Number of Pins" "2")
+    (property "Package" "T-1 (3mm)")
+    (property "Power Rating" "105mW")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-40C/+85C")
+    (property "Tracking" "No")
+    (property "ki_description" "Light emitting diode")
+    (property "ki_keywords" "LED diode")
     (path "/00000000-0000-0000-0000-00005eece7dc")
     (attr through_hole)
-    (fp_text reference "D65" (at -2.9718 0.5334) (layer "F.SilkS")
+    (fp_text reference "LED5" (at 1.27 -2.31 180) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 476a8fa7-9e94-437b-919c-7f4bab77144d)
+      (tstamp e73e904a-7ec6-4b94-9ea0-8191c49f29c2)
     )
-    (fp_text value "LED" (at 1.27 2.31) (layer "F.Fab")
+    (fp_text value "LED" (at 1.27 2.31 180) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 0958a6e1-7590-4d38-b0fd-8d621c3faa47)
+      (tstamp e7961d4c-ec46-42d0-8642-9063c9f8eb45)
     )
     (fp_line (start -1.19 -1.31) (end -1.19 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8950c204-c87a-4dc6-a2fc-07a1065a9e99))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f9da82f2-84e3-40af-9ec5-dfd9799699a2))
     (fp_line (start -1.19 -1.31) (end 3.73 -1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp bd97ad98-9ec3-43d8-bab7-adb0ce23ade9))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp f033294d-5e33-4606-805f-7ca56f554253))
     (fp_line (start -1.19 1.31) (end 3.73 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 64361c3c-a894-4ee2-a1f4-5e5a9799c080))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d3c2d5c9-3c51-40ba-8a72-d96f7891eecf))
     (fp_line (start -1.07 -1.31) (end -1.07 -1.08)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 6b6663ee-0051-42da-bb35-2a66bdfcda3e))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a64b9bd4-322e-4e8a-9e4f-c89bb09cd5e8))
     (fp_line (start -1.07 1.08) (end -1.07 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp fd82e2fb-099d-4885-8cd0-713247225bf1))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 27191367-b9ff-4a23-9495-864e98e54cfb))
     (fp_line (start -0.95 -1.31) (end -0.95 -1.08)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b946eebd-e184-4dae-99c3-0839f64225a3))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 92d817c7-2ccc-48c2-8cdb-c343d5a05e1c))
     (fp_line (start -0.95 1.08) (end -0.95 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp efa528a2-b260-4b3d-b546-f157494e698a))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp dff70eda-c3e7-407e-9029-0dc774bc8e2f))
     (fp_line (start 3.73 -1.31) (end 3.73 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 970fd951-ea82-4ef2-840c-b12280c461a6))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 233202c8-8e45-4d12-9a38-69ed80b190d9))
     (fp_line (start -1.45 -1.6) (end -1.45 1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7564c643-d3b9-4cce-bc33-892459be127f))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 87c29c8d-adf3-4a6f-adc8-0ee8a123ff59))
     (fp_line (start -1.45 1.6) (end 4 1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9abc0b1e-a63d-41bd-8382-4913f01f3d18))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0e15c427-fdf1-48dc-982b-6ec56f853ccb))
     (fp_line (start 4 -1.6) (end -1.45 -1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fedb3cfe-ce77-4564-a8f5-a15e20917756))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f2573d09-6764-4bc6-94b0-242051acd779))
     (fp_line (start 4 1.6) (end 4 -1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 9225d037-4ea1-4285-a419-d3d6b307897b))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5ad9e5e6-dba7-4d52-94fc-77f9911e865f))
     (fp_line (start -1.13 -1.25) (end -1.13 1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0ad51661-949e-4478-85da-f718b0cfc1ec))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4bac01f2-1585-4524-a8cb-ed0903a19139))
     (fp_line (start -1.13 1.25) (end 3.67 1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 389af5be-d099-45ad-a634-6b946a49eb96))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d6f7c6d1-b430-45e4-8830-46ce1e2e276e))
     (fp_line (start 3.67 -1.25) (end -1.13 -1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bcd5ad9a-6755-4a8d-85f3-bde0a0dd57b3))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1b1143d5-ee85-432c-8ad7-98411cbddc08))
     (fp_line (start 3.67 1.25) (end 3.67 -1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 258f1689-fbe4-4818-bdde-8b4fe1af9c07))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3c4c3a5a-0e43-4a1b-9286-d0b8bb3fd3c4))
     (fp_circle (center 1.27 0) (end 2.27 0)
-      (stroke (width 0.1) (type solid)) (fill none) (layer "F.Fab") (tstamp 7c787617-f919-4bba-8689-0ca5bfc88f14))
+      (stroke (width 0.1) (type solid)) (fill none) (layer "F.Fab") (tstamp 9b1642d3-5b0d-4ba4-9618-70de739fddfb))
     (pad "1" thru_hole rect locked (at 0 0 180) (size 1.8 1.8) (drill 0.9) (layers "*.Cu" "*.Mask")
-      (net 103 "Net-(D63-Pad1)") (tstamp c34cd97d-fd3a-4780-83eb-2026b32cbdbe))
+      (net 89 "Net-(J1-Pin_24)") (pinfunction "K") (pintype "passive") (tstamp 3c8ec384-83fe-4072-b905-53fb853ae256))
     (pad "2" thru_hole circle locked (at 2.54 0 180) (size 1.8 1.8) (drill 0.9) (layers "*.Cu" "*.Mask")
-      (net 102 "Net-(D63-Pad2)") (tstamp b99cf0de-fa3e-4d8f-ad41-579baf7894a1))
+      (net 102 "Net-(LED2-A)") (pinfunction "A") (pintype "passive") (tstamp f2782bca-a2ea-45fc-ab67-63481295b1ee))
     (model "${KICAD6_3DMODEL_DIR}/LED_THT.3dshapes/LED_D2.0mm_W4.8mm_H2.5mm_FlatTop.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3799,6 +5674,35 @@
   (footprint "unikbd:Key_MX" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005ee8c71b)
     (at 282.88488 146.94916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cd64")
     (attr through_hole)
     (fp_text reference "SW43" (at -5.7912 -8.6106) (layer "F.SilkS")
@@ -3824,22 +5728,22 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp f12d9e46-66ec-476c-97f2-c2568085d442))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (thermal_bridge_angle 45)
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0.0508 0.0381) (end 2.6162 -0.9779) (width 0.2))
       ) (tstamp 93d6abfd-1f72-4f1d-935e-c2c0a49a8c3d))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (tstamp 973399b6-8d63-4664-b447-e22f5ba832f4))
+      (net 57 "/Col3") (pinfunction "1") (pintype "passive") (tstamp 973399b6-8d63-4664-b447-e22f5ba832f4))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 82 "Net-(D44-Pad2)") (thermal_bridge_angle 45)
+      (net 49 "Net-(D44-A)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 -0.0254) (end 0.9398 4.0132) (width 0.2))
         (gr_line (start 0.9398 4.0132) (end 3.8354 6.3373) (width 0.2))
       ) (tstamp d086eb08-1b20-45a6-9932-0fca4cf7a6e0))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 82 "Net-(D44-Pad2)") (tstamp f7cfd9a3-d55b-4887-8150-b34a257bf038))
+      (net 49 "Net-(D44-A)") (pinfunction "2") (pintype "passive") (tstamp f7cfd9a3-d55b-4887-8150-b34a257bf038))
     (model "${PROJECT_PATH}/cherry_mx.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3850,6 +5754,35 @@
   (footprint "unikbd:Key_MX_LED" locked (layer "F.Cu")
     (tstamp 00000000-0000-0000-0000-00005ee8c7a2)
     (at 292.40988 127.89916)
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "Common to all layouts")
+    (property "Component Type" "Switch")
+    (property "Component Value" "Key")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Cherry")
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html")
+    (property "Manufacturer PN" "MX1A-11NN")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "2")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "10 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" "NO")
+    (property "Temp (Operating)" "-40C/+170C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "Combined Cherry MX / Futaba 1U LED")
+    (property "ki_keywords" "switch futaba cherry mx 1U")
     (path "/00000000-0000-0000-0000-00005eea388a")
     (attr through_hole)
     (fp_text reference "SW32" (at 2.69494 -8.55218) (layer "F.SilkS")
@@ -3887,26 +5820,26 @@
     (pad "" np_thru_hole circle locked (at 5.08 0.1016) (size 1.7018 1.7018) (drill 1.7018) (layers "*.Cu" "*.Mask")
       (solder_mask_margin 0.0762) (tstamp 76bfb6cf-6820-4f6d-9a10-871059061760))
     (pad "1" thru_hole custom locked (at 0 -4.1021) (size 2.2352 2.2352) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 84 "Net-(J1-Pad10)") (thermal_bridge_angle 45)
+      (net 96 "Net-(J1-Pin_10)") (pinfunction "1") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 0) (end 2.54 -0.8763) (width 0.2))
       ) (tstamp 4c5fda4c-ad84-4fd6-9dad-8ee31dc06fbb))
     (pad "1" thru_hole circle locked (at 2.54 -4.9784) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 84 "Net-(J1-Pad10)") (tstamp 24ee4f0b-834d-4af1-8ff4-561350c19276))
+      (net 96 "Net-(J1-Pin_10)") (pinfunction "1") (pintype "passive") (tstamp 24ee4f0b-834d-4af1-8ff4-561350c19276))
     (pad "2" thru_hole custom locked (at -3.81 -2.4384) (size 2.2352 2.2352) (drill 1.5748) (layers "*.Cu" "*.Mask")
-      (net 85 "Net-(J1-Pad12)") (thermal_bridge_angle 45)
+      (net 95 "Net-(J1-Pin_12)") (pinfunction "2") (pintype "passive")
       (options (clearance outline) (anchor circle))
       (primitives
         (gr_line (start 0 1.1176) (end 1.016 4.8768) (width 0.2))
         (gr_line (start 1.016 4.8768) (end 3.81 6.3373) (width 0.2))
       ) (tstamp 522a805b-b6a4-482b-8870-3a4a6001ec8f))
     (pad "2" thru_hole circle locked (at 0 3.8989) (size 1.651 1.651) (drill 1.397) (layers "*.Cu" "*.Mask")
-      (net 85 "Net-(J1-Pad12)") (tstamp 97e51dab-484a-45d8-a726-4b5ed332ff0d))
+      (net 95 "Net-(J1-Pin_12)") (pinfunction "2") (pintype "passive") (tstamp 97e51dab-484a-45d8-a726-4b5ed332ff0d))
     (pad "3" thru_hole circle locked (at -1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers "*.Cu" "*.Mask")
-      (net 96 "Net-(D33-Pad2)") (tstamp 1873ef1b-8f22-4ddc-a295-bfc9e2deef5e))
+      (net 103 "Net-(LED3-A)") (pinfunction "3") (pintype "passive") (tstamp 1873ef1b-8f22-4ddc-a295-bfc9e2deef5e))
     (pad "4" thru_hole circle locked (at 1.27 5.1816) (size 1.27 1.27) (drill 1.0668) (layers "*.Cu" "*.Mask")
-      (net 97 "Net-(D33-Pad1)") (tstamp 8b8fb408-906b-440f-b69d-f719d5ea2b62))
+      (net 93 "Net-(J1-Pin_16)") (pinfunction "4") (pintype "passive") (tstamp 8b8fb408-906b-440f-b69d-f719d5ea2b62))
   )
 
   (footprint "unikbd:kbd_header_and_mounting_holes" (layer "F.Cu")
@@ -3914,6 +5847,35 @@
     (at 301.0408 163.87826 90)
     (descr "Through hole straight pin header, 2x20, 2.54mm pitch, double rows")
     (tags "Through hole pin header THT 2x20 2.54mm double row")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "")
+    (property "Class" "If applicable")
+    (property "Comment" "20x2 0.1\" socket header. Mount on bottom side")
+    (property "Component Type" "Connector")
+    (property "Component Value" "header")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "3M")
+    (property "Manufacturer Link" "https://www.3m.com/3M/en_US/p/d/b10419776/")
+    (property "Manufacturer PN" "929975-01-20-RK")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "40")
+    (property "Package Type" "")
+    (property "Package Variant" "")
+    (property "Power Rating" "If applicable")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://4donline.ihs.com/images/VipMasterIC/IC/IIIM/IIIM-E-A0004687669/IIIM-E-A0004699241-1.pdf?hkey=6D0214268300F1406B835FE51CB13195")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-40C/+105C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "40 pin female header, straight, TH, 0.254\"")
+    (property "ki_keywords" "connector header female socket")
     (path "/00000000-0000-0000-0000-00005d1e4169")
     (attr through_hole)
     (fp_text reference "J1" (at 1.2954 -2.5078 90) (layer "F.SilkS")
@@ -3967,85 +5929,85 @@
     (pad "" np_thru_hole circle (at 91.4924 -2.8688 90) (size 3.175 3.175) (drill 3.175) (layers "*.Cu" "*.Mask") (tstamp 53bb3344-c2df-4f37-bbea-974700f72480))
     (pad "" np_thru_hole circle (at 91.4924 50.4712 90) (size 3.175 3.175) (drill 3.175) (layers "*.Cu" "*.Mask") (tstamp 9f97409a-ea60-4152-a72c-1f83600bcb3e))
     (pad "1" thru_hole rect (at 2.5654 -0.1778 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 61 "/Col7") (tstamp b6593b35-e8ff-415f-a4e7-42d2b4b69f38))
+      (net 61 "/Col7") (pinfunction "Pin_1") (pintype "passive") (tstamp b6593b35-e8ff-415f-a4e7-42d2b4b69f38))
     (pad "2" thru_hole oval (at 0.0254 -0.1778 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 92 "Net-(J1-Pad2)") (tstamp e6ee1a76-6d4f-4814-92ae-9981b1ae64ee))
+      (net 100 "Net-(J1-Pin_2)") (pinfunction "Pin_2") (pintype "passive") (tstamp e6ee1a76-6d4f-4814-92ae-9981b1ae64ee))
     (pad "3" thru_hole oval (at 2.5654 2.3622 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 60 "/Col6") (tstamp 5658c007-df00-49ee-90cb-fe3d327b9a1c))
+      (net 60 "/Col6") (pinfunction "Pin_3") (pintype "passive") (tstamp 5658c007-df00-49ee-90cb-fe3d327b9a1c))
     (pad "4" thru_hole oval (at 0.0254 2.3622 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 93 "Net-(J1-Pad4)") (tstamp c54ef3ea-c058-45d2-98ff-08a82353d828))
+      (net 99 "Net-(J1-Pin_4)") (pinfunction "Pin_4") (pintype "passive") (tstamp c54ef3ea-c058-45d2-98ff-08a82353d828))
     (pad "5" thru_hole oval (at 2.5654 4.9022 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 59 "/Col5") (tstamp 336f8ea3-01c2-444d-a39c-f87e6166c07a))
+      (net 59 "/Col5") (pinfunction "Pin_5") (pintype "passive") (tstamp 336f8ea3-01c2-444d-a39c-f87e6166c07a))
     (pad "6" thru_hole oval (at 0.0254 4.9022 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 83 "Net-(J1-Pad6)") (tstamp 7079901f-6655-42d9-959a-f922253a2d97))
+      (net 98 "Net-(J1-Pin_6)") (pinfunction "Pin_6") (pintype "passive") (tstamp 7079901f-6655-42d9-959a-f922253a2d97))
     (pad "7" thru_hole oval (at 2.5654 7.4422 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 58 "/Col4") (tstamp d8a5a7f2-045b-45eb-aeda-d89f64c80ccb))
+      (net 58 "/Col4") (pinfunction "Pin_7") (pintype "passive") (tstamp d8a5a7f2-045b-45eb-aeda-d89f64c80ccb))
     (pad "8" thru_hole oval (at 0.0254 7.4422 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 101 "Net-(D62-Pad1)") (tstamp 8d06a051-2a06-4454-8e89-390aad5ec4fe))
+      (net 97 "Net-(J1-Pin_8)") (pinfunction "Pin_8") (pintype "passive") (tstamp 8d06a051-2a06-4454-8e89-390aad5ec4fe))
     (pad "9" thru_hole oval (at 2.5654 9.9822 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 57 "/Col3") (tstamp bb4c3e19-15fc-45a4-8cec-f32009a2dbc5))
+      (net 57 "/Col3") (pinfunction "Pin_9") (pintype "passive") (tstamp bb4c3e19-15fc-45a4-8cec-f32009a2dbc5))
     (pad "10" thru_hole oval (at 0.0254 9.9822 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 84 "Net-(J1-Pad10)") (tstamp 1141bd72-cfa3-4d29-b59e-846453033105))
+      (net 96 "Net-(J1-Pin_10)") (pinfunction "Pin_10") (pintype "passive") (tstamp 1141bd72-cfa3-4d29-b59e-846453033105))
     (pad "11" thru_hole oval (at 2.5654 12.5222 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 56 "/Col2") (tstamp 516531b6-2609-4d88-9636-01a5dc13a1d4))
+      (net 56 "/Col2") (pinfunction "Pin_11") (pintype "passive") (tstamp 516531b6-2609-4d88-9636-01a5dc13a1d4))
     (pad "12" thru_hole oval (at 0.0254 12.5222 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 85 "Net-(J1-Pad12)") (tstamp 2b9e22cd-741c-4878-9148-ce0a046a5900))
+      (net 95 "Net-(J1-Pin_12)") (pinfunction "Pin_12") (pintype "passive") (tstamp 2b9e22cd-741c-4878-9148-ce0a046a5900))
     (pad "13" thru_hole oval (at 2.5654 15.0622 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 55 "/Col1") (tstamp 32d624f0-83d6-41da-82a1-62934654104e))
+      (net 55 "/Col1") (pinfunction "Pin_13") (pintype "passive") (tstamp 32d624f0-83d6-41da-82a1-62934654104e))
     (pad "14" thru_hole oval (at 0.0254 15.0622 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 99 "Net-(J1-Pad14)") (tstamp cc3157f4-c385-4f33-a121-e1a000e4264b))
+      (net 94 "Net-(J1-Pin_14)") (pinfunction "Pin_14") (pintype "passive") (tstamp cc3157f4-c385-4f33-a121-e1a000e4264b))
     (pad "15" thru_hole oval (at 2.5654 17.6022 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 54 "/Col0") (tstamp 524dac1b-d1d0-4b81-97d5-9cc267ea4b57))
+      (net 54 "/Col0") (pinfunction "Pin_15") (pintype "passive") (tstamp 524dac1b-d1d0-4b81-97d5-9cc267ea4b57))
     (pad "16" thru_hole oval (at 0.0254 17.6022 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 97 "Net-(D33-Pad1)") (tstamp 71f48c39-cbdf-4cfb-a97e-8a780983a6b6))
+      (net 93 "Net-(J1-Pin_16)") (pinfunction "Pin_16") (pintype "passive") (tstamp 71f48c39-cbdf-4cfb-a97e-8a780983a6b6))
     (pad "17" thru_hole oval (at 2.5654 20.1422 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 33 "/Row7") (tstamp aaec7d1a-2177-44c0-91e4-819bb09c21eb))
+      (net 33 "/Row7") (pinfunction "Pin_17") (pintype "passive") (tstamp aaec7d1a-2177-44c0-91e4-819bb09c21eb))
     (pad "18" thru_hole oval (at 0.0254 20.1422 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 86 "Net-(J1-Pad18)") (tstamp 1cc101cf-5222-47dc-a537-11c10d94f61d))
+      (net 92 "Net-(J1-Pin_18)") (pinfunction "Pin_18") (pintype "passive") (tstamp 1cc101cf-5222-47dc-a537-11c10d94f61d))
     (pad "19" thru_hole oval (at 2.5654 22.6822 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 62 "/Row6") (tstamp d7bf554c-6801-45f2-942f-add93ca71c2b))
+      (net 62 "/Row6") (pinfunction "Pin_19") (pintype "passive") (tstamp d7bf554c-6801-45f2-942f-add93ca71c2b))
     (pad "20" thru_hole oval (at 0.0254 22.6822 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 87 "Net-(J1-Pad20)") (tstamp 1b44cfa1-b931-4a0a-9d88-091eb2a34abb))
+      (net 91 "Net-(J1-Pin_20)") (pinfunction "Pin_20") (pintype "passive") (tstamp 1b44cfa1-b931-4a0a-9d88-091eb2a34abb))
     (pad "21" thru_hole oval (at 2.5654 25.2222 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 32 "/Row5") (tstamp 38b57d8d-f934-4b2d-b5ae-60f0fe1bb46f))
+      (net 32 "/Row5") (pinfunction "Pin_21") (pintype "passive") (tstamp 38b57d8d-f934-4b2d-b5ae-60f0fe1bb46f))
     (pad "22" thru_hole oval (at 0.0254 25.2222 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 98 "Net-(J1-Pad22)") (tstamp a8dadb64-f988-4a5e-b530-e99179ca3325))
+      (net 90 "Net-(J1-Pin_22)") (pinfunction "Pin_22") (pintype "passive") (tstamp a8dadb64-f988-4a5e-b530-e99179ca3325))
     (pad "23" thru_hole oval (at 2.5654 27.7622 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 31 "/Row4") (tstamp d3d1cfca-a852-4ec6-b5c7-687abce527ad))
+      (net 31 "/Row4") (pinfunction "Pin_23") (pintype "passive") (tstamp d3d1cfca-a852-4ec6-b5c7-687abce527ad))
     (pad "24" thru_hole oval (at 0.0254 27.7622 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 103 "Net-(D63-Pad1)") (tstamp da1eb2a2-369b-47a0-a656-8d522020f8e5))
+      (net 89 "Net-(J1-Pin_24)") (pinfunction "Pin_24") (pintype "passive") (tstamp da1eb2a2-369b-47a0-a656-8d522020f8e5))
     (pad "25" thru_hole oval (at 2.5654 30.3022 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 1 "/Row3") (tstamp 6fa31853-786c-4104-8783-5edc5b5b1d8d))
+      (net 1 "/Row3") (pinfunction "Pin_25") (pintype "passive") (tstamp 6fa31853-786c-4104-8783-5edc5b5b1d8d))
     (pad "26" thru_hole oval (at 0.0254 30.3022 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 88 "Net-(J1-Pad26)") (tstamp 739d4cdf-a51c-43de-8737-e537b39783c7))
+      (net 88 "unconnected-(J1-Pin_26-Pad26)") (pinfunction "Pin_26") (pintype "passive+no_connect") (tstamp 739d4cdf-a51c-43de-8737-e537b39783c7))
     (pad "27" thru_hole oval (at 2.5654 32.8422 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 63 "/Row2") (tstamp 0947b71c-bdd2-48a0-9fe2-1f46f33c5306))
+      (net 63 "/Row2") (pinfunction "Pin_27") (pintype "passive") (tstamp 0947b71c-bdd2-48a0-9fe2-1f46f33c5306))
     (pad "28" thru_hole oval (at 0.0254 32.8422 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 89 "Net-(J1-Pad28)") (tstamp 0914c12a-b159-49d0-9c32-64d571ddd3e8))
+      (net 87 "unconnected-(J1-Pin_28-Pad28)") (pinfunction "Pin_28") (pintype "passive+no_connect") (tstamp 0914c12a-b159-49d0-9c32-64d571ddd3e8))
     (pad "29" thru_hole oval (at 2.5654 35.3822 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 3 "/Row1") (tstamp 389521e5-52db-49b4-9093-0c50377158e3))
+      (net 3 "/Row1") (pinfunction "Pin_29") (pintype "passive") (tstamp 389521e5-52db-49b4-9093-0c50377158e3))
     (pad "30" thru_hole oval (at 0.0254 35.3822 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 90 "Net-(J1-Pad30)") (tstamp 8bf58609-9d9b-47f2-9d6e-d9184f5d3103))
+      (net 86 "unconnected-(J1-Pin_30-Pad30)") (pinfunction "Pin_30") (pintype "passive+no_connect") (tstamp 8bf58609-9d9b-47f2-9d6e-d9184f5d3103))
     (pad "31" thru_hole oval (at 2.5654 37.9222 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 2 "/Row0") (tstamp e06e9ad8-243c-4a20-9892-8feba21e8bdf))
+      (net 2 "/Row0") (pinfunction "Pin_31") (pintype "passive") (tstamp e06e9ad8-243c-4a20-9892-8feba21e8bdf))
     (pad "32" thru_hole oval (at 0.0254 37.9222 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 91 "Net-(J1-Pad32)") (tstamp 3854d9dd-880e-4a37-91ab-d75a7247de6e))
+      (net 85 "unconnected-(J1-Pin_32-Pad32)") (pinfunction "Pin_32") (pintype "passive+no_connect") (tstamp 3854d9dd-880e-4a37-91ab-d75a7247de6e))
     (pad "33" thru_hole oval (at 2.5654 40.4622 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 71 "Net-(J1-Pad33)") (tstamp cedec2d7-3a89-43c3-84d7-96aac7d54344))
+      (net 84 "unconnected-(J1-Pin_33-Pad33)") (pinfunction "Pin_33") (pintype "passive+no_connect") (tstamp cedec2d7-3a89-43c3-84d7-96aac7d54344))
     (pad "34" thru_hole oval (at 0.0254 40.4622 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 70 "Net-(J1-Pad34)") (tstamp 98ac568e-7de6-4293-b8fa-843a8d79966b))
+      (net 83 "unconnected-(J1-Pin_34-Pad34)") (pinfunction "Pin_34") (pintype "passive+no_connect") (tstamp 98ac568e-7de6-4293-b8fa-843a8d79966b))
     (pad "35" thru_hole oval (at 2.5654 43.0022 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 69 "Net-(J1-Pad35)") (tstamp 024dca5a-190a-4dd2-9e26-c2594ae6af54))
+      (net 82 "unconnected-(J1-Pin_35-Pad35)") (pinfunction "Pin_35") (pintype "passive+no_connect") (tstamp 024dca5a-190a-4dd2-9e26-c2594ae6af54))
     (pad "36" thru_hole oval (at 0.0254 43.0022 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 68 "Net-(J1-Pad36)") (tstamp 8cc42177-c567-456e-888f-ad0421a16dee))
+      (net 81 "unconnected-(J1-Pin_36-Pad36)") (pinfunction "Pin_36") (pintype "passive+no_connect") (tstamp 8cc42177-c567-456e-888f-ad0421a16dee))
     (pad "37" thru_hole oval (at 2.5654 45.5422 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 67 "Net-(J1-Pad37)") (tstamp ec01a5de-92dc-4f12-bc35-1129d7eb39ef))
+      (net 80 "unconnected-(J1-Pin_37-Pad37)") (pinfunction "Pin_37") (pintype "passive+no_connect") (tstamp ec01a5de-92dc-4f12-bc35-1129d7eb39ef))
     (pad "38" thru_hole oval (at 0.0254 45.5422 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 66 "Net-(J1-Pad38)") (tstamp e9e72595-d103-4788-8dd3-6049d685e812))
+      (net 79 "unconnected-(J1-Pin_38-Pad38)") (pinfunction "Pin_38") (pintype "passive+no_connect") (tstamp e9e72595-d103-4788-8dd3-6049d685e812))
     (pad "39" thru_hole oval (at 2.5654 48.0822 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 65 "Net-(J1-Pad39)") (tstamp 41a6c0e4-27b7-4af1-accd-a72a0d3baac2))
+      (net 78 "unconnected-(J1-Pin_39-Pad39)") (pinfunction "Pin_39") (pintype "passive+no_connect") (tstamp 41a6c0e4-27b7-4af1-accd-a72a0d3baac2))
     (pad "40" thru_hole oval (at 0.0254 48.0822 90) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask")
-      (net 64 "Net-(J1-Pad40)") (tstamp 3f9c56b8-327b-4738-9f5a-d75f61aabbf9))
+      (net 77 "unconnected-(J1-Pin_40-Pad40)") (pinfunction "Pin_40") (pintype "passive+no_connect") (tstamp 3f9c56b8-327b-4738-9f5a-d75f61aabbf9))
     (model "${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_2x20_P2.54mm_Vertical.wrl"
       (offset (xyz 2.54 0 -1.8288))
       (scale (xyz 1 1 1))
@@ -4058,6 +6020,15 @@
     (at 312.98388 171.8183)
     (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
     (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
+    (property "Comment" "If R1-R3 installed, then DNP R4-R6")
+    (property "Fitted" "NO")
+    (property "Manufacturer" "Generic Through hole")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Substitution OK" " YES ")
+    (property "ki_description" "Resistor, US symbol")
+    (property "ki_keywords" "R res resistor")
+    (property "tolerance" "1%")
     (path "/00000000-0000-0000-0000-00005feab402")
     (attr through_hole)
     (fp_text reference "R2" (at 5.08 -2.37) (layer "F.SilkS")
@@ -4105,9 +6076,9 @@
     (fp_line (start 10.16 0) (end 8.23 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bec1318d-31ab-436b-b2be-96049e1d23be))
     (pad "1" thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 96 "Net-(D33-Pad2)") (tstamp 7995c8c7-10d2-46ee-8c1a-9749fc7fc610))
+      (net 103 "Net-(LED3-A)") (pintype "passive") (tstamp 7995c8c7-10d2-46ee-8c1a-9749fc7fc610))
     (pad "2" thru_hole oval (at 10.16 0) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 99 "Net-(J1-Pad14)") (tstamp 0324f996-2c21-46f0-82ed-0f1f23cea1ea))
+      (net 94 "Net-(J1-Pin_14)") (pintype "passive") (tstamp 0324f996-2c21-46f0-82ed-0f1f23cea1ea))
     (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4120,9 +6091,31 @@
     (at 367.3602 127.889 180)
     (descr "LED, diameter 5.0mm, 2 pins, http://cdn-reichelt.de/documents/datenblatt/A500/LL-504BC2E-009.pdf")
     (tags "LED diameter 5.0mm 2 pins")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Install into switch")
+    (property "Comment" "3mm Through-hole LED, 0.1\" spacing")
+    (property "Component Type" "LED")
+    (property "Component Value" "Amber")
+    (property "Fitted" "NO")
+    (property "Manufacturer" "Lumex")
+    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD")
+    (property "Manufacturer PN" "SSL-LX3044AD")
+    (property "Number of Pins" "2")
+    (property "Package" "T-1 (3mm)")
+    (property "Power Rating" "105mW")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-40C/+85C")
+    (property "Tracking" "No")
+    (property "ki_description" "5mm Red LED 2200 mcd")
+    (property "ki_keywords" "LED diode")
     (path "/00000000-0000-0000-0000-00005e12925f")
     (attr through_hole)
-    (fp_text reference "D33" (at 1.27 -3.96) (layer "F.SilkS")
+    (fp_text reference "LED4" (at 1.27 -3.96) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 59571747-8c47-40a1-b6ba-99b39e7761fb)
     )
@@ -4157,9 +6150,9 @@
     (fp_circle (center 1.27 0) (end 3.77 0)
       (stroke (width 0.1) (type solid)) (fill none) (layer "F.Fab") (tstamp b4b6b34a-117b-4504-a5fc-b6c709bd8b0d))
     (pad "1" thru_hole rect locked (at 0 0 180) (size 1.8 1.8) (drill 0.9) (layers "*.Cu" "*.Mask")
-      (net 97 "Net-(D33-Pad1)") (tstamp ec45b019-4ae8-49a4-9a30-9230c7538b28))
+      (net 93 "Net-(J1-Pin_16)") (pinfunction "K") (pintype "passive") (tstamp ec45b019-4ae8-49a4-9a30-9230c7538b28))
     (pad "2" thru_hole circle locked (at 2.54 0 180) (size 1.8 1.8) (drill 0.9) (layers "*.Cu" "*.Mask")
-      (net 96 "Net-(D33-Pad2)") (tstamp b7c5b63a-c918-4a1d-a7c9-e8eb91dd8081))
+      (net 103 "Net-(LED3-A)") (pinfunction "A") (pintype "passive") (tstamp b7c5b63a-c918-4a1d-a7c9-e8eb91dd8081))
     (model "${KICAD6_3DMODEL_DIR}/LED_THT.3dshapes/LED_D5.0mm.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4172,54 +6165,77 @@
     (at 336.677 118.35892 180)
     (descr "LED, Round, FlatTop,  Rectangular size 4.8x2.5mm^2 diameter 2.0mm, 2 pins, http://www.kingbright.com/attachments/file/psearch/000/00/00/L-13GD(Ver.11B).pdf")
     (tags "LED Round FlatTop  Rectangular size 4.8x2.5mm^2 diameter 2.0mm 2 pins")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Install into switch")
+    (property "Comment" "3mm Through-hole LED, 0.1\" spacing")
+    (property "Component Type" "LED")
+    (property "Component Value" "Amber")
+    (property "Fitted" "YES")
+    (property "Manufacturer" "Lumex")
+    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD")
+    (property "Manufacturer PN" "SSL-LX3044AD")
+    (property "Manufacturer Part Number" "SSL-LX3044AD")
+    (property "Number of Pins" "2")
+    (property "Package" "T-1 (3mm)")
+    (property "Power Rating" "105mW")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-40C/+85C")
+    (property "Tracking" "No")
+    (property "ki_description" "Light emitting diode")
+    (property "ki_keywords" "LED diode")
     (path "/00000000-0000-0000-0000-00005ee84b07")
     (attr through_hole)
-    (fp_text reference "D63" (at -2.921 0.09652) (layer "F.SilkS")
+    (fp_text reference "LED2" (at 1.27 -2.31 180) (layer "F.SilkS")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp b81dafe2-5229-4926-a7d8-a96c15936504)
+      (tstamp f257ad47-a3b3-409a-85ea-39ffabd54f59)
     )
-    (fp_text value "LED" (at 1.27 2.31) (layer "F.Fab")
+    (fp_text value "LED" (at 1.27 2.31 180) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
-      (tstamp 46e169d4-c9d6-42ea-902a-cd4c7da17522)
+      (tstamp b1e6bb08-436f-46a0-a506-6459da4f1d1d)
     )
     (fp_line (start -1.19 -1.31) (end -1.19 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0f76a73e-5738-4754-9a41-fde13c004eeb))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp e569c8f0-a519-41e4-9fa2-ea7d75fbf858))
     (fp_line (start -1.19 -1.31) (end 3.73 -1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 300b46b6-c30b-481b-a89c-ccbc3e199562))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp ae9b58ab-065e-4ac3-bada-70b3b84337fa))
     (fp_line (start -1.19 1.31) (end 3.73 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3b60bedd-6278-4f97-961f-d52be4661f7f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b63d74db-3205-4638-9278-bf233542dd12))
     (fp_line (start -1.07 -1.31) (end -1.07 -1.08)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 70db652c-9562-411b-a673-faf5750e06aa))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7e92f8b5-ae7a-4ce1-b8f3-57a8db5996b0))
     (fp_line (start -1.07 1.08) (end -1.07 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 20c86cca-862a-4b08-9c42-6febfc9b5f8f))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 027e07ee-fb1a-4e2f-8d5c-3797a247799c))
     (fp_line (start -0.95 -1.31) (end -0.95 -1.08)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp d382281d-985d-4dcf-9c56-0dbe2e87e0b9))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9e945959-90ac-4590-99ed-69ef33e6ba8f))
     (fp_line (start -0.95 1.08) (end -0.95 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0467fbe3-96d2-4f14-b2ef-8868e6ceb928))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 0ec9483f-3470-4982-8b23-89f7ad725aec))
     (fp_line (start 3.73 -1.31) (end 3.73 1.31)
-      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 78486c24-e606-48ef-ac25-8376a1e9e929))
+      (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4f332d27-0358-4947-ada6-2623c2a04f6c))
     (fp_line (start -1.45 -1.6) (end -1.45 1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 321ec31a-6464-488c-b9b9-e8edd401c4e7))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 10c7c610-1075-49dd-ba46-fc1cf9d02408))
     (fp_line (start -1.45 1.6) (end 4 1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a76f6a87-ff10-465b-8503-0e89e2bb264f))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 2f68ee38-9961-425a-b044-9036f4e605ec))
     (fp_line (start 4 -1.6) (end -1.45 -1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 71edc2a1-69d6-46d8-b338-3cd90188fea5))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 39910792-3bf4-40ac-b194-406e75d81368))
     (fp_line (start 4 1.6) (end 4 -1.6)
-      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp cb2ff006-1ad6-4da6-b3fc-bb7c2509032d))
+      (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c1379e5f-395a-4185-9f1f-f38b45869ce3))
     (fp_line (start -1.13 -1.25) (end -1.13 1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 47da56c6-bb05-4bbf-b8b8-ff4a27e39e5d))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f2825a28-0d31-40e7-be58-cdbf42258a4b))
     (fp_line (start -1.13 1.25) (end 3.67 1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 83d3a3d9-bee2-4555-9fd4-87367b2dd607))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6090d798-31c6-4905-ac0c-25cfe2bbdd8e))
     (fp_line (start 3.67 -1.25) (end -1.13 -1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e8185a3d-f99b-41ab-96d5-11754455e021))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 741aed4c-503a-45b4-b1f9-f146e9e21acf))
     (fp_line (start 3.67 1.25) (end 3.67 -1.25)
-      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp eb4ce2b2-44f9-45b0-b1a8-6eb7a3d10166))
+      (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8800cc8a-fe5c-40f7-9f75-1df65e9f0624))
     (fp_circle (center 1.27 0) (end 2.27 0)
-      (stroke (width 0.1) (type solid)) (fill none) (layer "F.Fab") (tstamp c4040a05-a8fb-4257-ae4c-8437f49f8d5e))
+      (stroke (width 0.1) (type solid)) (fill none) (layer "F.Fab") (tstamp 20681714-9039-4767-a7e9-069abfae25e6))
     (pad "1" thru_hole rect (at 0 0 180) (size 1.8 1.8) (drill 0.9) (layers "*.Cu" "*.Mask")
-      (net 103 "Net-(D63-Pad1)") (tstamp ed3f89f8-4871-4117-8db7-a98773db94e4))
+      (net 89 "Net-(J1-Pin_24)") (pinfunction "K") (pintype "passive") (tstamp d59ba342-3ceb-4b40-abe3-ea57def6453e))
     (pad "2" thru_hole circle (at 2.54 0 180) (size 1.8 1.8) (drill 0.9) (layers "*.Cu" "*.Mask")
-      (net 102 "Net-(D63-Pad2)") (tstamp df499864-d8a1-43e9-97d5-1b20e5629721))
+      (net 102 "Net-(LED2-A)") (pinfunction "A") (pintype "passive") (tstamp a447f644-45f1-4c8d-ac2d-164a62f7ff44))
     (model "${KICAD6_3DMODEL_DIR}/LED_THT.3dshapes/LED_D2.0mm_W4.8mm_H2.5mm_FlatTop.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4357,6 +6373,38 @@
     (at 363.58322 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cf15")
     (attr smd)
     (fp_text reference "D34" (at 10.12444 0.60198 270) (layer "B.SilkS")
@@ -4452,9 +6500,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1ff16b86-ae08-4bc4-9936-01cc09523920))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 63 "/Row2") (tstamp 7283d140-5d06-4f2a-8a0f-a23c1cc49a93))
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (tstamp 7283d140-5d06-4f2a-8a0f-a23c1cc49a93))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 63 "/Row2") (thermal_bridge_angle 45)
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -4467,7 +6515,7 @@
           (width 0.1) (fill yes))
       ) (tstamp bc01b833-f841-49f6-bcb5-52c4faf74fb7))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 29 "Net-(D34-Pad2)") (thermal_bridge_angle 45)
+      (net 39 "Net-(D34-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -4482,7 +6530,7 @@
           (width 0.1) (fill yes))
       ) (tstamp b391640f-bbd8-44c2-bc72-bb6b1ed83312))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 29 "Net-(D34-Pad2)") (tstamp 6e69a81d-6687-4d5e-a7a9-4cbdc32b7b15))
+      (net 39 "Net-(D34-A)") (pinfunction "A") (pintype "passive") (tstamp 6e69a81d-6687-4d5e-a7a9-4cbdc32b7b15))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 8ad5abbc-76e1-4696-a52d-95e119f60fd7))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -4501,6 +6549,38 @@
     (at 207.40878 165.88486 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cdaa")
     (attr smd)
     (fp_text reference "D47" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -4596,9 +6676,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 742aae77-686e-4ef1-8631-da96b0687d54))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 3 "/Row1") (tstamp 4ff3199c-f46f-4386-8aa9-8a8ecc68deec))
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (tstamp 4ff3199c-f46f-4386-8aa9-8a8ecc68deec))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 3 "/Row1") (thermal_bridge_angle 45)
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -4611,7 +6691,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 7a107ab7-ee7d-4ba1-9ba7-ce8bb280d47e))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 39 "Net-(D47-Pad2)") (thermal_bridge_angle 45)
+      (net 52 "Net-(D47-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -4626,7 +6706,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 8e95ccc6-fb3a-4c24-997c-f92d5116f9b0))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 39 "Net-(D47-Pad2)") (tstamp 67a78298-19b3-47a2-802e-adeda87554e7))
+      (net 52 "Net-(D47-A)") (pinfunction "A") (pintype "passive") (tstamp 67a78298-19b3-47a2-802e-adeda87554e7))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 8037893c-2091-4034-ab06-3b769c47a3a7))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -4645,6 +6725,38 @@
     (at 320.9798 127.63246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cb6f")
     (attr smd)
     (fp_text reference "D58" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -4740,9 +6852,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3d6786b1-b289-4847-8f44-c911c301eec8))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 2 "/Row0") (tstamp 0893bba7-c8bc-459e-85c1-7817994d31d4))
+      (net 2 "/Row0") (pinfunction "K") (pintype "passive") (tstamp 0893bba7-c8bc-459e-85c1-7817994d31d4))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 2 "/Row0") (thermal_bridge_angle 45)
+      (net 2 "/Row0") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -4755,7 +6867,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 4603d88e-0461-4383-98b4-2b45a15095ee))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 50 "Net-(D58-Pad2)") (thermal_bridge_angle 45)
+      (net 73 "Net-(D58-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -4770,7 +6882,7 @@
           (width 0.1) (fill yes))
       ) (tstamp d430dc98-ebaa-497a-9e8d-ed43c0168d8a))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 50 "Net-(D58-Pad2)") (tstamp 11529f90-9143-4109-9db5-4d37e57cf46b))
+      (net 73 "Net-(D58-A)") (pinfunction "A") (pintype "passive") (tstamp 11529f90-9143-4109-9db5-4d37e57cf46b))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 323af8a8-0092-4c8a-a95b-94bc49af1264))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -4789,6 +6901,38 @@
     (at 211.34578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf497")
     (attr smd)
     (fp_text reference "D8" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -4884,9 +7028,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7c3c1cf5-653e-47e6-9bba-55c0d52fa20a))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 33 "/Row7") (tstamp 1ddfd9a5-eb05-4c77-b5f4-03b7d86009df))
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (tstamp 1ddfd9a5-eb05-4c77-b5f4-03b7d86009df))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 33 "/Row7") (thermal_bridge_angle 45)
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -4899,7 +7043,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 2434251f-73fb-4500-a761-9f37ae771542))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 6 "Net-(D8-Pad2)") (thermal_bridge_angle 45)
+      (net 11 "Net-(D8-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -4914,7 +7058,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 45e4d25d-8979-4b52-8953-4702edcb2dee))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 6 "Net-(D8-Pad2)") (tstamp d382dc3d-2d2e-429f-9add-fc039f3e8259))
+      (net 11 "Net-(D8-A)") (pinfunction "A") (pintype "passive") (tstamp d382dc3d-2d2e-429f-9add-fc039f3e8259))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 4341ec72-ac97-41c8-92a9-f59b25e9420a))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -4933,6 +7077,38 @@
     (at 325.64578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf435")
     (attr smd)
     (fp_text reference "D11" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -5028,9 +7204,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6ec31b1d-1ef7-4901-ba4b-88aaa6ccd879))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 62 "/Row6") (tstamp c35c0569-67ba-449e-afa9-971e8847019b))
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (tstamp c35c0569-67ba-449e-afa9-971e8847019b))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 62 "/Row6") (thermal_bridge_angle 45)
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5043,7 +7219,7 @@
           (width 0.1) (fill yes))
       ) (tstamp cbc0d5db-8195-4898-a4d7-62138b25152b))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 9 "Net-(D11-Pad2)") (thermal_bridge_angle 45)
+      (net 14 "Net-(D11-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5058,7 +7234,7 @@
           (width 0.1) (fill yes))
       ) (tstamp cda58cb2-896c-44b9-9f77-c78c1f6d5cc8))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 9 "Net-(D11-Pad2)") (tstamp 1d884766-be9b-45f9-a776-9bbdbcbfac5c))
+      (net 14 "Net-(D11-A)") (pinfunction "A") (pintype "passive") (tstamp 1d884766-be9b-45f9-a776-9bbdbcbfac5c))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 6481293d-8aba-45b3-9812-26079c8bc5ff))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -5077,6 +7253,38 @@
     (at 192.29578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf4a5")
     (attr smd)
     (fp_text reference "D12" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -5172,9 +7380,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5c4da35d-0092-41b9-a976-9ffd911193c7))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 33 "/Row7") (tstamp 433b6f35-2f77-4a9b-8478-65877d8f1b18))
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (tstamp 433b6f35-2f77-4a9b-8478-65877d8f1b18))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 33 "/Row7") (thermal_bridge_angle 45)
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5187,7 +7395,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 7e35fb22-28f1-4343-a01b-df9c32f05c70))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 10 "Net-(D12-Pad2)") (thermal_bridge_angle 45)
+      (net 15 "Net-(D12-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5202,7 +7410,7 @@
           (width 0.1) (fill yes))
       ) (tstamp ec56dbd3-ec2f-4723-b734-d5967ef4bc81))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 10 "Net-(D12-Pad2)") (tstamp 407f507e-6f86-4437-b8b3-084605dcb22b))
+      (net 15 "Net-(D12-A)") (pinfunction "A") (pintype "passive") (tstamp 407f507e-6f86-4437-b8b3-084605dcb22b))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp cabedea9-adcb-4810-b474-679ee90cd8e7))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -5221,6 +7429,38 @@
     (at 306.59578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf43c")
     (attr smd)
     (fp_text reference "D15" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -5316,9 +7556,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0381e98f-af80-4dbb-ac99-b68d251b7deb))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 62 "/Row6") (tstamp 19941e54-16af-4a09-abcc-5c76bc0e5f98))
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (tstamp 19941e54-16af-4a09-abcc-5c76bc0e5f98))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 62 "/Row6") (thermal_bridge_angle 45)
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5331,7 +7571,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 680e3102-a128-41c3-8f0c-44ee2510bcba))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 13 "Net-(D15-Pad2)") (thermal_bridge_angle 45)
+      (net 18 "Net-(D15-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5346,7 +7586,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 8274f9f6-e222-4d27-b701-1c817d7f1f19))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 13 "Net-(D15-Pad2)") (tstamp 81348ce4-a239-4811-adea-24f663c377b6))
+      (net 18 "Net-(D15-A)") (pinfunction "A") (pintype "passive") (tstamp 81348ce4-a239-4811-adea-24f663c377b6))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 0e0d6484-8359-44ea-a92b-24e86c23362c))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -5365,6 +7605,38 @@
     (at 173.24578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf4ac")
     (attr smd)
     (fp_text reference "D16" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -5460,9 +7732,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c0ee7441-1e2b-4927-bd97-4e9db1e9c419))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 33 "/Row7") (tstamp 71e197bc-0c99-4fed-b5a2-f2bd778743fa))
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (tstamp 71e197bc-0c99-4fed-b5a2-f2bd778743fa))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 33 "/Row7") (thermal_bridge_angle 45)
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5475,7 +7747,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 5b6a2909-1c8d-41e2-a916-a1bb51fabbb5))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 14 "Net-(D16-Pad2)") (thermal_bridge_angle 45)
+      (net 19 "Net-(D16-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5490,7 +7762,7 @@
           (width 0.1) (fill yes))
       ) (tstamp d2240458-3473-4a5b-9366-560951c5e445))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 14 "Net-(D16-Pad2)") (tstamp 37181e75-a65f-48c8-b6ca-686d96b0d4b5))
+      (net 19 "Net-(D16-A)") (pinfunction "A") (pintype "passive") (tstamp 37181e75-a65f-48c8-b6ca-686d96b0d4b5))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp dd4b334c-6103-4169-9d9a-a5281289e657))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -5509,6 +7781,38 @@
     (at 287.54578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf443")
     (attr smd)
     (fp_text reference "D19" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -5604,9 +7908,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 63713ac5-d05c-4a95-82e7-061022576538))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 62 "/Row6") (tstamp 1333a81e-9869-4139-942f-cfe81da8eac1))
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (tstamp 1333a81e-9869-4139-942f-cfe81da8eac1))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 62 "/Row6") (thermal_bridge_angle 45)
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5619,7 +7923,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 4d3aee5a-848f-48a1-9de1-6488da680d45))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 16 "Net-(D19-Pad2)") (thermal_bridge_angle 45)
+      (net 22 "Net-(D19-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5634,7 +7938,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 546591b0-215f-4d97-9c71-c46d97f58fca))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 16 "Net-(D19-Pad2)") (tstamp ad23a7f5-aedb-4a78-9d58-f6790002c3e9))
+      (net 22 "Net-(D19-A)") (pinfunction "A") (pintype "passive") (tstamp ad23a7f5-aedb-4a78-9d58-f6790002c3e9))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 07d9ee53-5359-4652-9105-5275d9fe395f))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -5653,6 +7957,38 @@
     (at 154.19578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf4b3")
     (attr smd)
     (fp_text reference "D20" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -5748,9 +8084,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f7cc5752-c6ab-4974-9ba7-fba524c57fef))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 33 "/Row7") (tstamp e7aa86a3-0604-4c57-9994-8d04e76fdb15))
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (tstamp e7aa86a3-0604-4c57-9994-8d04e76fdb15))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 33 "/Row7") (thermal_bridge_angle 45)
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5763,7 +8099,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 0100eacc-19de-4374-a857-eb4d989221e0))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 17 "Net-(D20-Pad2)") (thermal_bridge_angle 45)
+      (net 23 "Net-(D20-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5778,7 +8114,7 @@
           (width 0.1) (fill yes))
       ) (tstamp ccabda72-c847-416a-8c98-8b2183cb4589))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 17 "Net-(D20-Pad2)") (tstamp d4eb2726-381b-4438-8411-c7b8c061e88a))
+      (net 23 "Net-(D20-A)") (pinfunction "A") (pintype "passive") (tstamp d4eb2726-381b-4438-8411-c7b8c061e88a))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 7458d1d0-62bf-4fba-b297-afded2f96c3e))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -5797,6 +8133,38 @@
     (at 135.14578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf4ba")
     (attr smd)
     (fp_text reference "D24" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -5892,9 +8260,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ef746ad9-5dff-499a-ac93-d4f196743267))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 33 "/Row7") (tstamp d310f896-dacf-43d8-8f39-035ff3476b27))
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (tstamp d310f896-dacf-43d8-8f39-035ff3476b27))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 33 "/Row7") (thermal_bridge_angle 45)
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5907,7 +8275,7 @@
           (width 0.1) (fill yes))
       ) (tstamp a7288991-7835-4862-bab7-60a2a5d2085f))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 20 "Net-(D24-Pad2)") (thermal_bridge_angle 45)
+      (net 27 "Net-(D24-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -5922,7 +8290,7 @@
           (width 0.1) (fill yes))
       ) (tstamp b3cbd21b-3177-41a0-8b70-b18ab0e4c1d8))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 20 "Net-(D24-Pad2)") (tstamp c488ce4c-223a-4212-91b0-9404fba13a91))
+      (net 27 "Net-(D24-A)") (pinfunction "A") (pintype "passive") (tstamp c488ce4c-223a-4212-91b0-9404fba13a91))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 45d0518d-1cfa-4fd9-ab10-35bf978d27bb))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -5941,6 +8309,38 @@
     (at 249.44578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf451")
     (attr smd)
     (fp_text reference "D27" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -6036,9 +8436,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4d9a5159-4fb2-40bb-b96c-69e4e8c1338c))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 62 "/Row6") (tstamp 31fa5183-4e72-4488-b689-d689563f60fb))
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (tstamp 31fa5183-4e72-4488-b689-d689563f60fb))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 62 "/Row6") (thermal_bridge_angle 45)
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6051,7 +8451,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 6dd91421-cbc0-4a42-85f4-f915233ea573))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 23 "Net-(D27-Pad2)") (thermal_bridge_angle 45)
+      (net 30 "Net-(D27-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6066,7 +8466,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 2d676a57-197b-4dac-b977-40cd024081c1))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 23 "Net-(D27-Pad2)") (tstamp e0fef9f1-861e-4ba5-af9a-40892044e244))
+      (net 30 "Net-(D27-A)") (pinfunction "A") (pintype "passive") (tstamp e0fef9f1-861e-4ba5-af9a-40892044e244))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp ca579ea5-7e2b-468e-b774-ba152ebab91b))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -6085,6 +8485,38 @@
     (at 116.09578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf4c1")
     (attr smd)
     (fp_text reference "D28" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -6180,9 +8612,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f03f4fd8-ef63-482f-9f97-cb324db032f8))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 33 "/Row7") (tstamp 6cea5252-fc0c-46e4-ac28-afb5f19996c3))
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (tstamp 6cea5252-fc0c-46e4-ac28-afb5f19996c3))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 33 "/Row7") (thermal_bridge_angle 45)
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6195,7 +8627,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 303d6c54-6ff6-494e-98b3-ce79b5949399))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 24 "Net-(D28-Pad2)") (thermal_bridge_angle 45)
+      (net 34 "Net-(D28-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6210,7 +8642,7 @@
           (width 0.1) (fill yes))
       ) (tstamp db5c3ee9-7bcf-49b0-aa6e-0509f1131310))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 24 "Net-(D28-Pad2)") (tstamp 218e0731-bdf9-4c77-a4a0-e0d65ddfd00d))
+      (net 34 "Net-(D28-A)") (pinfunction "A") (pintype "passive") (tstamp 218e0731-bdf9-4c77-a4a0-e0d65ddfd00d))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 4ed2e7f0-8020-4aa5-a714-8bb484b5add3))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -6229,6 +8661,38 @@
     (at 230.39578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf458")
     (attr smd)
     (fp_text reference "D31" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -6324,9 +8788,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3d966602-6694-4a6a-8771-c19f9d748045))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 62 "/Row6") (tstamp ecf22980-11a8-489e-b733-c4fb1df5c418))
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (tstamp ecf22980-11a8-489e-b733-c4fb1df5c418))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 62 "/Row6") (thermal_bridge_angle 45)
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6339,7 +8803,7 @@
           (width 0.1) (fill yes))
       ) (tstamp c3a21465-9559-4144-9dfb-2e85b8359770))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 27 "Net-(D31-Pad2)") (thermal_bridge_angle 45)
+      (net 37 "Net-(D31-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6354,7 +8818,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 1495aec6-81ee-4a66-b948-4d12fb946d27))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 27 "Net-(D31-Pad2)") (tstamp 84ecaf63-29d1-46b2-96a6-5320c5f2ee92))
+      (net 37 "Net-(D31-A)") (pinfunction "A") (pintype "passive") (tstamp 84ecaf63-29d1-46b2-96a6-5320c5f2ee92))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp a24b2ea2-968c-4ceb-97ff-11ad10350119))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -6373,6 +8837,38 @@
     (at 97.04578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf4c8")
     (attr smd)
     (fp_text reference "D32" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -6468,9 +8964,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bbdd3aa3-2673-4030-9c5c-f126c7cc26f4))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 33 "/Row7") (tstamp f76a3069-c52f-4c74-ac44-45a904fce437))
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (tstamp f76a3069-c52f-4c74-ac44-45a904fce437))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 33 "/Row7") (thermal_bridge_angle 45)
+      (net 33 "/Row7") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6483,7 +8979,7 @@
           (width 0.1) (fill yes))
       ) (tstamp aa4748d9-c95c-49a4-ab42-9e0345e61897))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 28 "Net-(D32-Pad2)") (thermal_bridge_angle 45)
+      (net 38 "Net-(D32-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6498,7 +8994,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 741dfc21-ee42-47a6-b1b7-27d2be6aaf1e))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 28 "Net-(D32-Pad2)") (tstamp b90ff81f-5ff8-4e01-9e8e-28e2356b1cd6))
+      (net 38 "Net-(D32-A)") (pinfunction "A") (pintype "passive") (tstamp b90ff81f-5ff8-4e01-9e8e-28e2356b1cd6))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 4afa1c84-35bc-40e6-939b-5af69e9e7cd6))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -6517,6 +9013,38 @@
     (at 323.04228 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf3cc")
     (attr smd)
     (fp_text reference "D14" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -6612,9 +9140,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5b394b1a-dfbe-4e31-b6e9-89dea0342b80))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 32 "/Row5") (tstamp fe5b9aa6-f3ce-4b1f-9580-4293b9453b33))
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (tstamp fe5b9aa6-f3ce-4b1f-9580-4293b9453b33))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 32 "/Row5") (thermal_bridge_angle 45)
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6627,7 +9155,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 5c0638f7-681c-4e9e-9f0d-922d24df2082))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 12 "Net-(D14-Pad2)") (thermal_bridge_angle 45)
+      (net 17 "Net-(D14-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6642,7 +9170,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 302dcaf0-1f1a-4cb6-95ad-efe01f9ffa0f))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 12 "Net-(D14-Pad2)") (tstamp de3ae97b-0726-4180-ac32-9835fb3d30ea))
+      (net 17 "Net-(D14-A)") (pinfunction "A") (pintype "passive") (tstamp de3ae97b-0726-4180-ac32-9835fb3d30ea))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp ba9dce19-b714-43b1-8c41-7d9fc173a5b5))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -6661,6 +9189,38 @@
     (at 359.0798 127.63246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf3b7")
     (attr smd)
     (fp_text reference "D6" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -6756,9 +9316,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp be1e0c37-334d-4f56-ad0b-f771c90b45e7))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 32 "/Row5") (tstamp 30c306d0-e676-4ef3-a4ac-e86c4c770151))
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (tstamp 30c306d0-e676-4ef3-a4ac-e86c4c770151))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 32 "/Row5") (thermal_bridge_angle 45)
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6771,7 +9331,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 68f23a85-a67d-4b84-9e68-1c3f2c24339e))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 75 "Net-(D6-Pad2)") (thermal_bridge_angle 45)
+      (net 9 "Net-(D6-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6786,7 +9346,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 64559c8e-e231-42e0-bb02-eecadcb6e977))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 75 "Net-(D6-Pad2)") (tstamp 4eabcdbf-5a4d-46c4-967c-9d9099aa8123))
+      (net 9 "Net-(D6-A)") (pinfunction "A") (pintype "passive") (tstamp 4eabcdbf-5a4d-46c4-967c-9d9099aa8123))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 01bca2e8-2d16-43a2-beae-c1bd9df69c3a))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -6805,6 +9365,38 @@
     (at 277.74138 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cd8e")
     (attr smd)
     (fp_text reference "D37" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -6900,9 +9492,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7a946757-ce73-401c-b98f-32f8a23f0fef))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 3 "/Row1") (tstamp 7c834dd4-1849-44c5-89e3-8aeb5d55d4f7))
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (tstamp 7c834dd4-1849-44c5-89e3-8aeb5d55d4f7))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 3 "/Row1") (thermal_bridge_angle 45)
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6915,7 +9507,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 2fd6c81e-b9fc-47d0-8d4a-dd526c752616))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 78 "Net-(D37-Pad2)") (thermal_bridge_angle 45)
+      (net 42 "Net-(D37-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6930,7 +9522,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 7092932d-6e85-46fc-ad17-3e314b4650fe))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 78 "Net-(D37-Pad2)") (tstamp bbcf88fe-f7cb-45c4-96d6-f274edbbf478))
+      (net 42 "Net-(D37-A)") (pinfunction "A") (pintype "passive") (tstamp bbcf88fe-f7cb-45c4-96d6-f274edbbf478))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp f3a2562e-0e85-43f2-9874-c20cd9b3a04b))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -6949,6 +9541,38 @@
     (at 87.24138 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cb1b")
     (attr smd)
     (fp_text reference "D50" (at 0.254 2.22758 90) (layer "B.SilkS")
@@ -7044,9 +9668,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0f30e17b-5b43-45ce-a450-4257370db84b))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 2 "/Row0") (tstamp db26e99b-a250-4585-a764-491001ac794a))
+      (net 2 "/Row0") (pinfunction "K") (pintype "passive") (tstamp db26e99b-a250-4585-a764-491001ac794a))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 2 "/Row0") (thermal_bridge_angle 45)
+      (net 2 "/Row0") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7059,7 +9683,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 20091b39-71bd-46de-9bc0-bfa9fc2b9b05))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 42 "Net-(D50-Pad2)") (thermal_bridge_angle 45)
+      (net 65 "Net-(D50-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7074,7 +9698,7 @@
           (width 0.1) (fill yes))
       ) (tstamp bda9dd67-0f2f-4851-ad57-5d138a0595ce))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 42 "Net-(D50-Pad2)") (tstamp 0c4672d8-cd7f-47a4-b5b2-c8eca23e7af7))
+      (net 65 "Net-(D50-A)") (pinfunction "A") (pintype "passive") (tstamp 0c4672d8-cd7f-47a4-b5b2-c8eca23e7af7))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp ef25b79a-e480-4df3-aa51-f79329199cdd))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -7093,6 +9717,38 @@
     (at 220.59138 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf355")
     (attr smd)
     (fp_text reference "D9" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -7188,9 +9844,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dc24a90c-2da2-490a-838a-93729ba6ab94))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 31 "/Row4") (tstamp 8b33944e-a850-408b-a282-856b3341de9a))
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (tstamp 8b33944e-a850-408b-a282-856b3341de9a))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 31 "/Row4") (thermal_bridge_angle 45)
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7203,7 +9859,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 06dd977f-3913-4ec3-adf6-d969ccda2c25))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 7 "Net-(D9-Pad2)") (thermal_bridge_angle 45)
+      (net 12 "Net-(D9-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7218,7 +9874,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 9c3c4433-37a7-4669-99d6-8e86e57c1ff3))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 7 "Net-(D9-Pad2)") (tstamp 68a62ea2-8364-4c74-b172-a76241525a6e))
+      (net 12 "Net-(D9-A)") (pinfunction "A") (pintype "passive") (tstamp 68a62ea2-8364-4c74-b172-a76241525a6e))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 3fe54cb9-1858-4327-8d8e-289cba31eb02))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -7237,6 +9893,38 @@
     (at 268.49578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf44a")
     (attr smd)
     (fp_text reference "D23" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -7332,9 +10020,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1d690e44-1bca-407a-9390-d63578289f03))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 62 "/Row6") (tstamp 8d53f800-43b4-47b9-81ca-cd05ab2b8130))
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (tstamp 8d53f800-43b4-47b9-81ca-cd05ab2b8130))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 62 "/Row6") (thermal_bridge_angle 45)
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7347,7 +10035,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 38196c06-81a3-4725-9d82-e8191278c784))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 19 "Net-(D23-Pad2)") (thermal_bridge_angle 45)
+      (net 26 "Net-(D23-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7362,7 +10050,7 @@
           (width 0.1) (fill yes))
       ) (tstamp f75257b2-7aee-4637-b93e-2a20ff360a31))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 19 "Net-(D23-Pad2)") (tstamp 717dcdfd-1279-48b1-9258-226211b5875b))
+      (net 26 "Net-(D23-A)") (pinfunction "A") (pintype "passive") (tstamp 717dcdfd-1279-48b1-9258-226211b5875b))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 0ecf1d0b-6826-4673-8f00-0b79e16742ec))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -7381,6 +10069,38 @@
     (at 125.34138 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf378")
     (attr smd)
     (fp_text reference "D29" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -7476,9 +10196,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b7b6c6fb-7a80-4b23-895e-71e8d023de0d))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 31 "/Row4") (tstamp 4af10ef4-9d13-41d2-8bd3-cc69ca61a013))
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (tstamp 4af10ef4-9d13-41d2-8bd3-cc69ca61a013))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 31 "/Row4") (thermal_bridge_angle 45)
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7491,7 +10211,7 @@
           (width 0.1) (fill yes))
       ) (tstamp bc1a7cb3-f922-4aac-bb15-4fdcf1b7e06f))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 25 "Net-(D29-Pad2)") (thermal_bridge_angle 45)
+      (net 35 "Net-(D29-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7506,7 +10226,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 1464c56d-1e03-4f65-a363-d11ac5b2ed00))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 25 "Net-(D29-Pad2)") (tstamp cec2afcd-7aec-41a7-b1e7-36b7bb56b042))
+      (net 35 "Net-(D29-A)") (pinfunction "A") (pintype "passive") (tstamp cec2afcd-7aec-41a7-b1e7-36b7bb56b042))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp f4b4efd6-217c-463c-8944-7bc0b1e1a8c0))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -7525,6 +10245,38 @@
     (at 106.29138 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cdbf")
     (attr smd)
     (fp_text reference "D59" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -7620,9 +10372,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8a7afe78-9aef-4a87-bbb2-9a2a5ebc2253))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 3 "/Row1") (tstamp 87ae53e7-b8cf-4f28-b2fe-ab948b7ad8b6))
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (tstamp 87ae53e7-b8cf-4f28-b2fe-ab948b7ad8b6))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 3 "/Row1") (thermal_bridge_angle 45)
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7635,7 +10387,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 6b7937e6-1392-44e0-aa03-3c1a777582cd))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 51 "Net-(D59-Pad2)") (thermal_bridge_angle 45)
+      (net 74 "Net-(D59-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7650,7 +10402,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 5f2f139e-a76b-4c92-84d9-e7161b5af8f0))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 51 "Net-(D59-Pad2)") (tstamp f0ae79a1-8dbf-43af-a520-f2631ca6b995))
+      (net 74 "Net-(D59-A)") (pinfunction "A") (pintype "passive") (tstamp f0ae79a1-8dbf-43af-a520-f2631ca6b995))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 260235a7-f263-45b7-b0ad-f76455c870a0))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -7669,6 +10421,38 @@
     (at 182.49138 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf363")
     (attr smd)
     (fp_text reference "D17" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -7764,9 +10548,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d2fa5e2f-6f17-49a8-8a66-d27bade75f52))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 31 "/Row4") (tstamp 32a49a04-841e-4094-9047-1fbaa0fae060))
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (tstamp 32a49a04-841e-4094-9047-1fbaa0fae060))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 31 "/Row4") (thermal_bridge_angle 45)
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7779,7 +10563,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 06b64545-9c5f-4a66-b750-7b7df1977fac))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 76 "Net-(D17-Pad2)") (thermal_bridge_angle 45)
+      (net 20 "Net-(D17-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7794,7 +10578,7 @@
           (width 0.1) (fill yes))
       ) (tstamp e029b7d8-e18b-4e6b-a3ea-d3183818522d))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 76 "Net-(D17-Pad2)") (tstamp 4b7c9fe9-da92-431a-988d-b10c8c56054b))
+      (net 20 "Net-(D17-A)") (pinfunction "A") (pintype "passive") (tstamp 4b7c9fe9-da92-431a-988d-b10c8c56054b))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 6c2ad88b-0129-45d7-a348-3c0057924fd5))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -7813,6 +10597,38 @@
     (at 144.39138 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf371")
     (attr smd)
     (fp_text reference "D25" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -7908,9 +10724,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b36752ad-cc4a-4ce6-b13a-3216080caea9))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 31 "/Row4") (tstamp 26996e26-120a-40c1-bd91-3f14670a4e0d))
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (tstamp 26996e26-120a-40c1-bd91-3f14670a4e0d))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 31 "/Row4") (thermal_bridge_angle 45)
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7923,7 +10739,7 @@
           (width 0.1) (fill yes))
       ) (tstamp d5ecbdb2-9b3a-4015-8159-a90d23103d17))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 21 "Net-(D25-Pad2)") (thermal_bridge_angle 45)
+      (net 28 "Net-(D25-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -7938,7 +10754,7 @@
           (width 0.1) (fill yes))
       ) (tstamp bb9d95b8-e7d9-43bb-8da8-228580706f3e))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 21 "Net-(D25-Pad2)") (tstamp 3d4d758b-5505-4009-91a0-1c3dcd04e8ec))
+      (net 28 "Net-(D25-A)") (pinfunction "A") (pintype "passive") (tstamp 3d4d758b-5505-4009-91a0-1c3dcd04e8ec))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 2b1f1332-a6ee-42ea-b0e0-fd61f6211f74))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -7957,6 +10773,38 @@
     (at 163.44138 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf36a")
     (attr smd)
     (fp_text reference "D21" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -8052,9 +10900,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8cd388ff-aafb-4429-aef6-88366f337016))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 31 "/Row4") (tstamp d5e3b1f3-a00c-4b6f-ba4c-98b2464ff338))
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (tstamp d5e3b1f3-a00c-4b6f-ba4c-98b2464ff338))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 31 "/Row4") (thermal_bridge_angle 45)
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8067,7 +10915,7 @@
           (width 0.1) (fill yes))
       ) (tstamp e039c48f-d0b2-4056-9df1-880f271d5b82))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 77 "Net-(D21-Pad2)") (thermal_bridge_angle 45)
+      (net 24 "Net-(D21-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8082,7 +10930,7 @@
           (width 0.1) (fill yes))
       ) (tstamp a9dd36e7-2bfc-48c3-878e-b020167050ca))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 77 "Net-(D21-Pad2)") (tstamp 5889f05f-865c-42bb-a59c-592c771add2a))
+      (net 24 "Net-(D21-A)") (pinfunction "A") (pintype "passive") (tstamp 5889f05f-865c-42bb-a59c-592c771add2a))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 3b141b48-9698-417d-8ddd-c39bddde34cc))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -8101,6 +10949,38 @@
     (at 201.54138 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf35c")
     (attr smd)
     (fp_text reference "D13" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -8196,9 +11076,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 04e37246-bbc6-4b84-b2ad-91d18b78ff7f))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 31 "/Row4") (tstamp 64587d0d-b99a-42b7-a7a8-55a2ba4e537e))
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (tstamp 64587d0d-b99a-42b7-a7a8-55a2ba4e537e))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 31 "/Row4") (thermal_bridge_angle 45)
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8211,7 +11091,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 8e701866-d451-4f3c-942f-1f571f883fab))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 11 "Net-(D13-Pad2)") (thermal_bridge_angle 45)
+      (net 16 "Net-(D13-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8226,7 +11106,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 41fc45dc-c285-4e74-90ee-d2321f1b4b5f))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 11 "Net-(D13-Pad2)") (tstamp 23641c1e-c5c1-488a-b6b7-8ae5b07e2f1e))
+      (net 16 "Net-(D13-A)") (pinfunction "A") (pintype "passive") (tstamp 23641c1e-c5c1-488a-b6b7-8ae5b07e2f1e))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 7b7f0d07-f9d9-4c9b-a4ba-1b73773fe8ea))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -8245,6 +11125,38 @@
     (at 239.64138 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf347")
     (attr smd)
     (fp_text reference "D5" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -8340,9 +11252,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 41dd918f-759c-4c9a-9ded-570e9673f82d))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 31 "/Row4") (tstamp 7592d4af-a793-4b74-92c1-4d5902d7fb37))
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (tstamp 7592d4af-a793-4b74-92c1-4d5902d7fb37))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 31 "/Row4") (thermal_bridge_angle 45)
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8355,7 +11267,7 @@
           (width 0.1) (fill yes))
       ) (tstamp f9cd85b8-ae3a-4950-baec-54dc5654622b))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 4 "Net-(D5-Pad2)") (thermal_bridge_angle 45)
+      (net 8 "Net-(D5-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8370,7 +11282,7 @@
           (width 0.1) (fill yes))
       ) (tstamp ab5d46f1-22d5-4976-947d-e162e00afc82))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 4 "Net-(D5-Pad2)") (tstamp 1500b64f-6682-4df0-aba8-fa2f0b1ff7ba))
+      (net 8 "Net-(D5-A)") (pinfunction "A") (pintype "passive") (tstamp 1500b64f-6682-4df0-aba8-fa2f0b1ff7ba))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp c5903346-0230-481a-9556-70f53975b30b))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -8389,6 +11301,38 @@
     (at 244.56898 127.63246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d0de")
     (attr smd)
     (fp_text reference "D39" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -8484,9 +11428,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0ff206b6-3545-4330-aa8c-b1389f20d921))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 1 "/Row3") (tstamp d3834dec-3632-4a2e-b18d-d24522caf0e8))
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (tstamp d3834dec-3632-4a2e-b18d-d24522caf0e8))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 1 "/Row3") (thermal_bridge_angle 45)
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8499,7 +11443,7 @@
           (width 0.1) (fill yes))
       ) (tstamp ded70ee8-97d6-481a-985c-4cb1f7495a6f))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 80 "Net-(D39-Pad2)") (thermal_bridge_angle 45)
+      (net 44 "Net-(D39-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8514,7 +11458,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 924d0ee5-2fff-4d3a-b1c4-3248c4576b35))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 80 "Net-(D39-Pad2)") (tstamp d6377f9c-651c-4bd9-ae02-905fa0e8a7b9))
+      (net 44 "Net-(D39-A)") (pinfunction "A") (pintype "passive") (tstamp d6377f9c-651c-4bd9-ae02-905fa0e8a7b9))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 8d902ace-6f60-4c66-b034-30104cb7eef3))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -8533,6 +11477,38 @@
     (at 225.51898 127.63246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d0ec")
     (attr smd)
     (fp_text reference "D43" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -8628,9 +11604,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f66bd5b3-e501-487d-be58-c51aa624ca01))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 1 "/Row3") (tstamp 61862b36-5c60-4f99-b240-e12e967715c8))
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (tstamp 61862b36-5c60-4f99-b240-e12e967715c8))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 1 "/Row3") (thermal_bridge_angle 45)
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8643,7 +11619,7 @@
           (width 0.1) (fill yes))
       ) (tstamp e41ae525-5a1e-4108-807c-d12bd9dcc673))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 36 "Net-(D43-Pad2)") (thermal_bridge_angle 45)
+      (net 48 "Net-(D43-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8658,7 +11634,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 8a8e6c62-5d3a-436d-9fe1-2460542f2e17))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 36 "Net-(D43-Pad2)") (tstamp 7ed25796-4619-4d34-8ea6-c43d2032b982))
+      (net 48 "Net-(D43-A)") (pinfunction "A") (pintype "passive") (tstamp 7ed25796-4619-4d34-8ea6-c43d2032b982))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 78354304-e042-4660-8927-982f2e222988))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -8677,6 +11653,38 @@
     (at 149.31898 127.63246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d108")
     (attr smd)
     (fp_text reference "D57" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -8772,9 +11780,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 51f3c472-47ae-4300-b0fc-4ba1b7a35fb2))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 1 "/Row3") (tstamp 40c0fbe6-aff3-427f-ac96-696b6759015b))
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (tstamp 40c0fbe6-aff3-427f-ac96-696b6759015b))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 1 "/Row3") (thermal_bridge_angle 45)
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8787,7 +11795,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 710c9adc-fe6f-4c7d-8a07-6d669d3a32ca))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 49 "Net-(D57-Pad2)") (thermal_bridge_angle 45)
+      (net 72 "Net-(D57-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8802,7 +11810,7 @@
           (width 0.1) (fill yes))
       ) (tstamp bcce5a0c-66a4-42b2-8524-c96f37e51d38))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 49 "Net-(D57-Pad2)") (tstamp 1090782e-f536-4059-86df-7c8fb516acd5))
+      (net 72 "Net-(D57-A)") (pinfunction "A") (pintype "passive") (tstamp 1090782e-f536-4059-86df-7c8fb516acd5))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 7820b8a6-c3fd-4b94-a279-4872e8f9a8c5))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -8821,6 +11829,38 @@
     (at 111.21898 127.63246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cdb8")
     (attr smd)
     (fp_text reference "D55" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -8916,9 +11956,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c11ff9cc-e937-4351-b5dc-44c63b5c0b54))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 3 "/Row1") (tstamp 44e0be7c-28a8-4a0e-b64e-921f281b2f65))
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (tstamp 44e0be7c-28a8-4a0e-b64e-921f281b2f65))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 3 "/Row1") (thermal_bridge_angle 45)
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8931,7 +11971,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 35c54147-56cc-4981-bd42-a06bd9c18259))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 47 "Net-(D55-Pad2)") (thermal_bridge_angle 45)
+      (net 70 "Net-(D55-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8946,7 +11986,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 3f37e4a8-f1b0-42c2-aeb8-2418e7d00e65))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 47 "Net-(D55-Pad2)") (tstamp a675c6f3-acbd-46fc-b84e-2343e1ec0934))
+      (net 70 "Net-(D55-A)") (pinfunction "A") (pintype "passive") (tstamp a675c6f3-acbd-46fc-b84e-2343e1ec0934))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 58f76ec1-4391-45b2-8fd2-ebd94bed01cd))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -8965,6 +12005,38 @@
     (at 168.36898 127.63246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d101")
     (attr smd)
     (fp_text reference "D53" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -9060,9 +12132,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 50d9fa86-7975-4aff-9329-b5d0891fc1f6))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 1 "/Row3") (tstamp 5497742d-28ff-4c89-9aba-c88273b22613))
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (tstamp 5497742d-28ff-4c89-9aba-c88273b22613))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 1 "/Row3") (thermal_bridge_angle 45)
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9075,7 +12147,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 2b65f9fe-e270-49fa-ae8d-e146c01b7fa0))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 45 "Net-(D53-Pad2)") (thermal_bridge_angle 45)
+      (net 68 "Net-(D53-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9090,7 +12162,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 4f14f48b-084b-4ebe-b123-272d8b8e74b1))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 45 "Net-(D53-Pad2)") (tstamp 5f0e86e8-8b4d-4720-a488-32d33d4ab660))
+      (net 68 "Net-(D53-A)") (pinfunction "A") (pintype "passive") (tstamp 5f0e86e8-8b4d-4720-a488-32d33d4ab660))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 107e031d-4a4a-4914-9b4b-91913f935bb2))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -9109,6 +12181,38 @@
     (at 92.16898 127.63246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cb46")
     (attr smd)
     (fp_text reference "D54" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -9204,9 +12308,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5a31a386-d08b-458d-b933-e9bfbb3095fa))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 2 "/Row0") (tstamp cd9ffd05-8170-429a-a881-405f73edee8c))
+      (net 2 "/Row0") (pinfunction "K") (pintype "passive") (tstamp cd9ffd05-8170-429a-a881-405f73edee8c))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 2 "/Row0") (thermal_bridge_angle 45)
+      (net 2 "/Row0") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9219,7 +12323,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 982b97a9-2e24-43ce-99bf-989115908ec9))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 46 "Net-(D54-Pad2)") (thermal_bridge_angle 45)
+      (net 69 "Net-(D54-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9234,7 +12338,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 808a330f-ed32-46c5-bd8c-f56815b99cc8))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 46 "Net-(D54-Pad2)") (tstamp 0eb4ac77-dc63-488b-a502-4ddbf82442fa))
+      (net 69 "Net-(D54-A)") (pinfunction "A") (pintype "passive") (tstamp 0eb4ac77-dc63-488b-a502-4ddbf82442fa))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp b5ccfdbb-b810-45b4-a6c3-57ce1a5bbde9))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -9253,6 +12357,38 @@
     (at 187.41898 127.63246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d0fa")
     (attr smd)
     (fp_text reference "D49" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -9348,9 +12484,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4b2baee7-b551-4110-b6e5-aaecb0318f91))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 1 "/Row3") (tstamp 984fc819-e0e1-41d0-a450-eacdc449c26a))
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (tstamp 984fc819-e0e1-41d0-a450-eacdc449c26a))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 1 "/Row3") (thermal_bridge_angle 45)
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9363,7 +12499,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 9c7a9af7-ace5-4908-b49c-0b94056ee587))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 41 "Net-(D49-Pad2)") (thermal_bridge_angle 45)
+      (net 64 "Net-(D49-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9378,7 +12514,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 8bafa885-d73b-4de9-9852-55e29c09a9e5))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 41 "Net-(D49-Pad2)") (tstamp 6338c1ad-4615-48a6-b0e8-18a8f9d0aacd))
+      (net 64 "Net-(D49-A)") (pinfunction "A") (pintype "passive") (tstamp 6338c1ad-4615-48a6-b0e8-18a8f9d0aacd))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 5c16cdd7-6264-46ab-8737-1bbf68eb80c0))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -9397,6 +12533,38 @@
     (at 206.46898 127.63246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d0f3")
     (attr smd)
     (fp_text reference "D46" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -9492,9 +12660,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5e65c1c8-b4fe-41ed-bfa8-939d68ba1e1a))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 1 "/Row3") (tstamp 66f9f8cb-56a8-48eb-b2d6-a68043d1db43))
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (tstamp 66f9f8cb-56a8-48eb-b2d6-a68043d1db43))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 1 "/Row3") (thermal_bridge_angle 45)
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9507,7 +12675,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 090f225e-6ee6-4a31-9fa5-a81dd5423978))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 38 "Net-(D46-Pad2)") (thermal_bridge_angle 45)
+      (net 51 "Net-(D46-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9522,7 +12690,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 7898d96c-79e2-4c7c-aa68-b56267a1e0a8))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 38 "Net-(D46-Pad2)") (tstamp 4603048b-c558-40ad-8c01-a71ed74dbe0d))
+      (net 51 "Net-(D46-A)") (pinfunction "A") (pintype "passive") (tstamp 4603048b-c558-40ad-8c01-a71ed74dbe0d))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp f4426462-396d-4fe2-bb4f-a8d91359a5b6))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -9541,6 +12709,38 @@
     (at 130.26898 127.63246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6d10f")
     (attr smd)
     (fp_text reference "D61" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -9636,9 +12836,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d1f8a5c3-675e-41de-a4ba-e437078c7fd5))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 1 "/Row3") (tstamp e721962d-9715-423d-8372-31b45e36b727))
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (tstamp e721962d-9715-423d-8372-31b45e36b727))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 1 "/Row3") (thermal_bridge_angle 45)
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9651,7 +12851,7 @@
           (width 0.1) (fill yes))
       ) (tstamp f38b00a7-922c-4746-bc17-e86274ff6211))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 53 "Net-(D61-Pad2)") (thermal_bridge_angle 45)
+      (net 76 "Net-(D61-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9666,7 +12866,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 10172134-be02-488d-b10f-99a947afa2cc))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 53 "Net-(D61-Pad2)") (tstamp 2b4c5746-8203-4a09-9f36-786168b5c530))
+      (net 76 "Net-(D61-A)") (pinfunction "A") (pintype "passive") (tstamp 2b4c5746-8203-4a09-9f36-786168b5c530))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 6425ac8c-425c-4978-95a3-c14e7ae111c8))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -9685,6 +12885,38 @@
     (at 263.61898 127.63246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf3e1")
     (attr smd)
     (fp_text reference "D26" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -9780,9 +13012,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 20cac021-d80b-4d8c-b9c7-9c3d484ef33b))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 32 "/Row5") (tstamp c7b58fb0-6a4b-495b-900a-19fc30038511))
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (tstamp c7b58fb0-6a4b-495b-900a-19fc30038511))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 32 "/Row5") (thermal_bridge_angle 45)
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9795,7 +13027,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 1493ed4e-2f7b-47f1-a0e4-ee61824d4dce))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 22 "Net-(D26-Pad2)") (thermal_bridge_angle 45)
+      (net 29 "Net-(D26-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9810,7 +13042,7 @@
           (width 0.1) (fill yes))
       ) (tstamp f471f460-cd45-4c49-a697-04d767d324f2))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 22 "Net-(D26-Pad2)") (tstamp e26f7f8d-eaaa-4814-9f57-29061e49f9db))
+      (net 29 "Net-(D26-A)") (pinfunction "A") (pintype "passive") (tstamp e26f7f8d-eaaa-4814-9f57-29061e49f9db))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 2cb80c66-71be-4cd1-ba50-f4f96a5b04ed))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -9829,6 +13061,38 @@
     (at 344.69578 89.7001 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf427")
     (attr smd)
     (fp_text reference "D7" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -9924,9 +13188,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 24bec5c5-c7f4-4f23-b768-f35fd050c8c4))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 62 "/Row6") (tstamp b4b35419-b3af-40bf-839d-759c2857f2fb))
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (tstamp b4b35419-b3af-40bf-839d-759c2857f2fb))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 62 "/Row6") (thermal_bridge_angle 45)
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9939,7 +13203,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 2e5934b0-c101-4f14-a5f9-4566d06f80be))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 5 "Net-(D7-Pad2)") (thermal_bridge_angle 45)
+      (net 10 "Net-(D7-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -9954,7 +13218,7 @@
           (width 0.1) (fill yes))
       ) (tstamp dfdcf33a-ea13-4863-8ff0-4ea157c0082f))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 5 "Net-(D7-Pad2)") (tstamp 1b2ac617-e577-483e-8079-25a937d2f8b1))
+      (net 10 "Net-(D7-A)") (pinfunction "A") (pintype "passive") (tstamp 1b2ac617-e577-483e-8079-25a937d2f8b1))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 28ad809a-df32-450b-a99e-5053b4c22bee))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -9973,6 +13237,38 @@
     (at 344.53322 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005dfe048b")
     (attr smd)
     (fp_text reference "D10" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -10068,9 +13364,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp df35d87e-ba11-4144-9da4-c4e1506f988c))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 32 "/Row5") (tstamp 85e944d5-5f52-48a6-bd37-3abb8e4b2bfa))
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (tstamp 85e944d5-5f52-48a6-bd37-3abb8e4b2bfa))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 32 "/Row5") (thermal_bridge_angle 45)
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -10083,7 +13379,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 9a7a6366-c1cc-4b77-86f4-03da4ab532a5))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 8 "Net-(D10-Pad2)") (thermal_bridge_angle 45)
+      (net 13 "Net-(D10-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -10098,7 +13394,7 @@
           (width 0.1) (fill yes))
       ) (tstamp c4e619c3-b71a-4643-86c9-c128e977be5c))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 8 "Net-(D10-Pad2)") (tstamp 5e225b95-6636-4efe-b6a9-6307d86383ad))
+      (net 13 "Net-(D10-A)") (pinfunction "A") (pintype "passive") (tstamp 5e225b95-6636-4efe-b6a9-6307d86383ad))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 567ebe87-5148-4011-a1fe-ec7914b6a8c9))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -10117,6 +13413,38 @@
     (at 258.69138 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf3da")
     (attr smd)
     (fp_text reference "D22" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -10212,9 +13540,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b0fa9a6b-c7e0-49cf-8be9-9230aa98e850))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 32 "/Row5") (tstamp d7a28458-64ac-4a30-99d0-f13868594d18))
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (tstamp d7a28458-64ac-4a30-99d0-f13868594d18))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 32 "/Row5") (thermal_bridge_angle 45)
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -10227,7 +13555,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 6d5943a9-b9bf-4f5e-85a6-cf23e2633d74))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 18 "Net-(D22-Pad2)") (thermal_bridge_angle 45)
+      (net 25 "Net-(D22-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -10242,7 +13570,7 @@
           (width 0.1) (fill yes))
       ) (tstamp bc39e4ef-f690-4122-aa0d-baca0d626f7c))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 18 "Net-(D22-Pad2)") (tstamp 972a0fc8-bc00-4e58-83eb-3be137430aec))
+      (net 25 "Net-(D22-A)") (pinfunction "A") (pintype "passive") (tstamp 972a0fc8-bc00-4e58-83eb-3be137430aec))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 0ad9fb92-190b-431e-b40f-b545094ac787))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -10261,6 +13589,38 @@
     (at 77.99578 89.53246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005e0ac93e")
     (attr smd)
     (fp_text reference "D1" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -10356,9 +13716,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ffdd8f3a-8c96-4a0a-abc7-7fc725d0e86a))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 2 "/Row0") (tstamp 31e3350a-62d4-42fe-ab66-23a3b3547610))
+      (net 2 "/Row0") (pinfunction "K") (pintype "passive") (tstamp 31e3350a-62d4-42fe-ab66-23a3b3547610))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 2 "/Row0") (thermal_bridge_angle 45)
+      (net 2 "/Row0") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -10371,7 +13731,7 @@
           (width 0.1) (fill yes))
       ) (tstamp ebcfe288-2b9f-47e5-9613-e82f7b56236a))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 94 "Net-(D1-Pad2)") (thermal_bridge_angle 45)
+      (net 4 "Net-(D1-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -10386,7 +13746,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 53f1914b-1650-4a5c-b4a4-4f4df40450bc))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 94 "Net-(D1-Pad2)") (tstamp 209f8e9d-7d55-4ece-8b87-88ff512b22e9))
+      (net 4 "Net-(D1-A)") (pinfunction "A") (pintype "passive") (tstamp 209f8e9d-7d55-4ece-8b87-88ff512b22e9))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp d695c2d4-ee45-4a81-bb9a-6ef469fcd2e9))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -10405,6 +13765,38 @@
     (at 370.3193 136.7536 180)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005e423217")
     (attr smd)
     (fp_text reference "D35" (at 0.2794 -2.286) (layer "B.SilkS")
@@ -10500,9 +13892,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1d926705-d45c-4921-aa0c-ea5cc1e811e6))
     (pad "1" thru_hole rect locked (at -3.556 0 180) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 1 "/Row3") (tstamp 33a8d93d-5cdd-4da2-89db-252f6572b6f0))
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (tstamp 33a8d93d-5cdd-4da2-89db-252f6572b6f0))
     (pad "1" smd custom locked (at -1 0) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 1 "/Row3") (thermal_bridge_angle 45)
+      (net 1 "/Row3") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -10515,7 +13907,7 @@
           (width 0.1) (fill yes))
       ) (tstamp e8d65b60-4bd5-4f69-a1b4-280c7c428b1e))
     (pad "2" smd custom locked (at 1 -0.95) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 95 "Net-(D35-Pad2)") (thermal_bridge_angle 45)
+      (net 40 "Net-(D35-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -10530,7 +13922,7 @@
           (width 0.1) (fill yes))
       ) (tstamp fbd4429e-150a-43aa-be35-3336f9cbf9a7))
     (pad "2" thru_hole oval locked (at 4.064 0 180) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 95 "Net-(D35-Pad2)") (tstamp b132b952-000b-4d56-b6fe-5a2ba16e9c60))
+      (net 40 "Net-(D35-A)") (pinfunction "A") (pintype "passive") (tstamp b132b952-000b-4d56-b6fe-5a2ba16e9c60))
     (pad "NC" smd rect locked (at 1 0.95) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 785960ef-7093-43d2-b41d-b1dc6015a919))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -10549,6 +13941,38 @@
     (at 299.19168 108.58246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005ee923fb")
     (attr smd)
     (fp_text reference "D18" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -10644,9 +14068,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c8499b85-9d66-4a18-8d26-44e5f4f3a2d3))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 32 "/Row5") (tstamp f6324896-7367-4835-a398-ed0d24917096))
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (tstamp f6324896-7367-4835-a398-ed0d24917096))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 32 "/Row5") (thermal_bridge_angle 45)
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -10659,7 +14083,7 @@
           (width 0.1) (fill yes))
       ) (tstamp e474c14b-4833-46f3-8ce2-f34c0c9dffb8))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 15 "Net-(D18-Pad2)") (thermal_bridge_angle 45)
+      (net 21 "Net-(D18-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -10674,7 +14098,7 @@
           (width 0.1) (fill yes))
       ) (tstamp fb789381-5cf8-40ba-846b-732882ad0ebe))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 15 "Net-(D18-Pad2)") (tstamp 2b647c72-52bf-489b-9007-2920988c9a6e))
+      (net 21 "Net-(D18-A)") (pinfunction "A") (pintype "passive") (tstamp 2b647c72-52bf-489b-9007-2920988c9a6e))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 524eae11-35db-450b-8798-d4f906ffab40))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -10693,6 +14117,18 @@
     (at 67.0814 157.226 -90)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor")
+    (property "Comment" "If R4-R6 installed, then DNP R1-R3")
+    (property "Fitted" "YES")
+    (property "LCSC" "C144560")
+    (property "Manufacturer" "Panasonic")
+    (property "Manufacturer PN" "ERJ-3EKF3300V")
+    (property "Manufacturer Part Number" "ERJ-3EKF3300V")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Substitution OK" " YES ")
+    (property "ki_description" "Resistor, US symbol")
+    (property "ki_keywords" "R res resistor")
+    (property "tolerance" "1%")
     (path "/00000000-0000-0000-0000-00005f08c312")
     (attr smd)
     (fp_text reference "R4" (at 0.2794 1.8796 180) (layer "B.SilkS")
@@ -10728,9 +14164,9 @@
     (fp_line (start 1 0.625) (end 1 -0.625)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp cb2f0d29-281e-49d1-839a-4d57598574a6))
     (pad "1" smd roundrect (at -0.9125 0 270) (size 1.025 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.243902)
-      (net 100 "Net-(D62-Pad2)") (tstamp 23bd5adb-dcf8-4d29-9800-df14bf1297d3))
+      (net 101 "Net-(LED1-A)") (pintype "passive") (tstamp 23bd5adb-dcf8-4d29-9800-df14bf1297d3))
     (pad "2" smd roundrect (at 0.9125 0 270) (size 1.025 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.243902)
-      (net 83 "Net-(J1-Pad6)") (tstamp d607ca91-c355-4d4c-9d16-66e7d31c954f))
+      (net 98 "Net-(J1-Pin_6)") (pintype "passive") (tstamp d607ca91-c355-4d4c-9d16-66e7d31c954f))
     (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10743,6 +14179,18 @@
     (at 318.1096 171.8564)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor")
+    (property "Comment" "If R4-R6 installed, then DNP R1-R3")
+    (property "Fitted" "YES")
+    (property "LCSC" "C144560")
+    (property "Manufacturer" "Panasonic")
+    (property "Manufacturer PN" "ERJ-3EKF3300V")
+    (property "Manufacturer Part Number" "ERJ-3EKF3300V")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Substitution OK" " YES ")
+    (property "ki_description" "Resistor, US symbol")
+    (property "ki_keywords" "R res resistor")
+    (property "tolerance" "1%")
     (path "/00000000-0000-0000-0000-00005f082e1f")
     (attr smd)
     (fp_text reference "R5" (at -0.0762 -1.6256) (layer "B.SilkS")
@@ -10778,9 +14226,9 @@
     (fp_line (start 1 0.625) (end 1 -0.625)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp db9cabc2-27ef-4d87-b3aa-9971ba0bf7ae))
     (pad "1" smd roundrect (at -0.9125 0) (size 1.025 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.243902)
-      (net 96 "Net-(D33-Pad2)") (tstamp 39089c99-c0e7-4aef-9bfa-bafdb0a6ff8c))
+      (net 103 "Net-(LED3-A)") (pintype "passive") (tstamp 39089c99-c0e7-4aef-9bfa-bafdb0a6ff8c))
     (pad "2" smd roundrect (at 0.9125 0) (size 1.025 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.243902)
-      (net 99 "Net-(J1-Pad14)") (tstamp d1b9d5fd-a9e9-492a-8cde-e18d70028e0e))
+      (net 94 "Net-(J1-Pin_14)") (pintype "passive") (tstamp d1b9d5fd-a9e9-492a-8cde-e18d70028e0e))
     (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10793,6 +14241,18 @@
     (at 367.9444 111.9886 90)
     (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "resistor")
+    (property "Comment" "If R4-R6 installed, then DNP R1-R3")
+    (property "Fitted" "YES")
+    (property "LCSC" "C144560")
+    (property "Manufacturer" "Panasonic")
+    (property "Manufacturer PN" "ERJ-3EKF3300V")
+    (property "Manufacturer Part Number" "ERJ-3EKF3300V")
+    (property "Sheetfile" "kbd-classic.kicad_sch")
+    (property "Sheetname" "")
+    (property "Substitution OK" " YES ")
+    (property "ki_description" "Resistor, US symbol")
+    (property "ki_keywords" "R res resistor")
+    (property "tolerance" "1%")
     (path "/00000000-0000-0000-0000-00005f057bc7")
     (attr smd)
     (fp_text reference "R6" (at 2.413 0.1016 180) (layer "B.SilkS")
@@ -10828,9 +14288,9 @@
     (fp_line (start 1 0.625) (end 1 -0.625)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp da5a9228-11d9-4879-a002-2503e351542e))
     (pad "1" smd roundrect (at -0.9125 0 90) (size 1.025 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.243902)
-      (net 98 "Net-(J1-Pad22)") (tstamp b608877d-0524-47c7-919c-ccf563414a5c))
+      (net 90 "Net-(J1-Pin_22)") (pintype "passive") (tstamp b608877d-0524-47c7-919c-ccf563414a5c))
     (pad "2" smd roundrect (at 0.9125 0 90) (size 1.025 1.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.243902)
-      (net 102 "Net-(D63-Pad2)") (tstamp 99f09569-d27c-42d3-a2f4-93997fea35f3))
+      (net 102 "Net-(LED2-A)") (pintype "passive") (tstamp 99f09569-d27c-42d3-a2f4-93997fea35f3))
     (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10843,6 +14303,38 @@
     (at 318.44488 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6c862")
     (attr smd)
     (fp_text reference "D36" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -10938,9 +14430,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 740964aa-e8f7-41fe-9a25-7c98317498a3))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 2 "/Row0") (tstamp c77f0aca-7a1b-4393-b446-65dcd2dfbeeb))
+      (net 2 "/Row0") (pinfunction "K") (pintype "passive") (tstamp c77f0aca-7a1b-4393-b446-65dcd2dfbeeb))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 2 "/Row0") (thermal_bridge_angle 45)
+      (net 2 "/Row0") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -10953,7 +14445,7 @@
           (width 0.1) (fill yes))
       ) (tstamp a12faac1-fa45-460b-8f9c-2db5b77c68f6))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 30 "Net-(D36-Pad2)") (thermal_bridge_angle 45)
+      (net 41 "Net-(D36-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -10968,7 +14460,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 3025d3ba-1c92-4a98-8e85-a09bb376923a))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 30 "Net-(D36-Pad2)") (tstamp 677dfbaf-5883-40f9-b881-02e601af24fb))
+      (net 41 "Net-(D36-A)") (pinfunction "A") (pintype "passive") (tstamp 677dfbaf-5883-40f9-b881-02e601af24fb))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp d9a98738-0197-4d1e-ac7a-c7da595c3928))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -10987,6 +14479,38 @@
     (at 273.14398 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf3e8")
     (attr smd)
     (fp_text reference "D30" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -11082,9 +14606,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b1e39143-6ab0-4272-b1e5-eac2c31ada4c))
     (pad "1" thru_hole rect (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 32 "/Row5") (tstamp ba615e26-ee3c-4cf4-b5e5-6787e79ebba2))
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (tstamp ba615e26-ee3c-4cf4-b5e5-6787e79ebba2))
     (pad "1" smd custom (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 32 "/Row5") (thermal_bridge_angle 45)
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11097,7 +14621,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 7885503e-1658-409f-b4ec-33265da6eecd))
     (pad "2" smd custom (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 26 "Net-(D30-Pad2)") (thermal_bridge_angle 45)
+      (net 36 "Net-(D30-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11112,7 +14636,7 @@
           (width 0.1) (fill yes))
       ) (tstamp aa870662-9aad-4da5-867d-1634520b0384))
     (pad "2" thru_hole oval (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 26 "Net-(D30-Pad2)") (tstamp f3eec1c2-3ba5-4f0a-9c4b-f32a6dda89c8))
+      (net 36 "Net-(D30-A)") (pinfunction "A") (pintype "passive") (tstamp f3eec1c2-3ba5-4f0a-9c4b-f32a6dda89c8))
     (pad "NC" smd rect (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 1b5013e4-5a08-449d-b9bc-ea434ade059a))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -11131,6 +14655,38 @@
     (at 254.09398 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cf0e")
     (attr smd)
     (fp_text reference "D38" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -11226,9 +14782,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8aee1ed1-f0fb-4f2e-9717-78f0ee9fc6d6))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 63 "/Row2") (tstamp 7e45d259-7150-4c68-a711-2c64e2255a79))
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (tstamp 7e45d259-7150-4c68-a711-2c64e2255a79))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 63 "/Row2") (thermal_bridge_angle 45)
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11241,7 +14797,7 @@
           (width 0.1) (fill yes))
       ) (tstamp c3831b3c-9c18-4049-874d-147a668922c7))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 79 "Net-(D38-Pad2)") (thermal_bridge_angle 45)
+      (net 43 "Net-(D38-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11256,7 +14812,7 @@
           (width 0.1) (fill yes))
       ) (tstamp adfec4ed-76d7-4464-ae7a-8523ec67c948))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 79 "Net-(D38-Pad2)") (tstamp 3d69b192-1839-48fb-aef6-b66e2bda6249))
+      (net 43 "Net-(D38-A)") (pinfunction "A") (pintype "passive") (tstamp 3d69b192-1839-48fb-aef6-b66e2bda6249))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 7fa5057e-6a62-4d69-989c-92a49f3d9bb3))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -11275,6 +14831,38 @@
     (at 99.29368 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6ca8e")
     (attr smd)
     (fp_text reference "D40" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -11370,9 +14958,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 02875aa4-f2b7-4825-8942-a560e6996884))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 2 "/Row0") (tstamp 082a028c-a6aa-48cf-8889-0a65a3a7eeba))
+      (net 2 "/Row0") (pinfunction "K") (pintype "passive") (tstamp 082a028c-a6aa-48cf-8889-0a65a3a7eeba))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 2 "/Row0") (thermal_bridge_angle 45)
+      (net 2 "/Row0") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11385,7 +14973,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 7ec6c75c-aca3-415d-a226-dc44003ddc22))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 81 "Net-(D40-Pad2)") (thermal_bridge_angle 45)
+      (net 45 "Net-(D40-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11400,7 +14988,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 3798064f-52af-4c9e-9711-ca73b1834206))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 81 "Net-(D40-Pad2)") (tstamp 476926f5-7521-45aa-b0fd-d4fad92fc8e9))
+      (net 45 "Net-(D40-A)") (pinfunction "A") (pintype "passive") (tstamp 476926f5-7521-45aa-b0fd-d4fad92fc8e9))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp f64719cb-91f9-4fc0-8855-11694f2ece51))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -11419,6 +15007,38 @@
     (at 294.59428 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cda3")
     (attr smd)
     (fp_text reference "D44" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -11514,9 +15134,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 867360ff-263c-4199-be6d-3954fed52b23))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 3 "/Row1") (tstamp 3a285115-0f22-4cad-b83e-5d6080e522d6))
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (tstamp 3a285115-0f22-4cad-b83e-5d6080e522d6))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 3 "/Row1") (thermal_bridge_angle 45)
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11529,7 +15149,7 @@
           (width 0.1) (fill yes))
       ) (tstamp c61eba9c-1188-4adb-bcad-b7748afc7db8))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 82 "Net-(D44-Pad2)") (thermal_bridge_angle 45)
+      (net 49 "Net-(D44-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11544,7 +15164,7 @@
           (width 0.1) (fill yes))
       ) (tstamp e912ac4c-13d0-40fb-8229-b37da4caa266))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 82 "Net-(D44-Pad2)") (tstamp bc31e6c2-8a6e-48f5-a679-5141af0f7526))
+      (net 49 "Net-(D44-A)") (pinfunction "A") (pintype "passive") (tstamp bc31e6c2-8a6e-48f5-a679-5141af0f7526))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 59fcec44-96d3-48d0-8628-33f81706dfd0))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -11563,6 +15183,38 @@
     (at 235.04398 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cf1c")
     (attr smd)
     (fp_text reference "D42" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -11658,9 +15310,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4a3fcc4d-812d-46d7-af54-0d2240f47976))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 63 "/Row2") (tstamp 6e87dcfc-f677-42ad-ab78-5ebf117eb2e9))
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (tstamp 6e87dcfc-f677-42ad-ab78-5ebf117eb2e9))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 63 "/Row2") (thermal_bridge_angle 45)
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11673,7 +15325,7 @@
           (width 0.1) (fill yes))
       ) (tstamp e9ce80da-1c12-4a30-9ddd-968cd526610a))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 35 "Net-(D42-Pad2)") (thermal_bridge_angle 45)
+      (net 47 "Net-(D42-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11688,7 +15340,7 @@
           (width 0.1) (fill yes))
       ) (tstamp f67fc978-b08c-4ee1-99dd-106d16cd064b))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 35 "Net-(D42-Pad2)") (tstamp f488f123-c5b9-4678-81ee-0d698c80d0d0))
+      (net 47 "Net-(D42-A)") (pinfunction "A") (pintype "passive") (tstamp f488f123-c5b9-4678-81ee-0d698c80d0d0))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 8c70b08d-614b-454f-8232-b5bc0d7f1d1e))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -11707,6 +15359,38 @@
     (at 215.99398 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cf23")
     (attr smd)
     (fp_text reference "D45" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -11802,9 +15486,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ba7f843c-f0c3-4351-ac5a-09266ae121f9))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 63 "/Row2") (tstamp 7db3f426-4b7e-4ef7-a889-ea172258f64e))
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (tstamp 7db3f426-4b7e-4ef7-a889-ea172258f64e))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 63 "/Row2") (thermal_bridge_angle 45)
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11817,7 +15501,7 @@
           (width 0.1) (fill yes))
       ) (tstamp ed7a489f-284e-44a0-b779-b2490d115e9f))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 37 "Net-(D45-Pad2)") (thermal_bridge_angle 45)
+      (net 50 "Net-(D45-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11832,7 +15516,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 1fcf97bc-9ae0-4aed-87ec-d58d223aeb7a))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 37 "Net-(D45-Pad2)") (tstamp 19f00080-4889-49fb-98b3-e4070856ba40))
+      (net 50 "Net-(D45-A)") (pinfunction "A") (pintype "passive") (tstamp 19f00080-4889-49fb-98b3-e4070856ba40))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 57ccb7a2-2950-4e8c-8a11-a773d1129edf))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -11851,6 +15535,38 @@
     (at 196.94398 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cf2a")
     (attr smd)
     (fp_text reference "D48" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -11946,9 +15662,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b8662b95-6556-4aeb-8713-92620c7e5cfa))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 63 "/Row2") (tstamp aabce9f8-5c67-4e74-945b-185fa97fc0d2))
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (tstamp aabce9f8-5c67-4e74-945b-185fa97fc0d2))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 63 "/Row2") (thermal_bridge_angle 45)
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11961,7 +15677,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 3e89f88c-22af-4935-bef6-38aa742ce1db))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 40 "Net-(D48-Pad2)") (thermal_bridge_angle 45)
+      (net 53 "Net-(D48-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -11976,7 +15692,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 7e85bfce-84ce-4bfe-97a2-5899ffc34aeb))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 40 "Net-(D48-Pad2)") (tstamp 3b48edab-18d9-4925-a139-b80eed05c6b3))
+      (net 53 "Net-(D48-A)") (pinfunction "A") (pintype "passive") (tstamp 3b48edab-18d9-4925-a139-b80eed05c6b3))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 809ab6dd-98ed-46bb-8d46-8ef350ed555b))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -11995,6 +15711,38 @@
     (at 120.74398 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cdb1")
     (attr smd)
     (fp_text reference "D51" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -12090,9 +15838,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3f6ce6da-1f49-473e-807f-50318351e0da))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 3 "/Row1") (tstamp ab8928fa-1e62-459c-91da-34e1b50bc6fe))
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (tstamp ab8928fa-1e62-459c-91da-34e1b50bc6fe))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 3 "/Row1") (thermal_bridge_angle 45)
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12105,7 +15853,7 @@
           (width 0.1) (fill yes))
       ) (tstamp ddb36344-b4cb-4613-8353-428b7fce0059))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 43 "Net-(D51-Pad2)") (thermal_bridge_angle 45)
+      (net 66 "Net-(D51-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12120,7 +15868,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 2dd0e066-9d3a-4ff5-8664-5d412416311f))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 43 "Net-(D51-Pad2)") (tstamp 12aed46d-27c7-4e24-89ec-8741a0c629fe))
+      (net 66 "Net-(D51-A)") (pinfunction "A") (pintype "passive") (tstamp 12aed46d-27c7-4e24-89ec-8741a0c629fe))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp d8855518-7a80-4c10-914b-cf569edd1d66))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -12139,6 +15887,38 @@
     (at 177.89398 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cf31")
     (attr smd)
     (fp_text reference "D52" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -12234,9 +16014,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 17e83e41-f864-46e1-a5c5-25cec71db558))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 63 "/Row2") (tstamp a30f6ff5-3f16-401d-aee7-918073984fc8))
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (tstamp a30f6ff5-3f16-401d-aee7-918073984fc8))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 63 "/Row2") (thermal_bridge_angle 45)
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12249,7 +16029,7 @@
           (width 0.1) (fill yes))
       ) (tstamp c7b19370-c8df-4c3e-8dd7-d782ab5edfcc))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 44 "Net-(D52-Pad2)") (thermal_bridge_angle 45)
+      (net 67 "Net-(D52-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12264,7 +16044,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 8b9806c7-20f0-43a9-b9c2-572d3efa3298))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 44 "Net-(D52-Pad2)") (tstamp f656cb5e-3f66-494e-87ad-04bc8900a0e4))
+      (net 67 "Net-(D52-A)") (pinfunction "A") (pintype "passive") (tstamp f656cb5e-3f66-494e-87ad-04bc8900a0e4))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp c3250d5a-92a4-4457-bb46-9f3d8a5a843a))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -12283,6 +16063,38 @@
     (at 158.84398 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cf38")
     (attr smd)
     (fp_text reference "D56" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -12378,9 +16190,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bb5db2d2-da55-46b4-bd21-4d0b20757b40))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 63 "/Row2") (tstamp 132cc7c2-739c-4202-9d0d-d5ab8bad2373))
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (tstamp 132cc7c2-739c-4202-9d0d-d5ab8bad2373))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 63 "/Row2") (thermal_bridge_angle 45)
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12393,7 +16205,7 @@
           (width 0.1) (fill yes))
       ) (tstamp f5a8251c-b94c-47bd-ae1b-96c7cac2cc2c))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 48 "Net-(D56-Pad2)") (thermal_bridge_angle 45)
+      (net 71 "Net-(D56-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12408,7 +16220,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 6b3aa51b-5d4b-485e-a615-37974beb95de))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 48 "Net-(D56-Pad2)") (tstamp 6d32974e-ada7-427e-be91-8ac12d9e0df7))
+      (net 71 "Net-(D56-A)") (pinfunction "A") (pintype "passive") (tstamp 6d32974e-ada7-427e-be91-8ac12d9e0df7))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 97c7e3d5-94d9-481d-bd7e-f081ae72271b))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -12427,6 +16239,38 @@
     (at 139.79398 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cf3f")
     (attr smd)
     (fp_text reference "D60" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -12522,9 +16366,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bc12f122-5cf7-4604-b58b-557485de8ab8))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 63 "/Row2") (tstamp b0b83e3e-cd6b-4023-8243-a5586bfbf145))
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (tstamp b0b83e3e-cd6b-4023-8243-a5586bfbf145))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 63 "/Row2") (thermal_bridge_angle 45)
+      (net 63 "/Row2") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12537,7 +16381,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 6f9e78f7-210b-4e73-97ee-c2bd06eff0ad))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 52 "Net-(D60-Pad2)") (thermal_bridge_angle 45)
+      (net 75 "Net-(D60-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12552,7 +16396,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 347bb5d0-176b-4420-a745-b10c34b1dcb6))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 52 "Net-(D60-Pad2)") (tstamp fc6e33eb-4d14-439f-bfd0-462d668fb94b))
+      (net 75 "Net-(D60-A)") (pinfunction "A") (pintype "passive") (tstamp fc6e33eb-4d14-439f-bfd0-462d668fb94b))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 4a481bd3-545a-47c6-b936-ae48794055fb))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -12571,6 +16415,38 @@
     (at 358.806513 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf34e")
     (attr smd)
     (fp_text reference "D2" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -12666,9 +16542,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 88f8bcb1-a0b3-4153-9c3c-2c3548d2a390))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 31 "/Row4") (tstamp f56fef26-5e04-4774-b822-d52b3b1e5ec4))
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (tstamp f56fef26-5e04-4774-b822-d52b3b1e5ec4))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 31 "/Row4") (thermal_bridge_angle 45)
+      (net 31 "/Row4") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12681,7 +16557,7 @@
           (width 0.1) (fill yes))
       ) (tstamp fc698501-dd6a-4e6b-9f4d-92291f4a43ae))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 72 "Net-(D2-Pad2)") (thermal_bridge_angle 45)
+      (net 5 "Net-(D2-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12696,7 +16572,7 @@
           (width 0.1) (fill yes))
       ) (tstamp c28c080b-908a-4faa-afef-c2aca9614a90))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 72 "Net-(D2-Pad2)") (tstamp c85eebd9-8840-4fd7-a28a-dc328ed5356b))
+      (net 5 "Net-(D2-A)") (pinfunction "A") (pintype "passive") (tstamp c85eebd9-8840-4fd7-a28a-dc328ed5356b))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 2d39a265-3668-48f6-9f4d-0ee5e406cf71))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -12715,6 +16591,38 @@
     (at 339.756513 146.68246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf3be")
     (attr smd)
     (fp_text reference "D3" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -12810,9 +16718,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0594a8e3-a652-480c-9c6b-35a843e57226))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 32 "/Row5") (tstamp 1344a88d-6a3b-48ab-b40f-1ee953ea9c73))
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (tstamp 1344a88d-6a3b-48ab-b40f-1ee953ea9c73))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 32 "/Row5") (thermal_bridge_angle 45)
+      (net 32 "/Row5") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12825,7 +16733,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 9e7a9706-f32d-4fdb-9769-4cd75033112f))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 73 "Net-(D3-Pad2)") (thermal_bridge_angle 45)
+      (net 6 "Net-(D3-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12840,7 +16748,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 74488179-a21b-48c7-9b4b-ced569bf45e9))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 73 "Net-(D3-Pad2)") (tstamp f8a6140e-133a-424e-951f-027c9a4a49b7))
+      (net 6 "Net-(D3-A)") (pinfunction "A") (pintype "passive") (tstamp f8a6140e-133a-424e-951f-027c9a4a49b7))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 018a7b1c-102a-4dd3-9a40-bb50401d6693))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -12859,6 +16767,38 @@
     (at 282.66898 127.63246 -90)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys1.kicad_sch")
+    (property "Sheetname" "keys1")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3e99d/00000000-0000-0000-0000-00005bc6cd9c")
     (attr smd)
     (fp_text reference "D41" (at 3.81 2.247 270) (layer "B.SilkS")
@@ -12954,9 +16894,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp dbd32cae-49af-4d08-a96b-12daec0d47da))
     (pad "1" thru_hole rect locked (at -3.556 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 3 "/Row1") (tstamp b3e4e402-e7b3-4b44-8fc5-9a57fd16797e))
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (tstamp b3e4e402-e7b3-4b44-8fc5-9a57fd16797e))
     (pad "1" smd custom locked (at -1 0 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 3 "/Row1") (thermal_bridge_angle 45)
+      (net 3 "/Row1") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12969,7 +16909,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 7cf6a426-10b3-4332-abec-061fb6693d10))
     (pad "2" smd custom locked (at 1 -0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 34 "Net-(D41-Pad2)") (thermal_bridge_angle 45)
+      (net 46 "Net-(D41-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -12984,7 +16924,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 389d1c79-0446-4cbc-a66c-3f43e156a9b7))
     (pad "2" thru_hole oval locked (at 4.064 0 270) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 34 "Net-(D41-Pad2)") (tstamp a8dfce6a-f366-42b6-9b45-0c1f45abf263))
+      (net 46 "Net-(D41-A)") (pinfunction "A") (pintype "passive") (tstamp a8dfce6a-f366-42b6-9b45-0c1f45abf263))
     (pad "NC" smd rect locked (at 1 0.95 90) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 4edf04aa-f888-43e7-acdf-65bb478561c4))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -13003,6 +16943,38 @@
     (at 348.3864 80.391)
     (descr "Diode, DO-35_SOD27 series, Axial, Horizontal, pin pitch=7.62mm, , length*diameter=4*2mm^2, , http://www.diodes.com/_files/packages/DO-35.pdf")
     (tags "Diode DO-35_SOD27 series Axial Horizontal pin pitch 7.62mm  length 4mm diameter 2mm")
+    (property "Allow Substitution" "Yes")
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  ")
+    (property "Class" "If applicable")
+    (property "Comment" "<1.25V forward voltage.  ")
+    (property "Component Type" "Diode")
+    (property "Component Value" "19N14/MMBD914")
+    (property "Fitted" "Yes")
+    (property "LCSC" "C118751")
+    (property "Manufacturer" "Diodes, Inc.")
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914")
+    (property "Manufacturer PN" "MMBD914-7-F")
+    (property "Manufacturer Part Number" "MMBD914LT3G ")
+    (property "Material" "If applicable")
+    (property "Number of Pins" "3")
+    (property "Package" " SOT-23-3 ")
+    (property "Package Type" "SOT3-3")
+    (property "Package Variant" "")
+    (property "Power Rating" "350 mW / 200 mA")
+    (property "RoHS" "Yes")
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf")
+    (property "Sheetfile" "keys2.kicad_sch")
+    (property "Sheetname" "keys2")
+    (property "Standards Version" "1.1")
+    (property "Substitution OK" " YES ")
+    (property "Temp (Operating)" "-65C/150C")
+    (property "Temp (Soldering)" "If applicable")
+    (property "Temp (Storage)" "If applicable")
+    (property "Temp Coeff." "If applicable")
+    (property "Tolerance" "If applicable")
+    (property "Tracking" "No")
+    (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching")
+    (property "ki_keywords" "diode switching combined")
     (path "/00000000-0000-0000-0000-00005bc3ea0a/00000000-0000-0000-0000-00005bcaf42e")
     (attr smd)
     (fp_text reference "D4" (at 3.81 2.247) (layer "B.SilkS")
@@ -13098,9 +17070,9 @@
     (fp_line (start 4.064 0) (end 2.254 0)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ed49f429-7f9e-4406-8bc6-e9d52b85c728))
     (pad "1" thru_hole rect (at -3.556 0) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 62 "/Row6") (tstamp 8635f62a-23de-4836-b2c0-7d2aa692b66f))
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (tstamp 8635f62a-23de-4836-b2c0-7d2aa692b66f))
     (pad "1" smd custom (at -1 0 180) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 62 "/Row6") (thermal_bridge_angle 45)
+      (net 62 "/Row6") (pinfunction "K") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -13113,7 +17085,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 14f52b5f-336e-45d2-9485-2ae0539cc833))
     (pad "2" smd custom (at 1 -0.95 180) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 74 "Net-(D4-Pad2)") (thermal_bridge_angle 45)
+      (net 7 "Net-(D4-A)") (pinfunction "A") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -13128,7 +17100,7 @@
           (width 0.1) (fill yes))
       ) (tstamp 911ec3c1-507f-4fbd-a665-488a53041646))
     (pad "2" thru_hole oval (at 4.064 0) (size 1.6 1.6) (drill 0.8) (layers "*.Cu" "*.Mask")
-      (net 74 "Net-(D4-Pad2)") (tstamp 0dabbdbb-b42b-4844-9fb7-28a29a2ca257))
+      (net 7 "Net-(D4-A)") (pinfunction "A") (pintype "passive") (tstamp 0dabbdbb-b42b-4844-9fb7-28a29a2ca257))
     (pad "NC" smd rect (at 1 0.95 180) (size 0.9 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (tstamp 6637aaf2-16c6-4dd8-af29-871bcb383dce))
     (model "${KISYS3DMOD}/Diode_THT.3dshapes/D_DO-35_SOD27_P7.62mm_Horizontal.wrl"
       (offset (xyz -3.556 0 -1.4986))
@@ -13468,35 +17440,43 @@
   (segment (start 123.34621 146.84121) (end 123.34621 145.51279) (width 0.254) (layer "B.Cu") (net 3) (tstamp 9867dcad-9466-433c-ab60-9f3d4e9e8a6b))
   (segment (start 336.423 161.31286) (end 332.782522 157.672382) (width 0.254) (layer "B.Cu") (net 3) (tstamp a2564004-75a9-499b-85fb-23976ed5ef61))
   (segment (start 332.782522 157.672382) (end 296.673811 157.672382) (width 0.254) (layer "B.Cu") (net 3) (tstamp f87c1eeb-d5bf-4eb4-b64a-ea3993f90a9a))
-  (segment (start 230.21798 112.91316) (end 239.48898 112.91316) (width 0.254) (layer "B.Cu") (net 4) (tstamp be388927-6a1a-4813-9c83-fb73e1a5bd14))
-  (segment (start 335.27238 93.86316) (end 344.71102 93.86316) (width 0.254) (layer "B.Cu") (net 5) (tstamp 3444d891-6e4c-4bcc-98c8-dc1f5c94e978))
-  (segment (start 201.92238 93.86316) (end 211.19338 93.86316) (width 0.254) (layer "B.Cu") (net 6) (tstamp 2a5cab71-4241-4c25-ae3a-bd90e037fb40))
-  (segment (start 211.16798 112.91316) (end 220.43898 112.91316) (width 0.254) (layer "B.Cu") (net 7) (tstamp a89a985a-368a-4c29-89b3-267bd45b3f7a))
-  (segment (start 338.836 112.649) (end 335.751789 112.649) (width 0.254) (layer "F.Cu") (net 8) (tstamp 45af6e8d-5657-4eba-87bf-b70fe0021fe4))
-  (via (at 338.836 112.649) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 8) (tstamp 9e59fbe6-7a3d-4af0-80a6-070167499d43))
-  (segment (start 338.836 112.649) (end 344.37481 112.649) (width 0.254) (layer "B.Cu") (net 8) (tstamp e20b5517-0f1c-459f-befb-fff944fe7600))
-  (segment (start 316.22238 93.86316) (end 325.49338 93.86316) (width 0.254) (layer "B.Cu") (net 9) (tstamp 65d05c8c-65a1-441f-aa5e-0d912c079b53))
-  (segment (start 182.87238 93.86316) (end 192.14338 93.86316) (width 0.254) (layer "B.Cu") (net 10) (tstamp f7eaf7a0-58df-479b-b322-88761d33516f))
-  (segment (start 192.11798 112.91316) (end 201.38898 112.91316) (width 0.254) (layer "B.Cu") (net 11) (tstamp f6a1fc17-aad5-4f7b-8ea6-9bd5df6d644e))
-  (segment (start 311.21858 112.91316) (end 322.88988 112.91316) (width 0.254) (layer "B.Cu") (net 12) (tstamp b9a810fb-e048-4a6b-81ce-46d5d6e96e7f))
-  (segment (start 297.17238 93.86316) (end 306.44338 93.86316) (width 0.254) (layer "B.Cu") (net 13) (tstamp fa02ddd8-55e9-480b-9a75-d3bf6e727ced))
-  (segment (start 163.82238 93.86316) (end 173.09338 93.86316) (width 0.254) (layer "B.Cu") (net 14) (tstamp d346bbac-24d9-4e43-80ee-90cf17c69ba6))
-  (segment (start 287.36798 112.91316) (end 299.03928 112.91316) (width 0.254) (layer "B.Cu") (net 15) (tstamp 0c079159-a586-44b9-ba00-887a3053c2e7))
-  (segment (start 278.12238 93.86316) (end 287.39338 93.86316) (width 0.254) (layer "B.Cu") (net 16) (tstamp 526864f0-31a1-4b3c-af83-96b324263936))
-  (segment (start 144.77238 93.86316) (end 154.04338 93.86316) (width 0.254) (layer "B.Cu") (net 17) (tstamp ddfdfdc3-379c-45fc-8266-05cbe42a6c48))
-  (segment (start 249.26798 112.91316) (end 258.53898 112.91316) (width 0.254) (layer "B.Cu") (net 18) (tstamp 5fffba8f-48fe-4978-8a8f-2e1d87fe7172))
-  (segment (start 259.07238 93.86316) (end 268.34338 93.86316) (width 0.254) (layer "B.Cu") (net 19) (tstamp 12b7ec02-3a42-4e5a-aea3-c1c065b4489e))
-  (segment (start 125.72238 93.86316) (end 134.99338 93.86316) (width 0.254) (layer "B.Cu") (net 20) (tstamp c638d31c-2ada-4ad0-ad34-c81cc8237531))
-  (segment (start 144.49298 112.65916) (end 135.22198 112.65916) (width 0.254) (layer "B.Cu") (net 21) (tstamp bbb77208-4492-45e7-8372-c9e31ca2e1e2))
-  (segment (start 254.19558 131.96316) (end 263.46658 131.96316) (width 0.254) (layer "B.Cu") (net 22) (tstamp 2fda8f09-f280-4f46-8957-c701bfedb742))
-  (segment (start 240.02238 93.86316) (end 249.29338 93.86316) (width 0.254) (layer "B.Cu") (net 23) (tstamp 0e59f5a1-d0ce-4821-b1bc-d174eae4e0fc))
-  (segment (start 106.67238 93.86316) (end 115.94338 93.86316) (width 0.254) (layer "B.Cu") (net 24) (tstamp 73896ce5-5e48-4ee2-9877-b43a9412690e))
-  (segment (start 115.91798 112.91316) (end 125.18898 112.91316) (width 0.254) (layer "B.Cu") (net 25) (tstamp 3707b34a-b7dc-4971-91dd-dc670b211425))
-  (segment (start 263.72058 151.01316) (end 272.99158 151.01316) (width 0.254) (layer "B.Cu") (net 26) (tstamp 77aafc50-3bd0-43ca-be71-dbd4d25bf815))
-  (segment (start 220.97238 93.86316) (end 230.24338 93.86316) (width 0.254) (layer "B.Cu") (net 27) (tstamp dd4e3d2c-35e0-46e8-9eb2-d999b3465578))
-  (segment (start 87.62238 93.86316) (end 96.89338 93.86316) (width 0.254) (layer "B.Cu") (net 28) (tstamp f32302e9-2994-482c-b6f3-fdb3998be212))
-  (segment (start 354.11918 112.91316) (end 363.43082 112.91316) (width 0.254) (layer "B.Cu") (net 29) (tstamp 887b62ad-52f5-4247-9e60-171cac23e58c))
-  (segment (start 306.62118 151.01316) (end 318.29248 151.01316) (width 0.254) (layer "B.Cu") (net 30) (tstamp 0283658b-8e85-4c81-afd2-1c7cead3d7bf))
+  (segment (start 78.09738 93.60916) (end 76.96601 93.60916) (width 0.254) (layer "F.Cu") (net 4) (tstamp 3f59a4eb-53f1-4e13-9955-8d281a43d778))
+  (segment (start 76.96601 93.60916) (end 76.486601 94.088569) (width 0.254) (layer "F.Cu") (net 4) (tstamp a3887b58-3c47-4b18-9e0a-7415d172741e))
+  (segment (start 76.486601 94.088569) (end 68.57238 94.088569) (width 0.254) (layer "F.Cu") (net 4) (tstamp a6eb1fc0-8a2a-4873-a9fc-ad8fb5e3ab7f))
+  (segment (start 349.52178 151.01316) (end 358.654113 151.01316) (width 0.254) (layer "B.Cu") (net 5) (tstamp 017af09c-5824-4fa9-9ff0-45214435efe5))
+  (segment (start 338.486514 152.130759) (end 339.858113 150.75916) (width 0.254) (layer "B.Cu") (net 6) (tstamp 32da4978-65cc-4544-8157-4f83ab469088))
+  (segment (start 330.47178 151.01316) (end 331.589379 152.130759) (width 0.254) (layer "B.Cu") (net 6) (tstamp 7a823fd4-b2cf-4984-a730-36f14ce00342))
+  (segment (start 331.589379 152.130759) (end 338.486514 152.130759) (width 0.254) (layer "B.Cu") (net 6) (tstamp a0e9a245-5f54-4fe4-801b-df88ede89623))
+  (segment (start 361.442 91.186) (end 358.87914 93.74886) (width 0.254) (layer "B.Cu") (net 7) (tstamp 0fdaea48-d81c-4044-b21b-387723e0c5f5))
+  (segment (start 356.235 80.391) (end 361.442 85.598) (width 0.254) (layer "B.Cu") (net 7) (tstamp 88ab2034-2dee-4950-87c2-b40e034759d8))
+  (segment (start 352.4504 80.391) (end 356.235 80.391) (width 0.254) (layer "B.Cu") (net 7) (tstamp 8cafaf5a-6beb-4a0c-a768-310d1582b3c2))
+  (segment (start 358.87914 93.74886) (end 354.32238 93.74886) (width 0.254) (layer "B.Cu") (net 7) (tstamp c99dace1-0275-4f27-9c91-93fe588bc511))
+  (segment (start 361.442 85.598) (end 361.442 91.186) (width 0.254) (layer "B.Cu") (net 7) (tstamp f651bfdb-e6b8-461e-88a5-b0f5a5778c34))
+  (segment (start 230.21798 112.91316) (end 239.48898 112.91316) (width 0.254) (layer "B.Cu") (net 8) (tstamp be388927-6a1a-4813-9c83-fb73e1a5bd14))
+  (segment (start 349.44558 131.96316) (end 358.9274 131.96316) (width 0.254) (layer "B.Cu") (net 9) (tstamp 4ef20732-d7f1-4ada-b49c-81cca6de3756))
+  (segment (start 335.27238 93.86316) (end 344.71102 93.86316) (width 0.254) (layer "B.Cu") (net 10) (tstamp 3444d891-6e4c-4bcc-98c8-dc1f5c94e978))
+  (segment (start 201.92238 93.86316) (end 211.19338 93.86316) (width 0.254) (layer "B.Cu") (net 11) (tstamp 2a5cab71-4241-4c25-ae3a-bd90e037fb40))
+  (segment (start 211.16798 112.91316) (end 220.43898 112.91316) (width 0.254) (layer "B.Cu") (net 12) (tstamp a89a985a-368a-4c29-89b3-267bd45b3f7a))
+  (segment (start 338.836 112.649) (end 335.751789 112.649) (width 0.254) (layer "F.Cu") (net 13) (tstamp 45af6e8d-5657-4eba-87bf-b70fe0021fe4))
+  (via (at 338.836 112.649) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 13) (tstamp 9e59fbe6-7a3d-4af0-80a6-070167499d43))
+  (segment (start 338.836 112.649) (end 344.37481 112.649) (width 0.254) (layer "B.Cu") (net 13) (tstamp e20b5517-0f1c-459f-befb-fff944fe7600))
+  (segment (start 316.22238 93.86316) (end 325.49338 93.86316) (width 0.254) (layer "B.Cu") (net 14) (tstamp 65d05c8c-65a1-441f-aa5e-0d912c079b53))
+  (segment (start 182.87238 93.86316) (end 192.14338 93.86316) (width 0.254) (layer "B.Cu") (net 15) (tstamp f7eaf7a0-58df-479b-b322-88761d33516f))
+  (segment (start 192.11798 112.91316) (end 201.38898 112.91316) (width 0.254) (layer "B.Cu") (net 16) (tstamp f6a1fc17-aad5-4f7b-8ea6-9bd5df6d644e))
+  (segment (start 311.21858 112.91316) (end 322.88988 112.91316) (width 0.254) (layer "B.Cu") (net 17) (tstamp b9a810fb-e048-4a6b-81ce-46d5d6e96e7f))
+  (segment (start 297.17238 93.86316) (end 306.44338 93.86316) (width 0.254) (layer "B.Cu") (net 18) (tstamp fa02ddd8-55e9-480b-9a75-d3bf6e727ced))
+  (segment (start 163.82238 93.86316) (end 173.09338 93.86316) (width 0.254) (layer "B.Cu") (net 19) (tstamp d346bbac-24d9-4e43-80ee-90cf17c69ba6))
+  (segment (start 173.06798 112.91316) (end 182.33898 112.91316) (width 0.254) (layer "B.Cu") (net 20) (tstamp 1e51627f-b899-4d3a-8d74-ec134b913dc5))
+  (segment (start 287.36798 112.91316) (end 299.03928 112.91316) (width 0.254) (layer "B.Cu") (net 21) (tstamp 0c079159-a586-44b9-ba00-887a3053c2e7))
+  (segment (start 278.12238 93.86316) (end 287.39338 93.86316) (width 0.254) (layer "B.Cu") (net 22) (tstamp 526864f0-31a1-4b3c-af83-96b324263936))
+  (segment (start 144.77238 93.86316) (end 154.04338 93.86316) (width 0.254) (layer "B.Cu") (net 23) (tstamp ddfdfdc3-379c-45fc-8266-05cbe42a6c48))
+  (segment (start 154.01798 112.91316) (end 163.28898 112.91316) (width 0.254) (layer "B.Cu") (net 24) (tstamp f38b9120-f361-4fc7-a545-9a976899fab4))
+  (segment (start 249.26798 112.91316) (end 258.53898 112.91316) (width 0.254) (layer "B.Cu") (net 25) (tstamp 5fffba8f-48fe-4978-8a8f-2e1d87fe7172))
+  (segment (start 259.07238 93.86316) (end 268.34338 93.86316) (width 0.254) (layer "B.Cu") (net 26) (tstamp 12b7ec02-3a42-4e5a-aea3-c1c065b4489e))
+  (segment (start 125.72238 93.86316) (end 134.99338 93.86316) (width 0.254) (layer "B.Cu") (net 27) (tstamp c638d31c-2ada-4ad0-ad34-c81cc8237531))
+  (segment (start 144.49298 112.65916) (end 135.22198 112.65916) (width 0.254) (layer "B.Cu") (net 28) (tstamp bbb77208-4492-45e7-8372-c9e31ca2e1e2))
+  (segment (start 254.19558 131.96316) (end 263.46658 131.96316) (width 0.254) (layer "B.Cu") (net 29) (tstamp 2fda8f09-f280-4f46-8957-c701bfedb742))
+  (segment (start 240.02238 93.86316) (end 249.29338 93.86316) (width 0.254) (layer "B.Cu") (net 30) (tstamp 0e59f5a1-d0ce-4821-b1bc-d174eae4e0fc))
   (segment (start 366.14354 104.211855) (end 362.795085 100.8634) (width 0.254) (layer "F.Cu") (net 31) (tstamp 1188e28c-3dde-4585-8b27-3ac5646778a9))
   (segment (start 340.106 120.2055) (end 342.1507 118.1608) (width 0.254) (layer "F.Cu") (net 31) (tstamp 16160078-5052-4413-82be-879cc04fc069))
   (segment (start 328.803 161.31286) (end 332.09549 158.02037) (width 0.254) (layer "F.Cu") (net 31) (tstamp 179c5828-4a9f-4cc9-963f-4f5a7d1e5e43))
@@ -13658,29 +17638,35 @@
   (segment (start 173.4312 83.1469) (end 192.28308 83.1469) (width 0.254) (layer "B.Cu") (net 33) (tstamp f72714d4-2e0d-4c01-80c8-5307d63cf0b5))
   (segment (start 255.231457 158.877) (end 258.406457 162.052) (width 0.254) (layer "B.Cu") (net 33) (tstamp f8480704-1c51-4ab8-8fd6-5759bd817c20))
   (segment (start 296.109004 158.2928) (end 315.657644 158.2928) (width 0.254) (layer "B.Cu") (net 33) (tstamp fbe9c80b-3a05-41b9-bbe8-8d41bb7d6888))
-  (segment (start 273.24558 131.96316) (end 282.51658 131.96316) (width 0.254) (layer "B.Cu") (net 34) (tstamp 0eebb308-dc9e-4ae8-9c59-fffbdd98e04c))
-  (segment (start 225.62058 151.01316) (end 234.89158 151.01316) (width 0.254) (layer "B.Cu") (net 35) (tstamp f9afbbb3-3f9a-4773-a94c-819cfc03147c))
-  (segment (start 222.640171 133.080759) (end 224.01177 131.70916) (width 0.254) (layer "B.Cu") (net 36) (tstamp 4dcff3fb-987d-414e-b97e-97ec6feced8a))
-  (segment (start 217.213179 133.080759) (end 222.640171 133.080759) (width 0.254) (layer "B.Cu") (net 36) (tstamp 84abfc98-38e5-4732-aeab-ed06aa24e0d9))
-  (segment (start 216.09558 131.96316) (end 217.213179 133.080759) (width 0.254) (layer "B.Cu") (net 36) (tstamp 8874fe2d-8e1e-4d74-838d-7ff3cf0f21c0))
-  (segment (start 224.01177 131.70916) (end 225.62058 131.70916) (width 0.254) (layer "B.Cu") (net 36) (tstamp 9a4505ef-1666-4a46-9830-570a06211ea7))
-  (segment (start 206.57058 151.01316) (end 215.84158 151.01316) (width 0.254) (layer "B.Cu") (net 37) (tstamp 483eead8-deba-4f94-995e-388db993c799))
-  (segment (start 197.04558 131.96316) (end 206.31658 131.96316) (width 0.254) (layer "B.Cu") (net 38) (tstamp e8a08557-668a-4979-a511-59497a5332cd))
-  (segment (start 197.15988 169.94886) (end 207.52308 169.94886) (width 0.254) (layer "B.Cu") (net 39) (tstamp 19c984c8-427e-41d6-a78c-5734046bbde5))
-  (segment (start 187.52058 151.01316) (end 196.79158 151.01316) (width 0.254) (layer "B.Cu") (net 40) (tstamp e1f83709-1646-432d-b75d-a97e5676a159))
-  (segment (start 177.99558 131.96316) (end 187.26658 131.96316) (width 0.254) (layer "B.Cu") (net 41) (tstamp 5393ee41-f346-4e8f-924b-b27acb0a31f3))
-  (segment (start 77.99578 112.91316) (end 87.08898 112.91316) (width 0.254) (layer "B.Cu") (net 42) (tstamp df00fb18-f89c-43b5-80b1-88905d7383dc))
-  (segment (start 111.32058 151.01316) (end 120.59158 151.01316) (width 0.254) (layer "B.Cu") (net 43) (tstamp 148a2d9c-583f-4145-96fc-a11f61e60c69))
-  (segment (start 168.47058 151.01316) (end 177.74158 151.01316) (width 0.254) (layer "B.Cu") (net 44) (tstamp 5f9915ac-bb97-4c3d-bd1a-0f87d7c0efe5))
-  (segment (start 158.94558 131.96316) (end 168.21658 131.96316) (width 0.254) (layer "B.Cu") (net 45) (tstamp bd1500e8-53b9-4e8e-ac76-d7c40ab95013))
-  (segment (start 82.74558 131.96316) (end 92.01658 131.96316) (width 0.254) (layer "B.Cu") (net 46) (tstamp 931925c0-26eb-4af1-b012-b8e7d8ac00a4))
-  (segment (start 101.79558 131.96316) (end 111.06658 131.96316) (width 0.254) (layer "B.Cu") (net 47) (tstamp 235d2478-99bf-4a36-a9f2-a6f1a862ac4e))
-  (segment (start 149.42058 151.01316) (end 158.69158 151.01316) (width 0.254) (layer "B.Cu") (net 48) (tstamp 63819036-3d76-4588-b249-d6ba55d616c1))
-  (segment (start 139.89558 131.96316) (end 149.16658 131.96316) (width 0.254) (layer "B.Cu") (net 49) (tstamp 0cef585e-7e2a-4bda-b27f-6ecb95cd2d88))
-  (segment (start 311.34558 131.96316) (end 320.8274 131.96316) (width 0.254) (layer "B.Cu") (net 50) (tstamp e65a66e0-642d-4e41-b780-ab62d2d55720))
-  (segment (start 96.86798 112.91316) (end 106.13898 112.91316) (width 0.254) (layer "B.Cu") (net 51) (tstamp dde46b14-039c-44dd-859d-8bf120d303bb))
-  (segment (start 130.37058 151.01316) (end 139.64158 151.01316) (width 0.254) (layer "B.Cu") (net 52) (tstamp 3249ae4d-b1d5-488f-930c-1295fda31290))
-  (segment (start 120.84558 131.96316) (end 130.11658 131.96316) (width 0.254) (layer "B.Cu") (net 53) (tstamp a86b3d5b-d757-44cb-abba-3a835be0e155))
+  (segment (start 106.67238 93.86316) (end 115.94338 93.86316) (width 0.254) (layer "B.Cu") (net 34) (tstamp 73896ce5-5e48-4ee2-9877-b43a9412690e))
+  (segment (start 115.91798 112.91316) (end 125.18898 112.91316) (width 0.254) (layer "B.Cu") (net 35) (tstamp 3707b34a-b7dc-4971-91dd-dc670b211425))
+  (segment (start 263.72058 151.01316) (end 272.99158 151.01316) (width 0.254) (layer "B.Cu") (net 36) (tstamp 77aafc50-3bd0-43ca-be71-dbd4d25bf815))
+  (segment (start 220.97238 93.86316) (end 230.24338 93.86316) (width 0.254) (layer "B.Cu") (net 37) (tstamp dd4e3d2c-35e0-46e8-9eb2-d999b3465578))
+  (segment (start 87.62238 93.86316) (end 96.89338 93.86316) (width 0.254) (layer "B.Cu") (net 38) (tstamp f32302e9-2994-482c-b6f3-fdb3998be212))
+  (segment (start 354.11918 112.91316) (end 363.43082 112.91316) (width 0.254) (layer "B.Cu") (net 39) (tstamp 887b62ad-52f5-4247-9e60-171cac23e58c))
+  (segment (start 366.2426 138.6078) (end 366.2426 136.8806) (width 0.254) (layer "F.Cu") (net 40) (tstamp 18cdeffa-f17c-4ee6-ac88-5e17d041b5c6))
+  (segment (start 362.1786 148.1582) (end 362.1786 142.6718) (width 0.254) (layer "F.Cu") (net 40) (tstamp 2c2a3a76-e16a-486b-8fb7-f196eadf3d48))
+  (segment (start 368.122392 150.94966) (end 364.97006 150.94966) (width 0.254) (layer "F.Cu") (net 40) (tstamp c09b18a1-340b-45e0-a04d-982d141b0b6e))
+  (segment (start 364.97006 150.94966) (end 362.1786 148.1582) (width 0.254) (layer "F.Cu") (net 40) (tstamp c123a5a9-5003-447a-913e-84357cecd643))
+  (segment (start 362.1786 142.6718) (end 366.2426 138.6078) (width 0.254) (layer "F.Cu") (net 40) (tstamp d8dfe98e-410b-46d8-8bbc-78b514122aeb))
+  (segment (start 306.62118 151.01316) (end 318.29248 151.01316) (width 0.254) (layer "B.Cu") (net 41) (tstamp 0283658b-8e85-4c81-afd2-1c7cead3d7bf))
+  (segment (start 268.31798 112.91316) (end 277.58898 112.91316) (width 0.254) (layer "B.Cu") (net 42) (tstamp 7a579ea4-ecc8-4e3a-b4f5-75df1ef5f8a0))
+  (segment (start 252.823981 152.130759) (end 254.19558 150.75916) (width 0.254) (layer "B.Cu") (net 43) (tstamp 6610b3f2-84c6-49ed-9c9a-380d7d115f8b))
+  (segment (start 244.67058 151.01316) (end 245.788179 152.130759) (width 0.254) (layer "B.Cu") (net 43) (tstamp 896590d3-496e-41b9-a54c-59022db2f9fc))
+  (segment (start 245.788179 152.130759) (end 252.823981 152.130759) (width 0.254) (layer "B.Cu") (net 43) (tstamp cb47a999-4e03-4bbf-990f-fe4508723a8b))
+  (segment (start 235.14558 131.96316) (end 244.41658 131.96316) (width 0.254) (layer "B.Cu") (net 44) (tstamp 54eed3ce-ba6e-4e1a-a0f4-1b2e659ca991))
+  (segment (start 87.46998 151.01316) (end 99.14128 151.01316) (width 0.254) (layer "B.Cu") (net 45) (tstamp c7c993f7-30a6-4d60-b45c-545967366dc7))
+  (segment (start 273.24558 131.96316) (end 282.51658 131.96316) (width 0.254) (layer "B.Cu") (net 46) (tstamp 0eebb308-dc9e-4ae8-9c59-fffbdd98e04c))
+  (segment (start 225.62058 151.01316) (end 234.89158 151.01316) (width 0.254) (layer "B.Cu") (net 47) (tstamp f9afbbb3-3f9a-4773-a94c-819cfc03147c))
+  (segment (start 222.640171 133.080759) (end 224.01177 131.70916) (width 0.254) (layer "B.Cu") (net 48) (tstamp 4dcff3fb-987d-414e-b97e-97ec6feced8a))
+  (segment (start 217.213179 133.080759) (end 222.640171 133.080759) (width 0.254) (layer "B.Cu") (net 48) (tstamp 84abfc98-38e5-4732-aeab-ed06aa24e0d9))
+  (segment (start 216.09558 131.96316) (end 217.213179 133.080759) (width 0.254) (layer "B.Cu") (net 48) (tstamp 8874fe2d-8e1e-4d74-838d-7ff3cf0f21c0))
+  (segment (start 224.01177 131.70916) (end 225.62058 131.70916) (width 0.254) (layer "B.Cu") (net 48) (tstamp 9a4505ef-1666-4a46-9830-570a06211ea7))
+  (segment (start 282.77058 151.01316) (end 294.44188 151.01316) (width 0.254) (layer "B.Cu") (net 49) (tstamp 2c76277a-6400-4c59-8ed0-1c9b775979ae))
+  (segment (start 206.57058 151.01316) (end 215.84158 151.01316) (width 0.254) (layer "B.Cu") (net 50) (tstamp 483eead8-deba-4f94-995e-388db993c799))
+  (segment (start 197.04558 131.96316) (end 206.31658 131.96316) (width 0.254) (layer "B.Cu") (net 51) (tstamp e8a08557-668a-4979-a511-59497a5332cd))
+  (segment (start 197.15988 169.94886) (end 207.52308 169.94886) (width 0.254) (layer "B.Cu") (net 52) (tstamp 19c984c8-427e-41d6-a78c-5734046bbde5))
+  (segment (start 187.52058 151.01316) (end 196.79158 151.01316) (width 0.254) (layer "B.Cu") (net 53) (tstamp e1f83709-1646-432d-b75d-a97e5676a159))
   (segment (start 357.37038 108.03636) (end 357.37038 119.374918) (width 0.254) (layer "F.Cu") (net 54) (tstamp 04882736-2774-4141-8d3b-002eddacb6e1))
   (segment (start 330.55814 140.10386) (end 331.343 139.319) (width 0.254) (layer "F.Cu") (net 54) (tstamp 093b2334-04fa-4b44-9012-0da5834d22a6))
   (segment (start 354.11918 102.37216) (end 354.11918 104.356648) (width 0.254) (layer "F.Cu") (net 54) (tstamp 0e2deada-9920-48a9-82a7-e6dbbbd91ea6))
@@ -14198,211 +18184,196 @@
   (segment (start 197.04558 139.44346) (end 197.04558 143.13916) (width 0.254) (layer "B.Cu") (net 63) (tstamp d97a75fc-71db-4ad9-9513-f3b3e136da81))
   (segment (start 254.139051 139.491071) (end 259.390203 139.491071) (width 0.254) (layer "B.Cu") (net 63) (tstamp e99dbedd-fa51-48c9-9e17-e1ea9cc44065))
   (segment (start 177.94732 139.27582) (end 197.21322 139.27582) (width 0.254) (layer "B.Cu") (net 63) (tstamp f33d923d-2802-485f-a83b-38e93b47d4c5))
-  (segment (start 349.52178 151.01316) (end 358.654113 151.01316) (width 0.254) (layer "B.Cu") (net 72) (tstamp 017af09c-5824-4fa9-9ff0-45214435efe5))
-  (segment (start 338.486514 152.130759) (end 339.858113 150.75916) (width 0.254) (layer "B.Cu") (net 73) (tstamp 32da4978-65cc-4544-8157-4f83ab469088))
-  (segment (start 330.47178 151.01316) (end 331.589379 152.130759) (width 0.254) (layer "B.Cu") (net 73) (tstamp 7a823fd4-b2cf-4984-a730-36f14ce00342))
-  (segment (start 331.589379 152.130759) (end 338.486514 152.130759) (width 0.254) (layer "B.Cu") (net 73) (tstamp a0e9a245-5f54-4fe4-801b-df88ede89623))
-  (segment (start 361.442 91.186) (end 358.87914 93.74886) (width 0.254) (layer "B.Cu") (net 74) (tstamp 0fdaea48-d81c-4044-b21b-387723e0c5f5))
-  (segment (start 356.235 80.391) (end 361.442 85.598) (width 0.254) (layer "B.Cu") (net 74) (tstamp 88ab2034-2dee-4950-87c2-b40e034759d8))
-  (segment (start 352.4504 80.391) (end 356.235 80.391) (width 0.254) (layer "B.Cu") (net 74) (tstamp 8cafaf5a-6beb-4a0c-a768-310d1582b3c2))
-  (segment (start 358.87914 93.74886) (end 354.32238 93.74886) (width 0.254) (layer "B.Cu") (net 74) (tstamp c99dace1-0275-4f27-9c91-93fe588bc511))
-  (segment (start 361.442 85.598) (end 361.442 91.186) (width 0.254) (layer "B.Cu") (net 74) (tstamp f651bfdb-e6b8-461e-88a5-b0f5a5778c34))
-  (segment (start 349.44558 131.96316) (end 358.9274 131.96316) (width 0.254) (layer "B.Cu") (net 75) (tstamp 4ef20732-d7f1-4ada-b49c-81cca6de3756))
-  (segment (start 173.06798 112.91316) (end 182.33898 112.91316) (width 0.254) (layer "B.Cu") (net 76) (tstamp 1e51627f-b899-4d3a-8d74-ec134b913dc5))
-  (segment (start 154.01798 112.91316) (end 163.28898 112.91316) (width 0.254) (layer "B.Cu") (net 77) (tstamp f38b9120-f361-4fc7-a545-9a976899fab4))
-  (segment (start 268.31798 112.91316) (end 277.58898 112.91316) (width 0.254) (layer "B.Cu") (net 78) (tstamp 7a579ea4-ecc8-4e3a-b4f5-75df1ef5f8a0))
-  (segment (start 252.823981 152.130759) (end 254.19558 150.75916) (width 0.254) (layer "B.Cu") (net 79) (tstamp 6610b3f2-84c6-49ed-9c9a-380d7d115f8b))
-  (segment (start 244.67058 151.01316) (end 245.788179 152.130759) (width 0.254) (layer "B.Cu") (net 79) (tstamp 896590d3-496e-41b9-a54c-59022db2f9fc))
-  (segment (start 245.788179 152.130759) (end 252.823981 152.130759) (width 0.254) (layer "B.Cu") (net 79) (tstamp cb47a999-4e03-4bbf-990f-fe4508723a8b))
-  (segment (start 235.14558 131.96316) (end 244.41658 131.96316) (width 0.254) (layer "B.Cu") (net 80) (tstamp 54eed3ce-ba6e-4e1a-a0f4-1b2e659ca991))
-  (segment (start 87.46998 151.01316) (end 99.14128 151.01316) (width 0.254) (layer "B.Cu") (net 81) (tstamp c7c993f7-30a6-4d60-b45c-545967366dc7))
-  (segment (start 282.77058 151.01316) (end 294.44188 151.01316) (width 0.254) (layer "B.Cu") (net 82) (tstamp 2c76277a-6400-4c59-8ed0-1c9b775979ae))
-  (segment (start 309.660001 164.417821) (end 299.198822 174.879) (width 0.254) (layer "B.Cu") (net 83) (tstamp 08d92191-e480-4bc0-a932-20b09f399ecf))
-  (segment (start 117.277172 176.74903) (end 95.066827 176.749031) (width 0.254) (layer "B.Cu") (net 83) (tstamp 0c957a91-17f0-4433-9789-77a7a1d3c933))
-  (segment (start 95.066827 176.749031) (end 92.053796 173.736) (width 0.254) (layer "B.Cu") (net 83) (tstamp 26a825e7-cdb9-4946-af35-30b7815e813b))
-  (segment (start 309.047961 162.675859) (end 309.660001 163.287899) (width 0.254) (layer "B.Cu") (net 83) (tstamp 28820ebd-155e-4736-b4e4-c73b6cb04829))
-  (segment (start 186.655033 170.526033) (end 123.500171 170.526033) (width 0.254) (layer "B.Cu") (net 83) (tstamp 33c3d0c6-f7a5-4a37-9fd7-4aa1dcc75ba7))
-  (segment (start 69.85 162.56) (end 81.026 173.736) (width 0.254) (layer "B.Cu") (net 83) (tstamp 592a8bc7-f9df-4bb9-8b14-a231371481d7))
-  (segment (start 279.124796 174.879) (end 274.571818 170.326022) (width 0.254) (layer "B.Cu") (net 83) (tstamp 5a7e1bbb-dbbf-41e8-91ff-9648ba7d1112))
-  (segment (start 69.85 162.56) (end 67.0052 159.7152) (width 0.254) (layer "B.Cu") (net 83) (tstamp 61bb4507-b21a-4c62-874a-915236a39ff2))
-  (segment (start 309.660001 163.287899) (end 309.660001 164.417821) (width 0.254) (layer "B.Cu") (net 83) (tstamp 753f18a7-f22b-4fc7-96b8-9844076d9176))
-  (segment (start 67.0052 159.7152) (end 67.0052 158.2397) (width 0.254) (layer "B.Cu") (net 83) (tstamp 7b49ef69-bf8d-44de-aaa5-68f9e2b45c0e))
-  (segment (start 299.198822 174.879) (end 279.124796 174.879) (width 0.254) (layer "B.Cu") (net 83) (tstamp 7ecbf7d8-3af3-463b-bc48-dd0eb144e108))
-  (segment (start 307.120001 162.675859) (end 309.047961 162.675859) (width 0.254) (layer "B.Cu") (net 83) (tstamp a415aaa9-79d3-46c3-8bec-63414f2440aa))
-  (segment (start 305.943 163.85286) (end 307.120001 162.675859) (width 0.254) (layer "B.Cu") (net 83) (tstamp abe35cf3-38ae-423d-98b0-f5be9f25f721))
-  (segment (start 191.500053 175.371053) (end 186.655033 170.526033) (width 0.254) (layer "B.Cu") (net 83) (tstamp ae2b49ff-16f8-4d7c-b0be-fa479b242699))
-  (segment (start 274.571818 170.326022) (end 224.284182 170.326022) (width 0.254) (layer "B.Cu") (net 83) (tstamp af930c97-7499-4c99-a21e-f22ec845baa2))
-  (segment (start 123.500171 170.526033) (end 117.277172 176.74903) (width 0.254) (layer "B.Cu") (net 83) (tstamp c1f1c6a9-75f2-4c7f-a824-029e8c2dea03))
-  (segment (start 219.239151 175.371053) (end 191.500053 175.371053) (width 0.254) (layer "B.Cu") (net 83) (tstamp c79a8deb-abdf-4382-8aa4-560292f31475))
-  (segment (start 92.053796 173.736) (end 81.026 173.736) (width 0.254) (layer "B.Cu") (net 83) (tstamp cc9cfe37-3b0f-4b51-8226-7799cafcf7e8))
-  (segment (start 224.284182 170.326022) (end 219.239151 175.371053) (width 0.254) (layer "B.Cu") (net 83) (tstamp dd69714e-0817-46df-ac08-27fc6e71640e))
-  (segment (start 298.704001 166.422457) (end 299.870151 167.588607) (width 0.254) (layer "F.Cu") (net 84) (tstamp 25b9d920-a0ab-4c82-9e50-fec48216d402))
-  (segment (start 292.47927 123.83516) (end 295.222892 126.578782) (width 0.254) (layer "F.Cu") (net 84) (tstamp 4ebf543d-3d51-42df-affb-582851a8389f))
-  (segment (start 307.287253 167.588607) (end 311.023 163.85286) (width 0.254) (layer "F.Cu") (net 84) (tstamp 501fc7b6-a7a8-43e3-aabb-243c5a26d50c))
-  (segment (start 295.222892 128.344892) (end 298.704 131.826) (width 0.254) (layer "F.Cu") (net 84) (tstamp 8948a950-5dd7-4e98-9a64-bb8e1bf7df2a))
-  (segment (start 298.704 131.826) (end 298.704001 166.422457) (width 0.254) (layer "F.Cu") (net 84) (tstamp ca161565-7d44-4665-b4e1-8b18f085ae62))
-  (segment (start 299.870151 167.588607) (end 307.287253 167.588607) (width 0.254) (layer "F.Cu") (net 84) (tstamp deb3abb8-815d-4c25-a8b2-e739d05ffb86))
-  (segment (start 295.222892 126.578782) (end 295.222892 128.344892) (width 0.254) (layer "F.Cu") (net 84) (tstamp f40f7573-3d31-44be-9c97-6abbb496c2c9))
-  (segment (start 298.24999 132.549854) (end 297.602336 131.9022) (width 0.254) (layer "F.Cu") (net 85) (tstamp 0783121f-b4d9-4fd4-915a-67bebea85fa5))
-  (segment (start 298.24999 166.610514) (end 298.24999 132.549854) (width 0.254) (layer "F.Cu") (net 85) (tstamp 1b942cb7-4d9d-434e-b901-bc143974fa73))
-  (segment (start 297.0276 131.9022) (end 297.602336 131.9022) (width 0.254) (layer "F.Cu") (net 85) (tstamp 6591ad45-bf64-497e-b70d-f0415f8d3b10))
-  (segment (start 313.563 163.85286) (end 309.373242 168.042618) (width 0.254) (layer "F.Cu") (net 85) (tstamp 6fe9ed41-018e-48e3-84a8-d7f3088724e1))
-  (segment (start 309.373242 168.042618) (end 299.682094 168.042618) (width 0.254) (layer "F.Cu") (net 85) (tstamp 765467ea-b41c-4558-8739-778df8596ddd))
-  (segment (start 299.682094 168.042618) (end 298.24999 166.610514) (width 0.254) (layer "F.Cu") (net 85) (tstamp df5aa450-bb48-4d5e-b84c-06e4b3be3e25))
-  (via (at 297.0276 131.9022) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 85) (tstamp 7d6ef589-7bac-4a62-99af-ee3eac6673ad))
-  (segment (start 297.0276 131.9022) (end 292.41242 131.9022) (width 0.254) (layer "B.Cu") (net 85) (tstamp 2f3305b5-0649-422a-9524-a12c56aee793))
-  (segment (start 322.4403 160.55086) (end 323.328757 159.662403) (width 0.254) (layer "F.Cu") (net 86) (tstamp 0be191ae-434f-4269-8824-54bf727b6e9b))
-  (segment (start 337.766011 138.991989) (end 337.76601 150.271578) (width 0.254) (layer "F.Cu") (net 86) (tstamp 19545264-0c9f-4d06-bc35-ccf110139d98))
-  (segment (start 323.328757 159.662403) (end 323.328757 156.714779) (width 0.254) (layer "F.Cu") (net 86) (tstamp 2773eaf2-8504-4154-b660-e4aa49f1e058))
-  (segment (start 333.756 127.19558) (end 333.756 129.54) (width 0.254) (layer "F.Cu") (net 86) (tstamp 3dd6ab8c-5b59-4e39-93a3-4b850a7e3275))
-  (segment (start 338.709 134.493) (end 338.709 138.049) (width 0.254) (layer "F.Cu") (net 86) (tstamp 5a52c52b-e5c1-4ccc-bdfc-498c33ff367f))
-  (segment (start 331.832018 156.20557) (end 331.205288 156.20557) (width 0.254) (layer "F.Cu") (net 86) (tstamp 71dc87da-2a96-4b46-a5fe-a38b89afabfe))
-  (segment (start 333.756 129.54) (end 338.709 134.493) (width 0.254) (layer "F.Cu") (net 86) (tstamp 72d57d7b-6c32-4ab5-baeb-052217accb20))
-  (segment (start 337.76601 150.271578) (end 331.832018 156.20557) (width 0.254) (layer "F.Cu") (net 86) (tstamp 8ca104da-1c75-45e4-a182-53b149a66c35))
-  (segment (start 322.4403 162.59556) (end 322.4403 160.55086) (width 0.254) (layer "F.Cu") (net 86) (tstamp cde2d229-3198-46e3-b9dd-283145aec451))
-  (segment (start 330.39558 123.83516) (end 333.756 127.19558) (width 0.254) (layer "F.Cu") (net 86) (tstamp d8db25f1-1f25-4109-b770-518d0492c411))
-  (segment (start 321.183 163.85286) (end 322.4403 162.59556) (width 0.254) (layer "F.Cu") (net 86) (tstamp eabaeb21-cc83-4321-b090-c32f57e5f017))
-  (segment (start 338.709 138.049) (end 337.766011 138.991989) (width 0.254) (layer "F.Cu") (net 86) (tstamp ece711e7-0c38-45a5-a32c-7b9742f1b3ac))
-  (via (at 331.205288 156.20557) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 86) (tstamp 1d5ab6d3-787e-4b0b-9caf-63e893c9d46a))
-  (via (at 323.328757 156.714779) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 86) (tstamp 8dbfc843-cb24-4c5d-b6e0-afb944cf217b))
-  (segment (start 331.205288 156.20557) (end 323.837966 156.20557) (width 0.254) (layer "B.Cu") (net 86) (tstamp 069afd55-031a-4966-970c-22df708680ba))
-  (segment (start 323.837966 156.20557) (end 323.328757 156.714779) (width 0.254) (layer "B.Cu") (net 86) (tstamp 746244d1-91b3-4ad8-9acb-decf08b27898))
-  (segment (start 329.33894 155.6258) (end 329.33894 156.37256) (width 0.254) (layer "F.Cu") (net 87) (tstamp 0c090c11-3fcf-439f-bd18-cedef88f1972))
-  (segment (start 330.39558 132.188569) (end 335.515569 132.188569) (width 0.254) (layer "F.Cu") (net 87) (tstamp 218d0b95-6d04-4690-b2d3-e3bc31be9dd4))
-  (segment (start 329.33894 156.37256) (end 324.96506 160.74644) (width 0.254) (layer "F.Cu") (net 87) (tstamp 22928b6c-297f-4d42-998f-e83f465fe49c))
-  (segment (start 335.515569 132.188569) (end 338.175602 134.848602) (width 0.254) (layer "F.Cu") (net 87) (tstamp 2d4b6e58-ed38-4494-bb5c-4b7ef4eb0f01))
-  (segment (start 324.96506 160.74644) (end 324.96506 162.6108) (width 0.254) (layer "F.Cu") (net 87) (tstamp 404b3e27-9821-40bf-b591-80e8229d0935))
-  (segment (start 332.90256 154.49296) (end 332.44282 154.49296) (width 0.254) (layer "F.Cu") (net 87) (tstamp 4174b076-07db-4528-8c8c-cd5036498c9f))
-  (segment (start 338.175602 137.566398) (end 337.312 138.43) (width 0.254) (layer "F.Cu") (net 87) (tstamp 43edb5f7-37a2-4b2e-bc2a-6a58be889cb1))
-  (segment (start 324.96506 162.6108) (end 323.723 163.85286) (width 0.254) (layer "F.Cu") (net 87) (tstamp 8239a750-bed9-45f7-8213-46442c9bb43c))
-  (segment (start 337.312 150.08352) (end 332.90256 154.49296) (width 0.254) (layer "F.Cu") (net 87) (tstamp cacb1b72-9a07-4843-a77a-5785f22577c6))
-  (segment (start 337.312 138.43) (end 337.312 150.08352) (width 0.254) (layer "F.Cu") (net 87) (tstamp d2d5c6d8-31ab-41ef-95bc-d4ce2becc8ba))
-  (segment (start 338.175602 134.848602) (end 338.175602 137.566398) (width 0.254) (layer "F.Cu") (net 87) (tstamp dd178c1d-afe6-45cf-b1f3-570a293cd2d8))
-  (segment (start 329.3237 154.52344) (end 329.3237 155.61056) (width 0.254) (layer "F.Cu") (net 87) (tstamp f66a0310-5aa9-460d-b63c-55202a1d8268))
-  (segment (start 329.3237 155.61056) (end 329.33894 155.6258) (width 0.254) (layer "F.Cu") (net 87) (tstamp feaa3985-79cb-4d0e-a0de-37b4da90d23c))
-  (via (at 329.3237 154.52344) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 87) (tstamp 05c72df9-a5d0-40f2-b642-e630f5aa68a2))
-  (via (at 332.44282 154.49296) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 87) (tstamp ccb7632f-b951-4911-98d9-41febae3285d))
-  (segment (start 329.35418 154.49296) (end 329.3237 154.52344) (width 0.254) (layer "B.Cu") (net 87) (tstamp 4e2d6f51-8b55-45be-9fdd-f109aa5d8f6f))
-  (segment (start 332.44282 154.49296) (end 329.35418 154.49296) (width 0.254) (layer "B.Cu") (net 87) (tstamp ffcdcce0-485e-4f01-930e-9a548ca2a98e))
-  (segment (start 95.631 175.387) (end 89.789 169.545) (width 0.254) (layer "B.Cu") (net 92) (tstamp 185896c4-12ba-4b01-97c8-7c499858eb4f))
-  (segment (start 294.132 158.242) (end 282.956 158.242) (width 0.254) (layer "B.Cu") (net 92) (tstamp 31b15e73-13ce-4a42-8c9f-b80a902f7dca))
-  (segment (start 116.713 175.387) (end 95.631 175.387) (width 0.254) (layer "B.Cu") (net 92) (tstamp 3c78e62f-838c-4d86-a1b4-0ee6fb0a0fa6))
-  (segment (start 218.674978 174.009022) (end 192.064226 174.009022) (width 0.254) (layer "B.Cu") (net 92) (tstamp 4c399e50-bccc-4869-bcbd-bdf338815d2b))
-  (segment (start 122.936 169.164) (end 116.713 175.387) (width 0.254) (layer "B.Cu") (net 92) (tstamp 75120626-e285-4ebf-9164-2be836d7481a))
-  (segment (start 192.064226 174.009022) (end 187.219204 169.164) (width 0.254) (layer "B.Cu") (net 92) (tstamp 803bc84c-4333-4fee-9b65-5083b24c3c45))
-  (segment (start 277.749 163.449) (end 229.235 163.449) (width 0.254) (layer "B.Cu") (net 92) (tstamp 898e6bb4-5042-4230-badb-5f6a0be11eb2))
-  (segment (start 89.789 169.545) (end 87.376 169.545) (width 0.254) (layer "B.Cu") (net 92) (tstamp 9092d2a9-764e-4595-a40a-0366094c9ad4))
-  (segment (start 87.376 169.545) (end 86.106 168.275) (width 0.254) (layer "B.Cu") (net 92) (tstamp 96981c9c-5169-4f63-86c7-5c8457740841))
-  (segment (start 187.219204 169.164) (end 122.936 169.164) (width 0.254) (layer "B.Cu") (net 92) (tstamp a2d1e300-3932-499e-a6a1-d2cfbaad0cdb))
-  (segment (start 229.235 163.449) (end 218.674978 174.009022) (width 0.254) (layer "B.Cu") (net 92) (tstamp b8f474a2-da2c-4bfd-8aa7-f51b57426f1b))
-  (segment (start 300.863 163.85286) (end 299.74286 163.85286) (width 0.254) (layer "B.Cu") (net 92) (tstamp c5470978-b5cc-4291-b37a-78afb9151086))
-  (segment (start 86.106 168.275) (end 86.106 164.846) (width 0.254) (layer "B.Cu") (net 92) (tstamp d52de39b-ac6a-490c-a464-49a75b2b2161))
-  (segment (start 282.956 158.242) (end 277.749 163.449) (width 0.254) (layer "B.Cu") (net 92) (tstamp d8ee3e40-436d-489d-97b5-1f4018853015))
-  (segment (start 299.74286 163.85286) (end 294.132 158.242) (width 0.254) (layer "B.Cu") (net 92) (tstamp e9166206-be6e-4d3f-86e5-e849ef90e185))
-  (segment (start 86.106 164.846) (end 83.25866 161.99866) (width 0.254) (layer "B.Cu") (net 92) (tstamp fdbfa297-5cfa-4edb-9078-3b02ba75d8b8))
-  (segment (start 187.031147 169.618011) (end 191.876169 174.463033) (width 0.254) (layer "B.Cu") (net 93) (tstamp 1adc549f-b09e-4ff9-b1de-904b1e10c067))
-  (segment (start 95.442943 175.841011) (end 116.901058 175.84101) (width 0.254) (layer "B.Cu") (net 93) (tstamp 2439281f-31d5-46f2-baeb-df325439e1db))
-  (segment (start 116.901058 175.84101) (end 123.124057 169.618011) (width 0.254) (layer "B.Cu") (net 93) (tstamp 26c1a87c-6464-45da-b5cb-ac3bf233196c))
-  (segment (start 293.39286 173.863) (end 303.403 163.85286) (width 0.254) (layer "B.Cu") (net 93) (tstamp 381e05a0-8415-4638-ba03-f11a9a1081a9))
-  (segment (start 82.74558 169.99966) (end 89.601592 169.99966) (width 0.254) (layer "B.Cu") (net 93) (tstamp 5bef560f-b5b3-43e7-b6b4-93c96299c198))
-  (segment (start 274.955 169.418) (end 279.4 173.863) (width 0.254) (layer "B.Cu") (net 93) (tstamp 7d138c4e-fdf6-439f-92d0-bb2cd9e1f570))
-  (segment (start 123.124057 169.618011) (end 187.031147 169.618011) (width 0.254) (layer "B.Cu") (net 93) (tstamp 985fe66c-2d86-48b7-9093-a5f2796931ff))
-  (segment (start 191.876169 174.463033) (end 218.863036 174.463032) (width 0.254) (layer "B.Cu") (net 93) (tstamp bd8d673a-9a33-4e34-a888-e408394fae77))
-  (segment (start 218.863036 174.463032) (end 223.908068 169.418) (width 0.254) (layer "B.Cu") (net 93) (tstamp db3a24b7-4cc5-4152-beeb-e2760fa21adc))
-  (segment (start 279.4 173.863) (end 293.39286 173.863) (width 0.254) (layer "B.Cu") (net 93) (tstamp f2b632bd-59ef-4156-9779-d4ead070a016))
-  (segment (start 223.908068 169.418) (end 274.955 169.418) (width 0.254) (layer "B.Cu") (net 93) (tstamp f36c4d2b-f940-49c6-aa95-fd349488c12f))
-  (segment (start 89.601592 169.99966) (end 95.442943 175.841011) (width 0.254) (layer "B.Cu") (net 93) (tstamp fc9c32a1-a41c-4cd9-bc19-a9f51976e0b0))
-  (segment (start 78.09738 93.60916) (end 76.96601 93.60916) (width 0.254) (layer "F.Cu") (net 94) (tstamp 3f59a4eb-53f1-4e13-9955-8d281a43d778))
-  (segment (start 76.96601 93.60916) (end 76.486601 94.088569) (width 0.254) (layer "F.Cu") (net 94) (tstamp a3887b58-3c47-4b18-9e0a-7415d172741e))
-  (segment (start 76.486601 94.088569) (end 68.57238 94.088569) (width 0.254) (layer "F.Cu") (net 94) (tstamp a6eb1fc0-8a2a-4873-a9fc-ad8fb5e3ab7f))
-  (segment (start 366.2426 138.6078) (end 366.2426 136.8806) (width 0.254) (layer "F.Cu") (net 95) (tstamp 18cdeffa-f17c-4ee6-ac88-5e17d041b5c6))
-  (segment (start 362.1786 148.1582) (end 362.1786 142.6718) (width 0.254) (layer "F.Cu") (net 95) (tstamp 2c2a3a76-e16a-486b-8fb7-f196eadf3d48))
-  (segment (start 368.122392 150.94966) (end 364.97006 150.94966) (width 0.254) (layer "F.Cu") (net 95) (tstamp c09b18a1-340b-45e0-a04d-982d141b0b6e))
-  (segment (start 364.97006 150.94966) (end 362.1786 148.1582) (width 0.254) (layer "F.Cu") (net 95) (tstamp c123a5a9-5003-447a-913e-84357cecd643))
-  (segment (start 362.1786 142.6718) (end 366.2426 138.6078) (width 0.254) (layer "F.Cu") (net 95) (tstamp d8dfe98e-410b-46d8-8bbc-78b514122aeb))
-  (segment (start 291.1348 147.7772) (end 291.1348 137.4394) (width 0.254) (layer "F.Cu") (net 96) (tstamp 0d5c83b3-1ea2-445f-bbe7-26647e33f237))
-  (segment (start 312.983872 171.8183) (end 295.1353 171.8183) (width 0.254) (layer "F.Cu") (net 96) (tstamp 1b163e79-5513-4202-bed9-9e4344bfedaa))
-  (segment (start 295.1353 171.8183) (end 287.655 164.338) (width 0.254) (layer "F.Cu") (net 96) (tstamp 31a8a3d7-bab6-42bb-9997-e17f19fde731))
-  (segment (start 287.655 164.338) (end 287.655 151.257) (width 0.254) (layer "F.Cu") (net 96) (tstamp 95a0e85c-4d73-4d68-b4d6-43de38ae64cf))
-  (segment (start 291.13988 137.43432) (end 291.13988 132.97916) (width 0.254) (layer "F.Cu") (net 96) (tstamp a5508238-4f19-4d91-be6f-a27b93f29f96))
-  (segment (start 287.655 151.257) (end 291.1348 147.7772) (width 0.254) (layer "F.Cu") (net 96) (tstamp fb7560c3-f38f-47dc-a37e-4e1145e63b06))
-  (segment (start 369.4176 125.1712) (end 369.4176 132.715) (width 0.254) (layer "B.Cu") (net 96) (tstamp 0337bedf-e5e4-44f7-9175-35332c0360dd))
-  (segment (start 378.714 137.033) (end 378.714 154.305) (width 0.254) (layer "B.Cu") (net 96) (tstamp 0b04fbdd-c688-403b-9600-78eed75fb34a))
-  (segment (start 315.053972 173.8884) (end 312.983872 171.8183) (width 0.254) (layer "B.Cu") (net 96) (tstamp 15f6a744-714b-47d8-a6a7-e0fd6abc3e7f))
-  (segment (start 363.495202 157.607002) (end 361.442 159.660204) (width 0.254) (layer "B.Cu") (net 96) (tstamp 345636c1-4471-4b0f-943a-b4cfbadfd032))
-  (segment (start 316.865 173.8884) (end 316.865 172.1635) (width 0.254) (layer "B.Cu") (net 96) (tstamp 3892aad6-19eb-4238-8546-115b27c273ba))
-  (segment (start 368.3762 124.333) (end 368.5794 124.333) (width 0.254) (layer "B.Cu") (net 96) (tstamp 3e11c66d-5f5b-45f3-920a-18285547706b))
-  (segment (start 369.4176 132.715) (end 370.1796 133.477) (width 0.254) (layer "B.Cu") (net 96) (tstamp 58b323b5-7d0c-4cec-8f06-7b486cecef9c))
-  (segment (start 378.714 154.305) (end 375.411998 157.607002) (width 0.254) (layer "B.Cu") (net 96) (tstamp 5cf9deb3-4e46-4221-9363-f569f07a0f2b))
-  (segment (start 370.1796 133.477) (end 375.158001 133.477001) (width 0.254) (layer "B.Cu") (net 96) (tstamp 8e04a92b-9fbc-460b-a05d-8161d9d8e382))
-  (segment (start 361.442 172.593) (end 360.1466 173.8884) (width 0.254) (layer "B.Cu") (net 96) (tstamp 8f1446da-5890-44ac-8b02-2d9bfc49d774))
-  (segment (start 375.411998 157.607002) (end 363.495202 157.607002) (width 0.254) (layer "B.Cu") (net 96) (tstamp 8fe87963-3700-45dd-aee2-b46d76c6dfa3))
-  (segment (start 364.8202 127.889) (end 368.3762 124.333) (width 0.254) (layer "B.Cu") (net 96) (tstamp a4321c90-e2de-4c85-a248-b630e4fc473c))
-  (segment (start 316.865 173.8884) (end 360.1466 173.8884) (width 0.254) (layer "B.Cu") (net 96) (tstamp b2b4b8f5-13bc-4978-96af-b02d35026114))
-  (segment (start 368.5794 124.333) (end 369.4176 125.1712) (width 0.254) (layer "B.Cu") (net 96) (tstamp c1550cf3-2b3f-4a09-a147-858858e2db5d))
-  (segment (start 316.865 173.8884) (end 315.053972 173.8884) (width 0.254) (layer "B.Cu") (net 96) (tstamp d8093a6c-0397-44e1-8d03-320f831db402))
-  (segment (start 361.442 159.660204) (end 361.442 172.593) (width 0.254) (layer "B.Cu") (net 96) (tstamp de049e74-ed34-4a17-94c6-7fdd45a99a18))
-  (segment (start 375.158001 133.477001) (end 378.714 137.033) (width 0.254) (layer "B.Cu") (net 96) (tstamp f09cb48d-66a0-4228-bf49-fea6ba877962))
-  (segment (start 313.54522 168.95064) (end 318.643 163.85286) (width 0.254) (layer "F.Cu") (net 97) (tstamp 3abe7904-2147-45a8-b81f-5635b592a609))
-  (segment (start 293.67988 137.43432) (end 293.67988 132.97916) (width 0.254) (layer "F.Cu") (net 97) (tstamp 94b7b0a9-81ea-4c89-9aeb-d682049650ac))
-  (segment (start 297.64736 141.4018) (end 297.64736 166.817592) (width 0.254) (layer "F.Cu") (net 97) (tstamp affaeb92-8051-4be6-a8ae-c40a72413bae))
-  (segment (start 297.64736 166.817592) (end 299.780408 168.95064) (width 0.254) (layer "F.Cu") (net 97) (tstamp b02fa043-d958-45a3-bb12-3723862a8138))
-  (segment (start 299.780408 168.95064) (end 313.54522 168.95064) (width 0.254) (layer "F.Cu") (net 97) (tstamp d6b3db5b-00e8-4ca6-a9ad-d22cd97cc1bd))
-  (segment (start 293.67988 137.43432) (end 297.64736 141.4018) (width 0.254) (layer "F.Cu") (net 97) (tstamp e593bfa0-b856-4561-b450-b601efbc3d75))
-  (segment (start 359.151114 168.421022) (end 323.211162 168.421022) (width 0.254) (layer "B.Cu") (net 97) (tstamp 31292e35-45f4-40cc-b1e2-545acaceaf98))
-  (segment (start 363.307144 157.152992) (end 360.987989 159.472147) (width 0.254) (layer "B.Cu") (net 97) (tstamp 51903c35-4401-4a59-a51f-f984abe75033))
-  (segment (start 369.897011 133.931011) (end 374.969943 133.931011) (width 0.254) (layer "B.Cu") (net 97) (tstamp 56bec156-a68f-41a1-a460-4759990eeaac))
-  (segment (start 378.259987 154.080283) (end 375.187279 157.152991) (width 0.254) (layer "B.Cu") (net 97) (tstamp 72e3c2d6-ca7b-4666-9e82-da6e9dd4a36d))
-  (segment (start 374.969943 133.931011) (end 378.259989 137.221057) (width 0.254) (layer "B.Cu") (net 97) (tstamp 7d0bdd4c-89e2-424d-a024-3d09fdf9830f))
-  (segment (start 360.987989 159.472147) (end 360.987987 166.584149) (width 0.254) (layer "B.Cu") (net 97) (tstamp 87a013a7-a66c-4a2e-85b7-ba3e2a0e4e9a))
-  (segment (start 378.259989 137.221057) (end 378.259987 154.080283) (width 0.254) (layer "B.Cu") (net 97) (tstamp 8ef70cde-e808-410f-8ab6-b479be9720bf))
-  (segment (start 318.643 163.85286) (end 323.211162 168.421022) (width 0.254) (layer "B.Cu") (net 97) (tstamp a68ee507-58b9-4dbd-8d59-5cd85b57d6d9))
-  (segment (start 367.3602 131.3942) (end 369.897011 133.931011) (width 0.254) (layer "B.Cu") (net 97) (tstamp bef31e93-2d13-4e25-b69f-a9546cc8ae60))
-  (segment (start 367.3602 127.889) (end 367.3602 131.3942) (width 0.254) (layer "B.Cu") (net 97) (tstamp c193e842-ba32-41b0-b530-062678a77076))
-  (segment (start 375.187279 157.152991) (end 363.307144 157.152992) (width 0.254) (layer "B.Cu") (net 97) (tstamp e3719540-9147-4e77-b2dd-6fa718d83de1))
-  (segment (start 360.987987 166.584149) (end 359.151114 168.421022) (width 0.254) (layer "B.Cu") (net 97) (tstamp ecc796db-5ddb-4cc4-acdd-b7716f4f5831))
-  (segment (start 374.856844 134.45998) (end 377.805978 137.409114) (width 0.254) (layer "B.Cu") (net 98) (tstamp 0a9a6e4a-efc1-41dd-9d20-c264fde3a6de))
-  (segment (start 377.805978 137.409114) (end 377.805977 153.892225) (width 0.254) (layer "B.Cu") (net 98) (tstamp 110504c4-fb2d-4207-bbbe-87f18a332e1a))
-  (segment (start 363.118869 126.549501) (end 363.118869 131.683124) (width 0.254) (layer "B.Cu") (net 98) (tstamp 24f9e218-66f0-4b6e-b83c-5d80033abf7d))
-  (segment (start 330.377151 167.967011) (end 326.263 163.85286) (width 0.254) (layer "B.Cu") (net 98) (tstamp 292520f1-9889-481c-b609-80474b0421ba))
-  (segment (start 365.895724 134.459979) (end 374.856844 134.45998) (width 0.254) (layer "B.Cu") (net 98) (tstamp 31f03dba-54cf-442b-ba89-7734b3d3bafc))
-  (segment (start 377.805977 153.892225) (end 374.999222 156.69898) (width 0.254) (layer "B.Cu") (net 98) (tstamp 657cdb04-a9ab-430f-b21d-cbe73d144f9d))
-  (segment (start 358.963057 167.967011) (end 330.377151 167.967011) (width 0.254) (layer "B.Cu") (net 98) (tstamp 6b00cb3b-b16e-4d4c-b72d-a84efb534f09))
-  (segment (start 368.046 112.9261) (end 368.046 116.84) (width 0.254) (layer "B.Cu") (net 98) (tstamp 86a78959-eaba-4a03-ad4c-4d49feca7fe0))
-  (segment (start 368.046 116.84) (end 368.046 121.62237) (width 0.254) (layer "B.Cu") (net 98) (tstamp 88f4edb1-cea1-4708-910b-41405568c4af))
-  (segment (start 363.118869 131.683124) (end 365.895724 134.459979) (width 0.254) (layer "B.Cu") (net 98) (tstamp a0b68b26-8cab-47e3-916a-060b107a11f5))
-  (segment (start 368.046 121.62237) (end 363.118869 126.549501) (width 0.254) (layer "B.Cu") (net 98) (tstamp ce83b0ef-c178-45e6-88b9-a123974050ce))
-  (segment (start 374.999222 156.69898) (end 363.119088 156.69898) (width 0.254) (layer "B.Cu") (net 98) (tstamp d1e7e4ad-adcc-4eb6-ba37-06e9eacaaf85))
-  (segment (start 360.533978 159.28409) (end 360.533977 166.396091) (width 0.254) (layer "B.Cu") (net 98) (tstamp e328007b-1508-4063-9a58-778a436c08f7))
-  (segment (start 363.119088 156.69898) (end 360.533978 159.28409) (width 0.254) (layer "B.Cu") (net 98) (tstamp f0dd8bae-b304-4877-9294-49cc72394717))
-  (segment (start 360.533977 166.396091) (end 358.963057 167.967011) (width 0.254) (layer "B.Cu") (net 98) (tstamp f8a4bfe6-6276-41b3-84c3-7d7207fcdd4a))
-  (segment (start 315.9506 164.00526) (end 315.9506 164.62502) (width 0.254) (layer "B.Cu") (net 99) (tstamp 2259d9ce-c64a-4750-8b27-26cb9c393023))
-  (segment (start 315.9506 164.62502) (end 323.14388 171.8183) (width 0.254) (layer "B.Cu") (net 99) (tstamp 4cb71c22-b1c4-4a82-ae7f-7fcadee39611))
-  (segment (start 319.0471 171.8564) (end 323.10578 171.8564) (width 0.254) (layer "B.Cu") (net 99) (tstamp 8d24c3ee-e4ab-45d4-bf09-421c935ec6dd))
-  (segment (start 81.60258 175.54194) (end 81.60258 171.09186) (width 0.254) (layer "F.Cu") (net 100) (tstamp bb9b1d12-abc5-4d87-bd38-e00c7e14a442))
-  (segment (start 75.184 166.57828) (end 79.68488 171.07916) (width 0.254) (layer "B.Cu") (net 100) (tstamp 06af7a58-416d-4306-bdd1-661378067e28))
-  (segment (start 69.85 156.464) (end 69.85 159.893) (width 0.254) (layer "B.Cu") (net 100) (tstamp 147a8848-73eb-481f-b870-1feb76fc2190))
-  (segment (start 69.85 156.464) (end 67.2569 156.464) (width 0.254) (layer "B.Cu") (net 100) (tstamp 1a83e9e7-cdbf-4146-bd12-7fb6692a26c9))
-  (segment (start 75.184 165.227) (end 75.184 166.57828) (width 0.254) (layer "B.Cu") (net 100) (tstamp 2a4eacd7-b371-4a21-aca8-803ad36fae95))
-  (segment (start 69.85 159.893) (end 75.184 165.227) (width 0.254) (layer "B.Cu") (net 100) (tstamp 7d9468a3-8884-43ba-a420-df67f6697f6d))
-  (segment (start 79.68488 171.07916) (end 81.58988 171.07916) (width 0.254) (layer "B.Cu") (net 100) (tstamp c05a2ec6-fe18-42e6-a479-30bd6578a77d))
-  (segment (start 69.85 152.4) (end 69.85 156.464) (width 0.254) (layer "B.Cu") (net 100) (tstamp ceb88386-cbc6-4702-bd1f-4190c4f3c4d1))
-  (segment (start 84.14258 175.54194) (end 84.14258 172.915584) (width 0.254) (layer "F.Cu") (net 101) (tstamp 0cf8b839-762b-41ce-b639-52a161a2d53c))
-  (segment (start 84.12988 171.07916) (end 84.12988 172.902884) (width 0.254) (layer "F.Cu") (net 101) (tstamp e0cd38fc-fa38-4c1b-819c-c11337d6427d))
-  (segment (start 84.14258 172.915584) (end 84.12988 172.902884) (width 0.254) (layer "F.Cu") (net 101) (tstamp fb4c9b49-c5b6-4486-aa4b-f197bbaa2b7e))
-  (via (at 84.12988 172.902884) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 101) (tstamp 1c07b2fe-97aa-4517-8530-39bded857bbe))
-  (segment (start 298.018849 174.317011) (end 279.204875 174.317011) (width 0.254) (layer "B.Cu") (net 101) (tstamp 19e48679-c93c-4921-bc28-b7e8925c117b))
-  (segment (start 91.862748 172.902884) (end 84.12988 172.902884) (width 0.254) (layer "B.Cu") (net 101) (tstamp 1b37a457-20ab-45e4-940e-1eaedc4ddd35))
-  (segment (start 274.759875 169.872011) (end 224.096125 169.872011) (width 0.254) (layer "B.Cu") (net 101) (tstamp 39fb56a0-7c44-44bf-b783-d47376548499))
-  (segment (start 117.089114 176.29502) (end 95.254884 176.29502) (width 0.254) (layer "B.Cu") (net 101) (tstamp 75e71433-9fdc-47f8-88e1-e9b725aca37a))
-  (segment (start 224.096125 169.872011) (end 219.051092 174.917042) (width 0.254) (layer "B.Cu") (net 101) (tstamp a50a0ecf-0c99-4c5a-bbb8-0fb210554e9e))
-  (segment (start 95.254884 176.29502) (end 91.862748 172.902884) (width 0.254) (layer "B.Cu") (net 101) (tstamp aef6d03b-109c-440a-95a6-1561326251f9))
-  (segment (start 308.483 163.85286) (end 298.018849 174.317011) (width 0.254) (layer "B.Cu") (net 101) (tstamp bf5f3553-5482-4a34-bbe2-e1dbdc441d2a))
-  (segment (start 123.312114 170.072022) (end 117.089114 176.29502) (width 0.254) (layer "B.Cu") (net 101) (tstamp c32fb363-a9e1-48a4-8a8b-7e2b143e8dc5))
-  (segment (start 219.051092 174.917042) (end 191.68811 174.917042) (width 0.254) (layer "B.Cu") (net 101) (tstamp c530214b-80f3-455d-9588-ef66a42a859e))
-  (segment (start 186.84309 170.072022) (end 123.312114 170.072022) (width 0.254) (layer "B.Cu") (net 101) (tstamp da9f2248-81f3-45c2-b736-bcccbf215dcc))
-  (segment (start 279.204875 174.317011) (end 274.759875 169.872011) (width 0.254) (layer "B.Cu") (net 101) (tstamp dd5ff8aa-591f-439f-b5cc-a5e4affc7045))
-  (segment (start 191.68811 174.917042) (end 186.84309 170.072022) (width 0.254) (layer "B.Cu") (net 101) (tstamp fbcedb54-52d7-409c-9323-07077c587a8b))
+  (segment (start 177.99558 131.96316) (end 187.26658 131.96316) (width 0.254) (layer "B.Cu") (net 64) (tstamp 5393ee41-f346-4e8f-924b-b27acb0a31f3))
+  (segment (start 77.99578 112.91316) (end 87.08898 112.91316) (width 0.254) (layer "B.Cu") (net 65) (tstamp df00fb18-f89c-43b5-80b1-88905d7383dc))
+  (segment (start 111.32058 151.01316) (end 120.59158 151.01316) (width 0.254) (layer "B.Cu") (net 66) (tstamp 148a2d9c-583f-4145-96fc-a11f61e60c69))
+  (segment (start 168.47058 151.01316) (end 177.74158 151.01316) (width 0.254) (layer "B.Cu") (net 67) (tstamp 5f9915ac-bb97-4c3d-bd1a-0f87d7c0efe5))
+  (segment (start 158.94558 131.96316) (end 168.21658 131.96316) (width 0.254) (layer "B.Cu") (net 68) (tstamp bd1500e8-53b9-4e8e-ac76-d7c40ab95013))
+  (segment (start 82.74558 131.96316) (end 92.01658 131.96316) (width 0.254) (layer "B.Cu") (net 69) (tstamp 931925c0-26eb-4af1-b012-b8e7d8ac00a4))
+  (segment (start 101.79558 131.96316) (end 111.06658 131.96316) (width 0.254) (layer "B.Cu") (net 70) (tstamp 235d2478-99bf-4a36-a9f2-a6f1a862ac4e))
+  (segment (start 149.42058 151.01316) (end 158.69158 151.01316) (width 0.254) (layer "B.Cu") (net 71) (tstamp 63819036-3d76-4588-b249-d6ba55d616c1))
+  (segment (start 139.89558 131.96316) (end 149.16658 131.96316) (width 0.254) (layer "B.Cu") (net 72) (tstamp 0cef585e-7e2a-4bda-b27f-6ecb95cd2d88))
+  (segment (start 311.34558 131.96316) (end 320.8274 131.96316) (width 0.254) (layer "B.Cu") (net 73) (tstamp e65a66e0-642d-4e41-b780-ab62d2d55720))
+  (segment (start 96.86798 112.91316) (end 106.13898 112.91316) (width 0.254) (layer "B.Cu") (net 74) (tstamp dde46b14-039c-44dd-859d-8bf120d303bb))
+  (segment (start 130.37058 151.01316) (end 139.64158 151.01316) (width 0.254) (layer "B.Cu") (net 75) (tstamp 3249ae4d-b1d5-488f-930c-1295fda31290))
+  (segment (start 120.84558 131.96316) (end 130.11658 131.96316) (width 0.254) (layer "B.Cu") (net 76) (tstamp a86b3d5b-d757-44cb-abba-3a835be0e155))
+  (segment (start 336.677 118.35892) (end 336.677 114.16538) (width 0.254) (layer "F.Cu") (net 89) (tstamp 65cdda1e-603f-425f-aed8-667cfced467d))
+  (segment (start 289.0393 118.35892) (end 289.0393 114.05108) (width 0.254) (layer "F.Cu") (net 89) (tstamp bdc6fefb-491b-43ef-a60c-b15be29a3229))
+  (segment (start 360.079967 159.096033) (end 360.079967 166.208033) (width 0.254) (layer "B.Cu") (net 89) (tstamp 01835d02-5934-4665-843a-2f9d315ed2ce))
+  (segment (start 340.73527 118.34433) (end 362.71773 118.34433) (width 0.254) (layer "B.Cu") (net 89) (tstamp 0aa1aa21-3816-40e1-a1f8-a72b6b24ddac))
+  (segment (start 362.664858 126.361444) (end 362.664858 133.723946) (width 0.254) (layer "B.Cu") (net 89) (tstamp 0c03ebda-7b96-4bfc-a3d4-bcc2e8d06a1a))
+  (segment (start 339.1916 119.888) (end 340.73527 118.34433) (width 0.254) (layer "B.Cu") (net 89) (tstamp 12ba2d80-9494-4c9d-82ec-3782318b195e))
+  (segment (start 290.58108 119.888) (end 289.052 118.35892) (width 0.254) (layer "B.Cu") (net 89) (tstamp 46e6ab56-4272-4bfc-a9d5-f068d236b3cf))
+  (segment (start 358.775 167.513) (end 332.46314 167.513) (width 0.254) (layer "B.Cu") (net 89) (tstamp 4c8e63ae-4e1c-4ed6-b1fd-7c4f4e32424a))
+  (segment (start 362.664858 133.723946) (end 363.854902 134.91399) (width 0.254) (layer "B.Cu") (net 89) (tstamp 4f5ba117-3cc7-487d-9642-7a93b63843e0))
+  (segment (start 336.804 119.888) (end 290.58108 119.888) (width 0.254) (layer "B.Cu") (net 89) (tstamp 5e2c67d3-868e-4ad7-a108-5317c2698a20))
+  (segment (start 377.351967 137.597171) (end 377.351967 153.704167) (width 0.254) (layer "B.Cu") (net 89) (tstamp 5fdb4cd6-dcb4-4c1f-a6c4-7d7f7b70ff75))
+  (segment (start 362.71773 118.34433) (end 362.71773 126.308572) (width 0.254) (layer "B.Cu") (net 89) (tstamp 644e84b2-e643-450c-b6b6-13a8523df492))
+  (segment (start 362.71773 126.308572) (end 362.664858 126.361444) (width 0.254) (layer "B.Cu") (net 89) (tstamp 7de6e018-5a8a-4334-8f14-95a62196de40))
+  (segment (start 360.079967 166.208033) (end 358.775 167.513) (width 0.254) (layer "B.Cu") (net 89) (tstamp 830f3937-7fc7-4d46-aa52-c6038ab00188))
+  (segment (start 362.966 156.21) (end 360.079967 159.096033) (width 0.254) (layer "B.Cu") (net 89) (tstamp 8ad7bbda-bf63-4cef-bb61-19c2405167af))
+  (segment (start 374.668786 134.91399) (end 377.351967 137.597171) (width 0.254) (layer "B.Cu") (net 89) (tstamp 8d63928f-fc7a-4779-a3dc-338ee06f6a75))
+  (segment (start 374.846134 156.21) (end 362.966 156.21) (width 0.254) (layer "B.Cu") (net 89) (tstamp 9a065fe6-e661-4349-b5b3-de05d494f65b))
+  (segment (start 336.804 119.888) (end 339.1916 119.888) (width 0.254) (layer "B.Cu") (net 89) (tstamp b912aaf2-f760-4087-99be-14eac12914fc))
+  (segment (start 332.46314 167.513) (end 328.803 163.85286) (width 0.254) (layer "B.Cu") (net 89) (tstamp d35476eb-e376-46b9-88ff-33661013cdb3))
+  (segment (start 336.804 119.888) (end 336.804 118.48592) (width 0.254) (layer "B.Cu") (net 89) (tstamp df9a45e4-2900-459f-abeb-4241d2c622bc))
+  (segment (start 363.854902 134.91399) (end 374.668786 134.91399) (width 0.254) (layer "B.Cu") (net 89) (tstamp ed8e7f65-aca2-4046-9473-411b953cd2e6))
+  (segment (start 377.351967 153.704167) (end 374.846134 156.21) (width 0.254) (layer "B.Cu") (net 89) (tstamp f3fc9ada-245d-42ce-9cc5-acfffbd302a2))
+  (segment (start 374.856844 134.45998) (end 377.805978 137.409114) (width 0.254) (layer "B.Cu") (net 90) (tstamp 0a9a6e4a-efc1-41dd-9d20-c264fde3a6de))
+  (segment (start 377.805978 137.409114) (end 377.805977 153.892225) (width 0.254) (layer "B.Cu") (net 90) (tstamp 110504c4-fb2d-4207-bbbe-87f18a332e1a))
+  (segment (start 363.118869 126.549501) (end 363.118869 131.683124) (width 0.254) (layer "B.Cu") (net 90) (tstamp 24f9e218-66f0-4b6e-b83c-5d80033abf7d))
+  (segment (start 330.377151 167.967011) (end 326.263 163.85286) (width 0.254) (layer "B.Cu") (net 90) (tstamp 292520f1-9889-481c-b609-80474b0421ba))
+  (segment (start 365.895724 134.459979) (end 374.856844 134.45998) (width 0.254) (layer "B.Cu") (net 90) (tstamp 31f03dba-54cf-442b-ba89-7734b3d3bafc))
+  (segment (start 377.805977 153.892225) (end 374.999222 156.69898) (width 0.254) (layer "B.Cu") (net 90) (tstamp 657cdb04-a9ab-430f-b21d-cbe73d144f9d))
+  (segment (start 358.963057 167.967011) (end 330.377151 167.967011) (width 0.254) (layer "B.Cu") (net 90) (tstamp 6b00cb3b-b16e-4d4c-b72d-a84efb534f09))
+  (segment (start 368.046 112.9261) (end 368.046 116.84) (width 0.254) (layer "B.Cu") (net 90) (tstamp 86a78959-eaba-4a03-ad4c-4d49feca7fe0))
+  (segment (start 368.046 116.84) (end 368.046 121.62237) (width 0.254) (layer "B.Cu") (net 90) (tstamp 88f4edb1-cea1-4708-910b-41405568c4af))
+  (segment (start 363.118869 131.683124) (end 365.895724 134.459979) (width 0.254) (layer "B.Cu") (net 90) (tstamp a0b68b26-8cab-47e3-916a-060b107a11f5))
+  (segment (start 368.046 121.62237) (end 363.118869 126.549501) (width 0.254) (layer "B.Cu") (net 90) (tstamp ce83b0ef-c178-45e6-88b9-a123974050ce))
+  (segment (start 374.999222 156.69898) (end 363.119088 156.69898) (width 0.254) (layer "B.Cu") (net 90) (tstamp d1e7e4ad-adcc-4eb6-ba37-06e9eacaaf85))
+  (segment (start 360.533978 159.28409) (end 360.533977 166.396091) (width 0.254) (layer "B.Cu") (net 90) (tstamp e328007b-1508-4063-9a58-778a436c08f7))
+  (segment (start 363.119088 156.69898) (end 360.533978 159.28409) (width 0.254) (layer "B.Cu") (net 90) (tstamp f0dd8bae-b304-4877-9294-49cc72394717))
+  (segment (start 360.533977 166.396091) (end 358.963057 167.967011) (width 0.254) (layer "B.Cu") (net 90) (tstamp f8a4bfe6-6276-41b3-84c3-7d7207fcdd4a))
+  (segment (start 329.33894 155.6258) (end 329.33894 156.37256) (width 0.254) (layer "F.Cu") (net 91) (tstamp 0c090c11-3fcf-439f-bd18-cedef88f1972))
+  (segment (start 330.39558 132.188569) (end 335.515569 132.188569) (width 0.254) (layer "F.Cu") (net 91) (tstamp 218d0b95-6d04-4690-b2d3-e3bc31be9dd4))
+  (segment (start 329.33894 156.37256) (end 324.96506 160.74644) (width 0.254) (layer "F.Cu") (net 91) (tstamp 22928b6c-297f-4d42-998f-e83f465fe49c))
+  (segment (start 335.515569 132.188569) (end 338.175602 134.848602) (width 0.254) (layer "F.Cu") (net 91) (tstamp 2d4b6e58-ed38-4494-bb5c-4b7ef4eb0f01))
+  (segment (start 324.96506 160.74644) (end 324.96506 162.6108) (width 0.254) (layer "F.Cu") (net 91) (tstamp 404b3e27-9821-40bf-b591-80e8229d0935))
+  (segment (start 332.90256 154.49296) (end 332.44282 154.49296) (width 0.254) (layer "F.Cu") (net 91) (tstamp 4174b076-07db-4528-8c8c-cd5036498c9f))
+  (segment (start 338.175602 137.566398) (end 337.312 138.43) (width 0.254) (layer "F.Cu") (net 91) (tstamp 43edb5f7-37a2-4b2e-bc2a-6a58be889cb1))
+  (segment (start 324.96506 162.6108) (end 323.723 163.85286) (width 0.254) (layer "F.Cu") (net 91) (tstamp 8239a750-bed9-45f7-8213-46442c9bb43c))
+  (segment (start 337.312 150.08352) (end 332.90256 154.49296) (width 0.254) (layer "F.Cu") (net 91) (tstamp cacb1b72-9a07-4843-a77a-5785f22577c6))
+  (segment (start 337.312 138.43) (end 337.312 150.08352) (width 0.254) (layer "F.Cu") (net 91) (tstamp d2d5c6d8-31ab-41ef-95bc-d4ce2becc8ba))
+  (segment (start 338.175602 134.848602) (end 338.175602 137.566398) (width 0.254) (layer "F.Cu") (net 91) (tstamp dd178c1d-afe6-45cf-b1f3-570a293cd2d8))
+  (segment (start 329.3237 154.52344) (end 329.3237 155.61056) (width 0.254) (layer "F.Cu") (net 91) (tstamp f66a0310-5aa9-460d-b63c-55202a1d8268))
+  (segment (start 329.3237 155.61056) (end 329.33894 155.6258) (width 0.254) (layer "F.Cu") (net 91) (tstamp feaa3985-79cb-4d0e-a0de-37b4da90d23c))
+  (via (at 329.3237 154.52344) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 91) (tstamp 05c72df9-a5d0-40f2-b642-e630f5aa68a2))
+  (via (at 332.44282 154.49296) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 91) (tstamp ccb7632f-b951-4911-98d9-41febae3285d))
+  (segment (start 329.35418 154.49296) (end 329.3237 154.52344) (width 0.254) (layer "B.Cu") (net 91) (tstamp 4e2d6f51-8b55-45be-9fdd-f109aa5d8f6f))
+  (segment (start 332.44282 154.49296) (end 329.35418 154.49296) (width 0.254) (layer "B.Cu") (net 91) (tstamp ffcdcce0-485e-4f01-930e-9a548ca2a98e))
+  (segment (start 322.4403 160.55086) (end 323.328757 159.662403) (width 0.254) (layer "F.Cu") (net 92) (tstamp 0be191ae-434f-4269-8824-54bf727b6e9b))
+  (segment (start 337.766011 138.991989) (end 337.76601 150.271578) (width 0.254) (layer "F.Cu") (net 92) (tstamp 19545264-0c9f-4d06-bc35-ccf110139d98))
+  (segment (start 323.328757 159.662403) (end 323.328757 156.714779) (width 0.254) (layer "F.Cu") (net 92) (tstamp 2773eaf2-8504-4154-b660-e4aa49f1e058))
+  (segment (start 333.756 127.19558) (end 333.756 129.54) (width 0.254) (layer "F.Cu") (net 92) (tstamp 3dd6ab8c-5b59-4e39-93a3-4b850a7e3275))
+  (segment (start 338.709 134.493) (end 338.709 138.049) (width 0.254) (layer "F.Cu") (net 92) (tstamp 5a52c52b-e5c1-4ccc-bdfc-498c33ff367f))
+  (segment (start 331.832018 156.20557) (end 331.205288 156.20557) (width 0.254) (layer "F.Cu") (net 92) (tstamp 71dc87da-2a96-4b46-a5fe-a38b89afabfe))
+  (segment (start 333.756 129.54) (end 338.709 134.493) (width 0.254) (layer "F.Cu") (net 92) (tstamp 72d57d7b-6c32-4ab5-baeb-052217accb20))
+  (segment (start 337.76601 150.271578) (end 331.832018 156.20557) (width 0.254) (layer "F.Cu") (net 92) (tstamp 8ca104da-1c75-45e4-a182-53b149a66c35))
+  (segment (start 322.4403 162.59556) (end 322.4403 160.55086) (width 0.254) (layer "F.Cu") (net 92) (tstamp cde2d229-3198-46e3-b9dd-283145aec451))
+  (segment (start 330.39558 123.83516) (end 333.756 127.19558) (width 0.254) (layer "F.Cu") (net 92) (tstamp d8db25f1-1f25-4109-b770-518d0492c411))
+  (segment (start 321.183 163.85286) (end 322.4403 162.59556) (width 0.254) (layer "F.Cu") (net 92) (tstamp eabaeb21-cc83-4321-b090-c32f57e5f017))
+  (segment (start 338.709 138.049) (end 337.766011 138.991989) (width 0.254) (layer "F.Cu") (net 92) (tstamp ece711e7-0c38-45a5-a32c-7b9742f1b3ac))
+  (via (at 331.205288 156.20557) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 92) (tstamp 1d5ab6d3-787e-4b0b-9caf-63e893c9d46a))
+  (via (at 323.328757 156.714779) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 92) (tstamp 8dbfc843-cb24-4c5d-b6e0-afb944cf217b))
+  (segment (start 331.205288 156.20557) (end 323.837966 156.20557) (width 0.254) (layer "B.Cu") (net 92) (tstamp 069afd55-031a-4966-970c-22df708680ba))
+  (segment (start 323.837966 156.20557) (end 323.328757 156.714779) (width 0.254) (layer "B.Cu") (net 92) (tstamp 746244d1-91b3-4ad8-9acb-decf08b27898))
+  (segment (start 313.54522 168.95064) (end 318.643 163.85286) (width 0.254) (layer "F.Cu") (net 93) (tstamp 3abe7904-2147-45a8-b81f-5635b592a609))
+  (segment (start 293.67988 137.43432) (end 293.67988 132.97916) (width 0.254) (layer "F.Cu") (net 93) (tstamp 94b7b0a9-81ea-4c89-9aeb-d682049650ac))
+  (segment (start 297.64736 141.4018) (end 297.64736 166.817592) (width 0.254) (layer "F.Cu") (net 93) (tstamp affaeb92-8051-4be6-a8ae-c40a72413bae))
+  (segment (start 297.64736 166.817592) (end 299.780408 168.95064) (width 0.254) (layer "F.Cu") (net 93) (tstamp b02fa043-d958-45a3-bb12-3723862a8138))
+  (segment (start 299.780408 168.95064) (end 313.54522 168.95064) (width 0.254) (layer "F.Cu") (net 93) (tstamp d6b3db5b-00e8-4ca6-a9ad-d22cd97cc1bd))
+  (segment (start 293.67988 137.43432) (end 297.64736 141.4018) (width 0.254) (layer "F.Cu") (net 93) (tstamp e593bfa0-b856-4561-b450-b601efbc3d75))
+  (segment (start 359.151114 168.421022) (end 323.211162 168.421022) (width 0.254) (layer "B.Cu") (net 93) (tstamp 31292e35-45f4-40cc-b1e2-545acaceaf98))
+  (segment (start 363.307144 157.152992) (end 360.987989 159.472147) (width 0.254) (layer "B.Cu") (net 93) (tstamp 51903c35-4401-4a59-a51f-f984abe75033))
+  (segment (start 369.897011 133.931011) (end 374.969943 133.931011) (width 0.254) (layer "B.Cu") (net 93) (tstamp 56bec156-a68f-41a1-a460-4759990eeaac))
+  (segment (start 378.259987 154.080283) (end 375.187279 157.152991) (width 0.254) (layer "B.Cu") (net 93) (tstamp 72e3c2d6-ca7b-4666-9e82-da6e9dd4a36d))
+  (segment (start 374.969943 133.931011) (end 378.259989 137.221057) (width 0.254) (layer "B.Cu") (net 93) (tstamp 7d0bdd4c-89e2-424d-a024-3d09fdf9830f))
+  (segment (start 360.987989 159.472147) (end 360.987987 166.584149) (width 0.254) (layer "B.Cu") (net 93) (tstamp 87a013a7-a66c-4a2e-85b7-ba3e2a0e4e9a))
+  (segment (start 378.259989 137.221057) (end 378.259987 154.080283) (width 0.254) (layer "B.Cu") (net 93) (tstamp 8ef70cde-e808-410f-8ab6-b479be9720bf))
+  (segment (start 318.643 163.85286) (end 323.211162 168.421022) (width 0.254) (layer "B.Cu") (net 93) (tstamp a68ee507-58b9-4dbd-8d59-5cd85b57d6d9))
+  (segment (start 367.3602 131.3942) (end 369.897011 133.931011) (width 0.254) (layer "B.Cu") (net 93) (tstamp bef31e93-2d13-4e25-b69f-a9546cc8ae60))
+  (segment (start 367.3602 127.889) (end 367.3602 131.3942) (width 0.254) (layer "B.Cu") (net 93) (tstamp c193e842-ba32-41b0-b530-062678a77076))
+  (segment (start 375.187279 157.152991) (end 363.307144 157.152992) (width 0.254) (layer "B.Cu") (net 93) (tstamp e3719540-9147-4e77-b2dd-6fa718d83de1))
+  (segment (start 360.987987 166.584149) (end 359.151114 168.421022) (width 0.254) (layer "B.Cu") (net 93) (tstamp ecc796db-5ddb-4cc4-acdd-b7716f4f5831))
+  (segment (start 315.9506 164.00526) (end 315.9506 164.62502) (width 0.254) (layer "B.Cu") (net 94) (tstamp 2259d9ce-c64a-4750-8b27-26cb9c393023))
+  (segment (start 315.9506 164.62502) (end 323.14388 171.8183) (width 0.254) (layer "B.Cu") (net 94) (tstamp 4cb71c22-b1c4-4a82-ae7f-7fcadee39611))
+  (segment (start 319.0471 171.8564) (end 323.10578 171.8564) (width 0.254) (layer "B.Cu") (net 94) (tstamp 8d24c3ee-e4ab-45d4-bf09-421c935ec6dd))
+  (segment (start 298.24999 132.549854) (end 297.602336 131.9022) (width 0.254) (layer "F.Cu") (net 95) (tstamp 0783121f-b4d9-4fd4-915a-67bebea85fa5))
+  (segment (start 298.24999 166.610514) (end 298.24999 132.549854) (width 0.254) (layer "F.Cu") (net 95) (tstamp 1b942cb7-4d9d-434e-b901-bc143974fa73))
+  (segment (start 297.0276 131.9022) (end 297.602336 131.9022) (width 0.254) (layer "F.Cu") (net 95) (tstamp 6591ad45-bf64-497e-b70d-f0415f8d3b10))
+  (segment (start 313.563 163.85286) (end 309.373242 168.042618) (width 0.254) (layer "F.Cu") (net 95) (tstamp 6fe9ed41-018e-48e3-84a8-d7f3088724e1))
+  (segment (start 309.373242 168.042618) (end 299.682094 168.042618) (width 0.254) (layer "F.Cu") (net 95) (tstamp 765467ea-b41c-4558-8739-778df8596ddd))
+  (segment (start 299.682094 168.042618) (end 298.24999 166.610514) (width 0.254) (layer "F.Cu") (net 95) (tstamp df5aa450-bb48-4d5e-b84c-06e4b3be3e25))
+  (via (at 297.0276 131.9022) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 95) (tstamp 7d6ef589-7bac-4a62-99af-ee3eac6673ad))
+  (segment (start 297.0276 131.9022) (end 292.41242 131.9022) (width 0.254) (layer "B.Cu") (net 95) (tstamp 2f3305b5-0649-422a-9524-a12c56aee793))
+  (segment (start 298.704001 166.422457) (end 299.870151 167.588607) (width 0.254) (layer "F.Cu") (net 96) (tstamp 25b9d920-a0ab-4c82-9e50-fec48216d402))
+  (segment (start 292.47927 123.83516) (end 295.222892 126.578782) (width 0.254) (layer "F.Cu") (net 96) (tstamp 4ebf543d-3d51-42df-affb-582851a8389f))
+  (segment (start 307.287253 167.588607) (end 311.023 163.85286) (width 0.254) (layer "F.Cu") (net 96) (tstamp 501fc7b6-a7a8-43e3-aabb-243c5a26d50c))
+  (segment (start 295.222892 128.344892) (end 298.704 131.826) (width 0.254) (layer "F.Cu") (net 96) (tstamp 8948a950-5dd7-4e98-9a64-bb8e1bf7df2a))
+  (segment (start 298.704 131.826) (end 298.704001 166.422457) (width 0.254) (layer "F.Cu") (net 96) (tstamp ca161565-7d44-4665-b4e1-8b18f085ae62))
+  (segment (start 299.870151 167.588607) (end 307.287253 167.588607) (width 0.254) (layer "F.Cu") (net 96) (tstamp deb3abb8-815d-4c25-a8b2-e739d05ffb86))
+  (segment (start 295.222892 126.578782) (end 295.222892 128.344892) (width 0.254) (layer "F.Cu") (net 96) (tstamp f40f7573-3d31-44be-9c97-6abbb496c2c9))
+  (segment (start 84.14258 175.54194) (end 84.14258 172.915584) (width 0.254) (layer "F.Cu") (net 97) (tstamp 0cf8b839-762b-41ce-b639-52a161a2d53c))
+  (segment (start 84.12988 171.07916) (end 84.12988 172.902884) (width 0.254) (layer "F.Cu") (net 97) (tstamp e0cd38fc-fa38-4c1b-819c-c11337d6427d))
+  (segment (start 84.14258 172.915584) (end 84.12988 172.902884) (width 0.254) (layer "F.Cu") (net 97) (tstamp fb4c9b49-c5b6-4486-aa4b-f197bbaa2b7e))
+  (via (at 84.12988 172.902884) (size 0.8128) (drill 0.4064) (layers "F.Cu" "B.Cu") (net 97) (tstamp 1c07b2fe-97aa-4517-8530-39bded857bbe))
+  (segment (start 298.018849 174.317011) (end 279.204875 174.317011) (width 0.254) (layer "B.Cu") (net 97) (tstamp 19e48679-c93c-4921-bc28-b7e8925c117b))
+  (segment (start 91.862748 172.902884) (end 84.12988 172.902884) (width 0.254) (layer "B.Cu") (net 97) (tstamp 1b37a457-20ab-45e4-940e-1eaedc4ddd35))
+  (segment (start 274.759875 169.872011) (end 224.096125 169.872011) (width 0.254) (layer "B.Cu") (net 97) (tstamp 39fb56a0-7c44-44bf-b783-d47376548499))
+  (segment (start 117.089114 176.29502) (end 95.254884 176.29502) (width 0.254) (layer "B.Cu") (net 97) (tstamp 75e71433-9fdc-47f8-88e1-e9b725aca37a))
+  (segment (start 224.096125 169.872011) (end 219.051092 174.917042) (width 0.254) (layer "B.Cu") (net 97) (tstamp a50a0ecf-0c99-4c5a-bbb8-0fb210554e9e))
+  (segment (start 95.254884 176.29502) (end 91.862748 172.902884) (width 0.254) (layer "B.Cu") (net 97) (tstamp aef6d03b-109c-440a-95a6-1561326251f9))
+  (segment (start 308.483 163.85286) (end 298.018849 174.317011) (width 0.254) (layer "B.Cu") (net 97) (tstamp bf5f3553-5482-4a34-bbe2-e1dbdc441d2a))
+  (segment (start 123.312114 170.072022) (end 117.089114 176.29502) (width 0.254) (layer "B.Cu") (net 97) (tstamp c32fb363-a9e1-48a4-8a8b-7e2b143e8dc5))
+  (segment (start 219.051092 174.917042) (end 191.68811 174.917042) (width 0.254) (layer "B.Cu") (net 97) (tstamp c530214b-80f3-455d-9588-ef66a42a859e))
+  (segment (start 186.84309 170.072022) (end 123.312114 170.072022) (width 0.254) (layer "B.Cu") (net 97) (tstamp da9f2248-81f3-45c2-b736-bcccbf215dcc))
+  (segment (start 279.204875 174.317011) (end 274.759875 169.872011) (width 0.254) (layer "B.Cu") (net 97) (tstamp dd5ff8aa-591f-439f-b5cc-a5e4affc7045))
+  (segment (start 191.68811 174.917042) (end 186.84309 170.072022) (width 0.254) (layer "B.Cu") (net 97) (tstamp fbcedb54-52d7-409c-9323-07077c587a8b))
+  (segment (start 309.660001 164.417821) (end 299.198822 174.879) (width 0.254) (layer "B.Cu") (net 98) (tstamp 08d92191-e480-4bc0-a932-20b09f399ecf))
+  (segment (start 117.277172 176.74903) (end 95.066827 176.749031) (width 0.254) (layer "B.Cu") (net 98) (tstamp 0c957a91-17f0-4433-9789-77a7a1d3c933))
+  (segment (start 95.066827 176.749031) (end 92.053796 173.736) (width 0.254) (layer "B.Cu") (net 98) (tstamp 26a825e7-cdb9-4946-af35-30b7815e813b))
+  (segment (start 309.047961 162.675859) (end 309.660001 163.287899) (width 0.254) (layer "B.Cu") (net 98) (tstamp 28820ebd-155e-4736-b4e4-c73b6cb04829))
+  (segment (start 186.655033 170.526033) (end 123.500171 170.526033) (width 0.254) (layer "B.Cu") (net 98) (tstamp 33c3d0c6-f7a5-4a37-9fd7-4aa1dcc75ba7))
+  (segment (start 69.85 162.56) (end 81.026 173.736) (width 0.254) (layer "B.Cu") (net 98) (tstamp 592a8bc7-f9df-4bb9-8b14-a231371481d7))
+  (segment (start 279.124796 174.879) (end 274.571818 170.326022) (width 0.254) (layer "B.Cu") (net 98) (tstamp 5a7e1bbb-dbbf-41e8-91ff-9648ba7d1112))
+  (segment (start 69.85 162.56) (end 67.0052 159.7152) (width 0.254) (layer "B.Cu") (net 98) (tstamp 61bb4507-b21a-4c62-874a-915236a39ff2))
+  (segment (start 309.660001 163.287899) (end 309.660001 164.417821) (width 0.254) (layer "B.Cu") (net 98) (tstamp 753f18a7-f22b-4fc7-96b8-9844076d9176))
+  (segment (start 67.0052 159.7152) (end 67.0052 158.2397) (width 0.254) (layer "B.Cu") (net 98) (tstamp 7b49ef69-bf8d-44de-aaa5-68f9e2b45c0e))
+  (segment (start 299.198822 174.879) (end 279.124796 174.879) (width 0.254) (layer "B.Cu") (net 98) (tstamp 7ecbf7d8-3af3-463b-bc48-dd0eb144e108))
+  (segment (start 307.120001 162.675859) (end 309.047961 162.675859) (width 0.254) (layer "B.Cu") (net 98) (tstamp a415aaa9-79d3-46c3-8bec-63414f2440aa))
+  (segment (start 305.943 163.85286) (end 307.120001 162.675859) (width 0.254) (layer "B.Cu") (net 98) (tstamp abe35cf3-38ae-423d-98b0-f5be9f25f721))
+  (segment (start 191.500053 175.371053) (end 186.655033 170.526033) (width 0.254) (layer "B.Cu") (net 98) (tstamp ae2b49ff-16f8-4d7c-b0be-fa479b242699))
+  (segment (start 274.571818 170.326022) (end 224.284182 170.326022) (width 0.254) (layer "B.Cu") (net 98) (tstamp af930c97-7499-4c99-a21e-f22ec845baa2))
+  (segment (start 123.500171 170.526033) (end 117.277172 176.74903) (width 0.254) (layer "B.Cu") (net 98) (tstamp c1f1c6a9-75f2-4c7f-a824-029e8c2dea03))
+  (segment (start 219.239151 175.371053) (end 191.500053 175.371053) (width 0.254) (layer "B.Cu") (net 98) (tstamp c79a8deb-abdf-4382-8aa4-560292f31475))
+  (segment (start 92.053796 173.736) (end 81.026 173.736) (width 0.254) (layer "B.Cu") (net 98) (tstamp cc9cfe37-3b0f-4b51-8226-7799cafcf7e8))
+  (segment (start 224.284182 170.326022) (end 219.239151 175.371053) (width 0.254) (layer "B.Cu") (net 98) (tstamp dd69714e-0817-46df-ac08-27fc6e71640e))
+  (segment (start 187.031147 169.618011) (end 191.876169 174.463033) (width 0.254) (layer "B.Cu") (net 99) (tstamp 1adc549f-b09e-4ff9-b1de-904b1e10c067))
+  (segment (start 95.442943 175.841011) (end 116.901058 175.84101) (width 0.254) (layer "B.Cu") (net 99) (tstamp 2439281f-31d5-46f2-baeb-df325439e1db))
+  (segment (start 116.901058 175.84101) (end 123.124057 169.618011) (width 0.254) (layer "B.Cu") (net 99) (tstamp 26c1a87c-6464-45da-b5cb-ac3bf233196c))
+  (segment (start 293.39286 173.863) (end 303.403 163.85286) (width 0.254) (layer "B.Cu") (net 99) (tstamp 381e05a0-8415-4638-ba03-f11a9a1081a9))
+  (segment (start 82.74558 169.99966) (end 89.601592 169.99966) (width 0.254) (layer "B.Cu") (net 99) (tstamp 5bef560f-b5b3-43e7-b6b4-93c96299c198))
+  (segment (start 274.955 169.418) (end 279.4 173.863) (width 0.254) (layer "B.Cu") (net 99) (tstamp 7d138c4e-fdf6-439f-92d0-bb2cd9e1f570))
+  (segment (start 123.124057 169.618011) (end 187.031147 169.618011) (width 0.254) (layer "B.Cu") (net 99) (tstamp 985fe66c-2d86-48b7-9093-a5f2796931ff))
+  (segment (start 191.876169 174.463033) (end 218.863036 174.463032) (width 0.254) (layer "B.Cu") (net 99) (tstamp bd8d673a-9a33-4e34-a888-e408394fae77))
+  (segment (start 218.863036 174.463032) (end 223.908068 169.418) (width 0.254) (layer "B.Cu") (net 99) (tstamp db3a24b7-4cc5-4152-beeb-e2760fa21adc))
+  (segment (start 279.4 173.863) (end 293.39286 173.863) (width 0.254) (layer "B.Cu") (net 99) (tstamp f2b632bd-59ef-4156-9779-d4ead070a016))
+  (segment (start 223.908068 169.418) (end 274.955 169.418) (width 0.254) (layer "B.Cu") (net 99) (tstamp f36c4d2b-f940-49c6-aa95-fd349488c12f))
+  (segment (start 89.601592 169.99966) (end 95.442943 175.841011) (width 0.254) (layer "B.Cu") (net 99) (tstamp fc9c32a1-a41c-4cd9-bc19-a9f51976e0b0))
+  (segment (start 95.631 175.387) (end 89.789 169.545) (width 0.254) (layer "B.Cu") (net 100) (tstamp 185896c4-12ba-4b01-97c8-7c499858eb4f))
+  (segment (start 294.132 158.242) (end 282.956 158.242) (width 0.254) (layer "B.Cu") (net 100) (tstamp 31b15e73-13ce-4a42-8c9f-b80a902f7dca))
+  (segment (start 116.713 175.387) (end 95.631 175.387) (width 0.254) (layer "B.Cu") (net 100) (tstamp 3c78e62f-838c-4d86-a1b4-0ee6fb0a0fa6))
+  (segment (start 218.674978 174.009022) (end 192.064226 174.009022) (width 0.254) (layer "B.Cu") (net 100) (tstamp 4c399e50-bccc-4869-bcbd-bdf338815d2b))
+  (segment (start 122.936 169.164) (end 116.713 175.387) (width 0.254) (layer "B.Cu") (net 100) (tstamp 75120626-e285-4ebf-9164-2be836d7481a))
+  (segment (start 192.064226 174.009022) (end 187.219204 169.164) (width 0.254) (layer "B.Cu") (net 100) (tstamp 803bc84c-4333-4fee-9b65-5083b24c3c45))
+  (segment (start 277.749 163.449) (end 229.235 163.449) (width 0.254) (layer "B.Cu") (net 100) (tstamp 898e6bb4-5042-4230-badb-5f6a0be11eb2))
+  (segment (start 89.789 169.545) (end 87.376 169.545) (width 0.254) (layer "B.Cu") (net 100) (tstamp 9092d2a9-764e-4595-a40a-0366094c9ad4))
+  (segment (start 87.376 169.545) (end 86.106 168.275) (width 0.254) (layer "B.Cu") (net 100) (tstamp 96981c9c-5169-4f63-86c7-5c8457740841))
+  (segment (start 187.219204 169.164) (end 122.936 169.164) (width 0.254) (layer "B.Cu") (net 100) (tstamp a2d1e300-3932-499e-a6a1-d2cfbaad0cdb))
+  (segment (start 229.235 163.449) (end 218.674978 174.009022) (width 0.254) (layer "B.Cu") (net 100) (tstamp b8f474a2-da2c-4bfd-8aa7-f51b57426f1b))
+  (segment (start 300.863 163.85286) (end 299.74286 163.85286) (width 0.254) (layer "B.Cu") (net 100) (tstamp c5470978-b5cc-4291-b37a-78afb9151086))
+  (segment (start 86.106 168.275) (end 86.106 164.846) (width 0.254) (layer "B.Cu") (net 100) (tstamp d52de39b-ac6a-490c-a464-49a75b2b2161))
+  (segment (start 282.956 158.242) (end 277.749 163.449) (width 0.254) (layer "B.Cu") (net 100) (tstamp d8ee3e40-436d-489d-97b5-1f4018853015))
+  (segment (start 299.74286 163.85286) (end 294.132 158.242) (width 0.254) (layer "B.Cu") (net 100) (tstamp e9166206-be6e-4d3f-86e5-e849ef90e185))
+  (segment (start 86.106 164.846) (end 83.25866 161.99866) (width 0.254) (layer "B.Cu") (net 100) (tstamp fdbfa297-5cfa-4edb-9078-3b02ba75d8b8))
+  (segment (start 81.60258 175.54194) (end 81.60258 171.09186) (width 0.254) (layer "F.Cu") (net 101) (tstamp bb9b1d12-abc5-4d87-bd38-e00c7e14a442))
+  (segment (start 75.184 166.57828) (end 79.68488 171.07916) (width 0.254) (layer "B.Cu") (net 101) (tstamp 06af7a58-416d-4306-bdd1-661378067e28))
+  (segment (start 69.85 156.464) (end 69.85 159.893) (width 0.254) (layer "B.Cu") (net 101) (tstamp 147a8848-73eb-481f-b870-1feb76fc2190))
+  (segment (start 69.85 156.464) (end 67.2569 156.464) (width 0.254) (layer "B.Cu") (net 101) (tstamp 1a83e9e7-cdbf-4146-bd12-7fb6692a26c9))
+  (segment (start 75.184 165.227) (end 75.184 166.57828) (width 0.254) (layer "B.Cu") (net 101) (tstamp 2a4eacd7-b371-4a21-aca8-803ad36fae95))
+  (segment (start 69.85 159.893) (end 75.184 165.227) (width 0.254) (layer "B.Cu") (net 101) (tstamp 7d9468a3-8884-43ba-a420-df67f6697f6d))
+  (segment (start 79.68488 171.07916) (end 81.58988 171.07916) (width 0.254) (layer "B.Cu") (net 101) (tstamp c05a2ec6-fe18-42e6-a479-30bd6578a77d))
+  (segment (start 69.85 152.4) (end 69.85 156.464) (width 0.254) (layer "B.Cu") (net 101) (tstamp ceb88386-cbc6-4702-bd1f-4190c4f3c4d1))
   (segment (start 286.4993 118.35892) (end 286.4993 114.05108) (width 0.254) (layer "F.Cu") (net 102) (tstamp 724984b4-2ec0-4c10-a19d-4187c957e532))
   (segment (start 334.137 118.35892) (end 334.137 114.16538) (width 0.254) (layer "F.Cu") (net 102) (tstamp ccbf4857-cbff-4a1d-8a4e-62eea84e2fe1))
   (segment (start 366.8014 112.021454) (end 363.760854 115.062) (width 0.254) (layer "B.Cu") (net 102) (tstamp 01d32057-f205-4adc-97ee-c6060b6f9717))
@@ -14420,27 +18391,28 @@
   (segment (start 301.501568 116.585992) (end 301.476176 116.5606) (width 0.254) (layer "B.Cu") (net 102) (tstamp ae59675b-16e5-4a2b-9ded-3dd4c4d7c240))
   (segment (start 366.8014 110.998) (end 367.9929 110.998) (width 0.254) (layer "B.Cu") (net 102) (tstamp d789c673-2534-46e7-a9de-2d011f005f0d))
   (segment (start 302.939042 116.585992) (end 301.501568 116.585992) (width 0.254) (layer "B.Cu") (net 102) (tstamp ddeb34bc-e180-40d6-bc8d-6cbded5d9fc9))
-  (segment (start 336.677 118.35892) (end 336.677 114.16538) (width 0.254) (layer "F.Cu") (net 103) (tstamp 65cdda1e-603f-425f-aed8-667cfced467d))
-  (segment (start 289.0393 118.35892) (end 289.0393 114.05108) (width 0.254) (layer "F.Cu") (net 103) (tstamp bdc6fefb-491b-43ef-a60c-b15be29a3229))
-  (segment (start 360.079967 159.096033) (end 360.079967 166.208033) (width 0.254) (layer "B.Cu") (net 103) (tstamp 01835d02-5934-4665-843a-2f9d315ed2ce))
-  (segment (start 340.73527 118.34433) (end 362.71773 118.34433) (width 0.254) (layer "B.Cu") (net 103) (tstamp 0aa1aa21-3816-40e1-a1f8-a72b6b24ddac))
-  (segment (start 362.664858 126.361444) (end 362.664858 133.723946) (width 0.254) (layer "B.Cu") (net 103) (tstamp 0c03ebda-7b96-4bfc-a3d4-bcc2e8d06a1a))
-  (segment (start 339.1916 119.888) (end 340.73527 118.34433) (width 0.254) (layer "B.Cu") (net 103) (tstamp 12ba2d80-9494-4c9d-82ec-3782318b195e))
-  (segment (start 290.58108 119.888) (end 289.052 118.35892) (width 0.254) (layer "B.Cu") (net 103) (tstamp 46e6ab56-4272-4bfc-a9d5-f068d236b3cf))
-  (segment (start 358.775 167.513) (end 332.46314 167.513) (width 0.254) (layer "B.Cu") (net 103) (tstamp 4c8e63ae-4e1c-4ed6-b1fd-7c4f4e32424a))
-  (segment (start 362.664858 133.723946) (end 363.854902 134.91399) (width 0.254) (layer "B.Cu") (net 103) (tstamp 4f5ba117-3cc7-487d-9642-7a93b63843e0))
-  (segment (start 336.804 119.888) (end 290.58108 119.888) (width 0.254) (layer "B.Cu") (net 103) (tstamp 5e2c67d3-868e-4ad7-a108-5317c2698a20))
-  (segment (start 377.351967 137.597171) (end 377.351967 153.704167) (width 0.254) (layer "B.Cu") (net 103) (tstamp 5fdb4cd6-dcb4-4c1f-a6c4-7d7f7b70ff75))
-  (segment (start 362.71773 118.34433) (end 362.71773 126.308572) (width 0.254) (layer "B.Cu") (net 103) (tstamp 644e84b2-e643-450c-b6b6-13a8523df492))
-  (segment (start 362.71773 126.308572) (end 362.664858 126.361444) (width 0.254) (layer "B.Cu") (net 103) (tstamp 7de6e018-5a8a-4334-8f14-95a62196de40))
-  (segment (start 360.079967 166.208033) (end 358.775 167.513) (width 0.254) (layer "B.Cu") (net 103) (tstamp 830f3937-7fc7-4d46-aa52-c6038ab00188))
-  (segment (start 362.966 156.21) (end 360.079967 159.096033) (width 0.254) (layer "B.Cu") (net 103) (tstamp 8ad7bbda-bf63-4cef-bb61-19c2405167af))
-  (segment (start 374.668786 134.91399) (end 377.351967 137.597171) (width 0.254) (layer "B.Cu") (net 103) (tstamp 8d63928f-fc7a-4779-a3dc-338ee06f6a75))
-  (segment (start 374.846134 156.21) (end 362.966 156.21) (width 0.254) (layer "B.Cu") (net 103) (tstamp 9a065fe6-e661-4349-b5b3-de05d494f65b))
-  (segment (start 336.804 119.888) (end 339.1916 119.888) (width 0.254) (layer "B.Cu") (net 103) (tstamp b912aaf2-f760-4087-99be-14eac12914fc))
-  (segment (start 332.46314 167.513) (end 328.803 163.85286) (width 0.254) (layer "B.Cu") (net 103) (tstamp d35476eb-e376-46b9-88ff-33661013cdb3))
-  (segment (start 336.804 119.888) (end 336.804 118.48592) (width 0.254) (layer "B.Cu") (net 103) (tstamp df9a45e4-2900-459f-abeb-4241d2c622bc))
-  (segment (start 363.854902 134.91399) (end 374.668786 134.91399) (width 0.254) (layer "B.Cu") (net 103) (tstamp ed8e7f65-aca2-4046-9473-411b953cd2e6))
-  (segment (start 377.351967 153.704167) (end 374.846134 156.21) (width 0.254) (layer "B.Cu") (net 103) (tstamp f3fc9ada-245d-42ce-9cc5-acfffbd302a2))
+  (segment (start 291.1348 147.7772) (end 291.1348 137.4394) (width 0.254) (layer "F.Cu") (net 103) (tstamp 0d5c83b3-1ea2-445f-bbe7-26647e33f237))
+  (segment (start 312.983872 171.8183) (end 295.1353 171.8183) (width 0.254) (layer "F.Cu") (net 103) (tstamp 1b163e79-5513-4202-bed9-9e4344bfedaa))
+  (segment (start 295.1353 171.8183) (end 287.655 164.338) (width 0.254) (layer "F.Cu") (net 103) (tstamp 31a8a3d7-bab6-42bb-9997-e17f19fde731))
+  (segment (start 287.655 164.338) (end 287.655 151.257) (width 0.254) (layer "F.Cu") (net 103) (tstamp 95a0e85c-4d73-4d68-b4d6-43de38ae64cf))
+  (segment (start 291.13988 137.43432) (end 291.13988 132.97916) (width 0.254) (layer "F.Cu") (net 103) (tstamp a5508238-4f19-4d91-be6f-a27b93f29f96))
+  (segment (start 287.655 151.257) (end 291.1348 147.7772) (width 0.254) (layer "F.Cu") (net 103) (tstamp fb7560c3-f38f-47dc-a37e-4e1145e63b06))
+  (segment (start 369.4176 125.1712) (end 369.4176 132.715) (width 0.254) (layer "B.Cu") (net 103) (tstamp 0337bedf-e5e4-44f7-9175-35332c0360dd))
+  (segment (start 378.714 137.033) (end 378.714 154.305) (width 0.254) (layer "B.Cu") (net 103) (tstamp 0b04fbdd-c688-403b-9600-78eed75fb34a))
+  (segment (start 315.053972 173.8884) (end 312.983872 171.8183) (width 0.254) (layer "B.Cu") (net 103) (tstamp 15f6a744-714b-47d8-a6a7-e0fd6abc3e7f))
+  (segment (start 363.495202 157.607002) (end 361.442 159.660204) (width 0.254) (layer "B.Cu") (net 103) (tstamp 345636c1-4471-4b0f-943a-b4cfbadfd032))
+  (segment (start 316.865 173.8884) (end 316.865 172.1635) (width 0.254) (layer "B.Cu") (net 103) (tstamp 3892aad6-19eb-4238-8546-115b27c273ba))
+  (segment (start 368.3762 124.333) (end 368.5794 124.333) (width 0.254) (layer "B.Cu") (net 103) (tstamp 3e11c66d-5f5b-45f3-920a-18285547706b))
+  (segment (start 369.4176 132.715) (end 370.1796 133.477) (width 0.254) (layer "B.Cu") (net 103) (tstamp 58b323b5-7d0c-4cec-8f06-7b486cecef9c))
+  (segment (start 378.714 154.305) (end 375.411998 157.607002) (width 0.254) (layer "B.Cu") (net 103) (tstamp 5cf9deb3-4e46-4221-9363-f569f07a0f2b))
+  (segment (start 370.1796 133.477) (end 375.158001 133.477001) (width 0.254) (layer "B.Cu") (net 103) (tstamp 8e04a92b-9fbc-460b-a05d-8161d9d8e382))
+  (segment (start 361.442 172.593) (end 360.1466 173.8884) (width 0.254) (layer "B.Cu") (net 103) (tstamp 8f1446da-5890-44ac-8b02-2d9bfc49d774))
+  (segment (start 375.411998 157.607002) (end 363.495202 157.607002) (width 0.254) (layer "B.Cu") (net 103) (tstamp 8fe87963-3700-45dd-aee2-b46d76c6dfa3))
+  (segment (start 364.8202 127.889) (end 368.3762 124.333) (width 0.254) (layer "B.Cu") (net 103) (tstamp a4321c90-e2de-4c85-a248-b630e4fc473c))
+  (segment (start 316.865 173.8884) (end 360.1466 173.8884) (width 0.254) (layer "B.Cu") (net 103) (tstamp b2b4b8f5-13bc-4978-96af-b02d35026114))
+  (segment (start 368.5794 124.333) (end 369.4176 125.1712) (width 0.254) (layer "B.Cu") (net 103) (tstamp c1550cf3-2b3f-4a09-a147-858858e2db5d))
+  (segment (start 316.865 173.8884) (end 315.053972 173.8884) (width 0.254) (layer "B.Cu") (net 103) (tstamp d8093a6c-0397-44e1-8d03-320f831db402))
+  (segment (start 361.442 159.660204) (end 361.442 172.593) (width 0.254) (layer "B.Cu") (net 103) (tstamp de049e74-ed34-4a17-94c6-7fdd45a99a18))
+  (segment (start 375.158001 133.477001) (end 378.714 137.033) (width 0.254) (layer "B.Cu") (net 103) (tstamp f09cb48d-66a0-4228-bf49-fea6ba877962))
 
 )
diff --git a/hardware/keyboard-classic/kbd-classic.kicad_sch b/hardware/keyboard-classic/kbd-classic.kicad_sch
index 2a936eb..cab7a9a 100644
--- a/hardware/keyboard-classic/kbd-classic.kicad_sch
+++ b/hardware/keyboard-classic/kbd-classic.kicad_sch
@@ -97,7 +97,7 @@
         )
       )
     )
-    (symbol "mounting-hardware:MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+    (symbol "mounting-hardware:MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
       (property "Reference" "BOLT" (at 0 3.048 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
@@ -179,6 +179,9 @@
       (property "Standards Version" "1.1" (at -25.654 -75.692 0)
         (effects (font (size 1.27 1.27)) hide)
       )
+      (property "Sim.Enable" "0" (at -10.16 -7.62 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
       (property "ki_keywords" "spacer mounting #4" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
@@ -275,7 +278,7 @@
         )
       )
     )
-    (symbol "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+    (symbol "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
       (property "Reference" "WASHER" (at 0 3.048 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
@@ -357,6 +360,9 @@
       (property "Standards Version" "1.1" (at -25.654 -75.692 0)
         (effects (font (size 1.27 1.27)) hide)
       )
+      (property "Sim.Enable" "0" (at -5.08 -5.08 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
       (property "ki_keywords" "lockwasher mounting #4" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
@@ -417,7 +423,7 @@
         )
       )
     )
-    (symbol "mounting-hardware:MNT McMaster Nut, #4-40, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+    (symbol "mounting-hardware:MNT McMaster Nut, #4-40, stainless steel" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
       (property "Reference" "NUT" (at 0 3.048 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
@@ -499,6 +505,9 @@
       (property "Standards Version" "1.1" (at -25.654 -75.692 0)
         (effects (font (size 1.27 1.27)) hide)
       )
+      (property "Sim.Enable" "0" (at 10.16 -2.54 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
       (property "ki_keywords" "nut mounting #4" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
@@ -529,7 +538,7 @@
         )
       )
     )
-    (symbol "mounting-hardware:MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
+    (symbol "mounting-hardware:MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board no)
       (property "Reference" "SPACER" (at 0 3.048 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
@@ -611,6 +620,9 @@
       (property "Standards Version" "1.1" (at -25.654 -75.692 0)
         (effects (font (size 1.27 1.27)) hide)
       )
+      (property "Sim.Enable" "0" (at -12.7 -12.7 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
       (property "ki_keywords" "spacer mounting #4" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
@@ -1356,13 +1368,13 @@
       )
     )
     (symbol "unikbd:LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "LED" (at 5.461 1.27 0)
+      (property "Reference" "LED" (at 5.08 2.54 0)
         (effects (font (size 1.27 1.27)) (justify right))
       )
       (property "Value" "LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT" (at -59.69 -27.94 0)
         (effects (font (size 1.27 1.27)) (justify right) hide)
       )
-      (property "Footprint" "LED_THT:LED_D2.0mm_W4.8mm_H2.5mm_FlatTop" (at -50.8 -34.29 0)
+      (property "Footprint" "LED_THT:LED_D3.0mm" (at -50.8 -34.29 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (property "Datasheet" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at -50.8 -34.29 0)
@@ -1431,64 +1443,260 @@
       (symbol "LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT_0_1"
         (polyline
           (pts
-            (xy -1.27 -1.27)
-            (xy -1.27 1.27)
+            (xy 2.54 -1.27)
+            (xy 2.54 1.27)
           )
           (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy -1.27 0)
-            (xy 1.27 0)
+            (xy 2.54 0)
+            (xy 5.08 0)
           )
           (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy 1.27 -1.27)
-            (xy 1.27 1.27)
-            (xy -1.27 0)
-            (xy 1.27 -1.27)
+            (xy 5.08 -1.27)
+            (xy 5.08 1.27)
+            (xy 2.54 0)
+            (xy 5.08 -1.27)
           )
           (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy -3.048 -0.762)
-            (xy -4.572 -2.286)
-            (xy -3.81 -2.286)
-            (xy -4.572 -2.286)
-            (xy -4.572 -1.524)
+            (xy 0.762 -0.762)
+            (xy -0.762 -2.286)
+            (xy 0 -2.286)
+            (xy -0.762 -2.286)
+            (xy -0.762 -1.524)
           )
           (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy -1.778 -0.762)
-            (xy -3.302 -2.286)
-            (xy -2.54 -2.286)
-            (xy -3.302 -2.286)
-            (xy -3.302 -1.524)
+            (xy 2.032 -0.762)
+            (xy 0.508 -2.286)
+            (xy 1.27 -2.286)
+            (xy 0.508 -2.286)
+            (xy 0.508 -1.524)
           )
           (stroke (width 0) (type default))
           (fill (type none))
         )
       )
       (symbol "LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT_1_1"
-        (pin passive line (at -3.81 0 0) (length 2.54)
+        (pin passive line (at 0 0 0) (length 2.54)
           (name "K" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 3.81 0 180) (length 2.54)
+        (pin passive line (at 7.62 0 180) (length 2.54)
           (name "A" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
       )
     )
+    (symbol "unikbd:SW Cherry MX/Futaba 1U LED Style A" (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "SW" (at -2.54 5.08 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Value" "Key" (at -27.94 -34.798 0)
+        (effects (font (size 1.27 1.27)) (justify left))
+      )
+      (property "Footprint" "unikbd:Key_MX_LED" (at -40.64 -17.78 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Datasheet" "https://www.mouser.com/datasheet/2/71/chcp_s_a0002957244_1-2263075.pdf" (at -26.162 -29.464 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Component Value" "Key" (at -38.1 -12.7 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Tolerance" "If applicable" (at -22.098 -39.624 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Manufacturer" "Cherry" (at -26.162 -18.288 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at -23.368 -24.892 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at -23.114 -64.77 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Manufacturer PN" "MX1A-11NN" (at -23.876 -21.844 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "RoHS" "Yes" (at -26.416 -61.976 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Allow Substitution" "Yes" (at -26.67 -67.818 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Fitted" "Yes" (at -25.654 -72.644 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Tracking" "No" (at -26.162 -70.104 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "BOM Comment" "" (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Component Type" "Switch" (at -4.572 -36.83 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Package Type" "" (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Package Variant" "" (at 5.08 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Number of Pins" "2" (at -22.098 -42.164 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp (Storage)" "" (at -22.098 -44.196 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp (Operating)" "-40C/+170C" (at -21.844 -46.736 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp (Soldering)" "If applicable" (at -21.844 -49.53 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp Coeff." "If applicable" (at -21.844 -52.07 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Power Rating" "10 mA" (at -21.844 -54.61 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Material" "If applicable" (at -21.844 -56.896 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Class" "If applicable" (at -21.844 -59.182 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Standards Version" "1.1" (at -25.654 -75.692 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "switch futaba cherry mx 1U" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Combined Cherry MX / Futaba 1U LED" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "C_*" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "SW Cherry MX/Futaba 1U LED Style A_0_0"
+        (polyline
+          (pts
+            (xy 0.635 -1.27)
+            (xy 0.635 -3.81)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 2.54 -4.445)
+            (xy 1.27 -3.175)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 2.54 -2.54)
+            (xy -2.54 -2.54)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 3.81 -4.445)
+            (xy 2.54 -3.175)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 2.54 -3.81)
+            (xy 2.54 -4.445)
+            (xy 1.905 -4.445)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 3.81 -3.81)
+            (xy 3.81 -4.445)
+            (xy 3.175 -4.445)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0.635 -2.54)
+            (xy -1.27 -1.27)
+            (xy -1.27 -3.81)
+            (xy 0.635 -2.54)
+          )
+          (stroke (width 0) (type default))
+          (fill (type outline))
+        )
+      )
+      (symbol "SW Cherry MX/Futaba 1U LED Style A_0_1"
+        (circle (center -2.032 0) (radius 0.508)
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy -2.54 1.27)
+            (xy 2.54 1.27)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (polyline
+          (pts
+            (xy 0 1.27)
+            (xy 0 3.048)
+          )
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (circle (center 2.032 0) (radius 0.508)
+          (stroke (width 0) (type default))
+          (fill (type none))
+        )
+        (pin passive line (at 5.08 0 180) (length 2.54)
+          (name "1" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 0 0) (length 2.54)
+          (name "2" (effects (font (size 1.27 1.27))))
+          (number "2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -5.08 -2.54 0) (length 2.54)
+          (name "3" (effects (font (size 1.27 1.27))))
+          (number "3" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 5.08 -2.54 180) (length 2.54)
+          (name "4" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+      )
+    )
     (symbol "unikbd:SW Cherry MX/Futaba 1U Style A" (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
       (property "Reference" "SW" (at -2.54 5.08 0)
         (effects (font (size 1.27 1.27)) (justify left))
@@ -1615,186 +1823,131 @@
         )
       )
     )
-    (symbol "unikbd:SW_Push_LED" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "SW" (at -0.635 5.715 0)
-        (effects (font (size 1.27 1.27)) (justify left))
+    (symbol "unikbd:diode-combined" (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "D**" (at 0.635 2.54 0)
+        (effects (font (size 1.27 1.27)) (justify left) hide)
       )
-      (property "Value" "SW_Push_LED" (at 0 -3.175 0)
-        (effects (font (size 1.27 1.27)))
+      (property "Value" "1N914/MMBD914" (at -27.94 -34.798 0)
+        (effects (font (size 1.27 1.27)) (justify left) hide)
       )
-      (property "Footprint" "" (at 0 7.62 0)
+      (property "Footprint" "unikbd:diode-combined" (at -48.26 -17.78 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "~" (at 0 7.62 0)
+      (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at -26.162 -29.464 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "switch normally-open pushbutton push-button LED" (at 0 0 0)
+      (property "Component Value" "19N14/MMBD914" (at 9.144 4.826 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Push button switch with LED, generic" (at 0 0 0)
+      (property "Tolerance" "If applicable" (at -22.098 -39.624 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "SW_Push_LED_0_0"
-        (polyline
-          (pts
-            (xy 0.635 1.27)
-            (xy 0.635 -1.27)
-          )
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.54 -1.905)
-            (xy 1.27 -0.635)
-          )
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.54 0)
-            (xy -2.54 0)
-          )
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 3.81 -1.905)
-            (xy 2.54 -0.635)
-          )
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 2.54 -1.27)
-            (xy 2.54 -1.905)
-            (xy 1.905 -1.905)
-          )
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 3.81 -1.27)
-            (xy 3.81 -1.905)
-            (xy 3.175 -1.905)
-          )
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0.635 0)
-            (xy -1.27 1.27)
-            (xy -1.27 -1.27)
-            (xy 0.635 0)
-          )
-          (stroke (width 0) (type default))
-          (fill (type outline))
-        )
-      )
-      (symbol "SW_Push_LED_0_1"
-        (circle (center -2.032 2.54) (radius 0.508)
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy -2.54 3.81)
-            (xy 2.54 3.81)
-          )
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (polyline
-          (pts
-            (xy 0 3.81)
-            (xy 0 5.588)
-          )
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (circle (center 2.032 2.54) (radius 0.508)
-          (stroke (width 0) (type default))
-          (fill (type none))
-        )
-        (pin passive line (at 5.08 2.54 180) (length 2.54)
-          (name "1" (effects (font (size 1.27 1.27))))
-          (number "1" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 2.54 0) (length 2.54)
-          (name "2" (effects (font (size 1.27 1.27))))
-          (number "2" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at -5.08 0 0) (length 2.54)
-          (name "3" (effects (font (size 1.27 1.27))))
-          (number "3" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 5.08 0 180) (length 2.54)
-          (name "4" (effects (font (size 1.27 1.27))))
-          (number "4" (effects (font (size 1.27 1.27))))
-        )
-      )
-    )
-    (symbol "unikbd:diode-combined" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "D" (at 0 2.54 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Value" "diode-combined" (at 0 -2.54 0)
-        (effects (font (size 1.27 1.27)))
-      )
-      (property "Footprint" "unikbd:diode-combined" (at -20.32 -22.86 0)
+      (property "Manufacturer" "Diodes, Inc." (at -26.162 -18.288 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at -7.62 -20.32 0)
+      (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at -23.368 -24.892 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "diode" (at 0 0 0)
+      (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at -23.114 -64.77 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "100V 0.15A standard switching diode, DO-35" (at 0 0 0)
+      (property "Manufacturer PN" "MMBD914-7-F" (at -23.876 -21.844 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "D*DO?35*" (at 0 0 0)
+      (property "RoHS" "Yes" (at -26.416 -61.976 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Allow Substitution" "Yes" (at -26.67 -67.818 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Fitted" "Yes" (at -25.654 -72.644 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Tracking" "No" (at -26.162 -70.104 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at -27.94 -30.48 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Component Type" "Diode" (at -4.572 -36.83 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Package Type" "SOT3-3" (at -48.26 -12.7 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Package Variant" "" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Number of Pins" "3" (at -22.098 -42.164 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp (Storage)" "If applicable" (at -22.098 -44.196 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp (Operating)" "-65C/150C" (at -21.844 -46.736 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp (Soldering)" "If applicable" (at -21.844 -49.53 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp Coeff." "If applicable" (at -21.844 -52.07 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Power Rating" "350 mW / 200 mA" (at -21.844 -54.61 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Material" "If applicable" (at -21.844 -56.896 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Class" "If applicable" (at -21.844 -59.182 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Standards Version" "1.1" (at -25.654 -75.692 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "diode switching combined" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "C_*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "diode-combined_0_1"
         (polyline
           (pts
-            (xy -1.27 1.27)
-            (xy -1.27 -1.27)
+            (xy 2.54 1.27)
+            (xy 2.54 -1.27)
           )
           (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy 1.27 0)
-            (xy -1.27 0)
+            (xy 5.08 0)
+            (xy 2.54 0)
           )
           (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy 1.27 1.27)
-            (xy 1.27 -1.27)
-            (xy -1.27 0)
-            (xy 1.27 1.27)
+            (xy 5.08 1.27)
+            (xy 5.08 -1.27)
+            (xy 2.54 0)
+            (xy 5.08 1.27)
           )
           (stroke (width 0.254) (type default))
           (fill (type none))
         )
       )
       (symbol "diode-combined_1_1"
-        (pin passive line (at -3.81 0 0) (length 2.54)
+        (pin passive line (at 0 0 0) (length 2.54)
           (name "K" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 3.81 0 180) (length 2.54)
+        (pin passive line (at 7.62 0 180) (length 2.54)
           (name "A" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
@@ -1802,1022 +1955,1042 @@
     )
   )
 
-  (junction (at 203.2 36.83) (diameter 0) (color 0 0 0 0)
-    (uuid 05f67331-61ac-446f-85cf-6ad6c6e9d7bc)
+  (junction (at 190.5 35.56) (diameter 0) (color 0 0 0 0)
+    (uuid 110b0916-0571-4fe6-8b66-54ac9006a1e2)
   )
-  (junction (at 180.34 46.99) (diameter 0) (color 0 0 0 0)
-    (uuid 21845b53-660d-45f9-b6cf-bd91cae37b93)
+  (junction (at 208.28 53.34) (diameter 0) (color 0 0 0 0)
+    (uuid 2c8aa47b-7da2-44a4-a5a7-0696f50cf647)
   )
-  (junction (at 199.39 46.99) (diameter 0) (color 0 0 0 0)
-    (uuid 2a4f3647-bf61-41f6-ac1b-48db6edb275d)
-  )
-  (junction (at 135.763 17.78) (diameter 0) (color 0 0 0 0)
+  (junction (at 134.62 17.78) (diameter 0) (color 0 0 0 0)
     (uuid 2d04eb5f-e7f8-45cc-916b-183f78b42299)
   )
-  (junction (at 226.06 52.07) (diameter 0) (color 0 0 0 0)
-    (uuid 3b74990d-4d13-4eb0-bac3-1d53c95706e4)
+  (junction (at 226.06 53.34) (diameter 0) (color 0 0 0 0)
+    (uuid 33aefa39-2afc-4285-ac12-fbee8d6a1953)
   )
-  (junction (at 226.06 57.15) (diameter 0) (color 0 0 0 0)
-    (uuid 3e32347f-3bff-438c-86b0-d4391719f41f)
+  (junction (at 208.28 35.56) (diameter 0) (color 0 0 0 0)
+    (uuid 381f2f9d-23d8-4ba3-a620-b1ed97fa8e17)
   )
-  (junction (at 171.45 36.83) (diameter 0) (color 0 0 0 0)
+  (junction (at 200.66 48.26) (diameter 0) (color 0 0 0 0)
+    (uuid 48fd0611-8f40-440a-aedb-31783c91a5bb)
+  )
+  (junction (at 198.12 93.98) (diameter 0) (color 0 0 0 0)
+    (uuid 49433f4b-1c65-45b8-bef5-b3fa76b7b21f)
+  )
+  (junction (at 172.72 38.1) (diameter 0) (color 0 0 0 0)
     (uuid 5239b430-16b1-46f4-9520-a6f1e07a4ddf)
   )
-  (junction (at 196.85 99.06) (diameter 0) (color 0 0 0 0)
+  (junction (at 180.34 48.26) (diameter 0) (color 0 0 0 0)
+    (uuid 55c30d77-8a66-4621-9d72-d81f5b2b4b46)
+  )
+  (junction (at 198.12 109.22) (diameter 0) (color 0 0 0 0)
     (uuid 62b6d61f-4fb4-4a5f-99b0-0732480e53a9)
   )
-  (junction (at 209.55 52.07) (diameter 0) (color 0 0 0 0)
-    (uuid 6701ecf6-7ce7-4bfe-89b8-11e7b2e3af98)
+  (junction (at 187.96 35.56) (diameter 0) (color 0 0 0 0)
+    (uuid 70188304-c44c-4b43-be7d-3f3f97d05478)
   )
-  (junction (at 187.96 36.83) (diameter 0) (color 0 0 0 0)
-    (uuid 7aa1d7b6-81d0-4fdf-bfb5-e3a4bf38e8c5)
-  )
-  (junction (at 190.5 36.83) (diameter 0) (color 0 0 0 0)
-    (uuid 7c948b5f-97b3-4273-addd-360e102c70e8)
-  )
-  (junction (at 196.85 78.74) (diameter 0) (color 0 0 0 0)
+  (junction (at 198.12 83.82) (diameter 0) (color 0 0 0 0)
     (uuid 82d2b745-d746-4383-93a9-2dcbb11ba6b6)
   )
-  (junction (at 205.74 64.77) (diameter 0) (color 0 0 0 0)
+  (junction (at 205.74 66.04) (diameter 0) (color 0 0 0 0)
     (uuid 8ad8a1d9-f60c-4f0d-87f5-1e160fd7a83e)
   )
-  (junction (at 209.55 46.99) (diameter 0) (color 0 0 0 0)
-    (uuid 9dbc0b86-2600-4b86-853d-12316ceeacaa)
-  )
-  (junction (at 182.88 64.77) (diameter 0) (color 0 0 0 0)
+  (junction (at 182.88 66.04) (diameter 0) (color 0 0 0 0)
     (uuid adf997dc-ee3e-4035-b284-2d8769aff455)
   )
-  (junction (at 196.85 67.31) (diameter 0) (color 0 0 0 0)
-    (uuid b25e1815-9b7d-462d-b5c0-447a5ff695ed)
+  (junction (at 208.28 48.26) (diameter 0) (color 0 0 0 0)
+    (uuid c78419d0-2093-4d5d-bde8-e51fbfadac71)
   )
-  (junction (at 196.85 87.63) (diameter 0) (color 0 0 0 0)
-    (uuid b9afe729-a74f-4f97-b46d-e53df16760f9)
+  (junction (at 198.12 68.58) (diameter 0) (color 0 0 0 0)
+    (uuid cbe7f3b3-0c21-48e7-9fde-883686cb2890)
   )
-  (junction (at 189.23 78.74) (diameter 0) (color 0 0 0 0)
-    (uuid bcc004fb-98fd-46f0-88c3-c2259e2a74aa)
+  (junction (at 226.06 58.42) (diameter 0) (color 0 0 0 0)
+    (uuid cf7d4350-c2ab-44a0-9060-17afb813b204)
   )
-  (junction (at 208.28 31.75) (diameter 0) (color 0 0 0 0)
-    (uuid bfaccbe2-964b-4485-aeed-f19ef0b24548)
+  (junction (at 205.74 68.58) (diameter 0) (color 0 0 0 0)
+    (uuid dc9aba1e-8b40-4e61-815c-d1d1b1cf243a)
   )
-  (junction (at 205.74 67.31) (diameter 0) (color 0 0 0 0)
-    (uuid c43b34f9-48a3-45dc-a9fc-9c1d4d0e32f3)
-  )
-  (junction (at 208.28 36.83) (diameter 0) (color 0 0 0 0)
-    (uuid d1ddfb3a-7221-4d4f-bf65-ebaba22d2e6d)
+  (junction (at 190.5 83.82) (diameter 0) (color 0 0 0 0)
+    (uuid ef579537-87dd-4f6d-b92d-0aa1aacd191d)
   )
 
-  (no_connect (at 161.29 64.77) (uuid 123e52d2-de7f-4b23-99ce-0d36c1cb90a0))
-  (no_connect (at 161.29 74.93) (uuid 28862f26-fe3b-4bbd-8967-19ad947f852d))
-  (no_connect (at 161.29 62.23) (uuid 7019ebeb-4c7d-4933-bc2c-3ed7e5183305))
-  (no_connect (at 148.59 72.39) (uuid 7fbe468e-4f4e-4dc3-bc7f-3ea0cdb375a5))
-  (no_connect (at 161.29 72.39) (uuid 82fad135-272b-4c41-bab7-45001e69b883))
-  (no_connect (at 148.59 74.93) (uuid 98b8fce7-248c-4fa8-86de-f22672db2b7e))
-  (no_connect (at 148.59 80.01) (uuid a6298275-4dce-4294-b558-9e711bb8b950))
-  (no_connect (at 148.59 77.47) (uuid ac29c1ad-5cfd-4587-8ebb-f66a96faff58))
-  (no_connect (at 161.29 77.47) (uuid af5f77dc-c728-46c3-8db0-8120de88a471))
-  (no_connect (at 161.29 69.85) (uuid d159a6f6-174c-4170-8bcd-e4623d144c5d))
-  (no_connect (at 161.29 67.31) (uuid d990ec6c-f3e8-431d-bdd6-2e642665e479))
-  (no_connect (at 161.29 80.01) (uuid f1e6635f-1d74-4f71-b849-1ec3a44acc1b))
+  (no_connect (at 162.56 66.04) (uuid 123e52d2-de7f-4b23-99ce-0d36c1cb90a0))
+  (no_connect (at 162.56 76.2) (uuid 28862f26-fe3b-4bbd-8967-19ad947f852d))
+  (no_connect (at 162.56 63.5) (uuid 7019ebeb-4c7d-4933-bc2c-3ed7e5183305))
+  (no_connect (at 149.86 73.66) (uuid 7fbe468e-4f4e-4dc3-bc7f-3ea0cdb375a5))
+  (no_connect (at 162.56 73.66) (uuid 82fad135-272b-4c41-bab7-45001e69b883))
+  (no_connect (at 149.86 76.2) (uuid 98b8fce7-248c-4fa8-86de-f22672db2b7e))
+  (no_connect (at 149.86 81.28) (uuid a6298275-4dce-4294-b558-9e711bb8b950))
+  (no_connect (at 149.86 78.74) (uuid ac29c1ad-5cfd-4587-8ebb-f66a96faff58))
+  (no_connect (at 162.56 78.74) (uuid af5f77dc-c728-46c3-8db0-8120de88a471))
+  (no_connect (at 162.56 71.12) (uuid d159a6f6-174c-4170-8bcd-e4623d144c5d))
+  (no_connect (at 162.56 68.58) (uuid d990ec6c-f3e8-431d-bdd6-2e642665e479))
+  (no_connect (at 162.56 81.28) (uuid f1e6635f-1d74-4f71-b849-1ec3a44acc1b))
 
-  (bus_entry (at 71.755 54.61) (size 2.54 -2.54)
+  (bus_entry (at 71.12 55.88) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 01ff1316-2a77-47e1-b642-b8fedb82c7bd)
   )
-  (bus_entry (at 71.755 33.02) (size 2.54 -2.54)
+  (bus_entry (at 71.12 33.02) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 0290adfc-333e-402b-8a96-ba9302faa300)
   )
-  (bus_entry (at 71.755 106.68) (size 2.54 -2.54)
+  (bus_entry (at 71.12 106.68) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 27b07ca1-ec15-4b23-a463-860490f6e3ea)
   )
-  (bus_entry (at 229.87 99.06) (size 2.54 -2.54)
+  (bus_entry (at 231.14 109.22) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 32b57342-ce72-431c-abf6-457a2d3a20de)
   )
-  (bus_entry (at 71.755 99.06) (size 2.54 -2.54)
+  (bus_entry (at 71.12 99.06) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 386522d2-4618-409f-a1d0-fadcb40b6590)
   )
-  (bus_entry (at 71.755 57.15) (size 2.54 -2.54)
+  (bus_entry (at 71.12 58.42) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 3f56e7a5-cd9c-483b-80b4-1eb78e6a421e)
   )
-  (bus_entry (at 71.755 114.3) (size 2.54 -2.54)
+  (bus_entry (at 71.12 114.3) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 43288448-54c7-49a2-81a5-0bd9392b8739)
   )
-  (bus_entry (at 138.303 69.85) (size -2.54 -2.54)
+  (bus_entry (at 137.16 71.12) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 47749eb0-44be-4886-88f5-acb036f691f8)
   )
-  (bus_entry (at 71.755 101.6) (size 2.54 -2.54)
+  (bus_entry (at 71.12 101.6) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 4abfddcb-b42c-4f63-a2ad-b5d6415e3dd8)
   )
-  (bus_entry (at 71.755 96.52) (size 2.54 -2.54)
+  (bus_entry (at 71.12 96.52) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 4ebafd09-7b1e-4bd2-b9f7-576417bf3275)
   )
-  (bus_entry (at 229.87 78.74) (size 2.54 -2.54)
+  (bus_entry (at 231.14 83.82) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 54485419-cc22-469e-880d-12648c98c4d9)
   )
-  (bus_entry (at 71.755 52.07) (size 2.54 -2.54)
+  (bus_entry (at 71.12 53.34) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 55f4debf-3a8d-436a-86fd-7b342ea40f16)
   )
-  (bus_entry (at 71.755 104.14) (size 2.54 -2.54)
+  (bus_entry (at 71.12 104.14) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 578ca229-8123-4a9f-8fd0-69a183196436)
   )
-  (bus_entry (at 71.755 93.98) (size 2.54 -2.54)
+  (bus_entry (at 71.12 93.98) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 6277a910-1cc1-4d3c-a062-aaeaac7faa12)
   )
-  (bus_entry (at 71.755 30.48) (size 2.54 -2.54)
+  (bus_entry (at 71.12 30.48) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 6986476c-0782-41ce-9621-f348924ec9b3)
   )
-  (bus_entry (at 71.755 43.18) (size 2.54 -2.54)
+  (bus_entry (at 71.12 43.18) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 6d855187-10cb-4fda-9672-de3050327054)
   )
-  (bus_entry (at 71.755 121.92) (size 2.54 -2.54)
+  (bus_entry (at 71.12 121.92) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 6f220322-1a1d-41bd-92b2-dfb8d00158cd)
   )
-  (bus_entry (at 71.755 38.1) (size 2.54 -2.54)
+  (bus_entry (at 71.12 38.1) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 700c7f82-9919-461c-94cb-c5a8efe35d49)
   )
-  (bus_entry (at 138.303 31.75) (size -2.54 -2.54)
+  (bus_entry (at 137.16 33.02) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 803307de-de95-4a46-bf0e-1779e60b5232)
   )
-  (bus_entry (at 138.303 34.29) (size -2.54 -2.54)
+  (bus_entry (at 137.16 35.56) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 803307de-de95-4a46-bf0e-1779e60b5233)
   )
-  (bus_entry (at 138.303 36.83) (size -2.54 -2.54)
+  (bus_entry (at 137.16 38.1) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 803307de-de95-4a46-bf0e-1779e60b5234)
   )
-  (bus_entry (at 138.303 39.37) (size -2.54 -2.54)
+  (bus_entry (at 137.16 40.64) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 803307de-de95-4a46-bf0e-1779e60b5235)
   )
-  (bus_entry (at 229.87 68.58) (size 2.54 -2.54)
+  (bus_entry (at 231.14 68.58) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 85071938-203e-4fae-a154-911af19e0bf8)
   )
-  (bus_entry (at 71.755 109.22) (size 2.54 -2.54)
+  (bus_entry (at 71.12 109.22) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 86a24d25-a35d-408f-8daa-5f9db8d62b2c)
   )
-  (bus_entry (at 138.303 41.91) (size -2.54 -2.54)
+  (bus_entry (at 137.16 43.18) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 890471fe-f3e1-4b82-b8e0-c7909c410595)
   )
-  (bus_entry (at 138.303 64.77) (size -2.54 -2.54)
+  (bus_entry (at 137.16 66.04) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 890471fe-f3e1-4b82-b8e0-c7909c410596)
   )
-  (bus_entry (at 138.303 62.23) (size -2.54 -2.54)
+  (bus_entry (at 137.16 63.5) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 890471fe-f3e1-4b82-b8e0-c7909c410597)
   )
-  (bus_entry (at 138.303 44.45) (size -2.54 -2.54)
+  (bus_entry (at 137.16 45.72) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 890471fe-f3e1-4b82-b8e0-c7909c410598)
   )
-  (bus_entry (at 138.303 46.99) (size -2.54 -2.54)
+  (bus_entry (at 137.16 48.26) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 890471fe-f3e1-4b82-b8e0-c7909c410599)
   )
-  (bus_entry (at 138.303 49.53) (size -2.54 -2.54)
+  (bus_entry (at 137.16 50.8) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 890471fe-f3e1-4b82-b8e0-c7909c41059a)
   )
-  (bus_entry (at 138.303 52.07) (size -2.54 -2.54)
+  (bus_entry (at 137.16 53.34) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 890471fe-f3e1-4b82-b8e0-c7909c41059b)
   )
-  (bus_entry (at 138.303 57.15) (size -2.54 -2.54)
+  (bus_entry (at 137.16 58.42) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 890471fe-f3e1-4b82-b8e0-c7909c41059c)
   )
-  (bus_entry (at 138.303 59.69) (size -2.54 -2.54)
+  (bus_entry (at 137.16 60.96) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 890471fe-f3e1-4b82-b8e0-c7909c41059d)
   )
-  (bus_entry (at 138.303 67.31) (size -2.54 -2.54)
+  (bus_entry (at 137.16 68.58) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 890471fe-f3e1-4b82-b8e0-c7909c41059e)
   )
-  (bus_entry (at 138.303 54.61) (size -2.54 -2.54)
+  (bus_entry (at 137.16 55.88) (size -2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 890471fe-f3e1-4b82-b8e0-c7909c41059f)
   )
-  (bus_entry (at 71.755 91.44) (size 2.54 -2.54)
+  (bus_entry (at 71.12 91.44) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 8fa978a4-06ec-4ffd-bc3a-76235c506582)
   )
-  (bus_entry (at 71.755 40.64) (size 2.54 -2.54)
+  (bus_entry (at 71.12 40.64) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 97738327-b223-47ae-b2ff-b9808d029eee)
   )
-  (bus_entry (at 71.755 45.72) (size 2.54 -2.54)
+  (bus_entry (at 71.12 45.72) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid 98fdba29-9cf2-4568-a325-91508069d654)
   )
-  (bus_entry (at 71.755 119.38) (size 2.54 -2.54)
+  (bus_entry (at 71.12 119.38) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid c12a1d89-e4f3-4601-a757-51958916c1f7)
   )
-  (bus_entry (at 71.755 59.69) (size 2.54 -2.54)
+  (bus_entry (at 71.12 60.96) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid d19a90ed-c3eb-4dcc-b5bc-0f79598deef0)
   )
-  (bus_entry (at 71.755 116.84) (size 2.54 -2.54)
+  (bus_entry (at 71.12 116.84) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid dc384f8e-8f83-49dd-8852-91493d050f3b)
   )
-  (bus_entry (at 229.87 87.63) (size 2.54 -2.54)
+  (bus_entry (at 231.14 93.98) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid e3895ccf-3bc9-427a-b766-a8754ab6796c)
   )
-  (bus_entry (at 71.755 27.94) (size 2.54 -2.54)
+  (bus_entry (at 71.12 27.94) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid e4ca7b73-4b7c-461e-83bf-865e98fbbf48)
   )
-  (bus_entry (at 71.755 35.56) (size 2.54 -2.54)
+  (bus_entry (at 71.12 35.56) (size 2.54 -2.54)
     (stroke (width 0) (type default))
     (uuid f0339f32-1105-42b0-a470-acd1004cb114)
   )
 
-  (bus (pts (xy 74.295 93.98) (xy 74.295 96.52))
+  (bus (pts (xy 73.66 93.98) (xy 73.66 96.52))
     (stroke (width 0) (type default))
     (uuid 017fb458-dd79-4d7e-bbdb-f5efe4159ea5)
   )
 
-  (wire (pts (xy 182.88 34.29) (xy 187.96 34.29))
+  (wire (pts (xy 182.88 35.56) (xy 187.96 35.56))
     (stroke (width 0) (type default))
     (uuid 02802c92-0ff4-4507-a745-dd9be76df337)
   )
-  (wire (pts (xy 180.34 49.53) (xy 180.34 46.99))
+  (wire (pts (xy 208.28 27.94) (xy 208.28 22.86))
     (stroke (width 0) (type default))
-    (uuid 0539b37b-a7c1-47a1-8e40-7eb9f49a47eb)
+    (uuid 0669b103-79f7-4970-a5be-77380650053f)
   )
-  (wire (pts (xy 62.865 43.18) (xy 71.755 43.18))
+  (wire (pts (xy 198.12 96.52) (xy 198.12 93.98))
+    (stroke (width 0) (type default))
+    (uuid 06e6372d-9ec3-491c-a4f1-2cc027863a98)
+  )
+  (wire (pts (xy 63.5 43.18) (xy 71.12 43.18))
     (stroke (width 0) (type default))
     (uuid 09d635cc-99c4-4757-8587-c805d592c1ba)
   )
-  (wire (pts (xy 71.755 45.72) (xy 62.865 45.72))
+  (wire (pts (xy 71.12 45.72) (xy 63.5 45.72))
     (stroke (width 0) (type default))
     (uuid 09dc0a69-b8ca-4be4-90b9-e8a52baa687f)
   )
-  (bus (pts (xy 135.763 62.23) (xy 135.763 64.77))
+  (bus (pts (xy 134.62 63.5) (xy 134.62 66.04))
     (stroke (width 0) (type default))
     (uuid 0abe4886-72c2-4089-99b8-90f5073c981e)
   )
-  (bus (pts (xy 135.763 36.83) (xy 135.763 39.37))
+
+  (wire (pts (xy 190.5 83.82) (xy 198.12 83.82))
+    (stroke (width 0) (type default))
+    (uuid 0bf333a8-894b-4a9e-a331-4cad442d04e6)
+  )
+  (bus (pts (xy 134.62 38.1) (xy 134.62 40.64))
     (stroke (width 0) (type default))
     (uuid 0e7c9665-0089-4553-8c7a-456220fe5f26)
   )
 
-  (wire (pts (xy 207.01 60.96) (xy 226.06 60.96))
+  (wire (pts (xy 205.74 60.96) (xy 226.06 60.96))
     (stroke (width 0) (type default))
     (uuid 0f2a5ad9-a61c-44c6-8df6-7148d84f2263)
   )
-  (bus (pts (xy 74.295 88.9) (xy 74.295 91.44))
+  (bus (pts (xy 73.66 88.9) (xy 73.66 91.44))
     (stroke (width 0) (type default))
     (uuid 1077a058-faaa-4650-9ae2-36ccf4d98cb3)
   )
 
-  (wire (pts (xy 209.55 57.15) (xy 213.36 57.15))
-    (stroke (width 0) (type default))
-    (uuid 11761f7c-e7dc-47c4-81bb-e60a0d99e0d1)
-  )
-  (wire (pts (xy 172.72 64.77) (xy 182.88 64.77))
+  (wire (pts (xy 170.18 66.04) (xy 182.88 66.04))
     (stroke (width 0) (type default))
     (uuid 163f829f-8fcb-4605-ab9c-b6acde327e98)
   )
-  (wire (pts (xy 193.04 67.31) (xy 193.04 87.63))
+  (wire (pts (xy 193.04 68.58) (xy 193.04 93.98))
     (stroke (width 0) (type default))
     (uuid 16f018bd-572c-4dc9-90db-7a0a27bd00f5)
   )
-  (wire (pts (xy 71.755 109.22) (xy 62.865 109.22))
+  (wire (pts (xy 71.12 109.22) (xy 63.5 109.22))
     (stroke (width 0) (type default))
     (uuid 18cfbb37-9357-400f-bac9-5555c8f52dac)
   )
-  (wire (pts (xy 161.29 52.07) (xy 177.8 52.07))
+  (wire (pts (xy 162.56 53.34) (xy 175.26 53.34))
     (stroke (width 0) (type default))
     (uuid 1975cd92-7762-40ff-ad9c-1898f46f7dd9)
   )
-  (wire (pts (xy 208.28 87.63) (xy 208.28 88.9))
+  (wire (pts (xy 195.58 27.94) (xy 167.64 27.94))
     (stroke (width 0) (type default))
-    (uuid 1aa45a46-9f14-4b20-b4cd-35de7f9357c6)
+    (uuid 1a432116-b04e-4fe5-8697-0a4cfbad5089)
   )
-  (wire (pts (xy 161.29 54.61) (xy 173.99 54.61))
+  (wire (pts (xy 193.04 68.58) (xy 198.12 68.58))
+    (stroke (width 0) (type default))
+    (uuid 1a4e8057-ddeb-48cd-8cdd-8ef2191da3e9)
+  )
+  (wire (pts (xy 162.56 55.88) (xy 172.72 55.88))
     (stroke (width 0) (type default))
     (uuid 1b62c643-18b4-455b-b41a-7a06815cf7cd)
   )
-  (wire (pts (xy 209.55 46.99) (xy 209.55 52.07))
-    (stroke (width 0) (type default))
-    (uuid 1bc86dc6-4900-46fa-b922-db32bf18273d)
-  )
-  (wire (pts (xy 161.29 46.99) (xy 180.34 46.99))
+  (wire (pts (xy 162.56 48.26) (xy 180.34 48.26))
     (stroke (width 0) (type default))
     (uuid 1c4ca42e-08d1-4ddc-a0da-c6fbafb06cad)
   )
-  (bus (pts (xy 232.41 17.78) (xy 232.41 66.04))
+  (bus (pts (xy 233.68 17.78) (xy 233.68 66.04))
     (stroke (width 0) (type default))
     (uuid 1d629c7f-fc23-4443-a189-3946d51f8562)
   )
-  (bus (pts (xy 74.295 40.64) (xy 74.295 43.18))
+  (bus (pts (xy 73.66 40.64) (xy 73.66 43.18))
     (stroke (width 0) (type default))
     (uuid 1da675ec-d57a-4765-9a0f-3a6c70f0bf5f)
   )
 
-  (wire (pts (xy 71.755 54.61) (xy 62.865 54.61))
+  (wire (pts (xy 71.12 55.88) (xy 63.5 55.88))
     (stroke (width 0) (type default))
     (uuid 20b70fa8-2d7e-41ea-9938-39fdaeaae5a0)
   )
-  (wire (pts (xy 71.755 30.48) (xy 62.865 30.48))
+  (wire (pts (xy 71.12 30.48) (xy 63.5 30.48))
     (stroke (width 0) (type default))
     (uuid 20f1fce1-2695-4210-a3f7-1c73c1bd9a97)
   )
-  (wire (pts (xy 187.96 36.83) (xy 190.5 36.83))
-    (stroke (width 0) (type default))
-    (uuid 23b8d22a-73d0-455e-b4d3-7b09caca7a30)
-  )
-  (wire (pts (xy 190.5 31.75) (xy 194.31 31.75))
-    (stroke (width 0) (type default))
-    (uuid 2496aa07-a8e7-49b8-9b76-65a05cb98856)
-  )
-  (wire (pts (xy 226.06 52.07) (xy 226.06 57.15))
-    (stroke (width 0) (type default))
-    (uuid 25fbb572-e862-456d-a76d-dea5a3ecd5f1)
-  )
-  (wire (pts (xy 177.8 52.07) (xy 177.8 54.61))
+  (wire (pts (xy 175.26 53.34) (xy 175.26 55.88))
     (stroke (width 0) (type default))
     (uuid 26c0805e-11cd-468f-ab37-56da9781d93e)
   )
-  (bus (pts (xy 135.763 41.91) (xy 135.763 44.45))
+  (bus (pts (xy 134.62 43.18) (xy 134.62 45.72))
     (stroke (width 0) (type default))
     (uuid 289580a5-5124-4607-b6c4-aa14ff555649)
   )
-  (bus (pts (xy 135.763 57.15) (xy 135.763 59.69))
+  (bus (pts (xy 134.62 58.42) (xy 134.62 60.96))
     (stroke (width 0) (type default))
     (uuid 2981d243-a5bd-4349-a533-b792aad0263c)
   )
-
-  (wire (pts (xy 196.85 96.52) (xy 196.85 99.06))
-    (stroke (width 0) (type default))
-    (uuid 2a2ef032-6ae3-4eb9-9dc3-f71670196966)
-  )
-  (wire (pts (xy 202.565 36.83) (xy 203.2 36.83))
-    (stroke (width 0) (type default))
-    (uuid 2ac61e8d-30e4-400f-97f0-5eef10729fe0)
-  )
-  (bus (pts (xy 74.295 96.52) (xy 74.295 99.06))
+  (bus (pts (xy 73.66 96.52) (xy 73.66 99.06))
     (stroke (width 0) (type default))
     (uuid 3163c73e-cfde-441b-a415-2ba10ebb386b)
   )
 
-  (wire (pts (xy 161.29 44.45) (xy 212.09 44.45))
+  (wire (pts (xy 198.12 68.58) (xy 205.74 68.58))
+    (stroke (width 0) (type default))
+    (uuid 322c3320-f316-42c2-8d77-2b127e1a476a)
+  )
+  (wire (pts (xy 162.56 45.72) (xy 213.36 45.72))
     (stroke (width 0) (type default))
     (uuid 33229c18-0ffd-4bf6-912f-c9a84843161f)
   )
-  (wire (pts (xy 138.303 34.29) (xy 148.59 34.29))
+  (wire (pts (xy 195.58 30.48) (xy 190.5 30.48))
+    (stroke (width 0) (type default))
+    (uuid 338bf252-9f33-4772-ab7e-cb038e652d93)
+  )
+  (wire (pts (xy 137.16 35.56) (xy 149.86 35.56))
     (stroke (width 0) (type default))
     (uuid 33d21541-c080-4391-a2ae-0119aa2ab12d)
   )
-  (wire (pts (xy 171.45 36.83) (xy 175.26 36.83))
+  (wire (pts (xy 172.72 38.1) (xy 175.26 38.1))
     (stroke (width 0) (type default))
     (uuid 341dc3e9-5a3c-4ef4-8c05-6311688388e9)
   )
-  (wire (pts (xy 217.17 68.58) (xy 229.87 68.58))
-    (stroke (width 0) (type default))
-    (uuid 35861266-06d3-4750-8531-07a29ce5393f)
-  )
-  (wire (pts (xy 187.96 34.29) (xy 187.96 36.83))
+  (wire (pts (xy 187.96 35.56) (xy 187.96 38.1))
     (stroke (width 0) (type default))
     (uuid 35c0199b-34ab-4cc3-95b0-45ef5d008478)
   )
-  (wire (pts (xy 168.91 29.21) (xy 194.31 29.21))
-    (stroke (width 0) (type default))
-    (uuid 3607908e-16ef-41de-a886-6e5d5524f0ae)
-  )
-  (wire (pts (xy 62.865 96.52) (xy 71.755 96.52))
+  (wire (pts (xy 63.5 96.52) (xy 71.12 96.52))
     (stroke (width 0) (type default))
     (uuid 36d1791d-0690-4e92-8288-e814f2811814)
   )
-  (wire (pts (xy 212.09 38.1) (xy 212.09 41.91))
+  (wire (pts (xy 210.82 38.1) (xy 210.82 43.18))
     (stroke (width 0) (type default))
     (uuid 37824e1e-cbc0-4f7d-acdb-deccbc734386)
   )
-  (bus (pts (xy 135.763 54.61) (xy 135.763 57.15))
+  (bus (pts (xy 134.62 55.88) (xy 134.62 58.42))
     (stroke (width 0) (type default))
     (uuid 3784bb0b-f929-46ac-9bd8-e33eabd5ad1d)
   )
 
-  (wire (pts (xy 71.755 35.56) (xy 62.865 35.56))
+  (wire (pts (xy 71.12 35.56) (xy 63.5 35.56))
     (stroke (width 0) (type default))
     (uuid 378fc95c-3107-4139-a5ea-5218afa4a582)
   )
-  (wire (pts (xy 71.755 99.06) (xy 62.865 99.06))
+  (wire (pts (xy 71.12 99.06) (xy 63.5 99.06))
     (stroke (width 0) (type default))
     (uuid 37964ce7-42af-4fd8-8cbe-cd724969d590)
   )
-  (bus (pts (xy 135.763 31.75) (xy 135.763 34.29))
+  (bus (pts (xy 134.62 33.02) (xy 134.62 35.56))
     (stroke (width 0) (type default))
     (uuid 37b9ac42-eda2-4a46-b23c-59ab8c87e752)
   )
 
-  (wire (pts (xy 182.88 62.23) (xy 182.88 64.77))
+  (wire (pts (xy 182.88 63.5) (xy 182.88 66.04))
     (stroke (width 0) (type default))
     (uuid 39b43db4-30b4-4af4-a40a-32266f07f90b)
   )
-  (wire (pts (xy 186.69 49.53) (xy 180.34 49.53))
+  (wire (pts (xy 187.96 50.8) (xy 180.34 50.8))
     (stroke (width 0) (type default))
     (uuid 39c409e0-f23f-4cf9-a51b-909f0553f348)
   )
-  (wire (pts (xy 161.29 39.37) (xy 208.28 39.37))
+  (wire (pts (xy 200.66 48.26) (xy 208.28 48.26))
+    (stroke (width 0) (type default))
+    (uuid 3a749507-81d5-43e2-8cbd-aec3c9fd08fa)
+  )
+  (wire (pts (xy 162.56 40.64) (xy 208.28 40.64))
     (stroke (width 0) (type default))
     (uuid 3b59179a-1f3f-4795-ac73-103a581fe7b2)
   )
-  (wire (pts (xy 62.865 119.38) (xy 71.755 119.38))
+  (wire (pts (xy 167.64 60.96) (xy 167.64 83.82))
+    (stroke (width 0) (type default))
+    (uuid 3d37aeb7-025d-4bc1-88a8-5fb61f7fbddd)
+  )
+  (wire (pts (xy 63.5 119.38) (xy 71.12 119.38))
     (stroke (width 0) (type default))
     (uuid 3e9192c3-5f9c-4b9c-bae5-5d6a9c4a3415)
   )
-  (bus (pts (xy 74.295 30.48) (xy 74.295 33.02))
+  (bus (pts (xy 73.66 30.48) (xy 73.66 33.02))
     (stroke (width 0) (type default))
     (uuid 4093f53f-b536-421c-9536-b5dc5d30e972)
   )
 
-  (wire (pts (xy 220.98 52.07) (xy 226.06 52.07))
+  (wire (pts (xy 223.52 53.34) (xy 226.06 53.34))
     (stroke (width 0) (type default))
     (uuid 41780195-4b65-42f4-9f96-91eac1cd5d94)
   )
-  (wire (pts (xy 168.91 34.29) (xy 168.91 29.21))
+  (wire (pts (xy 167.64 83.82) (xy 190.5 83.82))
     (stroke (width 0) (type default))
-    (uuid 42f714e7-a256-4472-a3b8-a6c9c59abafd)
+    (uuid 437392e9-4906-4b3d-9a32-813042709060)
   )
-  (wire (pts (xy 204.47 31.75) (xy 208.28 31.75))
+  (wire (pts (xy 208.28 109.22) (xy 208.28 106.68))
     (stroke (width 0) (type default))
-    (uuid 476e90ab-8f21-45cc-8b56-cfd003948dd2)
+    (uuid 43a0e9cb-3f3f-425d-9c18-f4767ad1fb8a)
   )
-  (wire (pts (xy 189.23 99.06) (xy 196.85 99.06))
+  (wire (pts (xy 187.96 35.56) (xy 190.5 35.56))
+    (stroke (width 0) (type default))
+    (uuid 45fbb09b-0ab8-4db4-bb22-a95b4adad3b6)
+  )
+  (wire (pts (xy 190.5 109.22) (xy 198.12 109.22))
     (stroke (width 0) (type default))
     (uuid 4a5d31aa-6585-427b-bdc1-d43dc435974f)
   )
-  (wire (pts (xy 196.85 99.06) (xy 205.74 99.06))
+  (wire (pts (xy 198.12 109.22) (xy 208.28 109.22))
     (stroke (width 0) (type default))
     (uuid 4a86d17d-8c5a-4738-8955-fbe9e15ff379)
   )
-  (wire (pts (xy 228.6 44.45) (xy 228.6 38.1))
+  (wire (pts (xy 205.74 27.94) (xy 208.28 27.94))
+    (stroke (width 0) (type default))
+    (uuid 4b8dbcd6-e0be-416e-9979-a1e2f341dfb3)
+  )
+  (wire (pts (xy 228.6 45.72) (xy 228.6 38.1))
     (stroke (width 0) (type default))
     (uuid 4c83771c-b560-49d1-a7a4-3046c3c4015a)
   )
-  (wire (pts (xy 179.07 49.53) (xy 179.07 52.07))
+  (wire (pts (xy 177.8 50.8) (xy 177.8 53.34))
     (stroke (width 0) (type default))
     (uuid 4de99884-c051-40b7-99a7-98c83169a97b)
   )
-  (wire (pts (xy 226.06 57.15) (xy 226.06 60.96))
-    (stroke (width 0) (type default))
-    (uuid 4f4bd036-e252-4adf-9255-b2d564ca3d24)
-  )
-  (wire (pts (xy 203.2 36.83) (xy 208.28 36.83))
-    (stroke (width 0) (type default))
-    (uuid 50bb33e2-8ef4-4ca4-adb5-caa02d177548)
-  )
-  (wire (pts (xy 205.74 64.77) (xy 205.74 67.31))
+  (wire (pts (xy 205.74 66.04) (xy 205.74 68.58))
     (stroke (width 0) (type default))
     (uuid 50daa0c9-1146-4c7b-8452-74c3ca2a37dd)
   )
-  (wire (pts (xy 62.865 57.15) (xy 71.755 57.15))
+  (wire (pts (xy 63.5 58.42) (xy 71.12 58.42))
     (stroke (width 0) (type default))
     (uuid 5114004d-1710-4e8d-a05d-b45e13499d44)
   )
-  (wire (pts (xy 161.29 57.15) (xy 172.72 57.15))
+  (wire (pts (xy 162.56 58.42) (xy 170.18 58.42))
     (stroke (width 0) (type default))
     (uuid 51d24ddd-4807-47df-8e7e-81a7a1b9d70f)
   )
-  (wire (pts (xy 180.34 46.99) (xy 186.69 46.99))
+  (wire (pts (xy 180.34 48.26) (xy 187.96 48.26))
     (stroke (width 0) (type default))
     (uuid 52361c1a-1562-4e2d-8c34-5d72126b7854)
   )
-  (bus (pts (xy 74.295 27.94) (xy 74.295 30.48))
+  (bus (pts (xy 73.66 27.94) (xy 73.66 30.48))
     (stroke (width 0) (type default))
     (uuid 5434adce-d2a5-4e84-b224-48122cfe7d31)
   )
 
-  (wire (pts (xy 194.31 62.23) (xy 205.74 62.23))
+  (wire (pts (xy 195.58 63.5) (xy 205.74 63.5))
     (stroke (width 0) (type default))
     (uuid 5472566f-27db-422c-8fca-13f23977b588)
   )
-  (bus (pts (xy 74.295 111.76) (xy 74.295 114.3))
+  (bus (pts (xy 73.66 111.76) (xy 73.66 114.3))
     (stroke (width 0) (type default))
     (uuid 547e8521-528c-443f-b452-f4010fc2db81)
   )
 
-  (wire (pts (xy 62.865 52.07) (xy 71.755 52.07))
+  (wire (pts (xy 226.06 53.34) (xy 226.06 58.42))
+    (stroke (width 0) (type default))
+    (uuid 5502516a-c8a1-496f-8ecc-aab22436de82)
+  )
+  (wire (pts (xy 63.5 53.34) (xy 71.12 53.34))
     (stroke (width 0) (type default))
     (uuid 56a8f4fe-a949-4d1c-a03a-cecd810da105)
   )
-  (wire (pts (xy 196.85 76.2) (xy 196.85 78.74))
+  (wire (pts (xy 215.9 93.98) (xy 210.82 93.98))
     (stroke (width 0) (type default))
-    (uuid 56e5c615-8419-4bc8-bd15-729b17e8986c)
+    (uuid 573d104b-f0c9-4f2f-90ee-9ad129ab04e3)
   )
-  (bus (pts (xy 135.763 29.21) (xy 135.763 31.75))
+  (bus (pts (xy 134.62 30.48) (xy 134.62 33.02))
     (stroke (width 0) (type default))
     (uuid 57b9ee83-0c8b-4b9a-ba68-1dda0dc0ef52)
   )
 
-  (wire (pts (xy 209.55 52.07) (xy 209.55 57.15))
-    (stroke (width 0) (type default))
-    (uuid 59f45a94-6bc7-4044-87c0-0e0ca0b9cb10)
-  )
-  (wire (pts (xy 71.755 104.14) (xy 62.865 104.14))
+  (wire (pts (xy 71.12 104.14) (xy 63.5 104.14))
     (stroke (width 0) (type default))
     (uuid 5ad2730e-aee2-45ad-a3d9-faa185077487)
   )
-  (wire (pts (xy 148.59 52.07) (xy 138.303 52.07))
+  (wire (pts (xy 149.86 53.34) (xy 137.16 53.34))
     (stroke (width 0) (type default))
     (uuid 5d64e60e-dbd6-42bf-9102-e1446e5fe9c7)
   )
-  (wire (pts (xy 208.28 22.86) (xy 208.28 31.75))
-    (stroke (width 0) (type default))
-    (uuid 5d7b4fdf-1a28-4595-9fa9-196323625127)
-  )
-  (bus (pts (xy 74.295 91.44) (xy 74.295 93.98))
+  (bus (pts (xy 73.66 91.44) (xy 73.66 93.98))
     (stroke (width 0) (type default))
     (uuid 5e7b84d3-70ff-4f68-8662-6ae646d2c77c)
   )
 
-  (wire (pts (xy 148.59 39.37) (xy 138.303 39.37))
+  (wire (pts (xy 149.86 40.64) (xy 137.16 40.64))
     (stroke (width 0) (type default))
     (uuid 5eed501e-9a3a-4a77-ae0c-20851ddbae4c)
   )
-  (wire (pts (xy 196.85 78.74) (xy 205.74 78.74))
+  (wire (pts (xy 198.12 83.82) (xy 205.74 83.82))
     (stroke (width 0) (type default))
     (uuid 60244ce5-b426-40f1-9ee2-423fc55a4a89)
   )
-  (wire (pts (xy 201.93 54.61) (xy 201.93 58.42))
+  (wire (pts (xy 203.2 55.88) (xy 203.2 60.96))
     (stroke (width 0) (type default))
     (uuid 6073ffa8-65a8-4c40-8c44-08bb8a442d30)
   )
-  (wire (pts (xy 208.28 99.06) (xy 229.87 99.06))
+  (wire (pts (xy 210.82 109.22) (xy 231.14 109.22))
     (stroke (width 0) (type default))
     (uuid 61fa1ed4-0bd2-416e-b8ed-2f54704ac7dd)
   )
-  (wire (pts (xy 138.303 44.45) (xy 148.59 44.45))
+  (wire (pts (xy 167.64 27.94) (xy 167.64 35.56))
+    (stroke (width 0) (type default))
+    (uuid 62b3fd7d-070a-4d5a-896c-22b657fbcd9d)
+  )
+  (wire (pts (xy 137.16 45.72) (xy 149.86 45.72))
     (stroke (width 0) (type default))
     (uuid 67dd8102-916b-4357-9e29-eaee27076405)
   )
-  (wire (pts (xy 226.06 46.99) (xy 226.06 52.07))
+  (wire (pts (xy 226.06 48.26) (xy 226.06 53.34))
     (stroke (width 0) (type default))
     (uuid 68201c07-5050-4101-bd57-8b82b66810e2)
   )
-  (wire (pts (xy 161.29 34.29) (xy 168.91 34.29))
+  (wire (pts (xy 208.28 83.82) (xy 208.28 81.28))
     (stroke (width 0) (type default))
-    (uuid 6928a47a-ec94-40dc-bea0-0ba0db5d3268)
+    (uuid 6a3d4749-5474-48f7-8253-96d306d7f0c6)
   )
-  (wire (pts (xy 182.88 36.83) (xy 187.96 36.83))
+  (wire (pts (xy 182.88 38.1) (xy 187.96 38.1))
     (stroke (width 0) (type default))
     (uuid 6adc0dff-e63a-4fdb-9e1f-2a6d4f8fac4d)
   )
-  (wire (pts (xy 199.39 49.53) (xy 199.39 46.99))
+  (wire (pts (xy 200.66 50.8) (xy 200.66 48.26))
     (stroke (width 0) (type default))
     (uuid 6af88e95-1bfa-4039-baf0-83b9bf78fb25)
   )
-  (wire (pts (xy 161.29 36.83) (xy 171.45 36.83))
+  (wire (pts (xy 162.56 38.1) (xy 172.72 38.1))
     (stroke (width 0) (type default))
     (uuid 6c08dfe2-1dbf-48ba-8d56-0db47bbb9db5)
   )
-  (bus (pts (xy 135.763 49.53) (xy 135.763 52.07))
+  (wire (pts (xy 198.12 104.14) (xy 198.12 109.22))
+    (stroke (width 0) (type default))
+    (uuid 6d880e43-db9a-4eaa-b54f-584a37d8ee95)
+  )
+  (bus (pts (xy 134.62 50.8) (xy 134.62 53.34))
     (stroke (width 0) (type default))
     (uuid 6e0ea323-2b36-4a9b-a451-c3420c883a0d)
   )
-  (bus (pts (xy 74.295 101.6) (xy 74.295 104.14))
+  (bus (pts (xy 73.66 101.6) (xy 73.66 104.14))
     (stroke (width 0) (type default))
     (uuid 6f4db371-ff7b-4e02-94b3-c14781df2121)
   )
-
-  (wire (pts (xy 199.39 46.99) (xy 209.55 46.99))
-    (stroke (width 0) (type default))
-    (uuid 702f064b-61ab-4db2-9b1d-960358de3382)
-  )
-  (bus (pts (xy 74.295 106.68) (xy 74.295 111.76))
+  (bus (pts (xy 73.66 106.68) (xy 73.66 111.76))
     (stroke (width 0) (type default))
     (uuid 706c305b-6851-417d-9ae0-eaef01811e8d)
   )
 
-  (wire (pts (xy 194.31 46.99) (xy 199.39 46.99))
+  (wire (pts (xy 195.58 48.26) (xy 200.66 48.26))
     (stroke (width 0) (type default))
     (uuid 70c61184-df51-4d3d-b894-f9d13c67dbaf)
   )
-  (wire (pts (xy 209.55 46.99) (xy 212.09 46.99))
-    (stroke (width 0) (type default))
-    (uuid 71d3697c-4eee-4793-a70d-ae22ba57af16)
-  )
-  (wire (pts (xy 215.9 87.63) (xy 229.87 87.63))
+  (wire (pts (xy 223.52 93.98) (xy 231.14 93.98))
     (stroke (width 0) (type default))
     (uuid 73340554-f82d-4ed7-85b7-f20367170a09)
   )
-  (wire (pts (xy 138.303 64.77) (xy 148.59 64.77))
+  (wire (pts (xy 137.16 66.04) (xy 149.86 66.04))
     (stroke (width 0) (type default))
     (uuid 76a1dede-3439-4f06-ab86-ddd77ec23c2d)
   )
-  (wire (pts (xy 220.98 57.15) (xy 226.06 57.15))
+  (wire (pts (xy 223.52 58.42) (xy 226.06 58.42))
     (stroke (width 0) (type default))
     (uuid 7a923512-ea3d-49ed-b204-fef3810d88aa)
   )
-  (wire (pts (xy 148.59 31.75) (xy 138.303 31.75))
+  (wire (pts (xy 149.86 33.02) (xy 137.16 33.02))
     (stroke (width 0) (type default))
     (uuid 7b024500-c9cd-4f29-8104-b32c6cb1cbb8)
   )
-  (wire (pts (xy 194.31 49.53) (xy 199.39 49.53))
+  (wire (pts (xy 195.58 50.8) (xy 200.66 50.8))
     (stroke (width 0) (type default))
     (uuid 7c16ec8d-cc85-4241-9bbd-134ad752d344)
   )
-  (wire (pts (xy 161.29 41.91) (xy 212.09 41.91))
+  (wire (pts (xy 162.56 43.18) (xy 210.82 43.18))
     (stroke (width 0) (type default))
     (uuid 7cf668dc-09c4-4ed7-bb4b-e3a8f75c7ecd)
   )
-  (wire (pts (xy 190.5 36.83) (xy 190.5 31.75))
+  (wire (pts (xy 205.74 83.82) (xy 205.74 81.28))
     (stroke (width 0) (type default))
-    (uuid 7f6ebfd4-ad01-4e22-97e5-e89e2c283230)
+    (uuid 7d7f6f63-f80d-4147-8ba3-c1949f06ab0a)
   )
-  (bus (pts (xy 74.295 17.78) (xy 135.763 17.78))
-    (stroke (width 0) (type default))
-    (uuid 7fb1042a-24d6-4678-956c-bc5cc3d8ce15)
-  )
-
-  (wire (pts (xy 170.18 59.69) (xy 170.18 78.74))
-    (stroke (width 0) (type default))
-    (uuid 825d790e-9191-4907-9b08-bff3d89d3906)
-  )
-  (wire (pts (xy 173.99 58.42) (xy 185.42 58.42))
+  (wire (pts (xy 172.72 60.96) (xy 187.96 60.96))
     (stroke (width 0) (type default))
     (uuid 8306443e-0c4c-485a-879e-ffa14e53274f)
   )
-  (wire (pts (xy 148.59 41.91) (xy 138.303 41.91))
+  (wire (pts (xy 149.86 43.18) (xy 137.16 43.18))
     (stroke (width 0) (type default))
     (uuid 835e3009-93e1-43ca-b561-5fb6cb6e43c4)
   )
-  (wire (pts (xy 190.5 36.83) (xy 194.945 36.83))
-    (stroke (width 0) (type default))
-    (uuid 85df5615-3641-4ad9-8a65-af2662cf4856)
-  )
-  (wire (pts (xy 148.59 62.23) (xy 138.303 62.23))
+  (wire (pts (xy 149.86 63.5) (xy 137.16 63.5))
     (stroke (width 0) (type default))
     (uuid 8735b822-094b-40c0-973c-210b0886acf9)
   )
-  (wire (pts (xy 148.59 57.15) (xy 138.303 57.15))
+  (wire (pts (xy 149.86 58.42) (xy 137.16 58.42))
     (stroke (width 0) (type default))
     (uuid 87f92de7-8993-4e70-978c-765b68e3aae6)
   )
-  (wire (pts (xy 138.303 54.61) (xy 148.59 54.61))
+  (wire (pts (xy 137.16 55.88) (xy 149.86 55.88))
     (stroke (width 0) (type default))
     (uuid 88cb9c52-906f-48e9-8b9e-10365b72ec17)
   )
-  (bus (pts (xy 232.41 85.09) (xy 232.41 96.52))
+  (wire (pts (xy 162.56 60.96) (xy 167.64 60.96))
+    (stroke (width 0) (type default))
+    (uuid 8c0fdc43-27a1-49db-8f95-07e705980ca6)
+  )
+  (bus (pts (xy 233.68 91.44) (xy 233.68 106.68))
     (stroke (width 0) (type default))
     (uuid 8d4b4ca5-b477-4435-b723-00249902b450)
   )
 
-  (wire (pts (xy 71.755 40.64) (xy 62.865 40.64))
+  (wire (pts (xy 71.12 40.64) (xy 63.5 40.64))
     (stroke (width 0) (type default))
     (uuid 8e843e2a-e732-4efb-88da-87774f77ecab)
   )
-  (wire (pts (xy 62.865 27.94) (xy 71.755 27.94))
+  (wire (pts (xy 63.5 27.94) (xy 71.12 27.94))
     (stroke (width 0) (type default))
     (uuid 8efa4b91-775b-47ac-9de9-23a5c8107ac5)
   )
-  (bus (pts (xy 74.295 43.18) (xy 74.295 49.53))
+  (bus (pts (xy 73.66 43.18) (xy 73.66 50.8))
     (stroke (width 0) (type default))
     (uuid 906a894f-c581-476e-bde3-0a5453433d46)
   )
 
-  (wire (pts (xy 171.45 34.29) (xy 175.26 34.29))
+  (wire (pts (xy 180.34 48.26) (xy 180.34 50.8))
+    (stroke (width 0) (type default))
+    (uuid 90d7598c-0f8e-45c2-80af-4a627d22b451)
+  )
+  (wire (pts (xy 172.72 35.56) (xy 175.26 35.56))
     (stroke (width 0) (type default))
     (uuid 91001a56-4e26-4f51-8f62-383c574cc68b)
   )
-  (wire (pts (xy 189.23 78.74) (xy 196.85 78.74))
-    (stroke (width 0) (type default))
-    (uuid 92071331-f4e7-4be3-bc31-5d2b13df9951)
-  )
-  (wire (pts (xy 138.303 69.85) (xy 148.59 69.85))
+  (wire (pts (xy 137.16 71.12) (xy 149.86 71.12))
     (stroke (width 0) (type default))
     (uuid 928bbe6d-9620-42e2-b7d8-66ef9f3081ea)
   )
-  (bus (pts (xy 74.295 57.15) (xy 74.295 88.9))
-    (stroke (width 0) (type default))
-    (uuid 950fd808-837a-4d7b-9535-56841920f2d6)
-  )
-
-  (wire (pts (xy 196.85 87.63) (xy 205.74 87.63))
-    (stroke (width 0) (type default))
-    (uuid 96a85c61-476f-4ad9-969c-84404e9b142f)
-  )
-  (wire (pts (xy 196.85 87.63) (xy 196.85 88.9))
-    (stroke (width 0) (type default))
-    (uuid 972ba6b7-82a1-461e-a917-90b79669e959)
-  )
-  (wire (pts (xy 205.74 62.23) (xy 205.74 64.77))
+  (wire (pts (xy 205.74 63.5) (xy 205.74 66.04))
     (stroke (width 0) (type default))
     (uuid 97edee61-85ab-48cd-a06c-339bf149b305)
   )
-  (wire (pts (xy 205.74 67.31) (xy 205.74 68.58))
+  (wire (pts (xy 198.12 78.74) (xy 198.12 83.82))
     (stroke (width 0) (type default))
-    (uuid 9caca38c-5265-4118-b8e8-c3cecfd53eed)
+    (uuid 9891f2d7-7d6c-4bf9-90e1-eda0e7a489b7)
   )
-  (wire (pts (xy 194.31 64.77) (xy 205.74 64.77))
+  (wire (pts (xy 162.56 35.56) (xy 167.64 35.56))
+    (stroke (width 0) (type default))
+    (uuid 99c9bbe4-5cd7-48bf-a899-f9505e7b9966)
+  )
+  (wire (pts (xy 210.82 93.98) (xy 210.82 96.52))
+    (stroke (width 0) (type default))
+    (uuid 9a3debdf-8ab9-40c6-9b61-723d887a773a)
+  )
+  (wire (pts (xy 203.2 35.56) (xy 208.28 35.56))
+    (stroke (width 0) (type default))
+    (uuid 9d5cdad9-72aa-414d-b45d-34ebda941ea1)
+  )
+  (wire (pts (xy 195.58 66.04) (xy 205.74 66.04))
     (stroke (width 0) (type default))
     (uuid 9e6a8fdc-ecf5-4f28-a393-0d280ae687cc)
   )
-  (wire (pts (xy 222.25 46.99) (xy 226.06 46.99))
+  (wire (pts (xy 223.52 48.26) (xy 226.06 48.26))
     (stroke (width 0) (type default))
     (uuid a009b05e-06bb-4786-bd52-c46c204a49f3)
   )
-  (wire (pts (xy 62.865 101.6) (xy 71.755 101.6))
+  (wire (pts (xy 63.5 101.6) (xy 71.12 101.6))
     (stroke (width 0) (type default))
     (uuid a12cdb0d-bad7-4cb4-bc38-2631f4d08988)
   )
-  (wire (pts (xy 179.07 52.07) (xy 207.01 52.07))
+  (wire (pts (xy 177.8 53.34) (xy 205.74 53.34))
     (stroke (width 0) (type default))
     (uuid a1d19410-2e91-492e-b79f-d4641370f24c)
   )
-  (wire (pts (xy 195.58 58.42) (xy 201.93 58.42))
+  (wire (pts (xy 198.12 60.96) (xy 203.2 60.96))
     (stroke (width 0) (type default))
     (uuid a294bd85-ddc7-4c87-b2b4-18e0788feb30)
   )
-  (wire (pts (xy 62.865 91.44) (xy 71.755 91.44))
+  (wire (pts (xy 63.5 91.44) (xy 71.12 91.44))
     (stroke (width 0) (type default))
     (uuid a314c456-3b91-4e2e-ba4c-3819536fda5f)
   )
-  (bus (pts (xy 74.295 52.07) (xy 74.295 54.61))
+  (wire (pts (xy 198.12 93.98) (xy 208.28 93.98))
+    (stroke (width 0) (type default))
+    (uuid a5ba8de4-921b-43d1-9650-9523a405e34d)
+  )
+  (bus (pts (xy 73.66 53.34) (xy 73.66 55.88))
     (stroke (width 0) (type default))
     (uuid a60ed631-f3eb-494b-8f44-c44539ed4e0c)
   )
-  (bus (pts (xy 74.295 17.78) (xy 74.295 25.4))
+  (bus (pts (xy 73.66 17.78) (xy 73.66 25.4))
     (stroke (width 0) (type default))
     (uuid a6e2c88d-6fe4-47c9-b292-17eac875f933)
   )
 
-  (wire (pts (xy 177.8 54.61) (xy 201.93 54.61))
+  (wire (pts (xy 175.26 55.88) (xy 203.2 55.88))
     (stroke (width 0) (type default))
     (uuid a7c74d6b-5324-4bb7-8dcd-616ede403fe2)
   )
-  (bus (pts (xy 74.295 114.3) (xy 74.295 116.84))
+  (bus (pts (xy 73.66 114.3) (xy 73.66 116.84))
     (stroke (width 0) (type default))
     (uuid ac23fd57-90db-410b-ac33-00cef6a758ef)
   )
-  (bus (pts (xy 135.763 17.78) (xy 232.41 17.78))
+  (bus (pts (xy 134.62 17.78) (xy 233.68 17.78))
     (stroke (width 0) (type default))
     (uuid ad3d9b56-412c-4cf3-8584-7df2923fac69)
   )
-  (bus (pts (xy 135.763 52.07) (xy 135.763 54.61))
+  (bus (pts (xy 134.62 53.34) (xy 134.62 55.88))
     (stroke (width 0) (type default))
     (uuid adcdb4fa-b148-44ad-9499-5075c3511d8a)
   )
 
-  (wire (pts (xy 62.865 33.02) (xy 71.755 33.02))
+  (wire (pts (xy 63.5 33.02) (xy 71.12 33.02))
     (stroke (width 0) (type default))
     (uuid ae95e415-12f3-46a9-81f6-688bc893f457)
   )
-  (wire (pts (xy 166.37 31.75) (xy 166.37 22.86))
+  (wire (pts (xy 165.1 33.02) (xy 165.1 22.86))
     (stroke (width 0) (type default))
-    (uuid b1341d0a-680e-46e9-9dfe-72343d26727e)
+    (uuid afb003f8-a69c-48ed-82c5-cd7511cc4960)
   )
-  (wire (pts (xy 193.04 67.31) (xy 196.85 67.31))
+  (wire (pts (xy 223.52 68.58) (xy 231.14 68.58))
     (stroke (width 0) (type default))
-    (uuid b1649f8f-aded-4efc-a7cd-44424c7e8b95)
+    (uuid b19bdb5d-86a3-4dd4-bb53-af9a979d05be)
   )
-  (bus (pts (xy 74.295 54.61) (xy 74.295 57.15))
+  (bus (pts (xy 73.66 55.88) (xy 73.66 58.42))
     (stroke (width 0) (type default))
     (uuid b1c439a1-3fcd-480e-832c-ffcaaa788a19)
   )
-  (bus (pts (xy 74.295 104.14) (xy 74.295 106.68))
+
+  (wire (pts (xy 210.82 38.1) (xy 228.6 38.1))
+    (stroke (width 0) (type default))
+    (uuid b38ae566-aba8-44db-aa9c-83f8c990d1bb)
+  )
+  (bus (pts (xy 73.66 104.14) (xy 73.66 106.68))
     (stroke (width 0) (type default))
     (uuid b3a20280-80e3-4275-a560-758782ec54d0)
   )
 
-  (wire (pts (xy 189.23 99.06) (xy 189.23 78.74))
+  (wire (pts (xy 198.12 68.58) (xy 198.12 71.12))
+    (stroke (width 0) (type default))
+    (uuid b4626253-5b79-44c6-9451-2ba4931703c2)
+  )
+  (wire (pts (xy 190.5 109.22) (xy 190.5 83.82))
     (stroke (width 0) (type default))
     (uuid b4a4ced9-ef20-447d-a9f5-c42e9bb069de)
   )
-  (wire (pts (xy 208.28 31.75) (xy 208.28 36.83))
+  (wire (pts (xy 208.28 30.48) (xy 208.28 35.56))
     (stroke (width 0) (type default))
     (uuid b5377745-23f5-4ad3-b85c-81f08b94164b)
   )
-  (wire (pts (xy 148.59 46.99) (xy 138.303 46.99))
+  (wire (pts (xy 149.86 48.26) (xy 137.16 48.26))
     (stroke (width 0) (type default))
     (uuid b58a22d1-aca2-42f8-88e1-3ed4d3ecfe72)
   )
-  (wire (pts (xy 71.755 116.84) (xy 62.865 116.84))
+  (wire (pts (xy 190.5 30.48) (xy 190.5 35.56))
+    (stroke (width 0) (type default))
+    (uuid b6ef58ad-ceb5-4b65-aa96-8a3d21b99e5f)
+  )
+  (wire (pts (xy 71.12 116.84) (xy 63.5 116.84))
     (stroke (width 0) (type default))
     (uuid b7b69948-47a7-4f00-b824-bbbb071589c9)
   )
-  (wire (pts (xy 62.865 38.1) (xy 71.755 38.1))
+  (wire (pts (xy 63.5 38.1) (xy 71.12 38.1))
     (stroke (width 0) (type default))
     (uuid b83c29c3-be38-4fe2-bf02-c3f0dd3c4ba3)
   )
-  (bus (pts (xy 135.763 39.37) (xy 135.763 41.91))
+  (wire (pts (xy 190.5 35.56) (xy 195.58 35.56))
+    (stroke (width 0) (type default))
+    (uuid babf51e7-0c72-4eb8-8fd4-31336fc747bc)
+  )
+  (wire (pts (xy 162.56 33.02) (xy 165.1 33.02))
+    (stroke (width 0) (type default))
+    (uuid bbd1f731-3f90-4588-88bd-53fd7e0b7efe)
+  )
+  (bus (pts (xy 134.62 40.64) (xy 134.62 43.18))
     (stroke (width 0) (type default))
     (uuid bc0c6b8f-d2d1-4e70-ad07-644f4b5eb97b)
   )
 
-  (wire (pts (xy 161.29 59.69) (xy 170.18 59.69))
-    (stroke (width 0) (type default))
-    (uuid bd621647-cd63-41f8-85d2-1b33f1adca4b)
-  )
-  (wire (pts (xy 186.69 62.23) (xy 182.88 62.23))
+  (wire (pts (xy 187.96 63.5) (xy 182.88 63.5))
     (stroke (width 0) (type default))
     (uuid bf7df299-d529-44ce-8099-aebb35bc5d2d)
   )
-  (wire (pts (xy 205.74 88.9) (xy 205.74 87.63))
-    (stroke (width 0) (type default))
-    (uuid c05f5ef3-cc67-4938-8464-5627be705480)
-  )
-  (bus (pts (xy 74.295 116.84) (xy 74.295 119.38))
+  (bus (pts (xy 73.66 116.84) (xy 73.66 119.38))
     (stroke (width 0) (type default))
     (uuid c0bf9cf9-3fee-4da6-815d-1960a2c004ab)
   )
-  (bus (pts (xy 135.763 59.69) (xy 135.763 62.23))
+  (bus (pts (xy 134.62 60.96) (xy 134.62 63.5))
     (stroke (width 0) (type default))
     (uuid c1b00d25-5dca-4ecb-bb4f-2c97571200da)
   )
 
-  (wire (pts (xy 148.59 36.83) (xy 138.303 36.83))
+  (wire (pts (xy 149.86 38.1) (xy 137.16 38.1))
     (stroke (width 0) (type default))
     (uuid c243e847-1fba-4e86-b1e1-0759d98c3fc4)
   )
-  (wire (pts (xy 182.88 64.77) (xy 186.69 64.77))
+  (wire (pts (xy 208.28 71.12) (xy 208.28 68.58))
+    (stroke (width 0) (type default))
+    (uuid c5045570-4280-4419-ac5e-81376cdfcce0)
+  )
+  (wire (pts (xy 182.88 66.04) (xy 187.96 66.04))
     (stroke (width 0) (type default))
     (uuid c691f7a3-64f0-4d50-9f9f-6b9827497af8)
   )
-  (wire (pts (xy 228.6 38.1) (xy 212.09 38.1))
-    (stroke (width 0) (type default))
-    (uuid c760d767-791a-41d9-a9e3-a8a31373722c)
-  )
-  (wire (pts (xy 161.29 49.53) (xy 179.07 49.53))
+  (wire (pts (xy 162.56 50.8) (xy 177.8 50.8))
     (stroke (width 0) (type default))
     (uuid c9430437-b954-44cc-a3a5-0da3c353c165)
   )
-  (bus (pts (xy 74.295 38.1) (xy 74.295 40.64))
+  (bus (pts (xy 73.66 38.1) (xy 73.66 40.64))
     (stroke (width 0) (type default))
     (uuid c94363f5-feaa-4808-937e-16b3af3c4fd9)
   )
 
-  (wire (pts (xy 170.18 78.74) (xy 189.23 78.74))
-    (stroke (width 0) (type default))
-    (uuid cb65fcbb-36d0-43c8-901f-f40155c69ea9)
-  )
-  (wire (pts (xy 138.303 67.31) (xy 148.59 67.31))
+  (wire (pts (xy 137.16 68.58) (xy 149.86 68.58))
     (stroke (width 0) (type default))
     (uuid cc4747ed-b999-4c9a-9eab-5c0a872eefb6)
   )
-  (wire (pts (xy 71.755 121.92) (xy 62.865 121.92))
+  (bus (pts (xy 73.66 17.78) (xy 134.62 17.78))
+    (stroke (width 0) (type default))
+    (uuid cefb0b7d-c5c8-4472-b7f0-5f83dd8ab446)
+  )
+
+  (wire (pts (xy 71.12 121.92) (xy 63.5 121.92))
     (stroke (width 0) (type default))
     (uuid d0302726-e499-4c4c-9157-902ce424d12d)
   )
-  (bus (pts (xy 74.295 33.02) (xy 74.295 35.56))
+  (bus (pts (xy 73.66 33.02) (xy 73.66 35.56))
     (stroke (width 0) (type default))
     (uuid d0e79bcf-bd14-4311-a43b-cfb75abf11b7)
   )
 
-  (wire (pts (xy 161.29 31.75) (xy 166.37 31.75))
+  (wire (pts (xy 210.82 109.22) (xy 210.82 106.68))
     (stroke (width 0) (type default))
-    (uuid d337ce9d-067b-40da-996b-251ce8882fd8)
+    (uuid d17d925e-63cb-4bef-8d39-1baed2ca8730)
   )
-  (wire (pts (xy 208.28 36.83) (xy 208.28 39.37))
+  (wire (pts (xy 208.28 68.58) (xy 215.9 68.58))
+    (stroke (width 0) (type default))
+    (uuid d3adbdfc-eef9-4be4-aa13-7c92847ab30d)
+  )
+  (wire (pts (xy 208.28 35.56) (xy 208.28 40.64))
     (stroke (width 0) (type default))
     (uuid d584c7cb-a779-4265-9309-f0b2c846cc56)
   )
-  (bus (pts (xy 74.295 35.56) (xy 74.295 38.1))
+  (bus (pts (xy 73.66 35.56) (xy 73.66 38.1))
     (stroke (width 0) (type default))
     (uuid d5bb3d3c-8383-46a4-98e6-456bc4615a4f)
   )
-  (bus (pts (xy 232.41 76.2) (xy 232.41 85.09))
-    (stroke (width 0) (type default))
-    (uuid d8925cb2-84f8-41af-ab9c-9e6ff9fe408e)
-  )
-  (bus (pts (xy 135.763 34.29) (xy 135.763 36.83))
+  (bus (pts (xy 134.62 35.56) (xy 134.62 38.1))
     (stroke (width 0) (type default))
     (uuid dad65116-a736-47ab-9109-8ec654f334b3)
   )
-  (bus (pts (xy 135.763 17.78) (xy 135.763 29.21))
+  (bus (pts (xy 134.62 17.78) (xy 134.62 30.48))
     (stroke (width 0) (type default))
     (uuid db6d86fa-83e6-422f-b863-dea087de1abc)
   )
 
-  (wire (pts (xy 209.55 52.07) (xy 213.36 52.07))
+  (wire (pts (xy 208.28 53.34) (xy 215.9 53.34))
     (stroke (width 0) (type default))
     (uuid e0e62de2-240c-492c-b085-d3a063ec8a78)
   )
-  (bus (pts (xy 232.41 66.04) (xy 232.41 76.2))
+  (bus (pts (xy 233.68 66.04) (xy 233.68 81.28))
     (stroke (width 0) (type default))
     (uuid e11b3136-206a-4478-a051-72607c3c59e6)
   )
 
-  (wire (pts (xy 207.01 52.07) (xy 207.01 60.96))
+  (wire (pts (xy 205.74 53.34) (xy 205.74 60.96))
     (stroke (width 0) (type default))
     (uuid e215de27-a5e5-4f2a-92ce-1a1490799912)
   )
-  (wire (pts (xy 138.303 59.69) (xy 148.59 59.69))
+  (wire (pts (xy 137.16 60.96) (xy 149.86 60.96))
     (stroke (width 0) (type default))
     (uuid e24ccfa4-d106-4e9c-a5dd-3d4a6bb9f6a6)
   )
-  (bus (pts (xy 135.763 64.77) (xy 135.763 67.31))
+  (bus (pts (xy 134.62 66.04) (xy 134.62 68.58))
     (stroke (width 0) (type default))
     (uuid e2c4f922-ced0-4ee9-abed-8cf3af6e01ba)
   )
 
-  (wire (pts (xy 222.25 44.45) (xy 228.6 44.45))
+  (wire (pts (xy 208.28 53.34) (xy 208.28 58.42))
+    (stroke (width 0) (type default))
+    (uuid e30d81b0-6200-4cfc-ba07-43ce941bcae1)
+  )
+  (wire (pts (xy 223.52 45.72) (xy 228.6 45.72))
     (stroke (width 0) (type default))
     (uuid e3506cdd-1bef-4781-8126-3e837602a54b)
   )
-  (wire (pts (xy 196.85 67.31) (xy 205.74 67.31))
-    (stroke (width 0) (type default))
-    (uuid e4b4ffbb-cfb9-41ed-8097-76fd57fb8842)
-  )
-  (bus (pts (xy 74.295 25.4) (xy 74.295 27.94))
+  (bus (pts (xy 73.66 25.4) (xy 73.66 27.94))
     (stroke (width 0) (type default))
     (uuid e5b9f28d-ebf1-4cf5-941e-fcf224a4c06e)
   )
 
-  (wire (pts (xy 138.303 49.53) (xy 148.59 49.53))
+  (wire (pts (xy 137.16 50.8) (xy 149.86 50.8))
     (stroke (width 0) (type default))
     (uuid e61ce0f1-09dc-447c-a1e0-870d02ef77e9)
   )
-  (wire (pts (xy 166.37 22.86) (xy 208.28 22.86))
+  (wire (pts (xy 165.1 22.86) (xy 208.28 22.86))
     (stroke (width 0) (type default))
     (uuid e7278baf-fdf6-420b-ac81-0aa466dfd86f)
   )
-  (wire (pts (xy 71.755 93.98) (xy 62.865 93.98))
+  (wire (pts (xy 71.12 93.98) (xy 63.5 93.98))
     (stroke (width 0) (type default))
     (uuid e883ef61-9229-420a-8ba9-2ff84af8add5)
   )
-  (bus (pts (xy 135.763 44.45) (xy 135.763 46.99))
+  (bus (pts (xy 134.62 45.72) (xy 134.62 48.26))
     (stroke (width 0) (type default))
     (uuid ea3c028c-ba4c-46d9-9425-2bd5d55d17c7)
   )
 
-  (wire (pts (xy 62.865 114.3) (xy 71.755 114.3))
+  (wire (pts (xy 208.28 93.98) (xy 208.28 96.52))
+    (stroke (width 0) (type default))
+    (uuid ea41d530-4e84-424a-80af-495930a53991)
+  )
+  (wire (pts (xy 63.5 114.3) (xy 71.12 114.3))
     (stroke (width 0) (type default))
     (uuid ebd11425-ccb1-4945-920c-b3f5abacb761)
   )
-  (wire (pts (xy 172.72 57.15) (xy 172.72 64.77))
+  (wire (pts (xy 170.18 58.42) (xy 170.18 66.04))
     (stroke (width 0) (type default))
     (uuid ec6cfe1d-c061-4e76-962a-90e84064101b)
   )
-  (wire (pts (xy 196.85 67.31) (xy 196.85 68.58))
+  (wire (pts (xy 208.28 58.42) (xy 215.9 58.42))
     (stroke (width 0) (type default))
-    (uuid f124101c-6a83-4241-94e8-10243fe3a8d2)
+    (uuid ecad1518-f9b3-4e77-907c-c7efcac3cddb)
   )
-  (wire (pts (xy 171.45 36.83) (xy 171.45 34.29))
+  (wire (pts (xy 205.74 68.58) (xy 205.74 71.12))
+    (stroke (width 0) (type default))
+    (uuid ef005793-7357-435f-800f-5514b5b321b4)
+  )
+  (wire (pts (xy 208.28 48.26) (xy 213.36 48.26))
+    (stroke (width 0) (type default))
+    (uuid ef4479a9-4a5b-4800-8638-4c01eaf8bedb)
+  )
+  (bus (pts (xy 73.66 58.42) (xy 73.66 88.9))
+    (stroke (width 0) (type default))
+    (uuid f0911f1e-3a41-4970-ba39-b30785c33877)
+  )
+
+  (wire (pts (xy 172.72 38.1) (xy 172.72 35.56))
     (stroke (width 0) (type default))
     (uuid f2440aed-1ddd-47ad-8ad6-90fecc92b204)
   )
-  (wire (pts (xy 193.04 87.63) (xy 196.85 87.63))
+  (wire (pts (xy 193.04 93.98) (xy 198.12 93.98))
     (stroke (width 0) (type default))
     (uuid f2d50289-7045-4580-8edd-15dea5e65e8f)
   )
-  (bus (pts (xy 74.295 99.06) (xy 74.295 101.6))
+  (bus (pts (xy 73.66 99.06) (xy 73.66 101.6))
     (stroke (width 0) (type default))
     (uuid f377188c-c4d8-458b-82d5-f12dc46abbcf)
   )
-  (bus (pts (xy 135.763 46.99) (xy 135.763 49.53))
+
+  (wire (pts (xy 208.28 48.26) (xy 208.28 53.34))
+    (stroke (width 0) (type default))
+    (uuid f3a6bbfb-eac6-4279-ad70-83a02287a165)
+  )
+  (bus (pts (xy 233.68 81.28) (xy 233.68 91.44))
+    (stroke (width 0) (type default))
+    (uuid f647678f-93a5-47ee-882b-d1744792c5cd)
+  )
+
+  (wire (pts (xy 205.74 30.48) (xy 208.28 30.48))
+    (stroke (width 0) (type default))
+    (uuid f9b26da2-fd6e-45fa-8d4c-2753faf74eed)
+  )
+  (bus (pts (xy 134.62 48.26) (xy 134.62 50.8))
     (stroke (width 0) (type default))
     (uuid fc941c60-9d4c-4954-8e15-6f844a344cdd)
   )
 
-  (wire (pts (xy 71.755 59.69) (xy 62.865 59.69))
+  (wire (pts (xy 71.12 60.96) (xy 63.5 60.96))
     (stroke (width 0) (type default))
     (uuid fca00267-364a-434f-a1a4-f13549b4490f)
   )
-  (wire (pts (xy 62.865 106.68) (xy 71.755 106.68))
+  (wire (pts (xy 63.5 106.68) (xy 71.12 106.68))
     (stroke (width 0) (type default))
     (uuid fd0134d0-cf64-4aef-9b79-14ba169d3efd)
   )
-  (bus (pts (xy 74.295 49.53) (xy 74.295 52.07))
+  (wire (pts (xy 226.06 58.42) (xy 226.06 60.96))
+    (stroke (width 0) (type default))
+    (uuid ff2cb9b2-bc15-4cb5-a692-54aae63d5ac3)
+  )
+  (bus (pts (xy 73.66 50.8) (xy 73.66 53.34))
     (stroke (width 0) (type default))
     (uuid ff79c71d-2a26-4856-adb2-931d846bd08e)
   )
 
-  (wire (pts (xy 209.55 68.58) (xy 208.28 68.58))
-    (stroke (width 0) (type default))
-    (uuid ff7b9969-554a-4ba0-a881-cbc6c88681c2)
-  )
-  (wire (pts (xy 173.99 58.42) (xy 173.99 54.61))
+  (wire (pts (xy 172.72 60.96) (xy 172.72 55.88))
     (stroke (width 0) (type default))
     (uuid ff8903bb-38a5-4806-87fa-ce3ca4927cc4)
   )
-  (wire (pts (xy 208.28 78.74) (xy 229.87 78.74))
+  (wire (pts (xy 208.28 83.82) (xy 231.14 83.82))
     (stroke (width 0) (type default))
     (uuid ffc4392d-0a8a-4d5d-960c-ea5097b48977)
   )
@@ -2899,43 +3072,43 @@
     (uuid f0f8cb7a-e827-4a8e-8a2d-82e91d69f5a2)
   )
 
-  (label "Col0" (at 69.215 109.22 180) (fields_autoplaced)
+  (label "Col0" (at 68.58 109.22 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 04b69552-3151-4ab1-b6f3-f0af280ab491)
   )
-  (label "Row5" (at 220.5972 68.4079 180) (fields_autoplaced)
+  (label "Row5" (at 228.6 68.58 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 0c16bdee-384e-455e-8c62-c1a11e36fa4d)
   )
-  (label "Row6" (at 147.193 54.61 180) (fields_autoplaced)
+  (label "Row6" (at 147.32 55.88 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 0cd130dd-02ec-400c-9f6f-048c9d5b06c3)
   )
-  (label "Row6" (at 69.215 54.61 180) (fields_autoplaced)
+  (label "Row6" (at 68.58 55.88 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 129a27e7-fd3e-4b05-a784-d41dda8ab0a6)
   )
-  (label "Col3" (at 69.215 101.6 180) (fields_autoplaced)
+  (label "Col3" (at 68.58 101.6 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 1495ea04-9e85-4111-a78e-f963f6b41b1f)
   )
-  (label "Col3" (at 69.215 38.1 180) (fields_autoplaced)
+  (label "Col3" (at 68.58 38.1 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 1777084e-c008-43bf-ac09-2651ef336228)
   )
-  (label "Col2" (at 220.599 78.74 180) (fields_autoplaced)
+  (label "Col2" (at 220.599 83.82 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 21d412a1-01a8-4938-97a1-35a3fe5d622f)
   )
-  (label "Row5" (at 69.215 57.15 180) (fields_autoplaced)
+  (label "Row5" (at 68.58 58.42 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 27316c4f-62c7-47a7-9239-f7f9fae364d5)
   )
-  (label "Col2" (at 69.215 104.14 180) (fields_autoplaced)
+  (label "Col2" (at 68.58 104.14 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 35781559-83db-4526-84b2-1b6ba14b6798)
   )
-  (label "Col3" (at 147.193 41.91 180) (fields_autoplaced)
+  (label "Col3" (at 147.32 43.18 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 3a1dff56-1032-4ced-b2c1-41ae9891e875)
   )
@@ -2944,231 +3117,231 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 46a7cd96-f795-4f2d-896d-a9482fbb820f)
   )
-  (label "Row0" (at 69.215 121.92 180) (fields_autoplaced)
+  (label "Row0" (at 68.58 121.92 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 4fdcac16-3061-427c-865e-1dca1ae28452)
   )
-  (label "Col4" (at 222.25 99.06 180) (fields_autoplaced)
+  (label "Col4" (at 223.52 109.22 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 5bbef6f2-1248-4806-a06f-09549a1f3bac)
   )
-  (label "Col5" (at 69.215 96.52 180) (fields_autoplaced)
+  (label "Col5" (at 68.58 96.52 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 6203c2f2-39a0-40ac-a13a-6bcf1248fd31)
   )
-  (label "Row1" (at 69.215 119.38 180) (fields_autoplaced)
+  (label "Row1" (at 68.58 119.38 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 634df316-7c5a-427f-805b-367087ea2d10)
   )
-  (label "Col7" (at 147.193 31.75 180) (fields_autoplaced)
+  (label "Col7" (at 147.32 33.02 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 63b4c4af-7151-46f1-86fe-8193c7395906)
   )
-  (label "Col1" (at 147.193 46.99 180) (fields_autoplaced)
+  (label "Col1" (at 147.32 48.26 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 66f8b165-4c45-4a28-ba5e-ccbe9f122193)
   )
-  (label "Col6" (at 147.193 34.29 180) (fields_autoplaced)
+  (label "Col6" (at 147.32 35.56 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 696052eb-9db0-4fe3-bbd7-31fd0780dc65)
   )
-  (label "Row1" (at 147.193 67.31 180) (fields_autoplaced)
+  (label "Row1" (at 147.32 68.58 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 6bd6915f-9276-4c0f-a4fc-65eefd3f3610)
   )
-  (label "Row7" (at 69.215 52.07 180) (fields_autoplaced)
+  (label "Row7" (at 68.58 53.34 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 713b8817-5d28-4fd7-b910-f345f89a2967)
   )
-  (label "Col2" (at 147.193 44.45 180) (fields_autoplaced)
+  (label "Col2" (at 147.32 45.72 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 75b1f095-6706-4f48-ad67-49e829256a7d)
   )
-  (label "Col5" (at 147.193 36.83 180) (fields_autoplaced)
+  (label "Col5" (at 147.32 38.1 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 781f275a-fcb0-4e42-9e63-891214ebb014)
   )
-  (label "Col2" (at 69.215 40.64 180) (fields_autoplaced)
+  (label "Col2" (at 68.58 40.64 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 7d2e1402-fa6d-4461-bc5a-d2e0288179fc)
   )
-  (label "Col4" (at 69.215 99.06 180) (fields_autoplaced)
+  (label "Col4" (at 68.58 99.06 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 84110a82-a42e-448f-a37b-20089de60855)
   )
-  (label "Col0" (at 69.215 45.72 180) (fields_autoplaced)
+  (label "Col0" (at 68.58 45.72 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 8557ded0-1837-4460-86e6-692dbe3561f1)
   )
-  (label "Col4" (at 147.193 39.37 180) (fields_autoplaced)
+  (label "Col4" (at 147.32 40.64 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 8888a751-4737-4aa5-aac5-5b28dd248a12)
   )
-  (label "Col1" (at 69.215 43.18 180) (fields_autoplaced)
+  (label "Col1" (at 68.58 43.18 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 89d61205-33c4-45f0-a6fa-504d98b49854)
   )
-  (label "Row4" (at 147.193 59.69 180) (fields_autoplaced)
+  (label "Row4" (at 147.32 60.96 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 92323549-b274-432e-8deb-85c8222ad8a6)
   )
-  (label "Row5" (at 220.98 87.63 180) (fields_autoplaced)
+  (label "Row5" (at 228.6 93.98 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 98d67831-cf41-4157-aeca-08939a00e3d3)
   )
-  (label "Row2" (at 147.193 64.77 180) (fields_autoplaced)
+  (label "Row2" (at 147.32 66.04 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 99cc4252-feca-4f61-900f-2aaee464e70e)
   )
-  (label "Row5" (at 147.193 57.15 180) (fields_autoplaced)
+  (label "Row5" (at 147.32 58.42 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid 9e371dd5-39d0-47b4-924e-7df5d2e686ec)
   )
-  (label "Col6" (at 69.215 30.48 180) (fields_autoplaced)
+  (label "Col6" (at 68.58 30.48 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid a8611bc4-3bb4-49be-b8de-d9a07b19b4f1)
   )
-  (label "Row2" (at 69.215 116.84 180) (fields_autoplaced)
+  (label "Row2" (at 68.58 116.84 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid a961b1a4-508e-429f-a6a7-df52ec513dbe)
   )
-  (label "Col1" (at 69.215 106.68 180) (fields_autoplaced)
+  (label "Col1" (at 68.58 106.68 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid ace2c01b-7a3b-4f2f-9341-3a45503c777c)
   )
-  (label "Row7" (at 147.193 52.07 180) (fields_autoplaced)
+  (label "Row7" (at 147.32 53.34 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid b96f60c6-e108-451b-9c71-2f70dbba4ed1)
   )
-  (label "Col4" (at 69.215 35.56 180) (fields_autoplaced)
+  (label "Col4" (at 68.58 35.56 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid ba80a157-a862-4bd1-962d-50ed8de5b612)
   )
-  (label "Row0" (at 147.193 69.85 180) (fields_autoplaced)
+  (label "Row0" (at 147.32 71.12 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid bb6d58a7-512b-4f3a-bcdb-3e7251e3b8ad)
   )
-  (label "Row3" (at 147.193 62.23 180) (fields_autoplaced)
+  (label "Row3" (at 147.32 63.5 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid cb97bb48-b0b8-414e-a44a-ef358efc5b70)
   )
-  (label "Col6" (at 69.215 93.98 180) (fields_autoplaced)
+  (label "Col6" (at 68.58 93.98 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid ce210e2e-5298-4753-89a4-9e103d6814ab)
   )
-  (label "Col0" (at 147.193 49.53 180) (fields_autoplaced)
+  (label "Col0" (at 147.32 50.8 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid da67db11-7e97-46eb-b8d8-adbcf993c287)
   )
-  (label "Col5" (at 69.215 33.02 180) (fields_autoplaced)
+  (label "Col5" (at 68.58 33.02 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid de5d290a-6812-41f8-9bd4-101d59b28aa7)
   )
-  (label "Col7" (at 69.215 27.94 180) (fields_autoplaced)
+  (label "Col7" (at 68.58 27.94 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid e202ca0f-e6b3-454c-91a1-c55216460ac8)
   )
-  (label "Row3" (at 69.215 114.3 180) (fields_autoplaced)
+  (label "Row3" (at 68.58 114.3 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid e2dae737-a267-4770-8a88-06d808783bc9)
   )
-  (label "Row4" (at 69.215 59.69 180) (fields_autoplaced)
+  (label "Row4" (at 68.58 60.96 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid e3e366ed-5177-42d1-b481-57cc6a8833ba)
   )
-  (label "Col7" (at 69.215 91.44 180) (fields_autoplaced)
+  (label "Col7" (at 68.58 91.44 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right bottom))
     (uuid e8a0197e-32a8-40f3-b314-c5e4bdb01aaa)
   )
 
-  (symbol (lib_id "unikbd:CONN 3M 929975-01-20-RK 40 pin female header, straight, TH, 0.254{dblquote}") (at 148.59 54.61 0) (unit 1)
+  (symbol (lib_id "unikbd:CONN 3M 929975-01-20-RK 40 pin female header, straight, TH, 0.254{dblquote}") (at 149.86 55.88 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005d1e4169)
-    (property "Reference" "J1" (at 149.86 26.2382 0)
+    (property "Reference" "J1" (at 151.13 27.5082 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Controller" (at 149.86 28.5496 0)
+    (property "Value" "Controller" (at 151.13 29.8196 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:kbd_header_and_mounting_holes" (at 148.59 54.61 0)
+    (property "Footprint" "unikbd:kbd_header_and_mounting_holes" (at 149.86 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 148.59 54.61 0)
+    (property "Datasheet" "~" (at 149.86 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 148.59 54.61 0)
+    (property "Fitted" "YES" (at 149.86 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 148.59 54.61 0)
+    (property "Substitution OK" " YES " (at 149.86 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "20x2 0.1\" socket header. Mount on bottom side" (at 148.59 54.61 0)
+    (property "Comment" "20x2 0.1\" socket header. Mount on bottom side" (at 149.86 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "header" (at 179.324 26.924 0)
+    (property "Component Value" "header" (at 180.594 28.194 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Tolerance" "If applicable" (at 73.152 138.176 0)
+    (property "Tolerance" "If applicable" (at 74.422 139.446 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "3M" (at 69.088 116.84 0)
+    (property "Manufacturer" "3M" (at 70.358 118.11 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.3m.com/3M/en_US/p/d/b10419776/" (at 71.882 123.444 0)
+    (property "Manufacturer Link" "https://www.3m.com/3M/en_US/p/d/b10419776/" (at 73.152 124.714 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 68.834 160.528 0)
+    (property "RoHS" "Yes" (at 70.104 161.798 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://4donline.ihs.com/images/VipMasterIC/IC/IIIM/IIIM-E-A0004687669/IIIM-E-A0004699241-1.pdf?hkey=6D0214268300F1406B835FE51CB13195" (at 72.136 163.322 0)
+    (property "RoHS Document Link" "https://4donline.ihs.com/images/VipMasterIC/IC/IIIM/IIIM-E-A0004687669/IIIM-E-A0004699241-1.pdf?hkey=6D0214268300F1406B835FE51CB13195" (at 73.406 164.592 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "929975-01-20-RK" (at 71.374 120.396 0)
+    (property "Manufacturer PN" "929975-01-20-RK" (at 72.644 121.666 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 68.58 166.37 0)
+    (property "Allow Substitution" "Yes" (at 69.85 167.64 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 69.088 168.656 0)
+    (property "Tracking" "No" (at 70.358 169.926 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 179.07 31.75 0)
+    (property "BOM Comment" "" (at 180.34 33.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Connector" (at 90.678 135.382 0)
+    (property "Component Type" "Connector" (at 91.948 136.652 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 179.07 31.75 0)
+    (property "Package Type" "" (at 180.34 33.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 179.07 31.75 0)
+    (property "Package Variant" "" (at 180.34 33.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "40" (at 73.152 140.716 0)
+    (property "Number of Pins" "40" (at 74.422 141.986 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "If applicable" (at 73.152 142.748 0)
+    (property "Temp (Storage)" "If applicable" (at 74.422 144.018 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+105C" (at 73.406 145.288 0)
+    (property "Temp (Operating)" "-40C/+105C" (at 74.676 146.558 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 73.406 148.082 0)
+    (property "Temp (Soldering)" "If applicable" (at 74.676 149.352 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 73.406 150.622 0)
+    (property "Temp Coeff." "If applicable" (at 74.676 151.892 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "If applicable" (at 73.406 153.162 0)
+    (property "Power Rating" "If applicable" (at 74.676 154.432 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 73.406 155.448 0)
+    (property "Material" "If applicable" (at 74.676 156.718 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 73.406 157.734 0)
+    (property "Class" "If applicable" (at 74.676 159.004 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 69.596 174.244 0)
+    (property "Standards Version" "1.1" (at 70.866 175.514 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1430666e-99d1-4f5e-a90d-db9ac1d3ae85))
@@ -3220,94 +3393,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 190.5 58.42 0) (mirror y) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 193.04 60.96 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005d6c3751)
-    (property "Reference" "SW34" (at 196.85 57.15 0)
+    (property "Reference" "SW34" (at 196.088 58.166 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Rubout (OSI Break)" (at 193.802 59.69 0)
+    (property "Value" "Rubout (OSI Break)" (at 183.642 58.166 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 190.5 53.34 0)
+    (property "Footprint" "unikbd:Key_MX" (at 193.04 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 190.5 53.34 0)
+    (property "Datasheet" "" (at 193.04 55.88 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 190.5 58.42 0)
+    (property "Comment" "Common to all layouts" (at 193.04 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 190.5 58.42 0)
+    (property "Fitted" "YES" (at 193.04 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 190.5 58.42 0)
+    (property "Substitution OK" "NO" (at 193.04 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 228.6 71.12 0)
+    (property "Component Value" "Key" (at 231.14 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 212.598 98.044 0)
+    (property "Tolerance" "If applicable" (at 215.138 100.584 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 216.662 76.708 0)
+    (property "Manufacturer" "Cherry" (at 219.202 79.248 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 213.868 83.312 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 216.408 85.852 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 213.614 123.19 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 216.154 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 214.376 80.264 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 216.916 82.804 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 216.916 120.396 0)
+    (property "RoHS" "Yes" (at 219.456 122.936 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 217.17 126.238 0)
+    (property "Allow Substitution" "Yes" (at 219.71 128.778 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 216.662 128.524 0)
+    (property "Tracking" "No" (at 219.202 131.064 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 185.42 58.42 0)
+    (property "BOM Comment" "" (at 187.96 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 195.072 95.25 0)
+    (property "Component Type" "Switch" (at 197.612 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 185.42 58.42 0)
+    (property "Package Type" "" (at 187.96 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 185.42 58.42 0)
+    (property "Package Variant" "" (at 187.96 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 212.598 100.584 0)
+    (property "Number of Pins" "2" (at 215.138 103.124 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 212.598 102.616 0)
+    (property "Temp (Storage)" "" (at 215.138 105.156 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 212.344 105.156 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 214.884 107.696 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 212.344 107.95 0)
+    (property "Temp (Soldering)" "If applicable" (at 214.884 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 212.344 110.49 0)
+    (property "Temp Coeff." "If applicable" (at 214.884 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 212.344 113.03 0)
+    (property "Power Rating" "10 mA" (at 214.884 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 212.344 115.316 0)
+    (property "Material" "If applicable" (at 214.884 117.856 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 212.344 117.602 0)
+    (property "Class" "If applicable" (at 214.884 120.142 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 216.154 134.112 0)
+    (property "Standards Version" "1.1" (at 218.694 136.652 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b3c7bfb1-5dbd-4326-b6d3-6f141cd7c422))
@@ -3321,25 +3494,91 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW_Push_LED") (at 205.74 73.66 270) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U LED Style A") (at 208.28 76.2 270) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005df7d21e)
-    (property "Reference" "SW9" (at 211.836 71.628 90)
+    (property "Reference" "SW9" (at 214.376 74.168 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Caps_Lock" (at 206.502 79.502 90)
+    (property "Value" "Caps_Lock" (at 208.28 86.36 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX_LED" (at 213.36 73.66 0)
+    (property "Footprint" "unikbd:Key_MX_LED" (at 215.9 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 213.36 73.66 0)
+    (property "Datasheet" "~" (at 215.9 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "NO" (at 205.74 73.66 0)
+    (property "Fitted" "NO" (at 208.28 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 205.74 73.66 0)
+    (property "Substitution OK" "NO" (at 208.28 76.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "Key" (at 195.58 38.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 168.656 54.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "Cherry" (at 189.992 50.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 183.388 52.832 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 143.51 53.086 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer PN" "MX1A-11NN" (at 186.436 52.324 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 146.304 49.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 140.462 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 138.176 50.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "" (at 208.28 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Switch" (at 171.45 71.628 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "" (at 208.28 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 208.28 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "2" (at 166.116 54.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "" (at 164.084 54.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-40C/+170C" (at 161.544 54.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 158.75 54.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 156.21 54.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "10 mA" (at 153.67 54.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 151.384 54.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 149.098 54.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 132.588 50.546 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4b9dea2d-8bb0-4546-9dfb-aa1163df9fd7))
@@ -3355,43 +3594,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 213.36 68.58 180) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 223.52 68.58 180) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005dfe048b)
-    (property "Reference" "D10" (at 212.1916 66.5734 0)
+    (property "Reference" "D10" (at 214.122 67.31 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 214.63 69.85 0)
+    (property "Value" "1N4148" (at 221.488 70.104 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 233.68 45.72 0)
+    (property "Footprint" "unikbd:diode-combined" (at 243.84 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 220.98 48.26 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 231.14 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 213.36 68.58 0)
+    (property "Fitted" "Yes" (at 223.52 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 213.36 68.58 0)
+    (property "Substitution OK" " YES " (at 223.52 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 213.36 68.58 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 223.52 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 213.36 68.58 0)
+    (property "Manufacturer" "Diodes, Inc." (at 223.52 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 213.36 68.58 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 223.52 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 213.36 68.58 0)
+    (property "Package" " SOT-23-3 " (at 223.52 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 213.36 68.58 0)
+    (property "LCSC" "C118751" (at 223.52 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 213.36 68.58 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 223.52 68.58 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 214.376 73.406 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 245.618 28.956 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 246.888 43.688 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 246.634 3.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 249.936 6.604 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 250.19 0.762 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 249.682 -1.524 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 251.46 38.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 228.092 31.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 271.78 55.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 223.52 68.58 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 245.618 26.416 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 245.618 24.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 245.364 21.844 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 245.364 19.05 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 245.364 16.51 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 245.364 13.97 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 245.364 11.684 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 245.364 9.398 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 249.174 -7.112 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 249ad40f-3d20-4159-83d1-cb0f525c79f8))
@@ -3405,73 +3704,73 @@
     )
   )
 
-  (symbol (lib_id "unikbd:LED Cree C5SMF-RJE-CT0W0BB2 T1-3/4 5mm Red, 2200 mcd") (at 217.17 52.07 0) (mirror y) (unit 1)
+  (symbol (lib_id "unikbd:LED Cree C5SMF-RJE-CT0W0BB2 T1-3/4 5mm Red, 2200 mcd") (at 219.71 53.34 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005e12925f)
-    (property "Reference" "LED4" (at 209.931 50.927 0)
+    (property "Reference" "LED4" (at 212.471 52.197 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "LED" (at 219.456 50.673 0)
+    (property "Value" "LED" (at 221.996 51.943 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
-    (property "Footprint" "LED_THT:LED_D5.0mm" (at 217.17 52.07 0)
+    (property "Footprint" "LED_THT:LED_D5.0mm" (at 219.71 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 217.17 52.07 0)
+    (property "Datasheet" "~" (at 219.71 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "NO" (at 217.17 52.07 0)
+    (property "Fitted" "NO" (at 219.71 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 217.17 52.07 0)
+    (property "Substitution OK" " YES " (at 219.71 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "3mm Through-hole LED, 0.1\" spacing" (at 217.17 52.07 0)
+    (property "Comment" "3mm Through-hole LED, 0.1\" spacing" (at 219.71 53.34 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 254.635 76.835 0)
+    (property "Allow Substitution" "Yes" (at 257.175 78.105 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "Install into switch" (at 265.43 78.74 0)
+    (property "BOM Comment" "Install into switch" (at 267.97 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "LED" (at 260.985 80.645 0)
+    (property "Component Type" "LED" (at 263.525 81.915 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Amber" (at 266.7 78.74 0)
+    (property "Component Value" "Amber" (at 269.24 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Lumex" (at 260.985 76.835 0)
+    (property "Manufacturer" "Lumex" (at 263.525 78.105 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 267.97 86.36 0)
+    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 270.51 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "SSL-LX3044AD" (at 267.97 78.74 0)
+    (property "Manufacturer PN" "SSL-LX3044AD" (at 270.51 80.01 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 267.335 76.2 0)
+    (property "RoHS" "Yes" (at 269.875 77.47 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf" (at 267.97 86.36 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf" (at 270.51 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 282.575 77.47 0)
+    (property "Number of Pins" "2" (at 285.115 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" "T-1 (3mm)" (at 260.35 77.47 0)
+    (property "Package" "T-1 (3mm)" (at 262.89 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "105mW" (at 276.86 74.93 0)
+    (property "Power Rating" "105mW" (at 279.4 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+85C" (at 255.27 76.835 0)
+    (property "Temp (Operating)" "-40C/+85C" (at 257.81 78.105 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 261.62 71.755 0)
+    (property "Tracking" "No" (at 264.16 73.025 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 281.94 80.645 0)
+    (property "Standards Version" "1.1" (at 284.48 81.915 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2e47acb9-a7c2-43f2-8eb3-a777709e6a27))
@@ -3485,76 +3784,76 @@
     )
   )
 
-  (symbol (lib_id "unikbd:LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT") (at 199.39 36.83 0) (mirror y) (unit 1)
+  (symbol (lib_id "unikbd:LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT") (at 203.2 35.56 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005ee7a83e)
-    (property "Reference" "LED1" (at 192.405 35.56 0)
+    (property "Reference" "LED1" (at 193.294 37.084 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "LED" (at 259.08 64.77 0)
+    (property "Value" "LED" (at 262.89 63.5 0)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
-    (property "Footprint" "LED_THT:LED_D2.0mm_W4.8mm_H2.5mm_FlatTop" (at 250.19 71.12 0)
+    (property "Footprint" "LED_THT:LED_D2.0mm_W4.8mm_H2.5mm_FlatTop" (at 254 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 250.19 71.12 0)
+    (property "Datasheet" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 254 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 240.03 57.785 0)
+    (property "Fitted" "YES" (at 243.84 56.515 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 257.81 61.595 0)
+    (property "Substitution OK" " YES " (at 261.62 60.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "3mm Through-hole LED, 0.1\" spacing" (at 250.825 66.04 0)
+    (property "Comment" "3mm Through-hole LED, 0.1\" spacing" (at 254.635 64.77 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 236.855 61.595 0)
+    (property "Allow Substitution" "Yes" (at 240.665 60.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "Install into switch" (at 247.65 63.5 0)
+    (property "BOM Comment" "Install into switch" (at 251.46 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "LED" (at 243.205 65.405 0)
+    (property "Component Type" "LED" (at 247.015 64.135 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Amber" (at 248.92 63.5 0)
+    (property "Component Value" "Amber" (at 252.73 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Lumex" (at 243.205 61.595 0)
+    (property "Manufacturer" "Lumex" (at 247.015 60.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 250.19 71.12 0)
+    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 254 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "SSL-LX3044AD" (at 250.19 63.5 0)
+    (property "Manufacturer PN" "SSL-LX3044AD" (at 254 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "SSL-LX3044AD" (at 250.19 64.77 0)
+    (property "Manufacturer Part Number" "SSL-LX3044AD" (at 254 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 264.795 62.23 0)
+    (property "Number of Pins" "2" (at 268.605 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" "T-1 (3mm)" (at 242.57 62.23 0)
+    (property "Package" "T-1 (3mm)" (at 246.38 60.96 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "105mW" (at 259.08 59.69 0)
+    (property "Power Rating" "105mW" (at 262.89 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 249.555 60.96 0)
+    (property "RoHS" "Yes" (at 253.365 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf" (at 250.19 71.12 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf" (at 254 69.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 264.16 65.405 0)
+    (property "Standards Version" "1.1" (at 267.97 64.135 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+85C" (at 237.49 61.595 0)
+    (property "Temp (Operating)" "-40C/+85C" (at 241.3 60.325 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 243.84 56.515 0)
+    (property "Tracking" "No" (at 247.65 55.245 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 13212371-9939-4320-880e-1120f90d335a))
@@ -3568,76 +3867,76 @@
     )
   )
 
-  (symbol (lib_id "unikbd:LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT") (at 196.85 72.39 270) (mirror x) (unit 1)
+  (symbol (lib_id "unikbd:LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT") (at 198.12 78.74 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005ee84b07)
-    (property "Reference" "LED2" (at 202.057 69.342 90)
+    (property "Reference" "LED2" (at 202.946 72.39 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "LED" (at 196.215 69.85 90)
+    (property "Value" "LED" (at 197.485 76.2 90)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
-    (property "Footprint" "LED_THT:LED_D2.0mm_W4.8mm_H2.5mm_FlatTop" (at 196.85 72.39 0)
+    (property "Footprint" "LED_THT:LED_D2.0mm_W4.8mm_H2.5mm_FlatTop" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 196.85 72.39 0)
+    (property "Datasheet" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 196.85 72.39 0)
+    (property "Fitted" "YES" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 196.85 72.39 0)
+    (property "Substitution OK" " YES " (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "3mm Through-hole LED, 0.1\" spacing" (at 196.85 72.39 0)
+    (property "Comment" "3mm Through-hole LED, 0.1\" spacing" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 196.85 72.39 0)
+    (property "Allow Substitution" "Yes" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "Install into switch" (at 196.85 72.39 0)
+    (property "BOM Comment" "Install into switch" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "LED" (at 196.85 72.39 0)
+    (property "Component Type" "LED" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Amber" (at 196.85 72.39 0)
+    (property "Component Value" "Amber" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Lumex" (at 196.85 72.39 0)
+    (property "Manufacturer" "Lumex" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 196.85 72.39 0)
+    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "SSL-LX3044AD" (at 196.85 72.39 0)
+    (property "Manufacturer PN" "SSL-LX3044AD" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "SSL-LX3044AD" (at 196.85 72.39 0)
+    (property "Manufacturer Part Number" "SSL-LX3044AD" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 196.85 72.39 0)
+    (property "Number of Pins" "2" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" "T-1 (3mm)" (at 196.85 72.39 0)
+    (property "Package" "T-1 (3mm)" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "105mW" (at 196.85 72.39 0)
+    (property "Power Rating" "105mW" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 196.85 72.39 0)
+    (property "RoHS" "Yes" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf" (at 196.85 72.39 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 196.85 72.39 0)
+    (property "Standards Version" "1.1" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+85C" (at 196.85 72.39 0)
+    (property "Temp (Operating)" "-40C/+85C" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 196.85 72.39 0)
+    (property "Tracking" "No" (at 198.12 78.74 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f25b0517-5d71-43c8-ad39-5e68b3ff409f))
@@ -3651,28 +3950,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW_Push_LED") (at 205.74 93.98 270) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U LED Style A") (at 210.82 101.6 270) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005ee923f1)
-    (property "Reference" "SW17" (at 211.836 91.948 90)
+    (property "Reference" "SW17" (at 217.17 98.044 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Line_Feed" (at 206.883 100.203 90)
+    (property "Value" "Line_Feed" (at 211.963 112.903 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX_LED" (at 213.36 93.98 0)
+    (property "Footprint" "unikbd:Key_MX_LED" (at 218.44 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 213.36 93.98 0)
+    (property "Datasheet" "~" (at 218.44 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 205.74 93.98 0)
+    (property "Comment" "Common to all layouts" (at 210.82 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 205.74 93.98 0)
+    (property "Fitted" "YES" (at 210.82 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 205.74 93.98 0)
+    (property "Substitution OK" "NO" (at 210.82 101.6 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "Key" (at 198.12 63.5 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 171.196 79.502 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "Cherry" (at 192.532 75.438 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 185.928 78.232 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 146.05 78.486 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer PN" "MX1A-11NN" (at 188.976 77.724 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 148.844 75.184 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 143.002 74.93 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 140.716 75.438 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "" (at 210.82 106.68 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Switch" (at 173.99 97.028 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "" (at 210.82 106.68 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 210.82 106.68 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "2" (at 168.656 79.502 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "" (at 166.624 79.502 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-40C/+170C" (at 164.084 79.756 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 161.29 79.756 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 158.75 79.756 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "10 mA" (at 156.21 79.756 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 153.924 79.756 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 151.638 79.756 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 135.128 75.946 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 198b9353-e9dc-4b18-b81a-21f6fdd5dc4b))
@@ -3688,43 +4053,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 212.09 87.63 180) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 223.52 93.98 180) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005ee923fb)
-    (property "Reference" "D18" (at 210.9216 85.6234 0)
+    (property "Reference" "D18" (at 218.44 91.44 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 210.185 90.17 0)
+    (property "Value" "1N4148" (at 222.25 95.504 0)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 232.41 64.77 0)
+    (property "Footprint" "unikbd:diode-combined" (at 243.84 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 219.71 67.31 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 231.14 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 212.09 87.63 0)
+    (property "Fitted" "Yes" (at 223.52 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 212.09 87.63 0)
+    (property "Substitution OK" " YES " (at 223.52 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 212.09 87.63 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 223.52 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 212.09 87.63 0)
+    (property "Manufacturer" "Diodes, Inc." (at 223.52 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 212.09 87.63 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 223.52 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 212.09 87.63 0)
+    (property "Package" " SOT-23-3 " (at 223.52 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 212.09 87.63 0)
+    (property "LCSC" "C118751" (at 223.52 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 212.09 87.63 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 223.52 93.98 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 214.376 98.806 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 245.618 54.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 246.888 69.088 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 246.634 29.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 249.936 32.004 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 250.19 26.162 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 249.682 23.876 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 251.46 63.5 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 228.092 57.15 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 271.78 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 223.52 93.98 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 245.618 51.816 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 245.618 49.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 245.364 47.244 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 245.364 44.45 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 245.364 41.91 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 245.364 39.37 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 245.364 37.084 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 245.364 34.798 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 249.174 18.288 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d9de18e5-7f68-4051-b498-354dff165f7a))
@@ -3738,76 +4163,76 @@
     )
   )
 
-  (symbol (lib_id "unikbd:LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT") (at 217.17 57.15 0) (mirror y) (unit 1)
+  (symbol (lib_id "unikbd:LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT") (at 223.52 58.42 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005ee9df56)
-    (property "Reference" "LED3" (at 209.931 56.007 0)
+    (property "Reference" "LED3" (at 212.598 57.404 0)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Value" "LED" (at 220.98 59.055 90)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
-    (property "Value" "LED" (at 214.63 57.785 90)
-      (effects (font (size 1.27 1.27)) (justify right) hide)
-    )
-    (property "Footprint" "LED_THT:LED_D2.0mm_W4.8mm_H2.5mm_FlatTop" (at 217.17 57.15 0)
+    (property "Footprint" "LED_THT:LED_D2.0mm_W4.8mm_H2.5mm_FlatTop" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 217.17 57.15 0)
+    (property "Datasheet" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 217.17 57.15 0)
+    (property "Fitted" "YES" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 217.17 57.15 0)
+    (property "Substitution OK" " YES " (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "3mm Through-hole LED, 0.1\" spacing" (at 217.17 57.15 0)
+    (property "Comment" "3mm Through-hole LED, 0.1\" spacing" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 217.17 57.15 0)
+    (property "Allow Substitution" "Yes" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "Install into switch" (at 217.17 57.15 0)
+    (property "BOM Comment" "Install into switch" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "LED" (at 217.17 57.15 0)
+    (property "Component Type" "LED" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Amber" (at 217.17 57.15 0)
+    (property "Component Value" "Amber" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Lumex" (at 217.17 57.15 0)
+    (property "Manufacturer" "Lumex" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 217.17 57.15 0)
+    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "SSL-LX3044AD" (at 217.17 57.15 0)
+    (property "Manufacturer PN" "SSL-LX3044AD" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "SSL-LX3044AD" (at 217.17 57.15 0)
+    (property "Manufacturer Part Number" "SSL-LX3044AD" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 217.17 57.15 0)
+    (property "Number of Pins" "2" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" "T-1 (3mm)" (at 217.17 57.15 0)
+    (property "Package" "T-1 (3mm)" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "105mW" (at 217.17 57.15 0)
+    (property "Power Rating" "105mW" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 217.17 57.15 0)
+    (property "RoHS" "Yes" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf" (at 217.17 57.15 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 217.17 57.15 0)
+    (property "Standards Version" "1.1" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+85C" (at 217.17 57.15 0)
+    (property "Temp (Operating)" "-40C/+85C" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 217.17 57.15 0)
+    (property "Tracking" "No" (at 223.52 58.42 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 22b4c416-1ea1-4d40-a857-280ad8ca08b4))
@@ -3821,25 +4246,91 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW_Push_LED") (at 199.39 31.75 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U LED Style A") (at 200.66 27.94 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005ee9ea4f)
-    (property "Reference" "SW61" (at 202.692 26.543 0)
+    (property "Reference" "SW61" (at 203.962 22.733 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Power Light" (at 199.39 24.384 0)
+    (property "Value" "Power Light" (at 195.58 21.59 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX_LED" (at 199.39 24.13 0)
+    (property "Footprint" "unikbd:Key_MX_LED" (at 200.66 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 199.39 24.13 0)
+    (property "Datasheet" "~" (at 200.66 20.32 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "Yes" (at 199.39 31.75 0)
+    (property "Fitted" "Yes" (at 200.66 27.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 199.39 31.75 0)
+    (property "Substitution OK" "NO" (at 200.66 27.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "Key" (at 162.56 40.64 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 178.562 67.564 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "Cherry" (at 174.498 46.228 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 177.292 52.832 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 177.546 92.71 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer PN" "MX1A-11NN" (at 176.784 49.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 174.244 89.916 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 173.99 95.758 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 174.498 98.044 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "" (at 205.74 27.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Switch" (at 196.088 64.77 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "" (at 205.74 27.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 205.74 27.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "2" (at 178.562 70.104 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "" (at 178.562 72.136 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-40C/+170C" (at 178.816 74.676 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 178.816 77.47 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 178.816 80.01 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "10 mA" (at 178.816 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 178.816 84.836 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 178.816 87.122 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 175.006 103.632 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 08bb91db-88e6-494a-8d8a-983a0fa1514a))
@@ -3855,28 +4346,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW_Push_LED") (at 217.17 46.99 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U LED Style A") (at 218.44 45.72 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005eea388a)
-    (property "Reference" "SW32" (at 219.837 41.91 0)
+    (property "Reference" "SW32" (at 221.107 40.64 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "@(OSI SL)" (at 219.456 40.259 0)
+    (property "Value" "@(OSI SL)" (at 220.726 38.989 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX_LED" (at 217.17 39.37 0)
+    (property "Footprint" "unikbd:Key_MX_LED" (at 218.44 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 217.17 39.37 0)
+    (property "Datasheet" "~" (at 218.44 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 217.17 46.99 0)
+    (property "Comment" "Common to all layouts" (at 218.44 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 217.17 46.99 0)
+    (property "Fitted" "YES" (at 218.44 45.72 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 217.17 46.99 0)
+    (property "Substitution OK" "NO" (at 218.44 45.72 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "Key" (at 180.34 58.42 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 196.342 85.344 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer" "Cherry" (at 192.278 64.008 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 195.072 70.612 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 195.326 110.49 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer PN" "MX1A-11NN" (at 194.564 67.564 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 192.024 107.696 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 191.77 113.538 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 192.278 115.824 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "" (at 223.52 45.72 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Switch" (at 213.868 82.55 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "" (at 223.52 45.72 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 223.52 45.72 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "2" (at 196.342 87.884 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "" (at 196.342 89.916 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-40C/+170C" (at 196.596 92.456 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 196.596 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 196.596 97.79 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "10 mA" (at 196.596 100.33 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 196.596 102.616 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 196.596 104.902 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 192.786 121.412 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f549fa29-7cae-45cb-ac50-3cfec149fc97))
@@ -3892,76 +4449,76 @@
     )
   )
 
-  (symbol (lib_id "unikbd:LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT") (at 196.85 92.71 270) (mirror x) (unit 1)
+  (symbol (lib_id "unikbd:LED_Lumex_696-SSL-LX3044AD__3mm_amber_THT") (at 198.12 104.14 270) (mirror x) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005eece7dc)
-    (property "Reference" "LED5" (at 195.707 90.932 90)
+    (property "Reference" "LED5" (at 197.612 97.536 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "LED" (at 196.215 90.17 90)
+    (property "Value" "LED" (at 197.485 101.6 90)
       (effects (font (size 1.27 1.27)) (justify right) hide)
     )
-    (property "Footprint" "LED_THT:LED_D2.0mm_W4.8mm_H2.5mm_FlatTop" (at 196.85 92.71 0)
+    (property "Footprint" "LED_THT:LED_D2.0mm_W4.8mm_H2.5mm_FlatTop" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 196.85 92.71 0)
+    (property "Datasheet" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 196.85 92.71 0)
+    (property "Fitted" "YES" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 196.85 92.71 0)
+    (property "Substitution OK" " YES " (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "3mm Through-hole LED, 0.1\" spacing" (at 196.85 92.71 0)
+    (property "Comment" "3mm Through-hole LED, 0.1\" spacing" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 196.85 92.71 0)
+    (property "Allow Substitution" "Yes" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "Install into switch" (at 196.85 92.71 0)
+    (property "BOM Comment" "Install into switch" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "LED" (at 196.85 92.71 0)
+    (property "Component Type" "LED" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Amber" (at 196.85 92.71 0)
+    (property "Component Value" "Amber" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Lumex" (at 196.85 92.71 0)
+    (property "Manufacturer" "Lumex" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 196.85 92.71 0)
+    (property "Manufacturer Link" "https://www.lumex.com/datasheet/SSL-LX3044AD" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "SSL-LX3044AD" (at 196.85 92.71 0)
+    (property "Manufacturer PN" "SSL-LX3044AD" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "SSL-LX3044AD" (at 196.85 92.71 0)
+    (property "Manufacturer Part Number" "SSL-LX3044AD" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 196.85 92.71 0)
+    (property "Number of Pins" "2" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" "T-1 (3mm)" (at 196.85 92.71 0)
+    (property "Package" "T-1 (3mm)" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "105mW" (at 196.85 92.71 0)
+    (property "Power Rating" "105mW" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 196.85 92.71 0)
+    (property "RoHS" "Yes" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf" (at 196.85 92.71 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Lumex_6960_RoHS_Certificate.pdf" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 196.85 92.71 0)
+    (property "Standards Version" "1.1" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+85C" (at 196.85 92.71 0)
+    (property "Temp (Operating)" "-40C/+85C" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 196.85 92.71 0)
+    (property "Tracking" "No" (at 198.12 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 05f96713-ce66-4e2d-9424-7f974e0a5581))
@@ -3975,43 +4532,43 @@
     )
   )
 
-  (symbol (lib_id "Device:R_US") (at 190.5 62.23 90) (unit 1)
+  (symbol (lib_id "Device:R_US") (at 191.77 63.5 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005f057bc7)
-    (property "Reference" "R6" (at 187.579 63.373 90)
+    (property "Reference" "R6" (at 188.849 64.643 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "470" (at 196.596 63.246 90)
+    (property "Value" "470" (at 197.866 64.516 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (at 190.754 61.214 90)
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (at 192.024 62.484 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://industrial.panasonic.com/cdbs/www-data/pdf/RDA0000/DMA0000COL9.pdf~" (at 190.5 62.23 0)
+    (property "Datasheet" "https://industrial.panasonic.com/cdbs/www-data/pdf/RDA0000/DMA0000COL9.pdf~" (at 191.77 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "If R4-R6 installed, then DNP R1-R3" (at 190.5 62.23 0)
+    (property "Comment" "If R4-R6 installed, then DNP R1-R3" (at 191.77 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 190.5 62.23 0)
+    (property "Fitted" "YES" (at 191.77 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Panasonic" (at 190.5 62.23 0)
+    (property "Manufacturer" "Panasonic" (at 191.77 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "ERJ-3EKF3300V" (at 190.5 62.23 0)
+    (property "Manufacturer Part Number" "ERJ-3EKF3300V" (at 191.77 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 190.5 62.23 0)
+    (property "Substitution OK" " YES " (at 191.77 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "tolerance" "1%" (at 190.5 62.23 0)
+    (property "tolerance" "1%" (at 191.77 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C144560" (at 190.5 62.23 0)
+    (property "LCSC" "C144560" (at 191.77 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "ERJ-3EKF3300V" (at 190.5 62.23 0)
+    (property "Manufacturer PN" "ERJ-3EKF3300V" (at 191.77 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 707e98f2-dac8-47fc-850e-c244a42a1d56))
@@ -4025,43 +4582,43 @@
     )
   )
 
-  (symbol (lib_id "Device:R_US") (at 190.5 49.53 270) (unit 1)
+  (symbol (lib_id "Device:R_US") (at 191.77 50.8 270) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005f082e1f)
-    (property "Reference" "R5" (at 185.039 48.641 90)
+    (property "Reference" "R5" (at 186.69 49.53 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "470" (at 194.564 48.641 90)
+    (property "Value" "470" (at 195.834 49.911 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (at 190.246 50.546 90)
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (at 191.516 51.816 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://industrial.panasonic.com/cdbs/www-data/pdf/RDA0000/DMA0000COL9.pdf~" (at 190.5 49.53 0)
+    (property "Datasheet" "https://industrial.panasonic.com/cdbs/www-data/pdf/RDA0000/DMA0000COL9.pdf~" (at 191.77 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "If R4-R6 installed, then DNP R1-R3" (at 190.5 49.53 0)
+    (property "Comment" "If R4-R6 installed, then DNP R1-R3" (at 191.77 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 190.5 49.53 0)
+    (property "Fitted" "YES" (at 191.77 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Panasonic" (at 190.5 49.53 0)
+    (property "Manufacturer" "Panasonic" (at 191.77 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "ERJ-3EKF3300V" (at 190.5 49.53 0)
+    (property "Manufacturer Part Number" "ERJ-3EKF3300V" (at 191.77 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 190.5 49.53 0)
+    (property "Substitution OK" " YES " (at 191.77 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "tolerance" "1%" (at 190.5 49.53 0)
+    (property "tolerance" "1%" (at 191.77 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C144560" (at 190.5 49.53 0)
+    (property "LCSC" "C144560" (at 191.77 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "ERJ-3EKF3300V" (at 190.5 49.53 0)
+    (property "Manufacturer PN" "ERJ-3EKF3300V" (at 191.77 50.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3593ef05-daaa-4c39-89b5-acb128a1f936))
@@ -4075,43 +4632,43 @@
     )
   )
 
-  (symbol (lib_id "Device:R_US") (at 179.07 34.29 270) (unit 1)
+  (symbol (lib_id "Device:R_US") (at 179.07 35.56 270) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005f08c312)
-    (property "Reference" "R4" (at 174.117 33.274 90)
+    (property "Reference" "R4" (at 174.117 34.544 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "470" (at 182.626 33.274 90)
+    (property "Value" "470" (at 182.626 34.544 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (at 178.816 35.306 90)
+    (property "Footprint" "Resistor_SMD:R_0805_2012Metric" (at 178.816 36.576 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://industrial.panasonic.com/cdbs/www-data/pdf/RDA0000/DMA0000COL9.pdf~" (at 179.07 34.29 0)
+    (property "Datasheet" "https://industrial.panasonic.com/cdbs/www-data/pdf/RDA0000/DMA0000COL9.pdf~" (at 179.07 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "If R4-R6 installed, then DNP R1-R3" (at 179.07 34.29 0)
+    (property "Comment" "If R4-R6 installed, then DNP R1-R3" (at 179.07 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 179.07 34.29 0)
+    (property "Fitted" "YES" (at 179.07 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Panasonic" (at 179.07 34.29 0)
+    (property "Manufacturer" "Panasonic" (at 179.07 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "ERJ-3EKF3300V" (at 179.07 34.29 0)
+    (property "Manufacturer Part Number" "ERJ-3EKF3300V" (at 179.07 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 179.07 34.29 0)
+    (property "Substitution OK" " YES " (at 179.07 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "tolerance" "1%" (at 179.07 34.29 0)
+    (property "tolerance" "1%" (at 179.07 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C144560" (at 179.07 34.29 0)
+    (property "LCSC" "C144560" (at 179.07 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "ERJ-3EKF3300V" (at 179.07 34.29 0)
+    (property "Manufacturer PN" "ERJ-3EKF3300V" (at 179.07 35.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 677befa2-146b-4d1b-8b0e-400e693e7d90))
@@ -4125,34 +4682,34 @@
     )
   )
 
-  (symbol (lib_id "Device:R_US") (at 190.5 46.99 270) (unit 1)
+  (symbol (lib_id "Device:R_US") (at 191.77 48.26 270) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005feab402)
-    (property "Reference" "R2" (at 185.039 46.101 90)
+    (property "Reference" "R2" (at 186.309 47.371 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "470" (at 194.564 46.101 90)
+    (property "Value" "470" (at 195.834 47.371 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (at 190.246 48.006 90)
+    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (at 191.516 49.276 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 190.5 46.99 0)
+    (property "Datasheet" "~" (at 191.77 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "If R1-R3 installed, then DNP R4-R6" (at 190.5 46.99 0)
+    (property "Comment" "If R1-R3 installed, then DNP R4-R6" (at 191.77 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "NO" (at 190.5 46.99 0)
+    (property "Fitted" "NO" (at 191.77 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Generic Through hole" (at 190.5 46.99 0)
+    (property "Manufacturer" "Generic Through hole" (at 191.77 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 190.5 46.99 0)
+    (property "Substitution OK" " YES " (at 191.77 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "tolerance" "1%" (at 190.5 46.99 0)
+    (property "tolerance" "1%" (at 191.77 48.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4540dcbc-f70f-47ca-87d6-1ce18f916da2))
@@ -4166,34 +4723,34 @@
     )
   )
 
-  (symbol (lib_id "Device:R_US") (at 190.5 64.77 90) (unit 1)
+  (symbol (lib_id "Device:R_US") (at 191.77 66.04 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005fed3098)
-    (property "Reference" "R3" (at 187.833 66.04 90)
+    (property "Reference" "R3" (at 189.103 67.31 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "470" (at 196.85 65.913 90)
+    (property "Value" "470" (at 198.12 67.183 90)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (at 190.754 63.754 90)
+    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (at 192.024 65.024 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 190.5 64.77 0)
+    (property "Datasheet" "~" (at 191.77 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "If R1-R3 installed, then DNP R4-R6" (at 190.5 64.77 0)
+    (property "Comment" "If R1-R3 installed, then DNP R4-R6" (at 191.77 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "NO" (at 190.5 64.77 0)
+    (property "Fitted" "NO" (at 191.77 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Generic Through hole" (at 190.5 64.77 0)
+    (property "Manufacturer" "Generic Through hole" (at 191.77 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 190.5 64.77 0)
+    (property "Substitution OK" " YES " (at 191.77 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "tolerance" "1%" (at 190.5 64.77 0)
+    (property "tolerance" "1%" (at 191.77 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c6c9993e-f605-449d-869c-3ed1381cfce2))
@@ -4207,34 +4764,34 @@
     )
   )
 
-  (symbol (lib_id "Device:R_US") (at 179.07 36.83 270) (unit 1)
+  (symbol (lib_id "Device:R_US") (at 179.07 38.1 270) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005fed4095)
-    (property "Reference" "R1" (at 174.117 35.814 90)
+    (property "Reference" "R1" (at 174.117 37.084 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "470" (at 182.626 35.814 90)
+    (property "Value" "470" (at 182.626 37.084 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (at 178.816 37.846 90)
+    (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (at 178.816 39.116 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 179.07 36.83 0)
+    (property "Datasheet" "~" (at 179.07 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "If R1-R3 installed, then DNP R4-R6" (at 179.07 36.83 0)
+    (property "Comment" "If R1-R3 installed, then DNP R4-R6" (at 179.07 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "NO" (at 179.07 36.83 0)
+    (property "Fitted" "NO" (at 179.07 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Generic Through hole" (at 179.07 36.83 0)
+    (property "Manufacturer" "Generic Through hole" (at 179.07 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 179.07 36.83 0)
+    (property "Substitution OK" " YES " (at 179.07 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "tolerance" "1%" (at 179.07 36.83 0)
+    (property "tolerance" "1%" (at 179.07 38.1 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9c06c5c2-ab9b-4a38-9ca5-019281abb815))
@@ -4249,7 +4806,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel") (at 92.71 109.22 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 016d8c5f-7a94-4149-84fe-47f5eb020131)
     (property "Reference" "BOLT3" (at 74.93 93.98 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -4335,6 +4892,9 @@
     (property "Manufacturer Part Number" "91772A110" (at 92.71 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 82.55 116.84 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -4345,7 +4905,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel") (at 96.52 109.22 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 02eba722-371a-429f-b020-28442fabf304)
     (property "Reference" "BOLT9" (at 78.74 93.98 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -4431,6 +4991,9 @@
     (property "Manufacturer Part Number" "91772A110" (at 96.52 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 86.36 116.84 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -4441,7 +5004,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel") (at 92.71 106.68 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 0a194276-a67e-4f0f-9c3c-0f354eafd238)
     (property "Reference" "BOLT2" (at 74.93 91.44 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -4527,6 +5090,9 @@
     (property "Manufacturer Part Number" "91772A110" (at 92.71 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 82.55 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -4537,7 +5103,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon") (at 111.125 109.855 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (in_bom yes) (on_board no) (dnp no) (fields_autoplaced)
     (uuid 0a9f96b6-3d3c-41d7-8816-a0ba4a13df4f)
     (property "Reference" "SPACER9" (at 114.3 109.5438 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -4620,6 +5186,9 @@
     (property "Standards Version" "1.1" (at 85.471 185.547 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 98.425 122.555 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -4630,7 +5199,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 156.845 109.855 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 0e2a5521-b75f-4f60-aa9f-cdaabf578963)
     (property "Reference" "WASHER17" (at 162.56 108.5732 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -4713,6 +5282,9 @@
     (property "Standards Version" "1.1" (at 131.191 185.547 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 151.765 114.935 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -4723,7 +5295,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 141.605 109.22 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 1061bf7c-5c7e-4949-a8aa-99b9357f03c2)
     (property "Reference" "WASHER2" (at 147.32 107.9382 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -4806,6 +5378,9 @@
     (property "Standards Version" "1.1" (at 115.951 184.912 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 136.525 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -4816,7 +5391,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 153.035 107.315 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 10959039-e23d-43c5-9b4c-cf9a19665c09)
     (property "Reference" "WASHER13" (at 158.75 106.0332 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -4899,6 +5474,9 @@
     (property "Standards Version" "1.1" (at 127.381 183.007 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 147.955 112.395 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -4909,7 +5487,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Nut, #4-40, stainless steel") (at 132.08 104.775 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 10af029b-35c0-483b-ab84-e7bc7dbe710c)
     (property "Reference" "NUT7" (at 135.89 103.505 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -4995,6 +5573,9 @@
     (property "Manufacturer Part Number" "91841A005" (at 132.08 104.775 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 142.24 107.315 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -5005,7 +5586,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon") (at 109.22 106.68 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (in_bom yes) (on_board no) (dnp no) (fields_autoplaced)
     (uuid 289e9ad9-2962-422a-9a78-069f0b4e5cad)
     (property "Reference" "SPACER5" (at 112.395 106.3688 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -5088,6 +5669,9 @@
     (property "Standards Version" "1.1" (at 83.566 182.372 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 96.52 119.38 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -5098,7 +5682,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel") (at 96.52 104.14 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 31979e14-79d4-4d0a-822c-1aeac0316247)
     (property "Reference" "BOLT7" (at 78.74 88.9 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -5184,6 +5768,9 @@
     (property "Manufacturer Part Number" "91772A110" (at 96.52 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 86.36 111.76 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -5194,7 +5781,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 141.605 113.665 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 32ad84f8-bff5-4584-8bd2-7453d3b7252d)
     (property "Reference" "WASHER3" (at 147.32 112.3832 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -5277,6 +5864,9 @@
     (property "Standards Version" "1.1" (at 115.951 189.357 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 136.525 118.745 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -5287,7 +5877,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 145.415 120.65 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 37e0676f-f122-48c6-a70a-f8709dcf3189)
     (property "Reference" "WASHER8" (at 151.13 119.3682 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -5370,6 +5960,9 @@
     (property "Standards Version" "1.1" (at 119.761 196.342 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 140.335 125.73 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -5380,7 +5973,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Nut, #4-40, stainless steel") (at 124.46 104.775 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 39a72461-3eaa-484e-88fb-506e13735778)
     (property "Reference" "NUT1" (at 128.27 103.505 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -5466,6 +6059,9 @@
     (property "Manufacturer Part Number" "91841A005" (at 124.46 104.775 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 134.62 107.315 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -5476,7 +6072,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon") (at 107.315 109.855 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (in_bom yes) (on_board no) (dnp no) (fields_autoplaced)
     (uuid 3cea42e7-4c09-4dd7-8fb6-23e2294e45f1)
     (property "Reference" "SPACER3" (at 110.49 109.5438 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -5559,6 +6155,9 @@
     (property "Standards Version" "1.1" (at 81.661 185.547 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 94.615 122.555 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -5569,7 +6168,7 @@
   )
 
   (symbol (lib_id "unikbd:HW PCB-mount leveling hardware") (at 95.25 162.56 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (in_bom yes) (on_board no) (dnp no) (fields_autoplaced)
     (uuid 461b8ff4-6afc-4839-9e1e-b4731df4d16e)
     (property "Reference" "Leveler2" (at 95.25 160.02 0)
       (effects (font (size 1.27 1.27)))
@@ -5655,6 +6254,9 @@
     (property "Manufacturer Part Number" "0G990743" (at 95.25 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 95.25 162.56 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -5665,7 +6267,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel") (at 94.615 104.14 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 46e1a6bb-6686-4c54-a3ec-6727c15636e0)
     (property "Reference" "BOLT4" (at 76.835 88.9 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -5751,6 +6353,9 @@
     (property "Manufacturer Part Number" "91772A110" (at 94.615 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 84.455 111.76 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -5761,7 +6366,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 141.605 118.11 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 49a75c6b-ede1-47fa-bc45-a25444fe23cc)
     (property "Reference" "WASHER4" (at 147.32 116.8282 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -5844,6 +6449,9 @@
     (property "Standards Version" "1.1" (at 115.951 193.802 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 136.525 123.19 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -5854,7 +6462,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel") (at 96.52 106.68 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 4c8a838f-de72-4d08-972d-0909957a1169)
     (property "Reference" "BOLT8" (at 78.74 91.44 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -5940,6 +6548,9 @@
     (property "Manufacturer Part Number" "91772A110" (at 96.52 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 86.36 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -5950,7 +6561,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon") (at 109.22 109.855 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (in_bom yes) (on_board no) (dnp no) (fields_autoplaced)
     (uuid 5fd8316d-ce69-45bb-adfc-8c40f8f413e1)
     (property "Reference" "SPACER6" (at 112.395 109.5438 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -6033,6 +6644,9 @@
     (property "Standards Version" "1.1" (at 83.566 185.547 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 96.52 122.555 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -6043,7 +6657,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel") (at 92.075 138.43 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 62830e33-68ef-4997-b213-221e32709536)
     (property "Reference" "BOLT11" (at 74.295 123.19 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -6129,6 +6743,9 @@
     (property "Manufacturer Part Number" "91772A110" (at 92.075 138.43 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 81.915 146.05 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -6139,7 +6756,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 153.035 111.76 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 701ebb71-de9b-4630-b4ef-19740f6c1910)
     (property "Reference" "WASHER14" (at 158.75 110.4782 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -6222,6 +6839,9 @@
     (property "Standards Version" "1.1" (at 127.381 187.452 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 147.955 116.84 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -6232,7 +6852,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 129.54 140.97 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 78964c64-7a41-4f5a-ae71-fef4cb283ebf)
     (property "Reference" "WASHER20" (at 135.255 139.6882 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -6315,6 +6935,9 @@
     (property "Standards Version" "1.1" (at 103.886 216.662 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 124.46 146.05 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -6325,7 +6948,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon") (at 109.22 103.505 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 7d9125b5-f31d-4424-9aee-df1a51bf02ce)
     (property "Reference" "SPACER4" (at 112.395 103.1938 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -6408,6 +7031,9 @@
     (property "Standards Version" "1.1" (at 83.566 179.197 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 96.52 116.205 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -6418,7 +7044,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Nut, #4-40, stainless steel") (at 113.03 137.16 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 7f51133a-4e67-40c1-b28d-65c439b28d83)
     (property "Reference" "NUT10" (at 116.84 135.89 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -6504,6 +7130,9 @@
     (property "Manufacturer Part Number" "91841A005" (at 113.03 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 123.19 139.7 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -6514,7 +7143,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 149.225 104.775 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 81dbfdb1-7b2c-40ba-a8c3-cf5b5b0035b0)
     (property "Reference" "WASHER9" (at 154.94 103.4932 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -6597,6 +7226,9 @@
     (property "Standards Version" "1.1" (at 123.571 180.467 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 144.145 109.855 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -6607,7 +7239,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Nut, #4-40, stainless steel") (at 128.27 114.3 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 8793761f-c2e2-4346-90ab-eadd67fae4e8)
     (property "Reference" "NUT6" (at 132.08 113.03 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -6693,6 +7325,9 @@
     (property "Manufacturer Part Number" "91841A005" (at 128.27 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 138.43 116.84 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -6703,7 +7338,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel") (at 92.075 135.89 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 89c7e571-3807-47bf-8742-8d45e7ad24b0)
     (property "Reference" "BOLT10" (at 74.295 120.65 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -6789,6 +7424,9 @@
     (property "Manufacturer Part Number" "91772A110" (at 92.075 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 81.915 143.51 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -6799,7 +7437,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 145.415 107.315 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 8ac164a5-4629-4aa2-a676-1702f61b14e0)
     (property "Reference" "WASHER5" (at 151.13 106.0332 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -6882,6 +7520,9 @@
     (property "Standards Version" "1.1" (at 119.761 183.007 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 140.335 112.395 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -6892,7 +7533,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Nut, #4-40, stainless steel") (at 128.27 110.49 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 8c448fb2-eb5b-4a46-86e7-5bacdfdce9fe)
     (property "Reference" "NUT5" (at 132.08 109.22 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -6978,6 +7619,9 @@
     (property "Manufacturer Part Number" "91841A005" (at 128.27 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 138.43 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -6988,7 +7632,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 145.415 111.76 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 8f483019-0550-4288-908c-31fbbae5da92)
     (property "Reference" "WASHER6" (at 151.13 110.4782 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -7071,6 +7715,9 @@
     (property "Standards Version" "1.1" (at 119.761 187.452 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 140.335 116.84 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -7081,7 +7728,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 149.225 118.11 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 9498510d-c29e-42d3-996a-265dc3147f4c)
     (property "Reference" "WASHER12" (at 154.94 116.8282 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -7164,6 +7811,9 @@
     (property "Standards Version" "1.1" (at 123.571 193.802 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 144.145 123.19 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -7174,7 +7824,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 149.225 113.665 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 94d7e915-1c8a-42bb-aa61-c458aa64e2e6)
     (property "Reference" "WASHER11" (at 154.94 112.3832 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -7257,6 +7907,9 @@
     (property "Standards Version" "1.1" (at 123.571 189.357 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 144.145 118.745 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -7267,7 +7920,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 145.415 116.205 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 9bc992cd-728b-410a-81e7-59764cbaf64c)
     (property "Reference" "WASHER7" (at 151.13 114.9232 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -7350,6 +8003,9 @@
     (property "Standards Version" "1.1" (at 119.761 191.897 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 140.335 121.285 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -7360,7 +8016,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Nut, #4-40, stainless steel") (at 113.03 140.97 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid 9f3fcf89-50ae-4759-8dd3-02742f52e76a)
     (property "Reference" "NUT11" (at 116.84 139.7 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -7446,6 +8102,9 @@
     (property "Manufacturer Part Number" "91841A005" (at 113.03 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 123.19 143.51 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -7456,7 +8115,7 @@
   )
 
   (symbol (lib_id "unikbd:HW PCB-mount leveling hardware") (at 95.25 158.75 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (in_bom yes) (on_board no) (dnp no) (fields_autoplaced)
     (uuid a009b148-63fc-4514-8fc7-5387b2e8209d)
     (property "Reference" "Leveler1" (at 95.25 156.21 0)
       (effects (font (size 1.27 1.27)))
@@ -7542,6 +8201,9 @@
     (property "Manufacturer Part Number" "0G990743" (at 95.25 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 95.25 158.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -7552,7 +8214,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 129.54 136.525 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid a5c8df6f-6b3e-43e1-8ac7-75992c1b6d19)
     (property "Reference" "WASHER19" (at 135.255 135.2432 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -7635,6 +8297,9 @@
     (property "Standards Version" "1.1" (at 103.886 212.217 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 124.46 141.605 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -7645,7 +8310,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 149.225 109.22 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid aa19dcc1-a011-4786-a6cc-1af0a4144700)
     (property "Reference" "WASHER10" (at 154.94 107.9382 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -7728,6 +8393,9 @@
     (property "Standards Version" "1.1" (at 123.571 184.912 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 144.145 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -7738,7 +8406,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Nut, #4-40, stainless steel") (at 132.08 108.585 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid abffa287-2e4e-449d-8188-73e6d7ae1d23)
     (property "Reference" "NUT8" (at 135.89 107.315 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -7824,6 +8492,9 @@
     (property "Manufacturer Part Number" "91841A005" (at 132.08 108.585 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 142.24 111.125 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -7834,7 +8505,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon") (at 111.125 106.68 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (in_bom yes) (on_board no) (dnp no) (fields_autoplaced)
     (uuid aebecf32-c3d1-4908-9e97-3640798e969f)
     (property "Reference" "SPACER8" (at 114.3 106.3688 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -7917,6 +8588,9 @@
     (property "Standards Version" "1.1" (at 85.471 182.372 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 98.425 119.38 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -7927,7 +8601,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Nut, #4-40, stainless steel") (at 124.46 112.395 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid b52cc79c-6e53-4960-98de-0ea2b4efe75a)
     (property "Reference" "NUT3" (at 128.27 111.125 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -8013,6 +8687,9 @@
     (property "Manufacturer Part Number" "91841A005" (at 124.46 112.395 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 134.62 114.935 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -8023,7 +8700,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Nut, #4-40, stainless steel") (at 128.27 106.68 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid b65835ac-62a4-4eaa-80e3-4a4111635a25)
     (property "Reference" "NUT4" (at 132.08 105.41 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -8109,6 +8786,9 @@
     (property "Manufacturer Part Number" "91841A005" (at 128.27 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 138.43 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -8119,7 +8799,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon") (at 107.315 103.505 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid b7ab6566-6bc0-4a1a-8638-bbabffccb725)
     (property "Reference" "SPACER1" (at 110.49 103.1938 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -8202,6 +8882,9 @@
     (property "Standards Version" "1.1" (at 81.661 179.197 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 94.615 116.205 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -8212,7 +8895,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 156.845 114.3 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid be5478df-2327-4579-acd7-46f5ba74ac59)
     (property "Reference" "WASHER18" (at 162.56 113.0182 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -8295,6 +8978,9 @@
     (property "Standards Version" "1.1" (at 131.191 189.992 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 151.765 119.38 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -8305,7 +8991,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 141.605 104.775 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid be69d54c-4239-406b-898d-eb7a35bae8df)
     (property "Reference" "WASHER1" (at 147.32 103.4932 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -8388,6 +9074,9 @@
     (property "Standards Version" "1.1" (at 115.951 180.467 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 136.525 109.855 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -8398,7 +9087,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon") (at 107.315 106.68 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+    (in_bom yes) (on_board no) (dnp no) (fields_autoplaced)
     (uuid cb828d8d-b43b-4297-a75c-5dbc9420e948)
     (property "Reference" "SPACER2" (at 110.49 106.3688 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -8481,6 +9170,9 @@
     (property "Standards Version" "1.1" (at 81.661 182.372 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 94.615 119.38 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -8491,7 +9183,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel") (at 92.71 104.14 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid d3478746-2b9c-447e-9985-0b497766ee80)
     (property "Reference" "BOLT1" (at 74.93 88.9 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -8577,6 +9269,9 @@
     (property "Manufacturer Part Number" "91772A110" (at 92.71 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 82.55 111.76 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -8587,7 +9282,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel") (at 94.615 106.68 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid d3de4ea1-ad28-4da4-ab28-bb0d9ab26501)
     (property "Reference" "BOLT5" (at 76.835 91.44 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -8673,6 +9368,9 @@
     (property "Manufacturer Part Number" "91772A110" (at 94.615 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 84.455 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -8683,7 +9381,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Nut, #4-40, stainless steel") (at 132.08 112.395 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid d5117e89-88e4-4006-bfad-02fd14bf521c)
     (property "Reference" "NUT9" (at 135.89 111.125 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -8769,6 +9467,9 @@
     (property "Manufacturer Part Number" "91841A005" (at 132.08 112.395 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 142.24 114.935 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -8779,7 +9480,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 153.035 116.205 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid d9df50e2-a3c4-4c2f-b32b-4b1dbe564146)
     (property "Reference" "WASHER15" (at 158.75 114.9232 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -8862,6 +9563,9 @@
     (property "Standards Version" "1.1" (at 127.381 191.897 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 147.955 121.285 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -8872,7 +9576,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Spacer, #4, 3/16{dblquote} OD, 1/8{dblquote} Long, white nylon") (at 111.125 103.505 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid daecd0a6-a3ca-4973-bc8c-f93fc0bf49b6)
     (property "Reference" "SPACER7" (at 114.3 103.1938 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -8955,6 +9659,9 @@
     (property "Standards Version" "1.1" (at 85.471 179.197 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 98.425 116.205 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -8965,7 +9672,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Lockwasher, #4-40, internal teeth, stainless steel") (at 153.035 120.65 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid e86dd577-0dd0-4257-bdf3-26450dbcdea4)
     (property "Reference" "WASHER16" (at 158.75 119.3682 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -9048,6 +9755,9 @@
     (property "Standards Version" "1.1" (at 127.381 196.342 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 147.955 125.73 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -9058,7 +9768,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Nut, #4-40, stainless steel") (at 124.46 108.585 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid f088ddbd-5e6b-4c4a-b8ae-0c8dc4c2b4b4)
     (property "Reference" "NUT2" (at 128.27 107.315 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -9144,6 +9854,9 @@
     (property "Manufacturer Part Number" "91841A005" (at 124.46 108.585 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 134.62 111.125 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -9154,7 +9867,7 @@
   )
 
   (symbol (lib_id "mounting-hardware:MNT McMaster Bolt, #4-40, 1/2{dblquote} Long, stainless steel") (at 94.615 109.22 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
+    (in_bom yes) (on_board no) (dnp no)
     (uuid f96ecdaf-0f5e-437c-ac71-1a73924e42a4)
     (property "Reference" "BOLT6" (at 76.835 93.98 0)
       (effects (font (size 1.27 1.27)) (justify left) hide)
@@ -9240,6 +9953,9 @@
     (property "Manufacturer Part Number" "91772A110" (at 94.615 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Sim.Enable" "0" (at 84.455 116.84 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (instances
       (project "kbd-classic"
         (path "/8ec12fb8-db3e-48ce-8343-d5db7896fd4d"
@@ -9249,61 +9965,61 @@
     )
   )
 
-  (sheet (at 19.685 86.36) (size 43.18 48.26) (fields_autoplaced)
+  (sheet (at 20.32 86.36) (size 43.18 48.26) (fields_autoplaced)
     (stroke (width 0) (type solid))
     (fill (color 0 0 0 0.0000))
     (uuid 00000000-0000-0000-0000-00005bc3e99d)
-    (property "Sheetname" "keys1" (at 19.685 85.5214 0)
+    (property "Sheetname" "keys1" (at 20.32 85.5214 0)
       (effects (font (size 1.524 1.524)) (justify left bottom))
     )
-    (property "Sheetfile" "keys1.kicad_sch" (at 19.685 135.3062 0)
+    (property "Sheetfile" "keys1.kicad_sch" (at 20.32 135.3062 0)
       (effects (font (size 1.524 1.524)) (justify left top))
     )
-    (pin "Col0" input (at 62.865 109.22 0)
+    (pin "Col0" input (at 63.5 109.22 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 0759d055-73fe-4890-a748-58412b2f79a4)
     )
-    (pin "Col1" input (at 62.865 106.68 0)
+    (pin "Col1" input (at 63.5 106.68 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid de09d901-08bc-41c5-9f58-a7bb045b9807)
     )
-    (pin "Col2" input (at 62.865 104.14 0)
+    (pin "Col2" input (at 63.5 104.14 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 6558e0f7-fd3c-40c1-b896-7f7920009354)
     )
-    (pin "Col3" input (at 62.865 101.6 0)
+    (pin "Col3" input (at 63.5 101.6 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid c2593285-4cd7-4a3c-b0cf-badcc97feec2)
     )
-    (pin "Col4" input (at 62.865 99.06 0)
+    (pin "Col4" input (at 63.5 99.06 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 76d0f868-ae9f-4401-9bd5-7bcd5560470f)
     )
-    (pin "Col5" input (at 62.865 96.52 0)
+    (pin "Col5" input (at 63.5 96.52 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 5ee5dc7e-339b-49a3-a315-6ec85903071c)
     )
-    (pin "Col6" input (at 62.865 93.98 0)
+    (pin "Col6" input (at 63.5 93.98 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 4dd66f24-6f47-447e-a8be-8b68c813d945)
     )
-    (pin "Col7" input (at 62.865 91.44 0)
+    (pin "Col7" input (at 63.5 91.44 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 2c0a4681-c934-45bf-8cdd-23ea3cddd856)
     )
-    (pin "Row0" input (at 62.865 121.92 0)
+    (pin "Row0" input (at 63.5 121.92 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 796a5c9c-7d5d-4c36-87e8-b72b7d00abff)
     )
-    (pin "Row1" input (at 62.865 119.38 0)
+    (pin "Row1" input (at 63.5 119.38 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 5d43ec50-9143-4279-b0cb-dfc621889b2f)
     )
-    (pin "Row2" input (at 62.865 116.84 0)
+    (pin "Row2" input (at 63.5 116.84 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid b25ad3ae-53c3-4052-9333-ebeeb8eb7019)
     )
-    (pin "Row3" input (at 62.865 114.3 0)
+    (pin "Row3" input (at 63.5 114.3 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 44444c3f-75cf-4215-aa1d-e655b1f432db)
     )
@@ -9314,61 +10030,61 @@
     )
   )
 
-  (sheet (at 19.685 22.86) (size 43.18 48.26) (fields_autoplaced)
+  (sheet (at 20.32 22.86) (size 43.18 48.26) (fields_autoplaced)
     (stroke (width 0) (type solid))
     (fill (color 0 0 0 0.0000))
     (uuid 00000000-0000-0000-0000-00005bc3ea0a)
-    (property "Sheetname" "keys2" (at 19.685 22.0214 0)
+    (property "Sheetname" "keys2" (at 20.32 22.0214 0)
       (effects (font (size 1.524 1.524)) (justify left bottom))
     )
-    (property "Sheetfile" "keys2.kicad_sch" (at 19.685 71.8062 0)
+    (property "Sheetfile" "keys2.kicad_sch" (at 20.32 71.8062 0)
       (effects (font (size 1.524 1.524)) (justify left top))
     )
-    (pin "Col0" input (at 62.865 45.72 0)
+    (pin "Col0" input (at 63.5 45.72 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 99dd9e69-3a61-4631-ad65-3a2485d1ec71)
     )
-    (pin "Col1" input (at 62.865 43.18 0)
+    (pin "Col1" input (at 63.5 43.18 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 07cfb6ef-9e5a-44e8-a25a-0d080a559220)
     )
-    (pin "Col2" input (at 62.865 40.64 0)
+    (pin "Col2" input (at 63.5 40.64 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 687779e9-ec9e-45f4-a7e5-9170ef74ddf8)
     )
-    (pin "Col3" input (at 62.865 38.1 0)
+    (pin "Col3" input (at 63.5 38.1 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid ae59ad23-54a1-4844-a6db-81aaa48f4fdd)
     )
-    (pin "Col4" input (at 62.865 35.56 0)
+    (pin "Col4" input (at 63.5 35.56 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid af708784-fc02-4eeb-a814-92be6a951077)
     )
-    (pin "Col5" input (at 62.865 33.02 0)
+    (pin "Col5" input (at 63.5 33.02 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid b1e9cfb4-5646-4801-b263-6d252a0a1358)
     )
-    (pin "Col6" input (at 62.865 30.48 0)
+    (pin "Col6" input (at 63.5 30.48 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid fa9e6254-18fa-465e-bc0f-f3e2e98e8dac)
     )
-    (pin "Col7" input (at 62.865 27.94 0)
+    (pin "Col7" input (at 63.5 27.94 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid c7a2a01b-8b12-4723-b691-f274b35bffa0)
     )
-    (pin "Row4" input (at 62.865 59.69 0)
+    (pin "Row4" input (at 63.5 60.96 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 417b5a3f-8f23-4497-a3c0-2fe50a1247a4)
     )
-    (pin "Row5" input (at 62.865 57.15 0)
+    (pin "Row5" input (at 63.5 58.42 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 92d425e0-8017-45f1-9eb6-18c31890813d)
     )
-    (pin "Row6" input (at 62.865 54.61 0)
+    (pin "Row6" input (at 63.5 55.88 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid bd6827d2-64fa-4559-8ed4-2b8574264102)
     )
-    (pin "Row7" input (at 62.865 52.07 0)
+    (pin "Row7" input (at 63.5 53.34 0)
       (effects (font (size 1.27 1.27)) (justify right))
       (uuid 68497744-95a8-4464-b9d0-1548e8dc3360)
     )
diff --git a/hardware/keyboard-classic/keys1.kicad_sch b/hardware/keyboard-classic/keys1.kicad_sch
index 7be616c..4f7b76c 100644
--- a/hardware/keyboard-classic/keys1.kicad_sch
+++ b/hardware/keyboard-classic/keys1.kicad_sch
@@ -182,7 +182,7 @@
       (property "Tracking" "No" (at -26.162 -70.104 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "BOM Comment" "" (at 5.08 0 0)
+      (property "BOM Comment" "8U spacebar" (at 5.08 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (property "Component Type" "Switch" (at -4.572 -36.83 0)
@@ -265,62 +265,131 @@
         )
       )
     )
-    (symbol "unikbd:diode-combined" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "D" (at 0 2.54 0)
-        (effects (font (size 1.27 1.27)))
+    (symbol "unikbd:diode-combined" (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "D**" (at 0.635 2.54 0)
+        (effects (font (size 1.27 1.27)) (justify left) hide)
       )
-      (property "Value" "diode-combined" (at 0 -2.54 0)
-        (effects (font (size 1.27 1.27)))
+      (property "Value" "1N914/MMBD914" (at -27.94 -34.798 0)
+        (effects (font (size 1.27 1.27)) (justify left) hide)
       )
-      (property "Footprint" "unikbd:diode-combined" (at -20.32 -22.86 0)
+      (property "Footprint" "unikbd:diode-combined" (at -48.26 -17.78 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at -7.62 -20.32 0)
+      (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at -26.162 -29.464 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "diode" (at 0 0 0)
+      (property "Component Value" "19N14/MMBD914" (at 9.144 4.826 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "100V 0.15A standard switching diode, DO-35" (at 0 0 0)
+      (property "Tolerance" "If applicable" (at -22.098 -39.624 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "D*DO?35*" (at 0 0 0)
+      (property "Manufacturer" "Diodes, Inc." (at -26.162 -18.288 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at -23.368 -24.892 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at -23.114 -64.77 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Manufacturer PN" "MMBD914-7-F" (at -23.876 -21.844 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "RoHS" "Yes" (at -26.416 -61.976 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Allow Substitution" "Yes" (at -26.67 -67.818 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Fitted" "Yes" (at -25.654 -72.644 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Tracking" "No" (at -26.162 -70.104 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at -27.94 -30.48 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Component Type" "Diode" (at -4.572 -36.83 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Package Type" "SOT3-3" (at -48.26 -12.7 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Package Variant" "" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Number of Pins" "3" (at -22.098 -42.164 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp (Storage)" "If applicable" (at -22.098 -44.196 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp (Operating)" "-65C/150C" (at -21.844 -46.736 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp (Soldering)" "If applicable" (at -21.844 -49.53 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp Coeff." "If applicable" (at -21.844 -52.07 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Power Rating" "350 mW / 200 mA" (at -21.844 -54.61 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Material" "If applicable" (at -21.844 -56.896 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Class" "If applicable" (at -21.844 -59.182 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Standards Version" "1.1" (at -25.654 -75.692 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "diode switching combined" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "C_*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "diode-combined_0_1"
         (polyline
           (pts
-            (xy -1.27 1.27)
-            (xy -1.27 -1.27)
+            (xy 2.54 1.27)
+            (xy 2.54 -1.27)
           )
           (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy 1.27 0)
-            (xy -1.27 0)
+            (xy 5.08 0)
+            (xy 2.54 0)
           )
           (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy 1.27 1.27)
-            (xy 1.27 -1.27)
-            (xy -1.27 0)
-            (xy 1.27 1.27)
+            (xy 5.08 1.27)
+            (xy 5.08 -1.27)
+            (xy 2.54 0)
+            (xy 5.08 1.27)
           )
           (stroke (width 0.254) (type default))
           (fill (type none))
         )
       )
       (symbol "diode-combined_1_1"
-        (pin passive line (at -3.81 0 0) (length 2.54)
+        (pin passive line (at 0 0 0) (length 2.54)
           (name "K" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 3.81 0 180) (length 2.54)
+        (pin passive line (at 7.62 0 180) (length 2.54)
           (name "A" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
@@ -328,40 +397,43 @@
     )
   )
 
-  (junction (at 193.04 104.14) (diameter 0) (color 0 0 0 0)
+  (junction (at 193.04 93.98) (diameter 0) (color 0 0 0 0)
     (uuid 07ebfbe4-5d73-4972-a820-66d633e38131)
   )
   (junction (at 81.28 160.02) (diameter 0) (color 0 0 0 0)
     (uuid 0fe5f478-c416-4d37-b3c3-d217ef7c00fc)
   )
-  (junction (at 172.72 127) (diameter 0) (color 0 0 0 0)
+  (junction (at 172.72 119.38) (diameter 0) (color 0 0 0 0)
     (uuid 10d1e097-a868-4f04-9b95-5543d05a7d8e)
   )
   (junction (at 142.24 160.02) (diameter 0) (color 0 0 0 0)
     (uuid 11d13d05-15a0-44f5-abc9-d0db344e0268)
   )
-  (junction (at 162.56 114.3) (diameter 0) (color 0 0 0 0)
+  (junction (at 162.56 109.22) (diameter 0) (color 0 0 0 0)
     (uuid 145f18a0-5c20-4f2c-8876-cb8e9fd07efa)
   )
-  (junction (at 152.4 127) (diameter 0) (color 0 0 0 0)
+  (junction (at 152.4 119.38) (diameter 0) (color 0 0 0 0)
     (uuid 14e53770-cd3a-454e-88f6-b386ba993b97)
   )
-  (junction (at 152.4 81.28) (diameter 0) (color 0 0 0 0)
+  (junction (at 203.2 83.82) (diameter 0) (color 0 0 0 0)
+    (uuid 18ddee6b-01fd-4203-b999-98dc938738ad)
+  )
+  (junction (at 152.4 71.12) (diameter 0) (color 0 0 0 0)
     (uuid 2334047f-a070-497c-aac1-644179a5c4b3)
   )
-  (junction (at 111.76 127) (diameter 0) (color 0 0 0 0)
+  (junction (at 111.76 119.38) (diameter 0) (color 0 0 0 0)
     (uuid 23ed62fd-95b4-42f0-8ca0-9340a28d114b)
   )
-  (junction (at 81.28 137.16) (diameter 0) (color 0 0 0 0)
+  (junction (at 81.28 134.62) (diameter 0) (color 0 0 0 0)
     (uuid 24d47ce2-490a-4490-8589-78030da8543e)
   )
-  (junction (at 132.08 127) (diameter 0) (color 0 0 0 0)
+  (junction (at 132.08 119.38) (diameter 0) (color 0 0 0 0)
     (uuid 3292b9bb-0a96-4300-bef0-22c2418fc26c)
   )
-  (junction (at 91.44 81.28) (diameter 0) (color 0 0 0 0)
+  (junction (at 91.44 71.12) (diameter 0) (color 0 0 0 0)
     (uuid 37bbe582-de7b-4ae6-a1a1-121ad2e865ad)
   )
-  (junction (at 101.6 91.44) (diameter 0) (color 0 0 0 0)
+  (junction (at 101.6 83.82) (diameter 0) (color 0 0 0 0)
     (uuid 3b44a8bc-8ea2-4331-afec-d44c5e2cda74)
   )
   (junction (at 101.6 160.02) (diameter 0) (color 0 0 0 0)
@@ -370,112 +442,109 @@
   (junction (at 162.56 160.02) (diameter 0) (color 0 0 0 0)
     (uuid 4366967c-4327-4fd2-b1c8-255f5185f95e)
   )
-  (junction (at 203.2 91.44) (diameter 0) (color 0 0 0 0)
-    (uuid 4f9c48cc-bdd6-4ca2-bddf-a63bbaafda6f)
-  )
-  (junction (at 121.92 114.3) (diameter 0) (color 0 0 0 0)
+  (junction (at 121.92 109.22) (diameter 0) (color 0 0 0 0)
     (uuid 55a1e47f-5aac-46cb-90cf-f5d7b8e60944)
   )
-  (junction (at 121.92 91.44) (diameter 0) (color 0 0 0 0)
+  (junction (at 121.92 83.82) (diameter 0) (color 0 0 0 0)
     (uuid 568d7387-d8e6-43a5-8c6f-5c4701fc10b7)
   )
-  (junction (at 213.36 81.28) (diameter 0) (color 0 0 0 0)
+  (junction (at 213.36 71.12) (diameter 0) (color 0 0 0 0)
     (uuid 58340cdf-7b3d-4342-afc8-276b5a08591d)
   )
   (junction (at 182.88 160.02) (diameter 0) (color 0 0 0 0)
     (uuid 5d5d0b04-7670-4045-b739-5a4d839f877f)
   )
-  (junction (at 121.92 137.16) (diameter 0) (color 0 0 0 0)
+  (junction (at 121.92 134.62) (diameter 0) (color 0 0 0 0)
     (uuid 5f148443-6c15-4594-8fab-73ba5f60c5fd)
   )
-  (junction (at 142.24 114.3) (diameter 0) (color 0 0 0 0)
+  (junction (at 142.24 109.22) (diameter 0) (color 0 0 0 0)
     (uuid 5f24da24-5c5a-4f9c-b576-f4b5a9beac74)
   )
   (junction (at 121.92 160.02) (diameter 0) (color 0 0 0 0)
     (uuid 69f48100-26db-4894-9727-3952e494c2d6)
   )
-  (junction (at 182.88 137.16) (diameter 0) (color 0 0 0 0)
+  (junction (at 182.88 134.62) (diameter 0) (color 0 0 0 0)
     (uuid 69fe6f28-4243-477a-a367-6cb07aff3674)
   )
-  (junction (at 182.88 91.44) (diameter 0) (color 0 0 0 0)
+  (junction (at 182.88 83.82) (diameter 0) (color 0 0 0 0)
     (uuid 6fc08edf-fcba-4343-bfa9-cd2ad4388606)
   )
-  (junction (at 132.08 104.14) (diameter 0) (color 0 0 0 0)
+  (junction (at 132.08 93.98) (diameter 0) (color 0 0 0 0)
     (uuid 7379b3d7-a679-4418-a2f4-ff2e7448a4c8)
   )
-  (junction (at 91.44 127) (diameter 0) (color 0 0 0 0)
+  (junction (at 91.44 119.38) (diameter 0) (color 0 0 0 0)
     (uuid 74e3856f-bd22-4b7f-8446-da09f67d83e6)
   )
-  (junction (at 203.2 114.3) (diameter 0) (color 0 0 0 0)
+  (junction (at 203.2 109.22) (diameter 0) (color 0 0 0 0)
     (uuid 78e92ba9-5cce-485b-b9da-2f294b256fed)
   )
-  (junction (at 152.4 104.14) (diameter 0) (color 0 0 0 0)
+  (junction (at 152.4 93.98) (diameter 0) (color 0 0 0 0)
     (uuid 80c58d2a-e59e-4138-b246-3738473d8fb6)
   )
-  (junction (at 71.12 127) (diameter 0) (color 0 0 0 0)
+  (junction (at 71.12 119.38) (diameter 0) (color 0 0 0 0)
     (uuid 81b0e571-e1f9-4cf6-8490-e7214c2379f8)
   )
-  (junction (at 172.72 81.28) (diameter 0) (color 0 0 0 0)
+  (junction (at 172.72 71.12) (diameter 0) (color 0 0 0 0)
     (uuid 8b4a259d-4b25-49fb-a420-275f6af51772)
   )
-  (junction (at 101.6 137.16) (diameter 0) (color 0 0 0 0)
+  (junction (at 101.6 134.62) (diameter 0) (color 0 0 0 0)
     (uuid 93e83821-9654-44ee-875c-87af3a2be8c6)
   )
-  (junction (at 213.36 104.14) (diameter 0) (color 0 0 0 0)
+  (junction (at 213.36 93.98) (diameter 0) (color 0 0 0 0)
     (uuid 944189c6-61d5-436c-a7f9-3c30df3df62e)
   )
-  (junction (at 101.6 114.3) (diameter 0) (color 0 0 0 0)
+  (junction (at 101.6 109.22) (diameter 0) (color 0 0 0 0)
     (uuid 9ed65849-5564-407d-be48-4a86cb7e2f00)
   )
-  (junction (at 142.24 137.16) (diameter 0) (color 0 0 0 0)
+  (junction (at 142.24 134.62) (diameter 0) (color 0 0 0 0)
     (uuid a2c273fa-7ac0-42ed-a9b2-dfa782fecb5d)
   )
-  (junction (at 91.44 104.14) (diameter 0) (color 0 0 0 0)
+  (junction (at 91.44 93.98) (diameter 0) (color 0 0 0 0)
     (uuid a4d0ce63-8bad-4aa1-ab07-461583b2c91b)
   )
-  (junction (at 172.72 104.14) (diameter 0) (color 0 0 0 0)
+  (junction (at 172.72 93.98) (diameter 0) (color 0 0 0 0)
     (uuid a7debb17-4681-499c-a46a-658f3c9a5377)
   )
-  (junction (at 111.76 104.14) (diameter 0) (color 0 0 0 0)
+  (junction (at 111.76 93.98) (diameter 0) (color 0 0 0 0)
     (uuid a88ba739-3c16-4476-8457-b28d84ab1dd6)
   )
-  (junction (at 213.36 127) (diameter 0) (color 0 0 0 0)
+  (junction (at 213.36 119.38) (diameter 0) (color 0 0 0 0)
     (uuid ac87e3f5-5161-4e7f-939d-ad97b9f5145d)
   )
-  (junction (at 162.56 137.16) (diameter 0) (color 0 0 0 0)
+  (junction (at 162.56 134.62) (diameter 0) (color 0 0 0 0)
     (uuid c16afe64-f5a3-4fb7-9556-26c049967d25)
   )
-  (junction (at 203.2 137.16) (diameter 0) (color 0 0 0 0)
+  (junction (at 203.2 134.62) (diameter 0) (color 0 0 0 0)
     (uuid c74fab6b-c99d-4ac0-9edb-7cc34b862263)
   )
-  (junction (at 111.76 81.28) (diameter 0) (color 0 0 0 0)
+  (junction (at 111.76 71.12) (diameter 0) (color 0 0 0 0)
     (uuid ca093d0a-bd27-403c-8100-13dcb565b3ae)
   )
-  (junction (at 193.04 127) (diameter 0) (color 0 0 0 0)
+  (junction (at 193.04 119.38) (diameter 0) (color 0 0 0 0)
     (uuid d4b985b3-1605-4c9c-a9e5-41d1df450119)
   )
-  (junction (at 182.88 114.3) (diameter 0) (color 0 0 0 0)
+  (junction (at 182.88 109.22) (diameter 0) (color 0 0 0 0)
     (uuid e1887a2f-db12-4159-bfcc-e760c919ec20)
   )
-  (junction (at 193.04 81.28) (diameter 0) (color 0 0 0 0)
+  (junction (at 193.04 71.12) (diameter 0) (color 0 0 0 0)
     (uuid ed627605-15bb-4ce6-8006-f281d606e0a1)
   )
   (junction (at 203.2 160.02) (diameter 0) (color 0 0 0 0)
     (uuid f3d21026-0768-423c-ac4a-ea51fc80f7bb)
   )
-  (junction (at 162.56 91.44) (diameter 0) (color 0 0 0 0)
+  (junction (at 162.56 83.82) (diameter 0) (color 0 0 0 0)
     (uuid ff9880cf-3d09-4d56-b3c3-879612a2622c)
   )
 
-  (wire (pts (xy 101.6 104.14) (xy 101.6 106.68))
+  (wire (pts (xy 101.6 93.98) (xy 101.6 96.52))
     (stroke (width 0) (type default))
     (uuid 00e86e46-6e8d-417b-8e39-dc0d10cc75d1)
   )
-  (wire (pts (xy 162.56 137.16) (xy 182.88 137.16))
+  (wire (pts (xy 162.56 134.62) (xy 182.88 134.62))
     (stroke (width 0) (type default))
     (uuid 0290e35f-cdeb-4d11-8640-f7b94cc6a364)
   )
-  (wire (pts (xy 223.52 152.4) (xy 223.52 149.86))
+  (wire (pts (xy 223.52 147.32) (xy 223.52 144.78))
     (stroke (width 0) (type default))
     (uuid 0705e009-65bd-4d16-919e-ff58033c3667)
   )
@@ -483,15 +552,15 @@
     (stroke (width 0) (type default))
     (uuid 0937df5a-af7f-4add-b883-2546fbf96032)
   )
-  (wire (pts (xy 132.08 127) (xy 132.08 149.86))
+  (wire (pts (xy 132.08 119.38) (xy 132.08 144.78))
     (stroke (width 0) (type default))
     (uuid 0ea447fc-dcc6-4b25-81e6-5f419d629c45)
   )
-  (wire (pts (xy 162.56 114.3) (xy 182.88 114.3))
+  (wire (pts (xy 162.56 109.22) (xy 182.88 109.22))
     (stroke (width 0) (type default))
     (uuid 0fea36c5-9496-4e24-83f5-2c601dea64df)
   )
-  (wire (pts (xy 132.08 104.14) (xy 132.08 127))
+  (wire (pts (xy 132.08 93.98) (xy 132.08 119.38))
     (stroke (width 0) (type default))
     (uuid 10370f16-e1a2-4417-a411-580274a3db92)
   )
@@ -499,163 +568,215 @@
     (stroke (width 0) (type default))
     (uuid 106cfb08-0f49-4158-a6de-91cb23e7622b)
   )
-  (wire (pts (xy 182.88 81.28) (xy 182.88 83.82))
+  (wire (pts (xy 121.92 104.14) (xy 121.92 109.22))
     (stroke (width 0) (type default))
-    (uuid 157eefdf-a791-4693-aef2-cb9de35bd04f)
+    (uuid 11847e7f-fa66-462c-bc2f-a9575de75618)
   )
-  (wire (pts (xy 203.2 127) (xy 203.2 129.54))
+  (wire (pts (xy 203.2 71.12) (xy 203.2 73.66))
+    (stroke (width 0) (type default))
+    (uuid 15017240-e6c7-4bd5-a1b8-a7a41b813cb4)
+  )
+  (wire (pts (xy 203.2 119.38) (xy 203.2 121.92))
     (stroke (width 0) (type default))
     (uuid 161d1907-74e0-4af5-8c1f-23db71dd4b49)
   )
-  (wire (pts (xy 142.24 129.54) (xy 142.24 127))
+  (wire (pts (xy 142.24 121.92) (xy 142.24 119.38))
     (stroke (width 0) (type default))
     (uuid 167bdafc-114d-49bb-89f6-b144483596af)
   )
-  (wire (pts (xy 36.83 114.3) (xy 101.6 114.3))
+  (wire (pts (xy 38.1 109.22) (xy 101.6 109.22))
     (stroke (width 0) (type default))
     (uuid 1735e2b6-f980-4142-9d9b-0bae8ea05f33)
   )
-  (wire (pts (xy 193.04 81.28) (xy 193.04 104.14))
+  (wire (pts (xy 193.04 71.12) (xy 193.04 93.98))
     (stroke (width 0) (type default))
     (uuid 188945e8-31c8-4572-b1b0-0a92f6bfd8b0)
   )
-  (wire (pts (xy 101.6 129.54) (xy 101.6 127))
+  (wire (pts (xy 101.6 121.92) (xy 101.6 119.38))
     (stroke (width 0) (type default))
     (uuid 1ca2e321-f0bf-4550-8128-14b45053f16b)
   )
-  (wire (pts (xy 121.92 91.44) (xy 162.56 91.44))
+  (wire (pts (xy 121.92 83.82) (xy 162.56 83.82))
     (stroke (width 0) (type default))
     (uuid 1d16cd34-64fe-4463-9cf7-bfd671bc9938)
   )
-  (wire (pts (xy 182.88 106.68) (xy 182.88 104.14))
+  (wire (pts (xy 182.88 96.52) (xy 182.88 93.98))
     (stroke (width 0) (type default))
     (uuid 1d485d83-81d8-4774-8aa7-43c770446843)
   )
-  (wire (pts (xy 36.83 137.16) (xy 81.28 137.16))
+  (wire (pts (xy 38.1 134.62) (xy 81.28 134.62))
     (stroke (width 0) (type default))
     (uuid 1da9f54d-14b8-442a-be8d-73f00f85c03f)
   )
-  (wire (pts (xy 152.4 127) (xy 152.4 149.86))
+  (wire (pts (xy 121.92 129.54) (xy 121.92 134.62))
+    (stroke (width 0) (type default))
+    (uuid 1e9aca57-527a-4a76-ac82-a4dcfe5e2eba)
+  )
+  (wire (pts (xy 152.4 119.38) (xy 152.4 144.78))
     (stroke (width 0) (type default))
     (uuid 2547272f-185c-45e8-a7a1-9cc84f1e372b)
   )
-  (wire (pts (xy 121.92 114.3) (xy 142.24 114.3))
+  (wire (pts (xy 121.92 109.22) (xy 142.24 109.22))
     (stroke (width 0) (type default))
     (uuid 25794f42-e992-4dd1-8035-3a8f34e3eb44)
   )
-  (wire (pts (xy 162.56 149.86) (xy 162.56 152.4))
+  (wire (pts (xy 162.56 144.78) (xy 162.56 147.32))
     (stroke (width 0) (type default))
     (uuid 25838e90-e2b4-42f6-9a3b-8571b2d47a7b)
   )
-  (wire (pts (xy 81.28 137.16) (xy 101.6 137.16))
+  (wire (pts (xy 81.28 134.62) (xy 101.6 134.62))
     (stroke (width 0) (type default))
     (uuid 26711765-cf3a-40f6-b96a-f3e465b26d36)
   )
-  (wire (pts (xy 111.76 81.28) (xy 111.76 104.14))
+  (wire (pts (xy 111.76 71.12) (xy 111.76 93.98))
     (stroke (width 0) (type default))
     (uuid 2efa6d48-f935-4ccb-a619-3309818e6f85)
   )
-  (wire (pts (xy 152.4 43.18) (xy 152.4 81.28))
+  (wire (pts (xy 182.88 71.12) (xy 182.88 73.66))
+    (stroke (width 0) (type default))
+    (uuid 306f4565-9043-45fc-b141-e9c864db67a0)
+  )
+  (wire (pts (xy 182.88 104.14) (xy 182.88 109.22))
+    (stroke (width 0) (type default))
+    (uuid 309beb6e-9edf-45ac-bb80-a891bea1e262)
+  )
+  (wire (pts (xy 203.2 154.94) (xy 203.2 160.02))
+    (stroke (width 0) (type default))
+    (uuid 30a259d8-efaf-4639-8d18-ab15dab14ba0)
+  )
+  (wire (pts (xy 152.4 43.18) (xy 152.4 71.12))
     (stroke (width 0) (type default))
     (uuid 32e984e3-ec65-49ce-a100-db26ff4a4c87)
   )
-  (wire (pts (xy 36.83 48.26) (xy 132.08 48.26))
+  (wire (pts (xy 38.1 48.26) (xy 132.08 48.26))
     (stroke (width 0) (type default))
     (uuid 3551641f-7522-4b7f-acb3-203df2c8d0cb)
   )
-  (wire (pts (xy 36.83 38.1) (xy 172.72 38.1))
+  (wire (pts (xy 38.1 38.1) (xy 172.72 38.1))
     (stroke (width 0) (type default))
     (uuid 35c01423-efc2-40fd-a16d-007565be06a8)
   )
-  (wire (pts (xy 121.92 129.54) (xy 121.92 127))
+  (wire (pts (xy 142.24 104.14) (xy 142.24 109.22))
+    (stroke (width 0) (type default))
+    (uuid 3851f32a-44be-4f49-971d-2bf3f1aac9fe)
+  )
+  (wire (pts (xy 121.92 121.92) (xy 121.92 119.38))
     (stroke (width 0) (type default))
     (uuid 39586ab4-ca0e-414e-b0fd-b6ab6c96933f)
   )
-  (wire (pts (xy 162.56 129.54) (xy 162.56 127))
+  (wire (pts (xy 162.56 121.92) (xy 162.56 119.38))
     (stroke (width 0) (type default))
     (uuid 3a217d44-5b24-46e9-bdca-b179c46522b6)
   )
-  (wire (pts (xy 182.88 137.16) (xy 203.2 137.16))
+  (wire (pts (xy 182.88 134.62) (xy 203.2 134.62))
     (stroke (width 0) (type default))
     (uuid 3a6047f9-6cf4-4ea6-92de-ab994f9d1523)
   )
-  (wire (pts (xy 203.2 81.28) (xy 203.2 83.82))
-    (stroke (width 0) (type default))
-    (uuid 3c4c7fd1-dea2-475a-9b89-5420e82ac33c)
-  )
   (wire (pts (xy 182.88 160.02) (xy 203.2 160.02))
     (stroke (width 0) (type default))
     (uuid 3cf7d758-5105-4f47-901b-ae121e55278c)
   )
-  (wire (pts (xy 91.44 127) (xy 91.44 149.86))
+  (wire (pts (xy 91.44 119.38) (xy 91.44 144.78))
     (stroke (width 0) (type default))
     (uuid 3e2627bb-a36b-4a7f-8957-8b866f7c339f)
   )
-  (wire (pts (xy 223.52 127) (xy 223.52 129.54))
+  (wire (pts (xy 223.52 119.38) (xy 223.52 121.92))
     (stroke (width 0) (type default))
     (uuid 3e4f5d92-19cf-4ecf-8cf8-acec0b6030a1)
   )
-  (wire (pts (xy 111.76 104.14) (xy 111.76 127))
+  (wire (pts (xy 111.76 93.98) (xy 111.76 119.38))
     (stroke (width 0) (type default))
     (uuid 44113151-7d7e-4061-bbb9-d3c4e68c45a0)
   )
-  (wire (pts (xy 71.12 127) (xy 71.12 149.86))
+  (wire (pts (xy 142.24 154.94) (xy 142.24 160.02))
+    (stroke (width 0) (type default))
+    (uuid 47a35507-93cb-42ea-81e7-06879ab9bb39)
+  )
+  (wire (pts (xy 71.12 119.38) (xy 71.12 144.78))
     (stroke (width 0) (type default))
     (uuid 4c94fac8-5f36-4345-aca7-8b4b296b6d65)
   )
   (wire (pts (xy 223.52 81.28) (xy 223.52 83.82))
     (stroke (width 0) (type default))
-    (uuid 4d6db7f4-dc61-44e5-aed8-1c83b75f47f5)
+    (uuid 4f81c6d4-3001-4d0c-8be3-ab6d47711d37)
   )
-  (wire (pts (xy 203.2 91.44) (xy 223.52 91.44))
+  (wire (pts (xy 223.52 160.02) (xy 203.2 160.02))
     (stroke (width 0) (type default))
-    (uuid 4ece5e59-f5ec-4264-b80a-caae04b269e0)
+    (uuid 4fb92915-7c75-4d51-be33-a4731696c2e9)
   )
-  (wire (pts (xy 162.56 91.44) (xy 182.88 91.44))
+  (wire (pts (xy 142.24 129.54) (xy 142.24 134.62))
     (stroke (width 0) (type default))
-    (uuid 525620a2-80cc-45f2-8840-c6fb940c6c3f)
+    (uuid 52779af6-2d31-411f-97ce-b9dc6ede7f70)
   )
-  (wire (pts (xy 172.72 38.1) (xy 172.72 81.28))
+  (wire (pts (xy 203.2 129.54) (xy 203.2 134.62))
+    (stroke (width 0) (type default))
+    (uuid 530c39f1-d7be-492d-a1a3-ac0e302d91dd)
+  )
+  (wire (pts (xy 172.72 38.1) (xy 172.72 71.12))
     (stroke (width 0) (type default))
     (uuid 55b59035-6fe4-48cd-89a1-12ee2803c39b)
   )
-  (wire (pts (xy 36.83 27.94) (xy 213.36 27.94))
+  (wire (pts (xy 38.1 27.94) (xy 213.36 27.94))
     (stroke (width 0) (type default))
     (uuid 594eef20-a431-4b27-a12b-2b54855c2038)
   )
-  (wire (pts (xy 203.2 160.02) (xy 223.52 160.02))
+  (wire (pts (xy 162.56 71.12) (xy 162.56 73.66))
     (stroke (width 0) (type default))
-    (uuid 609a08f4-681b-4822-8c9a-ff0693f4d0fa)
+    (uuid 5d723322-c857-45ab-8270-6d89c1999b3c)
   )
-  (wire (pts (xy 101.6 91.44) (xy 121.92 91.44))
+  (wire (pts (xy 182.88 154.94) (xy 182.88 160.02))
+    (stroke (width 0) (type default))
+    (uuid 607e374e-226e-4c83-900c-ecbd5aa8ab2a)
+  )
+  (wire (pts (xy 101.6 83.82) (xy 121.92 83.82))
     (stroke (width 0) (type default))
     (uuid 662aaf87-c2c7-4f5d-803f-359dce76da7b)
   )
-  (wire (pts (xy 101.6 137.16) (xy 121.92 137.16))
+  (wire (pts (xy 101.6 134.62) (xy 121.92 134.62))
     (stroke (width 0) (type default))
     (uuid 67557972-d0d9-4efb-af85-eae9f60be0bf)
   )
-  (wire (pts (xy 213.36 27.94) (xy 213.36 81.28))
+  (wire (pts (xy 101.6 104.14) (xy 101.6 109.22))
+    (stroke (width 0) (type default))
+    (uuid 67aa19f0-5a3f-471c-870e-01b26d9c9af1)
+  )
+  (wire (pts (xy 213.36 27.94) (xy 213.36 71.12))
     (stroke (width 0) (type default))
     (uuid 69a7bd95-5f7b-4137-a772-f69e866d648a)
   )
-  (wire (pts (xy 81.28 149.86) (xy 81.28 152.4))
+  (wire (pts (xy 101.6 81.28) (xy 101.6 83.82))
+    (stroke (width 0) (type default))
+    (uuid 6c4b2f3c-f27d-45c1-8adf-c78b0b75a023)
+  )
+  (wire (pts (xy 81.28 154.94) (xy 81.28 160.02))
+    (stroke (width 0) (type default))
+    (uuid 6e9c3eee-13df-4c40-978a-f60e3c77f589)
+  )
+  (wire (pts (xy 81.28 144.78) (xy 81.28 147.32))
     (stroke (width 0) (type default))
     (uuid 6f495b25-6ad6-4296-88a4-a7c6524083e7)
   )
-  (wire (pts (xy 193.04 127) (xy 193.04 149.86))
+  (wire (pts (xy 193.04 119.38) (xy 193.04 144.78))
     (stroke (width 0) (type default))
     (uuid 737455f7-2ae8-4558-a4e8-2d0d14f4e6e9)
   )
-  (wire (pts (xy 101.6 149.86) (xy 101.6 152.4))
+  (wire (pts (xy 101.6 144.78) (xy 101.6 147.32))
     (stroke (width 0) (type default))
     (uuid 76709c31-e0b3-43f8-9420-e5db4af746e4)
   )
-  (wire (pts (xy 182.88 127) (xy 182.88 129.54))
+  (wire (pts (xy 223.52 129.54) (xy 223.52 134.62))
+    (stroke (width 0) (type default))
+    (uuid 787e909d-4f59-4563-932a-337564a17d28)
+  )
+  (wire (pts (xy 182.88 119.38) (xy 182.88 121.92))
     (stroke (width 0) (type default))
     (uuid 79c2859f-97a6-4b8b-83dc-e596bd83fe68)
   )
-  (wire (pts (xy 81.28 129.54) (xy 81.28 127))
+  (wire (pts (xy 203.2 81.28) (xy 203.2 83.82))
+    (stroke (width 0) (type default))
+    (uuid 7a7fbaaf-0a4f-4a56-a4dd-003a156c15ed)
+  )
+  (wire (pts (xy 81.28 121.92) (xy 81.28 119.38))
     (stroke (width 0) (type default))
     (uuid 7cf78e56-ec81-4646-88a0-e6aa1755e4fe)
   )
@@ -663,187 +784,251 @@
     (stroke (width 0) (type default))
     (uuid 7d7806cb-eff4-490d-9e4e-3e147398722c)
   )
-  (wire (pts (xy 36.83 91.44) (xy 101.6 91.44))
+  (wire (pts (xy 121.92 81.28) (xy 121.92 83.82))
+    (stroke (width 0) (type default))
+    (uuid 7da0ca13-2bbc-42e8-a51d-90939726cc17)
+  )
+  (wire (pts (xy 38.1 83.82) (xy 101.6 83.82))
     (stroke (width 0) (type default))
     (uuid 7df91c51-0077-4094-98e7-bf2be74765c1)
   )
-  (wire (pts (xy 152.4 81.28) (xy 152.4 104.14))
+  (wire (pts (xy 152.4 71.12) (xy 152.4 93.98))
     (stroke (width 0) (type default))
     (uuid 7f2691c7-d642-4d0b-ab4d-965e5e3f62ae)
   )
-  (wire (pts (xy 203.2 137.16) (xy 223.52 137.16))
-    (stroke (width 0) (type default))
-    (uuid 7fe833cf-b52f-4d34-bdb4-ad7b825afc91)
-  )
-  (wire (pts (xy 213.36 127) (xy 213.36 149.86))
+  (wire (pts (xy 213.36 119.38) (xy 213.36 144.78))
     (stroke (width 0) (type default))
     (uuid 80e6eb60-ca08-40d3-9fcc-777c0285afaa)
   )
-  (wire (pts (xy 71.12 63.5) (xy 71.12 127))
+  (wire (pts (xy 223.52 154.94) (xy 223.52 160.02))
+    (stroke (width 0) (type default))
+    (uuid 82fe7ec6-1493-4bc6-af31-fa82a969fe89)
+  )
+  (wire (pts (xy 71.12 63.5) (xy 71.12 119.38))
     (stroke (width 0) (type default))
     (uuid 870636b9-5204-4d71-b91f-b2cdb4e73b39)
   )
-  (wire (pts (xy 142.24 149.86) (xy 142.24 152.4))
+  (wire (pts (xy 142.24 144.78) (xy 142.24 147.32))
     (stroke (width 0) (type default))
     (uuid 879e07c8-a50b-439e-912a-4afa20ffc7d9)
   )
-  (wire (pts (xy 172.72 81.28) (xy 172.72 104.14))
+  (wire (pts (xy 172.72 71.12) (xy 172.72 93.98))
     (stroke (width 0) (type default))
     (uuid 888b3086-5f7b-4cdd-af77-1d33ed79076b)
   )
+  (wire (pts (xy 223.52 109.22) (xy 203.2 109.22))
+    (stroke (width 0) (type default))
+    (uuid 88e93f1a-623f-4305-91dd-15ad67e1680c)
+  )
   (wire (pts (xy 121.92 160.02) (xy 142.24 160.02))
     (stroke (width 0) (type default))
     (uuid 8a0e79f6-d743-4cf5-9c6a-3cec222247bb)
   )
-  (wire (pts (xy 203.2 106.68) (xy 203.2 104.14))
+  (wire (pts (xy 203.2 96.52) (xy 203.2 93.98))
     (stroke (width 0) (type default))
     (uuid 8bd83ce9-5421-4f56-8c08-c5c2564d5943)
   )
-  (wire (pts (xy 101.6 114.3) (xy 121.92 114.3))
+  (wire (pts (xy 182.88 83.82) (xy 203.2 83.82))
+    (stroke (width 0) (type default))
+    (uuid 8cc32849-098b-44ec-9f65-71da32fa0066)
+  )
+  (wire (pts (xy 101.6 109.22) (xy 121.92 109.22))
     (stroke (width 0) (type default))
     (uuid 8f19c214-06fc-4c72-9e1d-b7ec9bf318a4)
   )
-  (wire (pts (xy 91.44 104.14) (xy 91.44 127))
+  (wire (pts (xy 91.44 93.98) (xy 91.44 119.38))
     (stroke (width 0) (type default))
     (uuid 8f6a7911-6d67-4905-bce5-b56ee6a84504)
   )
-  (wire (pts (xy 36.83 43.18) (xy 152.4 43.18))
+  (wire (pts (xy 38.1 43.18) (xy 152.4 43.18))
     (stroke (width 0) (type default))
     (uuid 932a4f8f-2af3-4cfa-9a46-7c63cf9055a9)
   )
-  (wire (pts (xy 162.56 106.68) (xy 162.56 104.14))
+  (wire (pts (xy 101.6 129.54) (xy 101.6 134.62))
+    (stroke (width 0) (type default))
+    (uuid 93ceacc2-77a9-41e1-8385-66f8ed8162eb)
+  )
+  (wire (pts (xy 162.56 96.52) (xy 162.56 93.98))
     (stroke (width 0) (type default))
     (uuid 96421857-8e0b-4506-89f7-d5ee1a018700)
   )
-  (wire (pts (xy 152.4 104.14) (xy 152.4 127))
+  (wire (pts (xy 152.4 93.98) (xy 152.4 119.38))
     (stroke (width 0) (type default))
     (uuid 977b572c-b01e-4111-8bbd-399a63739a0b)
   )
-  (wire (pts (xy 91.44 81.28) (xy 91.44 104.14))
+  (wire (pts (xy 203.2 104.14) (xy 203.2 109.22))
+    (stroke (width 0) (type default))
+    (uuid 97c03bd8-2592-4bd3-8211-7795799636e0)
+  )
+  (wire (pts (xy 162.56 104.14) (xy 162.56 109.22))
+    (stroke (width 0) (type default))
+    (uuid 97d53245-08c7-4250-8a3f-849ca744310d)
+  )
+  (wire (pts (xy 223.52 71.12) (xy 223.52 73.66))
+    (stroke (width 0) (type default))
+    (uuid 98e3143e-06bb-46f6-bda9-50ace1157862)
+  )
+  (wire (pts (xy 91.44 71.12) (xy 91.44 93.98))
     (stroke (width 0) (type default))
     (uuid 9970e9a7-0f52-4647-916c-c2217cc2c265)
   )
-  (wire (pts (xy 36.83 33.02) (xy 193.04 33.02))
+  (wire (pts (xy 38.1 33.02) (xy 193.04 33.02))
     (stroke (width 0) (type default))
     (uuid 9d29fdc8-4dea-4ea3-b7dd-84bbaa4a11cf)
   )
-  (wire (pts (xy 193.04 33.02) (xy 193.04 81.28))
+  (wire (pts (xy 193.04 33.02) (xy 193.04 71.12))
     (stroke (width 0) (type default))
     (uuid 9d48143f-9cb3-4139-b4b2-20395ffed75b)
   )
-  (wire (pts (xy 203.2 114.3) (xy 223.52 114.3))
-    (stroke (width 0) (type default))
-    (uuid 9e5dfe3f-5df3-46da-9da3-befc4446a1bb)
-  )
-  (wire (pts (xy 142.24 106.68) (xy 142.24 104.14))
+  (wire (pts (xy 142.24 96.52) (xy 142.24 93.98))
     (stroke (width 0) (type default))
     (uuid a0894f5f-9771-43b0-8557-377f9e6c71c5)
   )
-  (wire (pts (xy 182.88 114.3) (xy 203.2 114.3))
+  (wire (pts (xy 182.88 109.22) (xy 203.2 109.22))
     (stroke (width 0) (type default))
     (uuid a18c5f34-1be8-4f43-b120-6c1f5e0799fe)
   )
-  (wire (pts (xy 121.92 83.82) (xy 121.92 81.28))
+  (wire (pts (xy 223.52 134.62) (xy 203.2 134.62))
     (stroke (width 0) (type default))
-    (uuid ab8901d5-a10e-4727-b2d8-591a9fa249df)
+    (uuid a87e4bc1-397c-4fee-a1c5-a0bc03c6e9b0)
   )
-  (wire (pts (xy 172.72 127) (xy 172.72 149.86))
+  (wire (pts (xy 81.28 129.54) (xy 81.28 134.62))
+    (stroke (width 0) (type default))
+    (uuid a8ea47d7-e064-476b-9fdd-67c3e0187cf6)
+  )
+  (wire (pts (xy 182.88 129.54) (xy 182.88 134.62))
+    (stroke (width 0) (type default))
+    (uuid aae1e5d9-4494-421e-8285-7530b4fba04c)
+  )
+  (wire (pts (xy 172.72 119.38) (xy 172.72 144.78))
     (stroke (width 0) (type default))
     (uuid ac2297a2-a8e8-4ee9-bedf-60158a6c8219)
   )
-  (wire (pts (xy 223.52 106.68) (xy 223.52 104.14))
+  (wire (pts (xy 223.52 96.52) (xy 223.52 93.98))
     (stroke (width 0) (type default))
     (uuid ad2846b1-406a-4391-a2cc-057c0d8c267f)
   )
-  (wire (pts (xy 36.83 58.42) (xy 91.44 58.42))
+  (wire (pts (xy 162.56 81.28) (xy 162.56 83.82))
+    (stroke (width 0) (type default))
+    (uuid aeec2381-2c90-470d-acd8-e02def4e72ea)
+  )
+  (wire (pts (xy 38.1 58.42) (xy 91.44 58.42))
     (stroke (width 0) (type default))
     (uuid b1cef21b-520b-42ad-bf63-7d14cdac6dfd)
   )
-  (wire (pts (xy 162.56 81.28) (xy 162.56 83.82))
-    (stroke (width 0) (type default))
-    (uuid b1dbf9ec-81a9-4621-899a-b1a8fe49ced7)
-  )
-  (wire (pts (xy 111.76 53.34) (xy 111.76 81.28))
+  (wire (pts (xy 111.76 53.34) (xy 111.76 71.12))
     (stroke (width 0) (type default))
     (uuid b3cdab52-a704-4c9f-9668-a932c654c602)
   )
-  (wire (pts (xy 182.88 91.44) (xy 203.2 91.44))
+  (wire (pts (xy 162.56 129.54) (xy 162.56 134.62))
+    (stroke (width 0) (type default))
+    (uuid ba43dbb1-a244-48cc-b8ba-36c638b27f61)
+  )
+  (wire (pts (xy 162.56 83.82) (xy 182.88 83.82))
     (stroke (width 0) (type default))
     (uuid bc39d3bf-eb74-4f4d-a59d-8f9b5feaadae)
   )
-  (wire (pts (xy 172.72 104.14) (xy 172.72 127))
+  (wire (pts (xy 162.56 154.94) (xy 162.56 160.02))
+    (stroke (width 0) (type default))
+    (uuid bcafb9f8-23f9-427e-a4c5-c47bda7b5528)
+  )
+  (wire (pts (xy 172.72 93.98) (xy 172.72 119.38))
     (stroke (width 0) (type default))
     (uuid c2e39412-0ca7-423c-a692-16adc8280a79)
   )
-  (wire (pts (xy 142.24 137.16) (xy 162.56 137.16))
+  (wire (pts (xy 142.24 134.62) (xy 162.56 134.62))
     (stroke (width 0) (type default))
     (uuid c50e49aa-146c-4b34-ad61-ab4542c3f785)
   )
-  (wire (pts (xy 132.08 48.26) (xy 132.08 104.14))
+  (wire (pts (xy 132.08 48.26) (xy 132.08 93.98))
     (stroke (width 0) (type default))
     (uuid c8645c53-2393-428a-9991-d17eb6e257c1)
   )
-  (wire (pts (xy 36.83 160.02) (xy 81.28 160.02))
+  (wire (pts (xy 38.1 160.02) (xy 81.28 160.02))
     (stroke (width 0) (type default))
     (uuid c9a94ae9-c729-4b38-a37b-46269cf5ece5)
   )
-  (wire (pts (xy 36.83 63.5) (xy 71.12 63.5))
+  (wire (pts (xy 38.1 63.5) (xy 71.12 63.5))
     (stroke (width 0) (type default))
     (uuid cdb5ec47-38b7-4d32-b409-84382ebabf5c)
   )
-  (wire (pts (xy 203.2 149.86) (xy 203.2 152.4))
+  (wire (pts (xy 121.92 71.12) (xy 121.92 73.66))
+    (stroke (width 0) (type default))
+    (uuid ce9b1447-c987-49b0-bb48-16bf4f4b351d)
+  )
+  (wire (pts (xy 203.2 144.78) (xy 203.2 147.32))
     (stroke (width 0) (type default))
     (uuid d2c4be37-e2c1-4e54-8d58-19ebbaccdd7d)
   )
-  (wire (pts (xy 101.6 81.28) (xy 101.6 83.82))
+  (wire (pts (xy 101.6 71.12) (xy 101.6 73.66))
     (stroke (width 0) (type default))
     (uuid d4c57252-812e-45f3-b9b9-98d4bc6d43c7)
   )
-  (wire (pts (xy 142.24 114.3) (xy 162.56 114.3))
+  (wire (pts (xy 142.24 109.22) (xy 162.56 109.22))
     (stroke (width 0) (type default))
     (uuid d7767109-4705-46e8-a683-58a6ef435e75)
   )
-  (wire (pts (xy 111.76 127) (xy 111.76 149.86))
+  (wire (pts (xy 111.76 119.38) (xy 111.76 144.78))
     (stroke (width 0) (type default))
     (uuid db01ed3b-b83f-4e91-ab59-cf7ef2b5b281)
   )
-  (wire (pts (xy 91.44 58.42) (xy 91.44 81.28))
+  (wire (pts (xy 91.44 58.42) (xy 91.44 71.12))
     (stroke (width 0) (type default))
     (uuid dc24c2ed-76a2-4129-bd24-4e121da15c3b)
   )
-  (wire (pts (xy 121.92 104.14) (xy 121.92 106.68))
+  (wire (pts (xy 121.92 93.98) (xy 121.92 96.52))
     (stroke (width 0) (type default))
     (uuid dc6b5049-3305-4029-90cf-2e18a2e41503)
   )
-  (wire (pts (xy 213.36 104.14) (xy 213.36 127))
+  (wire (pts (xy 213.36 93.98) (xy 213.36 119.38))
     (stroke (width 0) (type default))
     (uuid dd471c27-378a-4c28-957c-5ed62dab35c6)
   )
-  (wire (pts (xy 121.92 149.86) (xy 121.92 152.4))
+  (wire (pts (xy 121.92 144.78) (xy 121.92 147.32))
     (stroke (width 0) (type default))
     (uuid ddd1b435-1664-4c4b-a448-2ad8e23d1511)
   )
-  (wire (pts (xy 182.88 149.86) (xy 182.88 152.4))
+  (wire (pts (xy 223.52 104.14) (xy 223.52 109.22))
+    (stroke (width 0) (type default))
+    (uuid dfdb8ce1-46af-4531-9296-b408cf66ba2f)
+  )
+  (wire (pts (xy 182.88 144.78) (xy 182.88 147.32))
     (stroke (width 0) (type default))
     (uuid e090a872-62f9-4830-b919-89e7fa71e4d9)
   )
+  (wire (pts (xy 203.2 83.82) (xy 223.52 83.82))
+    (stroke (width 0) (type default))
+    (uuid e358e08d-6afd-40e3-a598-d30053b7db11)
+  )
+  (wire (pts (xy 101.6 154.94) (xy 101.6 160.02))
+    (stroke (width 0) (type default))
+    (uuid e759eaa4-1321-4a07-b2c8-92b3a5b64e94)
+  )
   (wire (pts (xy 162.56 160.02) (xy 182.88 160.02))
     (stroke (width 0) (type default))
     (uuid ea0351c1-af95-400c-b659-735ff981cf7f)
   )
-  (wire (pts (xy 193.04 104.14) (xy 193.04 127))
+  (wire (pts (xy 193.04 93.98) (xy 193.04 119.38))
     (stroke (width 0) (type default))
     (uuid ea64745a-6e14-4e45-9de3-d8961a8cecbb)
   )
-  (wire (pts (xy 213.36 81.28) (xy 213.36 104.14))
+  (wire (pts (xy 213.36 71.12) (xy 213.36 93.98))
     (stroke (width 0) (type default))
     (uuid eb4a3a73-6c60-474c-adfe-8e459f0a00ce)
   )
-  (wire (pts (xy 36.83 53.34) (xy 111.76 53.34))
+  (wire (pts (xy 38.1 53.34) (xy 111.76 53.34))
     (stroke (width 0) (type default))
     (uuid f3a72a75-7e91-488b-a20d-8bc2fd22f99b)
   )
-  (wire (pts (xy 121.92 137.16) (xy 142.24 137.16))
+  (wire (pts (xy 121.92 154.94) (xy 121.92 160.02))
+    (stroke (width 0) (type default))
+    (uuid f869a285-d6e9-4ae4-9905-8757b1264a88)
+  )
+  (wire (pts (xy 182.88 81.28) (xy 182.88 83.82))
+    (stroke (width 0) (type default))
+    (uuid f8818d15-b249-4921-876f-7bdd0d76d84d)
+  )
+  (wire (pts (xy 121.92 134.62) (xy 142.24 134.62))
     (stroke (width 0) (type default))
     (uuid fa1372f7-6edc-49b0-88fd-622d97239612)
   )
@@ -853,148 +1038,148 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 5883fd66-4399-42d0-85b9-65dcc4f153e5)
   )
-  (text "Rubout" (at 75.184 106.68 0)
+  (text "Rubout" (at 75.184 96.52 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid d35b1747-d2c0-4b7e-96ad-6301205a0225)
   )
 
-  (hierarchical_label "Col7" (shape input) (at 36.83 27.94 180) (fields_autoplaced)
+  (hierarchical_label "Col7" (shape input) (at 38.1 27.94 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 07fe8d63-cdfb-4437-8c45-c21ad27c0f6d)
   )
-  (hierarchical_label "Col2" (shape input) (at 36.83 53.34 180) (fields_autoplaced)
+  (hierarchical_label "Col2" (shape input) (at 38.1 53.34 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 298aaced-f974-47ef-a7bc-2325642f7026)
   )
-  (hierarchical_label "Col3" (shape input) (at 36.83 48.26 180) (fields_autoplaced)
+  (hierarchical_label "Col3" (shape input) (at 38.1 48.26 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 34aaa5b5-195c-4810-ab6f-e6519c75a6c7)
   )
-  (hierarchical_label "Row3" (shape input) (at 36.83 160.02 180) (fields_autoplaced)
+  (hierarchical_label "Row3" (shape input) (at 38.1 160.02 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 41a35322-8794-4778-b4d3-dc8a0708a8a2)
   )
-  (hierarchical_label "Col4" (shape input) (at 36.83 43.18 180) (fields_autoplaced)
+  (hierarchical_label "Col4" (shape input) (at 38.1 43.18 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 609a50ea-9972-4aa5-bdcd-232297dd89c1)
   )
-  (hierarchical_label "Col1" (shape input) (at 36.83 58.42 180) (fields_autoplaced)
+  (hierarchical_label "Col1" (shape input) (at 38.1 58.42 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 654686cb-c166-4085-b2bb-5da080ff568d)
   )
-  (hierarchical_label "Row2" (shape input) (at 36.83 137.16 180) (fields_autoplaced)
+  (hierarchical_label "Row2" (shape input) (at 38.1 134.62 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 78b45f06-268c-4384-b358-29d13afc3f44)
   )
-  (hierarchical_label "Col5" (shape input) (at 36.83 38.1 180) (fields_autoplaced)
+  (hierarchical_label "Col5" (shape input) (at 38.1 38.1 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 8d7a62d9-1f26-4446-af55-dbc00c6ce43b)
   )
-  (hierarchical_label "Col6" (shape input) (at 36.83 33.02 180) (fields_autoplaced)
+  (hierarchical_label "Col6" (shape input) (at 38.1 33.02 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid acdb506b-d22e-4d9b-b6c8-12d424a04d01)
   )
-  (hierarchical_label "Row1" (shape input) (at 36.83 114.3 180) (fields_autoplaced)
+  (hierarchical_label "Row1" (shape input) (at 38.1 109.22 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid af247ec0-4400-4f78-8a8a-baff0ada5cc7)
   )
-  (hierarchical_label "Row0" (shape input) (at 36.83 91.44 180) (fields_autoplaced)
+  (hierarchical_label "Row0" (shape input) (at 38.1 83.82 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid afcc2c6e-f511-4826-ae0d-713e5c890388)
   )
-  (hierarchical_label "Col0" (shape input) (at 36.83 63.5 180) (fields_autoplaced)
+  (hierarchical_label "Col0" (shape input) (at 38.1 63.5 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid c612e82b-a713-4f8a-93bb-f3c6c917327a)
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 96.52 81.28 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 96.52 71.12 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc3fd26)
-    (property "Reference" "SW35" (at 96.52 74.041 0)
+    (property "Reference" "SW35" (at 96.52 63.881 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "R_Shift" (at 96.52 76.3524 0)
+    (property "Value" "R_Shift" (at 96.52 66.1924 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 96.52 76.2 0)
+    (property "Footprint" "unikbd:Key_MX" (at 96.52 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 96.52 76.2 0)
+    (property "Datasheet" "" (at 96.52 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 96.52 81.28 0)
+    (property "Comment" "Common to all layouts" (at 96.52 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 96.52 81.28 0)
+    (property "Fitted" "YES" (at 96.52 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 96.52 81.28 0)
+    (property "Substitution OK" "NO" (at 96.52 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 58.42 93.98 0)
+    (property "Component Value" "Key" (at 58.42 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 74.422 120.904 0)
+    (property "Tolerance" "If applicable" (at 74.422 110.744 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 70.358 99.568 0)
+    (property "Manufacturer" "Cherry" (at 70.358 89.408 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 73.152 106.172 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 73.152 96.012 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 73.406 146.05 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 73.406 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 72.644 103.124 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 72.644 92.964 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 70.104 143.256 0)
+    (property "RoHS" "Yes" (at 70.104 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 69.85 149.098 0)
+    (property "Allow Substitution" "Yes" (at 69.85 138.938 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 70.358 151.384 0)
+    (property "Tracking" "No" (at 70.358 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "1.5U" (at 101.6 81.28 0)
+    (property "BOM Comment" "1.5U" (at 101.6 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 91.948 118.11 0)
+    (property "Component Type" "Switch" (at 91.948 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 101.6 81.28 0)
+    (property "Package Type" "" (at 101.6 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 101.6 81.28 0)
+    (property "Package Variant" "" (at 101.6 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 74.422 123.444 0)
+    (property "Number of Pins" "2" (at 74.422 113.284 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 74.422 125.476 0)
+    (property "Temp (Storage)" "" (at 74.422 115.316 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 74.676 128.016 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 74.676 117.856 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 74.676 130.81 0)
+    (property "Temp (Soldering)" "If applicable" (at 74.676 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 74.676 133.35 0)
+    (property "Temp Coeff." "If applicable" (at 74.676 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 74.676 135.89 0)
+    (property "Power Rating" "10 mA" (at 74.676 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 74.676 138.176 0)
+    (property "Material" "If applicable" (at 74.676 128.016 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 74.676 140.462 0)
+    (property "Class" "If applicable" (at 74.676 130.302 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 70.866 156.972 0)
+    (property "Standards Version" "1.1" (at 70.866 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9411146a-3440-4968-b440-6e193452f2d7))
@@ -1008,94 +1193,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 116.84 81.28 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 116.84 71.12 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc3fe57)
-    (property "Reference" "SW39" (at 116.84 74.041 0)
+    (property "Reference" "SW39" (at 116.84 63.881 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "L_Shift" (at 116.84 76.3524 0)
+    (property "Value" "L_Shift" (at 116.84 66.1924 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 116.84 76.2 0)
+    (property "Footprint" "unikbd:Key_MX" (at 116.84 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 116.84 76.2 0)
+    (property "Datasheet" "" (at 116.84 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 116.84 81.28 0)
+    (property "Comment" "Common to all layouts" (at 116.84 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 116.84 81.28 0)
+    (property "Fitted" "YES" (at 116.84 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 116.84 81.28 0)
+    (property "Substitution OK" "NO" (at 116.84 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 78.74 93.98 0)
+    (property "Component Value" "Key" (at 78.74 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 94.742 120.904 0)
+    (property "Tolerance" "If applicable" (at 94.742 110.744 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 90.678 99.568 0)
+    (property "Manufacturer" "Cherry" (at 90.678 89.408 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 93.472 106.172 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 93.472 96.012 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 93.726 146.05 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 93.726 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 92.964 103.124 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 92.964 92.964 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 90.424 143.256 0)
+    (property "RoHS" "Yes" (at 90.424 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 90.17 149.098 0)
+    (property "Allow Substitution" "Yes" (at 90.17 138.938 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 90.678 151.384 0)
+    (property "Tracking" "No" (at 90.678 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "1.5U " (at 121.92 81.28 0)
+    (property "BOM Comment" "1.5U " (at 121.92 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 112.268 118.11 0)
+    (property "Component Type" "Switch" (at 112.268 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 121.92 81.28 0)
+    (property "Package Type" "" (at 121.92 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 121.92 81.28 0)
+    (property "Package Variant" "" (at 121.92 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 94.742 123.444 0)
+    (property "Number of Pins" "2" (at 94.742 113.284 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 94.742 125.476 0)
+    (property "Temp (Storage)" "" (at 94.742 115.316 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 94.996 128.016 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 94.996 117.856 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 94.996 130.81 0)
+    (property "Temp (Soldering)" "If applicable" (at 94.996 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 94.996 133.35 0)
+    (property "Temp Coeff." "If applicable" (at 94.996 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 94.996 135.89 0)
+    (property "Power Rating" "10 mA" (at 94.996 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 94.996 138.176 0)
+    (property "Material" "If applicable" (at 94.996 128.016 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 94.996 140.462 0)
+    (property "Class" "If applicable" (at 94.996 130.302 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 91.186 156.972 0)
+    (property "Standards Version" "1.1" (at 91.186 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0878ddf6-49f8-4e68-a5f3-7b13be7ab294))
@@ -1109,94 +1294,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 177.8 81.28 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 177.8 71.12 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc3ff69)
-    (property "Reference" "SW49" (at 177.8 74.041 0)
+    (property "Reference" "SW49" (at 177.8 63.881 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "TAB" (at 177.8 76.3524 0)
+    (property "Value" "TAB" (at 177.8 66.1924 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 177.8 76.2 0)
+    (property "Footprint" "unikbd:Key_MX" (at 177.8 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 177.8 76.2 0)
+    (property "Datasheet" "" (at 177.8 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 177.8 81.28 0)
+    (property "Comment" "Common to all layouts" (at 177.8 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 177.8 81.28 0)
+    (property "Fitted" "YES" (at 177.8 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 177.8 81.28 0)
+    (property "Substitution OK" "NO" (at 177.8 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 139.7 93.98 0)
+    (property "Component Value" "Key" (at 139.7 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 155.702 120.904 0)
+    (property "Tolerance" "If applicable" (at 155.702 110.744 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 151.638 99.568 0)
+    (property "Manufacturer" "Cherry" (at 151.638 89.408 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 154.432 106.172 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 154.432 96.012 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 154.686 146.05 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 154.686 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 153.924 103.124 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 153.924 92.964 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 151.384 143.256 0)
+    (property "RoHS" "Yes" (at 151.384 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 151.13 149.098 0)
+    (property "Allow Substitution" "Yes" (at 151.13 138.938 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 151.638 151.384 0)
+    (property "Tracking" "No" (at 151.638 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 182.88 81.28 0)
+    (property "BOM Comment" "" (at 182.88 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 173.228 118.11 0)
+    (property "Component Type" "Switch" (at 173.228 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 182.88 81.28 0)
+    (property "Package Type" "" (at 182.88 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 182.88 81.28 0)
+    (property "Package Variant" "" (at 182.88 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 155.702 123.444 0)
+    (property "Number of Pins" "2" (at 155.702 113.284 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 155.702 125.476 0)
+    (property "Temp (Storage)" "" (at 155.702 115.316 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 155.956 128.016 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 155.956 117.856 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 155.956 130.81 0)
+    (property "Temp (Soldering)" "If applicable" (at 155.956 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 155.956 133.35 0)
+    (property "Temp Coeff." "If applicable" (at 155.956 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 155.956 135.89 0)
+    (property "Power Rating" "10 mA" (at 155.956 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 155.956 138.176 0)
+    (property "Material" "If applicable" (at 155.956 128.016 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 155.956 140.462 0)
+    (property "Class" "If applicable" (at 155.956 130.302 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 152.146 156.972 0)
+    (property "Standards Version" "1.1" (at 152.146 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2ecea752-9792-4722-891a-b3cd7d293cbc))
@@ -1210,94 +1395,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 218.44 81.28 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 218.44 71.12 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc3ff70)
-    (property "Reference" "SW57" (at 218.44 74.041 0)
+    (property "Reference" "SW57" (at 218.44 63.881 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Backslash" (at 218.44 76.3524 0)
+    (property "Value" "Backslash" (at 218.44 66.1924 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 218.44 76.2 0)
+    (property "Footprint" "unikbd:Key_MX" (at 218.44 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 218.44 76.2 0)
+    (property "Datasheet" "" (at 218.44 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 218.44 81.28 0)
+    (property "Comment" "Common to all layouts" (at 218.44 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 218.44 81.28 0)
+    (property "Fitted" "YES" (at 218.44 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 218.44 81.28 0)
+    (property "Substitution OK" "NO" (at 218.44 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 180.34 93.98 0)
+    (property "Component Value" "Key" (at 180.34 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 196.342 120.904 0)
+    (property "Tolerance" "If applicable" (at 196.342 110.744 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 192.278 99.568 0)
+    (property "Manufacturer" "Cherry" (at 192.278 89.408 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 195.072 106.172 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 195.072 96.012 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 195.326 146.05 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 195.326 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 194.564 103.124 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 194.564 92.964 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 192.024 143.256 0)
+    (property "RoHS" "Yes" (at 192.024 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 191.77 149.098 0)
+    (property "Allow Substitution" "Yes" (at 191.77 138.938 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 192.278 151.384 0)
+    (property "Tracking" "No" (at 192.278 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 223.52 81.28 0)
+    (property "BOM Comment" "" (at 223.52 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 213.868 118.11 0)
+    (property "Component Type" "Switch" (at 213.868 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 223.52 81.28 0)
+    (property "Package Type" "" (at 223.52 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 223.52 81.28 0)
+    (property "Package Variant" "" (at 223.52 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 196.342 123.444 0)
+    (property "Number of Pins" "2" (at 196.342 113.284 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 196.342 125.476 0)
+    (property "Temp (Storage)" "" (at 196.342 115.316 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 196.596 128.016 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 196.596 117.856 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 196.596 130.81 0)
+    (property "Temp (Soldering)" "If applicable" (at 196.596 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 196.596 133.35 0)
+    (property "Temp Coeff." "If applicable" (at 196.596 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 196.596 135.89 0)
+    (property "Power Rating" "10 mA" (at 196.596 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 196.596 138.176 0)
+    (property "Material" "If applicable" (at 196.596 128.016 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 196.596 140.462 0)
+    (property "Class" "If applicable" (at 196.596 130.302 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 192.786 156.972 0)
+    (property "Standards Version" "1.1" (at 192.786 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1302ef13-c450-4a16-98e9-3270dc028a97))
@@ -1311,94 +1496,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 198.12 81.28 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 198.12 71.12 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc3ff77)
-    (property "Reference" "SW53" (at 198.12 74.041 0)
+    (property "Reference" "SW53" (at 198.12 63.881 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "CTRL" (at 198.12 76.3524 0)
+    (property "Value" "CTRL" (at 198.12 66.1924 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 198.12 76.2 0)
+    (property "Footprint" "unikbd:Key_MX" (at 198.12 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 198.12 76.2 0)
+    (property "Datasheet" "" (at 198.12 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 198.12 81.28 0)
+    (property "Comment" "Common to all layouts" (at 198.12 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 198.12 81.28 0)
+    (property "Fitted" "YES" (at 198.12 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 198.12 81.28 0)
+    (property "Substitution OK" "NO" (at 198.12 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 160.02 93.98 0)
+    (property "Component Value" "Key" (at 160.02 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 176.022 120.904 0)
+    (property "Tolerance" "If applicable" (at 176.022 110.744 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 171.958 99.568 0)
+    (property "Manufacturer" "Cherry" (at 171.958 89.408 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 174.752 106.172 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 174.752 96.012 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 175.006 146.05 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 175.006 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 174.244 103.124 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 174.244 92.964 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 171.704 143.256 0)
+    (property "RoHS" "Yes" (at 171.704 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 171.45 149.098 0)
+    (property "Allow Substitution" "Yes" (at 171.45 138.938 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 171.958 151.384 0)
+    (property "Tracking" "No" (at 171.958 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 203.2 81.28 0)
+    (property "BOM Comment" "" (at 203.2 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 193.548 118.11 0)
+    (property "Component Type" "Switch" (at 193.548 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 203.2 81.28 0)
+    (property "Package Type" "" (at 203.2 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 203.2 81.28 0)
+    (property "Package Variant" "" (at 203.2 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 176.022 123.444 0)
+    (property "Number of Pins" "2" (at 176.022 113.284 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 176.022 125.476 0)
+    (property "Temp (Storage)" "" (at 176.022 115.316 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 176.276 128.016 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 176.276 117.856 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 176.276 130.81 0)
+    (property "Temp (Soldering)" "If applicable" (at 176.276 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 176.276 133.35 0)
+    (property "Temp Coeff." "If applicable" (at 176.276 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 176.276 135.89 0)
+    (property "Power Rating" "10 mA" (at 176.276 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 176.276 138.176 0)
+    (property "Material" "If applicable" (at 176.276 128.016 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 176.276 140.462 0)
+    (property "Class" "If applicable" (at 176.276 130.302 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 172.466 156.972 0)
+    (property "Standards Version" "1.1" (at 172.466 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid aecc0751-c51e-4ed3-afee-ec23dfaff04f))
@@ -1412,43 +1597,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 101.6 87.63 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 101.6 81.28 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6c862)
-    (property "Reference" "D36" (at 103.6066 86.4616 90)
+    (property "Reference" "D36" (at 103.6066 80.1116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 103.6066 88.773 90)
+    (property "Value" "1N4148" (at 103.6066 82.423 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 124.46 107.95 0)
+    (property "Footprint" "unikbd:diode-combined" (at 124.46 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 121.92 95.25 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 121.92 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 101.6 87.63 0)
+    (property "Fitted" "Yes" (at 101.6 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 101.6 87.63 0)
+    (property "Substitution OK" " YES " (at 101.6 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 101.6 87.63 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 101.6 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 101.6 87.63 0)
+    (property "Manufacturer" "Diodes, Inc." (at 101.6 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 101.6 87.63 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 101.6 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 101.6 87.63 0)
+    (property "Package" " SOT-23-3 " (at 101.6 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 101.6 87.63 0)
+    (property "LCSC" "C118751" (at 101.6 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 101.6 87.63 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 101.6 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 96.774 72.136 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 141.224 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 126.492 104.648 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 166.37 104.394 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 163.576 107.696 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 169.418 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 171.704 107.442 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 132.08 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 138.43 85.852 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 114.3 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 101.6 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 143.764 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 145.796 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 148.336 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 151.13 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 153.67 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 156.21 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 158.496 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 160.782 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 177.292 106.934 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid af7e5182-2872-4b27-9246-94f69cb6597d))
@@ -1462,43 +1707,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 121.92 87.63 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 121.92 81.28 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6ca8e)
-    (property "Reference" "D40" (at 123.9266 86.4616 90)
+    (property "Reference" "D40" (at 123.9266 80.1116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 123.9266 88.773 90)
+    (property "Value" "1N4148" (at 123.9266 82.423 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 144.78 107.95 0)
+    (property "Footprint" "unikbd:diode-combined" (at 144.78 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 142.24 95.25 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 142.24 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 121.92 87.63 0)
+    (property "Fitted" "Yes" (at 121.92 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 121.92 87.63 0)
+    (property "Substitution OK" " YES " (at 121.92 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 121.92 87.63 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 121.92 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 121.92 87.63 0)
+    (property "Manufacturer" "Diodes, Inc." (at 121.92 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 121.92 87.63 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 121.92 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 121.92 87.63 0)
+    (property "Package" " SOT-23-3 " (at 121.92 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 121.92 87.63 0)
+    (property "LCSC" "C118751" (at 121.92 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 121.92 87.63 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 121.92 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 117.094 72.136 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 161.544 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 146.812 104.648 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 186.69 104.394 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 183.896 107.696 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 189.738 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 192.024 107.442 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 152.4 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 158.75 85.852 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 134.62 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 121.92 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 164.084 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 166.116 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 168.656 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 171.45 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 173.99 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 176.53 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 178.816 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 181.102 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 197.612 106.934 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5f810f18-a00d-48be-8427-16121d4e61d9))
@@ -1512,43 +1817,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 182.88 87.63 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 182.88 81.28 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cb1b)
-    (property "Reference" "D50" (at 184.8866 86.4616 90)
+    (property "Reference" "D50" (at 184.8866 80.1116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 184.8866 88.773 90)
+    (property "Value" "1N4148" (at 184.8866 82.423 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 205.74 107.95 0)
+    (property "Footprint" "unikbd:diode-combined" (at 205.74 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 203.2 95.25 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 203.2 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 182.88 87.63 0)
+    (property "Fitted" "Yes" (at 182.88 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 182.88 87.63 0)
+    (property "Substitution OK" " YES " (at 182.88 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 182.88 87.63 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 182.88 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 182.88 87.63 0)
+    (property "Manufacturer" "Diodes, Inc." (at 182.88 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 182.88 87.63 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 182.88 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 182.88 87.63 0)
+    (property "Package" " SOT-23-3 " (at 182.88 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 182.88 87.63 0)
+    (property "LCSC" "C118751" (at 182.88 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 182.88 87.63 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 182.88 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 178.054 72.136 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 222.504 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 207.772 104.648 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 247.65 104.394 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 244.856 107.696 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 250.698 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 252.984 107.442 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 213.36 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 219.71 85.852 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 195.58 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 182.88 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 225.044 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 227.076 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 229.616 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 232.41 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 234.95 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 237.49 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 239.776 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 242.062 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 258.572 106.934 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9eca1eb6-cf3b-4ff3-9366-97ec543c2efb))
@@ -1562,43 +1927,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 203.2 87.63 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 203.2 81.28 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cb46)
-    (property "Reference" "D54" (at 205.2066 86.4616 90)
+    (property "Reference" "D54" (at 205.2066 80.1116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 205.2066 88.773 90)
+    (property "Value" "1N4148" (at 205.2066 82.423 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 226.06 107.95 0)
+    (property "Footprint" "unikbd:diode-combined" (at 226.06 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 223.52 95.25 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 223.52 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 203.2 87.63 0)
+    (property "Fitted" "Yes" (at 203.2 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 203.2 87.63 0)
+    (property "Substitution OK" " YES " (at 203.2 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 203.2 87.63 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 203.2 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 203.2 87.63 0)
+    (property "Manufacturer" "Diodes, Inc." (at 203.2 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 203.2 87.63 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 203.2 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 203.2 87.63 0)
+    (property "Package" " SOT-23-3 " (at 203.2 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 203.2 87.63 0)
+    (property "LCSC" "C118751" (at 203.2 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 203.2 87.63 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 203.2 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 198.374 72.136 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 242.824 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 228.092 104.648 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 267.97 104.394 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 265.176 107.696 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 271.018 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 273.304 107.442 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 233.68 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 240.03 85.852 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 215.9 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 203.2 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 245.364 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 247.396 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 249.936 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 252.73 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 255.27 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 257.81 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 260.096 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 262.382 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 278.892 106.934 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f2b60548-1c1f-4935-8af7-9a6c4547990a))
@@ -1612,43 +2037,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 223.52 87.63 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 223.52 81.28 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cb6f)
-    (property "Reference" "D58" (at 225.5266 86.4616 90)
+    (property "Reference" "D58" (at 225.5266 80.1116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 225.5266 88.773 90)
+    (property "Value" "1N4148" (at 225.5266 82.423 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 246.38 107.95 0)
+    (property "Footprint" "unikbd:diode-combined" (at 246.38 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 243.84 95.25 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 243.84 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 223.52 87.63 0)
+    (property "Fitted" "Yes" (at 223.52 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 223.52 87.63 0)
+    (property "Substitution OK" " YES " (at 223.52 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 223.52 87.63 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 223.52 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 223.52 87.63 0)
+    (property "Manufacturer" "Diodes, Inc." (at 223.52 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 223.52 87.63 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 223.52 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 223.52 87.63 0)
+    (property "Package" " SOT-23-3 " (at 223.52 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 223.52 87.63 0)
+    (property "LCSC" "C118751" (at 223.52 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 223.52 87.63 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 223.52 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 218.694 72.136 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 263.144 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 248.412 104.648 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 288.29 104.394 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 285.496 107.696 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 291.338 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 293.624 107.442 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 254 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 260.35 85.852 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 236.22 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 223.52 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 265.684 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 267.716 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 270.256 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 273.05 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 275.59 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 278.13 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 280.416 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 282.702 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 299.212 106.934 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid afc077f6-1c0c-4a78-98e2-a5bde8ae0915))
@@ -1662,94 +2147,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 96.52 104.14 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 96.52 93.98 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cd5d)
-    (property "Reference" "SW36" (at 96.52 96.901 0)
+    (property "Reference" "SW36" (at 96.52 86.741 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "P" (at 96.52 99.2124 0)
+    (property "Value" "P" (at 96.52 89.0524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 96.52 99.06 0)
+    (property "Footprint" "unikbd:Key_MX" (at 96.52 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 96.52 99.06 0)
+    (property "Datasheet" "" (at 96.52 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 96.52 104.14 0)
+    (property "Comment" "Common to all layouts" (at 96.52 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 96.52 104.14 0)
+    (property "Fitted" "YES" (at 96.52 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 96.52 104.14 0)
+    (property "Substitution OK" "NO" (at 96.52 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 58.42 116.84 0)
+    (property "Component Value" "Key" (at 58.42 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 74.422 143.764 0)
+    (property "Tolerance" "If applicable" (at 74.422 133.604 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 70.358 122.428 0)
+    (property "Manufacturer" "Cherry" (at 70.358 112.268 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 73.152 129.032 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 73.152 118.872 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 73.406 168.91 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 73.406 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 72.644 125.984 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 72.644 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 70.104 166.116 0)
+    (property "RoHS" "Yes" (at 70.104 155.956 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 69.85 171.958 0)
+    (property "Allow Substitution" "Yes" (at 69.85 161.798 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 70.358 174.244 0)
+    (property "Tracking" "No" (at 70.358 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 101.6 104.14 0)
+    (property "BOM Comment" "" (at 101.6 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 91.948 140.97 0)
+    (property "Component Type" "Switch" (at 91.948 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 101.6 104.14 0)
+    (property "Package Type" "" (at 101.6 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 101.6 104.14 0)
+    (property "Package Variant" "" (at 101.6 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 74.422 146.304 0)
+    (property "Number of Pins" "2" (at 74.422 136.144 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 74.422 148.336 0)
+    (property "Temp (Storage)" "" (at 74.422 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 74.676 150.876 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 74.676 140.716 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 74.676 153.67 0)
+    (property "Temp (Soldering)" "If applicable" (at 74.676 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 74.676 156.21 0)
+    (property "Temp Coeff." "If applicable" (at 74.676 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 74.676 158.75 0)
+    (property "Power Rating" "10 mA" (at 74.676 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 74.676 161.036 0)
+    (property "Material" "If applicable" (at 74.676 150.876 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 74.676 163.322 0)
+    (property "Class" "If applicable" (at 74.676 153.162 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 70.866 179.832 0)
+    (property "Standards Version" "1.1" (at 70.866 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0305ed9e-7984-45d1-8151-ffc3c34f64f7))
@@ -1763,94 +2248,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 137.16 104.14 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 137.16 93.98 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cd64)
-    (property "Reference" "SW43" (at 137.16 96.901 0)
+    (property "Reference" "SW43" (at 137.16 86.741 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Fwd_Slash" (at 137.16 99.2124 0)
+    (property "Value" "Fwd_Slash" (at 137.16 89.0524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 137.16 99.06 0)
+    (property "Footprint" "unikbd:Key_MX" (at 137.16 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 137.16 99.06 0)
+    (property "Datasheet" "" (at 137.16 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 137.16 104.14 0)
+    (property "Comment" "Common to all layouts" (at 137.16 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 137.16 104.14 0)
+    (property "Fitted" "YES" (at 137.16 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 137.16 104.14 0)
+    (property "Substitution OK" "NO" (at 137.16 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 99.06 116.84 0)
+    (property "Component Value" "Key" (at 99.06 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 115.062 143.764 0)
+    (property "Tolerance" "If applicable" (at 115.062 133.604 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 110.998 122.428 0)
+    (property "Manufacturer" "Cherry" (at 110.998 112.268 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 113.792 129.032 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 113.792 118.872 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 114.046 168.91 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 114.046 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 113.284 125.984 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 113.284 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 110.744 166.116 0)
+    (property "RoHS" "Yes" (at 110.744 155.956 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 110.49 171.958 0)
+    (property "Allow Substitution" "Yes" (at 110.49 161.798 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 110.998 174.244 0)
+    (property "Tracking" "No" (at 110.998 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 142.24 104.14 0)
+    (property "BOM Comment" "" (at 142.24 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 132.588 140.97 0)
+    (property "Component Type" "Switch" (at 132.588 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 142.24 104.14 0)
+    (property "Package Type" "" (at 142.24 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 142.24 104.14 0)
+    (property "Package Variant" "" (at 142.24 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 115.062 146.304 0)
+    (property "Number of Pins" "2" (at 115.062 136.144 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 115.062 148.336 0)
+    (property "Temp (Storage)" "" (at 115.062 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 115.316 150.876 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 115.316 140.716 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 115.316 153.67 0)
+    (property "Temp (Soldering)" "If applicable" (at 115.316 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 115.316 156.21 0)
+    (property "Temp Coeff." "If applicable" (at 115.316 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 115.316 158.75 0)
+    (property "Power Rating" "10 mA" (at 115.316 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 115.316 161.036 0)
+    (property "Material" "If applicable" (at 115.316 150.876 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 115.316 163.322 0)
+    (property "Class" "If applicable" (at 115.316 153.162 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 111.506 179.832 0)
+    (property "Standards Version" "1.1" (at 111.506 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 137296bf-9b96-49aa-bc1a-df611e3f1e1e))
@@ -1864,94 +2349,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 116.84 104.14 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 116.84 93.98 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cd6b)
-    (property "Reference" "SW40" (at 116.84 96.901 0)
+    (property "Reference" "SW40" (at 116.84 86.741 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Semicolon" (at 116.84 99.2124 0)
+    (property "Value" "Semicolon" (at 116.84 89.0524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 116.84 99.06 0)
+    (property "Footprint" "unikbd:Key_MX" (at 116.84 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 116.84 99.06 0)
+    (property "Datasheet" "" (at 116.84 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 116.84 104.14 0)
+    (property "Comment" "Common to all layouts" (at 116.84 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 116.84 104.14 0)
+    (property "Fitted" "YES" (at 116.84 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 116.84 104.14 0)
+    (property "Substitution OK" "NO" (at 116.84 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 78.74 116.84 0)
+    (property "Component Value" "Key" (at 78.74 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 94.742 143.764 0)
+    (property "Tolerance" "If applicable" (at 94.742 133.604 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 90.678 122.428 0)
+    (property "Manufacturer" "Cherry" (at 90.678 112.268 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 93.472 129.032 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 93.472 118.872 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 93.726 168.91 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 93.726 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 92.964 125.984 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 92.964 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 90.424 166.116 0)
+    (property "RoHS" "Yes" (at 90.424 155.956 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 90.17 171.958 0)
+    (property "Allow Substitution" "Yes" (at 90.17 161.798 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 90.678 174.244 0)
+    (property "Tracking" "No" (at 90.678 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 121.92 104.14 0)
+    (property "BOM Comment" "" (at 121.92 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 112.268 140.97 0)
+    (property "Component Type" "Switch" (at 112.268 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 121.92 104.14 0)
+    (property "Package Type" "" (at 121.92 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 121.92 104.14 0)
+    (property "Package Variant" "" (at 121.92 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 94.742 146.304 0)
+    (property "Number of Pins" "2" (at 94.742 136.144 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 94.742 148.336 0)
+    (property "Temp (Storage)" "" (at 94.742 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 94.996 150.876 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 94.996 140.716 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 94.996 153.67 0)
+    (property "Temp (Soldering)" "If applicable" (at 94.996 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 94.996 156.21 0)
+    (property "Temp Coeff." "If applicable" (at 94.996 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 94.996 158.75 0)
+    (property "Power Rating" "10 mA" (at 94.996 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 94.996 161.036 0)
+    (property "Material" "If applicable" (at 94.996 150.876 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 94.996 163.322 0)
+    (property "Class" "If applicable" (at 94.996 153.162 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 91.186 179.832 0)
+    (property "Standards Version" "1.1" (at 91.186 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3c052246-901f-45fe-8b62-0edb0bbe98b1))
@@ -1965,94 +2450,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 8U Spacebar Style A") (at 157.48 104.14 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 8U Spacebar Style A") (at 157.48 93.98 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cd72)
-    (property "Reference" "SW46" (at 157.48 96.901 0)
+    (property "Reference" "SW46" (at 157.48 86.741 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "SPACE" (at 157.48 99.2124 0)
+    (property "Value" "SPACE" (at 157.48 89.0524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX_Spacebar_5.25" (at 157.48 99.06 0)
+    (property "Footprint" "unikbd:Key_MX_Spacebar_5.25" (at 157.48 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 157.48 99.06 0)
+    (property "Datasheet" "" (at 157.48 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 157.48 104.14 0)
+    (property "Comment" "Common to all layouts" (at 157.48 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 157.48 104.14 0)
+    (property "Fitted" "YES" (at 157.48 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 157.48 104.14 0)
+    (property "Substitution OK" "NO" (at 157.48 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 119.38 116.84 0)
+    (property "Component Value" "Key" (at 119.38 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 135.382 143.764 0)
+    (property "Tolerance" "If applicable" (at 135.382 133.604 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 131.318 122.428 0)
+    (property "Manufacturer" "Cherry" (at 131.318 112.268 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 134.112 129.032 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 134.112 118.872 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 134.366 168.91 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 134.366 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 133.604 125.984 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 133.604 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 131.064 166.116 0)
+    (property "RoHS" "Yes" (at 131.064 155.956 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 130.81 171.958 0)
+    (property "Allow Substitution" "Yes" (at 130.81 161.798 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 131.318 174.244 0)
+    (property "Tracking" "No" (at 131.318 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "8U spacebar" (at 162.56 104.14 0)
+    (property "BOM Comment" "8U spacebar" (at 162.56 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 152.908 140.97 0)
+    (property "Component Type" "Switch" (at 152.908 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 162.56 104.14 0)
+    (property "Package Type" "" (at 162.56 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 162.56 104.14 0)
+    (property "Package Variant" "" (at 162.56 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 135.382 146.304 0)
+    (property "Number of Pins" "2" (at 135.382 136.144 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 135.382 148.336 0)
+    (property "Temp (Storage)" "" (at 135.382 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 135.636 150.876 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 135.636 140.716 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 135.636 153.67 0)
+    (property "Temp (Soldering)" "If applicable" (at 135.636 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 135.636 156.21 0)
+    (property "Temp Coeff." "If applicable" (at 135.636 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 135.636 158.75 0)
+    (property "Power Rating" "10 mA" (at 135.636 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 135.636 161.036 0)
+    (property "Material" "If applicable" (at 135.636 150.876 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 135.636 163.322 0)
+    (property "Class" "If applicable" (at 135.636 153.162 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 131.826 179.832 0)
+    (property "Standards Version" "1.1" (at 131.826 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 99902edb-eeba-4bd1-91c2-06e990534a26))
@@ -2066,94 +2551,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 177.8 104.14 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 177.8 93.98 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cd79)
-    (property "Reference" "SW50" (at 177.8 96.901 0)
+    (property "Reference" "SW50" (at 177.8 86.741 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Z" (at 177.8 99.2124 0)
+    (property "Value" "Z" (at 177.8 89.0524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 177.8 99.06 0)
+    (property "Footprint" "unikbd:Key_MX" (at 177.8 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 177.8 99.06 0)
+    (property "Datasheet" "" (at 177.8 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 177.8 104.14 0)
+    (property "Comment" "Common to all layouts" (at 177.8 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 177.8 104.14 0)
+    (property "Fitted" "YES" (at 177.8 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 177.8 104.14 0)
+    (property "Substitution OK" "NO" (at 177.8 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 139.7 116.84 0)
+    (property "Component Value" "Key" (at 139.7 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 155.702 143.764 0)
+    (property "Tolerance" "If applicable" (at 155.702 133.604 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 151.638 122.428 0)
+    (property "Manufacturer" "Cherry" (at 151.638 112.268 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 154.432 129.032 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 154.432 118.872 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 154.686 168.91 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 154.686 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 153.924 125.984 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 153.924 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 151.384 166.116 0)
+    (property "RoHS" "Yes" (at 151.384 155.956 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 151.13 171.958 0)
+    (property "Allow Substitution" "Yes" (at 151.13 161.798 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 151.638 174.244 0)
+    (property "Tracking" "No" (at 151.638 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 182.88 104.14 0)
+    (property "BOM Comment" "" (at 182.88 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 173.228 140.97 0)
+    (property "Component Type" "Switch" (at 173.228 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 182.88 104.14 0)
+    (property "Package Type" "" (at 182.88 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 182.88 104.14 0)
+    (property "Package Variant" "" (at 182.88 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 155.702 146.304 0)
+    (property "Number of Pins" "2" (at 155.702 136.144 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 155.702 148.336 0)
+    (property "Temp (Storage)" "" (at 155.702 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 155.956 150.876 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 155.956 140.716 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 155.956 153.67 0)
+    (property "Temp (Soldering)" "If applicable" (at 155.956 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 155.956 156.21 0)
+    (property "Temp Coeff." "If applicable" (at 155.956 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 155.956 158.75 0)
+    (property "Power Rating" "10 mA" (at 155.956 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 155.956 161.036 0)
+    (property "Material" "If applicable" (at 155.956 150.876 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 155.956 163.322 0)
+    (property "Class" "If applicable" (at 155.956 153.162 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 152.146 179.832 0)
+    (property "Standards Version" "1.1" (at 152.146 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9bb086f1-b43d-4e29-b6f4-68b238806ffe))
@@ -2167,94 +2652,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 218.44 104.14 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 218.44 93.98 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cd80)
-    (property "Reference" "SW58" (at 218.44 96.901 0)
+    (property "Reference" "SW58" (at 218.44 86.741 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Q" (at 218.44 99.2124 0)
+    (property "Value" "Q" (at 218.44 89.0524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 218.44 99.06 0)
+    (property "Footprint" "unikbd:Key_MX" (at 218.44 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 218.44 99.06 0)
+    (property "Datasheet" "" (at 218.44 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 218.44 104.14 0)
+    (property "Comment" "Common to all layouts" (at 218.44 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 218.44 104.14 0)
+    (property "Fitted" "YES" (at 218.44 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 218.44 104.14 0)
+    (property "Substitution OK" "NO" (at 218.44 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 180.34 116.84 0)
+    (property "Component Value" "Key" (at 180.34 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 196.342 143.764 0)
+    (property "Tolerance" "If applicable" (at 196.342 133.604 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 192.278 122.428 0)
+    (property "Manufacturer" "Cherry" (at 192.278 112.268 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 195.072 129.032 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 195.072 118.872 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 195.326 168.91 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 195.326 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 194.564 125.984 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 194.564 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 192.024 166.116 0)
+    (property "RoHS" "Yes" (at 192.024 155.956 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 191.77 171.958 0)
+    (property "Allow Substitution" "Yes" (at 191.77 161.798 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 192.278 174.244 0)
+    (property "Tracking" "No" (at 192.278 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 223.52 104.14 0)
+    (property "BOM Comment" "" (at 223.52 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 213.868 140.97 0)
+    (property "Component Type" "Switch" (at 213.868 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 223.52 104.14 0)
+    (property "Package Type" "" (at 223.52 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 223.52 104.14 0)
+    (property "Package Variant" "" (at 223.52 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 196.342 146.304 0)
+    (property "Number of Pins" "2" (at 196.342 136.144 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 196.342 148.336 0)
+    (property "Temp (Storage)" "" (at 196.342 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 196.596 150.876 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 196.596 140.716 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 196.596 153.67 0)
+    (property "Temp (Soldering)" "If applicable" (at 196.596 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 196.596 156.21 0)
+    (property "Temp Coeff." "If applicable" (at 196.596 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 196.596 158.75 0)
+    (property "Power Rating" "10 mA" (at 196.596 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 196.596 161.036 0)
+    (property "Material" "If applicable" (at 196.596 150.876 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 196.596 163.322 0)
+    (property "Class" "If applicable" (at 196.596 153.162 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 192.786 179.832 0)
+    (property "Standards Version" "1.1" (at 192.786 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9055a9dd-66c7-4d61-8fad-29bb92f116a8))
@@ -2268,94 +2753,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 198.12 104.14 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 198.12 93.98 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cd87)
-    (property "Reference" "SW54" (at 198.12 96.901 0)
+    (property "Reference" "SW54" (at 198.12 86.741 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "A" (at 198.12 99.2124 0)
+    (property "Value" "A" (at 198.12 89.0524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 198.12 99.06 0)
+    (property "Footprint" "unikbd:Key_MX" (at 198.12 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 198.12 99.06 0)
+    (property "Datasheet" "" (at 198.12 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 198.12 104.14 0)
+    (property "Comment" "Common to all layouts" (at 198.12 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 198.12 104.14 0)
+    (property "Fitted" "YES" (at 198.12 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 198.12 104.14 0)
+    (property "Substitution OK" "NO" (at 198.12 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 160.02 116.84 0)
+    (property "Component Value" "Key" (at 160.02 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 176.022 143.764 0)
+    (property "Tolerance" "If applicable" (at 176.022 133.604 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 171.958 122.428 0)
+    (property "Manufacturer" "Cherry" (at 171.958 112.268 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 174.752 129.032 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 174.752 118.872 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 175.006 168.91 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 175.006 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 174.244 125.984 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 174.244 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 171.704 166.116 0)
+    (property "RoHS" "Yes" (at 171.704 155.956 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 171.45 171.958 0)
+    (property "Allow Substitution" "Yes" (at 171.45 161.798 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 171.958 174.244 0)
+    (property "Tracking" "No" (at 171.958 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 203.2 104.14 0)
+    (property "BOM Comment" "" (at 203.2 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 193.548 140.97 0)
+    (property "Component Type" "Switch" (at 193.548 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 203.2 104.14 0)
+    (property "Package Type" "" (at 203.2 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 203.2 104.14 0)
+    (property "Package Variant" "" (at 203.2 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 176.022 146.304 0)
+    (property "Number of Pins" "2" (at 176.022 136.144 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 176.022 148.336 0)
+    (property "Temp (Storage)" "" (at 176.022 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 176.276 150.876 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 176.276 140.716 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 176.276 153.67 0)
+    (property "Temp (Soldering)" "If applicable" (at 176.276 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 176.276 156.21 0)
+    (property "Temp Coeff." "If applicable" (at 176.276 146.05 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 176.276 158.75 0)
+    (property "Power Rating" "10 mA" (at 176.276 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 176.276 161.036 0)
+    (property "Material" "If applicable" (at 176.276 150.876 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 176.276 163.322 0)
+    (property "Class" "If applicable" (at 176.276 153.162 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 172.466 179.832 0)
+    (property "Standards Version" "1.1" (at 172.466 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 471823c5-969b-47ba-aabd-5a06e40e58d0))
@@ -2369,43 +2854,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 101.6 110.49 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 101.6 104.14 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cd8e)
-    (property "Reference" "D37" (at 103.6066 109.3216 90)
+    (property "Reference" "D37" (at 103.6066 102.9716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 103.6066 111.633 90)
+    (property "Value" "1N4148" (at 103.6066 105.283 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 124.46 130.81 0)
+    (property "Footprint" "unikbd:diode-combined" (at 124.46 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 121.92 118.11 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 121.92 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 101.6 110.49 0)
+    (property "Fitted" "Yes" (at 101.6 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 101.6 110.49 0)
+    (property "Substitution OK" " YES " (at 101.6 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 101.6 110.49 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 101.6 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 101.6 110.49 0)
+    (property "Manufacturer" "Diodes, Inc." (at 101.6 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 101.6 110.49 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 101.6 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 101.6 110.49 0)
+    (property "Package" " SOT-23-3 " (at 101.6 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 101.6 110.49 0)
+    (property "LCSC" "C118751" (at 101.6 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 101.6 110.49 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 101.6 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 96.774 94.996 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 141.224 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 126.492 127.508 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 166.37 127.254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 163.576 130.556 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 169.418 130.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 171.704 130.302 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 132.08 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 138.43 108.712 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 114.3 152.4 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 101.6 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 143.764 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 145.796 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 148.336 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 151.13 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 153.67 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 156.21 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 158.496 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 160.782 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 177.292 129.794 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 250ac3f3-92cd-4694-a94f-0c8f50e4c29e))
@@ -2419,43 +2964,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 121.92 110.49 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 121.92 104.14 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cd9c)
-    (property "Reference" "D41" (at 123.9266 109.3216 90)
+    (property "Reference" "D41" (at 123.9266 102.9716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 123.9266 111.633 90)
+    (property "Value" "1N4148" (at 123.9266 105.283 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 144.78 130.81 0)
+    (property "Footprint" "unikbd:diode-combined" (at 144.78 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 142.24 118.11 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 142.24 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 121.92 110.49 0)
+    (property "Fitted" "Yes" (at 121.92 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 121.92 110.49 0)
+    (property "Substitution OK" " YES " (at 121.92 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 121.92 110.49 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 121.92 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 121.92 110.49 0)
+    (property "Manufacturer" "Diodes, Inc." (at 121.92 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 121.92 110.49 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 121.92 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 121.92 110.49 0)
+    (property "Package" " SOT-23-3 " (at 121.92 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 121.92 110.49 0)
+    (property "LCSC" "C118751" (at 121.92 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 121.92 110.49 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 121.92 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 117.094 94.996 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 161.544 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 146.812 127.508 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 186.69 127.254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 183.896 130.556 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 189.738 130.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 192.024 130.302 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 152.4 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 158.75 108.712 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 134.62 152.4 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 121.92 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 164.084 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 166.116 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 168.656 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 171.45 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 173.99 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 176.53 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 178.816 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 181.102 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 197.612 129.794 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 659f5c08-c34a-40f6-9359-38cb8608ddd1))
@@ -2469,43 +3074,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 142.24 110.49 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 142.24 104.14 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cda3)
-    (property "Reference" "D44" (at 144.2466 109.3216 90)
+    (property "Reference" "D44" (at 144.2466 102.9716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 144.2466 111.633 90)
+    (property "Value" "1N4148" (at 144.2466 105.283 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 165.1 130.81 0)
+    (property "Footprint" "unikbd:diode-combined" (at 165.1 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 162.56 118.11 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 162.56 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 142.24 110.49 0)
+    (property "Fitted" "Yes" (at 142.24 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 142.24 110.49 0)
+    (property "Substitution OK" " YES " (at 142.24 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 142.24 110.49 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 142.24 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 142.24 110.49 0)
+    (property "Manufacturer" "Diodes, Inc." (at 142.24 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 142.24 110.49 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 142.24 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 142.24 110.49 0)
+    (property "Package" " SOT-23-3 " (at 142.24 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 142.24 110.49 0)
+    (property "LCSC" "C118751" (at 142.24 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 142.24 110.49 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 142.24 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 137.414 94.996 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 181.864 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 167.132 127.508 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 207.01 127.254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 204.216 130.556 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 210.058 130.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 212.344 130.302 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 172.72 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 179.07 108.712 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 154.94 152.4 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 142.24 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 184.404 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 186.436 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 188.976 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 191.77 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 194.31 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 196.85 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 199.136 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 201.422 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 217.932 129.794 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 09f4594a-e59d-4f10-af7b-823f8d694819))
@@ -2519,43 +3184,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 162.56 110.49 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 162.56 104.14 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cdaa)
-    (property "Reference" "D47" (at 164.5666 109.3216 90)
+    (property "Reference" "D47" (at 164.5666 102.9716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 164.5666 111.633 90)
+    (property "Value" "1N4148" (at 164.5666 105.283 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 185.42 130.81 0)
+    (property "Footprint" "unikbd:diode-combined" (at 185.42 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 182.88 118.11 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 182.88 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 162.56 110.49 0)
+    (property "Fitted" "Yes" (at 162.56 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 162.56 110.49 0)
+    (property "Substitution OK" " YES " (at 162.56 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 162.56 110.49 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 162.56 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 162.56 110.49 0)
+    (property "Manufacturer" "Diodes, Inc." (at 162.56 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 162.56 110.49 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 162.56 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 162.56 110.49 0)
+    (property "Package" " SOT-23-3 " (at 162.56 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 162.56 110.49 0)
+    (property "LCSC" "C118751" (at 162.56 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 162.56 110.49 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 162.56 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 157.734 94.996 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 202.184 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 187.452 127.508 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 227.33 127.254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 224.536 130.556 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 230.378 130.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 232.664 130.302 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 193.04 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 199.39 108.712 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 175.26 152.4 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 162.56 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 204.724 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 206.756 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 209.296 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 212.09 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 214.63 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 217.17 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 219.456 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 221.742 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 238.252 129.794 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b504d503-0d4d-4bd3-b599-349540457e40))
@@ -2569,43 +3294,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 182.88 110.49 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 182.88 104.14 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cdb1)
-    (property "Reference" "D51" (at 184.8866 109.3216 90)
+    (property "Reference" "D51" (at 184.8866 102.9716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 184.8866 111.633 90)
+    (property "Value" "1N4148" (at 184.8866 105.283 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 205.74 130.81 0)
+    (property "Footprint" "unikbd:diode-combined" (at 205.74 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 203.2 118.11 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 203.2 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 182.88 110.49 0)
+    (property "Fitted" "Yes" (at 182.88 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 182.88 110.49 0)
+    (property "Substitution OK" " YES " (at 182.88 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 182.88 110.49 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 182.88 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 182.88 110.49 0)
+    (property "Manufacturer" "Diodes, Inc." (at 182.88 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 182.88 110.49 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 182.88 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 182.88 110.49 0)
+    (property "Package" " SOT-23-3 " (at 182.88 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 182.88 110.49 0)
+    (property "LCSC" "C118751" (at 182.88 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 182.88 110.49 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 182.88 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 178.054 94.996 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 222.504 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 207.772 127.508 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 247.65 127.254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 244.856 130.556 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 250.698 130.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 252.984 130.302 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 213.36 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 219.71 108.712 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 195.58 152.4 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 182.88 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 225.044 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 227.076 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 229.616 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 232.41 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 234.95 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 237.49 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 239.776 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 242.062 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 258.572 129.794 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1c1c3901-728e-4c38-a4a5-4b4041948354))
@@ -2619,43 +3404,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 203.2 110.49 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 203.2 104.14 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cdb8)
-    (property "Reference" "D55" (at 205.2066 109.3216 90)
+    (property "Reference" "D55" (at 205.2066 102.9716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 205.2066 111.633 90)
+    (property "Value" "1N4148" (at 205.2066 105.283 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 226.06 130.81 0)
+    (property "Footprint" "unikbd:diode-combined" (at 226.06 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 223.52 118.11 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 223.52 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 203.2 110.49 0)
+    (property "Fitted" "Yes" (at 203.2 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 203.2 110.49 0)
+    (property "Substitution OK" " YES " (at 203.2 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 203.2 110.49 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 203.2 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 203.2 110.49 0)
+    (property "Manufacturer" "Diodes, Inc." (at 203.2 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 203.2 110.49 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 203.2 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 203.2 110.49 0)
+    (property "Package" " SOT-23-3 " (at 203.2 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 203.2 110.49 0)
+    (property "LCSC" "C118751" (at 203.2 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 203.2 110.49 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 203.2 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 198.374 94.996 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 242.824 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 228.092 127.508 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 267.97 127.254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 265.176 130.556 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 271.018 130.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 273.304 130.302 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 233.68 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 240.03 108.712 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 215.9 152.4 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 203.2 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 245.364 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 247.396 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 249.936 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 252.73 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 255.27 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 257.81 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 260.096 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 262.382 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 278.892 129.794 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f92c428b-1cc1-41bc-91e4-99500dfcd134))
@@ -2669,43 +3514,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 223.52 110.49 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 223.52 104.14 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cdbf)
-    (property "Reference" "D59" (at 225.5266 109.3216 90)
+    (property "Reference" "D59" (at 225.5266 102.9716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 225.5266 111.633 90)
+    (property "Value" "1N4148" (at 225.5266 105.283 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 246.38 130.81 0)
+    (property "Footprint" "unikbd:diode-combined" (at 246.38 124.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 243.84 118.11 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 243.84 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 223.52 110.49 0)
+    (property "Fitted" "Yes" (at 223.52 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 223.52 110.49 0)
+    (property "Substitution OK" " YES " (at 223.52 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 223.52 110.49 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 223.52 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 223.52 110.49 0)
+    (property "Manufacturer" "Diodes, Inc." (at 223.52 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 223.52 110.49 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 223.52 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 223.52 110.49 0)
+    (property "Package" " SOT-23-3 " (at 223.52 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 223.52 110.49 0)
+    (property "LCSC" "C118751" (at 223.52 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 223.52 110.49 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 223.52 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 218.694 94.996 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 263.144 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 248.412 127.508 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 288.29 127.254 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 285.496 130.556 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 291.338 130.81 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 293.624 130.302 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 254 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 260.35 108.712 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 236.22 152.4 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 223.52 104.14 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 265.684 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 267.716 126.238 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 270.256 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 273.05 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 275.59 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 278.13 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 280.416 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 282.702 125.984 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 299.212 129.794 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 02659498-c412-46be-b15f-61a41eee3835))
@@ -2719,91 +3624,91 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 76.2 127 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 76.2 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6ced6)
-    (property "Reference" "SW33" (at 76.2 119.761 0)
+    (property "Reference" "SW33" (at 76.2 112.141 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Break" (at 76.2 122.0724 0)
+    (property "Value" "Break" (at 76.2 114.4524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 76.2 121.92 0)
+    (property "Footprint" "unikbd:Key_MX" (at 76.2 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 76.2 121.92 0)
+    (property "Datasheet" "" (at 76.2 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "Yes" (at 76.2 127 0)
+    (property "Fitted" "Yes" (at 76.2 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 76.2 127 0)
+    (property "Substitution OK" "NO" (at 76.2 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 38.1 139.7 0)
+    (property "Component Value" "Key" (at 38.1 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 54.102 166.624 0)
+    (property "Tolerance" "If applicable" (at 54.102 159.004 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 50.038 145.288 0)
+    (property "Manufacturer" "Cherry" (at 50.038 137.668 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 52.832 151.892 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 52.832 144.272 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 53.086 191.77 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 53.086 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 52.324 148.844 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 52.324 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 49.784 188.976 0)
+    (property "RoHS" "Yes" (at 49.784 181.356 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 49.53 194.818 0)
+    (property "Allow Substitution" "Yes" (at 49.53 187.198 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 50.038 197.104 0)
+    (property "Tracking" "No" (at 50.038 189.484 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 81.28 127 0)
+    (property "BOM Comment" "" (at 81.28 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 71.628 163.83 0)
+    (property "Component Type" "Switch" (at 71.628 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 81.28 127 0)
+    (property "Package Type" "" (at 81.28 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 81.28 127 0)
+    (property "Package Variant" "" (at 81.28 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 54.102 169.164 0)
+    (property "Number of Pins" "2" (at 54.102 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 54.102 171.196 0)
+    (property "Temp (Storage)" "" (at 54.102 163.576 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 54.356 173.736 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 54.356 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 54.356 176.53 0)
+    (property "Temp (Soldering)" "If applicable" (at 54.356 168.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 54.356 179.07 0)
+    (property "Temp Coeff." "If applicable" (at 54.356 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 54.356 181.61 0)
+    (property "Power Rating" "10 mA" (at 54.356 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 54.356 183.896 0)
+    (property "Material" "If applicable" (at 54.356 176.276 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 54.356 186.182 0)
+    (property "Class" "If applicable" (at 54.356 178.562 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 50.546 202.692 0)
+    (property "Standards Version" "1.1" (at 50.546 195.072 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid db3b1a74-7ca5-451f-aa94-6637825d00db))
@@ -2817,94 +3722,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 96.52 127 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 96.52 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cedd)
-    (property "Reference" "SW37" (at 96.52 119.761 0)
+    (property "Reference" "SW37" (at 96.52 112.141 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Comma" (at 96.52 122.0724 0)
+    (property "Value" "Comma" (at 96.52 114.4524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 96.52 121.92 0)
+    (property "Footprint" "unikbd:Key_MX" (at 96.52 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 96.52 121.92 0)
+    (property "Datasheet" "" (at 96.52 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 96.52 127 0)
+    (property "Comment" "Common to all layouts" (at 96.52 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 96.52 127 0)
+    (property "Fitted" "YES" (at 96.52 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 96.52 127 0)
+    (property "Substitution OK" "NO" (at 96.52 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 58.42 139.7 0)
+    (property "Component Value" "Key" (at 58.42 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 74.422 166.624 0)
+    (property "Tolerance" "If applicable" (at 74.422 159.004 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 70.358 145.288 0)
+    (property "Manufacturer" "Cherry" (at 70.358 137.668 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 73.152 151.892 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 73.152 144.272 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 73.406 191.77 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 73.406 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 72.644 148.844 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 72.644 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 70.104 188.976 0)
+    (property "RoHS" "Yes" (at 70.104 181.356 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 69.85 194.818 0)
+    (property "Allow Substitution" "Yes" (at 69.85 187.198 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 70.358 197.104 0)
+    (property "Tracking" "No" (at 70.358 189.484 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 101.6 127 0)
+    (property "BOM Comment" "" (at 101.6 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 91.948 163.83 0)
+    (property "Component Type" "Switch" (at 91.948 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 101.6 127 0)
+    (property "Package Type" "" (at 101.6 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 101.6 127 0)
+    (property "Package Variant" "" (at 101.6 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 74.422 169.164 0)
+    (property "Number of Pins" "2" (at 74.422 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 74.422 171.196 0)
+    (property "Temp (Storage)" "" (at 74.422 163.576 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 74.676 173.736 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 74.676 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 74.676 176.53 0)
+    (property "Temp (Soldering)" "If applicable" (at 74.676 168.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 74.676 179.07 0)
+    (property "Temp Coeff." "If applicable" (at 74.676 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 74.676 181.61 0)
+    (property "Power Rating" "10 mA" (at 74.676 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 74.676 183.896 0)
+    (property "Material" "If applicable" (at 74.676 176.276 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 74.676 186.182 0)
+    (property "Class" "If applicable" (at 74.676 178.562 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 70.866 202.692 0)
+    (property "Standards Version" "1.1" (at 70.866 195.072 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 361d9632-a525-437c-93dc-8c47d8853d63))
@@ -2918,94 +3823,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 137.16 127 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 137.16 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cee4)
-    (property "Reference" "SW44" (at 137.16 119.761 0)
+    (property "Reference" "SW44" (at 137.16 112.141 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "N" (at 137.16 122.0724 0)
+    (property "Value" "N" (at 137.16 114.4524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 137.16 121.92 0)
+    (property "Footprint" "unikbd:Key_MX" (at 137.16 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 137.16 121.92 0)
+    (property "Datasheet" "" (at 137.16 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 137.16 127 0)
+    (property "Comment" "Common to all layouts" (at 137.16 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 137.16 127 0)
+    (property "Fitted" "YES" (at 137.16 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 137.16 127 0)
+    (property "Substitution OK" "NO" (at 137.16 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 99.06 139.7 0)
+    (property "Component Value" "Key" (at 99.06 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 115.062 166.624 0)
+    (property "Tolerance" "If applicable" (at 115.062 159.004 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 110.998 145.288 0)
+    (property "Manufacturer" "Cherry" (at 110.998 137.668 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 113.792 151.892 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 113.792 144.272 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 114.046 191.77 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 114.046 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 113.284 148.844 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 113.284 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 110.744 188.976 0)
+    (property "RoHS" "Yes" (at 110.744 181.356 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 110.49 194.818 0)
+    (property "Allow Substitution" "Yes" (at 110.49 187.198 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 110.998 197.104 0)
+    (property "Tracking" "No" (at 110.998 189.484 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 142.24 127 0)
+    (property "BOM Comment" "" (at 142.24 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 132.588 163.83 0)
+    (property "Component Type" "Switch" (at 132.588 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 142.24 127 0)
+    (property "Package Type" "" (at 142.24 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 142.24 127 0)
+    (property "Package Variant" "" (at 142.24 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 115.062 169.164 0)
+    (property "Number of Pins" "2" (at 115.062 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 115.062 171.196 0)
+    (property "Temp (Storage)" "" (at 115.062 163.576 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 115.316 173.736 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 115.316 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 115.316 176.53 0)
+    (property "Temp (Soldering)" "If applicable" (at 115.316 168.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 115.316 179.07 0)
+    (property "Temp Coeff." "If applicable" (at 115.316 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 115.316 181.61 0)
+    (property "Power Rating" "10 mA" (at 115.316 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 115.316 183.896 0)
+    (property "Material" "If applicable" (at 115.316 176.276 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 115.316 186.182 0)
+    (property "Class" "If applicable" (at 115.316 178.562 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 111.506 202.692 0)
+    (property "Standards Version" "1.1" (at 111.506 195.072 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a4eaa56f-15d9-43b7-80d1-96d9233ee42f))
@@ -3019,94 +3924,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 116.84 127 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 116.84 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6ceeb)
-    (property "Reference" "SW41" (at 116.84 119.761 0)
+    (property "Reference" "SW41" (at 116.84 112.141 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "M" (at 116.84 122.0724 0)
+    (property "Value" "M" (at 116.84 114.4524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 116.84 121.92 0)
+    (property "Footprint" "unikbd:Key_MX" (at 116.84 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 116.84 121.92 0)
+    (property "Datasheet" "" (at 116.84 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 116.84 127 0)
+    (property "Comment" "Common to all layouts" (at 116.84 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 116.84 127 0)
+    (property "Fitted" "YES" (at 116.84 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 116.84 127 0)
+    (property "Substitution OK" "NO" (at 116.84 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 78.74 139.7 0)
+    (property "Component Value" "Key" (at 78.74 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 94.742 166.624 0)
+    (property "Tolerance" "If applicable" (at 94.742 159.004 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 90.678 145.288 0)
+    (property "Manufacturer" "Cherry" (at 90.678 137.668 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 93.472 151.892 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 93.472 144.272 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 93.726 191.77 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 93.726 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 92.964 148.844 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 92.964 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 90.424 188.976 0)
+    (property "RoHS" "Yes" (at 90.424 181.356 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 90.17 194.818 0)
+    (property "Allow Substitution" "Yes" (at 90.17 187.198 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 90.678 197.104 0)
+    (property "Tracking" "No" (at 90.678 189.484 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 121.92 127 0)
+    (property "BOM Comment" "" (at 121.92 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 112.268 163.83 0)
+    (property "Component Type" "Switch" (at 112.268 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 121.92 127 0)
+    (property "Package Type" "" (at 121.92 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 121.92 127 0)
+    (property "Package Variant" "" (at 121.92 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 94.742 169.164 0)
+    (property "Number of Pins" "2" (at 94.742 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 94.742 171.196 0)
+    (property "Temp (Storage)" "" (at 94.742 163.576 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 94.996 173.736 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 94.996 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 94.996 176.53 0)
+    (property "Temp (Soldering)" "If applicable" (at 94.996 168.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 94.996 179.07 0)
+    (property "Temp Coeff." "If applicable" (at 94.996 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 94.996 181.61 0)
+    (property "Power Rating" "10 mA" (at 94.996 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 94.996 183.896 0)
+    (property "Material" "If applicable" (at 94.996 176.276 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 94.996 186.182 0)
+    (property "Class" "If applicable" (at 94.996 178.562 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 91.186 202.692 0)
+    (property "Standards Version" "1.1" (at 91.186 195.072 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2c9f1791-da41-4254-b69c-4c637c0229df))
@@ -3120,94 +4025,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 157.48 127 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 157.48 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cef2)
-    (property "Reference" "SW47" (at 157.48 119.761 0)
+    (property "Reference" "SW47" (at 157.48 112.141 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "B" (at 157.48 122.0724 0)
+    (property "Value" "B" (at 157.48 114.4524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 157.48 121.92 0)
+    (property "Footprint" "unikbd:Key_MX" (at 157.48 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 157.48 121.92 0)
+    (property "Datasheet" "" (at 157.48 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 157.48 127 0)
+    (property "Comment" "Common to all layouts" (at 157.48 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 157.48 127 0)
+    (property "Fitted" "YES" (at 157.48 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 157.48 127 0)
+    (property "Substitution OK" "NO" (at 157.48 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 119.38 139.7 0)
+    (property "Component Value" "Key" (at 119.38 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 135.382 166.624 0)
+    (property "Tolerance" "If applicable" (at 135.382 159.004 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 131.318 145.288 0)
+    (property "Manufacturer" "Cherry" (at 131.318 137.668 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 134.112 151.892 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 134.112 144.272 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 134.366 191.77 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 134.366 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 133.604 148.844 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 133.604 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 131.064 188.976 0)
+    (property "RoHS" "Yes" (at 131.064 181.356 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 130.81 194.818 0)
+    (property "Allow Substitution" "Yes" (at 130.81 187.198 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 131.318 197.104 0)
+    (property "Tracking" "No" (at 131.318 189.484 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 162.56 127 0)
+    (property "BOM Comment" "" (at 162.56 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 152.908 163.83 0)
+    (property "Component Type" "Switch" (at 152.908 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 162.56 127 0)
+    (property "Package Type" "" (at 162.56 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 162.56 127 0)
+    (property "Package Variant" "" (at 162.56 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 135.382 169.164 0)
+    (property "Number of Pins" "2" (at 135.382 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 135.382 171.196 0)
+    (property "Temp (Storage)" "" (at 135.382 163.576 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 135.636 173.736 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 135.636 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 135.636 176.53 0)
+    (property "Temp (Soldering)" "If applicable" (at 135.636 168.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 135.636 179.07 0)
+    (property "Temp Coeff." "If applicable" (at 135.636 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 135.636 181.61 0)
+    (property "Power Rating" "10 mA" (at 135.636 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 135.636 183.896 0)
+    (property "Material" "If applicable" (at 135.636 176.276 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 135.636 186.182 0)
+    (property "Class" "If applicable" (at 135.636 178.562 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 131.826 202.692 0)
+    (property "Standards Version" "1.1" (at 131.826 195.072 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 95703a3f-4954-4b5d-b175-4c39bb361c0f))
@@ -3221,94 +4126,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 177.8 127 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 177.8 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cef9)
-    (property "Reference" "SW51" (at 177.8 119.761 0)
+    (property "Reference" "SW51" (at 177.8 112.141 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "V" (at 177.8 122.0724 0)
+    (property "Value" "V" (at 177.8 114.4524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 177.8 121.92 0)
+    (property "Footprint" "unikbd:Key_MX" (at 177.8 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 177.8 121.92 0)
+    (property "Datasheet" "" (at 177.8 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 177.8 127 0)
+    (property "Comment" "Common to all layouts" (at 177.8 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 177.8 127 0)
+    (property "Fitted" "YES" (at 177.8 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 177.8 127 0)
+    (property "Substitution OK" "NO" (at 177.8 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 139.7 139.7 0)
+    (property "Component Value" "Key" (at 139.7 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 155.702 166.624 0)
+    (property "Tolerance" "If applicable" (at 155.702 159.004 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 151.638 145.288 0)
+    (property "Manufacturer" "Cherry" (at 151.638 137.668 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 154.432 151.892 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 154.432 144.272 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 154.686 191.77 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 154.686 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 153.924 148.844 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 153.924 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 151.384 188.976 0)
+    (property "RoHS" "Yes" (at 151.384 181.356 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 151.13 194.818 0)
+    (property "Allow Substitution" "Yes" (at 151.13 187.198 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 151.638 197.104 0)
+    (property "Tracking" "No" (at 151.638 189.484 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 182.88 127 0)
+    (property "BOM Comment" "" (at 182.88 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 173.228 163.83 0)
+    (property "Component Type" "Switch" (at 173.228 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 182.88 127 0)
+    (property "Package Type" "" (at 182.88 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 182.88 127 0)
+    (property "Package Variant" "" (at 182.88 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 155.702 169.164 0)
+    (property "Number of Pins" "2" (at 155.702 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 155.702 171.196 0)
+    (property "Temp (Storage)" "" (at 155.702 163.576 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 155.956 173.736 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 155.956 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 155.956 176.53 0)
+    (property "Temp (Soldering)" "If applicable" (at 155.956 168.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 155.956 179.07 0)
+    (property "Temp Coeff." "If applicable" (at 155.956 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 155.956 181.61 0)
+    (property "Power Rating" "10 mA" (at 155.956 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 155.956 183.896 0)
+    (property "Material" "If applicable" (at 155.956 176.276 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 155.956 186.182 0)
+    (property "Class" "If applicable" (at 155.956 178.562 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 152.146 202.692 0)
+    (property "Standards Version" "1.1" (at 152.146 195.072 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2a4cc27c-4dea-4d60-ad82-37a08816a839))
@@ -3322,94 +4227,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 218.44 127 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 218.44 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cf00)
-    (property "Reference" "SW59" (at 218.44 119.761 0)
+    (property "Reference" "SW59" (at 218.44 112.141 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "X" (at 218.44 122.0724 0)
+    (property "Value" "X" (at 218.44 114.4524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 218.44 121.92 0)
+    (property "Footprint" "unikbd:Key_MX" (at 218.44 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 218.44 121.92 0)
+    (property "Datasheet" "" (at 218.44 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 218.44 127 0)
+    (property "Comment" "Common to all layouts" (at 218.44 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 218.44 127 0)
+    (property "Fitted" "YES" (at 218.44 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 218.44 127 0)
+    (property "Substitution OK" "NO" (at 218.44 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 180.34 139.7 0)
+    (property "Component Value" "Key" (at 180.34 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 196.342 166.624 0)
+    (property "Tolerance" "If applicable" (at 196.342 159.004 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 192.278 145.288 0)
+    (property "Manufacturer" "Cherry" (at 192.278 137.668 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 195.072 151.892 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 195.072 144.272 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 195.326 191.77 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 195.326 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 194.564 148.844 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 194.564 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 192.024 188.976 0)
+    (property "RoHS" "Yes" (at 192.024 181.356 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 191.77 194.818 0)
+    (property "Allow Substitution" "Yes" (at 191.77 187.198 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 192.278 197.104 0)
+    (property "Tracking" "No" (at 192.278 189.484 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 223.52 127 0)
+    (property "BOM Comment" "" (at 223.52 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 213.868 163.83 0)
+    (property "Component Type" "Switch" (at 213.868 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 223.52 127 0)
+    (property "Package Type" "" (at 223.52 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 223.52 127 0)
+    (property "Package Variant" "" (at 223.52 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 196.342 169.164 0)
+    (property "Number of Pins" "2" (at 196.342 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 196.342 171.196 0)
+    (property "Temp (Storage)" "" (at 196.342 163.576 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 196.596 173.736 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 196.596 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 196.596 176.53 0)
+    (property "Temp (Soldering)" "If applicable" (at 196.596 168.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 196.596 179.07 0)
+    (property "Temp Coeff." "If applicable" (at 196.596 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 196.596 181.61 0)
+    (property "Power Rating" "10 mA" (at 196.596 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 196.596 183.896 0)
+    (property "Material" "If applicable" (at 196.596 176.276 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 196.596 186.182 0)
+    (property "Class" "If applicable" (at 196.596 178.562 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 192.786 202.692 0)
+    (property "Standards Version" "1.1" (at 192.786 195.072 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0f4cfb6c-c9c1-41c4-965c-e25b9fb7bad3))
@@ -3423,94 +4328,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 198.12 127 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 198.12 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cf07)
-    (property "Reference" "SW55" (at 198.12 119.761 0)
+    (property "Reference" "SW55" (at 198.12 112.141 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "C" (at 198.12 122.0724 0)
+    (property "Value" "C" (at 198.12 114.4524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 198.12 121.92 0)
+    (property "Footprint" "unikbd:Key_MX" (at 198.12 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 198.12 121.92 0)
+    (property "Datasheet" "" (at 198.12 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 198.12 127 0)
+    (property "Comment" "Common to all layouts" (at 198.12 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 198.12 127 0)
+    (property "Fitted" "YES" (at 198.12 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 198.12 127 0)
+    (property "Substitution OK" "NO" (at 198.12 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 160.02 139.7 0)
+    (property "Component Value" "Key" (at 160.02 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 176.022 166.624 0)
+    (property "Tolerance" "If applicable" (at 176.022 159.004 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 171.958 145.288 0)
+    (property "Manufacturer" "Cherry" (at 171.958 137.668 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 174.752 151.892 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 174.752 144.272 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 175.006 191.77 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 175.006 184.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 174.244 148.844 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 174.244 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 171.704 188.976 0)
+    (property "RoHS" "Yes" (at 171.704 181.356 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 171.45 194.818 0)
+    (property "Allow Substitution" "Yes" (at 171.45 187.198 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 171.958 197.104 0)
+    (property "Tracking" "No" (at 171.958 189.484 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 203.2 127 0)
+    (property "BOM Comment" "" (at 203.2 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 193.548 163.83 0)
+    (property "Component Type" "Switch" (at 193.548 156.21 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 203.2 127 0)
+    (property "Package Type" "" (at 203.2 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 203.2 127 0)
+    (property "Package Variant" "" (at 203.2 119.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 176.022 169.164 0)
+    (property "Number of Pins" "2" (at 176.022 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 176.022 171.196 0)
+    (property "Temp (Storage)" "" (at 176.022 163.576 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 176.276 173.736 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 176.276 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 176.276 176.53 0)
+    (property "Temp (Soldering)" "If applicable" (at 176.276 168.91 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 176.276 179.07 0)
+    (property "Temp Coeff." "If applicable" (at 176.276 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 176.276 181.61 0)
+    (property "Power Rating" "10 mA" (at 176.276 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 176.276 183.896 0)
+    (property "Material" "If applicable" (at 176.276 176.276 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 176.276 186.182 0)
+    (property "Class" "If applicable" (at 176.276 178.562 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 172.466 202.692 0)
+    (property "Standards Version" "1.1" (at 172.466 195.072 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 86444222-18f6-4cdd-b2d8-1739a5656f2c))
@@ -3524,43 +4429,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 101.6 133.35 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 101.6 129.54 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cf0e)
-    (property "Reference" "D38" (at 103.6066 132.1816 90)
+    (property "Reference" "D38" (at 103.6066 128.3716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 103.6066 134.493 90)
+    (property "Value" "1N4148" (at 103.6066 130.683 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 124.46 153.67 0)
+    (property "Footprint" "unikbd:diode-combined" (at 124.46 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 121.92 140.97 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 121.92 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 101.6 133.35 0)
+    (property "Fitted" "Yes" (at 101.6 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 101.6 133.35 0)
+    (property "Substitution OK" " YES " (at 101.6 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 101.6 133.35 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 101.6 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 101.6 133.35 0)
+    (property "Manufacturer" "Diodes, Inc." (at 101.6 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 101.6 133.35 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 101.6 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 101.6 133.35 0)
+    (property "Package" " SOT-23-3 " (at 101.6 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 101.6 133.35 0)
+    (property "LCSC" "C118751" (at 101.6 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 101.6 133.35 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 101.6 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 96.774 120.396 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 141.224 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 126.492 152.908 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 166.37 152.654 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 163.576 155.956 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 169.418 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 171.704 155.702 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 132.08 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 138.43 134.112 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 114.3 177.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 101.6 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 143.764 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 145.796 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 148.336 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 151.13 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 153.67 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 156.21 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 158.496 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 160.782 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 177.292 155.194 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 45651b1c-1305-4959-8fe9-d83e26c5f564))
@@ -3574,43 +4539,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 81.28 133.35 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 81.28 129.54 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cf15)
-    (property "Reference" "D34" (at 83.2866 132.1816 90)
+    (property "Reference" "D34" (at 83.2866 128.3716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 83.2866 134.493 90)
+    (property "Value" "1N4148" (at 83.2866 130.683 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 104.14 153.67 0)
+    (property "Footprint" "unikbd:diode-combined" (at 104.14 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 101.6 140.97 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 101.6 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 81.28 133.35 0)
+    (property "Fitted" "Yes" (at 81.28 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 81.28 133.35 0)
+    (property "Substitution OK" " YES " (at 81.28 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 81.28 133.35 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 81.28 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 81.28 133.35 0)
+    (property "Manufacturer" "Diodes, Inc." (at 81.28 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 81.28 133.35 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 81.28 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 81.28 133.35 0)
+    (property "Package" " SOT-23-3 " (at 81.28 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 81.28 133.35 0)
+    (property "LCSC" "C118751" (at 81.28 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 81.28 133.35 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 81.28 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 76.454 120.396 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 120.904 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 106.172 152.908 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 146.05 152.654 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 143.256 155.956 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 149.098 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 151.384 155.702 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 111.76 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 118.11 134.112 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 93.98 177.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 81.28 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 123.444 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 125.476 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 128.016 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 130.81 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 133.35 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 135.89 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 138.176 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 140.462 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 156.972 155.194 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8218cbaf-f772-4d6a-b3c7-dcc0e0f22588))
@@ -3624,43 +4649,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 121.92 133.35 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 121.92 129.54 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cf1c)
-    (property "Reference" "D42" (at 123.9266 132.1816 90)
+    (property "Reference" "D42" (at 123.9266 128.3716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 123.9266 134.493 90)
+    (property "Value" "1N4148" (at 123.9266 130.683 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 144.78 153.67 0)
+    (property "Footprint" "unikbd:diode-combined" (at 144.78 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 142.24 140.97 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 142.24 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 121.92 133.35 0)
+    (property "Fitted" "Yes" (at 121.92 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 121.92 133.35 0)
+    (property "Substitution OK" " YES " (at 121.92 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 121.92 133.35 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 121.92 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 121.92 133.35 0)
+    (property "Manufacturer" "Diodes, Inc." (at 121.92 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 121.92 133.35 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 121.92 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 121.92 133.35 0)
+    (property "Package" " SOT-23-3 " (at 121.92 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 121.92 133.35 0)
+    (property "LCSC" "C118751" (at 121.92 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 121.92 133.35 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 121.92 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 117.094 120.396 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 161.544 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 146.812 152.908 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 186.69 152.654 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 183.896 155.956 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 189.738 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 192.024 155.702 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 152.4 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 158.75 134.112 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 134.62 177.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 121.92 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 164.084 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 166.116 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 168.656 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 171.45 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 173.99 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 176.53 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 178.816 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 181.102 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 197.612 155.194 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 558a4650-5f77-47f7-a136-c95838b9e605))
@@ -3674,43 +4759,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 142.24 133.35 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 142.24 129.54 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cf23)
-    (property "Reference" "D45" (at 144.2466 132.1816 90)
+    (property "Reference" "D45" (at 144.2466 128.3716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 144.2466 134.493 90)
+    (property "Value" "1N4148" (at 144.2466 130.683 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 165.1 153.67 0)
+    (property "Footprint" "unikbd:diode-combined" (at 165.1 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 162.56 140.97 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 162.56 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 142.24 133.35 0)
+    (property "Fitted" "Yes" (at 142.24 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 142.24 133.35 0)
+    (property "Substitution OK" " YES " (at 142.24 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 142.24 133.35 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 142.24 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 142.24 133.35 0)
+    (property "Manufacturer" "Diodes, Inc." (at 142.24 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 142.24 133.35 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 142.24 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 142.24 133.35 0)
+    (property "Package" " SOT-23-3 " (at 142.24 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 142.24 133.35 0)
+    (property "LCSC" "C118751" (at 142.24 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 142.24 133.35 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 142.24 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 137.414 120.396 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 181.864 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 167.132 152.908 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 207.01 152.654 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 204.216 155.956 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 210.058 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 212.344 155.702 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 172.72 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 179.07 134.112 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 154.94 177.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 142.24 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 184.404 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 186.436 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 188.976 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 191.77 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 194.31 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 196.85 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 199.136 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 201.422 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 217.932 155.194 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 18a1ab5b-9301-414e-a81d-c5f5891bb054))
@@ -3724,43 +4869,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 162.56 133.35 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 162.56 129.54 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cf2a)
-    (property "Reference" "D48" (at 164.5666 132.1816 90)
+    (property "Reference" "D48" (at 164.5666 128.3716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 164.5666 134.493 90)
+    (property "Value" "1N4148" (at 164.5666 130.683 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 185.42 153.67 0)
+    (property "Footprint" "unikbd:diode-combined" (at 185.42 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 182.88 140.97 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 182.88 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 162.56 133.35 0)
+    (property "Fitted" "Yes" (at 162.56 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 162.56 133.35 0)
+    (property "Substitution OK" " YES " (at 162.56 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 162.56 133.35 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 162.56 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 162.56 133.35 0)
+    (property "Manufacturer" "Diodes, Inc." (at 162.56 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 162.56 133.35 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 162.56 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 162.56 133.35 0)
+    (property "Package" " SOT-23-3 " (at 162.56 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 162.56 133.35 0)
+    (property "LCSC" "C118751" (at 162.56 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 162.56 133.35 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 162.56 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 157.734 120.396 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 202.184 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 187.452 152.908 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 227.33 152.654 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 224.536 155.956 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 230.378 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 232.664 155.702 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 193.04 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 199.39 134.112 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 175.26 177.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 162.56 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 204.724 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 206.756 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 209.296 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 212.09 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 214.63 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 217.17 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 219.456 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 221.742 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 238.252 155.194 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1db383e6-9380-47ad-a930-2298257c5eb6))
@@ -3774,43 +4979,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 182.88 133.35 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 182.88 129.54 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cf31)
-    (property "Reference" "D52" (at 184.8866 132.1816 90)
+    (property "Reference" "D52" (at 184.8866 128.3716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 184.8866 134.493 90)
+    (property "Value" "1N4148" (at 184.8866 130.683 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 205.74 153.67 0)
+    (property "Footprint" "unikbd:diode-combined" (at 205.74 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 203.2 140.97 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 203.2 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 182.88 133.35 0)
+    (property "Fitted" "Yes" (at 182.88 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 182.88 133.35 0)
+    (property "Substitution OK" " YES " (at 182.88 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 182.88 133.35 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 182.88 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 182.88 133.35 0)
+    (property "Manufacturer" "Diodes, Inc." (at 182.88 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 182.88 133.35 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 182.88 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 182.88 133.35 0)
+    (property "Package" " SOT-23-3 " (at 182.88 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 182.88 133.35 0)
+    (property "LCSC" "C118751" (at 182.88 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 182.88 133.35 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 182.88 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 178.054 120.396 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 222.504 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 207.772 152.908 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 247.65 152.654 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 244.856 155.956 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 250.698 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 252.984 155.702 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 213.36 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 219.71 134.112 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 195.58 177.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 182.88 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 225.044 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 227.076 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 229.616 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 232.41 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 234.95 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 237.49 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 239.776 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 242.062 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 258.572 155.194 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6c5d9746-1069-4444-a639-64b941d98978))
@@ -3824,43 +5089,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 203.2 133.35 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 203.2 129.54 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cf38)
-    (property "Reference" "D56" (at 205.2066 132.1816 90)
+    (property "Reference" "D56" (at 205.2066 128.3716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 205.2066 134.493 90)
+    (property "Value" "1N4148" (at 205.2066 130.683 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 226.06 153.67 0)
+    (property "Footprint" "unikbd:diode-combined" (at 226.06 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 223.52 140.97 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 223.52 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 203.2 133.35 0)
+    (property "Fitted" "Yes" (at 203.2 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 203.2 133.35 0)
+    (property "Substitution OK" " YES " (at 203.2 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 203.2 133.35 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 203.2 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 203.2 133.35 0)
+    (property "Manufacturer" "Diodes, Inc." (at 203.2 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 203.2 133.35 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 203.2 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 203.2 133.35 0)
+    (property "Package" " SOT-23-3 " (at 203.2 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 203.2 133.35 0)
+    (property "LCSC" "C118751" (at 203.2 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 203.2 133.35 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 203.2 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 198.374 120.396 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 242.824 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 228.092 152.908 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 267.97 152.654 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 265.176 155.956 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 271.018 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 273.304 155.702 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 233.68 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 240.03 134.112 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 215.9 177.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 203.2 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 245.364 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 247.396 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 249.936 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 252.73 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 255.27 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 257.81 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 260.096 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 262.382 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 278.892 155.194 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f47be2be-f9fb-4b05-a441-e7321f96fbab))
@@ -3874,43 +5199,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 223.52 133.35 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 223.52 129.54 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6cf3f)
-    (property "Reference" "D60" (at 225.5266 132.1816 90)
+    (property "Reference" "D60" (at 225.5266 128.3716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 225.5266 134.493 90)
+    (property "Value" "1N4148" (at 225.5266 130.683 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 246.38 153.67 0)
+    (property "Footprint" "unikbd:diode-combined" (at 246.38 149.86 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 243.84 140.97 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 243.84 137.16 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 223.52 133.35 0)
+    (property "Fitted" "Yes" (at 223.52 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 223.52 133.35 0)
+    (property "Substitution OK" " YES " (at 223.52 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 223.52 133.35 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 223.52 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 223.52 133.35 0)
+    (property "Manufacturer" "Diodes, Inc." (at 223.52 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 223.52 133.35 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 223.52 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 223.52 133.35 0)
+    (property "Package" " SOT-23-3 " (at 223.52 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 223.52 133.35 0)
+    (property "LCSC" "C118751" (at 223.52 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 223.52 133.35 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 223.52 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 218.694 120.396 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 263.144 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 248.412 152.908 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 288.29 152.654 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 285.496 155.956 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 291.338 156.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 293.624 155.702 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 254 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 260.35 134.112 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 236.22 177.8 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 223.52 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 265.684 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 267.716 151.638 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 270.256 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 273.05 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 275.59 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 278.13 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 280.416 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 282.702 151.384 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 299.212 155.194 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5cfb7e71-8619-4502-ad0d-b8c893a9ec68))
@@ -3924,94 +5309,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 96.52 149.86 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 96.52 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d0ad)
-    (property "Reference" "SW38" (at 96.52 142.621 0)
+    (property "Reference" "SW38" (at 96.52 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "K" (at 96.52 144.9324 0)
+    (property "Value" "K" (at 96.52 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 96.52 144.78 0)
+    (property "Footprint" "unikbd:Key_MX" (at 96.52 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 96.52 144.78 0)
+    (property "Datasheet" "" (at 96.52 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 96.52 149.86 0)
+    (property "Comment" "Common to all layouts" (at 96.52 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 96.52 149.86 0)
+    (property "Fitted" "YES" (at 96.52 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 96.52 149.86 0)
+    (property "Substitution OK" "NO" (at 96.52 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 58.42 162.56 0)
+    (property "Component Value" "Key" (at 58.42 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 74.422 189.484 0)
+    (property "Tolerance" "If applicable" (at 74.422 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 70.358 168.148 0)
+    (property "Manufacturer" "Cherry" (at 70.358 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 73.152 174.752 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 73.152 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 73.406 214.63 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 73.406 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 72.644 171.704 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 72.644 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 70.104 211.836 0)
+    (property "RoHS" "Yes" (at 70.104 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 69.85 217.678 0)
+    (property "Allow Substitution" "Yes" (at 69.85 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 70.358 219.964 0)
+    (property "Tracking" "No" (at 70.358 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 101.6 149.86 0)
+    (property "BOM Comment" "" (at 101.6 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 91.948 186.69 0)
+    (property "Component Type" "Switch" (at 91.948 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 101.6 149.86 0)
+    (property "Package Type" "" (at 101.6 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 101.6 149.86 0)
+    (property "Package Variant" "" (at 101.6 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 74.422 192.024 0)
+    (property "Number of Pins" "2" (at 74.422 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 74.422 194.056 0)
+    (property "Temp (Storage)" "" (at 74.422 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 74.676 196.596 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 74.676 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 74.676 199.39 0)
+    (property "Temp (Soldering)" "If applicable" (at 74.676 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 74.676 201.93 0)
+    (property "Temp Coeff." "If applicable" (at 74.676 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 74.676 204.47 0)
+    (property "Power Rating" "10 mA" (at 74.676 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 74.676 206.756 0)
+    (property "Material" "If applicable" (at 74.676 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 74.676 209.042 0)
+    (property "Class" "If applicable" (at 74.676 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 70.866 225.552 0)
+    (property "Standards Version" "1.1" (at 70.866 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b14bb2d9-2020-46f7-a263-81f4adcc65da))
@@ -4025,94 +5410,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 137.16 149.86 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 137.16 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d0b4)
-    (property "Reference" "SW45" (at 137.16 142.621 0)
+    (property "Reference" "SW45" (at 137.16 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "H" (at 137.16 144.9324 0)
+    (property "Value" "H" (at 137.16 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 137.16 144.78 0)
+    (property "Footprint" "unikbd:Key_MX" (at 137.16 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 137.16 144.78 0)
+    (property "Datasheet" "" (at 137.16 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 137.16 149.86 0)
+    (property "Comment" "Common to all layouts" (at 137.16 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 137.16 149.86 0)
+    (property "Fitted" "YES" (at 137.16 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 137.16 149.86 0)
+    (property "Substitution OK" "NO" (at 137.16 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 99.06 162.56 0)
+    (property "Component Value" "Key" (at 99.06 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 115.062 189.484 0)
+    (property "Tolerance" "If applicable" (at 115.062 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 110.998 168.148 0)
+    (property "Manufacturer" "Cherry" (at 110.998 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 113.792 174.752 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 113.792 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 114.046 214.63 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 114.046 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 113.284 171.704 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 113.284 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 110.744 211.836 0)
+    (property "RoHS" "Yes" (at 110.744 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 110.49 217.678 0)
+    (property "Allow Substitution" "Yes" (at 110.49 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 110.998 219.964 0)
+    (property "Tracking" "No" (at 110.998 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 142.24 149.86 0)
+    (property "BOM Comment" "" (at 142.24 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 132.588 186.69 0)
+    (property "Component Type" "Switch" (at 132.588 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 142.24 149.86 0)
+    (property "Package Type" "" (at 142.24 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 142.24 149.86 0)
+    (property "Package Variant" "" (at 142.24 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 115.062 192.024 0)
+    (property "Number of Pins" "2" (at 115.062 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 115.062 194.056 0)
+    (property "Temp (Storage)" "" (at 115.062 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 115.316 196.596 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 115.316 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 115.316 199.39 0)
+    (property "Temp (Soldering)" "If applicable" (at 115.316 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 115.316 201.93 0)
+    (property "Temp Coeff." "If applicable" (at 115.316 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 115.316 204.47 0)
+    (property "Power Rating" "10 mA" (at 115.316 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 115.316 206.756 0)
+    (property "Material" "If applicable" (at 115.316 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 115.316 209.042 0)
+    (property "Class" "If applicable" (at 115.316 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 111.506 225.552 0)
+    (property "Standards Version" "1.1" (at 111.506 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b131b137-7b42-4aee-b425-8d99cbd4c4b1))
@@ -4126,94 +5511,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 116.84 149.86 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 116.84 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d0bb)
-    (property "Reference" "SW42" (at 116.84 142.621 0)
+    (property "Reference" "SW42" (at 116.84 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "J" (at 116.84 144.9324 0)
+    (property "Value" "J" (at 116.84 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 116.84 144.78 0)
+    (property "Footprint" "unikbd:Key_MX" (at 116.84 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 116.84 144.78 0)
+    (property "Datasheet" "" (at 116.84 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 116.84 149.86 0)
+    (property "Comment" "Common to all layouts" (at 116.84 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 116.84 149.86 0)
+    (property "Fitted" "YES" (at 116.84 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 116.84 149.86 0)
+    (property "Substitution OK" "NO" (at 116.84 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 78.74 162.56 0)
+    (property "Component Value" "Key" (at 78.74 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 94.742 189.484 0)
+    (property "Tolerance" "If applicable" (at 94.742 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 90.678 168.148 0)
+    (property "Manufacturer" "Cherry" (at 90.678 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 93.472 174.752 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 93.472 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 93.726 214.63 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 93.726 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 92.964 171.704 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 92.964 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 90.424 211.836 0)
+    (property "RoHS" "Yes" (at 90.424 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 90.17 217.678 0)
+    (property "Allow Substitution" "Yes" (at 90.17 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 90.678 219.964 0)
+    (property "Tracking" "No" (at 90.678 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 121.92 149.86 0)
+    (property "BOM Comment" "" (at 121.92 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 112.268 186.69 0)
+    (property "Component Type" "Switch" (at 112.268 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 121.92 149.86 0)
+    (property "Package Type" "" (at 121.92 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 121.92 149.86 0)
+    (property "Package Variant" "" (at 121.92 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 94.742 192.024 0)
+    (property "Number of Pins" "2" (at 94.742 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 94.742 194.056 0)
+    (property "Temp (Storage)" "" (at 94.742 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 94.996 196.596 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 94.996 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 94.996 199.39 0)
+    (property "Temp (Soldering)" "If applicable" (at 94.996 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 94.996 201.93 0)
+    (property "Temp Coeff." "If applicable" (at 94.996 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 94.996 204.47 0)
+    (property "Power Rating" "10 mA" (at 94.996 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 94.996 206.756 0)
+    (property "Material" "If applicable" (at 94.996 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 94.996 209.042 0)
+    (property "Class" "If applicable" (at 94.996 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 91.186 225.552 0)
+    (property "Standards Version" "1.1" (at 91.186 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 358af35b-b7c8-4124-9a60-9a9322f1219f))
@@ -4227,94 +5612,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 157.48 149.86 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 157.48 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d0c2)
-    (property "Reference" "SW48" (at 157.48 142.621 0)
+    (property "Reference" "SW48" (at 157.48 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "G" (at 157.48 144.9324 0)
+    (property "Value" "G" (at 157.48 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 157.48 144.78 0)
+    (property "Footprint" "unikbd:Key_MX" (at 157.48 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 157.48 144.78 0)
+    (property "Datasheet" "" (at 157.48 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 157.48 149.86 0)
+    (property "Comment" "Common to all layouts" (at 157.48 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 157.48 149.86 0)
+    (property "Fitted" "YES" (at 157.48 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 157.48 149.86 0)
+    (property "Substitution OK" "NO" (at 157.48 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 119.38 162.56 0)
+    (property "Component Value" "Key" (at 119.38 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 135.382 189.484 0)
+    (property "Tolerance" "If applicable" (at 135.382 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 131.318 168.148 0)
+    (property "Manufacturer" "Cherry" (at 131.318 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 134.112 174.752 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 134.112 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 134.366 214.63 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 134.366 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 133.604 171.704 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 133.604 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 131.064 211.836 0)
+    (property "RoHS" "Yes" (at 131.064 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 130.81 217.678 0)
+    (property "Allow Substitution" "Yes" (at 130.81 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 131.318 219.964 0)
+    (property "Tracking" "No" (at 131.318 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 162.56 149.86 0)
+    (property "BOM Comment" "" (at 162.56 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 152.908 186.69 0)
+    (property "Component Type" "Switch" (at 152.908 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 162.56 149.86 0)
+    (property "Package Type" "" (at 162.56 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 162.56 149.86 0)
+    (property "Package Variant" "" (at 162.56 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 135.382 192.024 0)
+    (property "Number of Pins" "2" (at 135.382 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 135.382 194.056 0)
+    (property "Temp (Storage)" "" (at 135.382 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 135.636 196.596 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 135.636 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 135.636 199.39 0)
+    (property "Temp (Soldering)" "If applicable" (at 135.636 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 135.636 201.93 0)
+    (property "Temp Coeff." "If applicable" (at 135.636 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 135.636 204.47 0)
+    (property "Power Rating" "10 mA" (at 135.636 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 135.636 206.756 0)
+    (property "Material" "If applicable" (at 135.636 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 135.636 209.042 0)
+    (property "Class" "If applicable" (at 135.636 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 131.826 225.552 0)
+    (property "Standards Version" "1.1" (at 131.826 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c9105445-da3f-4235-a52e-18c3ae1ee5db))
@@ -4328,94 +5713,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 177.8 149.86 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 177.8 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d0c9)
-    (property "Reference" "SW52" (at 177.8 142.621 0)
+    (property "Reference" "SW52" (at 177.8 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "F" (at 177.8 144.9324 0)
+    (property "Value" "F" (at 177.8 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 177.8 144.78 0)
+    (property "Footprint" "unikbd:Key_MX" (at 177.8 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 177.8 144.78 0)
+    (property "Datasheet" "" (at 177.8 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 177.8 149.86 0)
+    (property "Comment" "Common to all layouts" (at 177.8 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 177.8 149.86 0)
+    (property "Fitted" "YES" (at 177.8 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 177.8 149.86 0)
+    (property "Substitution OK" "NO" (at 177.8 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 139.7 162.56 0)
+    (property "Component Value" "Key" (at 139.7 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 155.702 189.484 0)
+    (property "Tolerance" "If applicable" (at 155.702 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 151.638 168.148 0)
+    (property "Manufacturer" "Cherry" (at 151.638 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 154.432 174.752 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 154.432 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 154.686 214.63 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 154.686 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 153.924 171.704 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 153.924 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 151.384 211.836 0)
+    (property "RoHS" "Yes" (at 151.384 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 151.13 217.678 0)
+    (property "Allow Substitution" "Yes" (at 151.13 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 151.638 219.964 0)
+    (property "Tracking" "No" (at 151.638 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 182.88 149.86 0)
+    (property "BOM Comment" "" (at 182.88 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 173.228 186.69 0)
+    (property "Component Type" "Switch" (at 173.228 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 182.88 149.86 0)
+    (property "Package Type" "" (at 182.88 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 182.88 149.86 0)
+    (property "Package Variant" "" (at 182.88 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 155.702 192.024 0)
+    (property "Number of Pins" "2" (at 155.702 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 155.702 194.056 0)
+    (property "Temp (Storage)" "" (at 155.702 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 155.956 196.596 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 155.956 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 155.956 199.39 0)
+    (property "Temp (Soldering)" "If applicable" (at 155.956 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 155.956 201.93 0)
+    (property "Temp Coeff." "If applicable" (at 155.956 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 155.956 204.47 0)
+    (property "Power Rating" "10 mA" (at 155.956 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 155.956 206.756 0)
+    (property "Material" "If applicable" (at 155.956 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 155.956 209.042 0)
+    (property "Class" "If applicable" (at 155.956 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 152.146 225.552 0)
+    (property "Standards Version" "1.1" (at 152.146 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7c6d6c88-eaa5-409e-9b45-6f9d1bee5eb5))
@@ -4429,94 +5814,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 218.44 149.86 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 218.44 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d0d0)
-    (property "Reference" "SW60" (at 218.44 142.621 0)
+    (property "Reference" "SW60" (at 218.44 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "S" (at 218.44 144.9324 0)
+    (property "Value" "S" (at 218.44 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 218.44 144.78 0)
+    (property "Footprint" "unikbd:Key_MX" (at 218.44 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 218.44 144.78 0)
+    (property "Datasheet" "" (at 218.44 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 218.44 149.86 0)
+    (property "Comment" "Common to all layouts" (at 218.44 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 218.44 149.86 0)
+    (property "Fitted" "YES" (at 218.44 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 218.44 149.86 0)
+    (property "Substitution OK" "NO" (at 218.44 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 180.34 162.56 0)
+    (property "Component Value" "Key" (at 180.34 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 196.342 189.484 0)
+    (property "Tolerance" "If applicable" (at 196.342 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 192.278 168.148 0)
+    (property "Manufacturer" "Cherry" (at 192.278 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 195.072 174.752 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 195.072 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 195.326 214.63 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 195.326 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 194.564 171.704 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 194.564 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 192.024 211.836 0)
+    (property "RoHS" "Yes" (at 192.024 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 191.77 217.678 0)
+    (property "Allow Substitution" "Yes" (at 191.77 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 192.278 219.964 0)
+    (property "Tracking" "No" (at 192.278 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 223.52 149.86 0)
+    (property "BOM Comment" "" (at 223.52 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 213.868 186.69 0)
+    (property "Component Type" "Switch" (at 213.868 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 223.52 149.86 0)
+    (property "Package Type" "" (at 223.52 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 223.52 149.86 0)
+    (property "Package Variant" "" (at 223.52 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 196.342 192.024 0)
+    (property "Number of Pins" "2" (at 196.342 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 196.342 194.056 0)
+    (property "Temp (Storage)" "" (at 196.342 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 196.596 196.596 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 196.596 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 196.596 199.39 0)
+    (property "Temp (Soldering)" "If applicable" (at 196.596 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 196.596 201.93 0)
+    (property "Temp Coeff." "If applicable" (at 196.596 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 196.596 204.47 0)
+    (property "Power Rating" "10 mA" (at 196.596 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 196.596 206.756 0)
+    (property "Material" "If applicable" (at 196.596 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 196.596 209.042 0)
+    (property "Class" "If applicable" (at 196.596 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 192.786 225.552 0)
+    (property "Standards Version" "1.1" (at 192.786 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c43497ec-1207-44fe-9caa-3a85583c16f4))
@@ -4530,94 +5915,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 198.12 149.86 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 198.12 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d0d7)
-    (property "Reference" "SW56" (at 198.12 142.621 0)
+    (property "Reference" "SW56" (at 198.12 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "D" (at 198.12 144.9324 0)
+    (property "Value" "D" (at 198.12 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 198.12 144.78 0)
+    (property "Footprint" "unikbd:Key_MX" (at 198.12 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 198.12 144.78 0)
+    (property "Datasheet" "" (at 198.12 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 198.12 149.86 0)
+    (property "Comment" "Common to all layouts" (at 198.12 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 198.12 149.86 0)
+    (property "Fitted" "YES" (at 198.12 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 198.12 149.86 0)
+    (property "Substitution OK" "NO" (at 198.12 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 160.02 162.56 0)
+    (property "Component Value" "Key" (at 160.02 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 176.022 189.484 0)
+    (property "Tolerance" "If applicable" (at 176.022 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 171.958 168.148 0)
+    (property "Manufacturer" "Cherry" (at 171.958 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 174.752 174.752 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 174.752 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 175.006 214.63 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 175.006 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 174.244 171.704 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 174.244 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 171.704 211.836 0)
+    (property "RoHS" "Yes" (at 171.704 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 171.45 217.678 0)
+    (property "Allow Substitution" "Yes" (at 171.45 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 171.958 219.964 0)
+    (property "Tracking" "No" (at 171.958 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 203.2 149.86 0)
+    (property "BOM Comment" "" (at 203.2 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 193.548 186.69 0)
+    (property "Component Type" "Switch" (at 193.548 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 203.2 149.86 0)
+    (property "Package Type" "" (at 203.2 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 203.2 149.86 0)
+    (property "Package Variant" "" (at 203.2 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 176.022 192.024 0)
+    (property "Number of Pins" "2" (at 176.022 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 176.022 194.056 0)
+    (property "Temp (Storage)" "" (at 176.022 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 176.276 196.596 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 176.276 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 176.276 199.39 0)
+    (property "Temp (Soldering)" "If applicable" (at 176.276 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 176.276 201.93 0)
+    (property "Temp Coeff." "If applicable" (at 176.276 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 176.276 204.47 0)
+    (property "Power Rating" "10 mA" (at 176.276 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 176.276 206.756 0)
+    (property "Material" "If applicable" (at 176.276 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 176.276 209.042 0)
+    (property "Class" "If applicable" (at 176.276 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 172.466 225.552 0)
+    (property "Standards Version" "1.1" (at 172.466 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5f1f811c-4a2f-4705-93af-ea2d8833080d))
@@ -4631,43 +6016,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 101.6 156.21 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 101.6 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d0de)
-    (property "Reference" "D39" (at 103.6066 155.0416 90)
+    (property "Reference" "D39" (at 103.6066 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 103.6066 157.353 90)
+    (property "Value" "1N4148" (at 103.6066 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 124.46 176.53 0)
+    (property "Footprint" "unikbd:diode-combined" (at 124.46 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 121.92 163.83 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 121.92 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 101.6 156.21 0)
+    (property "Fitted" "Yes" (at 101.6 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 101.6 156.21 0)
+    (property "Substitution OK" " YES " (at 101.6 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 101.6 156.21 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 101.6 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 101.6 156.21 0)
+    (property "Manufacturer" "Diodes, Inc." (at 101.6 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 101.6 156.21 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 101.6 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 101.6 156.21 0)
+    (property "Package" " SOT-23-3 " (at 101.6 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 101.6 156.21 0)
+    (property "LCSC" "C118751" (at 101.6 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 101.6 156.21 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 101.6 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 96.774 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 141.224 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 126.492 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 166.37 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 163.576 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 169.418 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 171.704 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 132.08 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 138.43 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 114.3 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 101.6 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 143.764 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 145.796 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 148.336 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 151.13 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 153.67 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 156.21 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 158.496 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 160.782 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 177.292 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 46561422-0f55-4ae3-97d4-77717410bf14))
@@ -4681,43 +6126,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 121.92 156.21 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 121.92 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d0ec)
-    (property "Reference" "D43" (at 123.9266 155.0416 90)
+    (property "Reference" "D43" (at 123.9266 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 123.9266 157.353 90)
+    (property "Value" "1N4148" (at 123.9266 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 144.78 176.53 0)
+    (property "Footprint" "unikbd:diode-combined" (at 144.78 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 142.24 163.83 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 142.24 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 121.92 156.21 0)
+    (property "Fitted" "Yes" (at 121.92 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 121.92 156.21 0)
+    (property "Substitution OK" " YES " (at 121.92 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 121.92 156.21 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 121.92 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 121.92 156.21 0)
+    (property "Manufacturer" "Diodes, Inc." (at 121.92 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 121.92 156.21 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 121.92 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 121.92 156.21 0)
+    (property "Package" " SOT-23-3 " (at 121.92 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 121.92 156.21 0)
+    (property "LCSC" "C118751" (at 121.92 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 121.92 156.21 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 121.92 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 117.094 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 161.544 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 146.812 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 186.69 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 183.896 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 189.738 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 192.024 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 152.4 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 158.75 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 134.62 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 121.92 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 164.084 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 166.116 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 168.656 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 171.45 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 173.99 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 176.53 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 178.816 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 181.102 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 197.612 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3cd876ac-8dd7-44fb-9e57-5a12fa2c566a))
@@ -4731,43 +6236,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 142.24 156.21 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 142.24 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d0f3)
-    (property "Reference" "D46" (at 144.2466 155.0416 90)
+    (property "Reference" "D46" (at 144.2466 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 144.2466 157.353 90)
+    (property "Value" "1N4148" (at 144.2466 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 165.1 176.53 0)
+    (property "Footprint" "unikbd:diode-combined" (at 165.1 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 162.56 163.83 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 162.56 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 142.24 156.21 0)
+    (property "Fitted" "Yes" (at 142.24 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 142.24 156.21 0)
+    (property "Substitution OK" " YES " (at 142.24 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 142.24 156.21 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 142.24 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 142.24 156.21 0)
+    (property "Manufacturer" "Diodes, Inc." (at 142.24 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 142.24 156.21 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 142.24 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 142.24 156.21 0)
+    (property "Package" " SOT-23-3 " (at 142.24 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 142.24 156.21 0)
+    (property "LCSC" "C118751" (at 142.24 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 142.24 156.21 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 142.24 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 137.414 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 181.864 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 167.132 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 207.01 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 204.216 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 210.058 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 212.344 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 172.72 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 179.07 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 154.94 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 142.24 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 184.404 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 186.436 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 188.976 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 191.77 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 194.31 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 196.85 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 199.136 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 201.422 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 217.932 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e819c353-51fc-4339-a4f1-86d8207b879f))
@@ -4781,43 +6346,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 162.56 156.21 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 162.56 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d0fa)
-    (property "Reference" "D49" (at 164.5666 155.0416 90)
+    (property "Reference" "D49" (at 164.5666 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 164.5666 157.353 90)
+    (property "Value" "1N4148" (at 164.5666 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 185.42 176.53 0)
+    (property "Footprint" "unikbd:diode-combined" (at 185.42 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 182.88 163.83 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 182.88 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 162.56 156.21 0)
+    (property "Fitted" "Yes" (at 162.56 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 162.56 156.21 0)
+    (property "Substitution OK" " YES " (at 162.56 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 162.56 156.21 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 162.56 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 162.56 156.21 0)
+    (property "Manufacturer" "Diodes, Inc." (at 162.56 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 162.56 156.21 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 162.56 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 162.56 156.21 0)
+    (property "Package" " SOT-23-3 " (at 162.56 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 162.56 156.21 0)
+    (property "LCSC" "C118751" (at 162.56 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 162.56 156.21 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 162.56 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 157.734 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 202.184 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 187.452 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 227.33 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 224.536 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 230.378 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 232.664 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 193.04 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 199.39 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 175.26 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 162.56 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 204.724 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 206.756 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 209.296 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 212.09 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 214.63 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 217.17 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 219.456 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 221.742 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 238.252 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1ef6719f-9a14-4412-93f3-436d9471b8c4))
@@ -4831,43 +6456,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 182.88 156.21 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 182.88 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d101)
-    (property "Reference" "D53" (at 184.8866 155.0416 90)
+    (property "Reference" "D53" (at 184.8866 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 184.8866 157.353 90)
+    (property "Value" "1N4148" (at 184.8866 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 205.74 176.53 0)
+    (property "Footprint" "unikbd:diode-combined" (at 205.74 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 203.2 163.83 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 203.2 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 182.88 156.21 0)
+    (property "Fitted" "Yes" (at 182.88 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 182.88 156.21 0)
+    (property "Substitution OK" " YES " (at 182.88 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 182.88 156.21 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 182.88 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 182.88 156.21 0)
+    (property "Manufacturer" "Diodes, Inc." (at 182.88 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 182.88 156.21 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 182.88 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 182.88 156.21 0)
+    (property "Package" " SOT-23-3 " (at 182.88 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 182.88 156.21 0)
+    (property "LCSC" "C118751" (at 182.88 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 182.88 156.21 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 182.88 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 178.054 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 222.504 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 207.772 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 247.65 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 244.856 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 250.698 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 252.984 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 213.36 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 219.71 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 195.58 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 182.88 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 225.044 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 227.076 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 229.616 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 232.41 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 234.95 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 237.49 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 239.776 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 242.062 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 258.572 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3e55b1ce-2e2a-4146-b31e-297579a7334d))
@@ -4881,43 +6566,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 203.2 156.21 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 203.2 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d108)
-    (property "Reference" "D57" (at 205.2066 155.0416 90)
+    (property "Reference" "D57" (at 205.2066 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 205.2066 157.353 90)
+    (property "Value" "1N4148" (at 205.2066 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 226.06 176.53 0)
+    (property "Footprint" "unikbd:diode-combined" (at 226.06 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 223.52 163.83 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 223.52 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 203.2 156.21 0)
+    (property "Fitted" "Yes" (at 203.2 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 203.2 156.21 0)
+    (property "Substitution OK" " YES " (at 203.2 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 203.2 156.21 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 203.2 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 203.2 156.21 0)
+    (property "Manufacturer" "Diodes, Inc." (at 203.2 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 203.2 156.21 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 203.2 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 203.2 156.21 0)
+    (property "Package" " SOT-23-3 " (at 203.2 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 203.2 156.21 0)
+    (property "LCSC" "C118751" (at 203.2 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 203.2 156.21 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 203.2 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 198.374 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 242.824 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 228.092 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 267.97 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 265.176 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 271.018 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 273.304 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 233.68 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 240.03 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 215.9 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 203.2 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 245.364 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 247.396 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 249.936 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 252.73 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 255.27 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 257.81 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 260.096 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 262.382 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 278.892 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3af3f9e6-b62c-4c6d-9b74-dee5b92c5868))
@@ -4931,43 +6676,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 223.52 156.21 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 223.52 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bc6d10f)
-    (property "Reference" "D61" (at 225.5266 155.0416 90)
+    (property "Reference" "D61" (at 225.5266 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 225.5266 157.353 90)
+    (property "Value" "1N4148" (at 225.5266 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 246.38 176.53 0)
+    (property "Footprint" "unikbd:diode-combined" (at 246.38 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 243.84 163.83 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 243.84 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 223.52 156.21 0)
+    (property "Fitted" "Yes" (at 223.52 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 223.52 156.21 0)
+    (property "Substitution OK" " YES " (at 223.52 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 223.52 156.21 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 223.52 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 223.52 156.21 0)
+    (property "Manufacturer" "Diodes, Inc." (at 223.52 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 223.52 156.21 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 223.52 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 223.52 156.21 0)
+    (property "Package" " SOT-23-3 " (at 223.52 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 223.52 156.21 0)
+    (property "LCSC" "C118751" (at 223.52 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 223.52 156.21 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 223.52 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 218.694 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 263.144 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 248.412 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 288.29 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 285.496 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 291.338 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 293.624 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 254 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 260.35 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 236.22 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 223.52 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 265.684 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 267.716 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 270.256 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 273.05 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 275.59 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 278.13 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 280.416 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 282.702 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 299.212 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid aa6d8b13-afff-4550-9965-98f70e9ffe8b))
@@ -4981,91 +6786,91 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 157.48 81.28 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 157.48 71.12 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005e0ac938)
-    (property "Reference" "SW62" (at 157.48 74.041 0)
+    (property "Reference" "SW62" (at 157.48 63.881 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "ESC" (at 157.48 76.3524 0)
+    (property "Value" "ESC" (at 157.48 66.1924 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 157.48 76.2 0)
+    (property "Footprint" "unikbd:Key_MX" (at 157.48 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 157.48 76.2 0)
+    (property "Datasheet" "" (at 157.48 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "Yes" (at 157.48 81.28 0)
+    (property "Fitted" "Yes" (at 157.48 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 157.48 81.28 0)
+    (property "Substitution OK" "NO" (at 157.48 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 119.38 93.98 0)
+    (property "Component Value" "Key" (at 119.38 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 135.382 120.904 0)
+    (property "Tolerance" "If applicable" (at 135.382 110.744 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 131.318 99.568 0)
+    (property "Manufacturer" "Cherry" (at 131.318 89.408 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 134.112 106.172 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 134.112 96.012 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 134.366 146.05 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 134.366 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 133.604 103.124 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 133.604 92.964 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 131.064 143.256 0)
+    (property "RoHS" "Yes" (at 131.064 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 130.81 149.098 0)
+    (property "Allow Substitution" "Yes" (at 130.81 138.938 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 131.318 151.384 0)
+    (property "Tracking" "No" (at 131.318 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 162.56 81.28 0)
+    (property "BOM Comment" "" (at 162.56 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 152.908 118.11 0)
+    (property "Component Type" "Switch" (at 152.908 107.95 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 162.56 81.28 0)
+    (property "Package Type" "" (at 162.56 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 162.56 81.28 0)
+    (property "Package Variant" "" (at 162.56 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 135.382 123.444 0)
+    (property "Number of Pins" "2" (at 135.382 113.284 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 135.382 125.476 0)
+    (property "Temp (Storage)" "" (at 135.382 115.316 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 135.636 128.016 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 135.636 117.856 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 135.636 130.81 0)
+    (property "Temp (Soldering)" "If applicable" (at 135.636 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 135.636 133.35 0)
+    (property "Temp Coeff." "If applicable" (at 135.636 123.19 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 135.636 135.89 0)
+    (property "Power Rating" "10 mA" (at 135.636 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 135.636 138.176 0)
+    (property "Material" "If applicable" (at 135.636 128.016 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 135.636 140.462 0)
+    (property "Class" "If applicable" (at 135.636 130.302 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 131.826 156.972 0)
+    (property "Standards Version" "1.1" (at 131.826 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 5cbdf913-9bc6-4777-b02c-eb4e1068e73f))
@@ -5079,43 +6884,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 162.56 87.63 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 162.56 81.28 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005e0ac93e)
-    (property "Reference" "D1" (at 164.5666 86.4616 90)
+    (property "Reference" "D1" (at 164.5666 80.1116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 164.5666 88.773 90)
+    (property "Value" "1N4148" (at 164.5666 82.423 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 185.42 107.95 0)
+    (property "Footprint" "unikbd:diode-combined" (at 185.42 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 182.88 95.25 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 182.88 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 162.56 87.63 0)
+    (property "Fitted" "Yes" (at 162.56 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 162.56 87.63 0)
+    (property "Substitution OK" " YES " (at 162.56 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 162.56 87.63 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 162.56 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 162.56 87.63 0)
+    (property "Manufacturer" "Diodes, Inc." (at 162.56 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 162.56 87.63 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 162.56 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 162.56 87.63 0)
+    (property "Package" " SOT-23-3 " (at 162.56 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 162.56 87.63 0)
+    (property "LCSC" "C118751" (at 162.56 81.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 162.56 87.63 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 162.56 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 157.734 72.136 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 202.184 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 187.452 104.648 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 227.33 104.394 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 224.536 107.696 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 230.378 107.95 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 232.664 107.442 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 193.04 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 199.39 85.852 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 175.26 129.54 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 162.56 81.28 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 204.724 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 206.756 103.378 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 209.296 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 212.09 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 214.63 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 217.17 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 219.456 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 221.742 103.124 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 238.252 106.934 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e6ae2d20-9ecd-47d7-87e6-c6074114f70e))
@@ -5129,91 +6994,91 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 76.2 149.86 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 76.2 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005e423211)
-    (property "Reference" "SW63" (at 76.2 142.621 0)
+    (property "Reference" "SW63" (at 76.2 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Spare" (at 76.2 144.9324 0)
+    (property "Value" "Spare" (at 76.2 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 76.2 144.78 0)
+    (property "Footprint" "unikbd:Key_MX" (at 76.2 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 76.2 144.78 0)
+    (property "Datasheet" "" (at 76.2 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "Yes" (at 76.2 149.86 0)
+    (property "Fitted" "Yes" (at 76.2 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 76.2 149.86 0)
+    (property "Substitution OK" "NO" (at 76.2 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 38.1 162.56 0)
+    (property "Component Value" "Key" (at 38.1 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 54.102 189.484 0)
+    (property "Tolerance" "If applicable" (at 54.102 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 50.038 168.148 0)
+    (property "Manufacturer" "Cherry" (at 50.038 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 52.832 174.752 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 52.832 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 53.086 214.63 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 53.086 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 52.324 171.704 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 52.324 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 49.784 211.836 0)
+    (property "RoHS" "Yes" (at 49.784 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 49.53 217.678 0)
+    (property "Allow Substitution" "Yes" (at 49.53 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 50.038 219.964 0)
+    (property "Tracking" "No" (at 50.038 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 81.28 149.86 0)
+    (property "BOM Comment" "" (at 81.28 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 71.628 186.69 0)
+    (property "Component Type" "Switch" (at 71.628 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 81.28 149.86 0)
+    (property "Package Type" "" (at 81.28 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 81.28 149.86 0)
+    (property "Package Variant" "" (at 81.28 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 54.102 192.024 0)
+    (property "Number of Pins" "2" (at 54.102 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 54.102 194.056 0)
+    (property "Temp (Storage)" "" (at 54.102 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 54.356 196.596 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 54.356 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 54.356 199.39 0)
+    (property "Temp (Soldering)" "If applicable" (at 54.356 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 54.356 201.93 0)
+    (property "Temp Coeff." "If applicable" (at 54.356 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 54.356 204.47 0)
+    (property "Power Rating" "10 mA" (at 54.356 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 54.356 206.756 0)
+    (property "Material" "If applicable" (at 54.356 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 54.356 209.042 0)
+    (property "Class" "If applicable" (at 54.356 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 50.546 225.552 0)
+    (property "Standards Version" "1.1" (at 50.546 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 65928fe5-5abb-4eed-bc25-99709d17b2d8))
@@ -5227,43 +7092,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 81.28 156.21 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 81.28 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005e423217)
-    (property "Reference" "D35" (at 83.2866 155.0416 90)
+    (property "Reference" "D35" (at 83.2866 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 83.2866 157.353 90)
+    (property "Value" "1N4148" (at 83.2866 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 104.14 176.53 0)
+    (property "Footprint" "unikbd:diode-combined" (at 104.14 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 101.6 163.83 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 101.6 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 81.28 156.21 0)
+    (property "Fitted" "Yes" (at 81.28 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 81.28 156.21 0)
+    (property "Substitution OK" " YES " (at 81.28 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 81.28 156.21 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 81.28 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 81.28 156.21 0)
+    (property "Manufacturer" "Diodes, Inc." (at 81.28 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 81.28 156.21 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 81.28 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 81.28 156.21 0)
+    (property "Package" " SOT-23-3 " (at 81.28 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 81.28 156.21 0)
+    (property "LCSC" "C118751" (at 81.28 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 81.28 156.21 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 81.28 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 76.454 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 120.904 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 106.172 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 146.05 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 143.256 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 149.098 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 151.384 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 111.76 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 118.11 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 93.98 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 81.28 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 123.444 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 125.476 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 128.016 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 130.81 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 133.35 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 135.89 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 138.176 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 140.462 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 156.972 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f5159a58-53e0-4bdb-9a7f-a005a7b15a22))
diff --git a/hardware/keyboard-classic/keys2.kicad_sch b/hardware/keyboard-classic/keys2.kicad_sch
index 54f571a..8218dd2 100644
--- a/hardware/keyboard-classic/keys2.kicad_sch
+++ b/hardware/keyboard-classic/keys2.kicad_sch
@@ -139,62 +139,131 @@
         )
       )
     )
-    (symbol "unikbd:diode-combined" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "D" (at 0 2.54 0)
-        (effects (font (size 1.27 1.27)))
+    (symbol "unikbd:diode-combined" (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "D**" (at 0.635 2.54 0)
+        (effects (font (size 1.27 1.27)) (justify left) hide)
       )
-      (property "Value" "diode-combined" (at 0 -2.54 0)
-        (effects (font (size 1.27 1.27)))
+      (property "Value" "1N914/MMBD914" (at -27.94 -34.798 0)
+        (effects (font (size 1.27 1.27)) (justify left) hide)
       )
-      (property "Footprint" "unikbd:diode-combined" (at -20.32 -22.86 0)
+      (property "Footprint" "unikbd:diode-combined" (at -48.26 -17.78 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at -7.62 -20.32 0)
+      (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at -26.162 -29.464 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "diode" (at 0 0 0)
+      (property "Component Value" "19N14/MMBD914" (at 9.144 4.826 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "100V 0.15A standard switching diode, DO-35" (at 0 0 0)
+      (property "Tolerance" "If applicable" (at -22.098 -39.624 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_fp_filters" "D*DO?35*" (at 0 0 0)
+      (property "Manufacturer" "Diodes, Inc." (at -26.162 -18.288 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at -23.368 -24.892 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at -23.114 -64.77 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Manufacturer PN" "MMBD914-7-F" (at -23.876 -21.844 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "RoHS" "Yes" (at -26.416 -61.976 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Allow Substitution" "Yes" (at -26.67 -67.818 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Fitted" "Yes" (at -25.654 -72.644 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Tracking" "No" (at -26.162 -70.104 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at -27.94 -30.48 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Component Type" "Diode" (at -4.572 -36.83 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Package Type" "SOT3-3" (at -48.26 -12.7 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Package Variant" "" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Number of Pins" "3" (at -22.098 -42.164 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp (Storage)" "If applicable" (at -22.098 -44.196 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp (Operating)" "-65C/150C" (at -21.844 -46.736 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp (Soldering)" "If applicable" (at -21.844 -49.53 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Temp Coeff." "If applicable" (at -21.844 -52.07 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Power Rating" "350 mW / 200 mA" (at -21.844 -54.61 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Material" "If applicable" (at -21.844 -56.896 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Class" "If applicable" (at -21.844 -59.182 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Standards Version" "1.1" (at -25.654 -75.692 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_keywords" "diode switching combined" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "DIODE combined SMT/TH 1n914/mmbd914 generic switching" (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_fp_filters" "C_*" (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (symbol "diode-combined_0_1"
         (polyline
           (pts
-            (xy -1.27 1.27)
-            (xy -1.27 -1.27)
+            (xy 2.54 1.27)
+            (xy 2.54 -1.27)
           )
           (stroke (width 0.254) (type default))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy 1.27 0)
-            (xy -1.27 0)
+            (xy 5.08 0)
+            (xy 2.54 0)
           )
           (stroke (width 0) (type default))
           (fill (type none))
         )
         (polyline
           (pts
-            (xy 1.27 1.27)
-            (xy 1.27 -1.27)
-            (xy -1.27 0)
-            (xy 1.27 1.27)
+            (xy 5.08 1.27)
+            (xy 5.08 -1.27)
+            (xy 2.54 0)
+            (xy 5.08 1.27)
           )
           (stroke (width 0.254) (type default))
           (fill (type none))
         )
       )
       (symbol "diode-combined_1_1"
-        (pin passive line (at -3.81 0 0) (length 2.54)
+        (pin passive line (at 0 0 0) (length 2.54)
           (name "K" (effects (font (size 1.27 1.27))))
           (number "1" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 3.81 0 180) (length 2.54)
+        (pin passive line (at 7.62 0 180) (length 2.54)
           (name "A" (effects (font (size 1.27 1.27))))
           (number "2" (effects (font (size 1.27 1.27))))
         )
@@ -202,531 +271,647 @@
     )
   )
 
-  (junction (at 148.59 158.75) (diameter 0) (color 0 0 0 0)
+  (junction (at 139.7 99.06) (diameter 0) (color 0 0 0 0)
+    (uuid 0597b7b4-d4e4-47aa-900b-a6e204655ca3)
+  )
+  (junction (at 78.74 99.06) (diameter 0) (color 0 0 0 0)
+    (uuid 07b9b9b6-c9bb-413a-8db6-9229945d0e1d)
+  )
+  (junction (at 149.86 157.48) (diameter 0) (color 0 0 0 0)
     (uuid 0e8e028b-40bf-4223-8af0-5d3b9632e552)
   )
-  (junction (at 189.23 135.89) (diameter 0) (color 0 0 0 0)
+  (junction (at 190.5 134.62) (diameter 0) (color 0 0 0 0)
     (uuid 19b83f76-a7b0-4c17-8de7-1c5b6ba828df)
   )
-  (junction (at 97.79 125.73) (diameter 0) (color 0 0 0 0)
+  (junction (at 99.06 121.92) (diameter 0) (color 0 0 0 0)
     (uuid 272a4da9-f51a-4b2b-b245-e08636025e33)
   )
-  (junction (at 138.43 102.87) (diameter 0) (color 0 0 0 0)
-    (uuid 291c2f5b-52bd-4723-b994-d6f8f8da44f9)
+  (junction (at 99.06 99.06) (diameter 0) (color 0 0 0 0)
+    (uuid 2a40f536-4244-4d54-b81b-5641dbc4069e)
   )
-  (junction (at 148.59 113.03) (diameter 0) (color 0 0 0 0)
+  (junction (at 149.86 111.76) (diameter 0) (color 0 0 0 0)
     (uuid 2f539784-1ba3-4afa-b98e-8921c58be11a)
   )
-  (junction (at 179.07 102.87) (diameter 0) (color 0 0 0 0)
-    (uuid 33496f74-b774-481a-bdc0-9eaa5db8d39c)
-  )
-  (junction (at 168.91 90.17) (diameter 0) (color 0 0 0 0)
+  (junction (at 170.18 88.9) (diameter 0) (color 0 0 0 0)
     (uuid 3851a731-1e9f-4f3f-a233-1762fae04065)
   )
-  (junction (at 107.95 158.75) (diameter 0) (color 0 0 0 0)
+  (junction (at 109.22 157.48) (diameter 0) (color 0 0 0 0)
     (uuid 3a9cd6ca-1234-467f-8b4b-10f2746937cd)
   )
-  (junction (at 219.71 102.87) (diameter 0) (color 0 0 0 0)
-    (uuid 3e822ba7-3a4d-483d-b3ff-24e199e2044d)
-  )
-  (junction (at 199.39 80.01) (diameter 0) (color 0 0 0 0)
+  (junction (at 200.66 76.2) (diameter 0) (color 0 0 0 0)
     (uuid 44695082-4bbc-4d10-b8d4-7bafc3ebc79f)
   )
-  (junction (at 118.11 125.73) (diameter 0) (color 0 0 0 0)
-    (uuid 4499702c-ae14-407b-9af3-7428a3077a2a)
-  )
-  (junction (at 148.59 135.89) (diameter 0) (color 0 0 0 0)
+  (junction (at 149.86 134.62) (diameter 0) (color 0 0 0 0)
     (uuid 46b07908-f194-475e-8a50-93a9b5ff6cfd)
   )
-  (junction (at 219.71 125.73) (diameter 0) (color 0 0 0 0)
+  (junction (at 220.98 121.92) (diameter 0) (color 0 0 0 0)
     (uuid 4a425010-0f9a-4ba5-854b-b9ed34564ae1)
   )
-  (junction (at 97.79 80.01) (diameter 0) (color 0 0 0 0)
+  (junction (at 99.06 76.2) (diameter 0) (color 0 0 0 0)
     (uuid 4d45be44-b1fa-4fe7-8cc2-200856a5c77c)
   )
-  (junction (at 87.63 135.89) (diameter 0) (color 0 0 0 0)
+  (junction (at 88.9 134.62) (diameter 0) (color 0 0 0 0)
     (uuid 51bb78c4-ab78-4d6d-bafa-bf08bc93038e)
   )
-  (junction (at 209.55 113.03) (diameter 0) (color 0 0 0 0)
+  (junction (at 210.82 111.76) (diameter 0) (color 0 0 0 0)
     (uuid 53b6f01e-4aa6-4234-9f97-6c36fa5b219c)
   )
-  (junction (at 168.91 135.89) (diameter 0) (color 0 0 0 0)
+  (junction (at 170.18 134.62) (diameter 0) (color 0 0 0 0)
     (uuid 5582e4ae-981d-41f5-86aa-651646d5df9b)
   )
-  (junction (at 158.75 80.01) (diameter 0) (color 0 0 0 0)
+  (junction (at 160.02 76.2) (diameter 0) (color 0 0 0 0)
     (uuid 608dbd52-0b43-4dbd-9600-e8752bf5bf51)
   )
-  (junction (at 219.71 80.01) (diameter 0) (color 0 0 0 0)
+  (junction (at 220.98 76.2) (diameter 0) (color 0 0 0 0)
     (uuid 64c1ac7b-174c-47bb-b7f0-ce134c711e2d)
   )
-  (junction (at 199.39 125.73) (diameter 0) (color 0 0 0 0)
+  (junction (at 200.66 121.92) (diameter 0) (color 0 0 0 0)
     (uuid 64d17b60-932f-41f0-9212-555358d5b87b)
   )
-  (junction (at 209.55 90.17) (diameter 0) (color 0 0 0 0)
+  (junction (at 210.82 88.9) (diameter 0) (color 0 0 0 0)
     (uuid 68299a19-257c-4ab3-ad66-761d9f9235a0)
   )
-  (junction (at 77.47 80.01) (diameter 0) (color 0 0 0 0)
+  (junction (at 78.74 76.2) (diameter 0) (color 0 0 0 0)
     (uuid 6c29bd52-28a0-4410-aa39-8fbeeccaf618)
   )
-  (junction (at 128.27 135.89) (diameter 0) (color 0 0 0 0)
+  (junction (at 129.54 134.62) (diameter 0) (color 0 0 0 0)
     (uuid 6def7fdb-10cf-4849-b3ad-295a2ad955de)
   )
-  (junction (at 107.95 90.17) (diameter 0) (color 0 0 0 0)
+  (junction (at 109.22 88.9) (diameter 0) (color 0 0 0 0)
     (uuid 6e0e6dcd-f891-414f-b11a-ee090d8c19dc)
   )
-  (junction (at 189.23 90.17) (diameter 0) (color 0 0 0 0)
+  (junction (at 220.98 99.06) (diameter 0) (color 0 0 0 0)
+    (uuid 72fd60e1-ff96-4334-b136-67acb32e9870)
+  )
+  (junction (at 190.5 88.9) (diameter 0) (color 0 0 0 0)
     (uuid 7480208f-c513-43ab-907b-174eae8a25bb)
   )
-  (junction (at 118.11 80.01) (diameter 0) (color 0 0 0 0)
+  (junction (at 180.34 99.06) (diameter 0) (color 0 0 0 0)
+    (uuid 7548d8b8-a057-455e-901b-b676860949da)
+  )
+  (junction (at 119.38 76.2) (diameter 0) (color 0 0 0 0)
     (uuid 7be843c7-4670-4abd-9967-58790b4ad1cd)
   )
-  (junction (at 97.79 102.87) (diameter 0) (color 0 0 0 0)
-    (uuid 7eb49969-d1af-4234-aa25-fb77172c41ae)
-  )
-  (junction (at 158.75 125.73) (diameter 0) (color 0 0 0 0)
-    (uuid 86ea9859-2174-414e-b326-db670bd33973)
-  )
-  (junction (at 179.07 80.01) (diameter 0) (color 0 0 0 0)
+  (junction (at 180.34 76.2) (diameter 0) (color 0 0 0 0)
     (uuid 8977ba51-588c-4450-b7bc-9b767c2f1414)
   )
-  (junction (at 179.07 125.73) (diameter 0) (color 0 0 0 0)
+  (junction (at 180.34 121.92) (diameter 0) (color 0 0 0 0)
     (uuid 904ceb11-13e2-41f8-b408-aa538d95fd4e)
   )
-  (junction (at 87.63 90.17) (diameter 0) (color 0 0 0 0)
+  (junction (at 88.9 88.9) (diameter 0) (color 0 0 0 0)
     (uuid 93960bbe-11c5-4d99-b680-e66ee3f0972a)
   )
-  (junction (at 209.55 158.75) (diameter 0) (color 0 0 0 0)
+  (junction (at 210.82 157.48) (diameter 0) (color 0 0 0 0)
     (uuid a3f16d16-8a40-4546-9b30-128aab62fb33)
   )
-  (junction (at 138.43 80.01) (diameter 0) (color 0 0 0 0)
+  (junction (at 139.7 76.2) (diameter 0) (color 0 0 0 0)
     (uuid a44b287a-50a5-464b-90a6-7f225c92b558)
   )
-  (junction (at 77.47 102.87) (diameter 0) (color 0 0 0 0)
-    (uuid a80ef92b-fed2-4d82-9689-b70bcde0839c)
+  (junction (at 160.02 121.92) (diameter 0) (color 0 0 0 0)
+    (uuid a52fa291-c0f3-436a-b3ba-86c4f6bade69)
   )
-  (junction (at 148.59 90.17) (diameter 0) (color 0 0 0 0)
+  (junction (at 149.86 88.9) (diameter 0) (color 0 0 0 0)
     (uuid adb6d9cf-13c8-49ea-bdc6-c69e92b82977)
   )
-  (junction (at 128.27 158.75) (diameter 0) (color 0 0 0 0)
+  (junction (at 119.38 121.92) (diameter 0) (color 0 0 0 0)
+    (uuid af5972c3-68a4-45d4-940c-22bc54bb38b2)
+  )
+  (junction (at 129.54 157.48) (diameter 0) (color 0 0 0 0)
     (uuid c183d69b-d99b-4aeb-8dbe-86e6390945a8)
   )
-  (junction (at 107.95 113.03) (diameter 0) (color 0 0 0 0)
+  (junction (at 200.66 99.06) (diameter 0) (color 0 0 0 0)
+    (uuid ccaa5fa8-2858-4940-8ef5-ed9210c07b4f)
+  )
+  (junction (at 109.22 111.76) (diameter 0) (color 0 0 0 0)
     (uuid ce249a64-1f09-44d4-b22d-9ede8dc9313b)
   )
-  (junction (at 168.91 158.75) (diameter 0) (color 0 0 0 0)
+  (junction (at 170.18 157.48) (diameter 0) (color 0 0 0 0)
     (uuid cf956d9e-0716-442e-a87c-83852cb64322)
   )
-  (junction (at 209.55 135.89) (diameter 0) (color 0 0 0 0)
+  (junction (at 210.82 134.62) (diameter 0) (color 0 0 0 0)
     (uuid d93ecb05-f576-4a38-8ec9-7fa36c3abebc)
   )
-  (junction (at 189.23 158.75) (diameter 0) (color 0 0 0 0)
+  (junction (at 190.5 157.48) (diameter 0) (color 0 0 0 0)
     (uuid dab05ee3-83b9-42a1-881f-464ea770d3b9)
   )
-  (junction (at 138.43 125.73) (diameter 0) (color 0 0 0 0)
+  (junction (at 139.7 121.92) (diameter 0) (color 0 0 0 0)
     (uuid e2a5a0cc-8cd6-405d-9bc0-a5e989c0ca2c)
   )
-  (junction (at 199.39 102.87) (diameter 0) (color 0 0 0 0)
-    (uuid edd5b139-3331-4a44-b3aa-1c9d95d4320b)
-  )
-  (junction (at 128.27 90.17) (diameter 0) (color 0 0 0 0)
+  (junction (at 129.54 88.9) (diameter 0) (color 0 0 0 0)
     (uuid f4466a38-3489-4dff-8d12-98a65e6e77b8)
   )
-  (junction (at 107.95 135.89) (diameter 0) (color 0 0 0 0)
+  (junction (at 109.22 134.62) (diameter 0) (color 0 0 0 0)
     (uuid f5392a2b-95b1-4011-b02e-07f8447eda7a)
   )
-  (junction (at 189.23 113.03) (diameter 0) (color 0 0 0 0)
+  (junction (at 190.5 111.76) (diameter 0) (color 0 0 0 0)
     (uuid f82b9ed1-3c95-41ec-8a21-fad2e97461c7)
   )
-  (junction (at 87.63 113.03) (diameter 0) (color 0 0 0 0)
+  (junction (at 88.9 111.76) (diameter 0) (color 0 0 0 0)
     (uuid fc876066-9955-44e3-bc45-7f60d7a300eb)
   )
 
-  (wire (pts (xy 189.23 113.03) (xy 209.55 113.03))
+  (wire (pts (xy 190.5 111.76) (xy 210.82 111.76))
     (stroke (width 0) (type default))
     (uuid 01a7c902-5243-48e2-adcf-c29e954c506c)
   )
-  (wire (pts (xy 209.55 105.41) (xy 209.55 102.87))
+  (wire (pts (xy 190.5 109.22) (xy 190.5 111.76))
+    (stroke (width 0) (type default))
+    (uuid 03109d23-ad7d-49f6-9e5f-65bf01c3f9e4)
+  )
+  (wire (pts (xy 231.14 111.76) (xy 210.82 111.76))
+    (stroke (width 0) (type default))
+    (uuid 067f2c36-ed91-4f68-acad-0752fd5ea329)
+  )
+  (wire (pts (xy 210.82 101.6) (xy 210.82 99.06))
     (stroke (width 0) (type default))
     (uuid 06a79da4-d4c6-4d27-8f08-0586fb208597)
   )
-  (wire (pts (xy 107.95 158.75) (xy 128.27 158.75))
+  (wire (pts (xy 109.22 157.48) (xy 129.54 157.48))
     (stroke (width 0) (type default))
     (uuid 071a3a15-c7cf-4ab1-bd42-78a98e785f7c)
   )
-  (wire (pts (xy 118.11 52.07) (xy 118.11 80.01))
+  (wire (pts (xy 119.38 53.34) (xy 119.38 76.2))
     (stroke (width 0) (type default))
     (uuid 07c72f35-0a05-4457-bfb6-63795159579b)
   )
-  (wire (pts (xy 219.71 80.01) (xy 219.71 102.87))
+  (wire (pts (xy 220.98 76.2) (xy 220.98 99.06))
     (stroke (width 0) (type default))
     (uuid 0a7abb68-a757-49d0-9dff-7b0596c0d7c3)
   )
-  (wire (pts (xy 77.47 62.23) (xy 77.47 80.01))
+  (wire (pts (xy 78.74 63.5) (xy 78.74 76.2))
     (stroke (width 0) (type default))
     (uuid 0c9d8790-eeb8-43e1-9beb-d0561449673f)
   )
-  (wire (pts (xy 229.87 80.01) (xy 229.87 82.55))
+  (wire (pts (xy 231.14 76.2) (xy 231.14 78.74))
     (stroke (width 0) (type default))
     (uuid 0df6f832-0511-43d1-aed6-7f242515eab3)
   )
-  (wire (pts (xy 138.43 102.87) (xy 138.43 125.73))
+  (wire (pts (xy 139.7 99.06) (xy 139.7 121.92))
     (stroke (width 0) (type default))
     (uuid 0f05eca9-71ec-4e97-bc80-778a6b3e99be)
   )
-  (wire (pts (xy 43.18 52.07) (xy 118.11 52.07))
+  (wire (pts (xy 210.82 154.94) (xy 210.82 157.48))
+    (stroke (width 0) (type default))
+    (uuid 10fc9faa-13a0-4dd7-8a93-63323650f6fc)
+  )
+  (wire (pts (xy 43.18 53.34) (xy 119.38 53.34))
     (stroke (width 0) (type default))
     (uuid 115b207f-2d8a-4eb2-a65e-d563d1e0b1a8)
   )
-  (wire (pts (xy 179.07 80.01) (xy 179.07 102.87))
+  (wire (pts (xy 180.34 76.2) (xy 180.34 99.06))
     (stroke (width 0) (type default))
     (uuid 196fbc39-9646-427a-85f6-0a238d2a679c)
   )
-  (wire (pts (xy 43.18 57.15) (xy 97.79 57.15))
+  (wire (pts (xy 43.18 58.42) (xy 99.06 58.42))
     (stroke (width 0) (type default))
     (uuid 1af1dc33-9cac-4704-b55a-e5600001f1cb)
   )
-  (wire (pts (xy 168.91 80.01) (xy 168.91 82.55))
+  (wire (pts (xy 170.18 88.9) (xy 170.18 86.36))
+    (stroke (width 0) (type default))
+    (uuid 1b2816ea-1e84-46b9-b4e9-55382858b959)
+  )
+  (wire (pts (xy 170.18 76.2) (xy 170.18 78.74))
     (stroke (width 0) (type default))
     (uuid 1d9c331b-c06e-47d1-bc13-eebf3078f1e0)
   )
-  (wire (pts (xy 209.55 148.59) (xy 209.55 151.13))
+  (wire (pts (xy 210.82 144.78) (xy 210.82 147.32))
     (stroke (width 0) (type default))
     (uuid 1dc5ba25-1e06-4cbd-acaf-4fc8578dbec7)
   )
-  (wire (pts (xy 219.71 26.67) (xy 219.71 80.01))
+  (wire (pts (xy 220.98 27.94) (xy 220.98 76.2))
     (stroke (width 0) (type default))
     (uuid 1ef3f370-bdb7-48c6-b0da-a1714e9f23ce)
   )
-  (wire (pts (xy 148.59 128.27) (xy 148.59 125.73))
+  (wire (pts (xy 231.14 109.22) (xy 231.14 111.76))
+    (stroke (width 0) (type default))
+    (uuid 2015524a-e841-4a84-8e1a-3ca939435c62)
+  )
+  (wire (pts (xy 149.86 124.46) (xy 149.86 121.92))
     (stroke (width 0) (type default))
     (uuid 213efb46-dcbd-4cc7-a059-bebc9b64cf60)
   )
-  (wire (pts (xy 148.59 158.75) (xy 168.91 158.75))
+  (wire (pts (xy 149.86 157.48) (xy 170.18 157.48))
     (stroke (width 0) (type default))
     (uuid 2390ea38-2329-47de-b769-90f25502c92a)
   )
-  (wire (pts (xy 128.27 135.89) (xy 148.59 135.89))
+  (wire (pts (xy 129.54 134.62) (xy 149.86 134.62))
     (stroke (width 0) (type default))
     (uuid 24dc0e37-1aad-4bb9-a34e-15de53c937c8)
   )
-  (wire (pts (xy 168.91 90.17) (xy 189.23 90.17))
+  (wire (pts (xy 231.14 134.62) (xy 210.82 134.62))
+    (stroke (width 0) (type default))
+    (uuid 258d88a0-700a-4f8b-88ab-2893473f05f5)
+  )
+  (wire (pts (xy 170.18 88.9) (xy 190.5 88.9))
     (stroke (width 0) (type default))
     (uuid 29458d5d-aa4b-42bb-8be2-65e9c08e2343)
   )
-  (wire (pts (xy 209.55 135.89) (xy 229.87 135.89))
+  (wire (pts (xy 170.18 154.94) (xy 170.18 157.48))
     (stroke (width 0) (type default))
-    (uuid 2b27b4af-764e-4317-b839-09699df1e60d)
+    (uuid 2bd18bb0-0f2a-427b-b62e-23f0fdbfe082)
   )
-  (wire (pts (xy 189.23 80.01) (xy 189.23 82.55))
+  (wire (pts (xy 109.22 88.9) (xy 109.22 86.36))
+    (stroke (width 0) (type default))
+    (uuid 2e0e56c9-3bf8-44d9-bac1-400e850c6ebf)
+  )
+  (wire (pts (xy 190.5 76.2) (xy 190.5 78.74))
     (stroke (width 0) (type default))
     (uuid 2edfdb75-6978-42b9-bcc0-e2c34d61de2a)
   )
-  (wire (pts (xy 107.95 80.01) (xy 107.95 82.55))
+  (wire (pts (xy 109.22 76.2) (xy 109.22 78.74))
     (stroke (width 0) (type default))
     (uuid 2ef49366-e73a-4946-b9d7-9b909faae62a)
   )
-  (wire (pts (xy 199.39 80.01) (xy 199.39 102.87))
+  (wire (pts (xy 88.9 88.9) (xy 88.9 86.36))
+    (stroke (width 0) (type default))
+    (uuid 392d2966-46cc-424e-8797-0cbed4e69be2)
+  )
+  (wire (pts (xy 129.54 88.9) (xy 129.54 86.36))
+    (stroke (width 0) (type default))
+    (uuid 3efc721d-be11-45f3-bc9a-e97104d0eb8e)
+  )
+  (wire (pts (xy 149.86 109.22) (xy 149.86 111.76))
+    (stroke (width 0) (type default))
+    (uuid 406c5034-619f-43c7-a6c2-f04133955285)
+  )
+  (wire (pts (xy 200.66 76.2) (xy 200.66 99.06))
     (stroke (width 0) (type default))
     (uuid 40e9c71f-6a80-4aa9-9cc2-7909139b271c)
   )
-  (wire (pts (xy 209.55 113.03) (xy 229.87 113.03))
-    (stroke (width 0) (type default))
-    (uuid 44fe0bcd-11c2-4e6c-9559-ebdc4b3defc5)
-  )
-  (wire (pts (xy 229.87 125.73) (xy 229.87 128.27))
+  (wire (pts (xy 231.14 121.92) (xy 231.14 124.46))
     (stroke (width 0) (type default))
     (uuid 47dba97e-53bb-4ecf-93c9-a51f41eb4a66)
   )
-  (wire (pts (xy 107.95 128.27) (xy 107.95 125.73))
+  (wire (pts (xy 109.22 124.46) (xy 109.22 121.92))
     (stroke (width 0) (type default))
     (uuid 494a2544-88d6-4b24-ab64-acac8dd95e59)
   )
-  (wire (pts (xy 158.75 80.01) (xy 158.75 125.73))
+  (wire (pts (xy 160.02 76.2) (xy 160.02 121.92))
     (stroke (width 0) (type default))
     (uuid 49ae1397-ec1b-42ea-aec8-63c8861608c1)
   )
-  (wire (pts (xy 219.71 125.73) (xy 219.71 148.59))
+  (wire (pts (xy 220.98 121.92) (xy 220.98 144.78))
     (stroke (width 0) (type default))
     (uuid 4a3320ad-065c-4235-865e-fe14ae2cb2e8)
   )
-  (wire (pts (xy 148.59 113.03) (xy 189.23 113.03))
+  (wire (pts (xy 210.82 109.22) (xy 210.82 111.76))
+    (stroke (width 0) (type default))
+    (uuid 4b55f729-7adf-4762-9a9b-598c0f980cfb)
+  )
+  (wire (pts (xy 149.86 111.76) (xy 190.5 111.76))
     (stroke (width 0) (type default))
     (uuid 4e32a432-4f06-4ecf-bf0e-62e6dc75323a)
   )
-  (wire (pts (xy 43.18 135.89) (xy 87.63 135.89))
+  (wire (pts (xy 149.86 88.9) (xy 149.86 86.36))
+    (stroke (width 0) (type default))
+    (uuid 5b3b5e08-76c0-482c-bba4-4e6ef5062449)
+  )
+  (wire (pts (xy 43.18 134.62) (xy 88.9 134.62))
     (stroke (width 0) (type default))
     (uuid 5baa5719-02a1-45ae-b978-3baae1dea5b0)
   )
-  (wire (pts (xy 107.95 90.17) (xy 128.27 90.17))
+  (wire (pts (xy 109.22 88.9) (xy 129.54 88.9))
     (stroke (width 0) (type default))
     (uuid 5d41ef57-5dd3-4ff8-b45c-6a23d059aaeb)
   )
-  (wire (pts (xy 87.63 128.27) (xy 87.63 125.73))
+  (wire (pts (xy 88.9 124.46) (xy 88.9 121.92))
     (stroke (width 0) (type default))
     (uuid 5d536028-9470-4c28-b7b4-1bdc9579d7b0)
   )
-  (wire (pts (xy 199.39 102.87) (xy 199.39 125.73))
+  (wire (pts (xy 200.66 99.06) (xy 200.66 121.92))
     (stroke (width 0) (type default))
     (uuid 609e7bb4-de9b-435b-add0-f3f73094e5e4)
   )
-  (wire (pts (xy 97.79 80.01) (xy 97.79 102.87))
+  (wire (pts (xy 99.06 76.2) (xy 99.06 99.06))
     (stroke (width 0) (type default))
     (uuid 636ceae5-b67c-4ba1-bad9-e6ad76afbafa)
   )
-  (wire (pts (xy 43.18 26.67) (xy 219.71 26.67))
+  (wire (pts (xy 43.18 27.94) (xy 220.98 27.94))
     (stroke (width 0) (type default))
     (uuid 64243242-63b1-414c-83d9-3ec2233b089f)
   )
-  (wire (pts (xy 229.87 105.41) (xy 229.87 102.87))
+  (wire (pts (xy 231.14 101.6) (xy 231.14 99.06))
     (stroke (width 0) (type default))
     (uuid 69310b7d-0b60-45f3-8909-13d9680c9254)
   )
-  (wire (pts (xy 43.18 36.83) (xy 179.07 36.83))
+  (wire (pts (xy 43.18 38.1) (xy 180.34 38.1))
     (stroke (width 0) (type default))
     (uuid 6a4345a5-57c8-4d1a-9312-7d7b18f21121)
   )
-  (wire (pts (xy 138.43 46.99) (xy 138.43 80.01))
+  (wire (pts (xy 139.7 48.26) (xy 139.7 76.2))
     (stroke (width 0) (type default))
     (uuid 6e7cb0f5-109d-4ad9-9957-721da5533b09)
   )
-  (wire (pts (xy 189.23 148.59) (xy 189.23 151.13))
+  (wire (pts (xy 190.5 144.78) (xy 190.5 147.32))
     (stroke (width 0) (type default))
     (uuid 702cb14f-87e8-4819-929b-9b32db5d6667)
   )
-  (wire (pts (xy 138.43 125.73) (xy 138.43 148.59))
+  (wire (pts (xy 139.7 121.92) (xy 139.7 144.78))
     (stroke (width 0) (type default))
     (uuid 706cc595-caba-4209-a2d0-413853c07f76)
   )
-  (wire (pts (xy 128.27 158.75) (xy 148.59 158.75))
+  (wire (pts (xy 129.54 157.48) (xy 149.86 157.48))
     (stroke (width 0) (type default))
     (uuid 717f32c9-db1d-4218-8464-257126c4431e)
   )
-  (wire (pts (xy 168.91 158.75) (xy 189.23 158.75))
+  (wire (pts (xy 170.18 157.48) (xy 190.5 157.48))
     (stroke (width 0) (type default))
     (uuid 71940b82-2831-49c2-bb04-eed3a3dc10ba)
   )
-  (wire (pts (xy 148.59 148.59) (xy 148.59 151.13))
+  (wire (pts (xy 149.86 144.78) (xy 149.86 147.32))
     (stroke (width 0) (type default))
     (uuid 791a1bce-8204-468b-952b-698b61d966fa)
   )
-  (wire (pts (xy 43.18 62.23) (xy 77.47 62.23))
+  (wire (pts (xy 190.5 88.9) (xy 190.5 86.36))
     (stroke (width 0) (type default))
-    (uuid 7c0f731a-b75d-4d60-ab0b-caa04e4cff0f)
+    (uuid 7be54559-a416-467c-9072-d8eca712560f)
   )
-  (wire (pts (xy 43.18 41.91) (xy 158.75 41.91))
+  (wire (pts (xy 43.18 43.18) (xy 160.02 43.18))
     (stroke (width 0) (type default))
     (uuid 7cde940b-06fe-40d5-a4a8-10e14449fe2d)
   )
-  (wire (pts (xy 43.18 31.75) (xy 199.39 31.75))
+  (wire (pts (xy 43.18 33.02) (xy 200.66 33.02))
     (stroke (width 0) (type default))
     (uuid 7f1b8b47-ab6a-4f9b-9542-f36a65824887)
   )
-  (wire (pts (xy 189.23 135.89) (xy 209.55 135.89))
+  (wire (pts (xy 231.14 88.9) (xy 231.14 86.36))
+    (stroke (width 0) (type default))
+    (uuid 81a5e42e-d900-4f51-8d3d-a36ce93e62c0)
+  )
+  (wire (pts (xy 190.5 134.62) (xy 210.82 134.62))
     (stroke (width 0) (type default))
     (uuid 833738b0-4821-4f0e-922a-fd653257d683)
   )
-  (wire (pts (xy 107.95 148.59) (xy 107.95 151.13))
+  (wire (pts (xy 109.22 144.78) (xy 109.22 147.32))
     (stroke (width 0) (type default))
     (uuid 885ab7db-cd08-45fe-b3b9-c7dadcaba136)
   )
-  (wire (pts (xy 168.91 128.27) (xy 168.91 125.73))
+  (wire (pts (xy 170.18 124.46) (xy 170.18 121.92))
     (stroke (width 0) (type default))
     (uuid 8c0d3d40-02e0-43a4-981a-62e0c8d2460d)
   )
-  (wire (pts (xy 179.07 102.87) (xy 179.07 125.73))
+  (wire (pts (xy 180.34 99.06) (xy 180.34 121.92))
     (stroke (width 0) (type default))
     (uuid 8d6dcec9-0e0f-4b61-9bec-64d7b83f9736)
   )
-  (wire (pts (xy 43.18 113.03) (xy 87.63 113.03))
+  (wire (pts (xy 129.54 154.94) (xy 129.54 157.48))
+    (stroke (width 0) (type default))
+    (uuid 8efd48cb-6c16-4686-9dd1-c5fd3e67e029)
+  )
+  (wire (pts (xy 210.82 88.9) (xy 210.82 86.36))
+    (stroke (width 0) (type default))
+    (uuid 8eff96af-e675-4f3f-9c81-61b5c2d30125)
+  )
+  (wire (pts (xy 43.18 111.76) (xy 88.9 111.76))
     (stroke (width 0) (type default))
     (uuid 91014b06-9241-4c43-acab-ad8edcd4e57b)
   )
-  (wire (pts (xy 87.63 113.03) (xy 107.95 113.03))
+  (wire (pts (xy 88.9 111.76) (xy 109.22 111.76))
     (stroke (width 0) (type default))
     (uuid 91393dec-624c-4b68-9e7a-34cb0320d3b1)
   )
-  (wire (pts (xy 189.23 125.73) (xy 189.23 128.27))
+  (wire (pts (xy 190.5 121.92) (xy 190.5 124.46))
     (stroke (width 0) (type default))
     (uuid 930874fa-13a4-4126-80e8-80cdd4a98ab3)
   )
-  (wire (pts (xy 107.95 113.03) (xy 148.59 113.03))
+  (wire (pts (xy 78.74 63.5) (xy 43.18 63.5))
+    (stroke (width 0) (type default))
+    (uuid 9656590a-70e3-4684-a621-c2d73a286e27)
+  )
+  (wire (pts (xy 109.22 132.08) (xy 109.22 134.62))
+    (stroke (width 0) (type default))
+    (uuid 9963c6ac-cd7e-4e91-a314-a18d5b342d99)
+  )
+  (wire (pts (xy 109.22 111.76) (xy 149.86 111.76))
     (stroke (width 0) (type default))
     (uuid 9a4a1d23-29f3-43cb-b23b-19558bbe80be)
   )
-  (wire (pts (xy 77.47 80.01) (xy 77.47 102.87))
+  (wire (pts (xy 78.74 76.2) (xy 78.74 99.06))
     (stroke (width 0) (type default))
     (uuid 9b4c2812-2624-4b83-b593-68b4168f852d)
   )
-  (wire (pts (xy 219.71 102.87) (xy 219.71 125.73))
+  (wire (pts (xy 149.86 154.94) (xy 149.86 157.48))
+    (stroke (width 0) (type default))
+    (uuid 9e6de21b-2e06-4008-b7cc-256aaca61d4b)
+  )
+  (wire (pts (xy 220.98 99.06) (xy 220.98 121.92))
     (stroke (width 0) (type default))
     (uuid a0eedc77-5434-4500-ac7e-45ded9b9344a)
   )
-  (wire (pts (xy 138.43 80.01) (xy 138.43 102.87))
+  (wire (pts (xy 139.7 76.2) (xy 139.7 99.06))
     (stroke (width 0) (type default))
     (uuid a1707475-2392-44a3-95cc-6a1b22d4f8d3)
   )
-  (wire (pts (xy 87.63 135.89) (xy 107.95 135.89))
+  (wire (pts (xy 88.9 134.62) (xy 109.22 134.62))
     (stroke (width 0) (type default))
     (uuid a243ffcf-9859-4752-940c-75bb342b637c)
   )
-  (wire (pts (xy 77.47 102.87) (xy 77.47 125.73))
+  (wire (pts (xy 78.74 99.06) (xy 78.74 121.92))
     (stroke (width 0) (type default))
     (uuid ad3f31ca-233d-4cd3-ae94-cedcd9671abf)
   )
-  (wire (pts (xy 97.79 102.87) (xy 97.79 125.73))
+  (wire (pts (xy 99.06 99.06) (xy 99.06 121.92))
     (stroke (width 0) (type default))
     (uuid adfb6628-22f4-4351-8ae0-8b2aa6343bfd)
   )
-  (wire (pts (xy 43.18 158.75) (xy 107.95 158.75))
+  (wire (pts (xy 149.86 132.08) (xy 149.86 134.62))
+    (stroke (width 0) (type default))
+    (uuid b0fe930f-2b54-4d11-bbb0-3b1b726da362)
+  )
+  (wire (pts (xy 43.18 157.48) (xy 109.22 157.48))
     (stroke (width 0) (type default))
     (uuid b33bc777-8a2c-479d-a10f-9d68b3e76dca)
   )
-  (wire (pts (xy 107.95 135.89) (xy 128.27 135.89))
+  (wire (pts (xy 109.22 134.62) (xy 129.54 134.62))
     (stroke (width 0) (type default))
     (uuid b34ca649-b314-4d58-b90d-1fde56435d70)
   )
-  (wire (pts (xy 118.11 125.73) (xy 118.11 148.59))
+  (wire (pts (xy 119.38 121.92) (xy 119.38 144.78))
     (stroke (width 0) (type default))
     (uuid b5179f76-7862-4dfb-bfae-08e3739b2cb0)
   )
-  (wire (pts (xy 128.27 148.59) (xy 128.27 151.13))
+  (wire (pts (xy 129.54 144.78) (xy 129.54 147.32))
     (stroke (width 0) (type default))
     (uuid b53a1c8e-17b5-44db-9709-a81740e76d32)
   )
-  (wire (pts (xy 97.79 57.15) (xy 97.79 80.01))
+  (wire (pts (xy 99.06 58.42) (xy 99.06 76.2))
     (stroke (width 0) (type default))
     (uuid be5e5050-dfa7-4b26-a880-a66757d3a983)
   )
-  (wire (pts (xy 189.23 158.75) (xy 209.55 158.75))
+  (wire (pts (xy 190.5 157.48) (xy 210.82 157.48))
     (stroke (width 0) (type default))
     (uuid bf99532a-5201-4fbb-a4e5-4dc0557295e9)
   )
-  (wire (pts (xy 128.27 90.17) (xy 148.59 90.17))
+  (wire (pts (xy 88.9 109.22) (xy 88.9 111.76))
+    (stroke (width 0) (type default))
+    (uuid bfc7dca3-1bfd-42e1-a6b5-cedc76ea5d6b)
+  )
+  (wire (pts (xy 190.5 132.08) (xy 190.5 134.62))
+    (stroke (width 0) (type default))
+    (uuid c18c6eab-43f7-4f9d-a131-5010b26a9717)
+  )
+  (wire (pts (xy 231.14 157.48) (xy 210.82 157.48))
+    (stroke (width 0) (type default))
+    (uuid c4554252-eb90-4d58-a965-da5ce32e3824)
+  )
+  (wire (pts (xy 109.22 154.94) (xy 109.22 157.48))
+    (stroke (width 0) (type default))
+    (uuid c800aaed-6d45-4e12-8e21-83fe1e6f47c4)
+  )
+  (wire (pts (xy 129.54 88.9) (xy 149.86 88.9))
     (stroke (width 0) (type default))
     (uuid c840950b-5fae-4f40-97b0-70be7dc690ca)
   )
-  (wire (pts (xy 158.75 41.91) (xy 158.75 80.01))
+  (wire (pts (xy 160.02 43.18) (xy 160.02 76.2))
     (stroke (width 0) (type default))
     (uuid c8a9b0db-5092-4b29-a780-ba0176c11724)
   )
-  (wire (pts (xy 179.07 36.83) (xy 179.07 80.01))
+  (wire (pts (xy 180.34 38.1) (xy 180.34 76.2))
     (stroke (width 0) (type default))
     (uuid cad8bdc2-4461-42f8-be87-7176b6be659c)
   )
-  (wire (pts (xy 128.27 128.27) (xy 128.27 125.73))
+  (wire (pts (xy 129.54 124.46) (xy 129.54 121.92))
     (stroke (width 0) (type default))
     (uuid cd288464-1d27-44c0-8a8e-6b6190e78293)
   )
-  (wire (pts (xy 43.18 46.99) (xy 138.43 46.99))
+  (wire (pts (xy 43.18 48.26) (xy 139.7 48.26))
     (stroke (width 0) (type default))
     (uuid d21edabd-f4ba-405f-a512-e66370d40572)
   )
-  (wire (pts (xy 179.07 125.73) (xy 179.07 148.59))
+  (wire (pts (xy 180.34 121.92) (xy 180.34 144.78))
     (stroke (width 0) (type default))
     (uuid d401b9d4-a255-44f5-a432-68e931b3c7f9)
   )
-  (wire (pts (xy 199.39 31.75) (xy 199.39 80.01))
+  (wire (pts (xy 231.14 154.94) (xy 231.14 157.48))
+    (stroke (width 0) (type default))
+    (uuid d502e849-e89c-4417-a1f4-af1ba8815315)
+  )
+  (wire (pts (xy 200.66 33.02) (xy 200.66 76.2))
     (stroke (width 0) (type default))
     (uuid d5bcc89a-49f3-44aa-8b23-7e238da295a2)
   )
-  (wire (pts (xy 148.59 80.01) (xy 148.59 82.55))
+  (wire (pts (xy 170.18 132.08) (xy 170.18 134.62))
+    (stroke (width 0) (type default))
+    (uuid d7773d8a-24c1-4d7a-a24b-b7e2b6822d2e)
+  )
+  (wire (pts (xy 149.86 76.2) (xy 149.86 78.74))
     (stroke (width 0) (type default))
     (uuid d8efbd2e-f1dc-47e2-a396-6c92e1567515)
   )
-  (wire (pts (xy 107.95 102.87) (xy 107.95 105.41))
+  (wire (pts (xy 109.22 99.06) (xy 109.22 101.6))
     (stroke (width 0) (type default))
     (uuid d9f7c30c-d2a2-4ff3-a005-0e7a7d133c0f)
   )
-  (wire (pts (xy 209.55 90.17) (xy 229.87 90.17))
+  (wire (pts (xy 210.82 88.9) (xy 231.14 88.9))
     (stroke (width 0) (type default))
     (uuid dbf17e4e-f072-410c-a173-6af3645b8942)
   )
-  (wire (pts (xy 148.59 90.17) (xy 168.91 90.17))
+  (wire (pts (xy 88.9 132.08) (xy 88.9 134.62))
+    (stroke (width 0) (type default))
+    (uuid ddcf851d-2d94-45de-9208-9716ef9ed824)
+  )
+  (wire (pts (xy 149.86 88.9) (xy 170.18 88.9))
     (stroke (width 0) (type default))
     (uuid e0de8aa6-a160-4c0b-b181-506490ce65a9)
   )
-  (wire (pts (xy 158.75 125.73) (xy 158.75 148.59))
+  (wire (pts (xy 160.02 121.92) (xy 160.02 144.78))
     (stroke (width 0) (type default))
     (uuid e3dea6dd-400d-415c-86a7-f39013f78a63)
   )
-  (wire (pts (xy 97.79 125.73) (xy 97.79 148.59))
+  (wire (pts (xy 99.06 121.92) (xy 99.06 144.78))
     (stroke (width 0) (type default))
     (uuid e5de25c2-56a5-4c49-95ea-1427b7b4914b)
   )
-  (wire (pts (xy 209.55 80.01) (xy 209.55 82.55))
+  (wire (pts (xy 210.82 76.2) (xy 210.82 78.74))
     (stroke (width 0) (type default))
     (uuid e607641d-3811-4a29-bb44-1dd896a4135e)
   )
-  (wire (pts (xy 118.11 80.01) (xy 118.11 125.73))
+  (wire (pts (xy 129.54 132.08) (xy 129.54 134.62))
+    (stroke (width 0) (type default))
+    (uuid e6a3357f-d3cb-4c20-a01f-749b77f2e0f8)
+  )
+  (wire (pts (xy 119.38 76.2) (xy 119.38 121.92))
     (stroke (width 0) (type default))
     (uuid e6fa55e0-37bd-4829-b3aa-72bec6c1e001)
   )
-  (wire (pts (xy 87.63 90.17) (xy 107.95 90.17))
+  (wire (pts (xy 88.9 88.9) (xy 109.22 88.9))
     (stroke (width 0) (type default))
     (uuid e711da47-b9e7-4cdd-a01f-0b5dc74da635)
   )
-  (wire (pts (xy 148.59 105.41) (xy 148.59 102.87))
+  (wire (pts (xy 149.86 101.6) (xy 149.86 99.06))
     (stroke (width 0) (type default))
     (uuid e9a9307b-8e7f-486b-a44f-a0f61e6c8f56)
   )
-  (wire (pts (xy 87.63 105.41) (xy 87.63 102.87))
+  (wire (pts (xy 88.9 101.6) (xy 88.9 99.06))
     (stroke (width 0) (type default))
     (uuid ec444b97-7ddd-4497-8e72-a8fcb4840c03)
   )
-  (wire (pts (xy 87.63 82.55) (xy 87.63 80.01))
+  (wire (pts (xy 88.9 78.74) (xy 88.9 76.2))
     (stroke (width 0) (type default))
     (uuid efb07c38-90cd-4105-bf6b-cfbd092ad38b)
   )
-  (wire (pts (xy 229.87 151.13) (xy 229.87 148.59))
+  (wire (pts (xy 231.14 147.32) (xy 231.14 144.78))
     (stroke (width 0) (type default))
     (uuid f411576d-0494-481f-9faa-47d567215281)
   )
-  (wire (pts (xy 148.59 135.89) (xy 168.91 135.89))
+  (wire (pts (xy 231.14 132.08) (xy 231.14 134.62))
+    (stroke (width 0) (type default))
+    (uuid f89567d0-552e-40de-a61e-d0bd2d9e49cb)
+  )
+  (wire (pts (xy 149.86 134.62) (xy 170.18 134.62))
     (stroke (width 0) (type default))
     (uuid f8ade6a3-4159-4388-ba70-af4562d59210)
   )
-  (wire (pts (xy 168.91 135.89) (xy 189.23 135.89))
+  (wire (pts (xy 170.18 134.62) (xy 190.5 134.62))
     (stroke (width 0) (type default))
     (uuid f8ea303a-3c80-4ac2-9761-aff4ce94c284)
   )
-  (wire (pts (xy 209.55 125.73) (xy 209.55 128.27))
+  (wire (pts (xy 210.82 121.92) (xy 210.82 124.46))
     (stroke (width 0) (type default))
     (uuid f93697e1-c9b4-4aab-b7d1-755ddf637fd7)
   )
-  (wire (pts (xy 189.23 105.41) (xy 189.23 102.87))
+  (wire (pts (xy 190.5 101.6) (xy 190.5 99.06))
     (stroke (width 0) (type default))
     (uuid fa7cb7c3-108f-41c6-a736-254968c20bcf)
   )
-  (wire (pts (xy 43.18 90.17) (xy 87.63 90.17))
+  (wire (pts (xy 43.18 88.9) (xy 88.9 88.9))
     (stroke (width 0) (type default))
     (uuid fb5dec1c-0fc8-4a38-b4dc-6d0091afcc1d)
   )
-  (wire (pts (xy 209.55 158.75) (xy 229.87 158.75))
-    (stroke (width 0) (type default))
-    (uuid fbec13a5-0054-47e9-96a2-6543b8ca0608)
-  )
-  (wire (pts (xy 189.23 90.17) (xy 209.55 90.17))
+  (wire (pts (xy 190.5 88.9) (xy 210.82 88.9))
     (stroke (width 0) (type default))
     (uuid fc2aa2f6-214e-4f7f-82c3-4fd5ffc05375)
   )
-  (wire (pts (xy 128.27 82.55) (xy 128.27 80.01))
+  (wire (pts (xy 190.5 154.94) (xy 190.5 157.48))
+    (stroke (width 0) (type default))
+    (uuid fe527cc2-3d26-4322-b0f2-906dd232b4b3)
+  )
+  (wire (pts (xy 129.54 78.74) (xy 129.54 76.2))
     (stroke (width 0) (type default))
     (uuid fe82371e-9fdf-4931-815c-a702b8d25752)
   )
-  (wire (pts (xy 199.39 125.73) (xy 199.39 148.59))
+  (wire (pts (xy 210.82 132.08) (xy 210.82 134.62))
+    (stroke (width 0) (type default))
+    (uuid fef8c5b8-76fd-4ae3-9143-0e343a969ec0)
+  )
+  (wire (pts (xy 200.66 121.92) (xy 200.66 144.78))
     (stroke (width 0) (type default))
     (uuid ff514e28-0b1d-412b-afd8-cbe6bae8e4b5)
   )
-  (wire (pts (xy 168.91 148.59) (xy 168.91 151.13))
+  (wire (pts (xy 109.22 109.22) (xy 109.22 111.76))
+    (stroke (width 0) (type default))
+    (uuid ff772124-d41b-4a8f-9b3c-ea7b57e036ab)
+  )
+  (wire (pts (xy 170.18 144.78) (xy 170.18 147.32))
     (stroke (width 0) (type default))
     (uuid ff79896b-bbd3-4e8b-8fbd-b9e468707d1a)
   )
 
-  (text "@" (at 84.328 148.082 0)
+  (text "@" (at 84.328 143.002 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 20e1e278-9699-4960-b91e-e2a5c38d460b)
   )
-  (text "Caps Lock" (at 119.38 106.68 0)
+  (text "Caps Lock" (at 119.38 101.6 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 8ef0da52-553a-45ac-a024-44a6ed337a0a)
   )
@@ -735,148 +920,148 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid b0a325d5-fb04-47f5-ba31-dae446b7bf39)
   )
-  (text "Line Feed" (at 161.036 106.299 0)
+  (text "Line Feed" (at 161.036 101.219 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid f3828670-38c5-4613-8915-2c6e2af79014)
   )
 
-  (hierarchical_label "Row7" (shape input) (at 43.18 158.75 180) (fields_autoplaced)
+  (hierarchical_label "Row7" (shape input) (at 43.18 157.48 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 03495ef3-bd8f-4e76-ab96-a7dad713c190)
   )
-  (hierarchical_label "Col2" (shape input) (at 43.18 52.07 180) (fields_autoplaced)
+  (hierarchical_label "Col2" (shape input) (at 43.18 53.34 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 51a6ad16-d7b9-4c73-bde7-6edf5a0946cb)
   )
-  (hierarchical_label "Row4" (shape input) (at 43.18 90.17 180) (fields_autoplaced)
+  (hierarchical_label "Row4" (shape input) (at 43.18 88.9 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 61a40458-99e4-4217-832f-685a55ceb2aa)
   )
-  (hierarchical_label "Col5" (shape input) (at 43.18 36.83 180) (fields_autoplaced)
+  (hierarchical_label "Col5" (shape input) (at 43.18 38.1 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 68cdc088-8998-4a57-8757-5a18f146a555)
   )
-  (hierarchical_label "Row6" (shape input) (at 43.18 135.89 180) (fields_autoplaced)
+  (hierarchical_label "Row6" (shape input) (at 43.18 134.62 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 73632573-f234-4cd6-9186-ee89a3255385)
   )
-  (hierarchical_label "Col6" (shape input) (at 43.18 31.75 180) (fields_autoplaced)
+  (hierarchical_label "Col6" (shape input) (at 43.18 33.02 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid 870fabfb-c1b8-4655-a3fa-78476a978d80)
   )
-  (hierarchical_label "Col0" (shape input) (at 43.18 62.23 180) (fields_autoplaced)
+  (hierarchical_label "Col0" (shape input) (at 43.18 63.5 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid aee177a1-f0aa-4c20-990f-4f543c46051f)
   )
-  (hierarchical_label "Col1" (shape input) (at 43.18 57.15 180) (fields_autoplaced)
+  (hierarchical_label "Col1" (shape input) (at 43.18 58.42 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid b25eb654-b67d-4f65-925a-b0dcb07bb97b)
   )
-  (hierarchical_label "Row5" (shape input) (at 43.18 113.03 180) (fields_autoplaced)
+  (hierarchical_label "Row5" (shape input) (at 43.18 111.76 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid b401dd2f-1227-4907-9a24-58317335779e)
   )
-  (hierarchical_label "Col3" (shape input) (at 43.18 46.99 180) (fields_autoplaced)
+  (hierarchical_label "Col3" (shape input) (at 43.18 48.26 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid bd6858a4-a48d-43a1-8a59-4bd463d38a50)
   )
-  (hierarchical_label "Col7" (shape input) (at 43.18 26.67 180) (fields_autoplaced)
+  (hierarchical_label "Col7" (shape input) (at 43.18 27.94 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid cfa28bcb-8b42-4298-8df8-28545e63a935)
   )
-  (hierarchical_label "Col4" (shape input) (at 43.18 41.91 180) (fields_autoplaced)
+  (hierarchical_label "Col4" (shape input) (at 43.18 43.18 180) (fields_autoplaced)
     (effects (font (size 1.524 1.524)) (justify right))
     (uuid d44446fa-8a3d-463a-9b27-753b83ad7238)
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 82.55 80.01 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 83.82 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf30f)
-    (property "Reference" "SW1" (at 82.55 72.771 0)
+    (property "Reference" "SW1" (at 83.82 68.961 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "RT Arrow" (at 82.55 75.0824 0)
+    (property "Value" "RT Arrow" (at 83.82 71.2724 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 82.55 74.93 0)
+    (property "Footprint" "unikbd:Key_MX" (at 83.82 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 82.55 74.93 0)
+    (property "Datasheet" "" (at 83.82 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "NO" (at 82.55 80.01 0)
+    (property "Fitted" "NO" (at 83.82 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 82.55 80.01 0)
+    (property "Substitution OK" "NO" (at 83.82 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 82.55 80.01 0)
+    (property "Manufacturer" "Cherry" (at 83.82 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 82.55 80.01 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 83.82 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 44.45 92.71 0)
+    (property "Component Value" "Key" (at 45.72 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 60.452 119.634 0)
+    (property "Tolerance" "If applicable" (at 61.722 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 59.182 104.902 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 60.452 101.092 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 59.436 144.78 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 60.706 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 58.674 101.854 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 59.944 98.044 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 56.134 141.986 0)
+    (property "RoHS" "Yes" (at 57.404 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 55.88 147.828 0)
+    (property "Allow Substitution" "Yes" (at 57.15 144.018 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 56.388 150.114 0)
+    (property "Tracking" "No" (at 57.658 146.304 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 87.63 80.01 0)
+    (property "BOM Comment" "" (at 88.9 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 77.978 116.84 0)
+    (property "Component Type" "Switch" (at 79.248 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 87.63 80.01 0)
+    (property "Package Type" "" (at 88.9 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 87.63 80.01 0)
+    (property "Package Variant" "" (at 88.9 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 60.452 122.174 0)
+    (property "Number of Pins" "2" (at 61.722 118.364 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 60.452 124.206 0)
+    (property "Temp (Storage)" "" (at 61.722 120.396 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 60.706 126.746 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 61.976 122.936 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 60.706 129.54 0)
+    (property "Temp (Soldering)" "If applicable" (at 61.976 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 60.706 132.08 0)
+    (property "Temp Coeff." "If applicable" (at 61.976 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 60.706 134.62 0)
+    (property "Power Rating" "10 mA" (at 61.976 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 60.706 136.906 0)
+    (property "Material" "If applicable" (at 61.976 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 60.706 139.192 0)
+    (property "Class" "If applicable" (at 61.976 135.382 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 56.896 155.702 0)
+    (property "Standards Version" "1.1" (at 58.166 151.892 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 031238b6-aacf-4727-ae84-57a4cd28cd65))
@@ -890,97 +1075,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 102.87 80.01 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 104.14 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf316)
-    (property "Reference" "SW4" (at 102.87 72.771 0)
+    (property "Reference" "SW4" (at 104.14 68.961 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "I" (at 102.87 75.0824 0)
+    (property "Value" "I" (at 104.14 71.2724 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 102.87 74.93 0)
+    (property "Footprint" "unikbd:Key_MX" (at 104.14 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 102.87 74.93 0)
+    (property "Datasheet" "" (at 104.14 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 102.87 80.01 0)
+    (property "Comment" "Common to all layouts" (at 104.14 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 102.87 80.01 0)
+    (property "Fitted" "YES" (at 104.14 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 102.87 80.01 0)
+    (property "Substitution OK" "NO" (at 104.14 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 64.77 92.71 0)
+    (property "Component Value" "Key" (at 66.04 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 80.772 119.634 0)
+    (property "Tolerance" "If applicable" (at 82.042 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 76.708 98.298 0)
+    (property "Manufacturer" "Cherry" (at 77.978 94.488 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 79.502 104.902 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 80.772 101.092 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 79.756 144.78 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 81.026 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 78.994 101.854 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 80.264 98.044 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 76.454 141.986 0)
+    (property "RoHS" "Yes" (at 77.724 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 76.2 147.828 0)
+    (property "Allow Substitution" "Yes" (at 77.47 144.018 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 76.708 150.114 0)
+    (property "Tracking" "No" (at 77.978 146.304 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 107.95 80.01 0)
+    (property "BOM Comment" "" (at 109.22 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 98.298 116.84 0)
+    (property "Component Type" "Switch" (at 99.568 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 107.95 80.01 0)
+    (property "Package Type" "" (at 109.22 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 107.95 80.01 0)
+    (property "Package Variant" "" (at 109.22 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 80.772 122.174 0)
+    (property "Number of Pins" "2" (at 82.042 118.364 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 80.772 124.206 0)
+    (property "Temp (Storage)" "" (at 82.042 120.396 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 81.026 126.746 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 82.296 122.936 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 81.026 129.54 0)
+    (property "Temp (Soldering)" "If applicable" (at 82.296 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 81.026 132.08 0)
+    (property "Temp Coeff." "If applicable" (at 82.296 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 81.026 134.62 0)
+    (property "Power Rating" "10 mA" (at 82.296 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 81.026 136.906 0)
+    (property "Material" "If applicable" (at 82.296 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 81.026 139.192 0)
+    (property "Class" "If applicable" (at 82.296 135.382 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 77.216 155.702 0)
+    (property "Standards Version" "1.1" (at 78.486 151.892 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 102.87 80.01 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 104.14 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f0411cce-40e9-4241-b47a-4b507d4d5cbc))
@@ -994,97 +1179,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 143.51 80.01 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 144.78 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf31d)
-    (property "Reference" "SW12" (at 143.51 72.771 0)
+    (property "Reference" "SW12" (at 144.78 68.961 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Y" (at 143.51 75.0824 0)
+    (property "Value" "Y" (at 144.78 71.2724 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 143.51 74.93 0)
+    (property "Footprint" "unikbd:Key_MX" (at 144.78 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 143.51 74.93 0)
+    (property "Datasheet" "" (at 144.78 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 143.51 80.01 0)
+    (property "Comment" "Common to all layouts" (at 144.78 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 143.51 80.01 0)
+    (property "Fitted" "YES" (at 144.78 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 143.51 80.01 0)
+    (property "Substitution OK" "NO" (at 144.78 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 105.41 92.71 0)
+    (property "Component Value" "Key" (at 106.68 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 121.412 119.634 0)
+    (property "Tolerance" "If applicable" (at 122.682 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 117.348 98.298 0)
+    (property "Manufacturer" "Cherry" (at 118.618 94.488 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 120.142 104.902 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 121.412 101.092 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 120.396 144.78 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 121.666 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 119.634 101.854 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 120.904 98.044 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 117.094 141.986 0)
+    (property "RoHS" "Yes" (at 118.364 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 116.84 147.828 0)
+    (property "Allow Substitution" "Yes" (at 118.11 144.018 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 117.348 150.114 0)
+    (property "Tracking" "No" (at 118.618 146.304 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 148.59 80.01 0)
+    (property "BOM Comment" "" (at 149.86 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 138.938 116.84 0)
+    (property "Component Type" "Switch" (at 140.208 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 148.59 80.01 0)
+    (property "Package Type" "" (at 149.86 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 148.59 80.01 0)
+    (property "Package Variant" "" (at 149.86 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 121.412 122.174 0)
+    (property "Number of Pins" "2" (at 122.682 118.364 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 121.412 124.206 0)
+    (property "Temp (Storage)" "" (at 122.682 120.396 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 121.666 126.746 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 122.936 122.936 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 121.666 129.54 0)
+    (property "Temp (Soldering)" "If applicable" (at 122.936 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 121.666 132.08 0)
+    (property "Temp Coeff." "If applicable" (at 122.936 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 121.666 134.62 0)
+    (property "Power Rating" "10 mA" (at 122.936 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 121.666 136.906 0)
+    (property "Material" "If applicable" (at 122.936 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 121.666 139.192 0)
+    (property "Class" "If applicable" (at 122.936 135.382 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 117.856 155.702 0)
+    (property "Standards Version" "1.1" (at 119.126 151.892 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 143.51 80.01 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 144.78 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d0bb0246-99b0-4cc6-983a-77aaf93a16e7))
@@ -1098,97 +1283,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 123.19 80.01 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 124.46 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf324)
-    (property "Reference" "SW8" (at 123.19 72.771 0)
+    (property "Reference" "SW8" (at 124.46 68.961 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "U" (at 123.19 75.0824 0)
+    (property "Value" "U" (at 124.46 71.2724 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 123.19 74.93 0)
+    (property "Footprint" "unikbd:Key_MX" (at 124.46 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 123.19 74.93 0)
+    (property "Datasheet" "" (at 124.46 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 123.19 80.01 0)
+    (property "Comment" "Common to all layouts" (at 124.46 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 123.19 80.01 0)
+    (property "Fitted" "YES" (at 124.46 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 123.19 80.01 0)
+    (property "Substitution OK" "NO" (at 124.46 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 85.09 92.71 0)
+    (property "Component Value" "Key" (at 86.36 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 101.092 119.634 0)
+    (property "Tolerance" "If applicable" (at 102.362 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 97.028 98.298 0)
+    (property "Manufacturer" "Cherry" (at 98.298 94.488 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 99.822 104.902 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 101.092 101.092 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 100.076 144.78 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 101.346 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 99.314 101.854 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 100.584 98.044 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 96.774 141.986 0)
+    (property "RoHS" "Yes" (at 98.044 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 96.52 147.828 0)
+    (property "Allow Substitution" "Yes" (at 97.79 144.018 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 97.028 150.114 0)
+    (property "Tracking" "No" (at 98.298 146.304 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 128.27 80.01 0)
+    (property "BOM Comment" "" (at 129.54 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 118.618 116.84 0)
+    (property "Component Type" "Switch" (at 119.888 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 128.27 80.01 0)
+    (property "Package Type" "" (at 129.54 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 128.27 80.01 0)
+    (property "Package Variant" "" (at 129.54 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 101.092 122.174 0)
+    (property "Number of Pins" "2" (at 102.362 118.364 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 101.092 124.206 0)
+    (property "Temp (Storage)" "" (at 102.362 120.396 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 101.346 126.746 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 102.616 122.936 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 101.346 129.54 0)
+    (property "Temp (Soldering)" "If applicable" (at 102.616 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 101.346 132.08 0)
+    (property "Temp Coeff." "If applicable" (at 102.616 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 101.346 134.62 0)
+    (property "Power Rating" "10 mA" (at 102.616 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 101.346 136.906 0)
+    (property "Material" "If applicable" (at 102.616 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 101.346 139.192 0)
+    (property "Class" "If applicable" (at 102.616 135.382 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 97.536 155.702 0)
+    (property "Standards Version" "1.1" (at 98.806 151.892 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 123.19 80.01 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 124.46 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid dd5c9f87-7ae0-41f4-8c9b-0358edadc49e))
@@ -1202,97 +1387,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 163.83 80.01 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 165.1 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf32b)
-    (property "Reference" "SW16" (at 163.83 72.771 0)
+    (property "Reference" "SW16" (at 165.1 68.961 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "T" (at 163.83 75.0824 0)
+    (property "Value" "T" (at 165.1 71.2724 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 163.83 74.93 0)
+    (property "Footprint" "unikbd:Key_MX" (at 165.1 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 163.83 74.93 0)
+    (property "Datasheet" "" (at 165.1 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 163.83 80.01 0)
+    (property "Comment" "Common to all layouts" (at 165.1 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 163.83 80.01 0)
+    (property "Fitted" "YES" (at 165.1 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 163.83 80.01 0)
+    (property "Substitution OK" "NO" (at 165.1 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 125.73 92.71 0)
+    (property "Component Value" "Key" (at 127 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 141.732 119.634 0)
+    (property "Tolerance" "If applicable" (at 143.002 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 137.668 98.298 0)
+    (property "Manufacturer" "Cherry" (at 138.938 94.488 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 140.462 104.902 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 141.732 101.092 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 140.716 144.78 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 141.986 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 139.954 101.854 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 141.224 98.044 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 137.414 141.986 0)
+    (property "RoHS" "Yes" (at 138.684 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 137.16 147.828 0)
+    (property "Allow Substitution" "Yes" (at 138.43 144.018 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 137.668 150.114 0)
+    (property "Tracking" "No" (at 138.938 146.304 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 168.91 80.01 0)
+    (property "BOM Comment" "" (at 170.18 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 159.258 116.84 0)
+    (property "Component Type" "Switch" (at 160.528 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 168.91 80.01 0)
+    (property "Package Type" "" (at 170.18 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 168.91 80.01 0)
+    (property "Package Variant" "" (at 170.18 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 141.732 122.174 0)
+    (property "Number of Pins" "2" (at 143.002 118.364 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 141.732 124.206 0)
+    (property "Temp (Storage)" "" (at 143.002 120.396 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 141.986 126.746 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 143.256 122.936 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 141.986 129.54 0)
+    (property "Temp (Soldering)" "If applicable" (at 143.256 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 141.986 132.08 0)
+    (property "Temp Coeff." "If applicable" (at 143.256 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 141.986 134.62 0)
+    (property "Power Rating" "10 mA" (at 143.256 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 141.986 136.906 0)
+    (property "Material" "If applicable" (at 143.256 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 141.986 139.192 0)
+    (property "Class" "If applicable" (at 143.256 135.382 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 138.176 155.702 0)
+    (property "Standards Version" "1.1" (at 139.446 151.892 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 163.83 80.01 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 165.1 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid af696051-6999-4f85-a44a-5f7fc40150b4))
@@ -1306,97 +1491,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 184.15 80.01 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 185.42 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf332)
-    (property "Reference" "SW20" (at 184.15 72.771 0)
+    (property "Reference" "SW20" (at 185.42 68.961 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "R" (at 184.15 75.0824 0)
+    (property "Value" "R" (at 185.42 71.2724 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 184.15 74.93 0)
+    (property "Footprint" "unikbd:Key_MX" (at 185.42 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 184.15 74.93 0)
+    (property "Datasheet" "" (at 185.42 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 184.15 80.01 0)
+    (property "Comment" "Common to all layouts" (at 185.42 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 184.15 80.01 0)
+    (property "Fitted" "YES" (at 185.42 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 184.15 80.01 0)
+    (property "Substitution OK" "NO" (at 185.42 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 146.05 92.71 0)
+    (property "Component Value" "Key" (at 147.32 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 162.052 119.634 0)
+    (property "Tolerance" "If applicable" (at 163.322 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 157.988 98.298 0)
+    (property "Manufacturer" "Cherry" (at 159.258 94.488 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 160.782 104.902 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 162.052 101.092 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 161.036 144.78 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 162.306 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 160.274 101.854 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 161.544 98.044 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 157.734 141.986 0)
+    (property "RoHS" "Yes" (at 159.004 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 157.48 147.828 0)
+    (property "Allow Substitution" "Yes" (at 158.75 144.018 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 157.988 150.114 0)
+    (property "Tracking" "No" (at 159.258 146.304 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 189.23 80.01 0)
+    (property "BOM Comment" "" (at 190.5 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 179.578 116.84 0)
+    (property "Component Type" "Switch" (at 180.848 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 189.23 80.01 0)
+    (property "Package Type" "" (at 190.5 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 189.23 80.01 0)
+    (property "Package Variant" "" (at 190.5 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 162.052 122.174 0)
+    (property "Number of Pins" "2" (at 163.322 118.364 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 162.052 124.206 0)
+    (property "Temp (Storage)" "" (at 163.322 120.396 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 162.306 126.746 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 163.576 122.936 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 162.306 129.54 0)
+    (property "Temp (Soldering)" "If applicable" (at 163.576 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 162.306 132.08 0)
+    (property "Temp Coeff." "If applicable" (at 163.576 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 162.306 134.62 0)
+    (property "Power Rating" "10 mA" (at 163.576 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 162.306 136.906 0)
+    (property "Material" "If applicable" (at 163.576 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 162.306 139.192 0)
+    (property "Class" "If applicable" (at 163.576 135.382 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 158.496 155.702 0)
+    (property "Standards Version" "1.1" (at 159.766 151.892 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 184.15 80.01 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 185.42 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8559aefa-d7d6-4dd1-8cef-111da475b7b7))
@@ -1410,97 +1595,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 224.79 80.01 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 226.06 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf339)
-    (property "Reference" "SW28" (at 224.79 72.771 0)
+    (property "Reference" "SW28" (at 226.06 68.961 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "W" (at 224.79 75.0824 0)
+    (property "Value" "W" (at 226.06 71.2724 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 224.79 74.93 0)
+    (property "Footprint" "unikbd:Key_MX" (at 226.06 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 224.79 74.93 0)
+    (property "Datasheet" "" (at 226.06 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 224.79 80.01 0)
+    (property "Comment" "Common to all layouts" (at 226.06 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 224.79 80.01 0)
+    (property "Fitted" "YES" (at 226.06 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 224.79 80.01 0)
+    (property "Substitution OK" "NO" (at 226.06 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 186.69 92.71 0)
+    (property "Component Value" "Key" (at 187.96 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 202.692 119.634 0)
+    (property "Tolerance" "If applicable" (at 203.962 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 198.628 98.298 0)
+    (property "Manufacturer" "Cherry" (at 199.898 94.488 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 201.422 104.902 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 202.692 101.092 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 201.676 144.78 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 202.946 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 200.914 101.854 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 202.184 98.044 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 198.374 141.986 0)
+    (property "RoHS" "Yes" (at 199.644 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 198.12 147.828 0)
+    (property "Allow Substitution" "Yes" (at 199.39 144.018 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 198.628 150.114 0)
+    (property "Tracking" "No" (at 199.898 146.304 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 229.87 80.01 0)
+    (property "BOM Comment" "" (at 231.14 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 220.218 116.84 0)
+    (property "Component Type" "Switch" (at 221.488 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 229.87 80.01 0)
+    (property "Package Type" "" (at 231.14 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 229.87 80.01 0)
+    (property "Package Variant" "" (at 231.14 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 202.692 122.174 0)
+    (property "Number of Pins" "2" (at 203.962 118.364 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 202.692 124.206 0)
+    (property "Temp (Storage)" "" (at 203.962 120.396 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 202.946 126.746 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 204.216 122.936 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 202.946 129.54 0)
+    (property "Temp (Soldering)" "If applicable" (at 204.216 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 202.946 132.08 0)
+    (property "Temp Coeff." "If applicable" (at 204.216 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 202.946 134.62 0)
+    (property "Power Rating" "10 mA" (at 204.216 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 202.946 136.906 0)
+    (property "Material" "If applicable" (at 204.216 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 202.946 139.192 0)
+    (property "Class" "If applicable" (at 204.216 135.382 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 199.136 155.702 0)
+    (property "Standards Version" "1.1" (at 200.406 151.892 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 224.79 80.01 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 226.06 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e7712d8e-b8d8-412e-8673-490ef4216907))
@@ -1514,97 +1699,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 204.47 80.01 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 205.74 76.2 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf340)
-    (property "Reference" "SW24" (at 204.47 72.771 0)
+    (property "Reference" "SW24" (at 205.74 68.961 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "E" (at 204.47 75.0824 0)
+    (property "Value" "E" (at 205.74 71.2724 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 204.47 74.93 0)
+    (property "Footprint" "unikbd:Key_MX" (at 205.74 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 204.47 74.93 0)
+    (property "Datasheet" "" (at 205.74 71.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 204.47 80.01 0)
+    (property "Comment" "Common to all layouts" (at 205.74 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 204.47 80.01 0)
+    (property "Fitted" "YES" (at 205.74 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 204.47 80.01 0)
+    (property "Substitution OK" "NO" (at 205.74 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 166.37 92.71 0)
+    (property "Component Value" "Key" (at 167.64 88.9 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 182.372 119.634 0)
+    (property "Tolerance" "If applicable" (at 183.642 115.824 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 178.308 98.298 0)
+    (property "Manufacturer" "Cherry" (at 179.578 94.488 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 181.102 104.902 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 182.372 101.092 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 181.356 144.78 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 182.626 140.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 180.594 101.854 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 181.864 98.044 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 178.054 141.986 0)
+    (property "RoHS" "Yes" (at 179.324 138.176 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 177.8 147.828 0)
+    (property "Allow Substitution" "Yes" (at 179.07 144.018 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 178.308 150.114 0)
+    (property "Tracking" "No" (at 179.578 146.304 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 209.55 80.01 0)
+    (property "BOM Comment" "" (at 210.82 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 199.898 116.84 0)
+    (property "Component Type" "Switch" (at 201.168 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 209.55 80.01 0)
+    (property "Package Type" "" (at 210.82 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 209.55 80.01 0)
+    (property "Package Variant" "" (at 210.82 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 182.372 122.174 0)
+    (property "Number of Pins" "2" (at 183.642 118.364 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 182.372 124.206 0)
+    (property "Temp (Storage)" "" (at 183.642 120.396 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 182.626 126.746 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 183.896 122.936 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 182.626 129.54 0)
+    (property "Temp (Soldering)" "If applicable" (at 183.896 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 182.626 132.08 0)
+    (property "Temp Coeff." "If applicable" (at 183.896 128.27 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 182.626 134.62 0)
+    (property "Power Rating" "10 mA" (at 183.896 130.81 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 182.626 136.906 0)
+    (property "Material" "If applicable" (at 183.896 133.096 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 182.626 139.192 0)
+    (property "Class" "If applicable" (at 183.896 135.382 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 178.816 155.702 0)
+    (property "Standards Version" "1.1" (at 180.086 151.892 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 204.47 80.01 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 205.74 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d471d9e8-97b9-4e68-b77e-f3f5b19841a0))
@@ -1618,43 +1803,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 107.95 86.36 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 109.22 86.36 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf347)
-    (property "Reference" "D5" (at 109.9566 85.1916 90)
+    (property "Reference" "D5" (at 111.2266 85.1916 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 109.9566 87.503 90)
+    (property "Value" "1N4148" (at 111.2266 87.503 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 130.81 106.68 0)
+    (property "Footprint" "unikbd:diode-combined" (at 132.08 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 128.27 93.98 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 129.54 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 107.95 86.36 0)
+    (property "Fitted" "Yes" (at 109.22 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 107.95 86.36 0)
+    (property "Substitution OK" " YES " (at 109.22 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 107.95 86.36 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 109.22 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 107.95 86.36 0)
+    (property "Manufacturer" "Diodes, Inc." (at 109.22 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 107.95 86.36 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 109.22 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 107.95 86.36 0)
+    (property "Package" " SOT-23-3 " (at 109.22 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 107.95 86.36 0)
+    (property "LCSC" "C118751" (at 109.22 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 107.95 86.36 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 109.22 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 104.394 77.216 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 148.844 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 134.112 109.728 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 173.99 109.474 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 171.196 112.776 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 177.038 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 179.324 112.522 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 139.7 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 146.05 90.932 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 121.92 134.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 109.22 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 151.384 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 153.416 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 155.956 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 158.75 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 161.29 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 163.83 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 166.116 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 168.402 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 184.912 112.014 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 500c8c5e-ce18-4d71-a045-5c6083fe56dc))
@@ -1668,43 +1913,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 87.63 86.36 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 88.9 86.36 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf34e)
-    (property "Reference" "D2" (at 89.6366 85.1916 90)
+    (property "Reference" "D2" (at 90.9066 85.1916 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 89.6366 87.503 90)
+    (property "Value" "1N4148" (at 90.9066 87.503 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 110.49 106.68 0)
+    (property "Footprint" "unikbd:diode-combined" (at 111.76 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 107.95 93.98 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 109.22 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 87.63 86.36 0)
+    (property "Fitted" "Yes" (at 88.9 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 87.63 86.36 0)
+    (property "Substitution OK" " YES " (at 88.9 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 87.63 86.36 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 88.9 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 87.63 86.36 0)
+    (property "Manufacturer" "Diodes, Inc." (at 88.9 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 87.63 86.36 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 88.9 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 87.63 86.36 0)
+    (property "Package" " SOT-23-3 " (at 88.9 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 87.63 86.36 0)
+    (property "LCSC" "C118751" (at 88.9 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 87.63 86.36 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 88.9 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 84.074 77.216 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 128.524 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 113.792 109.728 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 153.67 109.474 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 150.876 112.776 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 156.718 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 159.004 112.522 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 119.38 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 125.73 90.932 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 101.6 134.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 88.9 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 131.064 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 133.096 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 135.636 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 138.43 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 140.97 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 143.51 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 145.796 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 148.082 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 164.592 112.014 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6e733359-1fa1-4e96-8444-ded764c617fb))
@@ -1718,43 +2023,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 128.27 86.36 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 129.54 86.36 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf355)
-    (property "Reference" "D9" (at 130.2766 85.1916 90)
+    (property "Reference" "D9" (at 131.5466 85.1916 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 130.2766 87.503 90)
+    (property "Value" "1N4148" (at 131.5466 87.503 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 151.13 106.68 0)
+    (property "Footprint" "unikbd:diode-combined" (at 152.4 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 148.59 93.98 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 149.86 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 128.27 86.36 0)
+    (property "Fitted" "Yes" (at 129.54 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 128.27 86.36 0)
+    (property "Substitution OK" " YES " (at 129.54 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 128.27 86.36 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 129.54 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 128.27 86.36 0)
+    (property "Manufacturer" "Diodes, Inc." (at 129.54 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 128.27 86.36 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 129.54 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 128.27 86.36 0)
+    (property "Package" " SOT-23-3 " (at 129.54 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 128.27 86.36 0)
+    (property "LCSC" "C118751" (at 129.54 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 128.27 86.36 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 129.54 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 124.714 77.216 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 169.164 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 154.432 109.728 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 194.31 109.474 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 191.516 112.776 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 197.358 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 199.644 112.522 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 160.02 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 166.37 90.932 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 142.24 134.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 129.54 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 171.704 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 173.736 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 176.276 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 179.07 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 181.61 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 184.15 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 186.436 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 188.722 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 205.232 112.014 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 36267186-fbc1-48e6-bbf9-357901e12263))
@@ -1768,43 +2133,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 148.59 86.36 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 149.86 86.36 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf35c)
-    (property "Reference" "D13" (at 150.5966 85.1916 90)
+    (property "Reference" "D13" (at 151.8666 85.1916 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 150.5966 87.503 90)
+    (property "Value" "1N4148" (at 151.8666 87.503 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 171.45 106.68 0)
+    (property "Footprint" "unikbd:diode-combined" (at 172.72 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 168.91 93.98 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 170.18 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 148.59 86.36 0)
+    (property "Fitted" "Yes" (at 149.86 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 148.59 86.36 0)
+    (property "Substitution OK" " YES " (at 149.86 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 148.59 86.36 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 149.86 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 148.59 86.36 0)
+    (property "Manufacturer" "Diodes, Inc." (at 149.86 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 148.59 86.36 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 149.86 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 148.59 86.36 0)
+    (property "Package" " SOT-23-3 " (at 149.86 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 148.59 86.36 0)
+    (property "LCSC" "C118751" (at 149.86 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 148.59 86.36 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 149.86 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 145.034 77.216 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 189.484 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 174.752 109.728 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 214.63 109.474 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 211.836 112.776 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 217.678 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 219.964 112.522 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 180.34 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 186.69 90.932 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 162.56 134.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 149.86 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 192.024 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 194.056 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 196.596 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 199.39 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 201.93 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 204.47 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 206.756 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 209.042 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 225.552 112.014 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 576934a6-9582-4e31-8262-bd6d83c67602))
@@ -1818,43 +2243,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 168.91 86.36 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 170.18 86.36 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf363)
-    (property "Reference" "D17" (at 170.9166 85.1916 90)
+    (property "Reference" "D17" (at 172.1866 85.1916 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 170.9166 87.503 90)
+    (property "Value" "1N4148" (at 172.1866 87.503 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 191.77 106.68 0)
+    (property "Footprint" "unikbd:diode-combined" (at 193.04 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 189.23 93.98 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 190.5 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 168.91 86.36 0)
+    (property "Fitted" "Yes" (at 170.18 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 168.91 86.36 0)
+    (property "Substitution OK" " YES " (at 170.18 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 168.91 86.36 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 170.18 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 168.91 86.36 0)
+    (property "Manufacturer" "Diodes, Inc." (at 170.18 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 168.91 86.36 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 170.18 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 168.91 86.36 0)
+    (property "Package" " SOT-23-3 " (at 170.18 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 168.91 86.36 0)
+    (property "LCSC" "C118751" (at 170.18 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 168.91 86.36 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 170.18 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 165.354 77.216 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 209.804 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 195.072 109.728 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 234.95 109.474 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 232.156 112.776 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 237.998 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 240.284 112.522 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 200.66 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 207.01 90.932 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 182.88 134.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 170.18 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 212.344 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 214.376 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 216.916 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 219.71 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 222.25 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 224.79 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 227.076 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 229.362 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 245.872 112.014 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid cc10fef1-9236-48dc-b4be-b700c6ae958a))
@@ -1868,43 +2353,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 189.23 86.36 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 190.5 86.36 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf36a)
-    (property "Reference" "D21" (at 191.2366 85.1916 90)
+    (property "Reference" "D21" (at 192.5066 85.1916 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 191.2366 87.503 90)
+    (property "Value" "1N4148" (at 192.5066 87.503 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 212.09 106.68 0)
+    (property "Footprint" "unikbd:diode-combined" (at 213.36 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 209.55 93.98 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 210.82 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 189.23 86.36 0)
+    (property "Fitted" "Yes" (at 190.5 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 189.23 86.36 0)
+    (property "Substitution OK" " YES " (at 190.5 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 189.23 86.36 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 190.5 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 189.23 86.36 0)
+    (property "Manufacturer" "Diodes, Inc." (at 190.5 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 189.23 86.36 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 190.5 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 189.23 86.36 0)
+    (property "Package" " SOT-23-3 " (at 190.5 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 189.23 86.36 0)
+    (property "LCSC" "C118751" (at 190.5 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 189.23 86.36 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 190.5 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 185.674 77.216 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 230.124 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 215.392 109.728 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 255.27 109.474 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 252.476 112.776 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 258.318 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 260.604 112.522 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 220.98 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 227.33 90.932 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 203.2 134.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 190.5 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 232.664 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 234.696 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 237.236 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 240.03 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 242.57 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 245.11 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 247.396 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 249.682 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 266.192 112.014 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 37e9dc75-6d94-4204-9517-d112fa0bb7c3))
@@ -1918,43 +2463,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 209.55 86.36 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 210.82 86.36 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf371)
-    (property "Reference" "D25" (at 211.5566 85.1916 90)
+    (property "Reference" "D25" (at 212.8266 85.1916 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 211.5566 87.503 90)
+    (property "Value" "1N4148" (at 212.8266 87.503 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 232.41 106.68 0)
+    (property "Footprint" "unikbd:diode-combined" (at 233.68 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 229.87 93.98 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 231.14 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 209.55 86.36 0)
+    (property "Fitted" "Yes" (at 210.82 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 209.55 86.36 0)
+    (property "Substitution OK" " YES " (at 210.82 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 209.55 86.36 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 210.82 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 209.55 86.36 0)
+    (property "Manufacturer" "Diodes, Inc." (at 210.82 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 209.55 86.36 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 210.82 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 209.55 86.36 0)
+    (property "Package" " SOT-23-3 " (at 210.82 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 209.55 86.36 0)
+    (property "LCSC" "C118751" (at 210.82 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 209.55 86.36 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 210.82 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 205.994 77.216 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 250.444 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 235.712 109.728 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 275.59 109.474 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 272.796 112.776 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 278.638 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 280.924 112.522 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 241.3 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 247.65 90.932 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 223.52 134.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 210.82 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 252.984 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 255.016 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 257.556 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 260.35 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 262.89 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 265.43 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 267.716 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 270.002 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 286.512 112.014 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4376b798-c37f-47e3-b8ff-17db6c5f78d0))
@@ -1968,43 +2573,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 229.87 86.36 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 231.14 86.36 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf378)
-    (property "Reference" "D29" (at 231.8766 85.1916 90)
+    (property "Reference" "D29" (at 233.1466 85.1916 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 231.8766 87.503 90)
+    (property "Value" "1N4148" (at 233.1466 87.503 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 252.73 106.68 0)
+    (property "Footprint" "unikbd:diode-combined" (at 254 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 250.19 93.98 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 251.46 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 229.87 86.36 0)
+    (property "Fitted" "Yes" (at 231.14 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 229.87 86.36 0)
+    (property "Substitution OK" " YES " (at 231.14 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 229.87 86.36 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 231.14 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 229.87 86.36 0)
+    (property "Manufacturer" "Diodes, Inc." (at 231.14 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 229.87 86.36 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 231.14 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 229.87 86.36 0)
+    (property "Package" " SOT-23-3 " (at 231.14 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 229.87 86.36 0)
+    (property "LCSC" "C118751" (at 231.14 86.36 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 229.87 86.36 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 231.14 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 226.314 77.216 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 270.764 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 256.032 109.728 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 295.91 109.474 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 293.116 112.776 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 298.958 113.03 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 301.244 112.522 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 261.62 114.3 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 267.97 90.932 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 243.84 134.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 231.14 86.36 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 273.304 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 275.336 108.458 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 277.876 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 280.67 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 283.21 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 285.75 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 288.036 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 290.322 108.204 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 306.832 112.014 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ba11d708-471c-4af9-8bbc-69d97ae5a576))
@@ -2018,94 +2683,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 82.55 102.87 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 83.82 99.06 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf37f)
-    (property "Reference" "SW2" (at 82.55 95.631 0)
+    (property "Reference" "SW2" (at 83.82 91.821 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "LT Arrow" (at 82.55 97.9424 0)
+    (property "Value" "LT Arrow" (at 83.82 94.1324 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 82.55 97.79 0)
+    (property "Footprint" "unikbd:Key_MX" (at 83.82 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 82.55 97.79 0)
+    (property "Datasheet" "" (at 83.82 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "NO" (at 82.55 102.87 0)
+    (property "Fitted" "NO" (at 83.82 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 82.55 102.87 0)
+    (property "Substitution OK" "NO" (at 83.82 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 44.45 115.57 0)
+    (property "Component Value" "Key" (at 45.72 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 60.452 142.494 0)
+    (property "Tolerance" "If applicable" (at 61.722 138.684 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 56.388 121.158 0)
+    (property "Manufacturer" "Cherry" (at 57.658 117.348 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 59.182 127.762 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 60.452 123.952 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 59.436 167.64 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 60.706 163.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 58.674 124.714 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 59.944 120.904 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 56.134 164.846 0)
+    (property "RoHS" "Yes" (at 57.404 161.036 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 55.88 170.688 0)
+    (property "Allow Substitution" "Yes" (at 57.15 166.878 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 56.388 172.974 0)
+    (property "Tracking" "No" (at 57.658 169.164 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 87.63 102.87 0)
+    (property "BOM Comment" "" (at 88.9 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 77.978 139.7 0)
+    (property "Component Type" "Switch" (at 79.248 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 87.63 102.87 0)
+    (property "Package Type" "" (at 88.9 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 87.63 102.87 0)
+    (property "Package Variant" "" (at 88.9 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 60.452 145.034 0)
+    (property "Number of Pins" "2" (at 61.722 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 60.452 147.066 0)
+    (property "Temp (Storage)" "" (at 61.722 143.256 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 60.706 149.606 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 61.976 145.796 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 60.706 152.4 0)
+    (property "Temp (Soldering)" "If applicable" (at 61.976 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 60.706 154.94 0)
+    (property "Temp Coeff." "If applicable" (at 61.976 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 60.706 157.48 0)
+    (property "Power Rating" "10 mA" (at 61.976 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 60.706 159.766 0)
+    (property "Material" "If applicable" (at 61.976 155.956 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 60.706 162.052 0)
+    (property "Class" "If applicable" (at 61.976 158.242 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 56.896 178.562 0)
+    (property "Standards Version" "1.1" (at 58.166 174.752 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 82.55 102.87 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 83.82 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 65e69a78-a51f-4972-bd1a-b19e243a44b4))
@@ -2119,94 +2784,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 102.87 102.87 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 104.14 99.06 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf386)
-    (property "Reference" "SW5" (at 102.87 95.631 0)
+    (property "Reference" "SW5" (at 104.14 91.821 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Repeat" (at 102.87 97.9424 0)
+    (property "Value" "Repeat" (at 104.14 94.1324 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 102.87 97.79 0)
+    (property "Footprint" "unikbd:Key_MX" (at 104.14 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 102.87 97.79 0)
+    (property "Datasheet" "" (at 104.14 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "NO" (at 102.87 102.87 0)
+    (property "Fitted" "NO" (at 104.14 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 102.87 102.87 0)
+    (property "Substitution OK" "NO" (at 104.14 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 64.77 115.57 0)
+    (property "Component Value" "Key" (at 66.04 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 80.772 142.494 0)
+    (property "Tolerance" "If applicable" (at 82.042 138.684 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 76.708 121.158 0)
+    (property "Manufacturer" "Cherry" (at 77.978 117.348 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 79.502 127.762 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 80.772 123.952 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 79.756 167.64 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 81.026 163.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 78.994 124.714 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 80.264 120.904 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 76.454 164.846 0)
+    (property "RoHS" "Yes" (at 77.724 161.036 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 76.2 170.688 0)
+    (property "Allow Substitution" "Yes" (at 77.47 166.878 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 76.708 172.974 0)
+    (property "Tracking" "No" (at 77.978 169.164 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 107.95 102.87 0)
+    (property "BOM Comment" "" (at 109.22 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 98.298 139.7 0)
+    (property "Component Type" "Switch" (at 99.568 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 107.95 102.87 0)
+    (property "Package Type" "" (at 109.22 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 107.95 102.87 0)
+    (property "Package Variant" "" (at 109.22 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 80.772 145.034 0)
+    (property "Number of Pins" "2" (at 82.042 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 80.772 147.066 0)
+    (property "Temp (Storage)" "" (at 82.042 143.256 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 81.026 149.606 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 82.296 145.796 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 81.026 152.4 0)
+    (property "Temp (Soldering)" "If applicable" (at 82.296 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 81.026 154.94 0)
+    (property "Temp Coeff." "If applicable" (at 82.296 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 81.026 157.48 0)
+    (property "Power Rating" "10 mA" (at 82.296 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 81.026 159.766 0)
+    (property "Material" "If applicable" (at 82.296 155.956 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 81.026 162.052 0)
+    (property "Class" "If applicable" (at 82.296 158.242 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 77.216 178.562 0)
+    (property "Standards Version" "1.1" (at 78.486 174.752 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 102.87 102.87 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 104.14 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 61abd159-813f-4a84-8065-a058d496a326))
@@ -2220,97 +2885,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 143.51 102.87 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 144.78 99.06 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf38d)
-    (property "Reference" "SW13" (at 143.51 95.631 0)
+    (property "Reference" "SW13" (at 144.78 91.821 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Return" (at 143.51 97.9424 0)
+    (property "Value" "Return" (at 144.78 94.1324 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 143.51 97.79 0)
+    (property "Footprint" "unikbd:Key_MX" (at 144.78 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 143.51 97.79 0)
+    (property "Datasheet" "" (at 144.78 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 143.51 102.87 0)
+    (property "Comment" "Common to all layouts" (at 144.78 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 143.51 102.87 0)
+    (property "Fitted" "YES" (at 144.78 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 143.51 102.87 0)
+    (property "Substitution OK" "NO" (at 144.78 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 105.41 115.57 0)
+    (property "Component Value" "Key" (at 106.68 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 121.412 142.494 0)
+    (property "Tolerance" "If applicable" (at 122.682 138.684 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 117.348 121.158 0)
+    (property "Manufacturer" "Cherry" (at 118.618 117.348 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 120.142 127.762 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 121.412 123.952 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 120.396 167.64 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 121.666 163.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 119.634 124.714 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 120.904 120.904 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 117.094 164.846 0)
+    (property "RoHS" "Yes" (at 118.364 161.036 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 116.84 170.688 0)
+    (property "Allow Substitution" "Yes" (at 118.11 166.878 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 117.348 172.974 0)
+    (property "Tracking" "No" (at 118.618 169.164 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "1.5U" (at 148.59 102.87 0)
+    (property "BOM Comment" "1.5U" (at 149.86 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 138.938 139.7 0)
+    (property "Component Type" "Switch" (at 140.208 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 148.59 102.87 0)
+    (property "Package Type" "" (at 149.86 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 148.59 102.87 0)
+    (property "Package Variant" "" (at 149.86 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 121.412 145.034 0)
+    (property "Number of Pins" "2" (at 122.682 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 121.412 147.066 0)
+    (property "Temp (Storage)" "" (at 122.682 143.256 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 121.666 149.606 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 122.936 145.796 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 121.666 152.4 0)
+    (property "Temp (Soldering)" "If applicable" (at 122.936 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 121.666 154.94 0)
+    (property "Temp Coeff." "If applicable" (at 122.936 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 121.666 157.48 0)
+    (property "Power Rating" "10 mA" (at 122.936 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 121.666 159.766 0)
+    (property "Material" "If applicable" (at 122.936 155.956 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 121.666 162.052 0)
+    (property "Class" "If applicable" (at 122.936 158.242 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 117.856 178.562 0)
+    (property "Standards Version" "1.1" (at 119.126 174.752 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 143.51 102.87 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 144.78 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 26a1b04f-2338-46bb-8645-943c2f292281))
@@ -2324,97 +2989,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 184.15 102.87 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 185.42 99.06 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf3a2)
-    (property "Reference" "SW21" (at 184.15 95.631 0)
+    (property "Reference" "SW21" (at 185.42 91.821 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "O" (at 184.15 97.9424 0)
+    (property "Value" "O" (at 185.42 94.1324 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 184.15 97.79 0)
+    (property "Footprint" "unikbd:Key_MX" (at 185.42 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 184.15 97.79 0)
+    (property "Datasheet" "" (at 185.42 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 184.15 102.87 0)
+    (property "Comment" "Common to all layouts" (at 185.42 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 184.15 102.87 0)
+    (property "Fitted" "YES" (at 185.42 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 184.15 102.87 0)
+    (property "Substitution OK" "NO" (at 185.42 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 146.05 115.57 0)
+    (property "Component Value" "Key" (at 147.32 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 162.052 142.494 0)
+    (property "Tolerance" "If applicable" (at 163.322 138.684 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 157.988 121.158 0)
+    (property "Manufacturer" "Cherry" (at 159.258 117.348 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 160.782 127.762 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 162.052 123.952 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 161.036 167.64 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 162.306 163.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 160.274 124.714 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 161.544 120.904 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 157.734 164.846 0)
+    (property "RoHS" "Yes" (at 159.004 161.036 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 157.48 170.688 0)
+    (property "Allow Substitution" "Yes" (at 158.75 166.878 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 157.988 172.974 0)
+    (property "Tracking" "No" (at 159.258 169.164 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 189.23 102.87 0)
+    (property "BOM Comment" "" (at 190.5 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 179.578 139.7 0)
+    (property "Component Type" "Switch" (at 180.848 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 189.23 102.87 0)
+    (property "Package Type" "" (at 190.5 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 189.23 102.87 0)
+    (property "Package Variant" "" (at 190.5 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 162.052 145.034 0)
+    (property "Number of Pins" "2" (at 163.322 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 162.052 147.066 0)
+    (property "Temp (Storage)" "" (at 163.322 143.256 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 162.306 149.606 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 163.576 145.796 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 162.306 152.4 0)
+    (property "Temp (Soldering)" "If applicable" (at 163.576 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 162.306 154.94 0)
+    (property "Temp Coeff." "If applicable" (at 163.576 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 162.306 157.48 0)
+    (property "Power Rating" "10 mA" (at 163.576 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 162.306 159.766 0)
+    (property "Material" "If applicable" (at 163.576 155.956 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 162.306 162.052 0)
+    (property "Class" "If applicable" (at 163.576 158.242 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 158.496 178.562 0)
+    (property "Standards Version" "1.1" (at 159.766 174.752 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 184.15 102.87 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 185.42 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d158959a-f9cb-4e2e-bca1-1dede67471f5))
@@ -2428,97 +3093,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 224.79 102.87 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 226.06 99.06 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf3a9)
-    (property "Reference" "SW29" (at 224.79 95.631 0)
+    (property "Reference" "SW29" (at 226.06 91.821 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Period" (at 224.79 97.9424 0)
+    (property "Value" "Period" (at 226.06 94.1324 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 224.79 97.79 0)
+    (property "Footprint" "unikbd:Key_MX" (at 226.06 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 224.79 97.79 0)
+    (property "Datasheet" "" (at 226.06 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 224.79 102.87 0)
+    (property "Comment" "Common to all layouts" (at 226.06 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 224.79 102.87 0)
+    (property "Fitted" "YES" (at 226.06 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 224.79 102.87 0)
+    (property "Substitution OK" "NO" (at 226.06 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 186.69 115.57 0)
+    (property "Component Value" "Key" (at 187.96 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 202.692 142.494 0)
+    (property "Tolerance" "If applicable" (at 203.962 138.684 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 198.628 121.158 0)
+    (property "Manufacturer" "Cherry" (at 199.898 117.348 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 201.422 127.762 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 202.692 123.952 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 201.676 167.64 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 202.946 163.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 200.914 124.714 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 202.184 120.904 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 198.374 164.846 0)
+    (property "RoHS" "Yes" (at 199.644 161.036 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 198.12 170.688 0)
+    (property "Allow Substitution" "Yes" (at 199.39 166.878 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 198.628 172.974 0)
+    (property "Tracking" "No" (at 199.898 169.164 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 229.87 102.87 0)
+    (property "BOM Comment" "" (at 231.14 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 220.218 139.7 0)
+    (property "Component Type" "Switch" (at 221.488 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 229.87 102.87 0)
+    (property "Package Type" "" (at 231.14 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 229.87 102.87 0)
+    (property "Package Variant" "" (at 231.14 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 202.692 145.034 0)
+    (property "Number of Pins" "2" (at 203.962 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 202.692 147.066 0)
+    (property "Temp (Storage)" "" (at 203.962 143.256 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 202.946 149.606 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 204.216 145.796 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 202.946 152.4 0)
+    (property "Temp (Soldering)" "If applicable" (at 204.216 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 202.946 154.94 0)
+    (property "Temp Coeff." "If applicable" (at 204.216 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 202.946 157.48 0)
+    (property "Power Rating" "10 mA" (at 204.216 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 202.946 159.766 0)
+    (property "Material" "If applicable" (at 204.216 155.956 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 202.946 162.052 0)
+    (property "Class" "If applicable" (at 204.216 158.242 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 199.136 178.562 0)
+    (property "Standards Version" "1.1" (at 200.406 174.752 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 224.79 102.87 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 226.06 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4d2df6fb-d859-4ced-b7b5-d7f1d2b71deb))
@@ -2532,97 +3197,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 204.47 102.87 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 205.74 99.06 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf3b0)
-    (property "Reference" "SW25" (at 204.47 95.631 0)
+    (property "Reference" "SW25" (at 205.74 91.821 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "L" (at 204.47 97.9424 0)
+    (property "Value" "L" (at 205.74 94.1324 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 204.47 97.79 0)
+    (property "Footprint" "unikbd:Key_MX" (at 205.74 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 204.47 97.79 0)
+    (property "Datasheet" "" (at 205.74 93.98 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 204.47 102.87 0)
+    (property "Comment" "Common to all layouts" (at 205.74 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 204.47 102.87 0)
+    (property "Fitted" "YES" (at 205.74 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 204.47 102.87 0)
+    (property "Substitution OK" "NO" (at 205.74 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 166.37 115.57 0)
+    (property "Component Value" "Key" (at 167.64 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 182.372 142.494 0)
+    (property "Tolerance" "If applicable" (at 183.642 138.684 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 178.308 121.158 0)
+    (property "Manufacturer" "Cherry" (at 179.578 117.348 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 181.102 127.762 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 182.372 123.952 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 181.356 167.64 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 182.626 163.83 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 180.594 124.714 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 181.864 120.904 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 178.054 164.846 0)
+    (property "RoHS" "Yes" (at 179.324 161.036 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 177.8 170.688 0)
+    (property "Allow Substitution" "Yes" (at 179.07 166.878 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 178.308 172.974 0)
+    (property "Tracking" "No" (at 179.578 169.164 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 209.55 102.87 0)
+    (property "BOM Comment" "" (at 210.82 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 199.898 139.7 0)
+    (property "Component Type" "Switch" (at 201.168 135.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 209.55 102.87 0)
+    (property "Package Type" "" (at 210.82 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 209.55 102.87 0)
+    (property "Package Variant" "" (at 210.82 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 182.372 145.034 0)
+    (property "Number of Pins" "2" (at 183.642 141.224 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 182.372 147.066 0)
+    (property "Temp (Storage)" "" (at 183.642 143.256 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 182.626 149.606 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 183.896 145.796 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 182.626 152.4 0)
+    (property "Temp (Soldering)" "If applicable" (at 183.896 148.59 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 182.626 154.94 0)
+    (property "Temp Coeff." "If applicable" (at 183.896 151.13 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 182.626 157.48 0)
+    (property "Power Rating" "10 mA" (at 183.896 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 182.626 159.766 0)
+    (property "Material" "If applicable" (at 183.896 155.956 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 182.626 162.052 0)
+    (property "Class" "If applicable" (at 183.896 158.242 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 178.816 178.562 0)
+    (property "Standards Version" "1.1" (at 180.086 174.752 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 204.47 102.87 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 205.74 99.06 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 96537184-e6b4-458a-b7d9-1a94aeab736e))
@@ -2636,43 +3301,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 107.95 109.22 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 109.22 109.22 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf3b7)
-    (property "Reference" "D6" (at 109.9566 108.0516 90)
+    (property "Reference" "D6" (at 111.2266 108.0516 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 109.9566 110.363 90)
+    (property "Value" "1N4148" (at 111.2266 110.363 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 130.81 129.54 0)
+    (property "Footprint" "unikbd:diode-combined" (at 132.08 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 128.27 116.84 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 129.54 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 107.95 109.22 0)
+    (property "Fitted" "Yes" (at 109.22 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 107.95 109.22 0)
+    (property "Substitution OK" " YES " (at 109.22 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 107.95 109.22 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 109.22 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 107.95 109.22 0)
+    (property "Manufacturer" "Diodes, Inc." (at 109.22 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 107.95 109.22 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 109.22 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 107.95 109.22 0)
+    (property "Package" " SOT-23-3 " (at 109.22 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 107.95 109.22 0)
+    (property "LCSC" "C118751" (at 109.22 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 107.95 109.22 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 109.22 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 104.394 100.076 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 148.844 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 134.112 132.588 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 173.99 132.334 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 171.196 135.636 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 177.038 135.89 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 179.324 135.382 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 139.7 137.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 146.05 113.792 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 121.92 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 109.22 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 151.384 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 153.416 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 155.956 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 158.75 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 161.29 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 163.83 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 166.116 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 168.402 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 184.912 134.874 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1ba17fe1-f068-430e-a251-18fe9e8aa337))
@@ -2686,43 +3411,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 87.63 109.22 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 88.9 109.22 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf3be)
-    (property "Reference" "D3" (at 89.6366 108.0516 90)
+    (property "Reference" "D3" (at 90.9066 108.0516 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 89.6366 110.363 90)
+    (property "Value" "1N4148" (at 90.9066 110.363 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 110.49 129.54 0)
+    (property "Footprint" "unikbd:diode-combined" (at 111.76 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 107.95 116.84 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 109.22 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 87.63 109.22 0)
+    (property "Fitted" "Yes" (at 88.9 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 87.63 109.22 0)
+    (property "Substitution OK" " YES " (at 88.9 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 87.63 109.22 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 88.9 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 87.63 109.22 0)
+    (property "Manufacturer" "Diodes, Inc." (at 88.9 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 87.63 109.22 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 88.9 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 87.63 109.22 0)
+    (property "Package" " SOT-23-3 " (at 88.9 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 87.63 109.22 0)
+    (property "LCSC" "C118751" (at 88.9 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 87.63 109.22 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 88.9 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 84.074 100.076 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 128.524 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 113.792 132.588 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 153.67 132.334 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 150.876 135.636 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 156.718 135.89 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 159.004 135.382 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 119.38 137.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 125.73 113.792 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 101.6 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 88.9 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 131.064 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 133.096 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 135.636 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 138.43 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 140.97 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 143.51 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 145.796 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 148.082 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 164.592 134.874 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7d7a3295-d8af-400e-b5c4-d470bfc1c87d))
@@ -2736,43 +3521,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 148.59 109.22 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 149.86 109.22 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf3cc)
-    (property "Reference" "D14" (at 150.5966 108.0516 90)
+    (property "Reference" "D14" (at 151.8666 108.0516 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 150.5966 110.363 90)
+    (property "Value" "1N4148" (at 151.8666 110.363 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 171.45 129.54 0)
+    (property "Footprint" "unikbd:diode-combined" (at 172.72 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 168.91 116.84 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 170.18 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 148.59 109.22 0)
+    (property "Fitted" "Yes" (at 149.86 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 148.59 109.22 0)
+    (property "Substitution OK" " YES " (at 149.86 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 148.59 109.22 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 149.86 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 148.59 109.22 0)
+    (property "Manufacturer" "Diodes, Inc." (at 149.86 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 148.59 109.22 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 149.86 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 148.59 109.22 0)
+    (property "Package" " SOT-23-3 " (at 149.86 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 148.59 109.22 0)
+    (property "LCSC" "C118751" (at 149.86 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 148.59 109.22 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 149.86 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 145.034 100.076 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 189.484 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 174.752 132.588 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 214.63 132.334 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 211.836 135.636 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 217.678 135.89 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 219.964 135.382 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 180.34 137.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 186.69 113.792 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 162.56 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 149.86 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 192.024 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 194.056 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 196.596 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 199.39 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 201.93 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 204.47 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 206.756 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 209.042 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 225.552 134.874 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6e4ec92a-0bb5-4b0c-a22f-0b8ca8a70d2d))
@@ -2786,43 +3631,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 189.23 109.22 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 190.5 109.22 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf3da)
-    (property "Reference" "D22" (at 191.2366 108.0516 90)
+    (property "Reference" "D22" (at 192.5066 108.0516 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 191.2366 110.363 90)
+    (property "Value" "1N4148" (at 192.5066 110.363 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 212.09 129.54 0)
+    (property "Footprint" "unikbd:diode-combined" (at 213.36 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 209.55 116.84 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 210.82 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 189.23 109.22 0)
+    (property "Fitted" "Yes" (at 190.5 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 189.23 109.22 0)
+    (property "Substitution OK" " YES " (at 190.5 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 189.23 109.22 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 190.5 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 189.23 109.22 0)
+    (property "Manufacturer" "Diodes, Inc." (at 190.5 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 189.23 109.22 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 190.5 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 189.23 109.22 0)
+    (property "Package" " SOT-23-3 " (at 190.5 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 189.23 109.22 0)
+    (property "LCSC" "C118751" (at 190.5 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 189.23 109.22 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 190.5 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 185.674 100.076 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 230.124 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 215.392 132.588 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 255.27 132.334 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 252.476 135.636 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 258.318 135.89 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 260.604 135.382 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 220.98 137.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 227.33 113.792 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 203.2 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 190.5 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 232.664 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 234.696 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 237.236 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 240.03 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 242.57 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 245.11 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 247.396 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 249.682 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 266.192 134.874 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9cf70181-c47e-44e0-a811-2387d30fa8e8))
@@ -2836,43 +3741,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 209.55 109.22 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 210.82 109.22 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf3e1)
-    (property "Reference" "D26" (at 211.5566 108.0516 90)
+    (property "Reference" "D26" (at 212.8266 108.0516 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 211.5566 110.363 90)
+    (property "Value" "1N4148" (at 212.8266 110.363 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 232.41 129.54 0)
+    (property "Footprint" "unikbd:diode-combined" (at 233.68 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 229.87 116.84 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 231.14 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 209.55 109.22 0)
+    (property "Fitted" "Yes" (at 210.82 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 209.55 109.22 0)
+    (property "Substitution OK" " YES " (at 210.82 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 209.55 109.22 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 210.82 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 209.55 109.22 0)
+    (property "Manufacturer" "Diodes, Inc." (at 210.82 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 209.55 109.22 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 210.82 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 209.55 109.22 0)
+    (property "Package" " SOT-23-3 " (at 210.82 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 209.55 109.22 0)
+    (property "LCSC" "C118751" (at 210.82 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 209.55 109.22 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 210.82 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 205.994 100.076 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 250.444 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 235.712 132.588 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 275.59 132.334 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 272.796 135.636 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 278.638 135.89 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 280.924 135.382 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 241.3 137.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 247.65 113.792 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 223.52 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 210.82 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 252.984 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 255.016 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 257.556 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 260.35 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 262.89 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 265.43 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 267.716 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 270.002 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 286.512 134.874 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 091d3c81-74c6-4649-8f18-4cec499fe684))
@@ -2886,43 +3851,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 229.87 109.22 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 231.14 109.22 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf3e8)
-    (property "Reference" "D30" (at 231.8766 108.0516 90)
+    (property "Reference" "D30" (at 233.1466 108.0516 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 231.8766 110.363 90)
+    (property "Value" "1N4148" (at 233.1466 110.363 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 252.73 129.54 0)
+    (property "Footprint" "unikbd:diode-combined" (at 254 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 250.19 116.84 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 251.46 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 229.87 109.22 0)
+    (property "Fitted" "Yes" (at 231.14 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 229.87 109.22 0)
+    (property "Substitution OK" " YES " (at 231.14 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 229.87 109.22 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 231.14 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 229.87 109.22 0)
+    (property "Manufacturer" "Diodes, Inc." (at 231.14 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 229.87 109.22 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 231.14 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 229.87 109.22 0)
+    (property "Package" " SOT-23-3 " (at 231.14 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 229.87 109.22 0)
+    (property "LCSC" "C118751" (at 231.14 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 229.87 109.22 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 231.14 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 226.314 100.076 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 270.764 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 256.032 132.588 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 295.91 132.334 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 293.116 135.636 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 298.958 135.89 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 301.244 135.382 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 261.62 137.16 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 267.97 113.792 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 243.84 157.48 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 231.14 109.22 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 273.304 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 275.336 131.318 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 277.876 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 280.67 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 283.21 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 285.75 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 288.036 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 290.322 131.064 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 306.832 134.874 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 09cda389-d3a2-435a-82c3-905fd7b7c8fd))
@@ -2936,94 +3961,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 82.55 125.73 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 83.82 121.92 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf3ef)
-    (property "Reference" "SW3" (at 82.55 118.491 0)
+    (property "Reference" "SW3" (at 83.82 114.681 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Tilde" (at 82.55 120.8024 0)
+    (property "Value" "Tilde" (at 83.82 116.9924 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 82.55 120.65 0)
+    (property "Footprint" "unikbd:Key_MX" (at 83.82 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 82.55 120.65 0)
+    (property "Datasheet" "" (at 83.82 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "NO" (at 82.55 125.73 0)
+    (property "Fitted" "NO" (at 83.82 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 82.55 125.73 0)
+    (property "Substitution OK" "NO" (at 83.82 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 44.45 138.43 0)
+    (property "Component Value" "Key" (at 45.72 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 60.452 165.354 0)
+    (property "Tolerance" "If applicable" (at 61.722 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 56.388 144.018 0)
+    (property "Manufacturer" "Cherry" (at 57.658 140.208 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 59.182 150.622 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 60.452 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 59.436 190.5 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 60.706 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 58.674 147.574 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 59.944 143.764 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 56.134 187.706 0)
+    (property "RoHS" "Yes" (at 57.404 183.896 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 55.88 193.548 0)
+    (property "Allow Substitution" "Yes" (at 57.15 189.738 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 56.388 195.834 0)
+    (property "Tracking" "No" (at 57.658 192.024 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 87.63 125.73 0)
+    (property "BOM Comment" "" (at 88.9 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 77.978 162.56 0)
+    (property "Component Type" "Switch" (at 79.248 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 87.63 125.73 0)
+    (property "Package Type" "" (at 88.9 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 87.63 125.73 0)
+    (property "Package Variant" "" (at 88.9 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 60.452 167.894 0)
+    (property "Number of Pins" "2" (at 61.722 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 60.452 169.926 0)
+    (property "Temp (Storage)" "" (at 61.722 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 60.706 172.466 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 61.976 168.656 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 60.706 175.26 0)
+    (property "Temp (Soldering)" "If applicable" (at 61.976 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 60.706 177.8 0)
+    (property "Temp Coeff." "If applicable" (at 61.976 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 60.706 180.34 0)
+    (property "Power Rating" "10 mA" (at 61.976 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 60.706 182.626 0)
+    (property "Material" "If applicable" (at 61.976 178.816 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 60.706 184.912 0)
+    (property "Class" "If applicable" (at 61.976 181.102 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 56.896 201.422 0)
+    (property "Standards Version" "1.1" (at 58.166 197.612 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 82.55 125.73 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 83.82 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b1f3d0fe-d843-408c-b183-326322e6a3d1))
@@ -3037,94 +4062,94 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 102.87 125.73 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 104.14 121.92 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf3f6)
-    (property "Reference" "SW6" (at 102.87 118.491 0)
+    (property "Reference" "SW6" (at 104.14 114.681 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Bracket_Close" (at 105.41 120.65 0)
+    (property "Value" "Bracket_Close" (at 106.68 116.84 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 102.87 120.65 0)
+    (property "Footprint" "unikbd:Key_MX" (at 104.14 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 102.87 120.65 0)
+    (property "Datasheet" "" (at 104.14 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "NO" (at 102.87 125.73 0)
+    (property "Fitted" "NO" (at 104.14 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 102.87 125.73 0)
+    (property "Substitution OK" "NO" (at 104.14 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 64.77 138.43 0)
+    (property "Component Value" "Key" (at 66.04 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 80.772 165.354 0)
+    (property "Tolerance" "If applicable" (at 82.042 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 76.708 144.018 0)
+    (property "Manufacturer" "Cherry" (at 77.978 140.208 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 79.502 150.622 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 80.772 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 79.756 190.5 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 81.026 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 78.994 147.574 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 80.264 143.764 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 76.454 187.706 0)
+    (property "RoHS" "Yes" (at 77.724 183.896 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 76.2 193.548 0)
+    (property "Allow Substitution" "Yes" (at 77.47 189.738 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 76.708 195.834 0)
+    (property "Tracking" "No" (at 77.978 192.024 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 107.95 125.73 0)
+    (property "BOM Comment" "" (at 109.22 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 98.298 162.56 0)
+    (property "Component Type" "Switch" (at 99.568 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 107.95 125.73 0)
+    (property "Package Type" "" (at 109.22 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 107.95 125.73 0)
+    (property "Package Variant" "" (at 109.22 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 80.772 167.894 0)
+    (property "Number of Pins" "2" (at 82.042 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 80.772 169.926 0)
+    (property "Temp (Storage)" "" (at 82.042 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 81.026 172.466 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 82.296 168.656 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 81.026 175.26 0)
+    (property "Temp (Soldering)" "If applicable" (at 82.296 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 81.026 177.8 0)
+    (property "Temp Coeff." "If applicable" (at 82.296 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 81.026 180.34 0)
+    (property "Power Rating" "10 mA" (at 82.296 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 81.026 182.626 0)
+    (property "Material" "If applicable" (at 82.296 178.816 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 81.026 184.912 0)
+    (property "Class" "If applicable" (at 82.296 181.102 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 77.216 201.422 0)
+    (property "Standards Version" "1.1" (at 78.486 197.612 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 102.87 125.73 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 104.14 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0e9e13d8-6338-4994-b9e1-0f302c082140))
@@ -3138,97 +4163,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 143.51 125.73 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 144.78 121.92 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf3fd)
-    (property "Reference" "SW14" (at 143.51 118.491 0)
+    (property "Reference" "SW14" (at 144.78 114.681 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Dash" (at 143.51 120.8024 0)
+    (property "Value" "Dash" (at 144.78 116.9924 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 143.51 120.65 0)
+    (property "Footprint" "unikbd:Key_MX" (at 144.78 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 143.51 120.65 0)
+    (property "Datasheet" "" (at 144.78 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 143.51 125.73 0)
+    (property "Comment" "Common to all layouts" (at 144.78 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 143.51 125.73 0)
+    (property "Fitted" "YES" (at 144.78 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 143.51 125.73 0)
+    (property "Substitution OK" "NO" (at 144.78 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 105.41 138.43 0)
+    (property "Component Value" "Key" (at 106.68 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 121.412 165.354 0)
+    (property "Tolerance" "If applicable" (at 122.682 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 117.348 144.018 0)
+    (property "Manufacturer" "Cherry" (at 118.618 140.208 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 120.142 150.622 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 121.412 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 120.396 190.5 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 121.666 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 119.634 147.574 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 120.904 143.764 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 117.094 187.706 0)
+    (property "RoHS" "Yes" (at 118.364 183.896 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 116.84 193.548 0)
+    (property "Allow Substitution" "Yes" (at 118.11 189.738 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 117.348 195.834 0)
+    (property "Tracking" "No" (at 118.618 192.024 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 148.59 125.73 0)
+    (property "BOM Comment" "" (at 149.86 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 138.938 162.56 0)
+    (property "Component Type" "Switch" (at 140.208 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 148.59 125.73 0)
+    (property "Package Type" "" (at 149.86 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 148.59 125.73 0)
+    (property "Package Variant" "" (at 149.86 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 121.412 167.894 0)
+    (property "Number of Pins" "2" (at 122.682 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 121.412 169.926 0)
+    (property "Temp (Storage)" "" (at 122.682 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 121.666 172.466 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 122.936 168.656 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 121.666 175.26 0)
+    (property "Temp (Soldering)" "If applicable" (at 122.936 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 121.666 177.8 0)
+    (property "Temp Coeff." "If applicable" (at 122.936 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 121.666 180.34 0)
+    (property "Power Rating" "10 mA" (at 122.936 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 121.666 182.626 0)
+    (property "Material" "If applicable" (at 122.936 178.816 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 121.666 184.912 0)
+    (property "Class" "If applicable" (at 122.936 181.102 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 117.856 201.422 0)
+    (property "Standards Version" "1.1" (at 119.126 197.612 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 143.51 125.73 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 144.78 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c8f73df5-18f2-4e1e-981f-99b838378442))
@@ -3242,97 +4267,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 123.19 125.73 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 124.46 121.92 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf404)
-    (property "Reference" "SW10" (at 123.19 118.491 0)
+    (property "Reference" "SW10" (at 124.46 114.681 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Bracket_Open" (at 125.73 120.65 0)
+    (property "Value" "Bracket_Open" (at 127 116.84 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 123.19 120.65 0)
+    (property "Footprint" "unikbd:Key_MX" (at 124.46 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 123.19 120.65 0)
+    (property "Datasheet" "" (at 124.46 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 123.19 125.73 0)
+    (property "Comment" "Common to all layouts" (at 124.46 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 123.19 125.73 0)
+    (property "Fitted" "YES" (at 124.46 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 123.19 125.73 0)
+    (property "Substitution OK" "NO" (at 124.46 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 85.09 138.43 0)
+    (property "Component Value" "Key" (at 86.36 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 101.092 165.354 0)
+    (property "Tolerance" "If applicable" (at 102.362 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 97.028 144.018 0)
+    (property "Manufacturer" "Cherry" (at 98.298 140.208 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 99.822 150.622 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 101.092 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 100.076 190.5 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 101.346 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 99.314 147.574 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 100.584 143.764 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 96.774 187.706 0)
+    (property "RoHS" "Yes" (at 98.044 183.896 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 96.52 193.548 0)
+    (property "Allow Substitution" "Yes" (at 97.79 189.738 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 97.028 195.834 0)
+    (property "Tracking" "No" (at 98.298 192.024 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 128.27 125.73 0)
+    (property "BOM Comment" "" (at 129.54 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 118.618 162.56 0)
+    (property "Component Type" "Switch" (at 119.888 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 128.27 125.73 0)
+    (property "Package Type" "" (at 129.54 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 128.27 125.73 0)
+    (property "Package Variant" "" (at 129.54 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 101.092 167.894 0)
+    (property "Number of Pins" "2" (at 102.362 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 101.092 169.926 0)
+    (property "Temp (Storage)" "" (at 102.362 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 101.346 172.466 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 102.616 168.656 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 101.346 175.26 0)
+    (property "Temp (Soldering)" "If applicable" (at 102.616 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 101.346 177.8 0)
+    (property "Temp Coeff." "If applicable" (at 102.616 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 101.346 180.34 0)
+    (property "Power Rating" "10 mA" (at 102.616 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 101.346 182.626 0)
+    (property "Material" "If applicable" (at 102.616 178.816 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 101.346 184.912 0)
+    (property "Class" "If applicable" (at 102.616 181.102 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 97.536 201.422 0)
+    (property "Standards Version" "1.1" (at 98.806 197.612 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 123.19 125.73 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 124.46 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3d0e8047-0ecc-4f3a-ab05-d102da613323))
@@ -3346,97 +4371,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 163.83 125.73 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 165.1 121.92 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf40b)
-    (property "Reference" "SW18" (at 163.83 118.491 0)
+    (property "Reference" "SW18" (at 165.1 114.681 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "Colon" (at 163.83 120.8024 0)
+    (property "Value" "Colon" (at 165.1 116.9924 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 163.83 120.65 0)
+    (property "Footprint" "unikbd:Key_MX" (at 165.1 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 163.83 120.65 0)
+    (property "Datasheet" "" (at 165.1 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 163.83 125.73 0)
+    (property "Comment" "Common to all layouts" (at 165.1 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 163.83 125.73 0)
+    (property "Fitted" "YES" (at 165.1 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 163.83 125.73 0)
+    (property "Substitution OK" "NO" (at 165.1 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 125.73 138.43 0)
+    (property "Component Value" "Key" (at 127 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 141.732 165.354 0)
+    (property "Tolerance" "If applicable" (at 143.002 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 137.668 144.018 0)
+    (property "Manufacturer" "Cherry" (at 138.938 140.208 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 140.462 150.622 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 141.732 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 140.716 190.5 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 141.986 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 139.954 147.574 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 141.224 143.764 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 137.414 187.706 0)
+    (property "RoHS" "Yes" (at 138.684 183.896 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 137.16 193.548 0)
+    (property "Allow Substitution" "Yes" (at 138.43 189.738 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 137.668 195.834 0)
+    (property "Tracking" "No" (at 138.938 192.024 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 168.91 125.73 0)
+    (property "BOM Comment" "" (at 170.18 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 159.258 162.56 0)
+    (property "Component Type" "Switch" (at 160.528 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 168.91 125.73 0)
+    (property "Package Type" "" (at 170.18 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 168.91 125.73 0)
+    (property "Package Variant" "" (at 170.18 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 141.732 167.894 0)
+    (property "Number of Pins" "2" (at 143.002 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 141.732 169.926 0)
+    (property "Temp (Storage)" "" (at 143.002 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 141.986 172.466 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 143.256 168.656 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 141.986 175.26 0)
+    (property "Temp (Soldering)" "If applicable" (at 143.256 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 141.986 177.8 0)
+    (property "Temp Coeff." "If applicable" (at 143.256 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 141.986 180.34 0)
+    (property "Power Rating" "10 mA" (at 143.256 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 141.986 182.626 0)
+    (property "Material" "If applicable" (at 143.256 178.816 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 141.986 184.912 0)
+    (property "Class" "If applicable" (at 143.256 181.102 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 138.176 201.422 0)
+    (property "Standards Version" "1.1" (at 139.446 197.612 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 163.83 125.73 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 165.1 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 35c90880-8b8d-4c17-986d-739789125ab5))
@@ -3450,97 +4475,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 184.15 125.73 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 185.42 121.92 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf412)
-    (property "Reference" "SW22" (at 184.15 118.491 0)
+    (property "Reference" "SW22" (at 185.42 114.681 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "0" (at 184.15 120.8024 0)
+    (property "Value" "0" (at 185.42 116.9924 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 184.15 120.65 0)
+    (property "Footprint" "unikbd:Key_MX" (at 185.42 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 184.15 120.65 0)
+    (property "Datasheet" "" (at 185.42 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 184.15 125.73 0)
+    (property "Comment" "Common to all layouts" (at 185.42 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 184.15 125.73 0)
+    (property "Fitted" "YES" (at 185.42 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 184.15 125.73 0)
+    (property "Substitution OK" "NO" (at 185.42 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 146.05 138.43 0)
+    (property "Component Value" "Key" (at 147.32 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 162.052 165.354 0)
+    (property "Tolerance" "If applicable" (at 163.322 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 157.988 144.018 0)
+    (property "Manufacturer" "Cherry" (at 159.258 140.208 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 160.782 150.622 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 162.052 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 161.036 190.5 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 162.306 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 160.274 147.574 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 161.544 143.764 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 157.734 187.706 0)
+    (property "RoHS" "Yes" (at 159.004 183.896 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 157.48 193.548 0)
+    (property "Allow Substitution" "Yes" (at 158.75 189.738 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 157.988 195.834 0)
+    (property "Tracking" "No" (at 159.258 192.024 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 189.23 125.73 0)
+    (property "BOM Comment" "" (at 190.5 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 179.578 162.56 0)
+    (property "Component Type" "Switch" (at 180.848 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 189.23 125.73 0)
+    (property "Package Type" "" (at 190.5 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 189.23 125.73 0)
+    (property "Package Variant" "" (at 190.5 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 162.052 167.894 0)
+    (property "Number of Pins" "2" (at 163.322 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 162.052 169.926 0)
+    (property "Temp (Storage)" "" (at 163.322 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 162.306 172.466 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 163.576 168.656 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 162.306 175.26 0)
+    (property "Temp (Soldering)" "If applicable" (at 163.576 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 162.306 177.8 0)
+    (property "Temp Coeff." "If applicable" (at 163.576 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 162.306 180.34 0)
+    (property "Power Rating" "10 mA" (at 163.576 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 162.306 182.626 0)
+    (property "Material" "If applicable" (at 163.576 178.816 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 162.306 184.912 0)
+    (property "Class" "If applicable" (at 163.576 181.102 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 158.496 201.422 0)
+    (property "Standards Version" "1.1" (at 159.766 197.612 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 184.15 125.73 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 185.42 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ce3ee07b-cab6-472a-91d3-ff9164d2e125))
@@ -3554,97 +4579,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 224.79 125.73 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 226.06 121.92 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf419)
-    (property "Reference" "SW30" (at 224.79 118.491 0)
+    (property "Reference" "SW30" (at 226.06 114.681 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "8" (at 224.79 120.8024 0)
+    (property "Value" "8" (at 226.06 116.9924 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 224.79 120.65 0)
+    (property "Footprint" "unikbd:Key_MX" (at 226.06 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 224.79 120.65 0)
+    (property "Datasheet" "" (at 226.06 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 224.79 125.73 0)
+    (property "Comment" "Common to all layouts" (at 226.06 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 224.79 125.73 0)
+    (property "Fitted" "YES" (at 226.06 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 224.79 125.73 0)
+    (property "Substitution OK" "NO" (at 226.06 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 186.69 138.43 0)
+    (property "Component Value" "Key" (at 187.96 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 202.692 165.354 0)
+    (property "Tolerance" "If applicable" (at 203.962 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 198.628 144.018 0)
+    (property "Manufacturer" "Cherry" (at 199.898 140.208 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 201.422 150.622 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 202.692 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 201.676 190.5 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 202.946 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 200.914 147.574 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 202.184 143.764 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 198.374 187.706 0)
+    (property "RoHS" "Yes" (at 199.644 183.896 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 198.12 193.548 0)
+    (property "Allow Substitution" "Yes" (at 199.39 189.738 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 198.628 195.834 0)
+    (property "Tracking" "No" (at 199.898 192.024 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 229.87 125.73 0)
+    (property "BOM Comment" "" (at 231.14 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 220.218 162.56 0)
+    (property "Component Type" "Switch" (at 221.488 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 229.87 125.73 0)
+    (property "Package Type" "" (at 231.14 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 229.87 125.73 0)
+    (property "Package Variant" "" (at 231.14 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 202.692 167.894 0)
+    (property "Number of Pins" "2" (at 203.962 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 202.692 169.926 0)
+    (property "Temp (Storage)" "" (at 203.962 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 202.946 172.466 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 204.216 168.656 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 202.946 175.26 0)
+    (property "Temp (Soldering)" "If applicable" (at 204.216 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 202.946 177.8 0)
+    (property "Temp Coeff." "If applicable" (at 204.216 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 202.946 180.34 0)
+    (property "Power Rating" "10 mA" (at 204.216 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 202.946 182.626 0)
+    (property "Material" "If applicable" (at 204.216 178.816 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 202.946 184.912 0)
+    (property "Class" "If applicable" (at 204.216 181.102 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 199.136 201.422 0)
+    (property "Standards Version" "1.1" (at 200.406 197.612 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 224.79 125.73 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 226.06 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4eabce6c-982d-4931-8ca7-8e68d822d977))
@@ -3658,97 +4683,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 204.47 125.73 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 205.74 121.92 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf420)
-    (property "Reference" "SW26" (at 204.47 118.491 0)
+    (property "Reference" "SW26" (at 205.74 114.681 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "9" (at 204.47 120.8024 0)
+    (property "Value" "9" (at 205.74 116.9924 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 204.47 120.65 0)
+    (property "Footprint" "unikbd:Key_MX" (at 205.74 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 204.47 120.65 0)
+    (property "Datasheet" "" (at 205.74 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 204.47 125.73 0)
+    (property "Comment" "Common to all layouts" (at 205.74 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 204.47 125.73 0)
+    (property "Fitted" "YES" (at 205.74 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 204.47 125.73 0)
+    (property "Substitution OK" "NO" (at 205.74 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 166.37 138.43 0)
+    (property "Component Value" "Key" (at 167.64 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 182.372 165.354 0)
+    (property "Tolerance" "If applicable" (at 183.642 161.544 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 178.308 144.018 0)
+    (property "Manufacturer" "Cherry" (at 179.578 140.208 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 181.102 150.622 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 182.372 146.812 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 181.356 190.5 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 182.626 186.69 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 180.594 147.574 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 181.864 143.764 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 178.054 187.706 0)
+    (property "RoHS" "Yes" (at 179.324 183.896 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 177.8 193.548 0)
+    (property "Allow Substitution" "Yes" (at 179.07 189.738 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 178.308 195.834 0)
+    (property "Tracking" "No" (at 179.578 192.024 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 209.55 125.73 0)
+    (property "BOM Comment" "" (at 210.82 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 199.898 162.56 0)
+    (property "Component Type" "Switch" (at 201.168 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 209.55 125.73 0)
+    (property "Package Type" "" (at 210.82 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 209.55 125.73 0)
+    (property "Package Variant" "" (at 210.82 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 182.372 167.894 0)
+    (property "Number of Pins" "2" (at 183.642 164.084 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 182.372 169.926 0)
+    (property "Temp (Storage)" "" (at 183.642 166.116 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 182.626 172.466 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 183.896 168.656 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 182.626 175.26 0)
+    (property "Temp (Soldering)" "If applicable" (at 183.896 171.45 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 182.626 177.8 0)
+    (property "Temp Coeff." "If applicable" (at 183.896 173.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 182.626 180.34 0)
+    (property "Power Rating" "10 mA" (at 183.896 176.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 182.626 182.626 0)
+    (property "Material" "If applicable" (at 183.896 178.816 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 182.626 184.912 0)
+    (property "Class" "If applicable" (at 183.896 181.102 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 178.816 201.422 0)
+    (property "Standards Version" "1.1" (at 180.086 197.612 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 204.47 125.73 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 205.74 121.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b8b09a0a-04a6-4009-9402-e8f872ae5b76))
@@ -3762,43 +4787,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 107.95 132.08 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 109.22 132.08 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf427)
-    (property "Reference" "D7" (at 109.9566 130.9116 90)
+    (property "Reference" "D7" (at 111.2266 130.9116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 109.9566 133.223 90)
+    (property "Value" "1N4148" (at 111.2266 133.223 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 130.81 152.4 0)
+    (property "Footprint" "unikbd:diode-combined" (at 132.08 152.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 128.27 139.7 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 129.54 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 107.95 132.08 0)
+    (property "Fitted" "Yes" (at 109.22 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 107.95 132.08 0)
+    (property "Substitution OK" " YES " (at 109.22 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 107.95 132.08 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 109.22 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 107.95 132.08 0)
+    (property "Manufacturer" "Diodes, Inc." (at 109.22 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 107.95 132.08 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 109.22 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 107.95 132.08 0)
+    (property "Package" " SOT-23-3 " (at 109.22 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 107.95 132.08 0)
+    (property "LCSC" "C118751" (at 109.22 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 107.95 132.08 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 109.22 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 104.394 122.936 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 148.844 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 134.112 155.448 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 173.99 155.194 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 171.196 158.496 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 177.038 158.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 179.324 158.242 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 139.7 160.02 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 146.05 136.652 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 121.92 180.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 109.22 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 151.384 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 153.416 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 155.956 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 158.75 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 161.29 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 163.83 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 166.116 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 168.402 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 184.912 157.734 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b57a07ae-3ea4-4e33-80e6-83fac360076f))
@@ -3812,43 +4897,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 87.63 132.08 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 88.9 132.08 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf42e)
-    (property "Reference" "D4" (at 89.6366 130.9116 90)
+    (property "Reference" "D4" (at 90.9066 130.9116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 89.6366 133.223 90)
+    (property "Value" "1N4148" (at 90.9066 133.223 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 110.49 152.4 0)
+    (property "Footprint" "unikbd:diode-combined" (at 111.76 152.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 107.95 139.7 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 109.22 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 87.63 132.08 0)
+    (property "Fitted" "Yes" (at 88.9 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 87.63 132.08 0)
+    (property "Substitution OK" " YES " (at 88.9 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 87.63 132.08 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 88.9 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 87.63 132.08 0)
+    (property "Manufacturer" "Diodes, Inc." (at 88.9 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 87.63 132.08 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 88.9 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 87.63 132.08 0)
+    (property "Package" " SOT-23-3 " (at 88.9 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 87.63 132.08 0)
+    (property "LCSC" "C118751" (at 88.9 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 87.63 132.08 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 88.9 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 84.074 122.936 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 128.524 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 113.792 155.448 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 153.67 155.194 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 150.876 158.496 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 156.718 158.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 159.004 158.242 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 119.38 160.02 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 125.73 136.652 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 101.6 180.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 88.9 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 131.064 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 133.096 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 135.636 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 138.43 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 140.97 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 143.51 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 145.796 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 148.082 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 164.592 157.734 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c387f170-4454-4c95-a33d-332e1e78ad0b))
@@ -3862,43 +5007,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 128.27 132.08 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 129.54 132.08 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf435)
-    (property "Reference" "D11" (at 130.2766 130.9116 90)
+    (property "Reference" "D11" (at 131.5466 130.9116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 130.2766 133.223 90)
+    (property "Value" "1N4148" (at 131.5466 133.223 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 151.13 152.4 0)
+    (property "Footprint" "unikbd:diode-combined" (at 152.4 152.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 148.59 139.7 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 149.86 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 128.27 132.08 0)
+    (property "Fitted" "Yes" (at 129.54 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 128.27 132.08 0)
+    (property "Substitution OK" " YES " (at 129.54 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 128.27 132.08 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 129.54 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 128.27 132.08 0)
+    (property "Manufacturer" "Diodes, Inc." (at 129.54 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 128.27 132.08 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 129.54 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 128.27 132.08 0)
+    (property "Package" " SOT-23-3 " (at 129.54 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 128.27 132.08 0)
+    (property "LCSC" "C118751" (at 129.54 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 128.27 132.08 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 129.54 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 124.714 122.936 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 169.164 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 154.432 155.448 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 194.31 155.194 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 191.516 158.496 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 197.358 158.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 199.644 158.242 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 160.02 160.02 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 166.37 136.652 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 142.24 180.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 129.54 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 171.704 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 173.736 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 176.276 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 179.07 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 181.61 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 184.15 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 186.436 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 188.722 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 205.232 157.734 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3e4fc367-8c2e-4085-a0b0-e86f20d2a052))
@@ -3912,43 +5117,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 148.59 132.08 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 149.86 132.08 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf43c)
-    (property "Reference" "D15" (at 150.5966 130.9116 90)
+    (property "Reference" "D15" (at 151.8666 130.9116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 150.5966 133.223 90)
+    (property "Value" "1N4148" (at 151.8666 133.223 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 171.45 152.4 0)
+    (property "Footprint" "unikbd:diode-combined" (at 172.72 152.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 168.91 139.7 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 170.18 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 148.59 132.08 0)
+    (property "Fitted" "Yes" (at 149.86 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 148.59 132.08 0)
+    (property "Substitution OK" " YES " (at 149.86 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 148.59 132.08 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 149.86 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 148.59 132.08 0)
+    (property "Manufacturer" "Diodes, Inc." (at 149.86 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 148.59 132.08 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 149.86 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 148.59 132.08 0)
+    (property "Package" " SOT-23-3 " (at 149.86 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 148.59 132.08 0)
+    (property "LCSC" "C118751" (at 149.86 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 148.59 132.08 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 149.86 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 145.034 122.936 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 189.484 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 174.752 155.448 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 214.63 155.194 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 211.836 158.496 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 217.678 158.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 219.964 158.242 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 180.34 160.02 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 186.69 136.652 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 162.56 180.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 149.86 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 192.024 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 194.056 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 196.596 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 199.39 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 201.93 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 204.47 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 206.756 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 209.042 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 225.552 157.734 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 18c01fb0-30b9-4054-90a0-1926b60f87a3))
@@ -3962,43 +5227,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 168.91 132.08 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 170.18 132.08 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf443)
-    (property "Reference" "D19" (at 170.9166 130.9116 90)
+    (property "Reference" "D19" (at 172.1866 130.9116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 170.9166 133.223 90)
+    (property "Value" "1N4148" (at 172.1866 133.223 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 191.77 152.4 0)
+    (property "Footprint" "unikbd:diode-combined" (at 193.04 152.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 189.23 139.7 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 190.5 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 168.91 132.08 0)
+    (property "Fitted" "Yes" (at 170.18 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 168.91 132.08 0)
+    (property "Substitution OK" " YES " (at 170.18 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 168.91 132.08 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 170.18 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 168.91 132.08 0)
+    (property "Manufacturer" "Diodes, Inc." (at 170.18 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 168.91 132.08 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 170.18 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 168.91 132.08 0)
+    (property "Package" " SOT-23-3 " (at 170.18 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 168.91 132.08 0)
+    (property "LCSC" "C118751" (at 170.18 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 168.91 132.08 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 170.18 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 165.354 122.936 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 209.804 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 195.072 155.448 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 234.95 155.194 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 232.156 158.496 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 237.998 158.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 240.284 158.242 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 200.66 160.02 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 207.01 136.652 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 182.88 180.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 170.18 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 212.344 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 214.376 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 216.916 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 219.71 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 222.25 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 224.79 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 227.076 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 229.362 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 245.872 157.734 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 67233c25-66ea-4648-af55-738968deab39))
@@ -4012,43 +5337,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 189.23 132.08 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 190.5 132.08 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf44a)
-    (property "Reference" "D23" (at 191.2366 130.9116 90)
+    (property "Reference" "D23" (at 192.5066 130.9116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 191.2366 133.223 90)
+    (property "Value" "1N4148" (at 192.5066 133.223 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 212.09 152.4 0)
+    (property "Footprint" "unikbd:diode-combined" (at 213.36 152.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 209.55 139.7 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 210.82 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 189.23 132.08 0)
+    (property "Fitted" "Yes" (at 190.5 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 189.23 132.08 0)
+    (property "Substitution OK" " YES " (at 190.5 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 189.23 132.08 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 190.5 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 189.23 132.08 0)
+    (property "Manufacturer" "Diodes, Inc." (at 190.5 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 189.23 132.08 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 190.5 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 189.23 132.08 0)
+    (property "Package" " SOT-23-3 " (at 190.5 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 189.23 132.08 0)
+    (property "LCSC" "C118751" (at 190.5 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 189.23 132.08 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 190.5 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 185.674 122.936 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 230.124 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 215.392 155.448 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 255.27 155.194 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 252.476 158.496 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 258.318 158.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 260.604 158.242 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 220.98 160.02 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 227.33 136.652 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 203.2 180.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 190.5 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 232.664 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 234.696 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 237.236 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 240.03 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 242.57 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 245.11 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 247.396 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 249.682 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 266.192 157.734 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 2a9590ac-5c52-4c1c-9441-ff206efe511b))
@@ -4062,43 +5447,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 209.55 132.08 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 210.82 132.08 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf451)
-    (property "Reference" "D27" (at 211.5566 130.9116 90)
+    (property "Reference" "D27" (at 212.8266 130.9116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 211.5566 133.223 90)
+    (property "Value" "1N4148" (at 212.8266 133.223 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 232.41 152.4 0)
+    (property "Footprint" "unikbd:diode-combined" (at 233.68 152.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 229.87 139.7 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 231.14 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 209.55 132.08 0)
+    (property "Fitted" "Yes" (at 210.82 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 209.55 132.08 0)
+    (property "Substitution OK" " YES " (at 210.82 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 209.55 132.08 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 210.82 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 209.55 132.08 0)
+    (property "Manufacturer" "Diodes, Inc." (at 210.82 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 209.55 132.08 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 210.82 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 209.55 132.08 0)
+    (property "Package" " SOT-23-3 " (at 210.82 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 209.55 132.08 0)
+    (property "LCSC" "C118751" (at 210.82 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 209.55 132.08 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 210.82 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 205.994 122.936 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 250.444 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 235.712 155.448 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 275.59 155.194 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 272.796 158.496 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 278.638 158.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 280.924 158.242 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 241.3 160.02 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 247.65 136.652 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 223.52 180.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 210.82 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 252.984 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 255.016 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 257.556 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 260.35 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 262.89 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 265.43 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 267.716 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 270.002 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 286.512 157.734 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6436e2d5-9502-4f48-8238-3e9ea661fd60))
@@ -4112,43 +5557,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 229.87 132.08 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 231.14 132.08 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf458)
-    (property "Reference" "D31" (at 231.8766 130.9116 90)
+    (property "Reference" "D31" (at 233.1466 130.9116 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 231.8766 133.223 90)
+    (property "Value" "1N4148" (at 233.1466 133.223 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 252.73 152.4 0)
+    (property "Footprint" "unikbd:diode-combined" (at 254 152.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 250.19 139.7 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 251.46 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 229.87 132.08 0)
+    (property "Fitted" "Yes" (at 231.14 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 229.87 132.08 0)
+    (property "Substitution OK" " YES " (at 231.14 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 229.87 132.08 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 231.14 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 229.87 132.08 0)
+    (property "Manufacturer" "Diodes, Inc." (at 231.14 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 229.87 132.08 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 231.14 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 229.87 132.08 0)
+    (property "Package" " SOT-23-3 " (at 231.14 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 229.87 132.08 0)
+    (property "LCSC" "C118751" (at 231.14 132.08 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 229.87 132.08 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 231.14 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 226.314 122.936 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 270.764 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 256.032 155.448 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 295.91 155.194 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 293.116 158.496 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 298.958 158.75 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 301.244 158.242 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 261.62 160.02 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 267.97 136.652 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 243.84 180.34 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 231.14 132.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 273.304 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 275.336 154.178 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 277.876 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 280.67 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 283.21 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 285.75 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 288.036 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 290.322 153.924 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 306.832 157.734 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 549d61ff-3c30-4470-b122-b96d1734ac3e))
@@ -4162,97 +5667,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 102.87 148.59 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 104.14 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf466)
-    (property "Reference" "SW7" (at 102.87 141.351 0)
+    (property "Reference" "SW7" (at 104.14 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "7" (at 102.87 143.6624 0)
+    (property "Value" "7" (at 104.14 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 102.87 143.51 0)
+    (property "Footprint" "unikbd:Key_MX" (at 104.14 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 102.87 143.51 0)
+    (property "Datasheet" "" (at 104.14 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 102.87 148.59 0)
+    (property "Comment" "Common to all layouts" (at 104.14 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 102.87 148.59 0)
+    (property "Fitted" "YES" (at 104.14 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 102.87 148.59 0)
+    (property "Substitution OK" "NO" (at 104.14 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 64.77 161.29 0)
+    (property "Component Value" "Key" (at 66.04 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 80.772 188.214 0)
+    (property "Tolerance" "If applicable" (at 82.042 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 76.708 166.878 0)
+    (property "Manufacturer" "Cherry" (at 77.978 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 79.502 173.482 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 80.772 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 79.756 213.36 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 81.026 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 78.994 170.434 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 80.264 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 76.454 210.566 0)
+    (property "RoHS" "Yes" (at 77.724 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 76.2 216.408 0)
+    (property "Allow Substitution" "Yes" (at 77.47 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 76.708 218.694 0)
+    (property "Tracking" "No" (at 77.978 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 107.95 148.59 0)
+    (property "BOM Comment" "" (at 109.22 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 98.298 185.42 0)
+    (property "Component Type" "Switch" (at 99.568 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 107.95 148.59 0)
+    (property "Package Type" "" (at 109.22 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 107.95 148.59 0)
+    (property "Package Variant" "" (at 109.22 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 80.772 190.754 0)
+    (property "Number of Pins" "2" (at 82.042 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 80.772 192.786 0)
+    (property "Temp (Storage)" "" (at 82.042 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 81.026 195.326 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 82.296 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 81.026 198.12 0)
+    (property "Temp (Soldering)" "If applicable" (at 82.296 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 81.026 200.66 0)
+    (property "Temp Coeff." "If applicable" (at 82.296 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 81.026 203.2 0)
+    (property "Power Rating" "10 mA" (at 82.296 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 81.026 205.486 0)
+    (property "Material" "If applicable" (at 82.296 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 81.026 207.772 0)
+    (property "Class" "If applicable" (at 82.296 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 77.216 224.282 0)
+    (property "Standards Version" "1.1" (at 78.486 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 102.87 148.59 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 104.14 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 51a27094-ac5f-4fe9-aab8-6c87e3b15653))
@@ -4266,97 +5771,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 143.51 148.59 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 144.78 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf46d)
-    (property "Reference" "SW15" (at 143.51 141.351 0)
+    (property "Reference" "SW15" (at 144.78 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "5" (at 143.51 143.6624 0)
+    (property "Value" "5" (at 144.78 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 143.51 143.51 0)
+    (property "Footprint" "unikbd:Key_MX" (at 144.78 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 143.51 143.51 0)
+    (property "Datasheet" "" (at 144.78 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 143.51 148.59 0)
+    (property "Comment" "Common to all layouts" (at 144.78 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 143.51 148.59 0)
+    (property "Fitted" "YES" (at 144.78 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 143.51 148.59 0)
+    (property "Substitution OK" "NO" (at 144.78 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 105.41 161.29 0)
+    (property "Component Value" "Key" (at 106.68 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 121.412 188.214 0)
+    (property "Tolerance" "If applicable" (at 122.682 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 117.348 166.878 0)
+    (property "Manufacturer" "Cherry" (at 118.618 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 120.142 173.482 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 121.412 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 120.396 213.36 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 121.666 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 119.634 170.434 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 120.904 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 117.094 210.566 0)
+    (property "RoHS" "Yes" (at 118.364 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 116.84 216.408 0)
+    (property "Allow Substitution" "Yes" (at 118.11 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 117.348 218.694 0)
+    (property "Tracking" "No" (at 118.618 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 148.59 148.59 0)
+    (property "BOM Comment" "" (at 149.86 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 138.938 185.42 0)
+    (property "Component Type" "Switch" (at 140.208 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 148.59 148.59 0)
+    (property "Package Type" "" (at 149.86 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 148.59 148.59 0)
+    (property "Package Variant" "" (at 149.86 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 121.412 190.754 0)
+    (property "Number of Pins" "2" (at 122.682 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 121.412 192.786 0)
+    (property "Temp (Storage)" "" (at 122.682 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 121.666 195.326 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 122.936 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 121.666 198.12 0)
+    (property "Temp (Soldering)" "If applicable" (at 122.936 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 121.666 200.66 0)
+    (property "Temp Coeff." "If applicable" (at 122.936 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 121.666 203.2 0)
+    (property "Power Rating" "10 mA" (at 122.936 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 121.666 205.486 0)
+    (property "Material" "If applicable" (at 122.936 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 121.666 207.772 0)
+    (property "Class" "If applicable" (at 122.936 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 117.856 224.282 0)
+    (property "Standards Version" "1.1" (at 119.126 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 143.51 148.59 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 144.78 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 319b68c5-3b8a-4825-b042-a3680989d168))
@@ -4370,97 +5875,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 123.19 148.59 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 124.46 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf474)
-    (property "Reference" "SW11" (at 123.19 141.351 0)
+    (property "Reference" "SW11" (at 124.46 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "6" (at 123.19 143.6624 0)
+    (property "Value" "6" (at 124.46 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 123.19 143.51 0)
+    (property "Footprint" "unikbd:Key_MX" (at 124.46 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 123.19 143.51 0)
+    (property "Datasheet" "" (at 124.46 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 123.19 148.59 0)
+    (property "Comment" "Common to all layouts" (at 124.46 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 123.19 148.59 0)
+    (property "Fitted" "YES" (at 124.46 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 123.19 148.59 0)
+    (property "Substitution OK" "NO" (at 124.46 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 85.09 161.29 0)
+    (property "Component Value" "Key" (at 86.36 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 101.092 188.214 0)
+    (property "Tolerance" "If applicable" (at 102.362 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 97.028 166.878 0)
+    (property "Manufacturer" "Cherry" (at 98.298 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 99.822 173.482 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 101.092 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 100.076 213.36 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 101.346 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 99.314 170.434 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 100.584 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 96.774 210.566 0)
+    (property "RoHS" "Yes" (at 98.044 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 96.52 216.408 0)
+    (property "Allow Substitution" "Yes" (at 97.79 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 97.028 218.694 0)
+    (property "Tracking" "No" (at 98.298 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 128.27 148.59 0)
+    (property "BOM Comment" "" (at 129.54 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 118.618 185.42 0)
+    (property "Component Type" "Switch" (at 119.888 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 128.27 148.59 0)
+    (property "Package Type" "" (at 129.54 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 128.27 148.59 0)
+    (property "Package Variant" "" (at 129.54 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 101.092 190.754 0)
+    (property "Number of Pins" "2" (at 102.362 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 101.092 192.786 0)
+    (property "Temp (Storage)" "" (at 102.362 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 101.346 195.326 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 102.616 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 101.346 198.12 0)
+    (property "Temp (Soldering)" "If applicable" (at 102.616 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 101.346 200.66 0)
+    (property "Temp Coeff." "If applicable" (at 102.616 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 101.346 203.2 0)
+    (property "Power Rating" "10 mA" (at 102.616 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 101.346 205.486 0)
+    (property "Material" "If applicable" (at 102.616 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 101.346 207.772 0)
+    (property "Class" "If applicable" (at 102.616 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 97.536 224.282 0)
+    (property "Standards Version" "1.1" (at 98.806 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 123.19 148.59 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 124.46 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ebfc8428-8cac-4d88-b519-5f1988cd29eb))
@@ -4474,97 +5979,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 163.83 148.59 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 165.1 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf47b)
-    (property "Reference" "SW19" (at 163.83 141.351 0)
+    (property "Reference" "SW19" (at 165.1 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "4" (at 163.83 143.6624 0)
+    (property "Value" "4" (at 165.1 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 163.83 143.51 0)
+    (property "Footprint" "unikbd:Key_MX" (at 165.1 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 163.83 143.51 0)
+    (property "Datasheet" "" (at 165.1 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 163.83 148.59 0)
+    (property "Comment" "Common to all layouts" (at 165.1 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 163.83 148.59 0)
+    (property "Fitted" "YES" (at 165.1 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 163.83 148.59 0)
+    (property "Substitution OK" "NO" (at 165.1 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 125.73 161.29 0)
+    (property "Component Value" "Key" (at 127 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 141.732 188.214 0)
+    (property "Tolerance" "If applicable" (at 143.002 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 137.668 166.878 0)
+    (property "Manufacturer" "Cherry" (at 138.938 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 140.462 173.482 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 141.732 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 140.716 213.36 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 141.986 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 139.954 170.434 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 141.224 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 137.414 210.566 0)
+    (property "RoHS" "Yes" (at 138.684 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 137.16 216.408 0)
+    (property "Allow Substitution" "Yes" (at 138.43 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 137.668 218.694 0)
+    (property "Tracking" "No" (at 138.938 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 168.91 148.59 0)
+    (property "BOM Comment" "" (at 170.18 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 159.258 185.42 0)
+    (property "Component Type" "Switch" (at 160.528 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 168.91 148.59 0)
+    (property "Package Type" "" (at 170.18 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 168.91 148.59 0)
+    (property "Package Variant" "" (at 170.18 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 141.732 190.754 0)
+    (property "Number of Pins" "2" (at 143.002 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 141.732 192.786 0)
+    (property "Temp (Storage)" "" (at 143.002 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 141.986 195.326 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 143.256 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 141.986 198.12 0)
+    (property "Temp (Soldering)" "If applicable" (at 143.256 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 141.986 200.66 0)
+    (property "Temp Coeff." "If applicable" (at 143.256 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 141.986 203.2 0)
+    (property "Power Rating" "10 mA" (at 143.256 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 141.986 205.486 0)
+    (property "Material" "If applicable" (at 143.256 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 141.986 207.772 0)
+    (property "Class" "If applicable" (at 143.256 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 138.176 224.282 0)
+    (property "Standards Version" "1.1" (at 139.446 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 163.83 148.59 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 165.1 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 26e36153-9af2-474f-bed2-ad0a4f54ca3c))
@@ -4578,97 +6083,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 184.15 148.59 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 185.42 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf482)
-    (property "Reference" "SW23" (at 184.15 141.351 0)
+    (property "Reference" "SW23" (at 185.42 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "3" (at 184.15 143.6624 0)
+    (property "Value" "3" (at 185.42 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 184.15 143.51 0)
+    (property "Footprint" "unikbd:Key_MX" (at 185.42 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 184.15 143.51 0)
+    (property "Datasheet" "" (at 185.42 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 184.15 148.59 0)
+    (property "Comment" "Common to all layouts" (at 185.42 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 184.15 148.59 0)
+    (property "Fitted" "YES" (at 185.42 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 184.15 148.59 0)
+    (property "Substitution OK" "NO" (at 185.42 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 146.05 161.29 0)
+    (property "Component Value" "Key" (at 147.32 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 162.052 188.214 0)
+    (property "Tolerance" "If applicable" (at 163.322 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 157.988 166.878 0)
+    (property "Manufacturer" "Cherry" (at 159.258 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 160.782 173.482 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 162.052 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 161.036 213.36 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 162.306 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 160.274 170.434 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 161.544 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 157.734 210.566 0)
+    (property "RoHS" "Yes" (at 159.004 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 157.48 216.408 0)
+    (property "Allow Substitution" "Yes" (at 158.75 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 157.988 218.694 0)
+    (property "Tracking" "No" (at 159.258 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 189.23 148.59 0)
+    (property "BOM Comment" "" (at 190.5 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 179.578 185.42 0)
+    (property "Component Type" "Switch" (at 180.848 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 189.23 148.59 0)
+    (property "Package Type" "" (at 190.5 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 189.23 148.59 0)
+    (property "Package Variant" "" (at 190.5 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 162.052 190.754 0)
+    (property "Number of Pins" "2" (at 163.322 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 162.052 192.786 0)
+    (property "Temp (Storage)" "" (at 163.322 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 162.306 195.326 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 163.576 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 162.306 198.12 0)
+    (property "Temp (Soldering)" "If applicable" (at 163.576 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 162.306 200.66 0)
+    (property "Temp Coeff." "If applicable" (at 163.576 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 162.306 203.2 0)
+    (property "Power Rating" "10 mA" (at 163.576 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 162.306 205.486 0)
+    (property "Material" "If applicable" (at 163.576 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 162.306 207.772 0)
+    (property "Class" "If applicable" (at 163.576 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 158.496 224.282 0)
+    (property "Standards Version" "1.1" (at 159.766 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 184.15 148.59 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 185.42 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 674119d7-cc5f-4c1f-b23d-e021fc711b5e))
@@ -4682,97 +6187,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 224.79 148.59 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 226.06 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf489)
-    (property "Reference" "SW31" (at 224.79 141.351 0)
+    (property "Reference" "SW31" (at 226.06 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "1" (at 224.79 143.6624 0)
+    (property "Value" "1" (at 226.06 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 224.79 143.51 0)
+    (property "Footprint" "unikbd:Key_MX" (at 226.06 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 224.79 143.51 0)
+    (property "Datasheet" "" (at 226.06 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 224.79 148.59 0)
+    (property "Comment" "Common to all layouts" (at 226.06 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 224.79 148.59 0)
+    (property "Fitted" "YES" (at 226.06 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 224.79 148.59 0)
+    (property "Substitution OK" "NO" (at 226.06 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 186.69 161.29 0)
+    (property "Component Value" "Key" (at 187.96 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 202.692 188.214 0)
+    (property "Tolerance" "If applicable" (at 203.962 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 198.628 166.878 0)
+    (property "Manufacturer" "Cherry" (at 199.898 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 201.422 173.482 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 202.692 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 201.676 213.36 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 202.946 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 200.914 170.434 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 202.184 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 198.374 210.566 0)
+    (property "RoHS" "Yes" (at 199.644 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 198.12 216.408 0)
+    (property "Allow Substitution" "Yes" (at 199.39 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 198.628 218.694 0)
+    (property "Tracking" "No" (at 199.898 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 229.87 148.59 0)
+    (property "BOM Comment" "" (at 231.14 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 220.218 185.42 0)
+    (property "Component Type" "Switch" (at 221.488 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 229.87 148.59 0)
+    (property "Package Type" "" (at 231.14 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 229.87 148.59 0)
+    (property "Package Variant" "" (at 231.14 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 202.692 190.754 0)
+    (property "Number of Pins" "2" (at 203.962 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 202.692 192.786 0)
+    (property "Temp (Storage)" "" (at 203.962 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 202.946 195.326 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 204.216 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 202.946 198.12 0)
+    (property "Temp (Soldering)" "If applicable" (at 204.216 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 202.946 200.66 0)
+    (property "Temp Coeff." "If applicable" (at 204.216 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 202.946 203.2 0)
+    (property "Power Rating" "10 mA" (at 204.216 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 202.946 205.486 0)
+    (property "Material" "If applicable" (at 204.216 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 202.946 207.772 0)
+    (property "Class" "If applicable" (at 204.216 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 199.136 224.282 0)
+    (property "Standards Version" "1.1" (at 200.406 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 224.79 148.59 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 226.06 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4dcd49d0-18e9-46ef-81cd-aeb901323f08))
@@ -4786,97 +6291,97 @@
     )
   )
 
-  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 204.47 148.59 0) (unit 1)
+  (symbol (lib_id "unikbd:SW Cherry MX/Futaba 1U Style A") (at 205.74 144.78 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf490)
-    (property "Reference" "SW27" (at 204.47 141.351 0)
+    (property "Reference" "SW27" (at 205.74 137.541 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "2" (at 204.47 143.6624 0)
+    (property "Value" "2" (at 205.74 139.8524 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "unikbd:Key_MX" (at 204.47 143.51 0)
+    (property "Footprint" "unikbd:Key_MX" (at 205.74 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 204.47 143.51 0)
+    (property "Datasheet" "" (at 205.74 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "Common to all layouts" (at 204.47 148.59 0)
+    (property "Comment" "Common to all layouts" (at 205.74 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 204.47 148.59 0)
+    (property "Fitted" "YES" (at 205.74 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" "NO" (at 204.47 148.59 0)
+    (property "Substitution OK" "NO" (at 205.74 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Value" "Key" (at 166.37 161.29 0)
+    (property "Component Value" "Key" (at 167.64 157.48 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tolerance" "If applicable" (at 182.372 188.214 0)
+    (property "Tolerance" "If applicable" (at 183.642 184.404 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Cherry" (at 178.308 166.878 0)
+    (property "Manufacturer" "Cherry" (at 179.578 163.068 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 181.102 173.482 0)
+    (property "Manufacturer Link" "https://www.cherrymx.de/en/cherry-mx/mx-original/mx-black.html" (at 182.372 169.672 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 181.356 213.36 0)
+    (property "RoHS Document Link" "https://www.mouser.com/catalog/additional/Cherry_Electrical_Products_5409_RoHS_Certificate.pdf" (at 182.626 209.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MX1A-11NN" (at 180.594 170.434 0)
+    (property "Manufacturer PN" "MX1A-11NN" (at 181.864 166.624 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "RoHS" "Yes" (at 178.054 210.566 0)
+    (property "RoHS" "Yes" (at 179.324 206.756 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Allow Substitution" "Yes" (at 177.8 216.408 0)
+    (property "Allow Substitution" "Yes" (at 179.07 212.598 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Tracking" "No" (at 178.308 218.694 0)
+    (property "Tracking" "No" (at 179.578 214.884 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "BOM Comment" "" (at 209.55 148.59 0)
+    (property "BOM Comment" "" (at 210.82 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Component Type" "Switch" (at 199.898 185.42 0)
+    (property "Component Type" "Switch" (at 201.168 181.61 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Type" "" (at 209.55 148.59 0)
+    (property "Package Type" "" (at 210.82 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package Variant" "" (at 209.55 148.59 0)
+    (property "Package Variant" "" (at 210.82 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Number of Pins" "2" (at 182.372 190.754 0)
+    (property "Number of Pins" "2" (at 183.642 186.944 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Storage)" "" (at 182.372 192.786 0)
+    (property "Temp (Storage)" "" (at 183.642 188.976 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Operating)" "-40C/+170C" (at 182.626 195.326 0)
+    (property "Temp (Operating)" "-40C/+170C" (at 183.896 191.516 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp (Soldering)" "If applicable" (at 182.626 198.12 0)
+    (property "Temp (Soldering)" "If applicable" (at 183.896 194.31 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Temp Coeff." "If applicable" (at 182.626 200.66 0)
+    (property "Temp Coeff." "If applicable" (at 183.896 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Power Rating" "10 mA" (at 182.626 203.2 0)
+    (property "Power Rating" "10 mA" (at 183.896 199.39 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Material" "If applicable" (at 182.626 205.486 0)
+    (property "Material" "If applicable" (at 183.896 201.676 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Class" "If applicable" (at 182.626 207.772 0)
+    (property "Class" "If applicable" (at 183.896 203.962 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Standards Version" "1.1" (at 178.816 224.282 0)
+    (property "Standards Version" "1.1" (at 180.086 220.472 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MX1A-11NN" (at 204.47 148.59 0)
+    (property "Manufacturer Part Number" "MX1A-11NN" (at 205.74 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3330a942-167d-4331-9d30-c55de1ebbecd))
@@ -4890,43 +6395,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 107.95 154.94 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 109.22 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf497)
-    (property "Reference" "D8" (at 109.9566 153.7716 90)
+    (property "Reference" "D8" (at 111.2266 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 109.9566 156.083 90)
+    (property "Value" "1N4148" (at 111.2266 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 130.81 175.26 0)
+    (property "Footprint" "unikbd:diode-combined" (at 132.08 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 128.27 162.56 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 129.54 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 107.95 154.94 0)
+    (property "Fitted" "Yes" (at 109.22 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 107.95 154.94 0)
+    (property "Substitution OK" " YES " (at 109.22 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 107.95 154.94 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 109.22 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 107.95 154.94 0)
+    (property "Manufacturer" "Diodes, Inc." (at 109.22 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 107.95 154.94 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 109.22 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 107.95 154.94 0)
+    (property "Package" " SOT-23-3 " (at 109.22 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 107.95 154.94 0)
+    (property "LCSC" "C118751" (at 109.22 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 107.95 154.94 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 109.22 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 104.394 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 148.844 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 134.112 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 173.99 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 171.196 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 177.038 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 179.324 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 139.7 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 146.05 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 121.92 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 109.22 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 151.384 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 153.416 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 155.956 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 158.75 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 161.29 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 163.83 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 166.116 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 168.402 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 184.912 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 6e34d6d4-c8c3-4128-b938-8d9e060b82e1))
@@ -4940,43 +6505,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 128.27 154.94 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 129.54 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf4a5)
-    (property "Reference" "D12" (at 130.2766 153.7716 90)
+    (property "Reference" "D12" (at 131.5466 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 130.2766 156.083 90)
+    (property "Value" "1N4148" (at 131.5466 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 151.13 175.26 0)
+    (property "Footprint" "unikbd:diode-combined" (at 152.4 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 148.59 162.56 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 149.86 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 128.27 154.94 0)
+    (property "Fitted" "Yes" (at 129.54 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 128.27 154.94 0)
+    (property "Substitution OK" " YES " (at 129.54 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 128.27 154.94 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 129.54 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 128.27 154.94 0)
+    (property "Manufacturer" "Diodes, Inc." (at 129.54 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 128.27 154.94 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 129.54 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 128.27 154.94 0)
+    (property "Package" " SOT-23-3 " (at 129.54 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 128.27 154.94 0)
+    (property "LCSC" "C118751" (at 129.54 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 128.27 154.94 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 129.54 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 124.714 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 169.164 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 154.432 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 194.31 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 191.516 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 197.358 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 199.644 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 160.02 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 166.37 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 142.24 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 129.54 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 171.704 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 173.736 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 176.276 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 179.07 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 181.61 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 184.15 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 186.436 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 188.722 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 205.232 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 27fcd542-0b01-4e15-819c-0aafaf4e734a))
@@ -4990,43 +6615,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 148.59 154.94 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 149.86 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf4ac)
-    (property "Reference" "D16" (at 150.5966 153.7716 90)
+    (property "Reference" "D16" (at 151.8666 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 150.5966 156.083 90)
+    (property "Value" "1N4148" (at 151.8666 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 171.45 175.26 0)
+    (property "Footprint" "unikbd:diode-combined" (at 172.72 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 168.91 162.56 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 170.18 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 148.59 154.94 0)
+    (property "Fitted" "Yes" (at 149.86 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 148.59 154.94 0)
+    (property "Substitution OK" " YES " (at 149.86 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 148.59 154.94 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 149.86 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 148.59 154.94 0)
+    (property "Manufacturer" "Diodes, Inc." (at 149.86 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 148.59 154.94 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 149.86 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 148.59 154.94 0)
+    (property "Package" " SOT-23-3 " (at 149.86 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 148.59 154.94 0)
+    (property "LCSC" "C118751" (at 149.86 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 148.59 154.94 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 149.86 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 145.034 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 189.484 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 174.752 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 214.63 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 211.836 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 217.678 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 219.964 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 180.34 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 186.69 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 162.56 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 149.86 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 192.024 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 194.056 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 196.596 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 199.39 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 201.93 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 204.47 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 206.756 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 209.042 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 225.552 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 47250805-3648-47b7-bb9d-1ef8b8865ea7))
@@ -5040,43 +6725,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 168.91 154.94 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 170.18 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf4b3)
-    (property "Reference" "D20" (at 170.9166 153.7716 90)
+    (property "Reference" "D20" (at 172.1866 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 170.9166 156.083 90)
+    (property "Value" "1N4148" (at 172.1866 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 191.77 175.26 0)
+    (property "Footprint" "unikbd:diode-combined" (at 193.04 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 189.23 162.56 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 190.5 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 168.91 154.94 0)
+    (property "Fitted" "Yes" (at 170.18 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 168.91 154.94 0)
+    (property "Substitution OK" " YES " (at 170.18 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 168.91 154.94 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 170.18 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 168.91 154.94 0)
+    (property "Manufacturer" "Diodes, Inc." (at 170.18 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 168.91 154.94 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 170.18 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 168.91 154.94 0)
+    (property "Package" " SOT-23-3 " (at 170.18 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 168.91 154.94 0)
+    (property "LCSC" "C118751" (at 170.18 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 168.91 154.94 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 170.18 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 165.354 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 209.804 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 195.072 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 234.95 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 232.156 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 237.998 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 240.284 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 200.66 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 207.01 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 182.88 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 170.18 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 212.344 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 214.376 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 216.916 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 219.71 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 222.25 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 224.79 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 227.076 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 229.362 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 245.872 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9daf55c2-bf2a-401b-94ea-c18e8b270b80))
@@ -5090,43 +6835,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 189.23 154.94 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 190.5 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf4ba)
-    (property "Reference" "D24" (at 191.2366 153.7716 90)
+    (property "Reference" "D24" (at 192.5066 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 191.2366 156.083 90)
+    (property "Value" "1N4148" (at 192.5066 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 212.09 175.26 0)
+    (property "Footprint" "unikbd:diode-combined" (at 213.36 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 209.55 162.56 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 210.82 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 189.23 154.94 0)
+    (property "Fitted" "Yes" (at 190.5 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 189.23 154.94 0)
+    (property "Substitution OK" " YES " (at 190.5 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 189.23 154.94 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 190.5 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 189.23 154.94 0)
+    (property "Manufacturer" "Diodes, Inc." (at 190.5 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 189.23 154.94 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 190.5 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 189.23 154.94 0)
+    (property "Package" " SOT-23-3 " (at 190.5 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 189.23 154.94 0)
+    (property "LCSC" "C118751" (at 190.5 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 189.23 154.94 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 190.5 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 185.674 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 230.124 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 215.392 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 255.27 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 252.476 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 258.318 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 260.604 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 220.98 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 227.33 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 203.2 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 190.5 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 232.664 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 234.696 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 237.236 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 240.03 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 242.57 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 245.11 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 247.396 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 249.682 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 266.192 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f3cba69e-a57c-4cbf-8d3f-418cdce8e546))
@@ -5140,43 +6945,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 209.55 154.94 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 210.82 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf4c1)
-    (property "Reference" "D28" (at 211.5566 153.7716 90)
+    (property "Reference" "D28" (at 212.8266 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 211.5566 156.083 90)
+    (property "Value" "1N4148" (at 212.8266 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 232.41 175.26 0)
+    (property "Footprint" "unikbd:diode-combined" (at 233.68 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 229.87 162.56 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 231.14 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 209.55 154.94 0)
+    (property "Fitted" "Yes" (at 210.82 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 209.55 154.94 0)
+    (property "Substitution OK" " YES " (at 210.82 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 209.55 154.94 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 210.82 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 209.55 154.94 0)
+    (property "Manufacturer" "Diodes, Inc." (at 210.82 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 209.55 154.94 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 210.82 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 209.55 154.94 0)
+    (property "Package" " SOT-23-3 " (at 210.82 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 209.55 154.94 0)
+    (property "LCSC" "C118751" (at 210.82 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 209.55 154.94 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 210.82 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 205.994 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 250.444 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 235.712 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 275.59 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 272.796 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 278.638 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 280.924 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 241.3 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 247.65 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 223.52 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 210.82 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 252.984 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 255.016 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 257.556 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 260.35 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 262.89 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 265.43 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 267.716 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 270.002 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 286.512 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 11398157-d356-4599-ac23-b41d809a080e))
@@ -5190,43 +7055,103 @@
     )
   )
 
-  (symbol (lib_id "unikbd:diode-combined") (at 229.87 154.94 90) (unit 1)
+  (symbol (lib_id "unikbd:diode-combined") (at 231.14 154.94 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 00000000-0000-0000-0000-00005bcaf4c8)
-    (property "Reference" "D32" (at 231.8766 153.7716 90)
+    (property "Reference" "D32" (at 233.1466 153.7716 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Value" "1N4148" (at 231.8766 156.083 90)
+    (property "Value" "1N4148" (at 233.1466 156.083 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "unikbd:diode-combined" (at 252.73 175.26 0)
+    (property "Footprint" "unikbd:diode-combined" (at 254 175.26 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "https://assets.nexperia.com/documents/data-sheet/1N4148_1N4448.pdf" (at 250.19 162.56 0)
+    (property "Datasheet" "https://www.diodes.com/assets/Datasheets/BAS16_MMBD4148_MMBD914.pdf" (at 251.46 162.56 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Fitted" "YES" (at 229.87 154.94 0)
+    (property "Fitted" "Yes" (at 231.14 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Substitution OK" " YES " (at 229.87 154.94 0)
+    (property "Substitution OK" " YES " (at 231.14 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Comment" "<1.25V forward voltage.  " (at 229.87 154.94 0)
+    (property "Comment" "<1.25V forward voltage.  " (at 231.14 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "ON Semiconductor" (at 229.87 154.94 0)
+    (property "Manufacturer" "Diodes, Inc." (at 231.14 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer Part Number" "MMBD914LT3G " (at 229.87 154.94 0)
+    (property "Manufacturer Part Number" "MMBD914LT3G " (at 231.14 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Package" " SOT-23-3 " (at 229.87 154.94 0)
+    (property "Package" " SOT-23-3 " (at 231.14 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C118751" (at 229.87 154.94 0)
+    (property "LCSC" "C118751" (at 231.14 154.94 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer PN" "MMBD914LT3G " (at 229.87 154.94 0)
+    (property "Manufacturer PN" "MMBD914-7-F" (at 231.14 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Value" "19N14/MMBD914" (at 226.314 145.796 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tolerance" "If applicable" (at 270.764 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer Link" "https://www.diodes.com/part/view/MMBD914" (at 256.032 178.308 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS Document Link" "https://www.diodes.com/assets/Quality-Reliability-Docs/Master_CofC.pdf" (at 295.91 178.054 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "RoHS" "Yes" (at 293.116 181.356 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Allow Substitution" "Yes" (at 298.958 181.61 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Tracking" "No" (at 301.244 181.102 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "BOM Comment" "Either SMT or Through-Hole part (1n914 or 1n4148) is fitted but not both.  " (at 261.62 182.88 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Component Type" "Diode" (at 267.97 159.512 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Type" "SOT3-3" (at 243.84 203.2 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Package Variant" "" (at 231.14 154.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Number of Pins" "3" (at 273.304 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Storage)" "If applicable" (at 275.336 177.038 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Operating)" "-65C/150C" (at 277.876 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp (Soldering)" "If applicable" (at 280.67 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Temp Coeff." "If applicable" (at 283.21 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Power Rating" "350 mW / 200 mA" (at 285.75 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Material" "If applicable" (at 288.036 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Class" "If applicable" (at 290.322 176.784 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Standards Version" "1.1" (at 306.832 180.594 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 70730cc4-ebb9-47e7-b6b7-5f6c48a76a61))