diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -2531,12 +2531,12 @@ design rules under a new name.</descript
 <element name="SW1" library="dp_devices" package="JOYSTICK_SF303GJ26-3" value="JOYSTICK_SF303GJ26-3" x="34.925" y="9.525" smashed="yes" rot="R45">
 <attribute name="NAME" x="35.44119375" y="12.29685625" size="0.8128" layer="25" ratio="16" rot="R315"/>
 </element>
-<element name="J2" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="43.815" y="9.525" smashed="yes" rot="R90">
+<element name="JP1" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="43.815" y="9.525" smashed="yes" rot="R90">
 <attribute name="PROD_ID" value="CONN-09505" x="78.105" y="37.465" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="NAME" x="44.165" y="8.956875" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="46.99" y="7.62" size="0.762" layer="27" rot="R90"/>
 </element>
-<element name="U3" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="27.46375" y="8.016875" smashed="yes" rot="R180">
+<element name="IC1" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="27.46375" y="8.016875" smashed="yes" rot="R180">
 <attribute name="NAME" x="31.035625" y="6.19125" size="0.8128" layer="25" font="vector" ratio="16" rot="R90"/>
 </element>
 <element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2210K-3.3" x="21.59" y="9.2075" smashed="yes" rot="R180">
@@ -2567,7 +2567,7 @@ design rules under a new name.</descript
 <attribute name="NAME" x="40.894" y="12.319" size="0.8128" layer="25" ratio="16" rot="R180"/>
 <attribute name="VALUE" x="40.4495" y="14.1605" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C8" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="23.97125" y="9.445625" smashed="yes" rot="R90">
+<element name="C10" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="23.97125" y="9.445625" smashed="yes" rot="R90">
 <attribute name="NAME" x="23.5585" y="12.080875" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="25.11425" y="8.366125" size="0.4064" layer="27" rot="R90"/>
 </element>
@@ -2591,28 +2591,28 @@ design rules under a new name.</descript
 <attribute name="NAME" x="3.571875" y="10.63625" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="-0.9525" y="11.1125" size="1.27" layer="27" rot="R270"/>
 </element>
-<element name="C9" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="13.6525" rot="R180"/>
-<element name="R3" library="SparkFun-Passives" package="0402-RES" value="390k" x="1.5875" y="6.985"/>
+<element name="C4" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="13.6525" rot="R180"/>
+<element name="R2" library="SparkFun-Passives" package="0402-RES" value="390k" x="1.5875" y="6.985"/>
 <element name="C3" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="12.065"/>
 <element name="U$6" library="Protofusion" package="THERM_LOGO_SMALL_0.2" value="" x="36.195" y="3.96875"/>
-<element name="C4" library="SparkFun-Passives" package="0402-CAP" value="0.01uF" x="27.46375" y="12.303125" rot="R180"/>
+<element name="C9" library="SparkFun-Passives" package="0402-CAP" value="0.01uF" x="27.46375" y="12.303125" rot="R180"/>
 <element name="U1" library="Protofusion" package="LQFP32" value="STM32F042K-T" x="10.63625" y="9.525" smashed="yes" rot="R270"/>
 <element name="J1" library="Protofusion" package="POGOPROG-CONN-4-ALLSMT" value="POGOPIN-CONN-4" x="23.1775" y="4.7625" rot="MR90"/>
-<element name="R2" library="SparkFun-Passives" package="0402-RES" value="" x="12.7" y="5.08" rot="MR90"/>
-<element name="C10" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="11.43" y="5.08" rot="MR90"/>
-<element name="JP1" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="14.9225" y="5.08" rot="MR180"/>
+<element name="R3" library="SparkFun-Passives" package="0402-RES" value="" x="12.7" y="5.08" rot="MR90"/>
+<element name="C8" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="11.43" y="5.08" rot="MR90"/>
+<element name="JP5" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="14.9225" y="5.08" rot="MR180"/>
 </elements>
 <signals>
 <signal name="GND">
 <contactref element="JP2" pad="P2"/>
 <contactref element="U2" pad="2"/>
 <contactref element="SW1" pad="5"/>
-<contactref element="J2" pad="GND"/>
-<contactref element="J2" pad="MT1"/>
-<contactref element="J2" pad="MT2"/>
+<contactref element="JP1" pad="GND"/>
+<contactref element="JP1" pad="MT1"/>
+<contactref element="JP1" pad="MT2"/>
 <contactref element="JP3" pad="P2"/>
 <contactref element="LED1" pad="C"/>
-<contactref element="C8" pad="1"/>
+<contactref element="C10" pad="1"/>
 <contactref element="C5" pad="1"/>
 <contactref element="C7" pad="2"/>
 <polygon width="0.254" layer="16" isolate="0.2032">
@@ -2651,10 +2651,10 @@ design rules under a new name.</descript
 <wire x1="43.97375" y1="13.49375" x2="43.97375" y2="13.573125" width="0.2032" layer="1"/>
 <wire x1="43.97375" y1="13.573125" x2="44.370625" y2="13.97" width="0.2032" layer="1"/>
 <wire x1="43.815" y1="5.525" x2="43.84625" y2="5.525" width="0.2032" layer="1"/>
-<contactref element="R3" pad="1"/>
+<contactref element="R2" pad="1"/>
 <via x="0.873125" y="6.0325" extent="1-16" drill="0.3048"/>
 <wire x1="0.873125" y1="6.0325" x2="0.873125" y2="7.049375" width="0.2032" layer="1"/>
-<contactref element="U3" pad="1"/>
+<contactref element="IC1" pad="1"/>
 <wire x1="29.36875" y1="9.36625" x2="25.24125" y2="9.36625" width="0.2032" layer="1"/>
 <wire x1="25.24125" y1="9.36625" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
 <wire x1="23.97125" y1="8.795625" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
@@ -2696,8 +2696,8 @@ design rules under a new name.</descript
 <wire x1="22.519375" y1="12.144375" x2="23.891875" y2="12.144375" width="0.2032" layer="1"/>
 <wire x1="23.891875" y1="12.144375" x2="24.13" y2="12.3825" width="0.2032" layer="1"/>
 <contactref element="J1" pad="2"/>
-<contactref element="R2" pad="2"/>
-<contactref element="C10" pad="2"/>
+<contactref element="R3" pad="2"/>
+<contactref element="C8" pad="2"/>
 <via x="24.28875" y="6.985" extent="1-16" drill="0.3048"/>
 <wire x1="23.97125" y1="8.795625" x2="24.27375" y2="8.795625" width="0.2032" layer="1"/>
 <wire x1="24.27375" y1="8.795625" x2="24.28875" y2="8.810625" width="0.2032" layer="1"/>
