diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -28,9 +28,9 @@
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <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="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="no" active="yes"/>
-<layer number="23" name="tOrigins" color="15" 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="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"/>
@@ -52,7 +52,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="no" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
@@ -2527,59 +2527,59 @@ design rules under a new name.</descript
 </pass>
 </autorouter>
 <elements>
-<element name="C106" library="microbuilder" package="0402" value="1.0uF" x="1.5875" y="11.1125" smashed="yes" rot="R180">
-<attribute name="NAME" x="6.5405" y="12.573" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<element name="C4" library="microbuilder" package="0402" value="1.0uF" x="1.5875" y="11.1125" smashed="yes" rot="R180">
+<attribute name="NAME" x="3.14325" y="12.017375" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="0.1905" y="11.7475" size="0.4064" layer="27" ratio="10" rot="R180"/>
 </element>
-<element name="C105" library="microbuilder" package="0402" value="1.0uF" x="1.5875" y="9.525" smashed="yes" rot="R180">
-<attribute name="NAME" x="6.5405" y="8.4455" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<element name="C3" library="microbuilder" package="0402" value="1.0uF" x="1.5875" y="9.525" smashed="yes" rot="R180">
+<attribute name="NAME" x="3.222625" y="10.3505" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="0.1905" y="10.16" size="0.4064" layer="27" ratio="10" rot="R180"/>
 </element>
-<element name="R103" library="microbuilder" package="0402" value="390K" x="1.5875" y="4.445" smashed="yes">
-<attribute name="NAME" x="-3.3655" y="4.2545" size="0.8128" layer="25" ratio="16"/>
+<element name="R2" library="microbuilder" package="0402" value="390K" x="1.5875" y="4.445" smashed="yes">
+<attribute name="NAME" x="3.921125" y="2.428875" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="2.9845" y="3.81" size="0.4064" layer="27" ratio="10"/>
 </element>
-<element name="SW101" library="dp_devices" package="JOYSTICK_SF303GJ26-3" value="JOYSTICK_SF303GJ26-3" x="34.925" y="6.985" smashed="yes" rot="R45">
+<element name="SW1" library="dp_devices" package="JOYSTICK_SF303GJ26-3" value="JOYSTICK_SF303GJ26-3" x="34.925" y="6.985" smashed="yes" rot="R45">
 <attribute name="NAME" x="35.44119375" y="9.75685625" size="0.8128" layer="25" ratio="16" rot="R315"/>
 </element>
-<element name="J101" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="43.815" y="6.985" smashed="yes" rot="R90">
+<element name="J2" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="43.815" y="6.985" smashed="yes" rot="R90">
 <attribute name="PROD_ID" value="CONN-09505" x="78.105" y="34.925" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="NAME" x="44.165" y="5.385" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="NAME" x="44.165" y="6.416875" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="46.99" y="5.08" size="0.762" layer="27" rot="R90"/>
 </element>
-<element name="U104" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="26.3525" y="6.35" smashed="yes" rot="R180">
-<attribute name="NAME" x="24.765" y="6.0325" size="0.8128" layer="21" font="vector" ratio="16"/>
+<element name="U3" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="26.3525" y="6.35" smashed="yes" rot="R180">
+<attribute name="NAME" x="29.924375" y="4.524375" size="0.8128" layer="25" font="vector" ratio="16" rot="R90"/>
 </element>
-<element name="U102" library="SparkFun-PowerIC" package="SOT23-5" value="AP2202K-3.3TRG1" x="21.59" y="6.6675" smashed="yes" rot="R180">
+<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2202K-3.3TRG1" x="21.59" y="6.6675" smashed="yes" rot="R180">
 <attribute name="PROD_ID" value="VREG-00822" x="-13.97" y="39.6875" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="NAME" x="20.066" y="6.2865" size="0.8128" layer="25" ratio="16"/>
+<attribute name="NAME" x="20.066" y="4.66725" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="22.5425" y="6.858" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="LED102" library="SparkFun-LED" package="LED-0603" value="" x="39.0525" y="11.7475" smashed="yes" rot="R270">
-<attribute name="NAME" x="38.354" y="11.4935" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<element name="LED1" library="SparkFun-LED" package="LED-0603" value="" x="39.0525" y="11.7475" smashed="yes" rot="R270">
+<attribute name="NAME" x="37.766625" y="12.446" size="0.8128" layer="25" ratio="16"/>
 <attribute name="VALUE" x="38.0365" y="10.668" size="0.4064" layer="27"/>
 </element>
-<element name="JP101" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="23.8125" y="11.43" rot="MR0"/>
-<element name="JP102" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="18.415" y="11.43" rot="MR0"/>
-<element name="JP103" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="29.21" y="11.43" rot="MR0"/>
-<element name="D101" library="SparkFun-DiscreteSemi" package="SOD523" value="" x="33.02" y="12.065" smashed="yes">
-<attribute name="NAME" x="31.0134" y="12.6238" size="0.8128" layer="25" ratio="16"/>
+<element name="JP2" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="23.8125" y="11.43" rot="MR0"/>
+<element name="JP3" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="18.415" y="11.43" rot="MR0"/>
+<element name="JP4" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="29.21" y="11.43" rot="MR0"/>
+<element name="D1" library="SparkFun-DiscreteSemi" package="SOD523" value="" x="33.02" y="12.065" smashed="yes">
+<attribute name="NAME" x="35.537775" y="11.750675" size="0.8128" layer="25" ratio="16"/>
 <attribute name="VALUE" x="32.3342" y="11.0744" size="0.4064" layer="27"/>
 </element>
-<element name="C107" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.43125" y="9.8425" smashed="yes" rot="R180">
-<attribute name="NAME" x="21.68525" y="11.52525" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.43125" y="9.8425" smashed="yes" rot="R180">
+<attribute name="NAME" x="23.08225" y="10.017125" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="22.51075" y="10.9855" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C110" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="4.1275" smashed="yes">
-<attribute name="NAME" x="23.241" y="4.191" size="0.8128" layer="25" ratio="16"/>
+<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="4.1275" smashed="yes">
+<attribute name="NAME" x="22.240875" y="2.047875" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="20.5105" y="2.9845" size="0.4064" layer="27"/>
 </element>
-<element name="R102" library="SparkFun-Passives" package="0402-RES" value="" x="39.37" y="10.4775" smashed="yes" rot="R180">
+<element name="R1" library="SparkFun-Passives" package="0402-RES" value="" x="39.37" y="10.4775" smashed="yes" rot="R180">
 <attribute name="NAME" x="40.894" y="9.779" size="0.8128" layer="25" ratio="16" rot="R180"/>
 <attribute name="VALUE" x="40.4495" y="11.6205" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C111" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="29.845" y="9.2075" smashed="yes" rot="R270">
-<attribute name="NAME" x="28.6385" y="9.5885" size="0.8128" layer="25" ratio="16"/>
+<element name="C8" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="29.845" y="9.2075" smashed="yes" rot="R270">
+<attribute name="NAME" x="30.25775" y="6.57225" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="28.702" y="10.287" size="0.4064" layer="27" rot="R270"/>
 </element>
 <element name="U$1" library="Protofusion" package="THERM_LOGO_SMALL_0.1" value="" x="37.62375" y="1.5875" smashed="yes"/>
@@ -2588,29 +2588,41 @@ design rules under a new name.</descript
 <attribute name="VALUE" x="30.635" y="14.32625" 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="3.175" rot="MR0"/>
