diff --git a/zoncoffee.sch b/zoncoffee.sch
--- a/zoncoffee.sch
+++ b/zoncoffee.sch
@@ -8,34 +8,34 @@
 </settings>
 <grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="no" active="no"/>
-<layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
-<layer number="3" name="Route3" color="4" fill="3" visible="no" active="no"/>
-<layer number="4" name="Route4" color="1" fill="4" visible="no" active="no"/>
-<layer number="5" name="Route5" color="4" fill="4" visible="no" active="no"/>
-<layer number="6" name="Route6" color="1" fill="8" visible="no" active="no"/>
-<layer number="7" name="Route7" color="4" fill="8" visible="no" active="no"/>
-<layer number="8" name="Route8" color="1" fill="2" visible="no" active="no"/>
-<layer number="9" name="Route9" color="4" fill="2" visible="no" active="no"/>
-<layer number="10" name="Route10" color="1" fill="7" visible="no" active="no"/>
-<layer number="11" name="Route11" color="4" fill="7" visible="no" active="no"/>
-<layer number="12" name="Route12" color="1" fill="5" visible="no" active="no"/>
-<layer number="13" name="Route13" color="4" fill="5" visible="no" active="no"/>
-<layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
-<layer number="15" name="Route15" color="4" fill="6" visible="no" active="no"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="no"/>
-<layer number="17" name="Pads" color="2" fill="1" visible="no" active="no"/>
-<layer number="18" name="Vias" color="2" fill="1" visible="no" active="no"/>
-<layer number="19" name="Unrouted" color="6" fill="1" visible="no" active="no"/>
-<layer number="20" name="Dimension" color="15" fill="1" visible="no" active="no"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="no"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="no"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="no"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="no"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="no" active="no"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="no" active="no"/>
-<layer number="27" name="tValues" color="7" fill="1" visible="no" active="no"/>
-<layer number="28" name="bValues" color="7" fill="1" visible="no" active="no"/>
+<layer number="1" name="Top" color="4" fill="1" visible="yes" active="no"/>
+<layer number="2" name="Route2" color="1" fill="3" visible="yes" active="no"/>
+<layer number="3" name="Route3" color="4" fill="3" visible="yes" active="no"/>
+<layer number="4" name="Route4" color="1" fill="4" visible="yes" active="no"/>
+<layer number="5" name="Route5" color="4" fill="4" visible="yes" active="no"/>
+<layer number="6" name="Route6" color="1" fill="8" visible="yes" active="no"/>
+<layer number="7" name="Route7" color="4" fill="8" visible="yes" active="no"/>
+<layer number="8" name="Route8" color="1" fill="2" visible="yes" active="no"/>
+<layer number="9" name="Route9" color="4" fill="2" visible="yes" active="no"/>
+<layer number="10" name="Route10" color="1" fill="7" visible="yes" active="no"/>
+<layer number="11" name="Route11" color="4" fill="7" visible="yes" active="no"/>
+<layer number="12" name="Route12" color="1" fill="5" visible="yes" active="no"/>
+<layer number="13" name="Route13" color="4" fill="5" visible="yes" active="no"/>
+<layer number="14" name="Route14" color="1" fill="6" visible="yes" active="no"/>
+<layer number="15" name="Route15" color="4" fill="6" visible="yes" active="no"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="no"/>
+<layer number="17" name="Pads" color="2" fill="1" visible="yes" active="no"/>
+<layer number="18" name="Vias" color="2" fill="1" visible="yes" active="no"/>
+<layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="no"/>
+<layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="no"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="no"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="no"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="no"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="no"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="no"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="no"/>
+<layer number="27" name="tValues" color="7" fill="1" visible="yes" active="no"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="yes" active="no"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="no"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="no"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="no"/>
@@ -44,8 +44,8 @@
 <layer number="34" name="bFinish" color="6" fill="6" visible="no" active="no"/>
 <layer number="35" name="tGlue" color="7" fill="4" visible="no" active="no"/>
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="no"/>
-<layer number="37" name="tTest" color="7" fill="1" visible="no" active="no"/>
-<layer number="38" name="bTest" color="7" fill="1" visible="no" active="no"/>
+<layer number="37" name="tTest" color="7" fill="1" visible="yes" active="no"/>
+<layer number="38" name="bTest" color="7" fill="1" visible="yes" active="no"/>
 <layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="no"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="no"/>
 <layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="no"/>