@@ -2712,7 +2712,7 @@ design rules under a new name.</descript
 <signal name="N$1">
 <via x="3.175" y="13.6525" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="2"/>
-<contactref element="C9" pad="1"/>
+<contactref element="C4" pad="1"/>
 <wire x1="2.2375" y1="13.6525" x2="3.175" y2="13.6525" width="0.2032" layer="1"/>
 <wire x1="3.481875" y1="13.345625" x2="3.175" y2="13.6525" width="0.2032" layer="16"/>
 <wire x1="3.481875" y1="13.345625" x2="4.434375" y2="13.345625" width="0.2032" layer="16"/>
@@ -2724,7 +2724,7 @@ design rules under a new name.</descript
 <contactref element="LCD1" pad="1"/>
 <wire x1="1.11125" y1="14.44625" x2="0.9525" y2="14.2875" width="0.2032" layer="1"/>
 <wire x1="0.9525" y1="14.2875" x2="0.9525" y2="13.6675" width="0.2032" layer="1"/>
-<contactref element="C9" pad="2"/>
+<contactref element="C4" pad="2"/>
 <wire x1="0.9375" y1="13.6525" x2="0.9525" y2="13.6675" width="0.2032" layer="1"/>
 <wire x1="1.11125" y1="14.44625" x2="3.4925" y2="14.44625" width="0.2032" layer="1"/>
 <wire x1="3.4925" y1="14.44625" x2="3.96875" y2="13.97" width="0.2032" layer="1"/>
@@ -2755,7 +2755,7 @@ design rules under a new name.</descript
 <via x="3.96875" y="6.50875" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="13"/>
 <wire x1="3.4925" y1="6.985" x2="3.96875" y2="6.50875" width="0.2032" layer="1"/>
-<contactref element="R3" pad="2"/>
+<contactref element="R2" pad="2"/>
 <wire x1="2.2375" y1="6.985" x2="3.4925" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="8.335" y1="6.275" x2="4.2025" y2="6.275" width="0.2032" layer="16"/>
 <wire x1="4.2025" y1="6.275" x2="3.96875" y2="6.50875" width="0.2032" layer="16"/>
@@ -2791,7 +2791,7 @@ design rules under a new name.</descript
 </signal>
 <signal name="3.3V">
 <contactref element="U2" pad="5"/>
-<contactref element="C8" pad="2"/>
+<contactref element="C10" pad="2"/>
 <contactref element="C7" pad="1"/>
 <wire x1="22.5425" y1="7.9099" x2="22.54" y2="7.9074" width="0.2032" layer="1"/>
 <via x="3.175" y="11.27125" extent="1-16" drill="0.3048"/>
@@ -2811,7 +2811,7 @@ design rules under a new name.</descript
 <wire x1="17.383125" y1="12.22375" x2="16.748125" y2="12.85875" width="0.2032" layer="1"/>
 <wire x1="2.3625" y1="9.925" x2="3.2575" y2="9.925" width="0.2032" layer="1"/>
 <wire x1="3.2575" y1="9.925" x2="3.33375" y2="10.00125" width="0.2032" layer="1"/>
-<contactref element="U3" pad="4"/>
+<contactref element="IC1" pad="4"/>
 <wire x1="23.97125" y1="10.095625" x2="23.97125" y2="10.63625" width="0.2032" layer="1"/>
 <wire x1="23.97125" y1="10.63625" x2="24.13" y2="10.795" width="0.2032" layer="1"/>
 <wire x1="24.13" y1="10.795" x2="25.470625" y2="10.795" width="0.2032" layer="1"/>
@@ -2970,7 +2970,7 @@ design rules under a new name.</descript
 <wire x1="16.66875" y1="10.95375" x2="15.64" y2="9.925" width="0.2032" layer="1"/>
 </signal>
 <signal name="D+">
-<contactref element="J2" pad="D+"/>
+<contactref element="JP1" pad="D+"/>
 <via x="38.4175" y="8.55574375" extent="1-16" drill="0.3048"/>
 <wire x1="41.14824375" y1="9.50824375" x2="41.165" y2="9.525" width="0.2032" layer="1"/>
 <wire x1="36.67125" y1="6.429375" x2="38.4175" y2="8.175625" width="0.2032" layer="16"/>
@@ -2994,7 +2994,7 @@ design rules under a new name.</descript
 <wire x1="11.826875" y1="5.434375" x2="11.83625" y2="5.425" width="0.2032" layer="1"/>
 </signal>
 <signal name="D-">
-<contactref element="J2" pad="D-"/>
+<contactref element="JP1" pad="D-"/>
 <via x="39.0525" y="7.9375" extent="1-16" drill="0.3048"/>
 <wire x1="41.15" y1="8.89" x2="41.165" y2="8.875" width="0.2032" layer="1"/>
 <wire x1="36.83" y1="6.0325" x2="38.735" y2="7.9375" width="0.2032" layer="16"/>
@@ -3019,7 +3019,7 @@ design rules under a new name.</descript
 <wire x1="11.43" y1="6.429375" x2="11.43" y2="8.09625" width="0.2032" layer="1"/>
 </signal>
 <signal name="VUSB">
-<contactref element="J2" pad="VBUS"/>
+<contactref element="JP1" pad="VBUS"/>
 <contactref element="D1" pad="A"/>
 <via x="42.38625" y="14.035" extent="1-16" drill="0.3048"/>
 <wire x1="42.38625" y1="14.035" x2="41.81625" y2="14.605" width="0.2032" layer="16"/>
@@ -3088,8 +3088,8 @@ design rules under a new name.</descript
 </signal>
 <signal name="T-">
 <contactref element="JP4" pad="P2"/>
-<contactref element="C4" pad="1"/>
-<contactref element="U3" pad="2"/>
+<contactref element="C9" pad="1"/>
+<contactref element="IC1" pad="2"/>
 <wire x1="28.09875" y1="10.706875" x2="28.09875" y2="12.288125" width="0.2032" layer="1"/>
 <wire x1="28.09875" y1="12.288125" x2="28.11375" y2="12.303125" width="0.2032" layer="1"/>
 <wire x1="28.11375" y1="12.303125" x2="28.11375" y2="12.87375" width="0.2032" layer="1"/>
