diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -29,9 +29,9 @@
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
@@ -199,9 +199,9 @@
 <dimension x1="1.27" y1="0" x2="45.72" y2="19.05" x3="-8.89" y3="9.525" textsize="1.27" layer="209" dtype="vertical" unit="inch"/>
 <dimension x1="45.72" y1="3.81" x2="45.72" y2="15.24" x3="-5.715" y3="9.525" textsize="1.27" layer="209" dtype="vertical" unit="inch"/>
 <dimension x1="0" y1="19.685" x2="45.085" y2="19.685" x3="22.5425" y3="-5.08" textsize="1.27" layer="209" dtype="horizontal" unit="inch"/>
-<text x="13.096875" y="9.36625" size="0.8128" layer="22" ratio="16" rot="MR180">rx</text>
-<text x="10.95375" y="9.36625" size="0.8128" layer="22" ratio="16" rot="MR180">tx</text>
-<text x="12.22375" y="3.96875" size="0.8128" layer="21" ratio="16" rot="R90">uart</text>
+<text x="16.66875" y="9.2075" size="0.8128" layer="22" ratio="16" rot="MR180">rx</text>
+<text x="14.366875" y="9.2075" size="0.8128" layer="22" ratio="16" rot="MR180">tx</text>
+<text x="16.589375" y="4.1275" size="0.8128" layer="21" ratio="16" rot="R90">uart</text>
 <text x="0.396875" y="6.270625" size="0.8128" layer="22" ratio="16" rot="SMR90">Zonca 2014</text>
 <circle x="29.36875" y="11.90625" radius="0.127" width="0.2032" layer="21"/>
 <circle x="31.75" y="14.605" radius="0.127" width="0.2032" layer="21"/>
@@ -243,6 +243,7 @@
 <hole x="0.9525" y="15.24" drill="0.381"/>
 <hole x="0.3175" y="15.24" drill="0.381"/>
 <hole x="2.2225" y="15.24" drill="0.381"/>
+<circle x="14.12875" y="14.44625" radius="0.127" width="0.2032" layer="21"/>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -2282,6 +2283,22 @@ chip</description>
 <rectangle x1="-0.1999" y1="-0.3" x2="0.1999" y2="0.3" layer="35"/>
 <rectangle x1="-0.2032" y1="-0.3556" x2="0.2032" y2="0.3556" layer="21"/>
 </package>
+<package name="0603-CAP">
+<wire x1="-1.473" y1="0.983" x2="1.473" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="1.473" y1="0.983" x2="1.473" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="1.473" y1="-0.983" x2="-1.473" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="-1.473" y1="-0.983" x2="-1.473" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="-0.356" y1="0.432" x2="0.356" y2="0.432" width="0.1016" layer="51"/>
+<wire x1="-0.356" y1="-0.419" x2="0.356" y2="-0.419" width="0.1016" layer="51"/>
+<wire x1="0" y1="0.0305" x2="0" y2="-0.0305" width="0.5588" layer="21"/>
+<smd name="1" x="-0.85" y="0" dx="1.1" dy="1" layer="1"/>
+<smd name="2" x="0.85" y="0" dx="1.1" dy="1" layer="1"/>
+<text x="-0.889" y="0.762" size="0.4064" layer="25" font="vector">&gt;NAME</text>
+<text x="-1.016" y="-1.143" size="0.4064" layer="27" font="vector">&gt;VALUE</text>
+<rectangle x1="-0.8382" y1="-0.4699" x2="-0.3381" y2="0.4801" layer="51"/>
+<rectangle x1="0.3302" y1="-0.4699" x2="0.8303" y2="0.4801" layer="51"/>
+<rectangle x1="-0.1999" y1="-0.3" x2="0.1999" y2="0.3" layer="35"/>
+</package>
 <package name="0402-CAP">
 <description>&lt;b&gt;CAPACITOR&lt;/b&gt;&lt;p&gt;
 chip</description>
@@ -2311,7 +2328,7 @@ chip</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="Elecrow_2-layer_eagle_rule">
+<designrules name="Elecrow_2-layer_eagle_rule *">
 <description language="de">&lt;b&gt;EAGLE Design Rules&lt;/b&gt;
 &lt;p&gt;
 Die Standard-Design-Rules sind so gewählt, dass sie für 
@@ -2390,7 +2407,7 @@ design rules under a new name.</descript
 <param name="dpMaxLengthDifference" value="10mm"/>
 <param name="dpGapFactor" value="2.5"/>
 <param name="checkGrid" value="0"/>
-<param name="checkAngle" value="0"/>
+<param name="checkAngle" value="1"/>
 <param name="checkFont" value="1"/>
 <param name="checkRestrict" value="0"/>
 <param name="useDiameter" value="13"/>
@@ -2501,7 +2518,7 @@ design rules under a new name.</descript
 <element name="U3" 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="AP2202K-3.3TRG1" x="21.59" y="9.2075" smashed="yes" rot="R180">
+<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2210K-3.3" x="21.59" y="9.2075" smashed="yes" rot="R180">
 <attribute name="PROD_ID" value="VREG-00822" x="-13.97" y="42.2275" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="NAME" x="20.066" y="7.20725" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="22.5425" y="9.398" size="0.4064" layer="27" rot="R180"/>
@@ -2517,9 +2534,9 @@ design rules under a new name.</descript
 <attribute name="NAME" x="35.537775" y="14.290675" size="0.8128" layer="25" ratio="16"/>
 <attribute name="VALUE" x="32.3342" y="13.6144" size="0.4064" layer="27"/>
 </element>
-<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.43125" y="12.3825" smashed="yes" rot="R180">
-<attribute name="NAME" x="23.08225" y="12.557125" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="22.51075" y="13.5255" size="0.4064" layer="27" rot="R180"/>
+<element name="C5" library="SparkFun-Passives" package="0603-CAP" value="4.7uF" x="21.669375" y="12.144375" smashed="yes" rot="R180">
+<attribute name="NAME" x="23.320375" y="12.319" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="22.748875" y="13.287375" size="0.4064" layer="27" rot="R180"/>
 </element>
 <element name="C7" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="6.35" smashed="yes">
 <attribute name="NAME" x="22.240875" y="4.270375" size="0.8128" layer="25" ratio="16" rot="R90"/>
@@ -2533,23 +2550,23 @@ design rules under a new name.</descript
 <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>
-<element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="SSD1306-SPI" x="0.635" y="9.36625" smashed="yes" rot="R180">
-<attribute name="VALUE" x="30.635" y="16.86625" size="0.4064" layer="27" ratio="10" rot="R180"/>
+<element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="SSD1306-SPI" x="0.635" y="9.525" smashed="yes" rot="R180">
+<attribute name="VALUE" x="30.635" y="17.025" size="0.4064" layer="27" ratio="10" rot="R180"/>
 </element>
 <element name="U$3" library="Protofusion" package="THERM_LOGO_0.2" value="" x="44.529375" y="5.715" rot="MR0"/>
 <element name="C2" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="5.715" y="13.573125" smashed="yes" rot="R180">
 <attribute name="NAME" x="5.381625" y="12.874625" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="6.7945" y="14.716125" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C1" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="19.129375" y="12.3825" smashed="yes">
-<attribute name="NAME" x="18.669" y="10.541" size="0.8128" layer="25" ratio="16" rot="R90"/>
-<attribute name="VALUE" x="18.049875" y="11.2395" size="0.4064" layer="27"/>
+<element name="C1" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="18.653125" y="12.22375" smashed="yes">
+<attribute name="NAME" x="18.19275" y="10.38225" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="17.573625" y="11.08075" size="0.4064" layer="27"/>
 </element>
 <element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="4.60375" y="5.08" smashed="yes" rot="R180">
 <attribute name="NAME" x="2.524125" y="5.81025" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="5.68325" y="6.223" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="RA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="9.525" smashed="yes" rot="R270">