@@ -53,17 +53,17 @@
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="no"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="no"/>
 <layer number="45" name="Holes" color="7" fill="1" visible="no" active="no"/>
-<layer number="46" name="Milling" color="3" fill="1" visible="no" active="no"/>
-<layer number="47" name="Measures" color="7" fill="1" visible="no" active="no"/>
-<layer number="48" name="Document" color="7" fill="1" visible="no" active="no"/>
-<layer number="49" name="Reference" color="7" fill="1" visible="no" active="no"/>
-<layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="no"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="no"/>
-<layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
-<layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
-<layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
-<layer number="57" name="tCAD" color="7" fill="1" visible="no" active="no"/>
+<layer number="46" name="Milling" color="3" fill="1" visible="yes" active="no"/>
+<layer number="47" name="Measures" color="7" fill="1" visible="yes" active="no"/>
+<layer number="48" name="Document" color="7" fill="1" visible="yes" active="no"/>
+<layer number="49" name="Reference" color="7" fill="1" visible="yes" active="no"/>
+<layer number="50" name="dxf" color="7" fill="1" visible="yes" active="no"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="no"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="no"/>
+<layer number="53" name="tGND_GNDA" color="7" fill="9" visible="yes" active="no"/>
+<layer number="54" name="bGND_GNDA" color="1" fill="9" visible="yes" active="no"/>
+<layer number="56" name="wert" color="7" fill="1" visible="yes" active="no"/>
+<layer number="57" name="tCAD" color="7" fill="1" visible="yes" active="no"/>
 <layer number="91" name="Nets" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="92" name="Busses" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="93" name="Pins" color="2" fill="1" visible="no" active="yes"/>
@@ -4037,7 +4037,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <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="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"/>
@@ -4051,7 +4051,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="U$5" 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="C5" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="4.7uF"/>
+<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=""/>
@@ -4073,7 +4073,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <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="RA1" library="Protofusion" deviceset="CAP-ARRAY" device="" value="1uF"/>
+<part name="CA1" library="Protofusion" deviceset="CAP-ARRAY" device="" value="1uF"/>
 <part name="JP1" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
 <part name="J1" library="Protofusion" deviceset="POGOPIN-CONN" device="ALLSMT"/>
 <part name="U$7" library="microbuilder" deviceset="GND" device=""/>
@@ -4083,7 +4083,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <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="U$8" library="Protofusion" deviceset="STM32F042K-T" device=""/>
+<part name="U1" library="Protofusion" deviceset="STM32F042K-T" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -4094,7 +4094,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <text x="58.42" y="83.82" size="2.54" layer="113">OLED Display</text>
 <text x="15.24" y="83.82" size="2.54" layer="113">Indication</text>
 <text x="139.7" y="43.18" size="2.54" layer="113">Buttons</text>
-<text x="228.6" y="175.26" size="2.54" layer="113">TC Amp</text>
+<text x="215.9" y="177.8" size="2.54" layer="113">TC Amp</text>
 <text x="101.6" y="172.72" size="2.54" layer="113">Micro</text>
 </plain>
 <instances>
@@ -4108,8 +4108,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <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="228.6" y="132.08"/>
-<instance part="GND1" gate="1" x="228.6" y="121.92"/>
+<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="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"/>
@@ -4120,7 +4120,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <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="228.6" y="106.68"/>
+<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"/>
@@ -4129,30 +4129,30 @@ Standard 0603 ceramic capacitor, and 0.1
 <instance part="GND8" 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="33.02" y="144.78"/>
