diff --git a/zoncoffee.sch b/zoncoffee.sch
--- a/zoncoffee.sch
+++ b/zoncoffee.sch
@@ -4675,19 +4675,19 @@ Standard 0603 ceramic capacitor, and 0.1
 </class>
 </classes>
 <parts>
-<part name="C106" library="microbuilder" deviceset="CAP_CERAMIC" device="0402" value="1.0uF"/>
-<part name="C105" library="microbuilder" deviceset="CAP_CERAMIC" device="0402" value="1.0uF"/>
+<part name="C4" library="microbuilder" deviceset="CAP_CERAMIC" device="0402" value="1.0uF"/>
+<part name="C3" library="microbuilder" deviceset="CAP_CERAMIC" device="0402" value="1.0uF"/>
 <part name="U$2" library="microbuilder" deviceset="GND" device=""/>
-<part name="R103" library="microbuilder" deviceset="RESISTOR" device="0402" value="390K"/>
+<part name="R2" library="microbuilder" deviceset="RESISTOR" device="0402" value="390K"/>
 <part name="U$17" library="microbuilder" deviceset="3.3V" device=""/>
-<part name="SW101" library="dp_devices" deviceset="JOYSTICK_SF303GJ26-3" device=""/>
-<part name="J101" library="SparkFun-Connectors" deviceset="USB" device="-MICROB"/>
-<part name="U104" library="dp_devices" deviceset="IC_MAX31855" device="-SO-8"/>
-<part name="U102" library="SparkFun-PowerIC" deviceset="MIC5205" device="3.3V" value="AP2202K-3.3TRG1"/>
-<part name="LED102" library="SparkFun-LED" deviceset="LED" device="0603"/>
-<part name="JP101" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM"/>
-<part name="JP102" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM"/>
-<part name="JP103" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM"/>
+<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="U2" library="SparkFun-PowerIC" deviceset="MIC5205" device="3.3V" value="AP2202K-3.3TRG1"/>
+<part name="LED1" library="SparkFun-LED" deviceset="LED" device="0603"/>
+<part name="JP2" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM"/>
+<part name="JP3" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM"/>
+<part name="JP4" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM"/>
 <part name="SUPPLY1" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
 <part name="GND1" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="SUPPLY3" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
@@ -4695,24 +4695,24 @@ Standard 0603 ceramic capacitor, and 0.1
 <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="D101" library="SparkFun-DiscreteSemi" deviceset="DIODE" device="SOD523"/>
+<part name="D1" library="SparkFun-DiscreteSemi" deviceset="DIODE" device="SOD523"/>
 <part name="SUPPLY5" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
-<part name="C107" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="4.7uF"/>
-<part name="C110" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="4.7uF"/>
-<part name="R102" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES"/>
+<part name="C5" library="SparkFun-Passives" deviceset="CAP" device="0402-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="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="C111" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
+<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"/>
-<part name="U$13" library="Protofusion" deviceset="STM32F042K" device=""/>
-<part name="C5" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
+<part name="U1" library="Protofusion" deviceset="STM32F042K" device=""/>
+<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="C7" 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=""/>
@@ -4722,7 +4722,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="SUPPLY13" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <part name="RA1" library="Protofusion" deviceset="CAP-ARRAY" device="" value="1uF"/>
 <part name="JP1" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM"/>
-<part name="U$6" library="Protofusion" deviceset="POGOPIN-CONN" device="ALLSMT"/>
+<part name="J1" library="Protofusion" deviceset="POGOPIN-CONN" device="ALLSMT"/>
 <part name="U$7" library="microbuilder" deviceset="GND" device=""/>
 </parts>
 <sheets>
@@ -4737,19 +4737,19 @@ Standard 0603 ceramic capacitor, and 0.1
 <text x="266.7" y="111.76" size="2.54" layer="113">TC Amp</text>
 </plain>
 <instances>
-<instance part="C106" gate="G$1" x="121.92" y="0" rot="R90"/>
-<instance part="C105" gate="G$1" x="114.3" y="-5.08" rot="R90"/>
+<instance part="C4" gate="G$1" x="121.92" y="0" rot="R90"/>
+<instance part="C3" gate="G$1" x="114.3" y="-5.08" rot="R90"/>
 <instance part="U$2" gate="G$1" x="99.06" y="-40.64"/>
-<instance part="R103" gate="G$1" x="106.68" y="-30.48"/>
+<instance part="R2" gate="G$1" x="106.68" y="-30.48"/>
 <instance part="U$17" gate="G$1" x="149.86" y="-5.08"/>
