diff --git a/therm.brd b/therm.brd
--- a/therm.brd
+++ b/therm.brd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="7.7.0">
+<eagle version="7.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
@@ -8,7 +8,7 @@
 </settings>
 <grid distance="10" unitdist="mil" unit="mil" style="lines" multiple="1" display="yes" altdistance="5" altunitdist="mil" altunit="mil"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="no" active="yes"/>
+<layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="PWR" color="1" fill="3" visible="no" active="yes"/>
 <layer number="3" name="Route3" color="4" fill="3" visible="no" active="no"/>
 <layer number="4" name="Route4" color="1" fill="4" visible="no" active="no"/>
@@ -23,20 +23,20 @@
 <layer number="13" name="Route13" color="4" fill="5" visible="no" active="no"/>
 <layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
 <layer number="15" name="GND" color="4" fill="6" visible="no" active="yes"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="no" 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="21" name="tPlace" color="7" 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="yes" 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"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
-<layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
+<layer number="29" name="tStop" color="7" fill="3" visible="yes" active="yes"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
 <layer number="32" name="bCream" color="7" fill="5" visible="no" active="yes"/>
@@ -59,7 +59,7 @@
 <layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
 <layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="yes"/>
 <layer number="53" name="tDXF" color="5" fill="9" visible="no" active="yes"/>
 <layer number="54" name="bDXF" color="5" fill="9" visible="no" active="yes"/>
 <layer number="55" name="Panel" color="14" fill="1" visible="no" active="yes"/>
@@ -189,9 +189,9 @@
 <wire x1="47.244" y1="0.873125" x2="47.244" y2="18.176875" width="0" layer="20"/>
 <wire x1="0" y1="18.176875" x2="0" y2="0.873125" width="0" layer="20"/>
 <text x="48.03775" y="-13.589" size="0.8128" layer="22" ratio="16" rot="SMR0">protofusion.org/therm</text>
-<text x="47.72025" y="10.715625" size="0.8128" layer="21" ratio="16" rot="R270">pwr</text>
+<text x="22.57425" y="19.605625" size="0.8128" layer="21" ratio="16" rot="R270">pwr</text>
 <text x="15.14475" y="18.38325" size="0.8128" layer="21" ratio="16" rot="R270">ssr</text>
-<text x="31.27375" y="26.67" size="0.8128" layer="21" ratio="16" rot="R270">tc</text>
+<text x="24.41575" y="19.05" size="0.8128" layer="21" ratio="16" rot="R270">tc</text>
 <text x="17.81175" y="-5.254625" size="0.8128" layer="22" ratio="16" rot="SMR180">ssr</text>
 <text x="17.62125" y="27.384375" size="0.8128" layer="22" ratio="16" rot="SMR180">power</text>
 <text x="24.28875" y="27.384375" size="0.8128" layer="22" ratio="16" rot="SMR180">t/c</text>
@@ -219,7 +219,7 @@
 <dimension x1="0" y1="19.685" x2="46.99" y2="19.685" x3="23.495" y3="-5.08" textsize="1.27" layer="209" dtype="horizontal" unit="inch"/>
 <text x="10.82675" y="-6.2865" size="0.8128" layer="22" ratio="16" rot="MR180">rx</text>
 <text x="16.652875" y="-5.7785" size="0.8128" layer="22" ratio="16" rot="MR180">tx</text>
-<text x="23.701375" y="0.0635" size="0.8128" layer="21" ratio="16" rot="R90">uart</text>
+<text x="20.653375" y="17.8435" 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 2017</text>
 <circle x="24.92375" y="33.17875" radius="0.127" width="0.2032" layer="21"/>
 <circle x="33.909" y="14.605" radius="0.127" width="0.2032" layer="21"/>
@@ -263,6 +263,7 @@
 <hole x="2.2225" y="15.24" drill="0.381"/>
 <circle x="13.49375" y="18.89125" radius="0.127" width="0.2032" layer="21"/>
 <text x="-3.81" y="27.559" size="1.778" layer="1">progconn orientation?</text>
+<text x="18.542" y="22.606" size="1.778" layer="1">Make new GFX</text>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -2434,30 +2435,6 @@ chip</description>
 </package>
 </packages>
 </library>