+<element name="CA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="9.525" smashed="yes" rot="R270">
 <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>
@@ -2560,7 +2577,7 @@ design rules under a new name.</descript
 <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="U$8" library="Protofusion" package="LQFP32" value="STM32F042K-T" x="10.63625" y="9.525" smashed="yes" rot="R270"/>
+<element name="U1" library="Protofusion" package="LQFP32" value="STM32F042K-T" x="10.63625" y="9.525" smashed="yes" rot="R270"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -2581,36 +2598,32 @@ design rules under a new name.</descript
 <vertex x="45.085" y="15.24"/>
 <vertex x="0" y="15.24"/>
 </polygon>
-<via x="22.86" y="12.3825" extent="1-16" drill="0.3048"/>
-<wire x1="22.08125" y1="12.3825" x2="22.86" y2="12.3825" width="0.2032" layer="1"/>
+<via x="24.13" y="12.3825" extent="1-16" drill="0.3048"/>
 <via x="23.574375" y="7.3025" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="6"/>
 <contactref element="C1" pad="2"/>
 <contactref element="C2" pad="2"/>
 <contactref element="C6" pad="2"/>
 <via x="39.84625" y="11.7475" extent="1-16" drill="0.3048"/>
-<contactref element="RA1" pad="C1A"/>
-<contactref element="RA1" pad="C2A"/>
-<contactref element="RA1" pad="C3A"/>
-<contactref element="RA1" pad="C4A"/>
+<contactref element="CA1" pad="C1A"/>
+<contactref element="CA1" pad="C2A"/>
+<contactref element="CA1" pad="C3A"/>
+<contactref element="CA1" pad="C4A"/>
 <wire x1="0.8125" y1="10.725" x2="0.8125" y2="9.925" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="9.925" x2="0.8125" y2="9.125" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="9.125" x2="0.8125" y2="8.325" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="9.925" x2="0.8125" y2="8.325" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="10.66625" x2="5.08" y2="10.66625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="10.825" x2="5.159375" y2="10.825" width="0.2032" layer="16"/>
 <via x="36.195" y="10.63625" extent="1-16" drill="0.3048"/>
 <wire x1="37.276128125" y1="11.876128125" x2="37.276128125" y2="11.717378125" width="0.2032" layer="1"/>
 <wire x1="37.276128125" y1="11.717378125" x2="36.195" y2="10.63625" width="0.2032" layer="1"/>
 <via x="41.43375" y="13.890625" extent="1-16" drill="0.3048"/>
-<via x="4.841875" y="14.605" extent="1-16" drill="0.3048"/>
+<via x="5.08" y="14.605" extent="1-16" drill="0.3048"/>
 <wire x1="40.247" y1="14.2875" x2="41.036875" y2="14.2875" width="0.2032" layer="1"/>
 <wire x1="41.036875" y1="14.2875" x2="41.43375" y2="13.890625" width="0.2032" layer="1"/>
 <contactref element="J1" pad="2"/>
 <wire x1="43.97375" y1="13.49375" x2="43.84625" y2="13.49375" width="0.2032" layer="1"/>
 <wire x1="43.84625" y1="13.49375" x2="43.815" y2="13.525" width="0.2032" layer="1"/>
-<wire x1="19.779375" y1="12.3825" x2="19.779375" y2="13.675225" width="0.2032" layer="1"/>
-<wire x1="19.779375" y1="13.675225" x2="19.4846" y2="13.97" width="0.2032" layer="1"/>
-<wire x1="19.4846" y1="13.97" x2="18.415" y2="13.97" width="0.2032" layer="1"/>
 <via x="42.38625" y="5.635625" extent="1-16" drill="0.3048"/>
 <via x="44.370625" y="13.97" extent="1-16" drill="0.3048"/>
 <wire x1="43.97375" y1="13.49375" x2="43.97375" y2="13.573125" width="0.2032" layer="1"/>
@@ -2626,109 +2639,120 @@ design rules under a new name.</descript
 <via x="29.36875" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="29.36875" y1="10.706875" x2="29.36875" y2="9.36625" width="0.2032" layer="1"/>
 <wire x1="29.36875" y1="9.36625" x2="29.36875" y2="8.651875" width="0.2032" layer="1"/>
-<wire x1="21.59" y1="10.5076" x2="21.59" y2="11.27125" width="0.2032" layer="1"/>
-<wire x1="21.59" y1="11.27125" x2="22.06625" y2="11.7475" width="0.2032" layer="1"/>
-<wire x1="22.06625" y1="11.7475" x2="22.06625" y2="12.3675" width="0.2032" layer="1"/>
-<wire x1="22.06625" y1="12.3675" x2="22.08125" y2="12.3825" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="8.325" x2="0.8125" y2="7.11" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="7.11" x2="0.9375" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="7.12875" x2="0.873125" y2="7.049375" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="7.049375" x2="0.9375" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="42.38625" y1="5.635625" x2="43.704375" y2="5.635625" width="0.2032" layer="1"/>
 <wire x1="43.704375" y1="5.635625" x2="43.815" y2="5.525" width="0.2032" layer="1"/>
-<contactref element="U$8" pad="16"/>
-<contactref element="U$8" pad="32"/>
+<contactref element="U1" pad="16"/>
+<contactref element="U1" pad="32"/>
 <wire x1="14.73625" y1="12.325" x2="13.43625" y2="12.325" width="0.2032" layer="1"/>
-<wire x1="13.43625" y1="12.325" x2="13.17625" y2="12.065" width="0.2032" layer="1"/>
-<via x="13.17625" y="12.065" extent="1-16" drill="0.3048"/>
-<wire x1="13.17625" y1="12.065" x2="12.54125" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="13.43625" y1="12.325" x2="13.414375" y2="12.303125" width="0.2032" layer="1"/>
+<via x="13.414375" y="12.303125" extent="1-16" drill="0.3048"/>
 <via x="2.38125" y="5.08" extent="1-16" drill="0.3048"/>
 <wire x1="3.95375" y1="5.08" x2="2.38125" y2="5.08" width="0.2032" layer="1"/>
 <wire x1="6.53625" y1="6.725" x2="4.97875" y2="6.725" width="0.2032" layer="1"/>
 <wire x1="4.97875" y1="6.725" x2="4.048125" y2="5.794375" width="0.2032" layer="1"/>
 <wire x1="4.048125" y1="5.794375" x2="4.048125" y2="5.174375" width="0.2032" layer="1"/>
 <wire x1="4.048125" y1="5.174375" x2="3.95375" y2="5.08" width="0.2032" layer="1"/>
-<wire x1="5.065" y1="13.573125" x2="5.065" y2="14.381875" width="0.2032" layer="1"/>
-<wire x1="5.065" y1="14.381875" x2="4.841875" y2="14.605" width="0.2032" layer="1"/>
 <wire x1="22.24" y1="6.35" x2="22.621875" y2="6.35" width="0.2032" layer="1"/>
 <wire x1="22.621875" y1="6.35" x2="23.574375" y2="7.3025" width="0.2032" layer="1"/>
-<wire x1="24.685625" y1="4.683125" x2="24.526875" y2="5.000625" width="0.2032" layer="16"/>
+<wire x1="24.685625" y1="4.683125" x2="24.685625" y2="4.92125" width="0.2032" layer="16"/>
 <wire x1="41.165" y1="10.825" x2="40.054375" y2="10.825" width="0.2032" layer="1"/>
 <wire x1="40.054375" y1="10.825" x2="39.84625" y2="11.033125" width="0.2032" layer="1"/>
 <wire x1="39.84625" y1="11.033125" x2="39.84625" y2="11.7475" width="0.2032" layer="1"/>