@@ -3097,8 +3097,8 @@ design rules under a new name.</descript
 </signal>
 <signal name="T+">
 <contactref element="JP4" pad="P1"/>
-<contactref element="C4" pad="2"/>
-<contactref element="U3" pad="3"/>
+<contactref element="C9" pad="2"/>
+<contactref element="IC1" pad="3"/>
 <wire x1="26.82875" y1="10.706875" x2="26.82875" y2="12.288125" width="0.2032" layer="1"/>
 <wire x1="26.82875" y1="12.288125" x2="26.81375" y2="12.303125" width="0.2032" layer="1"/>
 <wire x1="26.81375" y1="12.303125" x2="26.81375" y2="13.82625" width="0.2032" layer="1"/>
@@ -3131,7 +3131,7 @@ design rules under a new name.</descript
 <wire x1="5.3975" y1="8.255" x2="5.3975" y2="8.966221875" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MISO">
-<contactref element="U3" pad="7"/>
+<contactref element="IC1" pad="7"/>
 <wire x1="28.09875" y1="5.306875" x2="28.09875" y2="8.651875" width="0.2032" layer="1"/>
 <via x="28.09875" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="25.796875" y1="8.810625" x2="21.669375" y2="8.810625" width="0.2032" layer="16"/>
@@ -3150,7 +3150,7 @@ design rules under a new name.</descript
 </signal>
 <signal name="SPI_SCK">
 <contactref element="LCD1" pad="11"/>
-<contactref element="U3" pad="5"/>
+<contactref element="IC1" pad="5"/>
 <via x="25.479375" y="8.175625" extent="1-16" drill="0.3048"/>
 <wire x1="21.828125" y1="8.41375" x2="25.24125" y2="8.41375" width="0.2032" layer="16"/>
 <wire x1="25.24125" y1="8.41375" x2="25.479375" y2="8.175625" width="0.2032" layer="16"/>
@@ -3188,7 +3188,7 @@ design rules under a new name.</descript
 <wire x1="12.54125" y1="9.525" x2="12.779375" y2="9.763125" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_MAX">
-<contactref element="U3" pad="6"/>
+<contactref element="IC1" pad="6"/>
 <via x="26.82875" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="26.82875" y1="8.651875" x2="26.82875" y2="5.306875" width="0.2032" layer="1"/>
 <via x="19.84375" y="8.334375" extent="1-16" drill="0.3048"/>
@@ -3206,13 +3206,13 @@ design rules under a new name.</descript
 <wire x1="9.604375" y1="4.206875" x2="9.445625" y2="4.365625" width="0.2032" layer="1"/>
 <wire x1="9.445625" y1="4.365625" x2="9.445625" y2="5.415625" width="0.2032" layer="1"/>
 <wire x1="9.445625" y1="5.415625" x2="9.43625" y2="5.425" width="0.2032" layer="1"/>
-<contactref element="R2" pad="1"/>
+<contactref element="R3" pad="1"/>
 <contactref element="U1" pad="15"/>
 <wire x1="6.53625" y1="7.525" x2="8.588125" y2="7.525" width="0.2032" layer="1"/>
 <wire x1="8.588125" y1="7.525" x2="9.43625" y2="6.676875" width="0.2032" layer="1"/>
 <wire x1="9.43625" y1="5.425" x2="9.43625" y2="6.676875" width="0.2032" layer="1"/>
-<contactref element="JP1" pad="P2"/>
-<contactref element="C10" pad="1"/>
+<contactref element="JP5" pad="P2"/>
+<contactref element="C8" pad="1"/>
 <wire x1="14.049375" y1="4.206875" x2="14.9225" y2="5.08" width="0.2032" layer="1"/>
 <wire x1="11.43" y1="4.43" x2="12.7" y2="4.43" width="0.2032" layer="16"/>
 <wire x1="12.7" y1="4.43" x2="14.2725" y2="4.43" width="0.2032" layer="16"/>
@@ -3223,7 +3223,7 @@ design rules under a new name.</descript
 <via x="10.795" y="6.6675" extent="1-16" drill="0.3048"/>
 <contactref element="U1" pad="14"/>
 <wire x1="6.53625" y1="8.325" x2="9.7725" y2="8.325" width="0.2032" layer="1"/>
-<contactref element="JP1" pad="P1"/>
+<contactref element="JP5" pad="P1"/>
 <wire x1="9.7725" y1="8.325" x2="10.239375" y2="7.858125" width="0.2032" layer="1"/>
 <wire x1="10.239375" y1="7.858125" x2="10.239375" y2="6.6675" width="0.2032" layer="1"/>
 <wire x1="10.239375" y1="6.6675" x2="10.239375" y2="5.428125" width="0.2032" layer="1"/>
diff --git a/zoncoffee.sch b/zoncoffee.sch
--- a/zoncoffee.sch
+++ b/zoncoffee.sch
@@ -309,7 +309,7 @@
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="GND">
+<deviceset name="GND" prefix="SUP">
 <description>&lt;b&gt;GND&lt;/b&gt;</description>
 <gates>
 <gate name="G$1" symbol="GND" x="0" y="0"/>
@@ -322,7 +322,7 @@
 </device>
 </devices>
 </deviceset>
-<deviceset name="3.3V">
+<deviceset name="3.3V" prefix="SUP">
 <description>&lt;b&gt;3.3V Supply&lt;/b&gt;</description>
 <gates>
 <gate name="G$1" symbol="3.3V" x="0" y="0"/>
@@ -2515,12 +2515,12 @@ 5V - VREG-00823</description>
 <pin name="VCC" x="-2.54" y="5.08" length="short"/>
 <pin name="GND" x="-2.54" y="2.54" length="short"/>
 <text x="0" y="7.62" size="1.778" layer="95">&gt;NAME</text>
-<text x="0" y="-10.16" size="1.778" layer="95" rot="MR180">&gt;VALUE</text>
+<text x="0" y="-5.08" size="1.778" layer="95" rot="MR180">&gt;VALUE</text>
 <rectangle x1="0" y1="-3.81" x2="1.27" y2="6.35" layer="94"/>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="CAP-ARRAY">
+<deviceset name="CAP-ARRAY" prefix="CA">
 <gates>
 <gate name="1" symbol="C" x="-12.7" y="0"/>
 <gate name="2" symbol="C" x="-2.54" y="0"/>
@@ -2590,7 +2590,7 @@ 5V - VREG-00823</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="POGOPIN-CONN-4">
+<deviceset name="POGOPIN-CONN-4" prefix="J">
 <gates>
 <gate name="G$1" symbol="POGOPROG-CONN-4" x="0" y="0"/>
 </gates>