-<library name="SLAT-Connectors">
-<description>SLAT Connectors</description>
-<packages>
-<package name="JST_ZR-H-2-SM">
-<wire x1="3" y1="-2.85" x2="3" y2="0" width="0.2" layer="21"/>
-<wire x1="3" y1="2.4" x2="3" y2="3.15" width="0.2" layer="21"/>
-<wire x1="3" y1="3.15" x2="-3" y2="3.15" width="0.2" layer="21"/>
-<wire x1="-3" y1="3.15" x2="-3" y2="2.4" width="0.2" layer="21"/>
-<wire x1="-3" y1="0" x2="-3" y2="-2.85" width="0.2" layer="21"/>
-<wire x1="-3" y1="-2.85" x2="-1.4" y2="-2.85" width="0.2" layer="21"/>
-<wire x1="-0.15" y1="-2.85" x2="0.15" y2="-2.85" width="0.2" layer="21"/>
-<wire x1="1.4" y1="-2.85" x2="3" y2="-2.85" width="0.2" layer="21"/>
-<wire x1="-0.75" y1="0" x2="-0.75" y2="1.75" width="0.6096" layer="51"/>
-<wire x1="0.75" y1="0" x2="0.75" y2="1.75" width="0.6096" layer="51"/>
-<text x="-1.79" y="3.44" size="0.8128" layer="25" font="vector" ratio="16">&gt;NAME</text>
-<text x="-2.29" y="-4.4" size="0.8128" layer="27" font="vector" ratio="16">&gt;VALUE</text>
-<rectangle x1="2.176" y1="-2.754" x2="2.926" y2="-2.004" layer="51"/>
-<smd name="P1" x="2.7" y="1.2" dx="1.1" dy="1.9" layer="1" rot="R180"/>
-<smd name="P2" x="-2.7" y="1.2" dx="1.1" dy="1.9" layer="1" rot="R180"/>
-<smd name="2" x="-0.75" y="-2.25" dx="2.2" dy="0.7" layer="1" rot="R270"/>
-<smd name="1" x="0.75" y="-2.25" dx="2.2" dy="0.7" layer="1" rot="R270"/>
-</package>
-</packages>
-</library>
 </libraries>
 <attributes>
 </attributes>
@@ -2657,10 +2634,10 @@ design rules under a new name.</descript
 <attribute name="NAME" x="46.324" y="8.956875" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="49.149" y="7.62" size="0.762" layer="27" rot="R90"/>
 </element>
-<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2210K-3.3" x="30.734" y="11.1125" smashed="yes">
-<attribute name="PROD_ID" value="VREG-00822" x="66.294" y="-21.9075" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="32.258" y="13.11275" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="29.7815" y="10.922" size="0.4064" layer="27"/>
+<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2210K-3.3" x="30.734" y="9.2075" smashed="yes" rot="R180">
+<attribute name="PROD_ID" value="VREG-00822" x="-4.826" y="42.2275" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="NAME" x="29.21" y="7.20725" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="31.6865" y="9.398" size="0.4064" layer="27" rot="R180"/>
 </element>
 <element name="LED1" library="SparkFun-LED" package="LED-0603" value="" x="41.529" y="14.2875" smashed="yes" rot="R270">
 <attribute name="NAME" x="40.243125" y="14.986" size="0.8128" layer="25" ratio="16"/>
@@ -2672,13 +2649,13 @@ design rules under a new name.</descript
 <attribute name="NAME" x="45.316775" y="4.448175" size="0.8128" layer="25" ratio="16"/>
 <attribute name="VALUE" x="42.1132" y="3.7719" size="0.4064" layer="27"/>
 </element>