+<wire x1="5.065" y1="13.573125" x2="5.08" y2="13.588125" width="0.2032" layer="1"/>
+<wire x1="5.08" y1="13.588125" x2="5.08" y2="14.605" width="0.2032" layer="1"/>
+<contactref element="U1" pad="31"/>
+<wire x1="14.73625" y1="11.525" x2="15.81125" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="15.81125" y1="11.525" x2="16.03375" y2="11.7475" width="0.2032" layer="1"/>
+<wire x1="16.03375" y1="11.7475" x2="16.03375" y2="12.065" width="0.2032" layer="1"/>
+<wire x1="16.03375" y1="12.065" x2="15.795625" y2="12.303125" width="0.2032" layer="1"/>
+<wire x1="15.795625" y1="12.303125" x2="14.758125" y2="12.303125" width="0.2032" layer="1"/>
+<wire x1="14.758125" y1="12.303125" x2="14.73625" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="19.303125" y1="12.22375" x2="19.303125" y2="13.081875" width="0.2032" layer="1"/>
+<wire x1="19.303125" y1="13.081875" x2="18.415" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="21.59" y1="10.5076" x2="21.59" y2="11.215" width="0.2032" layer="1"/>
+<wire x1="21.59" y1="11.215" x2="22.519375" y2="12.144375" width="0.2032" layer="1"/>
+<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"/>
 </signal>
 <signal name="N$1">
 <via x="3.175" y="13.6525" extent="1-16" drill="0.3048"/>
-<wire x1="3.175" y1="13.6525" x2="3.56125" y2="13.26625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="2"/>
-<wire x1="3.56125" y1="13.26625" x2="8.335" y2="13.26625" width="0.2032" layer="16"/>
 <contactref element="C9" 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"/>
+<wire x1="8.335" y1="13.425" x2="4.51375" y2="13.425" width="0.2032" layer="16"/>
+<wire x1="4.51375" y1="13.425" x2="4.434375" y2="13.345625" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$2">
-<via x="4.1275" y="13.890625" extent="1-16" drill="0.3048"/>
+<via x="3.96875" y="13.97" extent="1-16" drill="0.3048"/>
 <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"/>
 <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.571875" y2="14.44625" width="0.2032" layer="1"/>
-<wire x1="3.571875" y1="14.44625" x2="4.1275" y2="13.890625" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="13.91625" x2="4.153125" y2="13.91625" width="0.2032" layer="16"/>
-<wire x1="4.153125" y1="13.91625" x2="4.1275" y2="13.890625" width="0.2032" layer="16"/>
+<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"/>
+<wire x1="5.3975" y1="13.97" x2="5.5025" y2="14.075" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="14.075" x2="5.5025" y2="14.075" width="0.2032" layer="16"/>
+<wire x1="5.3975" y1="13.97" x2="3.96875" y2="13.97" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$3">
 <via x="3.175" y="12.065" extent="1-16" drill="0.3048"/>
-<wire x1="3.27375" y1="11.96625" x2="3.175" y2="12.065" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="4"/>
-<wire x1="3.27375" y1="11.96625" x2="8.335" y2="11.96625" width="0.2032" layer="16"/>
 <contactref element="C3" pad="2"/>
 <wire x1="2.2375" y1="12.065" x2="3.175" y2="12.065" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="12.125" x2="3.235" y2="12.125" width="0.2032" layer="16"/>
+<wire x1="3.235" y1="12.125" x2="3.175" y2="12.065" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$4">
 <via x="3.175" y="12.85875" extent="1-16" drill="0.3048"/>
-<wire x1="3.4175" y1="12.61625" x2="3.175" y2="12.85875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="3"/>
-<wire x1="3.4175" y1="12.61625" x2="8.335" y2="12.61625" width="0.2032" layer="16"/>
 <wire x1="3.175" y1="12.85875" x2="1.11125" y2="12.85875" width="0.2032" layer="1"/>
 <wire x1="1.11125" y1="12.85875" x2="0.9525" y2="12.7" width="0.2032" layer="1"/>
 <wire x1="0.9525" y1="12.7" x2="0.9525" y2="12.08" width="0.2032" layer="1"/>
 <contactref element="C3" pad="1"/>
 <wire x1="0.9375" y1="12.065" x2="0.9525" y2="12.08" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="12.775" x2="3.25875" y2="12.775" width="0.2032" layer="16"/>
+<wire x1="3.25875" y1="12.775" x2="3.175" y2="12.85875" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$8">
 <via x="3.96875" y="6.50875" extent="1-16" drill="0.3048"/>
-<wire x1="3.96875" y1="6.50875" x2="4.36125" y2="6.11625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="13"/>
-<wire x1="4.36125" y1="6.11625" x2="8.335" y2="6.11625" width="0.2032" layer="16"/>
 <wire x1="3.4925" y1="6.985" x2="3.96875" y2="6.50875" width="0.2032" layer="1"/>
 <contactref element="R3" 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"/>
 </signal>
 <signal name="N$9">
 <via x="3.4925" y="9.04875" extent="1-16" drill="0.3048"/>
 <wire x1="3.33375" y1="6.985" x2="3.33375" y2="6.22075625" width="0.2032" layer="16"/>
-<wire x1="3.33375" y1="6.22075625" x2="4.08825625" y2="5.46625" width="0.2032" layer="16"/>
-<wire x1="4.08825625" y1="5.46625" x2="8.335" y2="5.46625" width="0.2032" layer="16"/>
 <wire x1="3.33375" y1="6.985" x2="3.81" y2="7.46125" width="0.2032" layer="16"/>
 <wire x1="3.81" y1="7.46125" x2="3.81" y2="8.73125" width="0.2032" layer="16"/>
 <wire x1="3.81" y1="8.73125" x2="3.4925" y2="9.04875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="14"/>
-<contactref element="RA1" pad="C3B"/>
+<contactref element="CA1" pad="C3B"/>
 <wire x1="2.3625" y1="9.125" x2="3.41625" y2="9.125" width="0.2032" layer="1"/>
 <wire x1="3.41625" y1="9.125" x2="3.4925" y2="9.04875" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="5.625" x2="3.92950625" y2="5.625" width="0.2032" layer="16"/>
+<wire x1="3.92950625" y1="5.625" x2="3.33375" y2="6.22075625" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$15">
 <via x="3.175" y="7.77875" extent="1-16" drill="0.3048"/>
 <wire x1="2.8575" y1="7.46125" x2="2.8575" y2="6.022421875" width="0.2032" layer="16"/>
-<wire x1="2.8575" y1="6.022421875" x2="4.063671875" y2="4.81625" width="0.2032" layer="16"/>
-<wire x1="4.063671875" y1="4.81625" x2="8.335" y2="4.81625" width="0.2032" layer="16"/>
 <wire x1="2.8575" y1="7.46125" x2="3.175" y2="7.77875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="15"/>
-<contactref element="RA1" pad="C4B"/>
+<contactref element="CA1" pad="C4B"/>
 <wire x1="2.3625" y1="8.325" x2="3.105" y2="8.325" width="0.2032" layer="1"/>
 <wire x1="3.105" y1="8.325" x2="3.175" y2="8.255" width="0.2032" layer="1"/>
 <wire x1="3.175" y1="8.255" x2="3.175" y2="7.77875" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="4.975" x2="3.904921875" y2="4.975" width="0.2032" layer="16"/>
+<wire x1="3.904921875" y1="4.975" x2="2.8575" y2="6.022421875" width="0.2032" layer="16"/>
 </signal>
 <signal name="3.3V">
 <contactref element="U2" pad="5"/>
@@ -2740,28 +2764,19 @@ design rules under a new name.</descript
 <wire x1="22.5425" y1="8.969375" x2="20.558125" y2="8.969375" width="0.2032" layer="1"/>
 <contactref element="LCD1" pad="5"/>
 <contactref element="LCD1" pad="7"/>
