diff --git a/pocket-reform-motherboard/3d-models/JXD-G2406S.mtl b/pocket-reform-motherboard/3d-models/JXD-G2406S.mtl
new file mode 100644
index 0000000..f231bdf
--- /dev/null
+++ b/pocket-reform-motherboard/3d-models/JXD-G2406S.mtl
@@ -0,0 +1,10 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl None
+Ns 500
+Ka 0.8 0.8 0.8
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2
diff --git a/pocket-reform-motherboard/3d-models/MP23ABS1TR.mtl b/pocket-reform-motherboard/3d-models/MP23ABS1TR.mtl
new file mode 100644
index 0000000..f231bdf
--- /dev/null
+++ b/pocket-reform-motherboard/3d-models/MP23ABS1TR.mtl
@@ -0,0 +1,10 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl None
+Ns 500
+Ka 0.8 0.8 0.8
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2
diff --git a/pocket-reform-motherboard/pocket-reform-motherboard-r2-bom.xlsx b/pocket-reform-motherboard/pocket-reform-motherboard-r2-bom.xlsx
new file mode 100644
index 0000000..cdb221d
Binary files /dev/null and b/pocket-reform-motherboard/pocket-reform-motherboard-r2-bom.xlsx differ
diff --git a/pocket-reform-motherboard/pocket-reform-motherboard.kicad_pcb b/pocket-reform-motherboard/pocket-reform-motherboard.kicad_pcb
index ca0fa5e..762dfda 100644
--- a/pocket-reform-motherboard/pocket-reform-motherboard.kicad_pcb
+++ b/pocket-reform-motherboard/pocket-reform-motherboard.kicad_pcb
@@ -979,7 +979,7 @@
     (pad "27" smd rect (at 23.85 -4.1) (size 2 0.35) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 318 "ETH0_A-") (pinfunction "TRX0_N") (pintype "bidirectional") (tstamp fa16f237-4e21-4b18-8c54-f7de4e62bbb6))
     (pad "28" smd rect (at 23.55 4.1) (size 2 0.35) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 336 "unconnected-(U1-BT_HOST_WAKE-Pad28)") (pinfunction "BT_HOST_WAKE") (pintype "output") (tstamp 18b6dcb6-5ab3-481b-b998-33e8cf6d281f))