-<element name="C5" library="SparkFun-Passives" package="0603-CAP" value="4.7uF" x="30.654625" y="8.175625" smashed="yes">
-<attribute name="NAME" x="29.003625" y="8.001" size="0.8128" layer="25" ratio="16" rot="R90"/>
-<attribute name="VALUE" x="29.575125" y="7.032625" size="0.4064" layer="27"/>
+<element name="C5" library="SparkFun-Passives" package="0603-CAP" value="4.7uF" x="30.813375" y="12.144375" smashed="yes" rot="R180">
+<attribute name="NAME" x="32.464375" y="12.319" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="31.892875" y="13.287375" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="30.4165" y="14.2875" smashed="yes">
-<attribute name="NAME" x="31.067375" y="12.207875" size="0.8128" layer="25" ratio="16" rot="R90"/>
-<attribute name="VALUE" x="29.337" y="13.1445" size="0.4064" layer="27"/>
+<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="30.7975" y="6.0325" smashed="yes" rot="R180">
+<attribute name="NAME" x="30.146625" y="8.112125" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="31.877" y="7.1755" size="0.4064" layer="27" rot="R180"/>
 </element>
 <element name="R1" library="Protofusion-passives" package="0402-RES" value="RESISTOR0402" x="41.529" y="13.0175" smashed="yes" rot="R180">
 <attribute name="NAME" x="43.053" y="12.319" size="0.8128" layer="25" ratio="16" rot="R180"/>
@@ -2715,7 +2692,7 @@ design rules under a new name.</descript
 <element name="C19" library="Protofusion-passives" package="0402-CAP" value="0.1uF" x="28.5115" y="9.8425" rot="R270"/>
 <element name="C11" library="Protofusion-passives" package="0402-CAP" value="0.1uF" x="20.939125" y="11.8745" rot="R180"/>
 <element name="Y1" library="microbuilder" package="CRYSTAL_2.5X2" value="16MHz" x="8.255" y="7.62" rot="R90"/>
-<element name="J2" library="SLAT-Connectors" package="JST_ZR-H-2-SM" value="" x="44.0055" y="9.271" rot="MR90"/>
+<element name="JP2" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="31.496" y="13.97" rot="MR0"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -2762,9 +2739,8 @@ design rules under a new name.</descript
 <via x="28.5115" y="12.620625" extent="1-16" drill="0.3048"/>
 <via x="21.3995" y="12.620625" extent="1-16" drill="0.3048"/>
 <wire x1="28.5115" y1="12.620625" x2="27.770875" y2="11.858625" width="0.254" layer="1"/>
-<wire x1="29.7815" y1="8.1525" x2="29.804625" y2="8.175625" width="0.254" layer="1"/>
-<wire x1="30.734" y1="9.8124" x2="30.6705" y2="9.4615" width="0.254" layer="1"/>
-<contactref element="J2" pad="1"/>
+<wire x1="31.6865" y1="12.1675" x2="31.663375" y2="12.144375" width="0.254" layer="1"/>
+<wire x1="30.734" y1="10.5076" x2="30.7975" y2="10.8585" width="0.254" layer="1"/>
 <wire x1="27.3018" y1="6.78125" x2="28.11725" y2="6.78125" width="0.254" layer="1"/>
 <wire x1="28.11725" y1="6.78125" x2="28.368625" y2="7.032625" width="0.254" layer="1"/>
 <via x="28.368625" y="7.032625" extent="1-16" drill="0.3048"/>
@@ -2775,15 +2751,9 @@ design rules under a new name.</descript
 <via x="43.942" y="14.335125" extent="1-16" drill="0.3048"/>
 <via x="44.497625" y="5.349875" extent="1-16" drill="0.3048"/>
 <via x="43.322875" y="11.572875" extent="1-16" drill="0.3048"/>
-<wire x1="31.0665" y1="14.2875" x2="32.0675" y2="14.2875" width="0.254" layer="1"/>
-<wire x1="32.0675" y1="14.2875" x2="32.131" y2="14.351" width="0.254" layer="1"/>
-<via x="32.131" y="14.351" extent="1-16" drill="0.3048"/>
 <via x="23.542625" y="7.032625" extent="1-16" drill="0.3048"/>
 <wire x1="23.542625" y1="7.032625" x2="23.286" y2="6.78125" width="0.254" layer="1"/>
 <wire x1="23.286" y1="6.78125" x2="21.4662" y2="6.78125" width="0.254" layer="1"/>
-<via x="29.765625" y="7.159625" extent="1-16" drill="0.3048"/>
-<wire x1="29.765625" y1="7.159625" x2="29.804625" y2="7.198625" width="0.254" layer="1"/>
-<wire x1="29.804625" y1="7.198625" x2="29.804625" y2="8.175625" width="0.254" layer="1"/>
 <via x="15.24" y="8.128" extent="1-16" drill="0.3048"/>
 <wire x1="14.605" y1="8.763" x2="15.24" y2="8.128" width="0.254" layer="1"/>
 <wire x1="13.99" y1="10.5415" x2="13.99" y2="9.378" width="0.254" layer="1"/>
