diff --git a/hardware/releases/evt1/tomu-fpga-bom.csv b/hardware/releases/evt1/tomu-fpga-bom.csv
index 68ce7ed..57e0b03 100644
--- a/hardware/releases/evt1/tomu-fpga-bom.csv
+++ b/hardware/releases/evt1/tomu-fpga-bom.csv
@@ -8,22 +8,15 @@ C8,"0805, 1uF, 10V, X5R, 20%",C_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tom
 C3,"0805, 1uF, 10V, X5R, 20%",C_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
 C1,"0805, 1uF, 10V, X5R, 20%",C_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
 C2,"0805, 1uF, 10V, X5R, 20%",C_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
-U9,USB-B,USB-B,1,,tomu-fpga,,,,PCB-etched USB pads,DNP,DNP,DNP,
 U10,RGB-LED,LED-RGB-5DS-UHD1110-FKA,1,https://www.cree.com/led-components/media/documents/ds-UHD1110-FKA.pdf,tomu-fpga,,Citizen,N/A,,UHD1110-FKA,Cree,,CL-505S-X-SD-T
 R12,"0805, 22ohm, 1/16W, 1%",R_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
 R11,"0805, 22ohm, 1/16W, 1%",R_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
 R9,"0805, 1.5k, 1/16W, 1%",R_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
-U6,MEMS Oscillator (DNP),MEMS-20005625B,1,http://ww1.microchip.com/downloads/en/DeviceDoc/20005625B.pdf,tomu-fpga,,,DSC6001HI2A-048.0000T-ND,MEMS OSC XO 48.0000MHZ CMOS SMD,DSC6001HI2A-048.0000T,Microchip,,
 C4,"0805, 100nF, 10V, X5R, 20%",C_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
-SW2,Captouch Pads,Touchpads,1,,tomu-fpga,,,,PCB-etched captouch pads,DNP,DNP,DNP,
-C23,"0805, 100nF, 10V, X5R, 20% (DNP)",C_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,DNP,DNP,DNP,
-C22,"0805, 10uF, 10V, X5R, 20% (DNP)",C_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,DNP,DNP,DNP,
-R10,"0805, 100ohm, 1/16W, 1% (DNP)",R_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,DNP,DNP,DNP,
 R1,"0805, 10k, 1/16W",R_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
-SW3,USER1,SPST-NO-Button,1,http://www.ckswitches.com/media/1467/pts525.pdf,tomu-fpga,,,CKN9104CT-ND,SWITCH TACTILE SPST-NO 0.02A 15V,PTS525SM15SMTR2 LFS,C&K,SW-PB-5X5-1.6,
-SW4,USER2,SPST-NO-Button,1,http://www.ckswitches.com/media/1467/pts525.pdf,tomu-fpga,,,CKN9104CT-ND,SWITCH TACTILE SPST-NO 0.02A 15V,PTS525SM15SMTR2 LFS,C&K,SW-PB-5X5-1.6,
+5,USER5,SPST-NO-Button,1,http://www.ckswitches.com/media/1467/pts525.pdf,tomu-fpga,,,CKN9104CT-ND,SWITCH TACTILE SPST-NO 0.02A 15V,PTS525SM15SMTR2 LFS,C&K,SW-PB-5X5-1.6,
+6,USER6,SPST-NO-Button,1,http://www.ckswitches.com/media/1467/pts525.pdf,tomu-fpga,,,CKN9104CT-ND,SWITCH TACTILE SPST-NO 0.02A 15V,PTS525SM15SMTR2 LFS,C&K,SW-PB-5X5-1.6,
 R8,"0805, 1.5k, 1/16W, 1%",R_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
-R4,"0805, 10k, 1/16W (DNP)",R_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,DNP,DNP,DNP,
 R5,"0805, 10k, 1/16W",R_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
 C21,"0805, 100nF, 10V, X5R, 20%",C_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
 C20,"0805, 100nF, 10V, X5R, 20%",C_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
@@ -44,15 +37,9 @@ C16,"0805, 1uF, 10V, X5R, 20%",C_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,to
 C27,"0805, 10nF, 10V, X5R, 20%",C_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
 C25,"0805, 1uF, 10V, X5R, 20%",C_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
 U7,Crystal Oscillator,XTAL-2520,1,https://www.ecsxtal.com/store/pdf/ECS-2520MV.pdf,tomu-fpga,,,XC2756CT-ND,XTAL OSC XO 48.0000MHZ CMOS SMD,XC2756CT-ND,ECS,,