-<element name="U$13" library="Protofusion" package="UFQFPN32" value="STM32F042K" x="14.525625" y="7.14375" rot="R270"/>
-<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.604375" y="10.4775" rot="R180"/>
-<element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="19.129375" y="9.8425"/>
-<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.68375" y="4.445" rot="R180"/>
-<element name="RA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="6.985" rot="R270"/>
+<element name="U1" library="Protofusion" package="UFQFPN32" value="STM32F042K" x="14.525625" y="7.14375" smashed="yes" rot="R270"/>
+<element name="C2" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.604375" y="10.4775" smashed="yes" rot="R180">
+<attribute name="NAME" x="9.271" y="9.779" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="10.683875" y="11.6205" size="0.4064" layer="27" rot="R180"/>
+</element>
+<element name="C1" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="19.129375" y="9.8425" smashed="yes">
+<attribute name="NAME" x="18.669" y="8.001" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="18.049875" y="8.6995" size="0.4064" layer="27"/>
+</element>
+<element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.68375" y="4.445" smashed="yes" rot="R180">
+<attribute name="NAME" x="7.604125" y="5.17525" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="10.76325" y="5.588" size="0.4064" layer="27" rot="R180"/>
+</element>
+<element name="RA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="6.985" smashed="yes" rot="R270">
+<attribute name="NAME" x="3.571875" y="8.09625" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="-0.9525" y="8.5725" size="1.27" layer="27" rot="R270"/>
+</element>
 <element name="JP1" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="13.97" y="2.38125" rot="MR0"/>
-<element name="U$6" library="Protofusion" package="POGOPROG-CONN-ALLSMT" value="POGOPIN-CONNALLSMT" x="20.240625" y="2.143125" rot="MR90"/>
+<element name="J1" library="Protofusion" package="POGOPROG-CONN-ALLSMT" value="POGOPIN-CONNALLSMT" x="20.240625" y="2.143125" rot="MR90"/>
 </elements>
 <signals>
 <signal name="GND">
-<contactref element="R103" pad="1"/>
-<contactref element="JP101" pad="P2"/>
-<contactref element="U102" pad="2"/>
-<contactref element="SW101" pad="5"/>
-<contactref element="J101" pad="GND"/>
-<contactref element="J101" pad="MT1"/>
-<contactref element="J101" pad="MT2"/>
-<contactref element="JP102" pad="P2"/>
-<contactref element="LED102" pad="C"/>
-<contactref element="U104" pad="1"/>
-<contactref element="C111" pad="1"/>
-<contactref element="C107" pad="1"/>
-<contactref element="C110" pad="2"/>
+<contactref element="R2" pad="1"/>
+<contactref element="JP2" pad="P2"/>
+<contactref element="U2" pad="2"/>
+<contactref element="SW1" pad="5"/>
+<contactref element="J2" pad="GND"/>
+<contactref element="J2" pad="MT1"/>
+<contactref element="J2" pad="MT2"/>
+<contactref element="JP3" pad="P2"/>
+<contactref element="LED1" pad="C"/>
+<contactref element="U3" pad="1"/>
+<contactref element="C8" pad="1"/>
+<contactref element="C5" pad="1"/>
+<contactref element="C7" pad="2"/>
 <polygon width="0.254" layer="16">
 <vertex x="-1.27" y="-3.175"/>
 <vertex x="46.99" y="-3.175"/>
@@ -2628,10 +2640,10 @@ design rules under a new name.</descript
 <via x="23.33625" y="4.365625" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="6"/>
 <wire x1="28.2575" y1="9.04" x2="28.2575" y2="9.525" width="0.2032" layer="1"/>
+<contactref element="C1" pad="2"/>
+<contactref element="C2" pad="2"/>
 <contactref element="C6" pad="2"/>
-<contactref element="C5" pad="2"/>
-<contactref element="C7" pad="2"/>
-<contactref element="U$13" pad="EXP"/>
+<contactref element="U1" pad="EXP"/>
 <via x="39.84625" y="8.255" extent="1-16" drill="0.3048"/>
 <wire x1="41.165" y1="8.285" x2="39.87625" y2="8.285" width="0.2032" layer="1"/>
 <wire x1="39.87625" y1="8.285" x2="39.84625" y2="8.255" width="0.2032" layer="1"/>
@@ -2646,8 +2658,7 @@ design rules under a new name.</descript
 <wire x1="0.8125" y1="4.57" x2="0.9375" y2="4.445" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="7.385" x2="0.8125" y2="5.785" width="0.2032" layer="1"/>
 <via x="0.873125" y="3.254375" extent="1-16" drill="0.3048"/>
-<via x="14.12875" y="6.746875" extent="1-16" drill="0.3048"/>
-<wire x1="14.12875" y1="6.746875" x2="14.525625" y2="7.14375" width="0.2032" layer="1"/>
+<via x="14.525625" y="7.14375" extent="1-16" drill="0.3048"/>
 <wire x1="8.335" y1="8.12625" x2="5.08" y2="8.12625" width="0.2032" layer="16"/>
 <wire x1="22.24" y1="4.1275" x2="23.098125" y2="4.1275" width="0.2032" layer="1"/>
 <wire x1="23.098125" y1="4.1275" x2="23.33625" y2="4.365625" width="0.2032" layer="1"/>
@@ -2669,10 +2680,9 @@ design rules under a new name.</descript
 <wire x1="40.64" y1="11.7475" x2="41.195625" y2="11.191875" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="3.254375" x2="0.873125" y2="4.380625" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="4.380625" x2="0.9375" y2="4.445" width="0.2032" layer="1"/>
-<contactref element="U$6" pad="2"/>
-<contactref element="U$13" pad="31"/>
+<contactref element="J1" pad="2"/>
+<contactref element="U1" pad="31"/>
 <wire x1="16.875625" y1="8.39375" x2="15.775625" y2="8.39375" width="0.2032" layer="1"/>
-<wire x1="15.775625" y1="8.39375" x2="14.12875" y2="6.746875" width="0.2032" layer="1"/>
 <wire x1="43.97375" y1="10.95375" x2="43.84625" y2="10.95375" width="0.2032" layer="1"/>
 <wire x1="43.84625" y1="10.95375" x2="43.815" y2="10.985" width="0.2032" layer="1"/>
 <wire x1="19.779375" y1="9.8425" x2="19.779375" y2="11.335625" width="0.2032" layer="1"/>
@@ -2684,9 +2694,10 @@ design rules under a new name.</descript
 <wire x1="43.97375" y1="11.033125" x2="44.370625" y2="11.43" width="0.2032" layer="1"/>
 <wire x1="43.815" y1="2.985" x2="43.84625" y2="2.985" width="0.2032" layer="1"/>
 <wire x1="43.84625" y1="2.985" x2="44.370625" y2="2.460625" width="0.2032" layer="1"/>
+<wire x1="14.525625" y1="7.14375" x2="15.775625" y2="8.39375" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
-<contactref element="C106" pad="1"/>
+<contactref element="C4" pad="1"/>
 <via x="4.445" y="11.1125" extent="1-16" drill="0.3048"/>
 <wire x1="4.445" y1="11.1125" x2="4.83125" y2="10.72625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="2"/>
@@ -2694,7 +2705,7 @@ design rules under a new name.</descript
 <wire x1="4.445" y1="11.1125" x2="2.2375" y2="11.1125" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$2">
-<contactref element="C106" pad="2"/>
+<contactref element="C4" pad="2"/>
 <via x="4.445" y="11.90625" extent="1-16" drill="0.3048"/>
 <wire x1="4.445" y1="11.90625" x2="4.975" y2="11.37625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="1"/>
@@ -2705,7 +2716,7 @@ design rules under a new name.</descript
 <wire x1="0.9525" y1="11.1275" x2="0.9375" y2="11.1125" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$3">
