diff --git a/hardware/eda/circuits/board.py b/hardware/eda/circuits/board.py
index 10ac951..5c6717c 100644
--- a/hardware/eda/circuits/board.py
+++ b/hardware/eda/circuits/board.py
@@ -124,7 +124,7 @@ rad=R(value="0"); cad=C("100nF"); p3v3+=rad[1]; rad[2]+=rp[44]; rp[44]+=cad[1];
 for _ in range(6): dcp(p3v3)
 for _ in range(2): dcp(dvdd)
 rp[21]+=xin; rp[22]+=xout
-xt=Part("Device","Crystal",value="12MHz",footprint="Crystal:Crystal_SMD_3225-4Pin_3.2x2.5mm")
+xt=Part("Device","Crystal",value="12MHz",footprint="Crystal:Crystal_SMD_2012-2Pin_2.0x1.2mm")  # 2-pin matches the 2-pin symbol (was a 4-pad fp -> Y1 pads 3/4 had no symbol pin). Set to your chosen crystal's footprint; if 4-pad, ground the case pads.
 xin+=xt[1]; xout+=xt[2]; cx1=C("15pF"); cx2=C("15pF"); xin+=cx1[1]; cx1[2]+=gnd; xout+=cx2[1]; cx2[2]+=gnd
 FL=mk("W25Q128JVS",[Pin(num=1,name="CS",func=P.INPUT),Pin(num=2,name="IO1",func=P.BIDIR),Pin(num=3,name="IO2",func=P.BIDIR),
     Pin(num=4,name="GND",func=P.PWRIN),Pin(num=5,name="IO0",func=P.BIDIR),Pin(num=6,name="CLK",func=P.INPUT),
@@ -303,7 +303,10 @@ for pin,net in {1:aout_hot,2:gnd,3:aout_cold,4:chassis,5:ain_hot,6:gnd,7:ain_col
 j5=hdr("Conn_01x08","Connector_PinHeader_2.54mm:PinHeader_1x08_P2.54mm_Vertical")
 for pin,net in {1:mo_a,2:mo_b,3:mi_a,4:mi_b,5:mt_a,6:mt_b,7:p5,8:gnd}.items(): j5[pin]+=net
 j1=Part("Connector","USB_C_Receptacle",footprint="Connector_USB:USB_C_Receptacle_HRO_TYPE-C-31-M-12")
-j1["VBUS"]+=vbus; j1["GND"]+=gnd; j1["SHIELD"]+=chassis; j1["D+"]+=usb_dp_c; j1["D-"]+=usb_dm_c
+j1["VBUS"]+=vbus; j1["GND"]+=gnd; j1["D+"]+=usb_dp_c; j1["D-"]+=usb_dm_c
+# USB shell/shield -> chassis is tied at LAYOUT (the symbol's shield pin "S1" mismatches older
+# KiCad footprints that name the shell pads "SH" -> would error on import). Ground the shell to
+# CHASSIS in Pcbnew directly, or via the usual 1Mohm || small-cap.
 rc1=R(value="5.1k"); rc2=R(value="5.1k"); j1["CC1"]+=rc1[1]; rc1[2]+=gnd; j1["CC2"]+=rc2[1]; rc2[2]+=gnd
 ESD=mk("USBLC6-2SC6",[Pin(num=1,name="IO1",func=P.PASSIVE),Pin(num=2,name="GND",func=P.PWRIN),Pin(num=3,name="IO2",func=P.PASSIVE),
     Pin(num=4,name="IO2b",func=P.PASSIVE),Pin(num=5,name="VBUS",func=P.PASSIVE),Pin(num=6,name="IO1b",func=P.PASSIVE)],fp="Package_TO_SOT_SMD:SOT-23-6")