@@ -3831,62 +3831,62 @@ Standard 0603 ceramic capacitor, and 0.1
 </class>
 </classes>
 <parts>
-<part name="U$2" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$17" library="microbuilder" deviceset="3.3V" device=""/>
+<part name="SUP3" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP4" library="microbuilder" deviceset="3.3V" device=""/>
 <part name="SW1" library="dp_devices" deviceset="JOYSTICK_SF303GJ26-3" device=""/>
-<part name="J2" library="SparkFun-Connectors" deviceset="USB" device="-MICROB"/>
-<part name="U3" library="dp_devices" deviceset="IC_MAX31855" device="-SO-8"/>
+<part name="JP1" library="SparkFun-Connectors" deviceset="USB" device="-MICROB"/>
+<part name="IC1" library="dp_devices" deviceset="IC_MAX31855" device="-SO-8"/>
 <part name="U2" library="SparkFun-PowerIC" deviceset="MIC5205" device="3.3V" value="AP2210K-3.3"/>
 <part name="LED1" library="SparkFun-LED" deviceset="LED" device="0603"/>
 <part name="JP2" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
 <part name="JP3" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
 <part name="JP4" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
-<part name="SUPPLY1" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
-<part name="GND1" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="SUPPLY9" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
+<part name="GND5" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="SUPPLY3" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
-<part name="GND2" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="SUPPLY4" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="U$4" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$5" library="microbuilder" deviceset="GND" device=""/>
+<part name="GND3" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="SUPPLY5" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="SUP8" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP11" library="microbuilder" deviceset="GND" device=""/>
 <part name="D1" library="SparkFun-DiscreteSemi" deviceset="DIODE" device="SOD523"/>
-<part name="SUPPLY5" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
+<part name="SUPPLY7" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
 <part name="C5" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="4.7uF"/>
 <part name="C7" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="4.7uF"/>
 <part name="R1" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES"/>
-<part name="GND3" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="GND6" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="GND1" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="SUP12" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUPPLY10" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="C10" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
+<part name="GND2" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="GND4" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="U$10" library="microbuilder" deviceset="GND" device=""/>
-<part name="SUPPLY9" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="C8" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
-<part name="GND7" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="GND8" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="FRAME1" library="SparkFun-Aesthetics" deviceset="FRAME-A4L" device=""/>
 <part name="LCD1" library="microbuilder" deviceset="DISP_OLED_UG-2832HSWEG04" device="WRAPAROUND" value="SSD1306-SPI"/>
 <part name="C2" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
 <part name="C1" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
 <part name="C6" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
-<part name="U$14" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$15" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$16" library="microbuilder" deviceset="GND" device=""/>
-<part name="U$18" library="microbuilder" deviceset="GND" device=""/>
-<part name="SUPPLY11" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="SUPPLY12" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="SUPPLY13" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="SUP1" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP2" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP7" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUP5" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUPPLY1" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="SUPPLY2" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="SUPPLY4" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <part name="CA1" library="Protofusion" deviceset="CAP-ARRAY" device="" value="1uF"/>
-<part name="U$7" library="microbuilder" deviceset="GND" device=""/>
-<part name="C9" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="2.2uF"/>
-<part name="R3" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES" value="390k"/>
+<part name="SUP6" library="microbuilder" deviceset="GND" device=""/>
+<part name="C4" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="2.2uF"/>
+<part name="R2" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES" value="390k"/>
 <part name="C3" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="2.2uF"/>
-<part name="U$1" library="microbuilder" deviceset="GND" device=""/>
-<part name="SUPPLY2" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="C4" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.01uF"/>
+<part name="SUP9" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUPPLY8" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="C9" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.01uF"/>
 <part name="U1" library="Protofusion" deviceset="STM32F042K-T" device=""/>
 <part name="J1" library="Protofusion" deviceset="POGOPIN-CONN-4" device=""/>
 <part name="SUPPLY6" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="R2" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES"/>
-<part name="U$8" library="microbuilder" deviceset="GND" device=""/>
-<part name="C10" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
-<part name="JP1" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
+<part name="R3" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES"/>
+<part name="SUP10" library="microbuilder" deviceset="GND" device=""/>
+<part name="C8" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
+<part name="JP5" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
 </parts>
 <sheets>
 <sheet>
@@ -3901,65 +3901,71 @@ Standard 0603 ceramic capacitor, and 0.1
 <text x="101.6" y="172.72" size="2.54" layer="113">Micro</text>
 </plain>
 <instances>
-<instance part="U$2" gate="G$1" x="48.26" y="30.48"/>
-<instance part="U$17" gate="G$1" x="99.06" y="66.04"/>
+<instance part="SUP3" gate="G$1" x="48.26" y="30.48"/>
+<instance part="SUP4" gate="G$1" x="99.06" y="66.04"/>
 <instance part="SW1" gate="SW" x="147.32" y="30.48"/>
-<instance part="J2" gate="G$1" x="256.54" y="35.56"/>
-<instance part="U3" gate="G$1" x="205.74" y="160.02" rot="R180"/>
+<instance part="JP1" gate="G$1" x="256.54" y="35.56"/>
+<instance part="IC1" gate="G$1" x="205.74" y="160.02" rot="R180"/>
 <instance part="U2" gate="G$1" x="149.86" y="66.04"/>
 <instance part="LED1" gate="G$1" x="27.94" y="48.26"/>
 <instance part="JP2" gate="G$1" x="261.62" y="129.54" rot="R180"/>
 <instance part="JP3" gate="G$1" x="261.62" y="114.3" rot="R180"/>
 <instance part="JP4" gate="G$1" x="261.62" y="99.06" rot="R180"/>
-<instance part="SUPPLY1" gate="G$1" x="246.38" y="132.08"/>
-<instance part="GND1" gate="1" x="246.38" y="121.92"/>
+<instance part="SUPPLY9" gate="G$1" x="246.38" y="132.08"/>
+<instance part="GND5" gate="1" x="246.38" y="121.92"/>
 <instance part="SUPPLY3" gate="G$1" x="134.62" y="73.66"/>