@@ -2821,8 +2791,8 @@ design rules under a new name.</descript
 <wire x1="11.511" y1="7.4415" x2="11.4935" y2="7.424" width="0.254" layer="1"/>
 <wire x1="18.156" y1="5.7145" x2="18.542" y2="5.3285" width="0.254" layer="1"/>
 <wire x1="9.652" y1="5.519" x2="9.6575" y2="5.5245" width="0.254" layer="1"/>
-<wire x1="30.6705" y1="9.4615" x2="30.6705" y2="9.0415" width="0.254" layer="1"/>
-<wire x1="30.6705" y1="9.0415" x2="29.804625" y2="8.175625" width="0.254" layer="1"/>
+<wire x1="30.7975" y1="10.8585" x2="30.7975" y2="11.2785" width="0.254" layer="1"/>
+<wire x1="30.7975" y1="11.2785" x2="31.663375" y2="12.144375" width="0.254" layer="1"/>
 <wire x1="13.49" y1="10.5415" x2="13.49" y2="10.132" width="0.254" layer="1"/>
 <wire x1="13.49" y1="10.132" x2="13.589" y2="10.033" width="0.254" layer="1"/>
 <wire x1="13.589" y1="10.033" x2="13.589" y2="9.779" width="0.254" layer="1"/>
@@ -2856,9 +2826,14 @@ design rules under a new name.</descript
 <wire x1="44.465875" y1="14.335125" x2="44.704" y2="14.097" width="0.254" layer="1"/>
 <wire x1="44.704" y1="14.097" x2="45.402" y2="14.097" width="0.254" layer="1"/>
 <wire x1="45.402" y1="14.097" x2="45.974" y2="13.525" width="0.254" layer="1"/>
-<wire x1="41.7555" y1="10.021" x2="41.7555" y2="10.8945" width="0.254" layer="16"/>
 <wire x1="41.7555" y1="10.8945" x2="42.433875" y2="11.572875" width="0.254" layer="16"/>
 <wire x1="43.322875" y1="11.572875" x2="42.433875" y2="11.572875" width="0.254" layer="16"/>
+<contactref element="JP2" pad="P2"/>
+<wire x1="31.6865" y1="12.1675" x2="31.6865" y2="13.7795" width="0.254" layer="1"/>
+<wire x1="31.6865" y1="13.7795" x2="31.496" y2="13.97" width="0.254" layer="1"/>
+<wire x1="30.1475" y1="6.0325" x2="29.5275" y2="6.0325" width="0.254" layer="1"/>
+<wire x1="29.5275" y1="6.0325" x2="29.083" y2="6.477" width="0.254" layer="1"/>
+<via x="29.083" y="6.477" extent="1-16" drill="0.3048"/>
 </signal>
 <signal name="N$1">
 <contactref element="LCD1" pad="2"/>
@@ -2967,11 +2942,9 @@ design rules under a new name.</descript
 <wire x1="27.31305" y1="9.3925" x2="26.2945" y2="9.3925" width="0.254" layer="1"/>
 <wire x1="26.2945" y1="9.3925" x2="26.289" y2="9.398" width="0.254" layer="1"/>
 <via x="26.289" y="9.398" extent="1-16" drill="0.3048"/>
-<via x="28.702" y="14.224" extent="1-16" drill="0.3048"/>
-<wire x1="28.702" y1="14.224" x2="29.703" y2="14.224" width="0.254" layer="1"/>
-<wire x1="29.703" y1="14.224" x2="29.7665" y2="14.2875" width="0.254" layer="1"/>
-<wire x1="29.784" y1="12.4126" x2="29.784" y2="14.27" width="0.254" layer="1"/>
-<wire x1="29.784" y1="14.27" x2="29.7665" y2="14.2875" width="0.254" layer="1"/>
+<via x="30.734" y="7.874" extent="1-16" drill="0.3048"/>
+<wire x1="31.684" y1="7.9074" x2="31.684" y2="6.05" width="0.254" layer="1"/>
+<wire x1="31.684" y1="6.05" x2="31.4475" y2="6.0325" width="0.254" layer="1"/>
 <via x="11.6205" y="11.4935" extent="1-16" drill="0.3048"/>
 <via x="10.7315" y="7.9375" extent="1-16" drill="0.3048"/>
 <via x="19.3675" y="6.5405" extent="1-16" drill="0.3048"/>