-<wire x1="8.335" y1="10.01625" x2="7.55625" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="3.22" y1="11.31625" x2="8.335" y2="11.31625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="10.175" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
 <contactref element="C1" pad="1"/>
 <contactref element="C2" pad="1"/>
 <contactref element="C6" pad="1"/>
-<contactref element="RA1" pad="C1B"/>
-<contactref element="RA1" pad="C2B"/>
+<contactref element="CA1" pad="C1B"/>
+<contactref element="CA1" pad="C2B"/>
 <via x="3.33375" y="10.00125" extent="1-16" drill="0.3048"/>
-<wire x1="10.63625" y1="8.651875" x2="10.63625" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="7.55625" y1="10.00125" x2="10.63625" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="10.239375" y1="11.43" x2="10.239375" y2="12.461875" width="0.2032" layer="16"/>
 <wire x1="2.3625" y1="10.725" x2="2.62875" y2="10.725" width="0.2032" layer="1"/>
 <wire x1="2.62875" y1="10.725" x2="3.175" y2="11.27125" width="0.2032" layer="1"/>
-<wire x1="10.63625" y1="10.00125" x2="10.63625" y2="11.31625" width="0.2032" layer="16"/>
-<wire x1="8.335" y1="11.31625" x2="10.63625" y2="11.31625" width="0.2032" layer="16"/>
-<wire x1="18.494375" y1="12.3675" x2="18.479375" y2="12.3825" width="0.2032" layer="1"/>
-<wire x1="18.479375" y1="12.3825" x2="17.224375" y2="12.3825" width="0.2032" layer="1"/>
-<wire x1="17.224375" y1="12.3825" x2="16.748125" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="10.01625" x2="3.34875" y2="10.01625" width="0.2032" layer="16"/>
-<wire x1="3.34875" y1="10.01625" x2="3.33375" y2="10.00125" width="0.2032" layer="16"/>
+<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"/>
-<wire x1="3.22" y1="11.31625" x2="3.175" y2="11.27125" width="0.2032" layer="16"/>
 <contactref element="U3" pad="4"/>
 <wire x1="22.463125" y1="7.830525" x2="22.490725" y2="7.858125" width="0.2032" layer="1"/>
 <wire x1="23.97125" y1="10.095625" x2="23.97125" y2="10.63625" width="0.2032" layer="1"/>
@@ -2770,10 +2785,9 @@ design rules under a new name.</descript
 <wire x1="25.470625" y1="10.795" x2="25.55875" y2="10.706875" width="0.2032" layer="1"/>
 <wire x1="22.5425" y1="8.969375" x2="22.845" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="22.845" y1="8.969375" x2="23.97125" y2="10.095625" width="0.2032" layer="1"/>
-<contactref element="U$8" pad="1"/>
-<contactref element="U$8" pad="5"/>
-<contactref element="U$8" pad="17"/>
-<wire x1="16.748125" y1="12.85875" x2="13.731875" y2="12.85875" width="0.2032" layer="1"/>
+<contactref element="U1" pad="1"/>
+<contactref element="U1" pad="5"/>
+<contactref element="U1" pad="17"/>
 <via x="10.63625" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="13.43625" y1="13.625" x2="13.43625" y2="14.6625" width="0.2032" layer="1"/>
 <wire x1="13.43625" y1="14.6625" x2="13.255625" y2="14.843125" width="0.2032" layer="1"/>
@@ -2782,21 +2796,15 @@ design rules under a new name.</descript
 <via x="10.239375" y="12.461875" extent="1-16" drill="0.3048"/>
 <wire x1="10.239375" y1="12.461875" x2="10.239375" y2="13.621875" width="0.2032" layer="1"/>
 <wire x1="10.239375" y1="13.621875" x2="10.23625" y2="13.625" width="0.2032" layer="1"/>
-<wire x1="13.731875" y1="12.85875" x2="13.573125" y2="13.0175" width="0.2032" layer="1"/>
-<wire x1="13.573125" y1="13.0175" x2="13.573125" y2="13.488125" width="0.2032" layer="1"/>
-<wire x1="13.573125" y1="13.488125" x2="13.43625" y2="13.625" width="0.2032" layer="1"/>
-<wire x1="10.63625" y1="8.651875" x2="9.113153125" y2="8.651875" width="0.2032" layer="1"/>
-<wire x1="9.113153125" y1="8.651875" x2="7.858125" y2="7.396846875" width="0.2032" layer="1"/>
-<wire x1="7.858125" y1="7.396846875" x2="7.858125" y2="5.446875" width="0.2032" layer="1"/>
+<wire x1="10.63625" y1="8.651875" x2="10.00271875" y2="8.651875" width="0.2032" layer="1"/>
+<wire x1="10.00271875" y1="8.651875" x2="7.858125" y2="6.50728125" width="0.2032" layer="1"/>
+<wire x1="7.858125" y1="6.50728125" x2="7.858125" y2="5.446875" width="0.2032" layer="1"/>
 <wire x1="7.858125" y1="5.446875" x2="7.83625" y2="5.425" width="0.2032" layer="1"/>
-<wire x1="10.63625" y1="11.31625" x2="10.63625" y2="12.065" width="0.2032" layer="16"/>
-<wire x1="10.63625" y1="12.065" x2="10.239375" y2="12.461875" width="0.2032" layer="16"/>
 <wire x1="10.23625" y1="14.843125" x2="6.746875" y2="14.843125" width="0.2032" layer="1"/>
 <wire x1="20.94" y1="6.35" x2="20.94" y2="6.49375" width="0.2032" layer="1"/>
 <wire x1="20.94" y1="6.49375" x2="22.06625" y2="7.62" width="0.2032" layer="1"/>
 <wire x1="22.490725" y1="7.858125" x2="22.54" y2="7.9074" width="0.2032" layer="1"/>
-<wire x1="20.558125" y1="8.969375" x2="18.494375" y2="11.033125" width="0.2032" layer="1"/>
-<wire x1="18.494375" y1="11.033125" x2="18.494375" y2="12.3675" width="0.2032" layer="1"/>
+<wire x1="20.558125" y1="8.969375" x2="18.003125" y2="11.524375" width="0.2032" layer="1"/>
 <wire x1="7.83625" y1="5.425" x2="7.83625" y2="5.101875" width="0.2032" layer="1"/>
 <wire x1="7.83625" y1="5.101875" x2="7.858125" y2="5.08" width="0.2032" layer="1"/>
 <wire x1="7.858125" y1="5.08" x2="5.25375" y2="5.08" width="0.2032" layer="1"/>
@@ -2806,6 +2814,23 @@ design rules under a new name.</descript
 <wire x1="6.746875" y1="14.843125" x2="6.429375" y2="14.525625" width="0.2032" layer="1"/>
 <wire x1="6.429375" y1="14.525625" x2="6.429375" y2="13.6375" width="0.2032" layer="1"/>
 <wire x1="6.429375" y1="13.6375" x2="6.365" y2="13.573125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="11.475" x2="3.37875" y2="11.475" width="0.2032" layer="16"/>
+<wire x1="3.37875" y1="11.475" x2="3.175" y2="11.27125" width="0.2032" layer="16"/>
+<wire x1="3.33375" y1="10.00125" x2="3.4925" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="3.4925" y1="10.16" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="10.63625" y1="8.651875" x2="10.63625" y2="9.823240625" width="0.2032" layer="16"/>
+<wire x1="10.63625" y1="9.823240625" x2="10.299490625" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="10.299490625" y1="10.16" x2="10.239375" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="10.239375" y1="10.16" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="11.475" x2="8.38" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="8.38" y1="11.43" x2="10.239375" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="16.748125" y1="12.85875" x2="14.843125" y2="12.85875" width="0.2032" layer="1"/>
+<wire x1="14.843125" y1="12.85875" x2="14.049375" y2="13.6525" width="0.2032" layer="1"/>
+<wire x1="14.049375" y1="13.6525" x2="13.46375" y2="13.6525" width="0.2032" layer="1"/>
+<wire x1="13.46375" y1="13.6525" x2="13.43625" y2="13.625" width="0.2032" layer="1"/>
+<wire x1="10.239375" y1="11.43" x2="10.239375" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="18.003125" y1="12.22375" x2="17.383125" y2="12.22375" width="0.2032" layer="1"/>
+<wire x1="18.003125" y1="11.524375" x2="18.003125" y2="12.22375" width="0.2032" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="JP2" pad="P1"/>
@@ -2819,19 +2844,22 @@ design rules under a new name.</descript
 <wire x1="20.79625" y1="9.525" x2="20.6375" y2="9.68375" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="9.68375" x2="20.6375" y2="10.5101" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="10.5101" x2="20.64" y2="10.5076" width="0.2032" layer="1"/>