-<instance part="GND2" gate="1" x="134.62" y="55.88"/>
-<instance part="SUPPLY4" gate="G$1" x="177.8" y="73.66"/>
-<instance part="U$4" gate="G$1" x="170.18" y="25.4"/>
-<instance part="U$5" gate="G$1" x="251.46" y="33.02"/>
+<instance part="GND3" gate="1" x="134.62" y="55.88"/>
+<instance part="SUPPLY5" gate="G$1" x="177.8" y="73.66"/>
+<instance part="SUP8" gate="G$1" x="170.18" y="25.4"/>
+<instance part="SUP11" gate="G$1" x="251.46" y="33.02"/>
 <instance part="D1" gate="G$1" x="231.14" y="38.1" rot="R180"/>
-<instance part="SUPPLY5" gate="G$1" x="218.44" y="40.64"/>
+<instance part="SUPPLY7" gate="G$1" x="218.44" y="40.64"/>
 <instance part="C5" gate="G$1" x="121.92" y="68.58" rot="R180"/>
 <instance part="C7" gate="G$1" x="182.88" y="63.5"/>
 <instance part="R1" gate="G$1" x="27.94" y="58.42" rot="R270"/>
-<instance part="GND3" gate="1" x="246.38" y="106.68"/>
-<instance part="GND4" gate="1" x="27.94" y="38.1"/>
-<instance part="U$10" gate="G$1" x="269.24" y="152.4"/>
-<instance part="SUPPLY9" gate="G$1" x="269.24" y="167.64"/>
-<instance part="C8" gate="G$1" x="269.24" y="162.56" rot="R180"/>
-<instance part="GND7" gate="1" x="121.92" y="58.42"/>
-<instance part="GND8" gate="1" x="182.88" y="55.88"/>
+<instance part="GND6" gate="1" x="246.38" y="106.68"/>
+<instance part="GND1" gate="1" x="27.94" y="38.1"/>
+<instance part="SUP12" gate="G$1" x="269.24" y="152.4"/>
+<instance part="SUPPLY10" gate="G$1" x="269.24" y="167.64"/>
+<instance part="C10" gate="G$1" x="269.24" y="162.56" rot="R180"/>
+<instance part="GND2" gate="1" x="121.92" y="58.42"/>
+<instance part="GND4" gate="1" x="182.88" y="55.88"/>
 <instance part="FRAME1" gate="G$1" x="5.08" y="5.08"/>
 <instance part="LCD1" gate="G$1" x="86.36" y="53.34"/>
 <instance part="C2" gate="G$1" x="40.64" y="144.78"/>
 <instance part="C1" gate="G$1" x="27.94" y="152.4"/>
 <instance part="C6" gate="G$1" x="170.18" y="116.84"/>
-<instance part="U$14" gate="G$1" x="27.94" y="137.16"/>
-<instance part="U$15" gate="G$1" x="40.64" y="137.16"/>
-<instance part="U$16" gate="G$1" x="170.18" y="109.22"/>
-<instance part="U$18" gate="G$1" x="106.68" y="109.22"/>
-<instance part="SUPPLY11" gate="G$1" x="27.94" y="165.1"/>
-<instance part="SUPPLY12" gate="G$1" x="40.64" y="154.94"/>
-<instance part="SUPPLY13" gate="G$1" x="170.18" y="127"/>
+<instance part="SUP1" gate="G$1" x="27.94" y="137.16"/>
+<instance part="SUP2" gate="G$1" x="40.64" y="137.16"/>
+<instance part="SUP7" gate="G$1" x="170.18" y="109.22"/>
+<instance part="SUP5" gate="G$1" x="106.68" y="109.22"/>
+<instance part="SUPPLY1" gate="G$1" x="27.94" y="165.1"/>
+<instance part="SUPPLY2" gate="G$1" x="40.64" y="154.94"/>
+<instance part="SUPPLY4" gate="G$1" x="170.18" y="127"/>
 <instance part="CA1" gate="1" x="68.58" y="60.96" rot="R90"/>
 <instance part="CA1" gate="2" x="63.5" y="55.88" rot="R90"/>
 <instance part="CA1" gate="3" x="68.58" y="38.1" rot="R90"/>
 <instance part="CA1" gate="4" x="63.5" y="35.56" rot="R90"/>
-<instance part="U$7" gate="G$1" x="165.1" y="157.48"/>
-<instance part="C9" gate="G$1" x="71.12" y="71.12" rot="R90"/>
-<instance part="R3" gate="G$1" x="55.88" y="40.64"/>
+<instance part="SUP6" gate="G$1" x="165.1" y="157.48"/>
+<instance part="C4" gate="G$1" x="71.12" y="71.12" rot="R90"/>
+<instance part="R2" gate="G$1" x="55.88" y="40.64"/>
 <instance part="C3" gate="G$1" x="60.96" y="66.04" rot="R270"/>
-<instance part="U$1" gate="G$1" x="223.52" y="152.4"/>
-<instance part="SUPPLY2" gate="G$1" x="223.52" y="167.64"/>
-<instance part="C4" gate="G$1" x="251.46" y="162.56" rot="R180"/>
+<instance part="SUP9" gate="G$1" x="223.52" y="152.4"/>
+<instance part="SUPPLY8" gate="G$1" x="223.52" y="167.64"/>
+<instance part="C9" gate="G$1" x="251.46" y="162.56" rot="R180"/>
 <instance part="U1" gate="G$1" x="111.76" y="144.78"/>
 <instance part="J1" gate="G$1" x="223.52" y="60.96"/>
 <instance part="SUPPLY6" gate="G$1" x="215.9" y="68.58"/>
-<instance part="R2" gate="G$1" x="246.38" y="76.2" rot="R270"/>
-<instance part="U$8" gate="G$1" x="246.38" y="60.96"/>
-<instance part="C10" gate="G$1" x="241.3" y="73.66"/>
-<instance part="JP1" gate="G$1" x="261.62" y="86.36" rot="R180"/>
+<instance part="R3" gate="G$1" x="246.38" y="76.2" smashed="yes" rot="R270">
+<attribute name="NAME" x="248.412" y="76.9366" size="1.778" layer="95"/>
+<attribute name="VALUE" x="243.078" y="80.01" size="1.778" layer="96" rot="R270"/>
+</instance>
+<instance part="SUP10" gate="G$1" x="246.38" y="60.96"/>
+<instance part="C8" gate="G$1" x="241.3" y="73.66" smashed="yes">
+<attribute name="NAME" x="240.284" y="78.359" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="240.538" y="73.279" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="JP5" gate="G$1" x="261.62" y="86.36" rot="R180"/>
 </instances>
 <busses>
 </busses>
@@ -3970,14 +3976,14 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="55.88" y1="68.58" x2="55.88" y2="71.12" width="0.1524" layer="91"/>
 <wire x1="55.88" y1="71.12" x2="66.04" y2="71.12" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="C2-"/>