@@ -3002,34 +2975,36 @@ design rules under a new name.</descript
 <wire x1="12.3135" y1="11.4935" x2="11.6205" y2="11.4935" width="0.254" layer="1"/>
 <wire x1="17.59" y1="6.4415" x2="18.329" y2="6.4415" width="0.254" layer="1"/>
 <wire x1="18.329" y1="6.4415" x2="18.542" y2="6.2285" width="0.254" layer="1"/>
+<wire x1="30.734" y1="7.874" x2="31.6506" y2="7.874" width="0.254" layer="1"/>
+<wire x1="31.6506" y1="7.874" x2="31.684" y2="7.9074" width="0.254" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="U2" pad="3"/>
 <contactref element="U2" pad="1"/>
 <contactref element="D1" pad="C"/>
 <contactref element="C5" pad="2"/>
-<wire x1="31.6865" y1="7.99375" x2="31.504625" y2="8.175625" width="0.254" layer="1"/>
-<wire x1="31.6865" y1="9.8149" x2="31.684" y2="9.8124" width="0.254" layer="1"/>
-<contactref element="J2" pad="2"/>
+<wire x1="29.7815" y1="12.32625" x2="29.963375" y2="12.144375" width="0.254" layer="1"/>
+<wire x1="29.7815" y1="10.5051" x2="29.784" y2="10.5076" width="0.254" layer="1"/>
 <wire x1="42.199" y1="4.7625" x2="41.5925" y2="4.7625" width="0.254" layer="1"/>
 <wire x1="41.5925" y1="4.7625" x2="41.402" y2="4.572" width="0.254" layer="1"/>
 <via x="41.402" y="4.572" extent="1-16" drill="0.3048"/>
 <wire x1="41.402" y1="4.572" x2="41.402" y2="8.521" width="0.254" layer="16"/>
-<wire x1="38.608" y1="9.906" x2="33.528" y2="9.906" width="0.254" layer="16"/>
-<wire x1="33.528" y1="9.906" x2="32.512" y2="10.922" width="0.254" layer="16"/>
-<via x="32.512" y="10.922" extent="1-16" drill="0.3048"/>
-<wire x1="31.684" y1="9.8124" x2="31.684" y2="8.355" width="0.254" layer="1"/>
-<wire x1="31.684" y1="8.355" x2="31.504625" y2="8.175625" width="0.254" layer="1"/>
-<wire x1="32.512" y1="10.922" x2="31.75" y2="10.922" width="0.254" layer="1"/>
-<wire x1="31.75" y1="10.922" x2="30.099" y2="10.922" width="0.254" layer="1"/>
-<wire x1="30.099" y1="10.922" x2="29.784" y2="10.607" width="0.254" layer="1"/>
-<wire x1="29.784" y1="9.8124" x2="29.784" y2="10.607" width="0.254" layer="1"/>
-<wire x1="31.6865" y1="9.8149" x2="31.6865" y2="10.8585" width="0.254" layer="1"/>
-<wire x1="31.6865" y1="10.8585" x2="31.75" y2="10.922" width="0.254" layer="1"/>
-<wire x1="41.402" y1="8.521" x2="41.7555" y2="8.521" width="0.254" layer="16"/>
+<wire x1="38.608" y1="9.906" x2="33.274" y2="9.906" width="0.254" layer="16"/>
+<wire x1="33.274" y1="9.906" x2="32.766" y2="9.398" width="0.254" layer="16"/>
+<via x="32.766" y="9.398" extent="1-16" drill="0.3048"/>
+<wire x1="29.784" y1="10.5076" x2="29.784" y2="11.965" width="0.254" layer="1"/>
+<wire x1="29.784" y1="11.965" x2="29.963375" y2="12.144375" width="0.254" layer="1"/>
 <wire x1="38.608" y1="9.906" x2="40.005" y2="8.509" width="0.254" layer="16"/>
 <wire x1="40.005" y1="8.509" x2="41.7435" y2="8.509" width="0.254" layer="16"/>