-<contactref element="C105" pad="1"/>
+<contactref element="C3" pad="1"/>
 <via x="4.445" y="9.525" extent="1-16" drill="0.3048"/>
 <wire x1="4.54375" y1="9.42625" x2="4.445" y2="9.525" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="4"/>
@@ -2713,7 +2724,7 @@ design rules under a new name.</descript
 <wire x1="4.445" y1="9.525" x2="2.2375" y2="9.525" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$4">
-<contactref element="C105" pad="2"/>
+<contactref element="C3" pad="2"/>
 <via x="4.445" y="10.31875" extent="1-16" drill="0.3048"/>
 <wire x1="4.6875" y1="10.07625" x2="4.445" y2="10.31875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="3"/>
@@ -2724,7 +2735,7 @@ design rules under a new name.</descript
 <wire x1="0.9525" y1="9.54" x2="0.9375" y2="9.525" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$8">
-<contactref element="R103" pad="2"/>
+<contactref element="R2" pad="2"/>
 <via x="3.96875" y="3.96875" extent="1-16" drill="0.3048"/>
 <wire x1="3.96875" y1="3.96875" x2="4.36125" y2="3.57625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="13"/>
@@ -2758,34 +2769,34 @@ design rules under a new name.</descript
 <wire x1="3.175" y1="5.715" x2="3.175" y2="5.23875" width="0.2032" layer="1"/>
 </signal>
 <signal name="3.3V">
-<contactref element="U102" pad="5"/>
-<contactref element="U104" pad="4"/>
-<contactref element="C111" pad="2"/>
-<contactref element="C110" pad="1"/>
+<contactref element="U2" pad="5"/>
+<contactref element="U3" pad="4"/>
+<contactref element="C8" pad="2"/>
+<contactref element="C7" pad="1"/>
 <wire x1="22.5425" y1="5.3699" x2="22.54" y2="5.3674" width="0.2032" layer="1"/>
 <via x="11.350625" y="10.4775" extent="1-16" drill="0.3048"/>
 <via x="3.81" y="8.73125" extent="1-16" drill="0.3048"/>
-<wire x1="22.5425" y1="5.3699" x2="22.5425" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="22.5425" y1="6.35" x2="20.6375" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="20.6375" y1="6.35" x2="20.0025" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="22.5425" y1="5.3699" x2="22.5425" y2="6.429375" width="0.2032" layer="1"/>
+<wire x1="22.5425" y1="6.429375" x2="20.558125" y2="6.429375" width="0.2032" layer="1"/>
+<wire x1="20.558125" y1="6.429375" x2="20.0025" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="20.0025" y1="6.985" x2="20.0025" y2="8.89" width="0.2032" layer="1"/>
 <wire x1="29.86" y1="8.5725" x2="29.845" y2="8.5575" width="0.2032" layer="1"/>
 <contactref element="LCD1" pad="5"/>
 <contactref element="LCD1" pad="7"/>
 <wire x1="8.335" y1="7.47625" x2="8.35" y2="7.46125" width="0.2032" layer="16"/>
 <wire x1="3.855" y1="8.77625" x2="8.335" y2="8.77625" width="0.2032" layer="16"/>
-<wire x1="22.5425" y1="6.35" x2="23.65375" y2="7.46125" width="0.2032" layer="1"/>
-<wire x1="23.65375" y1="7.46125" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
+<wire x1="22.5425" y1="6.429375" x2="23.574375" y2="7.46125" width="0.2032" layer="1"/>
+<wire x1="23.574375" y1="7.46125" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="29.845" y1="8.5575" x2="29.845" y2="7.888696875" width="0.2032" layer="1"/>
 <wire x1="29.845" y1="7.888696875" x2="29.417553125" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="29.417553125" y1="7.46125" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="24.4475" y1="9.04" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
+<contactref element="C1" pad="1"/>
+<contactref element="U1" pad="1"/>
+<contactref element="U1" pad="5"/>
+<contactref element="C2" pad="1"/>
+<contactref element="U1" pad="17"/>
 <contactref element="C6" pad="1"/>
-<contactref element="U$13" pad="1"/>
-<contactref element="U$13" pad="5"/>
-<contactref element="C5" pad="1"/>
-<contactref element="U$13" pad="17"/>
-<contactref element="C7" pad="1"/>
 <contactref element="RA1" pad="C1B"/>
 <contactref element="RA1" pad="C2B"/>
 <via x="4.60375" y="7.46125" extent="1-16" drill="0.3048"/>
@@ -2793,10 +2804,6 @@ design rules under a new name.</descript
 <wire x1="10.16" y1="5.55625" x2="10.16" y2="7.46125" width="0.2032" layer="16"/>
 <wire x1="20.0025" y1="8.89" x2="19.764375" y2="9.128125" width="0.2032" layer="1"/>
 <wire x1="14.3025" y1="9.466875" x2="14.275625" y2="9.49375" width="0.2032" layer="1"/>
-<wire x1="22.54" y1="5.3674" x2="21.639275" y2="5.3674" width="0.2032" layer="1"/>
-<wire x1="21.639275" y1="5.3674" x2="21.351875" y2="5.08" width="0.2032" layer="1"/>
-<wire x1="21.351875" y1="5.08" x2="21.351875" y2="4.539375" width="0.2032" layer="1"/>
-<wire x1="21.351875" y1="4.539375" x2="20.94" y2="4.1275" width="0.2032" layer="1"/>
 <wire x1="8.35" y1="7.46125" x2="10.16" y2="7.46125" width="0.2032" layer="16"/>
 <wire x1="10.33375" y1="4.445" x2="10.33375" y2="5.3825" width="0.2032" layer="1"/>
 <wire x1="10.33375" y1="5.3825" x2="10.16" y2="5.55625" width="0.2032" layer="1"/>
@@ -2831,13 +2838,16 @@ design rules under a new name.</descript
 <wire x1="2.3625" y1="7.385" x2="4.5275" y2="7.385" width="0.2032" layer="1"/>
 <wire x1="4.5275" y1="7.385" x2="4.60375" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="3.855" y1="8.77625" x2="3.81" y2="8.73125" width="0.2032" layer="16"/>
+<wire x1="22.115525" y1="5.3674" x2="20.94" y2="4.191875" width="0.2032" layer="1"/>
+<wire x1="20.94" y1="4.191875" x2="20.94" y2="4.1275" width="0.2032" layer="1"/>
+<wire x1="22.115525" y1="5.3674" x2="22.54" y2="5.3674" width="0.2032" layer="1"/>
 </signal>
 <signal name="V_BATT">
-<contactref element="JP101" pad="P1"/>
-<contactref element="U102" pad="3"/>
-<contactref element="U102" pad="1"/>
-<contactref element="D101" pad="C"/>
-<contactref element="C107" pad="2"/>
+<contactref element="JP2" pad="P1"/>
+<contactref element="U2" pad="3"/>
+<contactref element="U2" pad="1"/>
+<contactref element="D1" pad="C"/>
+<contactref element="C5" pad="2"/>
 <wire x1="22.54" y1="7.9676" x2="22.54" y2="7.14125" width="0.2032" layer="1"/>
 <wire x1="22.54" y1="7.14125" x2="22.38375" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="22.38375" y1="6.985" x2="20.79625" y2="6.985" width="0.2032" layer="1"/>
@@ -2846,136 +2856,134 @@ design rules under a new name.</descript
 <wire x1="20.6375" y1="7.9701" x2="20.64" y2="7.9676" width="0.2032" layer="1"/>
 <wire x1="20.78125" y1="9.8425" x2="20.78125" y2="10.93875" width="0.2032" layer="1"/>
 <wire x1="20.78125" y1="10.93875" x2="21.2725" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="30.48" y1="12.22375" x2="30.32125" y2="12.065" width="0.2032" layer="16"/>