-<instance part="SW101" gate="SW" x="208.28" y="-38.1"/>
-<instance part="J101" gate="G$1" x="299.72" y="-25.4"/>
-<instance part="U104" gate="G$1" x="269.24" y="96.52" rot="R180"/>
-<instance part="U102" gate="G$1" x="210.82" y="-2.54"/>
-<instance part="LED102" gate="G$1" x="78.74" y="-22.86"/>
-<instance part="JP101" gate="G$1" x="314.96" y="66.04" rot="R180"/>
-<instance part="JP102" gate="G$1" x="314.96" y="50.8" rot="R180"/>
-<instance part="JP103" gate="G$1" x="314.96" y="35.56" rot="R180"/>
+<instance part="SW1" gate="SW" x="208.28" y="-38.1"/>
+<instance part="J2" gate="G$1" x="299.72" y="-25.4"/>
+<instance part="U3" gate="G$1" x="269.24" y="96.52" rot="R180"/>
+<instance part="U2" gate="G$1" x="210.82" y="-2.54"/>
+<instance part="LED1" gate="G$1" x="78.74" y="-22.86"/>
+<instance part="JP2" gate="G$1" x="314.96" y="66.04" rot="R180"/>
+<instance part="JP3" gate="G$1" x="314.96" y="50.8" rot="R180"/>
+<instance part="JP4" gate="G$1" x="314.96" y="35.56" rot="R180"/>
 <instance part="SUPPLY1" gate="G$1" x="281.94" y="68.58"/>
 <instance part="GND1" gate="1" x="281.94" y="58.42"/>
 <instance part="SUPPLY3" gate="G$1" x="195.58" y="5.08"/>
@@ -4757,24 +4757,24 @@ Standard 0603 ceramic capacitor, and 0.1
 <instance part="SUPPLY4" gate="G$1" x="238.76" y="5.08"/>
 <instance part="U$4" gate="G$1" x="231.14" y="-43.18"/>
 <instance part="U$5" gate="G$1" x="294.64" y="-27.94"/>
-<instance part="D101" gate="G$1" x="274.32" y="-22.86" rot="R180"/>
+<instance part="D1" gate="G$1" x="274.32" y="-22.86" rot="R180"/>
 <instance part="SUPPLY5" gate="G$1" x="261.62" y="-20.32"/>
-<instance part="C107" gate="G$1" x="182.88" y="0" rot="R180"/>
-<instance part="C110" gate="G$1" x="243.84" y="-5.08"/>
-<instance part="R102" gate="G$1" x="78.74" y="-12.7" rot="R270"/>
+<instance part="C5" gate="G$1" x="182.88" y="0" rot="R180"/>
+<instance part="C7" gate="G$1" x="243.84" y="-5.08"/>
+<instance part="R1" gate="G$1" x="78.74" y="-12.7" rot="R270"/>
 <instance part="GND3" gate="1" x="281.94" y="43.18"/>
 <instance part="GND4" gate="1" x="78.74" y="-33.02"/>
 <instance part="U$10" gate="G$1" x="302.26" y="86.36"/>
 <instance part="SUPPLY9" gate="G$1" x="302.26" y="106.68"/>
-<instance part="C111" gate="G$1" x="302.26" y="99.06" rot="R180"/>
+<instance part="C8" gate="G$1" x="302.26" y="99.06" rot="R180"/>
 <instance part="GND7" gate="1" x="182.88" y="-10.16"/>
 <instance part="GND8" gate="1" x="243.84" y="-12.7"/>
 <instance part="FRAME1" gate="G$1" x="58.42" y="-58.42"/>
 <instance part="LCD1" gate="G$1" x="137.16" y="-17.78"/>
-<instance part="U$13" gate="G$1" x="160.02" y="63.5"/>
-<instance part="C5" gate="G$1" x="86.36" y="83.82"/>
-<instance part="C6" gate="G$1" x="73.66" y="91.44"/>
-<instance part="C7" gate="G$1" x="213.36" y="55.88"/>
+<instance part="U1" gate="G$1" x="160.02" y="63.5"/>
+<instance part="C2" gate="G$1" x="86.36" y="83.82"/>
+<instance part="C1" gate="G$1" x="73.66" y="91.44"/>
+<instance part="C6" gate="G$1" x="213.36" y="55.88"/>
 <instance part="U$14" gate="G$1" x="73.66" y="76.2"/>
 <instance part="U$15" gate="G$1" x="86.36" y="76.2"/>
 <instance part="U$16" gate="G$1" x="213.36" y="48.26"/>
@@ -4787,7 +4787,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <instance part="RA1" gate="3" x="119.38" y="-33.02" rot="R90"/>
 <instance part="RA1" gate="4" x="114.3" y="-35.56" rot="R90"/>
 <instance part="JP1" gate="G$1" x="198.12" y="33.02" rot="R180"/>
-<instance part="U$6" gate="J" x="246.38" y="40.64"/>
+<instance part="J1" gate="J" x="246.38" y="40.64"/>
 <instance part="U$7" gate="G$1" x="228.6" y="93.98"/>
 </instances>
 <busses>
@@ -4798,14 +4798,14 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="127" y1="-2.54" x2="106.68" y2="-2.54" width="0.1524" layer="91"/>
 <wire x1="106.68" y1="-2.54" x2="106.68" y2="0" width="0.1524" layer="91"/>
 <wire x1="106.68" y1="0" x2="116.84" y2="0" width="0.1524" layer="91"/>