-<wire x1="20.78125" y1="12.3825" x2="20.78125" y2="13.47875" width="0.2032" layer="1"/>
-<wire x1="20.78125" y1="13.47875" x2="21.2725" y2="13.97" width="0.2032" layer="1"/>
 <via x="25.479375" y="12.779375" extent="1-16" drill="0.3048"/>
 <wire x1="32.42" y1="14.605" x2="31.115" y2="14.605" width="0.2032" layer="1"/>
 <via x="31.115" y="14.605" extent="1-16" drill="0.3048"/>
-<wire x1="20.64" y1="10.5076" x2="20.64" y2="12.24125" width="0.2032" layer="1"/>
-<wire x1="20.64" y1="12.24125" x2="20.78125" y2="12.3825" width="0.2032" layer="1"/>
 <wire x1="30.4551" y1="12.779375" x2="31.115" y2="13.439275" width="0.2032" layer="16"/>
 <wire x1="31.115" y1="13.439275" x2="31.115" y2="14.605" width="0.2032" layer="16"/>
 <wire x1="30.4551" y1="12.779375" x2="25.479375" y2="12.779375" width="0.2032" layer="16"/>
-<wire x1="22.54" y1="10.5076" x2="22.54" y2="11.26875" width="0.2032" layer="1"/>
-<wire x1="22.54" y1="11.26875" x2="24.050625" y2="12.779375" width="0.2032" layer="1"/>
-<wire x1="25.479375" y1="12.779375" x2="24.050625" y2="12.779375" width="0.2032" layer="1"/>
+<wire x1="20.64" y1="10.5076" x2="20.64" y2="11.965" width="0.2032" layer="1"/>
+<wire x1="20.64" y1="11.965" x2="20.819375" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="20.819375" y1="12.144375" x2="20.819375" y2="13.516875" width="0.2032" layer="1"/>
+<wire x1="20.819375" y1="13.516875" x2="21.2725" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="25.479375" y1="12.779375" x2="24.13" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="24.13" y1="11.43" x2="23.8125" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="23.8125" y1="11.43" x2="23.1775" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="10.5076" x2="22.54" y2="10.7925" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="10.7925" x2="22.5425" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="22.5425" y1="10.795" x2="23.1775" y2="10.795" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-A">
 <contactref element="SW1" pad="1"/>
@@ -2841,7 +2869,7 @@ design rules under a new name.</descript
 <wire x1="31.58391875" y1="8.16381875" x2="32.54375" y2="9.12365" width="0.2032" layer="1"/>
 <wire x1="32.54375" y1="9.12365" x2="32.54375" y2="9.128125" width="0.2032" layer="1"/>
 <wire x1="31.27375" y1="10.398125" x2="32.54375" y2="9.128125" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="28"/>
+<contactref element="U1" pad="28"/>
 <wire x1="14.73625" y1="9.125" x2="15.63375" y2="9.125" width="0.2032" layer="1"/>
 <wire x1="16.748125" y1="10.239375" x2="17.93875" y2="10.239375" width="0.2032" layer="1"/>
 <wire x1="19.3675" y1="10.398125" x2="19.20875" y2="10.239375" width="0.2032" layer="16"/>
@@ -2859,7 +2887,7 @@ design rules under a new name.</descript
 <wire x1="33.64766875" y1="6.18391875" x2="34.6075" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="30.32125" y1="9.604375" x2="32.781875" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="32.781875" y1="7.14375" x2="34.6075" y2="7.14375" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="26"/>
+<contactref element="U1" pad="26"/>
 <wire x1="14.73625" y1="7.525" x2="15.541875" y2="7.525" width="0.2032" layer="1"/>
 <wire x1="16.98625" y1="8.969375" x2="19.129375" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="15.541875" y1="7.525" x2="16.98625" y2="8.969375" width="0.2032" layer="1"/>
@@ -2868,17 +2896,17 @@ design rules under a new name.</descript
 <contactref element="SW1" pad="4"/>
 <via x="35.2425" y="11.826875" extent="1-16" drill="0.3048"/>
 <via x="16.906875" y="11.58875" extent="1-16" drill="0.3048"/>
-<wire x1="32.623125" y1="11.191875" x2="19.52625" y2="11.191875" width="0.2032" layer="16"/>
+<wire x1="32.54375" y1="11.191875" x2="19.52625" y2="11.191875" width="0.2032" layer="16"/>
 <wire x1="36.286178125" y1="12.866078125" x2="36.281703125" y2="12.866078125" width="0.2032" layer="1"/>
 <wire x1="36.281703125" y1="12.866078125" x2="35.2425" y2="11.826875" width="0.2032" layer="1"/>
-<wire x1="32.623125" y1="11.191875" x2="33.416875" y2="11.826875" width="0.2032" layer="16"/>
-<wire x1="33.416875" y1="11.826875" x2="35.2425" y2="11.826875" width="0.2032" layer="16"/>
+<wire x1="33.17875" y1="11.826875" x2="35.2425" y2="11.826875" width="0.2032" layer="16"/>
 <wire x1="19.52625" y1="11.191875" x2="19.129375" y2="11.58875" width="0.2032" layer="16"/>
 <wire x1="19.129375" y1="11.58875" x2="16.906875" y2="11.58875" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="30"/>
+<contactref element="U1" pad="30"/>
 <wire x1="16.906875" y1="11.58875" x2="16.51" y2="11.58875" width="0.2032" layer="1"/>
 <wire x1="16.51" y1="11.58875" x2="15.64625" y2="10.725" width="0.2032" layer="1"/>
 <wire x1="14.73625" y1="10.725" x2="15.64625" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="32.54375" y1="11.191875" x2="33.17875" y2="11.826875" width="0.2032" layer="16"/>
 </signal>
 <signal name="SW-D">
 <contactref element="SW1" pad="6"/>
@@ -2891,7 +2919,7 @@ design rules under a new name.</descript
 <wire x1="38.266078125" y1="10.881703125" x2="37.30625" y2="9.921875" width="0.2032" layer="1"/>
 <wire x1="31.4325" y1="10.795" x2="32.305625" y2="9.921875" width="0.2032" layer="16"/>
 <wire x1="32.305625" y1="9.921875" x2="37.30625" y2="9.921875" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="29"/>
+<contactref element="U1" pad="29"/>
 <wire x1="14.73625" y1="9.925" x2="15.64" y2="9.925" width="0.2032" layer="1"/>
 <wire x1="17.4625" y1="10.95375" x2="16.66875" y2="10.95375" width="0.2032" layer="1"/>
 <wire x1="16.66875" y1="10.95375" x2="15.64" y2="9.925" width="0.2032" layer="1"/>
@@ -2906,7 +2934,7 @@ design rules under a new name.</descript
 <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"/>
 <wire x1="38.4175" y1="8.175625" x2="38.4175" y2="8.55574375" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="22"/>