-<wire x1="30.32125" y1="12.065" x2="30.32125" y2="10.4775" width="0.2032" layer="16"/>
-<wire x1="30.32125" y1="10.4775" x2="30.1625" y2="10.31875" width="0.2032" layer="16"/>
-<wire x1="30.1625" y1="10.31875" x2="23.97125" y2="10.31875" width="0.2032" layer="16"/>
 <via x="23.65375" y="10.00125" extent="1-16" drill="0.3048"/>
 <wire x1="23.65375" y1="10.00125" x2="23.65375" y2="8.62018125" width="0.2032" layer="1"/>
 <wire x1="23.65375" y1="8.62018125" x2="23.00116875" y2="7.9676" width="0.2032" layer="1"/>
 <wire x1="23.00116875" y1="7.9676" x2="22.54" y2="7.9676" width="0.2032" layer="1"/>
 <wire x1="32.42" y1="12.065" x2="31.115" y2="12.065" width="0.2032" layer="1"/>
 <via x="31.115" y="12.065" extent="1-16" drill="0.3048"/>
-<wire x1="31.115" y1="12.065" x2="31.115" y2="12.22375" width="0.2032" layer="16"/>
-<wire x1="31.115" y1="12.22375" x2="30.48" y2="12.22375" width="0.2032" layer="16"/>
-<wire x1="23.97125" y1="10.31875" x2="23.65375" y2="10.00125" width="0.2032" layer="16"/>
 <wire x1="20.64" y1="7.9676" x2="20.64" y2="9.70125" width="0.2032" layer="1"/>
 <wire x1="20.64" y1="9.70125" x2="20.78125" y2="9.8425" width="0.2032" layer="1"/>
+<wire x1="30.32125" y1="10.4775" x2="29.845" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="29.845" y1="10.00125" x2="23.65375" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="30.32125" y1="10.4775" x2="30.32125" y2="11.826875" width="0.2032" layer="16"/>
+<wire x1="30.32125" y1="11.826875" x2="30.559375" y2="12.065" width="0.2032" layer="16"/>
+<wire x1="30.559375" y1="12.065" x2="31.115" y2="12.065" width="0.2032" layer="16"/>
 </signal>
 <signal name="SW-A">
-<contactref element="SW101" pad="1"/>
-<via x="31.75" y="7.14375" extent="1-16" drill="0.3048"/>
-<wire x1="20.16125" y1="7.540625" x2="31.353125" y2="7.540625" width="0.2032" layer="16"/>
-<wire x1="31.353125" y1="7.540625" x2="31.75" y2="7.14375" width="0.2032" layer="16"/>
-<wire x1="31.75" y1="7.14375" x2="31.75" y2="5.7899" width="0.2032" layer="1"/>
-<wire x1="31.75" y1="5.7899" x2="31.58391875" y2="5.62381875" width="0.2032" layer="1"/>
+<contactref element="SW1" pad="1"/>
+<via x="32.54375" y="6.588125" extent="1-16" drill="0.3048"/>
+<wire x1="20.16125" y1="7.540625" x2="31.59125" y2="7.540625" width="0.2032" layer="16"/>
 <wire x1="20.16125" y1="7.540625" x2="19.84375" y2="7.223125" width="0.2032" layer="16"/>
 <wire x1="19.84375" y1="7.223125" x2="18.335625" y2="7.223125" width="0.2032" layer="16"/>
 <via x="18.335625" y="7.223125" extent="1-16" drill="0.3048"/>
-<contactref element="U$13" pad="28"/>
+<contactref element="U1" pad="28"/>
 <wire x1="16.875625" y1="6.89375" x2="18.00625" y2="6.89375" width="0.2032" layer="1"/>
 <wire x1="18.00625" y1="6.89375" x2="18.335625" y2="7.223125" width="0.2032" layer="1"/>
+<wire x1="31.58391875" y1="5.62381875" x2="32.54375" y2="6.58365" width="0.2032" layer="1"/>
+<wire x1="32.54375" y1="6.58365" x2="32.54375" y2="6.588125" width="0.2032" layer="1"/>
+<wire x1="31.59125" y1="7.540625" x2="32.54375" y2="6.588125" width="0.2032" layer="16"/>
 </signal>
 <signal name="SW-C">
-<contactref element="SW101" pad="3"/>
+<contactref element="SW1" pad="3"/>
 <wire x1="33.56381875" y1="3.64391875" x2="33.48891875" y2="3.64391875" width="0.2032" layer="1"/>
-<via x="34.76625" y="4.7625" extent="1-16" drill="0.3048"/>
-<wire x1="34.76625" y1="4.7625" x2="34.44875" y2="4.445" width="0.2032" layer="16"/>
-<wire x1="34.44875" y1="4.445" x2="33.02" y2="4.445" width="0.2032" layer="16"/>
-<wire x1="33.02" y1="4.445" x2="30.718125" y2="6.746875" width="0.2032" layer="16"/>
+<via x="34.6075" y="4.60375" extent="1-16" drill="0.3048"/>
+<wire x1="34.44875" y1="4.445" x2="32.86125" y2="4.445" width="0.2032" layer="16"/>
+<wire x1="32.86125" y1="4.445" x2="30.559375" y2="6.746875" width="0.2032" layer="16"/>
 <wire x1="19.605625" y1="5.87375" x2="20.47875" y2="6.746875" width="0.2032" layer="16"/>
-<wire x1="20.47875" y1="6.746875" x2="30.718125" y2="6.746875" width="0.2032" layer="16"/>
-<wire x1="34.76625" y1="4.7625" x2="34.6824" y2="4.7625" width="0.2032" layer="1"/>
-<wire x1="34.6824" y1="4.7625" x2="33.56381875" y2="3.64391875" width="0.2032" layer="1"/>
+<wire x1="20.47875" y1="6.746875" x2="30.559375" y2="6.746875" width="0.2032" layer="16"/>
 <wire x1="19.605625" y1="5.87375" x2="18.89125" y2="5.87375" width="0.2032" layer="16"/>
 <via x="18.89125" y="5.87375" extent="1-16" drill="0.3048"/>
 <wire x1="18.768125" y1="5.996875" x2="18.89125" y2="5.87375" width="0.2032" layer="1"/>
-<contactref element="U$13" pad="26"/>
+<contactref element="U1" pad="26"/>
 <wire x1="16.875625" y1="5.89375" x2="17.4825" y2="5.89375" width="0.2032" layer="1"/>
 <wire x1="17.4825" y1="5.89375" x2="17.541875" y2="5.953125" width="0.2032" layer="1"/>
 <wire x1="17.541875" y1="5.953125" x2="18.811875" y2="5.953125" width="0.2032" layer="1"/>
 <wire x1="18.811875" y1="5.953125" x2="18.89125" y2="5.87375" width="0.2032" layer="1"/>
+<wire x1="33.56381875" y1="3.64391875" x2="33.64766875" y2="3.64391875" width="0.2032" layer="1"/>
+<wire x1="33.64766875" y1="3.64391875" x2="34.6075" y2="4.60375" width="0.2032" layer="1"/>
+<wire x1="34.44875" y1="4.445" x2="34.6075" y2="4.60375" width="0.2032" layer="16"/>
 </signal>
 <signal name="SW-B">