-<pinref part="C9" gate="G$1" pin="1"/>
+<pinref part="C4" gate="G$1" pin="1"/>
 </segment>
 </net>
 <net name="N$2" class="0">
 <segment>
 <wire x1="73.66" y1="71.12" x2="76.2" y2="71.12" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="C2+"/>
-<pinref part="C9" gate="G$1" pin="2"/>
+<pinref part="C4" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="N$3" class="0">
@@ -4015,17 +4021,17 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="48.26" y="40.64"/>
 <junction x="48.26" y="35.56"/>
 <junction x="48.26" y="38.1"/>
-<pinref part="U$2" gate="G$1" pin="GND"/>
+<pinref part="SUP3" gate="G$1" pin="GND"/>
 <pinref part="LCD1" gate="G$1" pin="VSS"/>
 <pinref part="CA1" gate="1" pin="1"/>
 <pinref part="CA1" gate="2" pin="1"/>
 <pinref part="CA1" gate="3" pin="1"/>
 <pinref part="CA1" gate="4" pin="1"/>
-<pinref part="R3" gate="G$1" pin="1"/>
+<pinref part="R2" gate="G$1" pin="1"/>
 </segment>
 <segment>
 <pinref part="JP2" gate="G$1" pin="2"/>
-<pinref part="GND1" gate="1" pin="GND"/>
+<pinref part="GND5" gate="1" pin="GND"/>
 <wire x1="254" y1="127" x2="246.38" y2="127" width="0.1524" layer="91"/>
 <wire x1="246.38" y1="127" x2="246.38" y2="124.46" width="0.1524" layer="91"/>
 </segment>
@@ -4033,76 +4039,76 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="U2" gate="G$1" pin="GND"/>
 <wire x1="139.7" y1="66.04" x2="134.62" y2="66.04" width="0.1524" layer="91"/>
 <wire x1="134.62" y1="66.04" x2="134.62" y2="58.42" width="0.1524" layer="91"/>
-<pinref part="GND2" gate="1" pin="GND"/>
+<pinref part="GND3" gate="1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="SW1" gate="SW" pin="COMMON"/>
-<pinref part="U$4" gate="G$1" pin="GND"/>
+<pinref part="SUP8" gate="G$1" pin="GND"/>
 <wire x1="154.94" y1="30.48" x2="170.18" y2="30.48" width="0.1524" layer="91"/>
 <wire x1="170.18" y1="30.48" x2="170.18" y2="27.94" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="J2" gate="G$1" pin="GND"/>
-<pinref part="U$5" gate="G$1" pin="GND"/>
+<pinref part="JP1" gate="G$1" pin="GND"/>
+<pinref part="SUP11" gate="G$1" pin="GND"/>
 <wire x1="251.46" y1="35.56" x2="254" y2="35.56" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="JP3" gate="G$1" pin="2"/>
 <wire x1="254" y1="111.76" x2="246.38" y2="111.76" width="0.1524" layer="91"/>
 <wire x1="246.38" y1="111.76" x2="246.38" y2="109.22" width="0.1524" layer="91"/>
-<pinref part="GND3" gate="1" pin="GND"/>
+<pinref part="GND6" gate="1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="LED1" gate="G$1" pin="C"/>
-<pinref part="GND4" gate="1" pin="GND"/>
+<pinref part="GND1" gate="1" pin="GND"/>
 <wire x1="27.94" y1="43.18" x2="27.94" y2="40.64" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C8" gate="G$1" pin="1"/>
-<pinref part="U$10" gate="G$1" pin="GND"/>
+<pinref part="C10" gate="G$1" pin="1"/>
+<pinref part="SUP12" gate="G$1" pin="GND"/>
 <wire x1="269.24" y1="157.48" x2="269.24" y2="154.94" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C5" gate="G$1" pin="1"/>
-<pinref part="GND7" gate="1" pin="GND"/>
+<pinref part="GND2" gate="1" pin="GND"/>
 <wire x1="121.92" y1="60.96" x2="121.92" y2="63.5" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C7" gate="G$1" pin="2"/>
-<pinref part="GND8" gate="1" pin="GND"/>
+<pinref part="GND4" gate="1" pin="GND"/>
 <wire x1="182.88" y1="58.42" x2="182.88" y2="60.96" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C1" gate="G$1" pin="2"/>
 <wire x1="27.94" y1="149.86" x2="27.94" y2="139.7" width="0.1524" layer="91"/>
-<pinref part="U$14" gate="G$1" pin="GND"/>
+<pinref part="SUP1" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="C2" gate="G$1" pin="2"/>
 <wire x1="40.64" y1="142.24" x2="40.64" y2="139.7" width="0.1524" layer="91"/>
-<pinref part="U$15" gate="G$1" pin="GND"/>
+<pinref part="SUP2" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="C6" gate="G$1" pin="2"/>
 <wire x1="170.18" y1="114.3" x2="170.18" y2="111.76" width="0.1524" layer="91"/>
-<pinref part="U$16" gate="G$1" pin="GND"/>
+<pinref part="SUP7" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="U$18" gate="G$1" pin="GND"/>
+<pinref part="SUP5" gate="G$1" pin="GND"/>
 <wire x1="106.68" y1="111.76" x2="106.68" y2="114.3" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <wire x1="152.4" y1="162.56" x2="165.1" y2="162.56" width="0.1524" layer="91"/>
 <wire x1="165.1" y1="162.56" x2="165.1" y2="160.02" width="0.1524" layer="91"/>
-<pinref part="U$7" gate="G$1" pin="GND"/>
+<pinref part="SUP6" gate="G$1" pin="GND"/>
 <pinref part="U1" gate="G$1" pin="BOOT0/I2C1_SCL/CAN_RX/PB8"/>
 </segment>
 <segment>
-<pinref part="U3" gate="G$1" pin="GND"/>
+<pinref part="IC1" gate="G$1" pin="GND"/>
 <wire x1="223.52" y1="157.48" x2="220.98" y2="157.48" width="0.1524" layer="91"/>
 <wire x1="223.52" y1="157.48" x2="223.52" y2="154.94" width="0.1524" layer="91"/>
-<pinref part="U$1" gate="G$1" pin="GND"/>
+<pinref part="SUP9" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <wire x1="215.9" y1="63.5" x2="220.98" y2="63.5" width="0.1524" layer="91"/>
@@ -4110,13 +4116,13 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="J1" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="R2" gate="G$1" pin="2"/>
+<pinref part="R3" gate="G$1" pin="2"/>
 <wire x1="246.38" y1="71.12" x2="246.38" y2="68.58" width="0.1524" layer="91"/>