-R7,"0201, 0ohm (DNP)",R_0201_0603Metric,1,,tomu-fpga,,,,,DNP,DNP,DNP,
-R6,"0201, 0ohm (DNP)",R_0201_0603Metric,1,,tomu-fpga,,,,,DNP,DNP,DNP,
 C11,"0805, 100nF, 10V, X5R, 20%",C_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
 U5,ICE40UP5K-SG48I,QFN-48-1EP_7x7mm_P0.5mm_EP5.6x5.6mm,1,http://www.latticesemi.com/Products/FPGAandCPLD/iCE40Ultra,tomu-fpga,,,220-2212-1-ND,"ICE40-ULTRAPLUS, 5280 LUTS, 1.2V",ICE40UP5K-SG48I,Lattice,,
 U4,SPI Flash,SOIC-8,1,http://www.winbond.com/resource-files/w25q128jv_dtr%20revc%2003272018%20plus.pdf,tomu-fpga,,,W25Q128JVSIMCT-ND,IC FLASH 128M SPI 133MHZ 8SOIC,W25Q128JVSIM,Winbond Electronics,,
-SW1,RESET,SPST-NO-Button,1,http://www.ckswitches.com/media/1467/pts525.pdf,tomu-fpga,,,CKN9104CT-ND,SWITCH TACTILE SPST-NO 0.02A 15V,PTS525SM15SMTR2 LFS,C&K,SW-PB-5X5-1.6,
+Reset,RESET,SPST-NO-Button,1,http://www.ckswitches.com/media/1467/pts525.pdf,tomu-fpga,,,CKN9104CT-ND,SWITCH TACTILE SPST-NO 0.02A 15V,PTS525SM15SMTR2 LFS,C&K,SW-PB-5X5-1.6,
 D1,Power LED,LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,http://optoelectronics.liteon.com/upload/download/DS-22-99-0150/LTST-C170KRKT.pdf,tomu-fpga,,,160-1415-1-ND,LED RED CLEAR SMD,LTST-C170KRKT,Lite-On Inc.,,
 R2,"0805, 1.5k, 1/16W, 1%",R_0805_2012Metric_Pad1.15x1.40mm_HandSolder,1,,tomu-fpga,,,,,ANY,ANY,ANY,
-J1,Raspberry_Pi_2_3,PinHeader_2x20_P2.54mm_Vertical,1,https://www.raspberrypi.org/documentation/hardware/raspberrypi/schematics/rpi_SCH_3bplus_1p0_reduced.pdf,tomu-fpga,,,,Connector for development,,,,
-R3,"0201, 0ohm (DNP)",R_0201_0603Metric,1,,tomu-fpga,,,,,DNP,DNP,DNP,
-R13,"0201, 0ohm (DNP)",R_0201_0603Metric,1,,tomu-fpga,,,,,DNP,DNP,DNP,
-J3,PMOD,Pin_Header_Straight_1x06_Pitch2.54mm,1,~,tomu-fpga,,,DNP,,DNP,DNP,,
diff --git a/hardware/releases/evt1/tomu-fpga-top-pos.csv b/hardware/releases/evt1/tomu-fpga-top-pos.csv
index 2bfba66..c839236 100644
--- a/hardware/releases/evt1/tomu-fpga-top-pos.csv
+++ b/hardware/releases/evt1/tomu-fpga-top-pos.csv
@@ -19,8 +19,6 @@ Ref,Val,Package,PosX,PosY,Rot,Side
 "C19","0805, 1uF, 10V, X5R, 20%","C_0805_2012Metric_Pad1.15x1.40mm_HandSolder",66.000000,17.975000,270.000000,top
 "C20","0805, 100nF, 10V, X5R, 20%","C_0805_2012Metric_Pad1.15x1.40mm_HandSolder",39.000000,18.400000,90.000000,top
 "C21","0805, 100nF, 10V, X5R, 20%","C_0805_2012Metric_Pad1.15x1.40mm_HandSolder",54.000000,9.000000,0.000000,top