-<contactref element="SW101" pad="4"/>
-<via x="35.2425" y="8.09625" extent="1-16" drill="0.3048"/>
-<wire x1="36.286178125" y1="10.326078125" x2="35.2425" y2="9.2824" width="0.2032" layer="1"/>
-<wire x1="35.2425" y1="9.2824" x2="35.2425" y2="8.09625" width="0.2032" layer="1"/>
-<wire x1="32.146875" y1="8.334375" x2="32.940625" y2="7.540625" width="0.2032" layer="16"/>
-<wire x1="32.940625" y1="7.540625" x2="34.686875" y2="7.540625" width="0.2032" layer="16"/>
-<wire x1="34.686875" y1="7.540625" x2="35.2425" y2="8.09625" width="0.2032" layer="16"/>
+<contactref element="SW1" pad="4"/>
+<via x="35.2425" y="9.286875" extent="1-16" drill="0.3048"/>
+<wire x1="32.464375" y1="8.334375" x2="33.258125" y2="7.540625" width="0.2032" layer="16"/>
 <via x="19.3675" y="8.493125" extent="1-16" drill="0.3048"/>
 <wire x1="19.3675" y1="8.493125" x2="18.25625" y2="8.493125" width="0.2032" layer="1"/>
 <wire x1="18.25625" y1="8.493125" x2="17.656875" y2="7.89375" width="0.2032" layer="1"/>
-<contactref element="U$13" pad="30"/>
+<contactref element="U1" pad="30"/>
 <wire x1="16.875625" y1="7.89375" x2="17.656875" y2="7.89375" width="0.2032" layer="1"/>
-<wire x1="32.146875" y1="8.334375" x2="19.52625" y2="8.334375" width="0.2032" layer="16"/>
+<wire x1="32.464375" y1="8.334375" x2="19.52625" y2="8.334375" width="0.2032" layer="16"/>
 <wire x1="19.52625" y1="8.334375" x2="19.3675" y2="8.493125" width="0.2032" layer="16"/>
+<wire x1="33.258125" y1="7.540625" x2="34.76625" y2="7.540625" width="0.2032" layer="16"/>
+<wire x1="34.76625" y1="7.540625" x2="35.2425" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="35.2425" y1="8.016875" x2="35.2425" y2="9.286875" width="0.2032" layer="16"/>
+<wire x1="36.286178125" y1="10.326078125" x2="36.281703125" y2="10.326078125" width="0.2032" layer="1"/>
+<wire x1="36.281703125" y1="10.326078125" x2="35.2425" y2="9.286875" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-D">
-<contactref element="SW101" pad="6"/>
-<via x="36.98875" y="7.14375" extent="1-16" drill="0.3048"/>
-<wire x1="20.0025" y1="7.9375" x2="31.90875" y2="7.9375" width="0.2032" layer="16"/>
-<wire x1="36.98875" y1="7.14375" x2="37.06365" y2="7.14375" width="0.2032" layer="1"/>
-<wire x1="37.06365" y1="7.14375" x2="38.266078125" y2="8.346178125" width="0.2032" layer="1"/>
-<wire x1="31.90875" y1="7.9375" x2="32.7025" y2="7.14375" width="0.2032" layer="16"/>
-<wire x1="32.7025" y1="7.14375" x2="36.98875" y2="7.14375" width="0.2032" layer="16"/>
+<contactref element="SW1" pad="6"/>
+<via x="37.30625" y="7.381875" extent="1-16" drill="0.3048"/>
+<wire x1="20.0025" y1="7.9375" x2="32.146875" y2="7.9375" width="0.2032" layer="16"/>
+<wire x1="32.146875" y1="7.9375" x2="32.940625" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="19.764375" y1="7.699375" x2="20.0025" y2="7.9375" width="0.2032" layer="16"/>
 <wire x1="19.764375" y1="7.699375" x2="18.970625" y2="7.699375" width="0.2032" layer="16"/>
 <wire x1="18.970625" y1="7.699375" x2="18.811875" y2="7.858125" width="0.2032" layer="16"/>
 <via x="18.811875" y="7.858125" extent="1-16" drill="0.3048"/>
 <wire x1="18.811875" y1="7.858125" x2="18.176875" y2="7.858125" width="0.2032" layer="1"/>
 <wire x1="18.176875" y1="7.858125" x2="17.7125" y2="7.39375" width="0.2032" layer="1"/>
-<contactref element="U$13" pad="29"/>
+<contactref element="U1" pad="29"/>
 <wire x1="16.875625" y1="7.39375" x2="17.7125" y2="7.39375" width="0.2032" layer="1"/>
+<wire x1="32.940625" y1="7.14375" x2="37.068125" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="37.068125" y1="7.14375" x2="37.30625" y2="7.381875" width="0.2032" layer="16"/>
+<wire x1="38.266078125" y1="8.346178125" x2="38.266078125" y2="8.341703125" width="0.2032" layer="1"/>
+<wire x1="38.266078125" y1="8.341703125" x2="37.30625" y2="7.381875" width="0.2032" layer="1"/>
 </signal>
 <signal name="D+">
-<contactref element="J101" pad="D+"/>
-<wire x1="41.165" y1="6.985" x2="40.005" y2="6.985" width="0.2032" layer="1"/>
-<wire x1="40.005" y1="6.985" x2="39.6875" y2="6.6675" width="0.2032" layer="1"/>
-<wire x1="39.6875" y1="6.6675" x2="39.6875" y2="2.778125" width="0.2032" layer="1"/>
-<wire x1="39.6875" y1="2.778125" x2="39.21125" y2="2.301875" width="0.2032" layer="1"/>
+<contactref element="J2" pad="D+"/>
+<wire x1="41.165" y1="6.985" x2="40.33925625" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="40.33925625" y1="6.985" x2="39.766875" y2="6.41261875" width="0.2032" layer="1"/>
+<wire x1="39.766875" y1="6.41261875" x2="39.766875" y2="2.8575" width="0.2032" layer="1"/>
+<wire x1="39.766875" y1="2.8575" x2="39.21125" y2="2.301875" width="0.2032" layer="1"/>
 <wire x1="39.21125" y1="2.301875" x2="18.576875" y2="2.301875" width="0.2032" layer="1"/>
-<contactref element="U$13" pad="22"/>
+<contactref element="U1" pad="22"/>
 <wire x1="15.275625" y1="4.79375" x2="15.275625" y2="3.774375" width="0.2032" layer="1"/>
-<wire x1="15.275625" y1="3.774375" x2="15.95125" y2="3.09875" width="0.2032" layer="1"/>
-<contactref element="U$6" pad="5"/>
-<wire x1="17.78" y1="3.09875" x2="15.95125" y2="3.09875" width="0.2032" layer="1"/>
+<contactref element="J1" pad="5"/>
 <wire x1="17.700625" y1="2.143125" x2="17.700625" y2="3.019375" width="0.2032" layer="16"/>
 <wire x1="17.700625" y1="3.019375" x2="17.78" y2="3.09875" width="0.2032" layer="16"/>
 <via x="17.78" y="3.09875" extent="1-16" drill="0.3048"/>
 <wire x1="18.576875" y1="2.301875" x2="17.78" y2="3.09875" width="0.2032" layer="1"/>
+<wire x1="17.78" y1="3.09875" x2="17.465625" y2="3.413125" width="0.2032" layer="1"/>
+<wire x1="17.465625" y1="3.413125" x2="15.636875" y2="3.413125" width="0.2032" layer="1"/>
+<wire x1="15.636875" y1="3.413125" x2="15.275625" y2="3.774375" width="0.2032" layer="1"/>
 </signal>
 <signal name="D-">
-<contactref element="J101" pad="D-"/>
+<contactref element="J2" pad="D-"/>
 <wire x1="41.165" y1="6.335" x2="40.3075" y2="6.335" width="0.2032" layer="1"/>
 <wire x1="40.3075" y1="6.335" x2="40.16375" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="21.9075" y1="1.905" x2="39.6875" y2="1.905" width="0.2032" layer="1"/>