-<pinref part="C106" gate="G$1" pin="P$1"/>
+<pinref part="C4" gate="G$1" pin="P$1"/>
 <pinref part="LCD1" gate="G$1" pin="C2-"/>
 </segment>
 </net>
 <net name="N$2" class="0">
 <segment>
 <wire x1="124.46" y1="0" x2="127" y2="0" width="0.1524" layer="91"/>
-<pinref part="C106" gate="G$1" pin="P$2"/>
+<pinref part="C4" gate="G$1" pin="P$2"/>
 <pinref part="LCD1" gate="G$1" pin="C2+"/>
 </segment>
 </net>
@@ -4814,14 +4814,14 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="127" y1="-7.62" x2="106.68" y2="-7.62" width="0.1524" layer="91"/>
 <wire x1="106.68" y1="-7.62" x2="106.68" y2="-5.08" width="0.1524" layer="91"/>
 <wire x1="106.68" y1="-5.08" x2="109.22" y2="-5.08" width="0.1524" layer="91"/>
-<pinref part="C105" gate="G$1" pin="P$1"/>
+<pinref part="C3" gate="G$1" pin="P$1"/>
 <pinref part="LCD1" gate="G$1" pin="C1-"/>
 </segment>
 </net>
 <net name="N$4" class="0">
 <segment>
 <wire x1="116.84" y1="-5.08" x2="127" y2="-5.08" width="0.1524" layer="91"/>
-<pinref part="C105" gate="G$1" pin="P$2"/>
+<pinref part="C3" gate="G$1" pin="P$2"/>
 <pinref part="LCD1" gate="G$1" pin="C1+"/>
 </segment>
 </net>
@@ -4845,7 +4845,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="99.06" y="-35.56"/>
 <junction x="99.06" y="-33.02"/>
 <pinref part="U$2" gate="G$1" pin="GND"/>
-<pinref part="R103" gate="G$1" pin="1"/>
+<pinref part="R2" gate="G$1" pin="1"/>
 <pinref part="LCD1" gate="G$1" pin="VSS"/>
 <pinref part="RA1" gate="1" pin="1"/>
 <pinref part="RA1" gate="2" pin="1"/>
@@ -4853,44 +4853,44 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="RA1" gate="4" pin="1"/>
 </segment>
 <segment>
-<pinref part="JP101" gate="G$1" pin="2"/>
+<pinref part="JP2" gate="G$1" pin="2"/>
 <pinref part="GND1" gate="1" pin="GND"/>
 <wire x1="307.34" y1="63.5" x2="281.94" y2="63.5" width="0.1524" layer="91"/>
 <wire x1="281.94" y1="63.5" x2="281.94" y2="60.96" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U102" gate="G$1" pin="GND"/>
+<pinref part="U2" gate="G$1" pin="GND"/>
 <wire x1="200.66" y1="-2.54" x2="195.58" y2="-2.54" width="0.1524" layer="91"/>
 <wire x1="195.58" y1="-2.54" x2="195.58" y2="-10.16" width="0.1524" layer="91"/>
 <pinref part="GND2" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="SW101" gate="SW" pin="COMMON"/>
+<pinref part="SW1" gate="SW" pin="COMMON"/>
 <pinref part="U$4" gate="G$1" pin="GND"/>
 <wire x1="215.9" y1="-38.1" x2="231.14" y2="-38.1" width="0.1524" layer="91"/>
 <wire x1="231.14" y1="-38.1" x2="231.14" y2="-40.64" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="J101" gate="G$1" pin="GND"/>
+<pinref part="J2" gate="G$1" pin="GND"/>
 <pinref part="U$5" gate="G$1" pin="GND"/>
 <wire x1="294.64" y1="-25.4" x2="297.18" y2="-25.4" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="JP102" gate="G$1" pin="2"/>
+<pinref part="JP3" gate="G$1" pin="2"/>
 <wire x1="307.34" y1="48.26" x2="281.94" y2="48.26" width="0.1524" layer="91"/>
 <wire x1="281.94" y1="48.26" x2="281.94" y2="45.72" width="0.1524" layer="91"/>
 <pinref part="GND3" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="LED102" gate="G$1" pin="C"/>
+<pinref part="LED1" gate="G$1" pin="C"/>
 <pinref part="GND4" gate="1" pin="GND"/>
 <wire x1="78.74" y1="-27.94" x2="78.74" y2="-30.48" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U104" gate="G$1" pin="GND"/>
+<pinref part="U3" gate="G$1" pin="GND"/>
 <wire x1="287.02" y1="93.98" x2="284.48" y2="93.98" width="0.1524" layer="91"/>
 <wire x1="287.02" y1="93.98" x2="287.02" y2="91.44" width="0.1524" layer="91"/>