-"C22","0805, 10uF, 10V, X5R, 20% (DNP)","C_0805_2012Metric_Pad1.15x1.40mm_HandSolder",64.000000,17.975000,90.000000,top
-"C23","0805, 100nF, 10V, X5R, 20% (DNP)","C_0805_2012Metric_Pad1.15x1.40mm_HandSolder",62.000000,18.000000,270.000000,top
 "C24","0805, 1uF, 10V, X5R, 20%","C_0805_2012Metric_Pad1.15x1.40mm_HandSolder",59.000000,31.000000,0.000000,top
 "C25","0805, 1uF, 10V, X5R, 20%","C_0805_2012Metric_Pad1.15x1.40mm_HandSolder",54.000000,11.000000,0.000000,top
 "C26","0805, 10nF, 10V, X5R, 20%","C_0805_2012Metric_Pad1.15x1.40mm_HandSolder",59.000000,29.000000,0.000000,top
@@ -29,20 +27,19 @@ Ref,Val,Package,PosX,PosY,Rot,Side
 "D1","Power LED","LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder",58.000000,3.000000,180.000000,top
 "R1","0805, 10k, 1/16W","R_0805_2012Metric_Pad1.15x1.40mm_HandSolder",10.250000,27.500000,0.000000,top
 "R2","0805, 1.5k, 1/16W, 1%","R_0805_2012Metric_Pad1.15x1.40mm_HandSolder",62.025000,3.000000,180.000000,top
-"R3","0201, 0ohm (DNP)","R_0201_0603Metric",16.750000,19.250000,270.000000,top
-"R4","0805, 10k, 1/16W (DNP)","R_0805_2012Metric_Pad1.15x1.40mm_HandSolder",10.225000,29.500000,0.000000,top
 "R5","0805, 10k, 1/16W","R_0805_2012Metric_Pad1.15x1.40mm_HandSolder",15.250000,18.000000,90.000000,top
-"R6","0201, 0ohm (DNP)","R_0201_0603Metric",47.000000,26.255000,270.000000,top
-"R7","0201, 0ohm (DNP)","R_0201_0603Metric",49.600000,25.800000,180.000000,top
 "R8","0805, 1.5k, 1/16W, 1%","R_0805_2012Metric_Pad1.15x1.40mm_HandSolder",73.275216,35.275216,45.000000,top
 "R9","0805, 1.5k, 1/16W, 1%","R_0805_2012Metric_Pad1.15x1.40mm_HandSolder",74.800000,33.800000,45.000000,top
-"R10","0805, 100ohm, 1/16W, 1% (DNP)","R_0805_2012Metric_Pad1.15x1.40mm_HandSolder",60.000000,20.000000,90.000000,top
 "R11","0805, 22ohm, 1/16W, 1%","R_0805_2012Metric_Pad1.15x1.40mm_HandSolder",71.824784,36.724784,45.000000,top
 "R12","0805, 22ohm, 1/16W, 1%","R_0805_2012Metric_Pad1.15x1.40mm_HandSolder",76.200000,32.400000,45.000000,top
-"R13","0201, 0ohm (DNP)","R_0201_0603Metric",13.750000,19.180000,90.000000,top
+"Reset","RESET","SPST-NO-Button",7.000000,20.000000,270.000000,top
+"5","USER5","SPST-NO-Button",63.000000,43.000000,180.000000,top
+"6","USER6","SPST-NO-Button",53.000000,43.000000,180.000000,top
 "U1","LDO-SOT23-1.2V","SOT-23-5_HandSoldering",27.350000,20.050000,270.000000,top
 "U2","LDO-SOT23-3.3V","SOT-23-5_HandSoldering",33.000000,27.000000,270.000000,top
 "U3","LDO-SOT23-2.5V","SOT-23-5_HandSoldering",62.000000,8.000000,180.000000,top
 "U4","SPI Flash","SOIC-8",18.000000,13.000000,270.000000,top
 "U5","ICE40UP5K-SG48I","QFN-48-1EP_7x7mm_P0.5mm_EP5.6x5.6mm",49.000000,20.000000,0.000000,top
+"U7","Crystal Oscillator","XTAL-2520",49.000000,27.600000,0.000000,top
 "U8","LDO-SOT23-1.2V","SOT-23-5_HandSoldering",69.000000,16.000000,90.000000,top
+"U10","RGB-LED","LED-RGB-5DS-UHD1110-FKA",52.000000,27.000000,90.000000,top