-<instance part="C1" gate="G$1" x="20.32" y="152.4"/>
-<instance part="C6" gate="G$1" x="160.02" y="116.84"/>
-<instance part="U$14" gate="G$1" x="20.32" y="137.16"/>
-<instance part="U$15" gate="G$1" x="33.02" y="137.16"/>
-<instance part="U$16" gate="G$1" x="160.02" y="109.22"/>
+<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="20.32" y="165.1"/>
-<instance part="SUPPLY12" gate="G$1" x="33.02" y="154.94"/>
-<instance part="SUPPLY13" gate="G$1" x="160.02" y="124.46"/>
-<instance part="RA1" gate="1" x="68.58" y="60.96" rot="R90"/>
-<instance part="RA1" gate="2" x="63.5" y="55.88" rot="R90"/>
-<instance part="RA1" gate="3" x="68.58" y="38.1" rot="R90"/>
-<instance part="RA1" gate="4" x="63.5" y="35.56" rot="R90"/>
+<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="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="JP1" gate="G$1" x="261.62" y="83.82" rot="R180"/>
-<instance part="J1" gate="J" x="261.62" y="63.5"/>
-<instance part="U$7" gate="G$1" x="175.26" y="154.94"/>
+<instance part="J1" gate="J" x="259.08" y="63.5"/>
+<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="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="U$8" gate="G$1" x="111.76" y="144.78"/>
+<instance part="U1" gate="G$1" x="111.76" y="144.78"/>
 </instances>
 <busses>
 </busses>
@@ -4210,17 +4210,17 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="48.26" y="38.1"/>
 <pinref part="U$2" gate="G$1" pin="GND"/>
 <pinref part="LCD1" gate="G$1" pin="VSS"/>
-<pinref part="RA1" gate="1" pin="1"/>
-<pinref part="RA1" gate="2" pin="1"/>
-<pinref part="RA1" gate="3" pin="1"/>
-<pinref part="RA1" gate="4" pin="1"/>
+<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"/>
 </segment>
 <segment>
 <pinref part="JP2" gate="G$1" pin="2"/>
 <pinref part="GND1" gate="1" pin="GND"/>
-<wire x1="254" y1="127" x2="228.6" y2="127" width="0.1524" layer="91"/>
-<wire x1="228.6" y1="127" x2="228.6" y2="124.46" width="0.1524" layer="91"/>
+<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>
 <segment>
 <pinref part="U2" gate="G$1" pin="GND"/>
@@ -4241,8 +4241,8 @@ Standard 0603 ceramic capacitor, and 0.1
 </segment>
 <segment>
 <pinref part="JP3" gate="G$1" pin="2"/>
-<wire x1="254" y1="111.76" x2="228.6" y2="111.76" width="0.1524" layer="91"/>
-<wire x1="228.6" y1="111.76" x2="228.6" y2="109.22" width="0.1524" layer="91"/>
+<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"/>
 </segment>
 <segment>
@@ -4267,33 +4267,34 @@ Standard 0603 ceramic capacitor, and 0.1
 </segment>
 <segment>
 <pinref part="C1" gate="G$1" pin="2"/>
-<wire x1="20.32" y1="149.86" x2="20.32" y2="139.7" width="0.1524" layer="91"/>
+<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"/>
 </segment>
 <segment>
 <pinref part="C2" gate="G$1" pin="2"/>
-<wire x1="33.02" y1="142.24" x2="33.02" y2="139.7" width="0.1524" layer="91"/>
+<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"/>
 </segment>
 <segment>
 <pinref part="C6" gate="G$1" pin="2"/>
-<wire x1="160.02" y1="114.3" x2="160.02" y2="111.76" width="0.1524" layer="91"/>
+<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"/>
 </segment>
 <segment>
 <pinref part="U$18" 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="U$8" gate="G$1" pin="GND"/>