-<pinref part="C111" gate="G$1" pin="1"/>
+<pinref part="C8" gate="G$1" pin="1"/>
 <wire x1="287.02" y1="91.44" x2="302.26" y2="91.44" width="0.1524" layer="91"/>
 <wire x1="302.26" y1="91.44" x2="302.26" y2="93.98" width="0.1524" layer="91"/>
 <pinref part="U$10" gate="G$1" pin="GND"/>
@@ -4898,42 +4898,42 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="302.26" y="91.44"/>
 </segment>
 <segment>
-<pinref part="C107" gate="G$1" pin="1"/>
+<pinref part="C5" gate="G$1" pin="1"/>
 <pinref part="GND7" gate="1" pin="GND"/>
 <wire x1="182.88" y1="-7.62" x2="182.88" y2="-5.08" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C110" gate="G$1" pin="2"/>
+<pinref part="C7" gate="G$1" pin="2"/>
 <pinref part="GND8" gate="1" pin="GND"/>
 <wire x1="243.84" y1="-10.16" x2="243.84" y2="-7.62" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C6" gate="G$1" pin="2"/>
+<pinref part="C1" gate="G$1" pin="2"/>
 <wire x1="73.66" y1="88.9" x2="73.66" y2="78.74" width="0.1524" layer="91"/>
 <pinref part="U$14" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="C5" gate="G$1" pin="2"/>
+<pinref part="C2" gate="G$1" pin="2"/>
 <wire x1="86.36" y1="81.28" x2="86.36" y2="78.74" width="0.1524" layer="91"/>
 <pinref part="U$15" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="C7" gate="G$1" pin="2"/>
+<pinref part="C6" gate="G$1" pin="2"/>
 <wire x1="213.36" y1="53.34" x2="213.36" y2="50.8" width="0.1524" layer="91"/>
 <pinref part="U$16" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="U$13" gate="G$1" pin="GND"/>
+<pinref part="U1" gate="G$1" pin="GND"/>
 <pinref part="U$18" gate="G$1" pin="GND"/>
 <wire x1="160.02" y1="50.8" x2="160.02" y2="53.34" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$6" gate="J" pin="GND"/>
+<pinref part="J1" gate="J" pin="GND"/>
 <wire x1="238.76" y1="43.18" x2="243.84" y2="43.18" width="0.1524" layer="91"/>
 <label x="238.76" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$13" gate="G$1" pin="BOOT0-PF11"/>
+<pinref part="U1" gate="G$1" pin="BOOT0-PF11"/>
 <wire x1="205.74" y1="99.06" x2="228.6" y2="99.06" width="0.1524" layer="91"/>
 <wire x1="228.6" y1="99.06" x2="228.6" y2="96.52" width="0.1524" layer="91"/>
 <pinref part="U$7" gate="G$1" pin="GND"/>
@@ -4942,7 +4942,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <net name="N$8" class="0">
 <segment>
 <wire x1="127" y1="-30.48" x2="111.76" y2="-30.48" width="0.1524" layer="91"/>
-<pinref part="R103" gate="G$1" pin="2"/>
+<pinref part="R2" gate="G$1" pin="2"/>
 <pinref part="LCD1" gate="G$1" pin="IREF"/>
 </segment>
 </net>
@@ -4978,20 +4978,20 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="RA1" gate="2" pin="2"/>
 </segment>
 <segment>
-<pinref part="U102" gate="G$1" pin="OUT"/>
+<pinref part="U2" gate="G$1" pin="OUT"/>
 <wire x1="218.44" y1="2.54" x2="238.76" y2="2.54" width="0.1524" layer="91"/>
 <wire x1="238.76" y1="2.54" x2="238.76" y2="5.08" width="0.1524" layer="91"/>
 <pinref part="SUPPLY4" gate="G$1" pin="3.3V"/>
-<pinref part="C110" gate="G$1" pin="1"/>
+<pinref part="C7" gate="G$1" pin="1"/>
 <wire x1="238.76" y1="2.54" x2="243.84" y2="2.54" width="0.1524" layer="91"/>
 <wire x1="243.84" y1="2.54" x2="243.84" y2="0" width="0.1524" layer="91"/>
 <junction x="238.76" y="2.54"/>
 </segment>
 <segment>
-<pinref part="U104" gate="G$1" pin="VCC"/>
+<pinref part="U3" gate="G$1" pin="VCC"/>
 <wire x1="287.02" y1="101.6" x2="284.48" y2="101.6" width="0.1524" layer="91"/>
 <wire x1="287.02" y1="101.6" x2="287.02" y2="104.14" width="0.1524" layer="91"/>
-<pinref part="C111" gate="G$1" pin="2"/>
+<pinref part="C8" gate="G$1" pin="2"/>
 <wire x1="287.02" y1="104.14" x2="302.26" y2="104.14" width="0.1524" layer="91"/>
 <wire x1="302.26" y1="104.14" x2="302.26" y2="101.6" width="0.1524" layer="91"/>
 <pinref part="SUPPLY9" gate="G$1" pin="3.3V"/>