+<contactref element="U1" pad="22"/>
 <via x="11.826875" y="7.9375" extent="1-16" drill="0.3048"/>
 <wire x1="11.826875" y1="5.434375" x2="11.83625" y2="5.425" width="0.2032" layer="1"/>
 <wire x1="20.875625" y1="5.400625" x2="20.875625" y2="5.794375" width="0.2032" layer="16"/>
@@ -2934,24 +2962,26 @@ design rules under a new name.</descript
 <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"/>
 <wire x1="38.735" y1="7.9375" x2="39.0525" y2="7.9375" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="21"/>
-<wire x1="19.446875" y1="5.000625" x2="17.383125" y2="7.064375" width="0.2032" layer="16"/>
+<contactref element="U1" pad="21"/>
 <wire x1="11.191875" y1="7.064375" x2="11.033125" y2="7.223125" width="0.2032" layer="16"/>
 <via x="11.033125" y="7.223125" extent="1-16" drill="0.3048"/>
-<wire x1="11.03625" y1="5.425" x2="11.03625" y2="7.0675" width="0.2032" layer="1"/>
-<wire x1="11.03625" y1="7.0675" x2="11.033125" y2="7.223125" width="0.2032" layer="1"/>
-<wire x1="11.191875" y1="7.064375" x2="16.8275" y2="7.064375" width="0.2032" layer="16"/>
-<wire x1="16.8275" y1="7.064375" x2="17.383125" y2="7.064375" width="0.2032" layer="16"/>
+<wire x1="11.191875" y1="7.064375" x2="16.51" y2="7.064375" width="0.2032" layer="16"/>
+<wire x1="16.98625" y1="7.064375" x2="17.383125" y2="7.064375" width="0.2032" layer="16"/>
 <wire x1="36.83" y1="6.0325" x2="24.526875" y2="6.0325" width="0.2032" layer="16"/>
 <wire x1="24.526875" y1="6.0325" x2="24.28875" y2="6.270625" width="0.2032" layer="16"/>
 <wire x1="16.98625" y1="6.35" x2="18.57375" y2="6.35" width="0.2032" layer="1"/>
 <wire x1="18.57375" y1="6.35" x2="20.399375" y2="4.524375" width="0.2032" layer="1"/>
 <wire x1="20.399375" y1="4.524375" x2="22.5425" y2="4.524375" width="0.2032" layer="1"/>
-<wire x1="16.98625" y1="6.35" x2="16.98625" y2="6.905625" width="0.2032" layer="16"/>
-<wire x1="16.98625" y1="6.905625" x2="16.8275" y2="7.064375" width="0.2032" layer="16"/>
-<wire x1="19.605625" y1="4.683125" x2="19.446875" y2="5.000625" width="0.2032" layer="16"/>
+<wire x1="16.98625" y1="6.35" x2="16.98625" y2="7.064375" width="0.2032" layer="16"/>
 <wire x1="41.15" y1="8.89" x2="40.005" y2="8.89" width="0.2032" layer="1"/>
 <wire x1="40.005" y1="8.89" x2="39.0525" y2="7.9375" width="0.2032" layer="1"/>
+<wire x1="11.033125" y1="7.223125" x2="11.03625" y2="7.22" width="0.2032" layer="1"/>
+<wire x1="11.03625" y1="7.22" x2="11.03625" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="17.383125" y1="7.064375" x2="18.7325" y2="5.715" width="0.2032" layer="16"/>
+<wire x1="18.7325" y1="5.715" x2="19.3675" y2="5.715" width="0.2032" layer="16"/>
+<wire x1="19.3675" y1="5.715" x2="19.605625" y2="5.476875" width="0.2032" layer="16"/>
+<wire x1="19.605625" y1="5.476875" x2="19.605625" y2="4.683125" width="0.2032" layer="16"/>
+<wire x1="16.98625" y1="7.064375" x2="16.51" y2="7.064375" width="0.2032" layer="16"/>
 </signal>
 <signal name="VUSB">
 <contactref element="J2" pad="VBUS"/>
@@ -2974,14 +3004,14 @@ design rules under a new name.</descript
 </signal>
 <signal name="SSR+">
 <contactref element="JP3" pad="P1"/>
-<contactref element="U$8" pad="7"/>
+<contactref element="U1" pad="7"/>
 <wire x1="8.63625" y1="13.625" x2="8.63625" y2="12.41231875" width="0.2032" layer="1"/>
 <wire x1="8.63625" y1="12.41231875" x2="9.22169375" y2="11.826875" width="0.2032" layer="1"/>
 <wire x1="9.22169375" y1="11.826875" x2="11.668125" y2="11.826875" width="0.2032" layer="1"/>
-<via x="11.90625" y="12.065" extent="1-16" drill="0.3048"/>
-<wire x1="15.875" y1="13.97" x2="14.12875" y2="13.97" width="0.2032" layer="16"/>
-<wire x1="14.12875" y1="13.97" x2="11.90625" y2="12.065" width="0.2032" layer="16"/>
-<wire x1="11.668125" y1="11.826875" x2="11.90625" y2="12.065" width="0.2032" layer="1"/>
+<via x="11.985625" y="12.144375" extent="1-16" drill="0.3048"/>
+<wire x1="11.668125" y1="11.826875" x2="11.985625" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="11.985625" y1="12.144375" x2="13.81125" y2="13.97" width="0.2032" layer="16"/>
+<wire x1="13.81125" y1="13.97" x2="15.875" y2="13.97" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$23">
 <contactref element="LED1" pad="A"/>
@@ -2994,42 +3024,39 @@ design rules under a new name.</descript
 <wire x1="19.05" y1="12.22375" x2="19.685" y2="11.58875" width="0.2032" layer="16"/>
 <wire x1="19.685" y1="11.58875" x2="32.385" y2="11.58875" width="0.2032" layer="16"/>
 <via x="41.195625" y="12.85875" extent="1-16" drill="0.3048"/>
-<wire x1="19.05" y1="12.22375" x2="16.271875" y2="12.22375" width="0.2032" layer="16"/>
-<via x="16.271875" y="12.22375" extent="1-16" drill="0.3048"/>
+<wire x1="19.05" y1="12.22375" x2="14.76375" y2="12.22375" width="0.2032" layer="16"/>
 <wire x1="40.005" y1="13.0025" x2="40.02" y2="13.0175" width="0.2032" layer="1"/>
-<wire x1="41.195625" y1="12.85875" x2="33.9725" y2="12.85875" width="0.2032" layer="16"/>
-<wire x1="33.9725" y1="12.85875" x2="32.385" y2="11.58875" width="0.2032" layer="16"/>
+<wire x1="41.195625" y1="12.85875" x2="33.655" y2="12.85875" width="0.2032" layer="16"/>
 <wire x1="41.195625" y1="12.85875" x2="40.17875" y2="12.85875" width="0.2032" layer="1"/>
 <wire x1="40.17875" y1="12.85875" x2="40.02" y2="13.0175" width="0.2032" layer="1"/>
-<contactref element="U$8" pad="31"/>
-<wire x1="15.573125" y1="11.525" x2="16.271875" y2="12.22375" width="0.2032" layer="1"/>
-<wire x1="14.73625" y1="11.525" x2="15.573125" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="32.385" y1="11.58875" x2="33.655" y2="12.85875" width="0.2032" layer="16"/>
+<contactref element="U1" pad="2"/>
+<wire x1="14.76375" y1="12.22375" x2="13.97" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="13.97" y1="11.43" x2="13.335" y2="11.43" width="0.2032" layer="16"/>
+<via x="13.335" y="11.43" extent="1-16" drill="0.3048"/>
+<wire x1="12.63625" y1="13.625" x2="12.63625" y2="12.12875" width="0.2032" layer="1"/>
+<wire x1="12.63625" y1="12.12875" x2="13.335" y2="11.43" width="0.2032" layer="1"/>
 </signal>
 <signal name="!RES">
 <via x="4.206875" y="9.445625" extent="1-16" drill="0.3048"/>