-<wire x1="39.6875" y1="1.905" x2="40.16375" y2="2.38125" width="0.2032" layer="1"/>
-<wire x1="40.16375" y1="2.38125" x2="40.16375" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="21.9075" y1="1.905" x2="21.910625" y2="1.901875" width="0.2032" layer="1"/>
-<contactref element="U$13" pad="21"/>
+<wire x1="18.018125" y1="1.905" x2="39.414928125" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="39.414928125" y1="1.905" x2="40.16375" y2="2.653821875" width="0.2032" layer="1"/>
+<wire x1="40.16375" y1="2.653821875" x2="40.16375" y2="6.19125" width="0.2032" layer="1"/>
+<contactref element="U1" pad="21"/>
 <wire x1="14.775625" y1="4.79375" x2="14.775625" y2="3.639375" width="0.2032" layer="1"/>
-<wire x1="21.910625" y1="1.901875" x2="15.64" y2="1.901875" width="0.2032" layer="1"/>
-<contactref element="U$6" pad="6"/>
-<via x="15.39875" y="1.905" extent="1-16" drill="0.3048"/>
+<contactref element="J1" pad="6"/>
+<via x="15.39875" y="2.143125" extent="1-16" drill="0.3048"/>
 <wire x1="14.775625" y1="3.639375" x2="15.39875" y2="3.01625" width="0.2032" layer="1"/>
-<wire x1="15.39875" y1="3.01625" x2="15.39875" y2="1.905" width="0.2032" layer="1"/>
-<wire x1="16.430625" y1="2.143125" x2="15.636875" y2="2.143125" width="0.2032" layer="16"/>
-<wire x1="15.636875" y1="2.143125" x2="15.39875" y2="1.905" width="0.2032" layer="16"/>
-<wire x1="15.39875" y1="1.905" x2="15.636875" y2="1.905" width="0.2032" layer="1"/>
-<wire x1="15.636875" y1="1.905" x2="15.64" y2="1.901875" width="0.2032" layer="1"/>
+<wire x1="16.430625" y1="2.143125" x2="15.39875" y2="2.143125" width="0.2032" layer="16"/>
+<wire x1="18.018125" y1="1.905" x2="16.906875" y2="3.01625" width="0.2032" layer="1"/>
+<wire x1="16.906875" y1="3.01625" x2="15.39875" y2="3.01625" width="0.2032" layer="1"/>
+<wire x1="15.39875" y1="3.01625" x2="15.39875" y2="2.143125" width="0.2032" layer="1"/>
 </signal>
 <signal name="VUSB">
-<contactref element="J101" pad="VBUS"/>
-<contactref element="D101" pad="A"/>
+<contactref element="J2" pad="VBUS"/>
+<contactref element="D1" pad="A"/>
 <wire x1="41.165" y1="5.685" x2="42.35625" y2="5.685" width="0.2032" layer="1"/>
 <via x="42.38625" y="11.495" extent="1-16" drill="0.3048"/>
 <wire x1="42.38625" y1="11.495" x2="41.81625" y2="12.065" width="0.2032" layer="16"/>
 <wire x1="41.81625" y1="12.065" x2="34.925" y2="12.065" width="0.2032" layer="16"/>
 <via x="34.925" y="12.065" extent="1-16" drill="0.3048"/>
 <wire x1="34.925" y1="12.065" x2="33.72" y2="12.065" width="0.2032" layer="1"/>
-<contactref element="U$6" pad="1"/>
+<contactref element="J1" pad="1"/>
 <wire x1="22.780625" y1="2.143125" x2="40.243125" y2="2.143125" width="0.2032" layer="16"/>
 <via x="42.38625" y="4.28625" extent="1-16" drill="0.3048"/>
 <wire x1="40.243125" y1="2.143125" x2="42.38625" y2="4.28625" width="0.2032" layer="16"/>
@@ -2984,8 +2992,8 @@ design rules under a new name.</descript
 <wire x1="42.35625" y1="5.685" x2="42.38625" y2="5.715" width="0.2032" layer="1"/>
 </signal>
 <signal name="SSR+">
-<contactref element="JP102" pad="P1"/>
-<contactref element="U$13" pad="7"/>
+<contactref element="JP3" pad="P1"/>
+<contactref element="U1" pad="7"/>
 <via x="13.335" y="10.31875" extent="1-16" drill="0.3048"/>
 <wire x1="15.875" y1="11.43" x2="14.44625" y2="11.43" width="0.2032" layer="16"/>
 <wire x1="14.44625" y1="11.43" x2="13.335" y2="10.31875" width="0.2032" layer="16"/>
@@ -2993,26 +3001,29 @@ design rules under a new name.</descript
 <wire x1="13.275625" y1="10.259375" x2="13.335" y2="10.31875" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$23">
-<contactref element="LED102" pad="A"/>
-<contactref element="R102" pad="2"/>
-<wire x1="38.72" y1="10.4775" x2="38.72" y2="11.203" width="0.2032" layer="1"/>
-<wire x1="38.72" y1="11.203" x2="38.1755" y2="11.7475" width="0.2032" layer="1"/>
+<contactref element="LED1" pad="A"/>
+<contactref element="R1" pad="2"/>
+<wire x1="38.1755" y1="11.7475" x2="38.25875" y2="11.7475" width="0.2032" layer="1"/>
+<wire x1="38.25875" y1="11.7475" x2="38.496875" y2="11.509375" width="0.2032" layer="1"/>
+<wire x1="38.496875" y1="11.509375" x2="38.496875" y2="10.700625" width="0.2032" layer="1"/>
+<wire x1="38.496875" y1="10.700625" x2="38.72" y2="10.4775" width="0.2032" layer="1"/>
 </signal>
 <signal name="LED_PWR">
-<contactref element="R102" pad="1"/>
-<contactref element="U$13" pad="32"/>
-<wire x1="19.52625" y1="9.128125" x2="19.764375" y2="8.89" width="0.2032" layer="16"/>
-<wire x1="19.764375" y1="8.89" x2="32.940625" y2="8.89" width="0.2032" layer="16"/>
-<via x="40.005" y="9.525" extent="1-16" drill="0.3048"/>
+<contactref element="R1" pad="1"/>
+<contactref element="U1" pad="32"/>
+<wire x1="19.52625" y1="9.128125" x2="19.923125" y2="8.73125" width="0.2032" layer="16"/>
+<wire x1="19.923125" y1="8.73125" x2="32.781875" y2="8.73125" width="0.2032" layer="16"/>
+<via x="41.195625" y="10.31875" extent="1-16" drill="0.3048"/>
 <wire x1="19.52625" y1="9.128125" x2="17.62125" y2="9.128125" width="0.2032" layer="16"/>
 <via x="17.62125" y="9.128125" extent="1-16" drill="0.3048"/>
 <wire x1="17.62125" y1="9.128125" x2="17.145" y2="9.128125" width="0.2032" layer="1"/>
 <wire x1="17.145" y1="9.128125" x2="16.875625" y2="8.85875" width="0.2032" layer="1"/>
 <wire x1="16.875625" y1="8.85875" x2="16.875625" y2="8.89375" width="0.2032" layer="1"/>
-<wire x1="40.005" y1="9.525" x2="40.005" y2="10.4625" width="0.2032" layer="1"/>
 <wire x1="40.005" y1="10.4625" x2="40.02" y2="10.4775" width="0.2032" layer="1"/>