@@ -4999,8 +4999,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="302.26" y="104.14"/>
 </segment>
 <segment>
-<pinref part="U$13" gate="G$1" pin="VDD"/>
-<pinref part="C6" gate="G$1" pin="1"/>
+<pinref part="U1" gate="G$1" pin="VDD"/>
+<pinref part="C1" gate="G$1" pin="1"/>
 <wire x1="119.38" y1="101.6" x2="73.66" y2="101.6" width="0.1524" layer="91"/>
 <wire x1="73.66" y1="101.6" x2="73.66" y2="96.52" width="0.1524" layer="91"/>
 <pinref part="SUPPLY11" gate="G$1" pin="3.3V"/>
@@ -5008,8 +5008,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="73.66" y="101.6"/>
 </segment>
 <segment>
-<pinref part="U$13" gate="G$1" pin="VDDA"/>
-<pinref part="C5" gate="G$1" pin="1"/>
+<pinref part="U1" gate="G$1" pin="VDDA"/>
+<pinref part="C2" gate="G$1" pin="1"/>
 <wire x1="119.38" y1="91.44" x2="86.36" y2="91.44" width="0.1524" layer="91"/>
 <wire x1="86.36" y1="91.44" x2="86.36" y2="88.9" width="0.1524" layer="91"/>
 <pinref part="SUPPLY12" gate="G$1" pin="3.3V"/>
@@ -5017,8 +5017,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="86.36" y="91.44"/>
 </segment>
 <segment>
-<pinref part="U$13" gate="G$1" pin="VDDIO2"/>
-<pinref part="C7" gate="G$1" pin="1"/>
+<pinref part="U1" gate="G$1" pin="VDDIO2"/>
+<pinref part="C6" gate="G$1" pin="1"/>
 <wire x1="205.74" y1="63.5" x2="213.36" y2="63.5" width="0.1524" layer="91"/>
 <wire x1="213.36" y1="63.5" x2="213.36" y2="60.96" width="0.1524" layer="91"/>
 <pinref part="SUPPLY13" gate="G$1" pin="3.3V"/>
@@ -5027,27 +5027,27 @@ Standard 0603 ceramic capacitor, and 0.1
 </net>
 <net name="V_BATT" class="0">
 <segment>
-<pinref part="JP101" gate="G$1" pin="1"/>
+<pinref part="JP2" gate="G$1" pin="1"/>
 <pinref part="SUPPLY1" gate="G$1" pin="V_BATT"/>
 <wire x1="307.34" y1="66.04" x2="281.94" y2="66.04" width="0.1524" layer="91"/>
 <wire x1="281.94" y1="66.04" x2="281.94" y2="68.58" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U102" gate="G$1" pin="EN"/>
+<pinref part="U2" gate="G$1" pin="EN"/>
 <wire x1="200.66" y1="-7.62" x2="198.12" y2="-7.62" width="0.1524" layer="91"/>
 <wire x1="198.12" y1="-7.62" x2="198.12" y2="2.54" width="0.1524" layer="91"/>
-<pinref part="U102" gate="G$1" pin="IN"/>
+<pinref part="U2" gate="G$1" pin="IN"/>
 <wire x1="198.12" y1="2.54" x2="200.66" y2="2.54" width="0.1524" layer="91"/>
 <wire x1="198.12" y1="2.54" x2="195.58" y2="2.54" width="0.1524" layer="91"/>
 <wire x1="195.58" y1="2.54" x2="195.58" y2="5.08" width="0.1524" layer="91"/>
 <junction x="198.12" y="2.54"/>
 <pinref part="SUPPLY3" gate="G$1" pin="V_BATT"/>
-<pinref part="C107" gate="G$1" pin="2"/>
+<pinref part="C5" gate="G$1" pin="2"/>
 <wire x1="182.88" y1="2.54" x2="195.58" y2="2.54" width="0.1524" layer="91"/>
 <junction x="195.58" y="2.54"/>
 </segment>
 <segment>
-<pinref part="D101" gate="G$1" pin="C"/>
+<pinref part="D1" gate="G$1" pin="C"/>
 <wire x1="271.78" y1="-22.86" x2="261.62" y2="-22.86" width="0.1524" layer="91"/>
 <wire x1="261.62" y1="-22.86" x2="261.62" y2="-20.32" width="0.1524" layer="91"/>
 <pinref part="SUPPLY5" gate="G$1" pin="V_BATT"/>
@@ -5055,90 +5055,90 @@ Standard 0603 ceramic capacitor, and 0.1
 </net>
 <net name="SW-A" class="0">
 <segment>
-<pinref part="SW101" gate="SW" pin="A"/>
+<pinref part="SW1" gate="SW" pin="A"/>
 <wire x1="190.5" y1="-35.56" x2="200.66" y2="-35.56" width="0.1524" layer="91"/>
 <label x="190.5" y="-35.56" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="208.28" y1="91.44" x2="205.74" y2="91.44" width="0.1524" layer="91"/>
 <label x="208.28" y="91.44" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="SPI1_MOSI/PB5"/>