-<pinref part="U$8" gate="G$1" pin="GND"/>
+<pinref part="SUP10" gate="G$1" pin="GND"/>
 <wire x1="246.38" y1="68.58" x2="246.38" y2="63.5" width="0.1524" layer="91"/>
 <wire x1="246.38" y1="68.58" x2="241.3" y2="68.58" width="0.1524" layer="91"/>
 <junction x="246.38" y="68.58"/>
-<pinref part="C10" gate="G$1" pin="2"/>
+<pinref part="C8" gate="G$1" pin="2"/>
 <wire x1="241.3" y1="68.58" x2="241.3" y2="71.12" width="0.1524" layer="91"/>
 </segment>
 </net>
@@ -4124,7 +4130,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <wire x1="76.2" y1="40.64" x2="60.96" y2="40.64" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="IREF"/>
-<pinref part="R3" gate="G$1" pin="2"/>
+<pinref part="R2" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="N$9" class="0">
@@ -4150,7 +4156,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="76.2" y1="55.88" x2="99.06" y2="55.88" width="0.1524" layer="91"/>
 <wire x1="99.06" y1="55.88" x2="99.06" y2="60.96" width="0.1524" layer="91"/>
 <junction x="99.06" y="60.96"/>
-<pinref part="U$17" gate="G$1" pin="3.3V"/>
+<pinref part="SUP4" gate="G$1" pin="3.3V"/>
 <pinref part="LCD1" gate="G$1" pin="VBAT"/>
 <junction x="76.2" y="60.96"/>
 <pinref part="LCD1" gate="G$1" pin="VDD"/>
@@ -4162,22 +4168,22 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="U2" gate="G$1" pin="OUT"/>
 <wire x1="157.48" y1="71.12" x2="177.8" y2="71.12" width="0.1524" layer="91"/>
 <wire x1="177.8" y1="71.12" x2="177.8" y2="73.66" width="0.1524" layer="91"/>
-<pinref part="SUPPLY4" gate="G$1" pin="3.3V"/>
+<pinref part="SUPPLY5" gate="G$1" pin="3.3V"/>
 <pinref part="C7" gate="G$1" pin="1"/>
 <wire x1="177.8" y1="71.12" x2="182.88" y2="71.12" width="0.1524" layer="91"/>
 <wire x1="182.88" y1="71.12" x2="182.88" y2="68.58" width="0.1524" layer="91"/>
 <junction x="177.8" y="71.12"/>
 </segment>
 <segment>
-<pinref part="C8" gate="G$1" pin="2"/>
-<pinref part="SUPPLY9" gate="G$1" pin="3.3V"/>
+<pinref part="C10" gate="G$1" pin="2"/>
+<pinref part="SUPPLY10" gate="G$1" pin="3.3V"/>
 <wire x1="269.24" y1="165.1" x2="269.24" y2="167.64" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C1" gate="G$1" pin="1"/>
 <wire x1="66.04" y1="162.56" x2="27.94" y2="162.56" width="0.1524" layer="91"/>
 <wire x1="27.94" y1="162.56" x2="27.94" y2="157.48" width="0.1524" layer="91"/>
-<pinref part="SUPPLY11" gate="G$1" pin="3.3V"/>
+<pinref part="SUPPLY1" gate="G$1" pin="3.3V"/>
 <wire x1="27.94" y1="165.1" x2="27.94" y2="162.56" width="0.1524" layer="91"/>
 <junction x="27.94" y="162.56"/>
 <pinref part="U1" gate="G$1" pin="VDD"/>
@@ -4186,7 +4192,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="C2" gate="G$1" pin="1"/>
 <wire x1="66.04" y1="152.4" x2="40.64" y2="152.4" width="0.1524" layer="91"/>
 <wire x1="40.64" y1="152.4" x2="40.64" y2="149.86" width="0.1524" layer="91"/>
-<pinref part="SUPPLY12" gate="G$1" pin="3.3V"/>
+<pinref part="SUPPLY2" gate="G$1" pin="3.3V"/>
 <wire x1="40.64" y1="154.94" x2="40.64" y2="152.4" width="0.1524" layer="91"/>
 <junction x="40.64" y="152.4"/>
 <pinref part="U1" gate="G$1" pin="VDDA"/>
@@ -4194,17 +4200,17 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="C6" gate="G$1" pin="1"/>
 <wire x1="170.18" y1="127" x2="170.18" y2="124.46" width="0.1524" layer="91"/>
-<pinref part="SUPPLY13" gate="G$1" pin="3.3V"/>
+<pinref part="SUPPLY4" gate="G$1" pin="3.3V"/>
 <pinref part="U1" gate="G$1" pin="VDDIO2"/>
 <wire x1="170.18" y1="124.46" x2="170.18" y2="121.92" width="0.1524" layer="91"/>
 <wire x1="152.4" y1="124.46" x2="170.18" y2="124.46" width="0.1524" layer="91"/>
 <junction x="170.18" y="124.46"/>
 </segment>
 <segment>
-<pinref part="U3" gate="G$1" pin="VCC"/>
+<pinref part="IC1" gate="G$1" pin="VCC"/>
 <wire x1="223.52" y1="165.1" x2="223.52" y2="167.64" width="0.1524" layer="91"/>
 <wire x1="223.52" y1="165.1" x2="220.98" y2="165.1" width="0.1524" layer="91"/>
-<pinref part="SUPPLY2" gate="G$1" pin="3.3V"/>
+<pinref part="SUPPLY8" gate="G$1" pin="3.3V"/>
 </segment>
 <segment>
 <pinref part="J1" gate="G$1" pin="VCC"/>
@@ -4216,7 +4222,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <net name="V_BATT" class="0">
 <segment>
 <pinref part="JP2" gate="G$1" pin="1"/>
-<pinref part="SUPPLY1" gate="G$1" pin="V_BATT"/>
+<pinref part="SUPPLY9" gate="G$1" pin="V_BATT"/>
 <wire x1="254" y1="129.54" x2="246.38" y2="129.54" width="0.1524" layer="91"/>
 <wire x1="246.38" y1="129.54" x2="246.38" y2="132.08" width="0.1524" layer="91"/>
 </segment>