-<wire x1="40.005" y1="9.525" x2="33.575625" y2="9.525" width="0.2032" layer="16"/>
-<wire x1="33.575625" y1="9.525" x2="32.940625" y2="8.89" width="0.2032" layer="16"/>
+<wire x1="41.195625" y1="10.31875" x2="34.369375" y2="10.31875" width="0.2032" layer="16"/>
+<wire x1="34.369375" y1="10.31875" x2="32.781875" y2="8.73125" width="0.2032" layer="16"/>
+<wire x1="41.195625" y1="10.31875" x2="40.17875" y2="10.31875" width="0.2032" layer="1"/>
+<wire x1="40.17875" y1="10.31875" x2="40.02" y2="10.4775" width="0.2032" layer="1"/>
 </signal>
 <signal name="!RES">
 <via x="5.715" y="5.87375" extent="1-16" drill="0.3048"/>
@@ -3023,7 +3034,7 @@ design rules under a new name.</descript
 <contactref element="LCD1" pad="9"/>
 <wire x1="8.335" y1="6.17625" x2="8.27" y2="6.17625" width="0.2032" layer="16"/>
 <wire x1="8.27" y1="6.17625" x2="8.255" y2="6.19125" width="0.2032" layer="16"/>
-<contactref element="U$13" pad="9"/>
+<contactref element="U1" pad="9"/>
 <wire x1="12.175625" y1="8.89375" x2="7.30625" y2="8.89375" width="0.2032" layer="1"/>
 <wire x1="7.30625" y1="8.89375" x2="5.794375" y2="7.381875" width="0.2032" layer="1"/>
 <wire x1="5.794375" y1="7.381875" x2="5.794375" y2="5.953125" width="0.2032" layer="1"/>
@@ -3034,36 +3045,36 @@ design rules under a new name.</descript
 <wire x1="6.53875" y1="5.52625" x2="6.50875" y2="5.55625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="10"/>
 <wire x1="8.335" y1="5.52625" x2="6.53875" y2="5.52625" width="0.2032" layer="16"/>
-<contactref element="U$13" pad="10"/>
+<contactref element="U1" pad="10"/>
 <wire x1="12.175625" y1="8.39375" x2="7.75875" y2="8.39375" width="0.2032" layer="1"/>
 <wire x1="7.75875" y1="8.39375" x2="6.50875" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="6.50875" y1="7.14375" x2="6.50875" y2="5.55625" width="0.2032" layer="1"/>
 </signal>
 <signal name="T-">
-<contactref element="U104" pad="2"/>
-<contactref element="JP103" pad="P2"/>
+<contactref element="U3" pad="2"/>
+<contactref element="JP4" pad="P2"/>
 <wire x1="26.9875" y1="9.04" x2="26.9875" y2="10.00125" width="0.2032" layer="1"/>
 <wire x1="26.9875" y1="10.00125" x2="27.14625" y2="10.16" width="0.2032" layer="1"/>
 <wire x1="27.14625" y1="10.16" x2="27.94" y2="10.16" width="0.2032" layer="1"/>
 <wire x1="27.94" y1="10.16" x2="29.21" y2="11.43" width="0.2032" layer="1"/>
 </signal>
 <signal name="T+">
-<contactref element="U104" pad="3"/>
-<contactref element="JP103" pad="P1"/>
+<contactref element="U3" pad="3"/>
+<contactref element="JP4" pad="P1"/>
 <wire x1="25.7175" y1="9.04" x2="25.7175" y2="10.4775" width="0.2032" layer="1"/>
 <wire x1="25.7175" y1="10.4775" x2="26.67" y2="11.43" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-BTN">
-<contactref element="SW101" pad="2"/>
-<wire x1="32.385" y1="5.715" x2="33.655" y2="5.715" width="0.2032" layer="16"/>
-<via x="33.655" y="5.715" extent="1-16" drill="0.3048"/>
-<wire x1="20.32" y1="7.14375" x2="30.95625" y2="7.14375" width="0.2032" layer="16"/>
-<wire x1="30.95625" y1="7.14375" x2="32.385" y2="5.715" width="0.2032" layer="16"/>
-<wire x1="33.655" y1="5.715" x2="32.57386875" y2="4.63386875" width="0.2032" layer="1"/>
+<contactref element="SW1" pad="2"/>
+<wire x1="32.305625" y1="5.635625" x2="33.575625" y2="5.635625" width="0.2032" layer="16"/>
+<via x="33.575625" y="5.635625" extent="1-16" drill="0.3048"/>
+<wire x1="20.32" y1="7.14375" x2="30.7975" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="30.7975" y1="7.14375" x2="32.305625" y2="5.635625" width="0.2032" layer="16"/>
+<wire x1="33.575625" y1="5.635625" x2="32.57386875" y2="4.63386875" width="0.2032" layer="1"/>
 <wire x1="20.32" y1="7.14375" x2="19.764375" y2="6.588125" width="0.2032" layer="16"/>
 <wire x1="19.764375" y1="6.588125" x2="19.288125" y2="6.588125" width="0.2032" layer="16"/>
 <via x="19.288125" y="6.588125" extent="1-16" drill="0.3048"/>
-<contactref element="U$13" pad="27"/>
+<contactref element="U1" pad="27"/>
 <wire x1="16.875625" y1="6.39375" x2="18.3" y2="6.39375" width="0.2032" layer="1"/>
 <wire x1="18.3" y1="6.39375" x2="18.494375" y2="6.588125" width="0.2032" layer="1"/>
 <wire x1="18.494375" y1="6.588125" x2="19.288125" y2="6.588125" width="0.2032" layer="1"/>
@@ -3071,7 +3082,7 @@ design rules under a new name.</descript
 <signal name="SPI_MOSI">
 <via x="6.50875" y="4.206875" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="12"/>
-<contactref element="U$13" pad="13"/>
+<contactref element="U1" pad="13"/>
 <wire x1="11.191875" y1="6.19125" x2="8.711875" y2="6.19125" width="0.2032" layer="1"/>
 <wire x1="8.335" y1="4.22625" x2="6.528125" y2="4.22625" width="0.2032" layer="16"/>
 <wire x1="6.528125" y1="4.22625" x2="6.50875" y2="4.206875" width="0.2032" layer="16"/>
@@ -3081,18 +3092,18 @@ design rules under a new name.</descript
 <wire x1="11.894375" y1="6.89375" x2="11.191875" y2="6.19125" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MISO">
-<contactref element="U104" pad="7"/>
+<contactref element="U3" pad="7"/>
 <wire x1="26.9875" y1="3.64" x2="26.9875" y2="5.715" width="0.2032" layer="1"/>
 <wire x1="27.066875" y1="3.560625" x2="26.9875" y2="3.64" width="0.2032" layer="1"/>
-<contactref element="U$13" pad="12"/>
+<contactref element="U1" pad="12"/>
 <via x="26.9875" y="5.715" extent="1-16" drill="0.3048"/>
 <wire x1="26.273125" y1="5.000625" x2="25.479375" y2="5.000625" width="0.2032" layer="16"/>
 <wire x1="25.479375" y1="5.000625" x2="24.526875" y2="5.953125" width="0.2032" layer="16"/>
-<wire x1="24.526875" y1="5.953125" x2="21.034375" y2="5.953125" width="0.2032" layer="16"/>
-<wire x1="21.034375" y1="5.953125" x2="19.764375" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="19.764375" y1="4.683125" x2="13.13435625" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="13.13435625" y1="4.683125" x2="11.43" y2="6.38748125" width="0.2032" layer="16"/>
-<wire x1="11.43" y1="6.38748125" x2="11.43" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="24.526875" y1="5.953125" x2="20.79625" y2="5.953125" width="0.2032" layer="16"/>
+<wire x1="20.79625" y1="5.953125" x2="19.52625" y2="4.683125" width="0.2032" layer="16"/>
+<wire x1="19.52625" y1="4.683125" x2="13.05498125" y2="4.683125" width="0.2032" layer="16"/>
+<wire x1="13.05498125" y1="4.683125" x2="11.43" y2="6.30810625" width="0.2032" layer="16"/>
+<wire x1="11.43" y1="6.30810625" x2="11.43" y2="7.223125" width="0.2032" layer="16"/>
 <via x="11.43" y="7.223125" extent="1-16" drill="0.3048"/>
 <wire x1="12.175625" y1="7.39375" x2="11.600625" y2="7.39375" width="0.2032" layer="1"/>
 <wire x1="11.600625" y1="7.39375" x2="11.43" y2="7.223125" width="0.2032" layer="1"/>