+<pinref part="U1" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="J1" gate="J" pin="GND"/>
-<wire x1="254" y1="66.04" x2="259.08" y2="66.04" width="0.1524" layer="91"/>
-<label x="254" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="246.38" y1="66.04" x2="256.54" y2="66.04" width="0.1524" layer="91"/>
+<label x="246.38" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="152.4" y1="160.02" x2="175.26" y2="160.02" width="0.1524" layer="91"/>
-<wire x1="175.26" y1="160.02" x2="175.26" y2="157.48" width="0.1524" layer="91"/>
+<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="U1" gate="G$1" pin="BOOT0/I2C1_SCL/CAN_RX/PB8"/>
 </segment>
 <segment>
 <pinref part="U3" gate="G$1" pin="GND"/>
@@ -4313,14 +4314,14 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <wire x1="76.2" y1="38.1" x2="71.12" y2="38.1" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="VCOMH"/>
-<pinref part="RA1" gate="3" pin="2"/>
+<pinref part="CA1" gate="3" pin="2"/>
 </segment>
 </net>
 <net name="N$15" class="0">
 <segment>
 <wire x1="76.2" y1="35.56" x2="66.04" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="VCC"/>
-<pinref part="RA1" gate="4" pin="2"/>
+<pinref part="CA1" gate="4" pin="2"/>
 </segment>
 </net>
 <net name="3.3V" class="0">
@@ -4337,8 +4338,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="76.2" y="60.96"/>
 <pinref part="LCD1" gate="G$1" pin="VDD"/>
 <junction x="76.2" y="55.88"/>
-<pinref part="RA1" gate="1" pin="2"/>
-<pinref part="RA1" gate="2" pin="2"/>
+<pinref part="CA1" gate="1" pin="2"/>
+<pinref part="CA1" gate="2" pin="2"/>
 </segment>
 <segment>
 <pinref part="U2" gate="G$1" pin="OUT"/>
@@ -4357,29 +4358,30 @@ Standard 0603 ceramic capacitor, and 0.1
 </segment>
 <segment>
 <pinref part="C1" gate="G$1" pin="1"/>
-<wire x1="66.04" y1="162.56" x2="20.32" y2="162.56" width="0.1524" layer="91"/>
-<wire x1="20.32" y1="162.56" x2="20.32" y2="157.48" width="0.1524" layer="91"/>
+<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"/>
-<wire x1="20.32" y1="165.1" x2="20.32" y2="162.56" width="0.1524" layer="91"/>
-<junction x="20.32" y="162.56"/>
-<pinref part="U$8" gate="G$1" pin="VDD"/>
+<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"/>
 </segment>
 <segment>
 <pinref part="C2" gate="G$1" pin="1"/>
-<wire x1="66.04" y1="152.4" x2="33.02" y2="152.4" width="0.1524" layer="91"/>
-<wire x1="33.02" y1="152.4" x2="33.02" y2="149.86" width="0.1524" layer="91"/>
+<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"/>
-<wire x1="33.02" y1="154.94" x2="33.02" y2="152.4" width="0.1524" layer="91"/>
-<junction x="33.02" y="152.4"/>
-<pinref part="U$8" gate="G$1" pin="VDDA"/>
+<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"/>
 </segment>
 <segment>
 <pinref part="C6" gate="G$1" pin="1"/>
-<wire x1="152.4" y1="124.46" x2="160.02" y2="124.46" width="0.1524" layer="91"/>
-<wire x1="160.02" y1="124.46" x2="160.02" y2="121.92" width="0.1524" layer="91"/>
+<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"/>
-<junction x="160.02" y="124.46"/>
-<pinref part="U$8" gate="G$1" pin="VDDIO2"/>
+<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"/>
@@ -4392,8 +4394,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="JP2" gate="G$1" pin="1"/>
 <pinref part="SUPPLY1" gate="G$1" pin="V_BATT"/>
-<wire x1="254" y1="129.54" x2="228.6" y2="129.54" width="0.1524" layer="91"/>
-<wire x1="228.6" y1="129.54" x2="228.6" y2="132.08" width="0.1524" layer="91"/>
+<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>
 <segment>
 <pinref part="U2" gate="G$1" pin="EN"/>
@@ -4420,82 +4422,82 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="SW1" gate="SW" pin="A"/>
 <wire x1="129.54" y1="33.02" x2="139.7" y2="33.02" width="0.1524" layer="91"/>