-<wire x1="7.52625" y1="8.73125" x2="7.46125" y2="8.73125" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="9"/>
-<wire x1="8.335" y1="8.71625" x2="7.47625" y2="8.71625" width="0.2032" layer="16"/>
-<wire x1="7.47625" y1="8.71625" x2="7.46125" y2="8.73125" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="9"/>
-<wire x1="6.53625" y1="12.325" x2="4.47871875" y2="12.325" width="0.2032" layer="1"/>
-<wire x1="4.47871875" y1="12.325" x2="4.206875" y2="12.05315625" width="0.2032" layer="1"/>
-<wire x1="4.206875" y1="12.05315625" x2="4.206875" y2="9.445625" width="0.2032" layer="1"/>
-<wire x1="7.46125" y1="8.73125" x2="4.92125" y2="8.73125" width="0.2032" layer="16"/>
-<wire x1="4.92125" y1="8.73125" x2="4.206875" y2="9.445625" width="0.2032" layer="16"/>
+<contactref element="U1" pad="9"/>
+<wire x1="6.53625" y1="12.325" x2="5.457221875" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="5.457221875" y1="12.325" x2="4.206875" y2="11.074653125" width="0.2032" layer="1"/>
+<wire x1="4.206875" y1="11.074653125" x2="4.206875" y2="9.445625" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="8.875" x2="4.7775" y2="8.875" width="0.2032" layer="16"/>
+<wire x1="4.7775" y1="8.875" x2="4.206875" y2="9.445625" width="0.2032" layer="16"/>
 </signal>
 <signal name="D/!C">
-<via x="4.445" y="8.09625" extent="1-16" drill="0.3048"/>
-<wire x1="5.26875" y1="8.06625" x2="4.445" y2="8.09625" width="0.2032" layer="16"/>
+<via x="4.445" y="8.255" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="10"/>
-<wire x1="8.335" y1="8.06625" x2="5.26875" y2="8.06625" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="10"/>
-<wire x1="6.53625" y1="11.525" x2="5.20379375" y2="11.525" width="0.2032" layer="1"/>
-<wire x1="4.445" y1="8.09625" x2="4.7625" y2="8.41375" width="0.2032" layer="1"/>
-<wire x1="5.08" y1="11.40120625" x2="5.20379375" y2="11.525" width="0.2032" layer="1"/>
-<wire x1="4.7625" y1="8.41375" x2="4.7625" y2="9.2075" width="0.2032" layer="1"/>
-<wire x1="4.7625" y1="9.2075" x2="5.08" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="5.08" y1="9.525" x2="5.08" y2="11.40120625" width="0.2032" layer="1"/>
+<contactref element="U1" pad="10"/>
+<wire x1="4.92125" y1="8.73125" x2="4.92125" y2="10.894946875" width="0.2032" layer="1"/>
+<wire x1="4.92125" y1="10.894946875" x2="5.551303125" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="5.551303125" y1="11.525" x2="6.53625" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="4.445" y1="8.255" x2="4.92125" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="4.445" y1="8.255" x2="4.475" y2="8.225" width="0.2032" layer="16"/>
+<wire x1="4.475" y1="8.225" x2="8.335" y2="8.225" width="0.2032" layer="16"/>
 </signal>
 <signal name="T-">
 <contactref element="JP4" pad="P2"/>
@@ -3059,7 +3086,7 @@ design rules under a new name.</descript
 <wire x1="19.605625" y1="10.00125" x2="19.20875" y2="9.604375" width="0.2032" layer="16"/>
 <wire x1="19.20875" y1="9.604375" x2="18.57375" y2="9.604375" width="0.2032" layer="16"/>
 <via x="18.57375" y="9.604375" extent="1-16" drill="0.3048"/>
-<contactref element="U$8" pad="27"/>
+<contactref element="U1" pad="27"/>
 <wire x1="14.73625" y1="8.325" x2="15.6275" y2="8.325" width="0.2032" layer="1"/>
 <wire x1="16.906875" y1="9.604375" x2="18.57375" y2="9.604375" width="0.2032" layer="1"/>
 <wire x1="15.6275" y1="8.325" x2="16.906875" y2="9.604375" width="0.2032" layer="1"/>
@@ -3067,15 +3094,13 @@ design rules under a new name.</descript
 <signal name="SPI_MOSI">
 <via x="4.365625" y="7.223125" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="12"/>
-<wire x1="8.335" y1="6.76625" x2="4.8225" y2="6.76625" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="13"/>
-<wire x1="6.53625" y1="9.125" x2="5.318153125" y2="9.125" width="0.2032" layer="1"/>
-<wire x1="5.318153125" y1="9.125" x2="5.159375" y2="8.966221875" width="0.2032" layer="1"/>
-<wire x1="4.8225" y1="6.76625" x2="4.365625" y2="7.223125" width="0.2032" layer="16"/>
-<wire x1="5.159375" y1="8.966221875" x2="5.156221875" y2="8.966221875" width="0.2032" layer="1"/>
-<wire x1="5.156221875" y1="8.966221875" x2="5.159375" y2="8.175625" width="0.2032" layer="1"/>
-<wire x1="5.159375" y1="8.175625" x2="5.159375" y2="8.016875" width="0.2032" layer="1"/>
-<wire x1="5.159375" y1="8.016875" x2="4.365625" y2="7.223125" width="0.2032" layer="1"/>
+<contactref element="U1" pad="13"/>
+<wire x1="6.53625" y1="9.125" x2="5.556278125" y2="9.125" width="0.2032" layer="1"/>
+<wire x1="5.556278125" y1="9.125" x2="5.3975" y2="8.966221875" width="0.2032" layer="1"/>
+<wire x1="5.3975" y1="8.255" x2="4.365625" y2="7.223125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="6.925" x2="4.66375" y2="6.925" width="0.2032" layer="16"/>
+<wire x1="4.66375" y1="6.925" x2="4.365625" y2="7.223125" width="0.2032" layer="16"/>
+<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"/>
@@ -3085,14 +3110,15 @@ design rules under a new name.</descript
 <wire x1="25.796875" y1="8.810625" x2="26.590625" y2="8.016875" width="0.2032" layer="16"/>
 <wire x1="26.590625" y1="8.016875" x2="27.46375" y2="8.016875" width="0.2032" layer="16"/>
 <wire x1="27.46375" y1="8.016875" x2="28.09875" y2="8.651875" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="12"/>
-<via x="12.303125" y="10.080625" extent="1-16" drill="0.3048"/>
-<wire x1="6.53625" y1="9.925" x2="6.981875" y2="10.08375" width="0.2032" layer="1"/>
-<wire x1="6.981875" y1="10.08375" x2="12.303125" y2="10.080625" width="0.2032" layer="1"/>
-<wire x1="19.52625" y1="7.699375" x2="17.145" y2="10.080625" width="0.2032" layer="16"/>
-<wire x1="17.145" y1="10.080625" x2="12.303125" y2="10.080625" width="0.2032" layer="16"/>
+<contactref element="U1" pad="12"/>
+<via x="11.985625" y="10.16" extent="1-16" drill="0.3048"/>
+<wire x1="19.52625" y1="7.699375" x2="17.065625" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="17.065625" y1="10.16" x2="11.985625" y2="10.16" width="0.2032" layer="16"/>
 <wire x1="19.52625" y1="7.699375" x2="19.923125" y2="7.699375" width="0.2032" layer="16"/>
 <wire x1="19.923125" y1="7.699375" x2="21.034375" y2="8.810625" width="0.2032" layer="16"/>
+<wire x1="6.53625" y1="9.925" x2="9.29" y2="9.925" width="0.2032" layer="1"/>
+<wire x1="9.29" y1="9.925" x2="9.525" y2="10.16" width="0.2032" layer="1"/>
+<wire x1="9.525" y1="10.16" x2="11.985625" y2="10.16" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_SCK">
 <contactref element="LCD1" pad="11"/>