@@ -3101,19 +3112,19 @@ design rules under a new name.</descript
 <signal name="SPI_SCK">
 <via x="6.0325" y="4.92125" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="11"/>
-<contactref element="U104" pad="5"/>
+<contactref element="U3" pad="5"/>
 <via x="24.13" y="5.23875" extent="1-16" drill="0.3048"/>
-<contactref element="U$13" pad="11"/>
+<contactref element="U1" pad="11"/>
 <via x="10.795" y="7.77875" extent="1-16" drill="0.3048"/>
 <wire x1="10.795" y1="6.344109375" x2="12.852859375" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="12.852859375" y1="4.28625" x2="20.0025" y2="4.28625" width="0.2032" layer="16"/>
+<wire x1="12.852859375" y1="4.28625" x2="19.685" y2="4.28625" width="0.2032" layer="16"/>
 <wire x1="10.795" y1="7.89375" x2="8.52875" y2="7.89375" width="0.2032" layer="1"/>
 <wire x1="8.52875" y1="7.89375" x2="7.62" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="7.62" y1="6.985" x2="7.62" y2="5.67" width="0.2032" layer="1"/>
 <wire x1="7.62" y1="5.67" x2="6.82625" y2="4.87625" width="0.2032" layer="1"/>
-<wire x1="20.0025" y1="4.28625" x2="21.193125" y2="5.476875" width="0.2032" layer="16"/>
-<wire x1="21.193125" y1="5.476875" x2="23.891875" y2="5.476875" width="0.2032" layer="16"/>
-<wire x1="23.891875" y1="5.476875" x2="24.13" y2="5.23875" width="0.2032" layer="16"/>
+<wire x1="19.685" y1="4.28625" x2="20.955" y2="5.55625" width="0.2032" layer="16"/>
+<wire x1="20.955" y1="5.55625" x2="23.8125" y2="5.55625" width="0.2032" layer="16"/>
+<wire x1="23.8125" y1="5.55625" x2="24.13" y2="5.23875" width="0.2032" layer="16"/>
 <wire x1="12.175625" y1="7.89375" x2="10.795" y2="7.89375" width="0.2032" layer="1"/>
 <wire x1="10.795" y1="7.89375" x2="10.795" y2="7.77875" width="0.2032" layer="1"/>
 <wire x1="10.795" y1="6.344109375" x2="10.795" y2="7.77875" width="0.2032" layer="16"/>
@@ -3128,14 +3139,14 @@ design rules under a new name.</descript
 <contactref element="LCD1" pad="8"/>
 <via x="5.159375" y="6.82625" extent="1-16" drill="0.3048"/>
 <wire x1="8.335" y1="6.82625" x2="5.159375" y2="6.82625" width="0.2032" layer="16"/>
-<contactref element="U$13" pad="8"/>
+<contactref element="U1" pad="8"/>
 <wire x1="12.775625" y1="9.49375" x2="7.27125" y2="9.49375" width="0.2032" layer="1"/>
 <wire x1="7.27125" y1="9.49375" x2="5.159375" y2="7.381875" width="0.2032" layer="1"/>
 <wire x1="5.159375" y1="7.381875" x2="5.159375" y2="6.82625" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_MAX">
-<contactref element="U104" pad="6"/>
-<contactref element="U$13" pad="25"/>
+<contactref element="U3" pad="6"/>
+<contactref element="U1" pad="25"/>
 <wire x1="19.52625" y1="5.23875" x2="20.6375" y2="6.35" width="0.2032" layer="16"/>
 <wire x1="20.6375" y1="6.35" x2="25.161875" y2="6.35" width="0.2032" layer="16"/>
 <via x="25.7175" y="5.794375" extent="1-16" drill="0.3048"/>
@@ -3149,7 +3160,7 @@ design rules under a new name.</descript
 </signal>
 <signal name="AUX-TX">
 <contactref element="JP1" pad="P1"/>
-<contactref element="U$13" pad="19"/>
+<contactref element="U1" pad="19"/>
 <wire x1="13.775625" y1="4.79375" x2="13.775625" y2="3.933125" width="0.2032" layer="1"/>
 <wire x1="13.775625" y1="3.933125" x2="13.49375" y2="3.65125" width="0.2032" layer="1"/>
 <wire x1="13.49375" y1="3.65125" x2="11.58875" y2="3.65125" width="0.2032" layer="1"/>
@@ -3158,27 +3169,26 @@ design rules under a new name.</descript
 </signal>
 <signal name="AUX-RX">
 <contactref element="JP1" pad="P2"/>
-<contactref element="U$13" pad="20"/>
+<contactref element="U1" pad="20"/>
 <wire x1="14.275625" y1="4.79375" x2="14.275625" y2="3.798125" width="0.2032" layer="1"/>
 <wire x1="14.275625" y1="3.798125" x2="13.97" y2="3.4925" width="0.2032" layer="1"/>
 <wire x1="13.97" y1="3.4925" x2="13.97" y2="2.38125" width="0.2032" layer="1"/>
 </signal>
 <signal name="SWCLK">
-<contactref element="U$6" pad="3"/>
-<contactref element="U$13" pad="24"/>
+<contactref element="J1" pad="3"/>
+<contactref element="U1" pad="24"/>
 <via x="20.240625" y="3.095625" extent="1-16" drill="0.3048"/>
 <wire x1="20.32" y1="2.2225" x2="20.240625" y2="2.143125" width="0.2032" layer="16"/>
 <wire x1="20.240625" y1="3.095625" x2="20.240625" y2="2.143125" width="0.2032" layer="16"/>
 <wire x1="20.240625" y1="3.095625" x2="20.240625" y2="3.571875" width="0.2032" layer="1"/>
 <wire x1="20.240625" y1="3.571875" x2="19.605625" y2="4.206875" width="0.2032" layer="1"/>
-<wire x1="19.605625" y1="4.206875" x2="16.35125" y2="4.206875" width="0.2032" layer="1"/>
-<wire x1="16.275625" y1="4.2825" x2="16.271875" y2="4.28625" width="0.2032" layer="1"/>
-<wire x1="16.275625" y1="4.79375" x2="16.275625" y2="4.2825" width="0.2032" layer="1"/>
-<wire x1="16.275625" y1="4.2825" x2="16.35125" y2="4.206875" width="0.2032" layer="1"/>
+<wire x1="19.605625" y1="4.206875" x2="16.430625" y2="4.206875" width="0.2032" layer="1"/>
+<wire x1="16.430625" y1="4.206875" x2="16.275625" y2="4.361875" width="0.2032" layer="1"/>
+<wire x1="16.275625" y1="4.79375" x2="16.275625" y2="4.361875" width="0.2032" layer="1"/>
 </signal>
 <signal name="SWDIO">
-<contactref element="U$6" pad="4"/>
-<contactref element="U$13" pad="23"/>
+<contactref element="J1" pad="4"/>
+<contactref element="U1" pad="23"/>
 <wire x1="15.775625" y1="4.79375" x2="15.775625" y2="3.909375" width="0.2032" layer="1"/>
 <via x="18.970625" y="3.095625" extent="1-16" drill="0.3048"/>
 <wire x1="19.05" y1="2.2225" x2="18.970625" y2="2.143125" width="0.2032" layer="16"/>