@@ -4238,7 +4244,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="D1" gate="G$1" pin="C"/>
 <wire x1="228.6" y1="38.1" x2="218.44" y2="38.1" width="0.1524" layer="91"/>
 <wire x1="218.44" y1="38.1" x2="218.44" y2="40.64" width="0.1524" layer="91"/>
-<pinref part="SUPPLY5" gate="G$1" pin="V_BATT"/>
+<pinref part="SUPPLY7" gate="G$1" pin="V_BATT"/>
 </segment>
 </net>
 <net name="SW-A" class="0">
@@ -4291,7 +4297,7 @@ Standard 0603 ceramic capacitor, and 0.1
 </net>
 <net name="D+" class="0">
 <segment>
-<pinref part="J2" gate="G$1" pin="D+"/>
+<pinref part="JP1" gate="G$1" pin="D+"/>
 <wire x1="248.92" y1="43.18" x2="254" y2="43.18" width="0.1524" layer="91"/>
 <label x="248.92" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
@@ -4303,7 +4309,7 @@ Standard 0603 ceramic capacitor, and 0.1
 </net>
 <net name="D-" class="0">
 <segment>
-<pinref part="J2" gate="G$1" pin="D-"/>
+<pinref part="JP1" gate="G$1" pin="D-"/>
 <wire x1="248.92" y1="40.64" x2="254" y2="40.64" width="0.1524" layer="91"/>
 <label x="248.92" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
@@ -4315,7 +4321,7 @@ Standard 0603 ceramic capacitor, and 0.1
 </net>
 <net name="VUSB" class="0">
 <segment>
-<pinref part="J2" gate="G$1" pin="VBUS"/>
+<pinref part="JP1" gate="G$1" pin="VBUS"/>
 <pinref part="D1" gate="G$1" pin="A"/>
 <wire x1="233.68" y1="38.1" x2="238.76" y2="38.1" width="0.1524" layer="91"/>
 <wire x1="238.76" y1="38.1" x2="254" y2="38.1" width="0.1524" layer="91"/>
@@ -4387,12 +4393,12 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="246.38" y="96.52" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="C4" gate="G$1" pin="1"/>
+<pinref part="C9" gate="G$1" pin="1"/>
 <wire x1="251.46" y1="152.4" x2="251.46" y2="157.48" width="0.1524" layer="91"/>
 <wire x1="251.46" y1="152.4" x2="254" y2="152.4" width="0.1524" layer="91"/>
 <junction x="251.46" y="152.4"/>
 <label x="254" y="152.4" size="1.27" layer="95" xref="yes"/>
-<pinref part="U3" gate="G$1" pin="T-"/>
+<pinref part="IC1" gate="G$1" pin="T-"/>
 <wire x1="220.98" y1="160.02" x2="231.14" y2="160.02" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="160.02" x2="231.14" y2="152.4" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="152.4" x2="251.46" y2="152.4" width="0.1524" layer="91"/>
@@ -4405,12 +4411,12 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="246.38" y="99.06" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="C4" gate="G$1" pin="2"/>
+<pinref part="C9" gate="G$1" pin="2"/>
 <wire x1="251.46" y1="167.64" x2="251.46" y2="165.1" width="0.1524" layer="91"/>
 <wire x1="251.46" y1="167.64" x2="254" y2="167.64" width="0.1524" layer="91"/>
 <junction x="251.46" y="167.64"/>
 <label x="254" y="167.64" size="1.27" layer="95" xref="yes"/>
-<pinref part="U3" gate="G$1" pin="T+"/>
+<pinref part="IC1" gate="G$1" pin="T+"/>
 <wire x1="220.98" y1="162.56" x2="231.14" y2="162.56" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="162.56" x2="231.14" y2="167.64" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="167.64" x2="251.46" y2="167.64" width="0.1524" layer="91"/>
@@ -4442,7 +4448,7 @@ Standard 0603 ceramic capacitor, and 0.1
 </net>
 <net name="SPI_MISO" class="0">
 <segment>
-<pinref part="U3" gate="G$1" pin="SO"/>
+<pinref part="IC1" gate="G$1" pin="SO"/>
 <wire x1="187.96" y1="160.02" x2="190.5" y2="160.02" width="0.1524" layer="91"/>
 <label x="187.96" y="160.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
@@ -4459,7 +4465,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="LCD1" gate="G$1" pin="SCLK"/>
 </segment>
 <segment>
-<pinref part="U3" gate="G$1" pin="SCK"/>
+<pinref part="IC1" gate="G$1" pin="SCK"/>
 <wire x1="187.96" y1="165.1" x2="190.5" y2="165.1" width="0.1524" layer="91"/>
 <label x="187.96" y="165.1" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
@@ -4483,7 +4489,7 @@ Standard 0603 ceramic capacitor, and 0.1
 </net>
 <net name="!CS_MAX" class="0">
 <segment>
-<pinref part="U3" gate="G$1" pin="!CS"/>
+<pinref part="IC1" gate="G$1" pin="!CS"/>
 <wire x1="187.96" y1="162.56" x2="190.5" y2="162.56" width="0.1524" layer="91"/>
 <label x="187.96" y="162.56" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
@@ -4502,13 +4508,13 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <wire x1="236.22" y1="83.82" x2="241.3" y2="83.82" width="0.1524" layer="91"/>
 <label x="236.22" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="R2" gate="G$1" pin="1"/>
+<pinref part="R3" gate="G$1" pin="1"/>
 <wire x1="241.3" y1="83.82" x2="246.38" y2="83.82" width="0.1524" layer="91"/>
 <wire x1="246.38" y1="83.82" x2="254" y2="83.82" width="0.1524" layer="91"/>
 <wire x1="246.38" y1="83.82" x2="246.38" y2="81.28" width="0.1524" layer="91"/>
 <junction x="246.38" y="83.82"/>
-<pinref part="JP1" gate="G$1" pin="2"/>
-<pinref part="C10" gate="G$1" pin="1"/>
+<pinref part="JP5" gate="G$1" pin="2"/>
+<pinref part="C8" gate="G$1" pin="1"/>
 <wire x1="241.3" y1="83.82" x2="241.3" y2="78.74" width="0.1524" layer="91"/>
 <junction x="241.3" y="83.82"/>
 </segment>
@@ -4527,7 +4533,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <wire x1="236.22" y1="86.36" x2="254" y2="86.36" width="0.1524" layer="91"/>
 <label x="236.22" y="86.36" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="JP1" gate="G$1" pin="1"/>
+<pinref part="JP5" gate="G$1" pin="1"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="PB0/ADC8"/>