+<pinref part="U1" gate="G$1" pin="SPI1_MOSI/PB5"/>
 </segment>
 </net>
 <net name="SW-C" class="0">
 <segment>
-<pinref part="SW101" gate="SW" pin="C"/>
+<pinref part="SW1" gate="SW" pin="C"/>
 <wire x1="190.5" y1="-40.64" x2="200.66" y2="-40.64" width="0.1524" layer="91"/>
 <label x="190.5" y="-40.64" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="208.28" y1="86.36" x2="205.74" y2="86.36" width="0.1524" layer="91"/>
 <label x="208.28" y="86.36" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="SPI1_SCK/PB3"/>
+<pinref part="U1" gate="G$1" pin="SPI1_SCK/PB3"/>
 </segment>
 </net>
 <net name="SW-B" class="0">
 <segment>
-<pinref part="SW101" gate="SW" pin="B"/>
+<pinref part="SW1" gate="SW" pin="B"/>
 <wire x1="223.52" y1="-35.56" x2="215.9" y2="-35.56" width="0.1524" layer="91"/>
 <label x="223.52" y="-35.56" size="1.016" layer="95" xref="yes"/>
 </segment>
 <segment>
 <wire x1="208.28" y1="96.52" x2="205.74" y2="96.52" width="0.1524" layer="91"/>
 <label x="208.28" y="96.52" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
+<pinref part="U1" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
 </segment>
 </net>
 <net name="SW-D" class="0">
 <segment>
-<pinref part="SW101" gate="SW" pin="D"/>
+<pinref part="SW1" gate="SW" pin="D"/>
 <wire x1="223.52" y1="-40.64" x2="215.9" y2="-40.64" width="0.1524" layer="91"/>
 <label x="223.52" y="-40.64" size="1.016" layer="95" xref="yes"/>
 </segment>
 <segment>
 <wire x1="208.28" y1="93.98" x2="205.74" y2="93.98" width="0.1524" layer="91"/>
 <label x="208.28" y="93.98" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
+<pinref part="U1" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
 </segment>
 </net>
 <net name="D+" class="0">
 <segment>
-<pinref part="J101" gate="G$1" pin="D+"/>
+<pinref part="J2" gate="G$1" pin="D+"/>
 <wire x1="292.1" y1="-17.78" x2="297.18" y2="-17.78" width="0.1524" layer="91"/>
 <label x="292.1" y="-17.78" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <label x="236.22" y="76.2" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12"/>
+<pinref part="U1" gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12"/>
 <wire x1="205.74" y1="76.2" x2="236.22" y2="76.2" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$6" gate="J" pin="MOSI"/>
+<pinref part="J1" gate="J" pin="MOSI"/>
 <wire x1="238.76" y1="35.56" x2="243.84" y2="35.56" width="0.1524" layer="91"/>
 <label x="238.76" y="35.56" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="D-" class="0">
 <segment>
-<pinref part="J101" gate="G$1" pin="D-"/>
+<pinref part="J2" gate="G$1" pin="D-"/>
 <wire x1="292.1" y1="-20.32" x2="297.18" y2="-20.32" width="0.1524" layer="91"/>
 <label x="292.1" y="-20.32" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <label x="236.22" y="73.66" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11"/>
+<pinref part="U1" gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11"/>
 <wire x1="205.74" y1="73.66" x2="236.22" y2="73.66" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$6" gate="J" pin="\RST"/>
+<pinref part="J1" gate="J" pin="\RST"/>
 <wire x1="238.76" y1="33.02" x2="243.84" y2="33.02" width="0.1524" layer="91"/>
 <label x="238.76" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="VUSB" class="0">
 <segment>
-<pinref part="J101" gate="G$1" pin="VBUS"/>
-<pinref part="D101" gate="G$1" pin="A"/>
+<pinref part="J2" gate="G$1" pin="VBUS"/>
+<pinref part="D1" gate="G$1" pin="A"/>
 <wire x1="276.86" y1="-22.86" x2="281.94" y2="-22.86" width="0.1524" layer="91"/>
 <wire x1="281.94" y1="-22.86" x2="297.18" y2="-22.86" width="0.1524" layer="91"/>
 <wire x1="281.94" y1="-22.86" x2="281.94" y2="-7.62" width="0.1524" layer="91"/>
@@ -5147,40 +5147,40 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="276.86" y="-7.62" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$6" gate="J" pin="VCC"/>
+<pinref part="J1" gate="J" pin="VCC"/>
 <wire x1="243.84" y1="45.72" x2="238.76" y2="45.72" width="0.1524" layer="91"/>
 <label x="238.76" y="45.72" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SSR+" class="0">
 <segment>