-<label x="129.54" y="33.02" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="129.54" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="152.4" x2="152.4" y2="152.4" width="0.1524" layer="91"/>
-<label x="154.94" y="152.4" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="SPI1_MOSI/PB5"/>
+<label x="154.94" y="152.4" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="SPI1_MOSI/PB5"/>
 </segment>
 </net>
 <net name="SW-C" class="0">
 <segment>
 <pinref part="SW1" gate="SW" pin="C"/>
 <wire x1="129.54" y1="27.94" x2="139.7" y2="27.94" width="0.1524" layer="91"/>
-<label x="129.54" y="27.94" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="129.54" y="27.94" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="147.32" x2="152.4" y2="147.32" width="0.1524" layer="91"/>
-<label x="154.94" y="147.32" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="SPI1_SCK/PB3"/>
+<label x="154.94" y="147.32" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="SPI1_SCK/PB3"/>
 </segment>
 </net>
 <net name="SW-B" class="0">
 <segment>
 <pinref part="SW1" gate="SW" pin="B"/>
 <wire x1="162.56" y1="33.02" x2="154.94" y2="33.02" width="0.1524" layer="91"/>
-<label x="162.56" y="33.02" size="1.016" layer="95" xref="yes"/>
+<label x="162.56" y="33.02" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="157.48" x2="152.4" y2="157.48" width="0.1524" layer="91"/>
-<label x="154.94" y="157.48" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
+<label x="154.94" y="157.48" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
 </segment>
 </net>
 <net name="SW-D" class="0">
 <segment>
 <pinref part="SW1" gate="SW" pin="D"/>
 <wire x1="162.56" y1="27.94" x2="154.94" y2="27.94" width="0.1524" layer="91"/>
-<label x="162.56" y="27.94" size="1.016" layer="95" xref="yes"/>
+<label x="162.56" y="27.94" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="154.94" x2="152.4" y2="154.94" width="0.1524" layer="91"/>
-<label x="154.94" y="154.94" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
+<label x="154.94" y="154.94" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
 </segment>
 </net>
 <net name="D+" class="0">
 <segment>
 <pinref part="J2" 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.016" layer="95" rot="R180" xref="yes"/>
+<label x="248.92" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="182.88" y="137.16" size="1.016" layer="95" xref="yes"/>
-<wire x1="152.4" y1="137.16" x2="182.88" y2="137.16" width="0.1524" layer="91"/>
-<pinref part="U$8" gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12"/>
+<label x="154.94" y="137.16" size="1.27" layer="95" xref="yes"/>
+<wire x1="152.4" y1="137.16" x2="154.94" y2="137.16" width="0.1524" layer="91"/>
+<pinref part="U1" gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12"/>
 </segment>
 <segment>
 <pinref part="J1" gate="J" pin="MOSI"/>
-<wire x1="254" y1="58.42" x2="259.08" y2="58.42" width="0.1524" layer="91"/>
-<label x="254" y="58.42" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="246.38" y1="58.42" x2="256.54" y2="58.42" width="0.1524" layer="91"/>
+<label x="246.38" y="58.42" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="D-" class="0">
 <segment>
 <pinref part="J2" 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.016" layer="95" rot="R180" xref="yes"/>
+<label x="248.92" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="182.88" y="134.62" size="1.016" layer="95" xref="yes"/>
-<wire x1="152.4" y1="134.62" x2="182.88" y2="134.62" width="0.1524" layer="91"/>
-<pinref part="U$8" gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11"/>
+<label x="154.94" y="134.62" size="1.27" layer="95" xref="yes"/>
+<wire x1="152.4" y1="134.62" x2="154.94" y2="134.62" width="0.1524" layer="91"/>
+<pinref part="U1" gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11"/>
 </segment>
 <segment>
 <pinref part="J1" gate="J" pin="\RST"/>