@@ -3100,34 +3126,34 @@ design rules under a new name.</descript
 <via x="25.479375" y="8.175625" extent="1-16" drill="0.3048"/>
 <wire x1="21.193125" 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"/>
-<wire x1="11.668125" y1="8.810625" x2="11.668125" y2="9.36625" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="11"/>
-<via x="11.668125" y="10.795" extent="1-16" drill="0.3048"/>
-<wire x1="11.668125" y1="9.36625" x2="11.668125" y2="10.795" width="0.2032" layer="16"/>
-<wire x1="6.53625" y1="10.725" x2="11.51875" y2="10.725" width="0.2032" layer="1"/>
-<wire x1="11.51875" y1="10.725" x2="11.668125" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="11.350625" y1="8.493125" x2="11.350625" y2="9.36625" width="0.2032" layer="16"/>
+<contactref element="U1" pad="11"/>
+<via x="10.95375" y="10.795" extent="1-16" drill="0.3048"/>
+<wire x1="11.350625" y1="9.36625" x2="11.350625" y2="10.398125" width="0.2032" layer="16"/>
+<wire x1="11.350625" y1="10.398125" x2="10.95375" y2="10.795" width="0.2032" layer="16"/>
+<wire x1="6.53625" y1="10.725" x2="10.88375" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="10.88375" y1="10.725" x2="10.95375" y2="10.795" width="0.2032" layer="1"/>
 <wire x1="19.3675" y1="7.3025" x2="17.30375" y2="9.36625" width="0.2032" layer="16"/>
-<wire x1="8.335" y1="7.41625" x2="10.27375" y2="7.41625" width="0.2032" layer="16"/>
-<wire x1="17.30375" y1="9.36625" x2="11.668125" y2="9.36625" width="0.2032" layer="16"/>
+<wire x1="17.30375" y1="9.36625" x2="11.350625" y2="9.36625" width="0.2032" layer="16"/>
 <wire x1="19.3675" y1="7.3025" x2="20.081875" y2="7.3025" width="0.2032" layer="16"/>
 <wire x1="20.081875" y1="7.3025" x2="21.193125" y2="8.41375" width="0.2032" layer="16"/>
-<wire x1="10.27375" y1="7.41625" x2="11.668125" y2="8.810625" width="0.2032" layer="16"/>
 <wire x1="25.479375" y1="8.175625" x2="25.479375" y2="5.38625" width="0.2032" layer="1"/>
 <wire x1="25.479375" y1="5.38625" x2="25.55875" y2="5.306875" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="7.575" x2="10.4325" y2="7.575" width="0.2032" layer="16"/>
+<wire x1="10.4325" y1="7.575" x2="11.350625" y2="8.493125" width="0.2032" layer="16"/>
 </signal>
 <signal name="!CS_OLED">
 <contactref element="LCD1" pad="8"/>
-<contactref element="U$8" pad="8"/>
+<contactref element="U1" pad="8"/>
 <wire x1="7.83625" y1="13.625" x2="7.83625" y2="12.325" width="0.2032" layer="1"/>
 <wire x1="7.83625" y1="12.325" x2="8.73125" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="8.73125" y1="11.43" x2="12.54125" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="12.54125" y1="11.43" x2="13.0175" y2="10.95375" width="0.2032" layer="1"/>
-<wire x1="13.0175" y1="10.95375" x2="13.0175" y2="9.763125" width="0.2032" layer="1"/>
-<wire x1="13.0175" y1="9.763125" x2="12.54125" y2="9.286875" width="0.2032" layer="1"/>
-<wire x1="12.54125" y1="9.286875" x2="10.00125" y2="9.286875" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="9.36625" x2="9.286875" y2="9.36625" width="0.2032" layer="16"/>
-<wire x1="9.286875" y1="9.36625" x2="10.00125" y2="9.286875" width="0.2032" layer="16"/>
-<via x="10.00125" y="9.286875" extent="1-16" drill="0.3048"/>
+<wire x1="8.73125" y1="11.43" x2="11.626059375" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="11.626059375" y1="11.43" x2="12.620625" y2="10.435434375" width="0.2032" layer="1"/>
+<wire x1="12.620625" y1="10.435434375" x2="12.620625" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="9.525" x2="10.00125" y2="9.525" width="0.2032" layer="16"/>
+<via x="10.00125" y="9.525" extent="1-16" drill="0.3048"/>
+<wire x1="10.00125" y1="9.525" x2="12.3825" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="12.3825" y1="9.525" x2="12.620625" y2="9.763125" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_MAX">
 <contactref element="U3" pad="6"/>
@@ -3137,14 +3163,14 @@ design rules under a new name.</descript
 <via x="19.764375" y="8.334375" extent="1-16" drill="0.3048"/>
 <wire x1="20.6375" y1="9.2075" x2="26.273125" y2="9.2075" width="0.2032" layer="16"/>
 <wire x1="26.273125" y1="9.2075" x2="26.82875" y2="8.651875" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="25"/>
+<contactref element="U1" pad="25"/>
 <wire x1="14.73625" y1="6.725" x2="15.615" y2="6.725" width="0.2032" layer="1"/>
 <wire x1="15.615" y1="6.725" x2="17.224375" y2="8.334375" width="0.2032" layer="1"/>
 <wire x1="19.764375" y1="8.334375" x2="17.224375" y2="8.334375" width="0.2032" layer="1"/>
 </signal>
 <signal name="AUX-TX">
 <contactref element="JP1" pad="P2"/>
-<contactref element="U$8" pad="19"/>
+<contactref element="U1" pad="19"/>
 <wire x1="15.001875" y1="4.841875" x2="14.366875" y2="4.206875" width="0.2032" layer="1"/>
 <wire x1="14.366875" y1="4.206875" x2="9.604375" y2="4.206875" width="0.2032" layer="1"/>
 <wire x1="9.604375" y1="4.206875" x2="9.445625" y2="4.365625" width="0.2032" layer="1"/>
@@ -3153,7 +3179,7 @@ design rules under a new name.</descript
 </signal>
 <signal name="AUX-RX">
 <contactref element="JP1" pad="P1"/>
-<contactref element="U$8" pad="20"/>
+<contactref element="U1" pad="20"/>
 <wire x1="10.23625" y1="5.425" x2="10.23625" y2="6.664375" width="0.2032" layer="1"/>
 <wire x1="10.23625" y1="6.664375" x2="10.239375" y2="6.6675" width="0.2032" layer="1"/>
 <via x="10.239375" y="6.6675" extent="1-16" drill="0.3048"/>
@@ -3166,7 +3192,7 @@ design rules under a new name.</descript
 </signal>
 <signal name="SWCLK">
 <contactref element="J1" pad="3"/>
-<contactref element="U$8" pad="24"/>
+<contactref element="U1" pad="24"/>
 <via x="13.414375" y="8.5725" extent="1-16" drill="0.3048"/>
 <wire x1="13.414375" y1="8.5725" x2="13.414375" y2="5.446875" width="0.2032" layer="1"/>
 <wire x1="13.414375" y1="5.446875" x2="13.43625" y2="5.425" width="0.2032" layer="1"/>
@@ -3178,7 +3204,7 @@ design rules under a new name.</descript
 </signal>
 <signal name="SWDIO">
 <contactref element="J1" pad="4"/>
-<contactref element="U$8" pad="23"/>
+<contactref element="U1" pad="23"/>
 <via x="12.620625" y="8.255" extent="1-16" drill="0.3048"/>
 <wire x1="12.620625" y1="5.440625" x2="12.63625" y2="5.425" width="0.2032" layer="1"/>
 <wire x1="22.145625" y1="4.683125" x2="22.145625" y2="6.0325" width="0.2032" layer="16"/>