-<pinref part="JP102" gate="G$1" pin="1"/>
+<pinref part="JP3" gate="G$1" pin="1"/>
 <wire x1="307.34" y1="50.8" x2="281.94" y2="50.8" width="0.1524" layer="91"/>
 <label x="281.94" y="50.8" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <label x="114.3" y="86.36" size="1.016" layer="95" rot="R180" xref="yes"/>
 <wire x1="114.3" y1="86.36" x2="119.38" y2="86.36" width="0.1524" layer="91"/>
-<pinref part="U$13" gate="G$1" pin="PA1/ADC1"/>
+<pinref part="U1" gate="G$1" pin="PA1/ADC1"/>
 </segment>
 </net>
 <net name="N$23" class="0">
 <segment>
-<pinref part="LED102" gate="G$1" pin="A"/>
-<pinref part="R102" gate="G$1" pin="2"/>
+<pinref part="LED1" gate="G$1" pin="A"/>
+<pinref part="R1" gate="G$1" pin="2"/>
 <wire x1="78.74" y1="-20.32" x2="78.74" y2="-17.78" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="LED_PWR" class="0">
 <segment>
-<pinref part="R102" gate="G$1" pin="1"/>
+<pinref part="R1" gate="G$1" pin="1"/>
 <wire x1="78.74" y1="-5.08" x2="78.74" y2="-7.62" width="0.1524" layer="91"/>
 <label x="78.74" y="-5.08" size="1.27" layer="95" rot="R90" xref="yes"/>
 </segment>
 <segment>
 <wire x1="208.28" y1="101.6" x2="205.74" y2="101.6" width="0.1524" layer="91"/>
 <label x="208.28" y="101.6" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="I2C1_SCL/CAN_RX/PB8"/>
+<pinref part="U1" gate="G$1" pin="I2C1_SCL/CAN_RX/PB8"/>
 </segment>
 </net>
 <net name="!RES" class="0">
@@ -5192,7 +5192,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <label x="111.76" y="81.28" size="1.016" layer="95" rot="R180" xref="yes"/>
 <wire x1="111.76" y1="81.28" x2="119.38" y2="81.28" width="0.1524" layer="91"/>
-<pinref part="U$13" gate="G$1" pin="PA3/ADC3/USART2_RX"/>
+<pinref part="U1" gate="G$1" pin="PA3/ADC3/USART2_RX"/>
 </segment>
 </net>
 <net name="D/!C" class="0">
@@ -5204,43 +5204,43 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <label x="111.76" y="78.74" size="1.016" layer="95" rot="R180" xref="yes"/>
 <wire x1="111.76" y1="78.74" x2="119.38" y2="78.74" width="0.1524" layer="91"/>
-<pinref part="U$13" gate="G$1" pin="PA4/ADC4"/>
+<pinref part="U1" gate="G$1" pin="PA4/ADC4"/>
 </segment>
 </net>
 <net name="T-" class="0">
 <segment>
-<pinref part="U104" gate="G$1" pin="T-"/>
+<pinref part="U3" gate="G$1" pin="T-"/>
 <wire x1="287.02" y1="96.52" x2="284.48" y2="96.52" width="0.1524" layer="91"/>
 <label x="287.02" y="96.52" size="1.016" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="JP103" gate="G$1" pin="2"/>
+<pinref part="JP4" gate="G$1" pin="2"/>
 <wire x1="307.34" y1="33.02" x2="281.94" y2="33.02" width="0.1524" layer="91"/>
 <label x="281.94" y="33.02" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="T+" class="0">
 <segment>
-<pinref part="U104" gate="G$1" pin="T+"/>
+<pinref part="U3" gate="G$1" pin="T+"/>
 <wire x1="287.02" y1="99.06" x2="284.48" y2="99.06" width="0.1524" layer="91"/>
 <label x="287.02" y="99.06" size="1.016" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="JP103" gate="G$1" pin="1"/>
+<pinref part="JP4" gate="G$1" pin="1"/>
 <wire x1="307.34" y1="35.56" x2="281.94" y2="35.56" width="0.1524" layer="91"/>
 <label x="281.94" y="35.56" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SW-BTN" class="0">
 <segment>
-<pinref part="SW101" gate="SW" pin="CENTER"/>
+<pinref part="SW1" gate="SW" pin="CENTER"/>
 <wire x1="200.66" y1="-38.1" x2="190.5" y2="-38.1" width="0.1524" layer="91"/>
 <label x="190.5" y="-38.1" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="205.74" y1="88.9" x2="208.28" y2="88.9" width="0.1524" layer="91"/>
 <label x="208.28" y="88.9" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="SPI1_MISO/PB4"/>
+<pinref part="U1" gate="G$1" pin="SPI1_MISO/PB4"/>
 </segment>
 </net>
 <net name="SPI_MOSI" class="0">
@@ -5252,19 +5252,19 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <wire x1="119.38" y1="71.12" x2="109.22" y2="71.12" width="0.1524" layer="91"/>
 <label x="109.22" y="71.12" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="PA7/ADC7/SPI1_MOSI"/>