-<wire x1="254" y1="55.88" x2="259.08" y2="55.88" width="0.1524" layer="91"/>
-<label x="254" y="55.88" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="246.38" y1="55.88" x2="256.54" y2="55.88" width="0.1524" layer="91"/>
+<label x="246.38" y="55.88" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="VUSB" class="0">
@@ -4511,20 +4513,20 @@ Standard 0603 ceramic capacitor, and 0.1
 </segment>
 <segment>
 <pinref part="J1" gate="J" pin="VCC"/>
-<wire x1="259.08" y1="68.58" x2="254" y2="68.58" width="0.1524" layer="91"/>
-<label x="254" y="68.58" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="256.54" y1="68.58" x2="246.38" y2="68.58" width="0.1524" layer="91"/>
+<label x="246.38" y="68.58" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SSR+" class="0">
 <segment>
 <pinref part="JP3" gate="G$1" pin="1"/>
-<wire x1="254" y1="114.3" x2="228.6" y2="114.3" width="0.1524" layer="91"/>
-<label x="228.6" y="114.3" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="114.3" x2="246.38" y2="114.3" width="0.1524" layer="91"/>
+<label x="246.38" y="114.3" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="60.96" y="147.32" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="60.96" y1="147.32" x2="66.04" y2="147.32" width="0.1524" layer="91"/>
-<pinref part="U$8" gate="G$1" pin="PA1/ADC1"/>
+<label x="63.5" y="147.32" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="63.5" y1="147.32" x2="66.04" y2="147.32" width="0.1524" layer="91"/>
+<pinref part="U1" gate="G$1" pin="PA1/ADC1"/>
 </segment>
 </net>
 <net name="N$23" class="0">
@@ -4541,40 +4543,40 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="27.94" y="66.04" size="1.27" layer="95" rot="R90" xref="yes"/>
 </segment>
 <segment>
-<wire x1="154.94" y1="162.56" x2="152.4" y2="162.56" width="0.1524" layer="91"/>
-<label x="154.94" y="162.56" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="BOOT0/I2C1_SCL/CAN_RX/PB8"/>
+<wire x1="63.5" y1="160.02" x2="66.04" y2="160.02" width="0.1524" layer="91"/>
+<label x="63.5" y="160.02" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="PF0/I2C1_SDA"/>
 </segment>
 </net>
 <net name="!RES" class="0">
 <segment>
 <wire x1="73.66" y1="50.8" x2="76.2" y2="50.8" width="0.1524" layer="91"/>
-<label x="73.66" y="50.8" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="50.8" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="RES#"/>
 </segment>
 <segment>
-<label x="58.42" y="142.24" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="58.42" y1="142.24" x2="66.04" y2="142.24" width="0.1524" layer="91"/>
-<pinref part="U$8" gate="G$1" pin="PA3/ADC3/USART2_RX"/>
+<label x="63.5" y="142.24" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="63.5" y1="142.24" x2="66.04" y2="142.24" width="0.1524" layer="91"/>
+<pinref part="U1" gate="G$1" pin="PA3/ADC3/USART2_RX"/>
 </segment>
 </net>
 <net name="D/!C" class="0">
 <segment>
 <wire x1="73.66" y1="48.26" x2="76.2" y2="48.26" width="0.1524" layer="91"/>
-<label x="73.66" y="48.26" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="48.26" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="D/C#"/>
 </segment>
 <segment>
-<label x="58.42" y="139.7" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="58.42" y1="139.7" x2="66.04" y2="139.7" width="0.1524" layer="91"/>
-<pinref part="U$8" gate="G$1" pin="PA4/ADC4"/>
+<label x="63.5" y="139.7" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="63.5" y1="139.7" x2="66.04" y2="139.7" width="0.1524" layer="91"/>
+<pinref part="U1" gate="G$1" pin="PA4/ADC4"/>
 </segment>
 </net>
 <net name="T-" class="0">
 <segment>
 <pinref part="JP4" gate="G$1" pin="2"/>
