diff --git a/Hardware/BOM.csv b/Hardware/BOM.csv
index cbacbb2..b8bafee 100644
--- a/Hardware/BOM.csv
+++ b/Hardware/BOM.csv
@@ -1,26 +1,29 @@
-busComment,RefDes,Pattern,JLCPCB
-1u,"C1, C2, C3",CAP_0603_M,C15849
-0.1u,C4,CAP_0603_N,C694145
-8pf,"C5, C7",CAP_0805_M,C296108
-1u,C6,CAP_0805_M,C377011
-https://datasheet.lcsc.com/lcsc/1810101813_Everlight-Elec-19-213-Y2C-CQ2R2L-3T-CY_C72038.pdf,"D1, D2",DIO_0603_L,C72038
-http://datasheets.diptrace.com/con_headers/xPxCxxxLFBN-RC_10492-E.pdf,J1,RHDRV22W80P254_22X1_5638X250H875_AP1,
-http://datasheets.diptrace.com/con_headers/xPxCxxxLFBN-RC_10492-E.pdf,"J2, J6, J9",RHDRV4W80P254_4X1_1066X250H875_AP1,
-https://datasheet.lcsc.com/lcsc/1811131825_Korean-Hroparts-Elec-TYPE-C-31-M-12_C165948.pdf,J3,C165948,C165948
-http://datasheets.diptrace.com/con_headers/xPxCxxxLFBN-RC_10492-E.pdf,"J4, J8, J10, J11",RHDRV6W80P254_6X1_1574X250H875_AP1,
-https://jlcpcb.com/partdetail/Hooya-PJ_320_OS/C2939180,J5,PJ-320,C2939180
-http://datasheets.diptrace.com/con_headers/xPxCxxxLFBN-RC_10492-E.pdf,J7,RHDRV13W80P254_13X1_3352X250H875_AP1,
-0,"R1, R2, R5",RES_0603_M,
-5k1,"R3, R4",RES_0402_N,
-22k,"R8, R15, R16",RES_0402_N,
-300,"R6, R7",RES_0805_M,
-56k,R9,RES_0805_N,
-46k,R10,RES_0805_N,
-40k,R11,RES_0805_N,
-10k,"R12, R13, R14",RES_0805_N,
-,S1,C720477,C720477
-https://jlcpcb.com/partdetail/gswitch-GT_TF003_H018501/C5155563,U1,GT-TF003-H0185-01,C5155563
-F1C200S,U2,QFN89P40_1000X1000X90L40X20T674M,
-https://jlcpcb.com/partdetail/AnalogDevices-ADP323ACPZR7/C143893,U3,QFN17P50_300X300X80L40X24T160N,C143893
-https://jlcpcb.com/partdetail/TexasInstruments-TLV73311PDQNR/C2863780,U4,X2SON,C2863780
-file:///C:/Users/devin/Downloads/X322524MMB4SI.pdf,Y1,X322524MMB4SI,C70583
+Comment,RefDes,Pattern,JLCPCB
+1 CAP_0402_7pF Murata Electronics 7pF,"C1, C2",CAP_0402_N,C307438
+2 CAP_0805_M  8pf,"C3, C4, C7",CAP_0805_M,
+3 CAP_0603_N  0.1u,C5,CAP_0603_N,C694145
+4 CAP_0603_M  1u,"C6, C8, C9",CAP_0603_M,C15849
+5 YellowLED  Yellow LED,"D1, D2, D3, D4, D5, D6, D7, D8",DIO_0603_L,C72038
+6 PJ-320(OS) HOOYA ,J1,PJ-320,C2939180
+7 TYPE-C-31-M-12 Korean Hroparts Elec ,"J2, J3",C165948,C165948
+8 PPTC041LFBN-RC Sullins ,"J4, J8",RHDRV4W80P254_4X1_1066X250H875_AP1,
+9 A2541HWV-2P CJT(Changjiang Connectors) ,J5,RHDRV2W80P254_2X1_558X250H875_AP1,C225499
+10 PPTC061LFBN-RC Sullins ,"J6, J7",RHDRV6W80P254_6X1_1574X250H875_AP1,
+11 RES_0402_N  5K1,"R1, R2, R3, R4, R15, R25, R26, R27, R28",RES_0402_N,C400635
+12 RES_0805_M  300,"R5, R6, R7, R8, R9, R10, R11, R12",RES_0805_M,C352224
+13 RES_0402_27.4  27.4,"R13, R14",RES_0402_M,C31439
+14 RES_0805_N  56k,"R16, R17, R18, R19, R20, R21, R22, R31, R32, R33, R34, R35, R36",RES_0805_N,C2828780
+15 RES_0402_1K  1K,"R23, R24",RES_0402_N,C11702
+16 RES_0603_M  0,"R29, R30",RES_0603_M,C21189
+17 TS-1088-AR02016  ,"S1, S2, S3, S4",C720477,C720477
+18 GT-TF003-H0185-01 G-Switch ,U1,GT-TF003-H0185-01,C5155563
+19 W25Q128JVSIQ Winbond Elec 128Mbit,"U2, U7",SOIC8P127_528X790X216L65X41N,C97521
+20 MAX40200AUK+T Analog Devices PD Switch,"U3, U4",SOT23-5P65_210X100L36X22M,C2649430
+21 2x20 Header  ,U5,HEADER40,C19192096
+22 RP2040 Raspberry Pi  ,U6,RP2040,C2040
+23 F1C200S  ,U8,QFN89P40_1000X1000X90L40X20T674M,
+24 TLV73311PDQNR Texas Instruments 1.11V,U9,X2SON,C2863780
+25 ADP323 Analog Devices ,U10,QFN17P50_300X300X80L40X24T160N,C143893
+26 RPI_HEADER  ,U11,HEADER40,C19192096
+27 7M12000039 TXC Corp 12Mhz,Y1,7M12000039,C90900
+28 X322524MMB4SI Yangxing Tech 24MHZ 7PF,Y2,X322524MMB4SI,C70583
diff --git a/Hardware/PNP.csv b/Hardware/PNP.csv
index 5e775ee..511fe92 100644
--- a/Hardware/PNP.csv
+++ b/Hardware/PNP.csv
@@ -1,43 +1,79 @@
-"Designator","Mid X (mm)","Mid Y (mm)","Layer","Rotation"
-"C1","60","29","Top","0.0"
-"C2","40","29","Top","180.0"
-"C3","46","20","Top","180.0"
-"C4","23","15","Top","90.0"
-"C5","48.799","39","Top","90.0"
-"C6","22","18","Top","0.0"
-"C7","54.799","39","Top","270.0"
-"D1","85","19","Top","0.0"
-"D2","85","22","Top","0.0"
-"J1","56.67","2","Top","0.0"
-"J2","1.523","49.324","Top","270.0"
-"J3","29.853","68.56","Top","180.0"
-"J4","1","33.65","Top","270.0"
-"J5","18","66.35","Top","270.0"
-"J6","91","59.81","Top","90.0"
-"J7","91","34.76","Top","270.0"
-"J8","47.35","66","Top","0.0"
-"J9","15","29.19","Top","270.0"
-"J10","47.35","70","Top","0.0"
-"J11","18.65","2","Top","180.0"
-"R1","46","18","Top","0.0"
-"R2","6","53","Top","0.0"
-"R3","32","62","Top","180.0"
-"R4","27","62","Top","0.0"
-"R5","9","30.5","Top","180.0"
-"R6","81","19","Top","180.0"
-"R7","81","22","Top","180.0"
-"R8","35","30","Top","270.0"
-"R9","6","16","Top","90.0"
-"R10","8","16","Top","90.0"
-"R11","10","16","Top","90.0"
-"R12","6","13","Top","90.0"
-"R13","8","13","Top","90.0"
-"R14","10","13","Top","90.0"
-"R15","59","30","Top","180.0"
-"R16","59","30.8","Top","0.0"
-"S1","30","30","Top","180.0"
-"U1","69.512","64.297","Top","180.0"
-"U2","50","30","Top","0.0"
-"U3","15","15","Top","0.0"
-"U4","27.325","14.823","Top","180.0"
-"Y1","51.799","39","Top","180.0"
+Designator,Mid X (mm),Mid Y (mm),Layer,Rotation
+C1,80.5,54,Top,270
+C2,78,52,Top,0
+C3,38.5,34,Top,270
+C4,43.5,34,Top,90
+C5,30,26,Top,90
+C6,27,25,Top,270
+C7,24,21,Top,90
+C8,24,15,Top,270
+C9,32,14,Top,270
+D1,15,75,Top,90
+D2,17,75,Top,90
+D3,19,75,Top,90
+D4,21,75,Top,90
+D5,93,75,Top,90
+D6,95,75,Top,90
+D7,97,75,Top,90
+D8,99,75,Top,90
+J1,29,76.35,Top,270
+J2,40.853,78.56,Top,180
+J3,78.853,78.56,Top,180
+J4,12,59.19,Top,270
+J5,87,55.27,Top,90
+J6,12,43.65,Top,270
+J7,12,24.65,Top,270
+J8,32.19,51,Bottom,180
+R1,77,72.5,Top,0
+R2,81,72.5,Top,180
+R3,38,72,Top,0
+R4,43,72,Top,180
+R5,15,69,Top,270
+R6,17,69,Top,270
+R7,19,69,Top,270
+R8,21,69,Top,270
+R9,93,69,Top,270
+R10,95,69,Top,270
+R11,97,69,Top,270
+R12,99,69,Top,270
+R13,80,65,Top,270
+R14,81,65,Top,270
+R15,73.5,62,Top,0
+R16,55,60,Top,270
+R17,57,60,Top,270
+R18,59,60,Top,270
+R19,61,60,Top,270
+R20,63,60,Top,270
+R21,65,60,Top,270
+R22,67,60,Top,270
+R23,81.5,54,Top,90
+R24,82,50,Top,270
+R25,40,44,Top,0
+R26,23,26,Top,0
+R27,46,24.5,Top,90
+R28,47,24.5,Top,270
+R29,32,17,Top,270
+R30,35,17,Top,270
+R31,26,17,Top,90
+R32,28,17,Top,90
+R33,30,17,Top,90
+R34,26,14,Top,90
+R35,28,14,Top,90
+R36,30,14,Top,90
+S1,71,62,Top,270
+S2,86,50,Top,180
+S3,40,41,Top,180
+S4,24,30,Top,0
+U1,58.512,74.197,Top,180
+U2,74,68,Top,270
+U3,44,68,Top,180
+U4,83,68,Top,180
+U5,101,40.5,Top,90
+U6,79,60,Top,0
+U7,33,37,Top,180
+U8,39,25,Top,0
+U9,32.5,26,Top,180
+U10,29,21,Top,180
+U11,68,13.5,Top,180
+Y1,78,54,Top,180
+Y2,41,34,Top,90
diff --git a/Hardware/SimpleSBC.dip b/Hardware/SimpleSBC.dip
index ab91ac7..aed2cae 100644
Binary files a/Hardware/SimpleSBC.dip and b/Hardware/SimpleSBC.dip differ