+<pinref part="U1" gate="G$1" pin="PA7/ADC7/SPI1_MOSI"/>
 </segment>
 </net>
 <net name="SPI_MISO" class="0">
 <segment>
-<pinref part="U104" gate="G$1" pin="SO"/>
+<pinref part="U3" gate="G$1" pin="SO"/>
 <wire x1="251.46" y1="96.52" x2="254" y2="96.52" width="0.1524" layer="91"/>
 <label x="251.46" y="96.52" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="119.38" y1="73.66" x2="109.22" y2="73.66" width="0.1524" layer="91"/>
 <label x="109.22" y="73.66" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="PA6/ADC6/SPI1_MISO"/>
+<pinref part="U1" gate="G$1" pin="PA6/ADC6/SPI1_MISO"/>
 </segment>
 </net>
 <net name="SPI_SCK" class="0">
@@ -5274,14 +5274,14 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="LCD1" gate="G$1" pin="SCLK"/>
 </segment>
 <segment>
-<pinref part="U104" gate="G$1" pin="SCK"/>
+<pinref part="U3" gate="G$1" pin="SCK"/>
 <wire x1="251.46" y1="101.6" x2="254" y2="101.6" width="0.1524" layer="91"/>
 <label x="251.46" y="101.6" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="119.38" y1="76.2" x2="109.22" y2="76.2" width="0.1524" layer="91"/>
 <label x="109.22" y="76.2" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="PA5/ADC5/SPI1_SCK"/>
+<pinref part="U1" gate="G$1" pin="PA5/ADC5/SPI1_SCK"/>
 </segment>
 </net>
 <net name="!CS_OLED" class="0">
@@ -5293,19 +5293,19 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <wire x1="119.38" y1="83.82" x2="109.22" y2="83.82" width="0.1524" layer="91"/>
 <label x="109.22" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="PA2/ADC2/USART2_TX"/>
+<pinref part="U1" gate="G$1" pin="PA2/ADC2/USART2_TX"/>
 </segment>
 </net>
 <net name="!CS_MAX" class="0">
 <segment>
-<pinref part="U104" gate="G$1" pin="!CS"/>
+<pinref part="U3" gate="G$1" pin="!CS"/>
 <wire x1="251.46" y1="99.06" x2="254" y2="99.06" width="0.1524" layer="91"/>
 <label x="251.46" y="99.06" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="205.74" y1="83.82" x2="215.9" y2="83.82" width="0.1524" layer="91"/>
 <label x="215.9" y="83.82" size="1.27" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="USART2_RX/PA15"/>
+<pinref part="U1" gate="G$1" pin="USART2_RX/PA15"/>
 </segment>
 </net>
 <net name="AUX-TX" class="0">
@@ -5315,7 +5315,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="185.42" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$13" gate="G$1" pin="USART1_TX/I2C1_SCL/PA9"/>
+<pinref part="U1" gate="G$1" pin="USART1_TX/I2C1_SCL/PA9"/>
 <wire x1="205.74" y1="68.58" x2="243.84" y2="68.58" width="0.1524" layer="91"/>
 <label x="243.84" y="68.58" size="1.27" layer="95" xref="yes"/>
 </segment>
@@ -5327,31 +5327,31 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="185.42" y="30.48" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$13" gate="G$1" pin="USART1_RX/I2C1_SDA/PA10"/>
+<pinref part="U1" gate="G$1" pin="USART1_RX/I2C1_SDA/PA10"/>
 <wire x1="205.74" y1="71.12" x2="243.84" y2="71.12" width="0.1524" layer="91"/>
 <label x="243.84" y="71.12" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="SWCLK" class="0">
 <segment>
-<pinref part="U$6" gate="J" pin="SCK"/>
+<pinref part="J1" gate="J" pin="SCK"/>
 <wire x1="238.76" y1="40.64" x2="243.84" y2="40.64" width="0.1524" layer="91"/>
 <label x="238.76" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$13" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
+<pinref part="U1" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
 <wire x1="226.06" y1="81.28" x2="205.74" y2="81.28" width="0.1524" layer="91"/>
 <label x="226.06" y="81.28" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="SWDIO" class="0">
 <segment>
-<pinref part="U$6" gate="J" pin="MISO"/>
+<pinref part="J1" gate="J" pin="MISO"/>
 <wire x1="238.76" y1="38.1" x2="243.84" y2="38.1" width="0.1524" layer="91"/>
 <label x="238.76" y="38.1" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$13" gate="G$1" pin="SWDIO/PA13"/>
+<pinref part="U1" gate="G$1" pin="SWDIO/PA13"/>
 <wire x1="226.06" y1="78.74" x2="205.74" y2="78.74" width="0.1524" layer="91"/>
 <label x="226.06" y="78.74" size="1.27" layer="95" xref="yes"/>
 </segment>