-<wire x1="254" y1="96.52" x2="228.6" y2="96.52" width="0.1524" layer="91"/>
-<label x="228.6" y="96.52" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="96.52" x2="246.38" y2="96.52" width="0.1524" layer="91"/>
+<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"/>
@@ -4591,8 +4593,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <net name="T+" class="0">
 <segment>
 <pinref part="JP4" gate="G$1" pin="1"/>
-<wire x1="254" y1="99.06" x2="228.6" y2="99.06" width="0.1524" layer="91"/>
-<label x="228.6" y="99.06" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="99.06" x2="246.38" y2="99.06" width="0.1524" layer="91"/>
+<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"/>
@@ -4610,125 +4612,125 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="SW1" gate="SW" pin="CENTER"/>
 <wire x1="139.7" y1="30.48" x2="129.54" y2="30.48" width="0.1524" layer="91"/>
-<label x="129.54" y="30.48" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="129.54" y="30.48" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="152.4" y1="149.86" x2="154.94" y2="149.86" width="0.1524" layer="91"/>
-<label x="154.94" y="149.86" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="SPI1_MISO/PB4"/>
+<label x="154.94" y="149.86" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="SPI1_MISO/PB4"/>
 </segment>
 </net>
 <net name="SPI_MOSI" class="0">
 <segment>
 <wire x1="73.66" y1="43.18" x2="76.2" y2="43.18" width="0.1524" layer="91"/>
-<label x="73.66" y="43.18" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="SDIN"/>
 </segment>
 <segment>
-<wire x1="66.04" y1="132.08" x2="55.88" y2="132.08" width="0.1524" layer="91"/>
-<label x="55.88" y="132.08" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="PA7/ADC7/SPI1_MOSI"/>
+<wire x1="66.04" y1="132.08" x2="63.5" y2="132.08" width="0.1524" layer="91"/>
+<label x="63.5" y="132.08" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="PA7/ADC7/SPI1_MOSI"/>
 </segment>
 </net>
 <net name="SPI_MISO" class="0">
 <segment>
 <pinref part="U3" 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.016" layer="95" rot="R180" xref="yes"/>
+<label x="187.96" y="160.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="66.04" y1="134.62" x2="55.88" y2="134.62" width="0.1524" layer="91"/>
-<label x="55.88" y="134.62" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="PA6/ADC6/SPI1_MISO"/>
+<wire x1="66.04" y1="134.62" x2="63.5" y2="134.62" width="0.1524" layer="91"/>
+<label x="63.5" y="134.62" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="PA6/ADC6/SPI1_MISO"/>
 </segment>
 </net>
 <net name="SPI_SCK" class="0">
 <segment>
 <wire x1="73.66" y1="45.72" x2="76.2" y2="45.72" width="0.1524" layer="91"/>
-<label x="73.66" y="45.72" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="45.72" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="SCLK"/>
 </segment>
 <segment>
 <pinref part="U3" 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.016" layer="95" rot="R180" xref="yes"/>
+<label x="187.96" y="165.1" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="66.04" y1="137.16" x2="55.88" y2="137.16" width="0.1524" layer="91"/>
-<label x="55.88" y="137.16" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="PA5/ADC5/SPI1_SCK"/>
+<wire x1="66.04" y1="137.16" x2="63.5" y2="137.16" width="0.1524" layer="91"/>
+<label x="63.5" y="137.16" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="PA5/ADC5/SPI1_SCK"/>
 </segment>
 </net>
 <net name="!CS_OLED" class="0">
 <segment>
 <wire x1="73.66" y1="53.34" x2="76.2" y2="53.34" width="0.1524" layer="91"/>
-<label x="73.66" y="53.34" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="73.66" y="53.34" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="CS#"/>
 </segment>
 <segment>
-<wire x1="66.04" y1="144.78" x2="55.88" y2="144.78" width="0.1524" layer="91"/>
-<label x="55.88" y="144.78" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="PA2/ADC2/USART2_TX"/>
+<wire x1="66.04" y1="144.78" x2="63.5" y2="144.78" width="0.1524" layer="91"/>
+<label x="63.5" y="144.78" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="PA2/ADC2/USART2_TX"/>
 </segment>
 </net>
 <net name="!CS_MAX" class="0">
 <segment>
 <pinref part="U3" 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.016" layer="95" rot="R180" xref="yes"/>