+      (net 336 "unconnected-(U1-BT_HOST_WAKE-Pad28)") (pinfunction "BT_HOST_WAKE") (pintype "output+no_connect") (tstamp 18b6dcb6-5ab3-481b-b998-33e8cf6d281f))
     (pad "29" smd rect (at 23.25 -4.1) (size 2 0.35) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 317 "ETH0_A+") (pinfunction "TRX0_P") (pintype "bidirectional") (tstamp 25ca9482-069d-43de-b77e-6f2ad77fa017))
     (pad "30" smd rect (at 22.95 4.1) (size 2 0.35) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -4501,9 +4501,9 @@
     (tstamp 0fef6438-ab4b-4dd8-b342-89a09c8e4fd0)
     (at 151.8 68.5)
     (property "DNP" "")
-    (property "LCSC" "C2915626")
+    (property "LCSC" "")
     (property "Manufacturer" "Wurth")
-    (property "Manufacturer_No" "SMTSO2020CTJ")
+    (property "Manufacturer_No" "9774020243R")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Mounting Hole with connection")
@@ -4597,9 +4597,9 @@
     (at 83.65 127.8)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor")
-    (property "LCSC" "")
+    (property "LCSC" "C86295")
     (property "Manufacturer" "Samsung")
-    (property "Manufacturer_No" "")
+    (property "Manufacturer_No" "CL10A226MP8NUNE")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Unpolarized capacitor, small symbol")
@@ -4811,7 +4811,7 @@
     (descr "Resistor SMD 0402 (1005 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 "LCSC" "DNP")
-    (property "Manufacturer" "")
+    (property "Manufacturer" "DNP")
     (property "Manufacturer_No" "DNP")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
@@ -4823,7 +4823,7 @@
         (effects (font (size 0.5 0.5) (thickness 0.1)))
       (tstamp b473f5a3-90be-4e35-af17-5fa97eeca808)
     )
-    (fp_text value "0" (at 0 1.17) (layer "F.Fab")
+    (fp_text value "DNP" (at 0 1.17) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp f7b7baa2-daf5-422a-b5d9-768c13b5ec8b)
     )
@@ -5784,6 +5784,7 @@
     (descr "SMD pad as test Point, diameter 1.0mm")
     (tags "test point SMD pad")
     (property "LCSC" "DNP")
+    (property "Manufacturer" "DNP")
     (property "Manufacturer_No" "DNP")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
@@ -5991,7 +5992,8 @@
     (at 69.225 93.975 180)
     (descr "SOT-353, SC-70-5")
     (tags "SOT-353 SC-70-5")
-    (property "Manufacturer" "Texas Instruments")
+    (property "LCSC" "C7394031")
+    (property "Manufacturer" "Texas Instruments or UMW")
     (property "Manufacturer_No" "SN74LVC1G34DCKR")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
@@ -7404,9 +7406,9 @@
   (footprint "footprints:WA-SMSI-M2" (layer "F.Cu")
     (tstamp 38f7cbca-94a8-4651-95b7-3b9265d56312)
     (at 90.75 134)
-    (property "LCSC" "C2915626")
-    (property "Manufacturer" "Sinhoo")
-    (property "Manufacturer_No" "SMTSO2020CTJ")
+    (property "LCSC" "")
+    (property "Manufacturer" "Wurth")
+    (property "Manufacturer_No" "9774025243R")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Mounting Hole with connection")
@@ -8799,9 +8801,9 @@
     (at 79.505 129.165 180)
     (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator")
     (tags "capacitor")
-    (property "LCSC" "")
+    (property "LCSC" "C86295")
     (property "Manufacturer" "Samsung")
-    (property "Manufacturer_No" "")
+    (property "Manufacturer_No" "CL10A226MP8NUNE")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Unpolarized capacitor, small symbol")
@@ -8857,7 +8859,7 @@
     (descr "Resistor SMD 0402 (1005 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 "LCSC" "DNP")
-    (property "Manufacturer" "")
+    (property "Manufacturer" "DNP")
     (property "Manufacturer_No" "DNP")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
@@ -9253,6 +9255,8 @@
     (at 89.465 124.855 -90)
     (descr "SOT, 3 Pin (https://www.jedec.org/system/files/docs/to-236h.pdf variant AB), generated with kicad-footprint-generator ipc_gullwing_generator.py")
     (tags "SOT TO_SOT_SMD")
+    (property "Manufacturer" "Texas Instruments")
+    (property "Manufacturer_No" "TPS7A0533PDBZ")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "200-mA Ultra-Low-Iq LDO, 3.3V, SOT-23-3")
@@ -10167,9 +10171,9 @@
     (at 180.695 126.885 180)
     (descr "Resistor SMD 0402 (1005 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 "LCSC" "")
-    (property "Manufacturer" "")
-    (property "Manufacturer_No" "")
+    (property "LCSC" "C321660")
+    (property "Manufacturer" "FH")
+    (property "Manufacturer_No" "RC-02W9531FT")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Resistor, small symbol")
@@ -11255,9 +11259,9 @@
     (at 74.4 123.2 -90)
     (descr "Resistor SMD 0402 (1005 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 "LCSC" "")
-    (property "Manufacturer" "")
-    (property "Manufacturer_No" "")
+    (property "LCSC" "C114762")
+    (property "Manufacturer" "Yageo")
+    (property "Manufacturer_No" "RC0402FR-072K2L")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Resistor, small symbol")
@@ -17904,6 +17908,8 @@
     (at 173.5 121.3 180)
     (descr "QFN, 64 Pin (http://www.ti.com/lit/ds/symlink/tusb8041.pdf#page=42), generated with kicad-footprint-generator ipc_noLead_generator.py")
     (tags "QFN NoLead")
+    (property "Manufacturer" "Texas Instruments")
+    (property "Manufacturer_No" "TUSB8041")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "four port USB 3.0 Hub")
@@ -18625,9 +18631,9 @@
     (tstamp 8e0cc4c1-d9b8-4ec6-a4b7-786fe9ec222d)
     (at 181 106)
     (property "DNP" "")
-    (property "LCSC" "C2915626")
+    (property "LCSC" "")
     (property "Manufacturer" "Wurth")
-    (property "Manufacturer_No" "SMTSO2020CTJ")
+    (property "Manufacturer_No" "9774020243R")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Mounting Hole with connection")
@@ -18833,9 +18839,9 @@
   (footprint "footprints:WA-SMSI-M2" (layer "F.Cu")
     (tstamp 90b1671e-9645-48c9-a935-22270fa469cb)
     (at 90.75 74)
-    (property "LCSC" "C2915626")
-    (property "Manufacturer" "Sinhoo")
-    (property "Manufacturer_No" "SMTSO2020CTJ")
+    (property "LCSC" "")
+    (property "Manufacturer" "Wurth")
+    (property "Manufacturer_No" "9774025243R")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Mounting Hole with connection")
@@ -19229,6 +19235,7 @@
     (descr "Resistor SMD 0402 (1005 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 "LCSC" "DNP")
+    (property "Manufacturer" "DNP")
     (property "Manufacturer_No" "DNP")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
@@ -19628,7 +19635,7 @@
         (effects (font (size 0.5 0.5) (thickness 0.1)))
       (tstamp f4da8ec3-9903-40d2-9509-ac7616b60aec)
     )
-    (fp_text value "100@100MHz 3A" (at 0 1.43 90) (layer "F.Fab")
+    (fp_text value "DNP" (at 0 1.43 90) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp fee78ed6-90c5-4e14-a025-289c4d8b729f)
     )
@@ -20704,7 +20711,7 @@
     (descr "Resistor SMD 0402 (1005 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 "LCSC" "DNP")
-    (property "Manufacturer" "")
+    (property "Manufacturer" "DNP")
     (property "Manufacturer_No" "DNP")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
@@ -23720,7 +23727,7 @@
     (pad "6" smd rect (at -3 -1.69 270) (size 0.3 0.65) (layers "F.Cu" "F.Mask")
       (net 397 "Net-(J13-Pin_28)") (pinfunction "Pin_6") (pintype "passive") (tstamp 5df50a55-ae6e-4416-8ad1-a6bef199eba3))
     (pad "7" smd rect (at -2.7 1.185 270) (size 0.3 0.8) (layers "F.Cu" "F.Mask")
-      (net 457 "DISP_TE") (pinfunction "Pin_7") (pintype "passive+no_connect") (tstamp 5f284d7b-e941-43d1-95ca-ff6e1041cf6c))
+      (net 457 "DISP_TE") (pinfunction "Pin_7") (pintype "passive") (tstamp 5f284d7b-e941-43d1-95ca-ff6e1041cf6c))
     (pad "8" smd rect (at -2.4 -1.69 270) (size 0.3 0.65) (layers "F.Cu" "F.Mask")
       (net 485 "~{DISP_RESET_1V8}") (pinfunction "Pin_8") (pintype "passive") (tstamp e03a2ed0-46dd-4e34-acb2-7480ff82b2d2))
     (pad "9" smd rect (at -2.1 1.185 270) (size 0.3 0.8) (layers "F.Cu" "F.Mask")
@@ -24062,6 +24069,8 @@
     (at 61.2 75.175 -90)
     (descr "JST SH series connector, SM02B-SRSS-TB (http://www.jst-mfg.com/product/pdf/eng/eSH.pdf), generated with kicad-footprint-generator")
     (tags "connector JST SH top entry")
+    (property "Manufacturer" "JST")
+    (property "Manufacturer_No" "SM02B-SRSS-TB(LF)(SN)")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Generic connector, single row, 01x02, script generated")
@@ -24534,9 +24543,9 @@
     (at 68.835 128.755 -90)
     (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "capacitor")
-    (property "LCSC" "")
-    (property "Manufacturer" "")
-    (property "Manufacturer_No" "")
+    (property "LCSC" "C94034")
+    (property "Manufacturer" "Murata")
+    (property "Manufacturer_No" "GRM31CR61A476ME15L")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Unpolarized capacitor, small symbol")
@@ -24918,6 +24927,9 @@
     (at 96.175 82.325)
     (descr "TSSOP, 20 Pin (JEDEC MO-153 Var AC https://www.jedec.org/document_search?search_api_views_fulltext=MO-153), generated with kicad-footprint-generator ipc_gullwing_generator.py")
     (tags "TSSOP SO")
+    (property "LCSC" "C5944")
+    (property "Manufacturer" "Nexperia")
+    (property "Manufacturer_No" "74HC573PW,118")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "8-bit Latch 3-state outputs")
@@ -26062,7 +26074,7 @@
     (descr "Resistor SMD 0402 (1005 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 "LCSC" "DNP")
-    (property "Manufacturer" "")
+    (property "Manufacturer" "DNP")
     (property "Manufacturer_No" "DNP")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
@@ -26233,7 +26245,7 @@
     (descr "Resistor SMD 0402 (1005 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 "LCSC" "DNP")
-    (property "Manufacturer" "")
+    (property "Manufacturer" "DNP")
     (property "Manufacturer_No" "DNP")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
@@ -26290,6 +26302,7 @@
     (descr "SMD pad as test Point, diameter 1.0mm")
     (tags "test point SMD pad")
     (property "LCSC" "DNP")
+    (property "Manufacturer" "DNP")
     (property "Manufacturer_No" "DNP")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
@@ -26848,7 +26861,7 @@
     (at 194.74 133.26)
     (descr "SOT, 5 Pin (https://www.jedec.org/sites/default/files/docs/Mo-178c.PDF variant AA), generated with kicad-footprint-generator ipc_gullwing_generator.py")
     (tags "SOT TO_SOT_SMD")
-    (property "LCSC" "")
+    (property "LCSC" "C2150007")
     (property "Manufacturer" "Diodes, Inc.")
     (property "Manufacturer_No" "AP22815AWT-7")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
@@ -27417,9 +27430,10 @@
     (at 71.265 128.755 -90)
     (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
     (tags "capacitor")
-    (property "LCSC" "")
-    (property "Manufacturer" "")
+    (property "LCSC" "C94034")
+    (property "Manufacturer" "Murata")
     (property "Manufacturer_N" "")
+    (property "Manufacturer_No" "GRM31CR61A476ME15L")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
     (property "ki_description" "Unpolarized capacitor, small symbol")
@@ -27475,7 +27489,7 @@
     (descr "Resistor SMD 0402 (1005 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 "LCSC" "DNP")
-    (property "Manufacturer" "")
+    (property "Manufacturer" "DNP")
     (property "Manufacturer_No" "DNP")
     (property "Sheetfile" "pocket-reform-motherboard.kicad_sch")
     (property "Sheetname" "")
@@ -27487,7 +27501,7 @@
         (effects (font (size 0.5 0.5) (thickness 0.1)))
       (tstamp 279b2c93-86a9-45c1-b9a9-ca3dc8987f25)
     )
-    (fp_text value "0" (at 0 1.17) (layer "F.Fab")
+    (fp_text value "DNP" (at 0 1.17) (layer "F.Fab")
         (effects (font (size 1 1) (thickness 0.15)))
       (tstamp 6677685c-1ef2-4d6c-82f8-52b6f19bee53)
     )
@@ -63696,9 +63710,7 @@
     (filled_polygon
       (layer "F.Cu")
       (pts
-        (xy 105.763638 89.874986)
-        (xy 105.821394 89.909143)
-        (xy 105.821397 89.909143)
+        (xy 105.763638 89.874985)
         (xy 105.821399 89.909145)
         (xy 105.981169 89.955562)
         (xy 106.013988 89.958145)
@@ -63750,11 +63762,10 @@
         (xy 106.666 90.554)
         (xy 106.133461 90.554)
         (xy 105.5735 90.554)
-        (xy 105.5735 90.447505)
-        (xy 105.5735 89.983435)
-        (xy 105.593501 89.915318)
-        (xy 105.647157 89.868825)
-        (xy 105.717431 89.858721)
+        (xy 105.5735 89.983439)
+        (xy 105.593502 89.915318)
+        (xy 105.647158 89.868825)
+        (xy 105.717432 89.858721)
       )
     )
     (filled_polygon
diff --git a/pocket-reform-motherboard/pocket-reform-motherboard.kicad_sch b/pocket-reform-motherboard/pocket-reform-motherboard.kicad_sch
index ac3f523..dfa1e9a 100644
--- a/pocket-reform-motherboard/pocket-reform-motherboard.kicad_sch
+++ b/pocket-reform-motherboard/pocket-reform-motherboard.kicad_sch
@@ -10078,6 +10078,7 @@
   (no_connect (at 109.22 248.92) (uuid 80977079-1e92-41e3-83ea-f1ce257988a3))
   (no_connect (at 706.12 152.4) (uuid 81719882-1852-4a29-8503-c1efcbe1c960))
   (no_connect (at 937.26 529.59) (uuid 828c5fb5-b646-41fb-b76e-4f8d427f217f))
+  (no_connect (at 238.76 406.4) (uuid 83e04da1-6f2c-4d7e-a171-3eee1aa6c194))
   (no_connect (at 756.92 593.09) (uuid 8615dae0-65cf-4932-8e6f-9a0f32429a5e))
   (no_connect (at 195.58 444.5) (uuid 869d6302-ae22-478f-9723-3feacbb12eef))
   (no_connect (at 759.46 445.77) (uuid 8b0c31a2-a33e-415a-a765-a3ece950aacf))
@@ -16708,7 +16709,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 1dd390f7-607e-45c9-ad9b-b02630f14cd3)
   )
-  (text "TODO: N/P swapped" (at 621.03 510.54 0)
+  (text "N/P swapped" (at 621.03 510.54 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 1edcfd24-e570-42d0-b1b2-4aea37699c02)
   )
@@ -16740,7 +16741,8 @@
     (effects (font (size 2.54 2.54)) (justify left bottom))
     (uuid 2a89034f-3e1c-4928-bf2f-f25d7456c5fb)
   )
-  (text "TODO: ordered B version by\naccident (active low)" (at 839.47 59.69 0)
+  (text "WARNING: do not use B version by\naccident (active low)"
+    (at 836.93 58.42 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 2e179494-a853-4275-aa37-5cfb74bf225c)
   )
@@ -16901,7 +16903,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 8578f4b9-2425-4624-bd9e-92ab185b49c4)
   )
-  (text "Heatsink Mount" (at 137.16 765.175 0)
+  (text "Heatsink/SOM Mount" (at 137.16 765.175 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 85995ef5-5964-4265-ae7d-a189dcc7905d)
   )
@@ -17017,7 +17019,7 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c20aea50-e9e4-4978-b938-d613d445aab7)
   )
-  (text "TODO: N/P swapped" (at 622.3 534.67 0)
+  (text "N/P swapped" (at 622.3 534.67 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid c3ad35d4-aadb-4e28-9538-5aac03fe1d4c)
   )
@@ -22837,13 +22839,13 @@
     (property "Datasheet" "~" (at 147.955 777.875 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C2915626" (at 147.955 777.875 0)
+    (property "LCSC" "" (at 147.955 777.875 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Sinhoo" (at 147.955 777.875 0)
+    (property "Manufacturer" "Wurth" (at 147.955 777.875 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer_No" "SMTSO2020CTJ" (at 147.955 777.875 0)
+    (property "Manufacturer_No" "9774025243R" (at 147.955 777.875 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid c974e678-3df5-43ca-8348-6e0308146a91))
@@ -22937,6 +22939,9 @@
     (property "Manufacturer_No" "DNP" (at 525.78 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Manufacturer" "DNP" (at 525.78 134.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 13d67648-d021-41cf-9b56-3ef0bb486591))
     (instances
       (project "pocket-reform-motherboard"
@@ -25530,7 +25535,7 @@
     (property "Reference" "R55" (at 259.08 609.6 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "0" (at 259.08 612.14 90)
+    (property "Value" "33" (at 259.08 612.14 90)
       (effects (font (size 1.27 1.27)))
     )
     (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (at 259.08 612.14 0)
@@ -25539,7 +25544,7 @@
     (property "Datasheet" "~" (at 259.08 612.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "" (at 259.08 612.14 0)
+    (property "Manufacturer" "DNP" (at 259.08 612.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Manufacturer_No" "DNP" (at 259.08 612.14 0)
@@ -26528,6 +26533,12 @@
     (property "Datasheet" "https://www.ti.com/lit/ds/symlink/tps7a05.pdf" (at 938.53 643.89 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Manufacturer" "Texas Instruments" (at 938.53 642.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer_No" "TPS7A0533PDBZ" (at 938.53 642.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 5289f1fb-4f3f-4edc-a921-49f5acd4d672))
     (pin "2" (uuid d11f7134-d34b-41e0-82d9-f8e2868b4f97))
     (pin "3" (uuid c0af2c74-f444-401d-a87b-a76b35c18641))
@@ -26555,6 +26566,12 @@
     (property "Datasheet" "~" (at 33.02 196.85 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Manufacturer" "JST" (at 33.02 196.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer_No" "SM02B-SRSS-TB(LF)(SN)" (at 33.02 196.85 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid cdcc552e-f1be-40b5-b5b8-a72996639e6a))
     (pin "2" (uuid 463ddacc-a7c1-4107-9bdc-69cf15549c8c))
     (instances
@@ -26622,7 +26639,7 @@
     (property "Reference" "R86" (at 265.43 609.6 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "0" (at 265.43 614.68 90)
+    (property "Value" "33" (at 265.43 614.68 90)
       (effects (font (size 1.27 1.27)))
     )
     (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (at 265.43 614.68 0)
@@ -26631,7 +26648,7 @@
     (property "Datasheet" "~" (at 265.43 614.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "" (at 265.43 614.68 0)
+    (property "Manufacturer" "DNP" (at 265.43 614.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Manufacturer_No" "DNP" (at 265.43 614.68 0)
@@ -26940,6 +26957,9 @@
     (property "Manufacturer_No" "DNP" (at 590.55 223.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Manufacturer" "DNP" (at 590.55 223.52 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid c86668ae-acaf-4809-8727-33c9c64d3bce))
     (pin "2" (uuid 5485e8b8-e952-4608-9dd7-8739f7f9999d))
     (instances
@@ -27061,13 +27081,16 @@
     (property "Datasheet" "~" (at 1007.11 706.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "" (at 1007.11 706.12 0)
+    (property "Manufacturer" "Murata" (at 1007.11 706.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Manufacturer_N" "" (at 1007.11 706.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "" (at 1007.11 706.12 0)
+    (property "LCSC" "C94034" (at 1007.11 706.12 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer_No" "GRM31CR61A476ME15L" (at 1007.11 706.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 01e30e2a-f42c-4d68-826e-e7a22ad304ae))
@@ -27222,6 +27245,9 @@
     (property "Manufacturer_No" "74HC573PW,118" (at 96.52 246.38 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "LCSC" "C5944" (at 96.52 246.38 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 01c0a89f-3719-44f6-a24d-88fedaa03be4))
     (pin "10" (uuid bc0bb3bf-9fef-4923-a3bc-b6d4c99dec54))
     (pin "11" (uuid 01daafc5-fb37-46b5-b01d-f2f68df9d3a5))
@@ -27509,13 +27535,13 @@
     (property "Datasheet" "~" (at 514.35 505.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "" (at 514.35 505.46 0)
+    (property "LCSC" "C321660" (at 514.35 505.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "" (at 514.35 505.46 0)
+    (property "Manufacturer" "FH" (at 514.35 505.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer_No" "" (at 514.35 505.46 0)
+    (property "Manufacturer_No" "RC-02W9531FT" (at 514.35 505.46 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e127de15-7c61-4bb1-aba5-3d8b458a5ccb))
@@ -27660,10 +27686,10 @@
     (property "Manufacturer" "Wurth" (at 789.94 427.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer_No" "SMTSO2020CTJ" (at 789.94 427.99 0)
+    (property "Manufacturer_No" "9774020243R" (at 789.94 427.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C2915626" (at 789.94 427.99 0)
+    (property "LCSC" "" (at 789.94 427.99 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 1791d1b1-2c67-4510-a7c9-f0b780a30fdf))
@@ -27757,7 +27783,7 @@
     (property "Manufacturer_No" "AP22815AWT-7" (at 858.52 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "" (at 858.52 76.2 0)
+    (property "LCSC" "C2150007" (at 858.52 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3687ef0c-f37e-4b2e-b1f0-2ec5d79ba503))
@@ -28032,10 +28058,10 @@
     (property "Manufacturer" "Samsung" (at 1007.11 668.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer_No" "" (at 1007.11 668.02 0)
+    (property "Manufacturer_No" "CL10A226MP8NUNE" (at 1007.11 668.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "" (at 1007.11 668.02 0)
+    (property "LCSC" "C86295" (at 1007.11 668.02 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8de259bc-9c46-46a3-9be2-0ecd916553a6))
@@ -28507,7 +28533,7 @@
     (property "Datasheet" "~" (at 265.43 579.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "" (at 265.43 579.12 0)
+    (property "Manufacturer" "DNP" (at 265.43 579.12 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Manufacturer_No" "DNP" (at 265.43 579.12 0)
@@ -28874,13 +28900,13 @@
     (property "Datasheet" "~" (at 1008.38 716.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "" (at 1008.38 716.28 0)
+    (property "LCSC" "C114762" (at 1008.38 716.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "" (at 1008.38 716.28 0)
+    (property "Manufacturer" "Yageo" (at 1008.38 716.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer_No" "" (at 1008.38 716.28 0)
+    (property "Manufacturer_No" "RC0402FR-072K2L" (at 1008.38 716.28 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f250e0c2-4001-466c-af90-33e0852d4ac2))
@@ -29012,13 +29038,13 @@
     (property "Datasheet" "~" (at 1002.03 703.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "" (at 1002.03 703.58 0)
+    (property "Manufacturer" "Murata" (at 1002.03 703.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer_No" "" (at 1002.03 703.58 0)
+    (property "Manufacturer_No" "GRM31CR61A476ME15L" (at 1002.03 703.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "" (at 1002.03 703.58 0)
+    (property "LCSC" "C94034" (at 1002.03 703.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d18c2699-f21a-45df-b722-f7347e455d9e))
@@ -29829,12 +29855,15 @@
     (property "Datasheet" "https://www.ti.com/lit/ds/symlink/sn74lvc1g34.pdf" (at 767.08 261.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Texas Instruments" (at 767.08 261.62 0)
+    (property "Manufacturer" "Texas Instruments or UMW" (at 767.08 261.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Manufacturer_No" "SN74LVC1G34DCKR" (at 767.08 261.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "LCSC" "C7394031" (at 767.08 261.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 0cec2e6a-1aa4-455f-99f1-361eca357f5e))
     (pin "2" (uuid 604999f1-e0ff-4b57-a3df-d9b02082df1d))
     (pin "3" (uuid 4bfe5f95-053f-472b-9dea-f8b83b5f76ad))
@@ -31299,7 +31328,7 @@
     (property "Datasheet" "~" (at 265.43 599.44 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "" (at 265.43 599.44 0)
+    (property "Manufacturer" "DNP" (at 265.43 599.44 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Manufacturer_No" "DNP" (at 265.43 599.44 0)
@@ -32513,10 +32542,10 @@
     (property "Manufacturer" "Wurth" (at 795.02 558.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer_No" "SMTSO2020CTJ" (at 795.02 558.8 0)
+    (property "Manufacturer_No" "9774020243R" (at 795.02 558.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C2915626" (at 795.02 558.8 0)
+    (property "LCSC" "" (at 795.02 558.8 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9684e506-612d-4fc5-9744-ab0ddfadbb54))
@@ -33155,7 +33184,7 @@
     (property "Datasheet" "~" (at 274.32 624.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "" (at 274.32 624.84 0)
+    (property "Manufacturer" "DNP" (at 274.32 624.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Manufacturer_No" "DNP" (at 274.32 624.84 0)
@@ -33164,8 +33193,8 @@
     (property "LCSC" "DNP" (at 274.32 624.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid f5aae23f-4295-49d4-8bc8-3254d38b9c50))
-    (pin "2" (uuid f4f2d241-5aed-4a81-8187-9d4c20749ebd))
+    (pin "1" (uuid 0edf3712-b035-4a80-8c2b-df49147205b5))
+    (pin "2" (uuid 7dee9725-7693-4d29-a14c-04c06968dc5a))
     (instances
       (project "pocket-reform-motherboard"
         (path "/63c56ea4-91a3-4172-b9de-a4388cc8f894"
@@ -33345,7 +33374,7 @@
     (property "Datasheet" "~" (at 266.7 622.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "" (at 266.7 622.3 0)
+    (property "Manufacturer" "DNP" (at 266.7 622.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Manufacturer_No" "DNP" (at 266.7 622.3 0)
@@ -33354,8 +33383,8 @@
     (property "LCSC" "DNP" (at 266.7 622.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid eae9d66f-5eac-4b59-9cdc-34a01bcfb178))
-    (pin "2" (uuid 71a70dac-0e8d-4230-a76a-3dc20deee7fd))
+    (pin "1" (uuid 08b38f3e-c550-4004-bd06-503d5ff5e164))
+    (pin "2" (uuid 19638ee6-aa42-4d80-a775-1714a3b16ce3))
     (instances
       (project "pocket-reform-motherboard"
         (path "/63c56ea4-91a3-4172-b9de-a4388cc8f894"
@@ -33561,6 +33590,9 @@
     (property "Manufacturer_No" "DNP" (at 510.54 134.62 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Manufacturer" "DNP" (at 510.54 134.62 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid 805837fe-fd07-424c-9e34-29e61f52f30e))
     (instances
       (project "pocket-reform-motherboard"
@@ -34156,6 +34188,12 @@
     (property "Datasheet" "http://www.ti.com/lit/ds/symlink/tusb8041.pdf" (at 562.61 502.92 0)
       (effects (font (size 1.27 1.27)) hide)
     )
+    (property "Manufacturer" "Texas Instruments" (at 570.23 508 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Manufacturer_No" "TUSB8041" (at 570.23 508 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
     (pin "1" (uuid f439831e-f783-4674-9da8-057f85bd0c63))
     (pin "10" (uuid a002df8d-abad-4378-9c2b-11512654d364))
     (pin "11" (uuid 03370d4e-6f83-46c9-a1a3-3dac3d30afd3))
@@ -34473,10 +34511,10 @@
     (property "Manufacturer" "Samsung" (at 1007.11 648.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer_No" "" (at 1007.11 648.97 0)
+    (property "Manufacturer_No" "CL10A226MP8NUNE" (at 1007.11 648.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "" (at 1007.11 648.97 0)
+    (property "LCSC" "C86295" (at 1007.11 648.97 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 52d334df-5b30-4a27-a775-ca054a2fb2a0))
@@ -35495,13 +35533,13 @@
     (property "Datasheet" "~" (at 144.145 771.525 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "LCSC" "C2915626" (at 144.145 771.525 0)
+    (property "LCSC" "" (at 144.145 771.525 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Sinhoo" (at 144.145 771.525 0)
+    (property "Manufacturer" "Wurth" (at 144.145 771.525 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer_No" "SMTSO2020CTJ" (at 144.145 771.525 0)
+    (property "Manufacturer_No" "9774025243R" (at 144.145 771.525 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9b2acb7f-d4db-4445-9ba4-97b75a788759))