-<wire x1="41.7435" y1="8.509" x2="41.7555" y2="8.521" width="0.254" layer="16"/>
+<contactref element="JP2" pad="P1"/>
+<wire x1="32.766" y1="9.398" x2="31.684" y2="9.398" width="0.254" layer="1"/>
+<wire x1="31.684" y1="9.398" x2="29.972" y2="9.398" width="0.254" layer="1"/>
+<wire x1="29.972" y1="9.398" x2="29.784" y2="9.586" width="0.254" layer="1"/>
+<wire x1="29.784" y1="10.5076" x2="29.784" y2="9.586" width="0.254" layer="1"/>
+<wire x1="31.684" y1="10.5076" x2="31.684" y2="9.398" width="0.254" layer="1"/>
+<wire x1="29.7815" y1="12.32625" x2="29.7815" y2="13.1445" width="0.254" layer="1"/>
+<wire x1="29.7815" y1="13.1445" x2="28.956" y2="13.97" width="0.254" layer="1"/>
+<wire x1="41.7435" y1="8.509" x2="41.402" y2="8.521" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="SW-A">
 <contactref element="SW1" pad="1"/>
@@ -3112,10 +3087,8 @@ design rules under a new name.</descript
 <wire x1="20.574" y1="6.35" x2="20.574" y2="8.36511875" width="0.254" layer="1"/>
 <wire x1="20.574" y1="8.36511875" x2="19.99761875" y2="8.9415" width="0.254" layer="1"/>
 <wire x1="19.99761875" y1="8.9415" x2="17.59" y2="8.9415" width="0.254" layer="1"/>
-<wire x1="40.105671875" y1="4.841875" x2="32.750125" y2="4.841875" width="0.254" layer="1"/>
-<wire x1="32.750125" y1="4.841875" x2="31.496" y2="6.096" width="0.254" layer="1"/>
-<wire x1="31.496" y1="6.096" x2="20.828" y2="6.096" width="0.254" layer="1"/>
-<wire x1="20.828" y1="6.096" x2="20.574" y2="6.35" width="0.254" layer="1"/>
+<wire x1="40.105671875" y1="4.841875" x2="22.082125" y2="4.841875" width="0.254" layer="1"/>
+<wire x1="22.082125" y1="4.841875" x2="20.574" y2="6.35" width="0.254" layer="1"/>
 </signal>
 <signal name="D-">
 <contactref element="JP1" pad="D-"/>
@@ -3124,10 +3097,8 @@ design rules under a new name.</descript
 <wire x1="42.4665" y1="8.875" x2="42.32275" y2="8.73125" width="0.254" layer="1"/>
 <wire x1="42.32275" y1="8.73125" x2="42.32275" y2="6.3939625" width="0.254" layer="1"/>
 <wire x1="42.32275" y1="6.3939625" x2="40.2944125" y2="4.365625" width="0.254" layer="1"/>
-<wire x1="40.2944125" y1="4.365625" x2="32.464375" y2="4.365625" width="0.254" layer="1"/>
-<wire x1="32.464375" y1="4.365625" x2="31.242" y2="5.588" width="0.254" layer="1"/>
-<wire x1="31.242" y1="5.588" x2="20.574" y2="5.588" width="0.254" layer="1"/>
-<wire x1="20.574" y1="5.588" x2="20.066" y2="6.096" width="0.254" layer="1"/>
+<wire x1="40.2944125" y1="4.365625" x2="21.796375" y2="4.365625" width="0.254" layer="1"/>
+<wire x1="21.796375" y1="4.365625" x2="20.066" y2="6.096" width="0.254" layer="1"/>
 <wire x1="20.066" y1="6.096" x2="20.066" y2="8.058134375" width="0.254" layer="1"/>
 <wire x1="17.59" y1="8.4415" x2="19.682634375" y2="8.4415" width="0.254" layer="1"/>
 <wire x1="19.682634375" y1="8.4415" x2="20.066" y2="8.058134375" width="0.254" layer="1"/>