+<label x="187.96" y="162.56" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="152.4" y1="144.78" x2="162.56" y2="144.78" width="0.1524" layer="91"/>
-<label x="162.56" y="144.78" size="1.27" layer="95" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="USART2_RX/PA15"/>
+<wire x1="152.4" y1="144.78" x2="154.94" y2="144.78" width="0.1524" layer="91"/>
+<label x="154.94" y="144.78" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="USART2_RX/PA15"/>
 </segment>
 </net>
 <net name="AUX-TX" class="0">
 <segment>
-<wire x1="152.4" y1="129.54" x2="190.5" y2="129.54" width="0.1524" layer="91"/>
-<label x="190.5" y="129.54" size="1.27" layer="95" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="USART1_TX/I2C1_SCL/PA9"/>
+<wire x1="152.4" y1="129.54" x2="154.94" y2="129.54" width="0.1524" layer="91"/>
+<label x="154.94" y="129.54" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="USART1_TX/I2C1_SCL/PA9"/>
 </segment>
 <segment>
 <pinref part="JP1" gate="G$1" pin="2"/>
-<wire x1="248.92" y1="81.28" x2="254" y2="81.28" width="0.1524" layer="91"/>
-<label x="248.92" y="81.28" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="246.38" y1="81.28" x2="254" y2="81.28" width="0.1524" layer="91"/>
+<label x="246.38" y="81.28" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="AUX-RX" class="0">
 <segment>
-<wire x1="152.4" y1="132.08" x2="190.5" y2="132.08" width="0.1524" layer="91"/>
-<label x="190.5" y="132.08" size="1.27" layer="95" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="USART1_RX/I2C1_SDA/PA10"/>
+<wire x1="152.4" y1="132.08" x2="154.94" y2="132.08" width="0.1524" layer="91"/>
+<label x="154.94" y="132.08" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="USART1_RX/I2C1_SDA/PA10"/>
 </segment>
 <segment>
 <pinref part="JP1" gate="G$1" pin="1"/>
-<wire x1="248.92" y1="83.82" x2="254" y2="83.82" width="0.1524" layer="91"/>
-<label x="248.92" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="246.38" y1="83.82" x2="254" y2="83.82" width="0.1524" layer="91"/>
+<label x="246.38" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SWCLK" class="0">
 <segment>
 <pinref part="J1" gate="J" pin="SCK"/>
-<wire x1="254" y1="63.5" x2="259.08" y2="63.5" width="0.1524" layer="91"/>
-<label x="254" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="246.38" y1="63.5" x2="256.54" y2="63.5" width="0.1524" layer="91"/>
+<label x="246.38" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="172.72" y1="142.24" x2="152.4" y2="142.24" width="0.1524" layer="91"/>
-<label x="172.72" y="142.24" size="1.27" layer="95" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
+<wire x1="154.94" y1="142.24" x2="152.4" y2="142.24" width="0.1524" layer="91"/>
+<label x="154.94" y="142.24" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
 </segment>
 </net>
 <net name="SWDIO" class="0">
 <segment>
 <pinref part="J1" gate="J" pin="MISO"/>
-<wire x1="254" y1="60.96" x2="259.08" y2="60.96" width="0.1524" layer="91"/>
-<label x="254" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="246.38" y1="60.96" x2="256.54" y2="60.96" width="0.1524" layer="91"/>
+<label x="246.38" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="172.72" y1="139.7" x2="152.4" y2="139.7" width="0.1524" layer="91"/>
-<label x="172.72" y="139.7" size="1.27" layer="95" xref="yes"/>
-<pinref part="U$8" gate="G$1" pin="SWDIO/PA13"/>
+<wire x1="154.94" y1="139.7" x2="152.4" y2="139.7" width="0.1524" layer="91"/>
+<label x="154.94" y="139.7" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="SWDIO/PA13"/>
 </segment>
 </net>
 </nets>