diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="no" altdistance="3.125" altunitdist="mil" altunit="mil"/>
+<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="yes" altdistance="3.125" altunitdist="mil" altunit="mil"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
@@ -23,12 +23,12 @@
 <layer number="13" name="Route13" color="4" fill="5" visible="no" active="no"/>
 <layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
 <layer number="15" name="Route15" color="4" fill="6" visible="no" active="no"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="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="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="24" name="bOrigins" color="15" 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="no" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="yes" 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"/>
@@ -168,8 +168,8 @@
 </layers>
 <board>
 <plain>
-<wire x1="45.085" y1="1.27" x2="45.085" y2="17.78" width="0" layer="20"/>
-<wire x1="0" y1="17.78" x2="0" y2="1.27" width="0" layer="20"/>
+<wire x1="45.085" y1="0.873125" x2="45.085" y2="18.176875" width="0" layer="20"/>
+<wire x1="0" y1="18.176875" x2="0" y2="0.873125" width="0" layer="20"/>
 <text x="44.60875" y="4.445" size="0.8128" layer="22" ratio="16" rot="SMR0">protofusion.org/therm</text>
 <text x="22.06625" y="15.160625" size="0.8128" layer="21" ratio="16" rot="R270">pwr</text>
 <text x="16.66875" y="15.08125" size="0.8128" layer="21" ratio="16" rot="R270">ssr</text>
@@ -183,52 +183,19 @@
 <text x="20.0025" y="10.31875" size="0.8128" layer="22" ratio="16" rot="SMR180">+</text>
 <text x="29.606875" y="10.31875" size="0.8128" layer="22" ratio="16" rot="SMR180">-</text>
 <text x="26.51125" y="10.31875" size="0.8128" layer="22" ratio="16" rot="SMR180">+</text>
-<wire x1="0" y1="17.78" x2="1.27" y2="19.05" width="0" layer="20" curve="-90"/>
-<wire x1="1.27" y1="19.05" x2="2.54" y2="19.05" width="0" layer="20"/>
-<wire x1="2.54" y1="19.05" x2="3.81" y2="17.78" width="0" layer="20" curve="-90"/>
-<wire x1="3.81" y1="17.78" x2="3.81" y2="15.24" width="0" layer="20"/>
-<hole x="1.905" y="17.145" drill="2.54"/>
-<wire x1="3.81" y1="3.81" x2="3.81" y2="1.27" width="0" layer="20"/>
-<wire x1="3.81" y1="1.27" x2="2.54" y2="0" width="0" layer="20" curve="-90"/>
-<wire x1="2.54" y1="0" x2="1.27" y2="0" width="0" layer="20"/>
-<wire x1="1.27" y1="0" x2="0" y2="1.27" width="0" layer="20" curve="-90"/>
-<hole x="1.905" y="1.905" drill="2.54"/>
-<hole x="3.571875" y="3.81" drill="0.381"/>
-<hole x="2.936875" y="3.81" drill="0.381"/>
-<hole x="2.301875" y="3.81" drill="0.381"/>
-<hole x="1.5875" y="3.81" drill="0.381"/>
-<hole x="0.9525" y="3.81" drill="0.381"/>
-<hole x="0.238125" y="3.81" drill="0.381"/>
-<wire x1="41.275" y1="15.24" x2="41.275" y2="17.78" width="0" layer="20"/>
-<wire x1="41.275" y1="17.78" x2="42.545" y2="19.05" width="0" layer="20" curve="-90"/>
-<wire x1="42.545" y1="19.05" x2="43.815" y2="19.05" width="0" layer="20"/>
-<wire x1="43.815" y1="19.05" x2="45.085" y2="17.78" width="0" layer="20" curve="-90"/>
-<hole x="43.18" y="17.145" drill="2.54"/>
-<wire x1="45.085" y1="1.27" x2="43.815" y2="0" width="0" layer="20" curve="-90"/>
-<wire x1="43.815" y1="0" x2="42.545" y2="0" width="0" layer="20"/>
-<wire x1="42.545" y1="0" x2="41.275" y2="1.27" width="0" layer="20" curve="-90"/>
-<wire x1="41.275" y1="1.27" x2="41.275" y2="3.81" width="0" layer="20"/>
-<hole x="43.18" y="1.905" drill="2.54"/>
-<wire x1="41.275" y1="3.81" x2="3.81" y2="3.81" width="0" layer="20"/>
-<wire x1="3.81" y1="15.24" x2="41.275" y2="15.24" width="0" layer="20"/>
-<hole x="3.571875" y="15.24" drill="0.381"/>
-<hole x="2.936875" y="15.24" drill="0.381"/>
-<hole x="2.301875" y="15.24" drill="0.381"/>
-<hole x="1.5875" y="15.24" drill="0.381"/>
-<hole x="0.9525" y="15.24" drill="0.381"/>
-<hole x="0.238125" y="15.24" drill="0.381"/>
-<hole x="44.846875" y="15.24" drill="0.381"/>
-<hole x="44.211875" y="15.24" drill="0.381"/>
-<hole x="43.576875" y="15.24" drill="0.381"/>
-<hole x="42.8625" y="15.24" drill="0.381"/>
+<wire x1="40.64" y1="15.24" x2="40.64" y2="18.176875" width="0" layer="20"/>
+<wire x1="40.64" y1="18.176875" x2="41.91" y2="19.446875" width="0" layer="20" curve="-90"/>
+<wire x1="41.91" y1="19.446875" x2="43.815" y2="19.446875" width="0" layer="20"/>
+<wire x1="43.815" y1="19.446875" x2="45.085" y2="18.176875" width="0" layer="20" curve="-90"/>
+<hole x="42.8625" y="17.224375" drill="2.54"/>
+<wire x1="40.64" y1="3.81" x2="4.445" y2="3.81" width="0" layer="20"/>
+<wire x1="4.445" y1="15.24" x2="40.64" y2="15.24" width="0" layer="20"/>
+<hole x="44.7675" y="15.24" drill="0.381"/>
+<hole x="44.1325" y="15.24" drill="0.381"/>
+<hole x="43.4975" y="15.24" drill="0.381"/>
 <hole x="42.2275" y="15.24" drill="0.381"/>
-<hole x="41.513125" y="15.24" drill="0.381"/>
-<hole x="44.846875" y="3.81" drill="0.381"/>
-<hole x="44.211875" y="3.81" drill="0.381"/>
-<hole x="43.576875" y="3.81" drill="0.381"/>
-<hole x="42.8625" y="3.81" drill="0.381"/>
-<hole x="42.2275" y="3.81" drill="0.381"/>
-<hole x="41.513125" y="3.81" drill="0.381"/>
+<hole x="41.5925" y="15.24" drill="0.381"/>
+<hole x="40.9575" y="15.24" drill="0.381"/>
 <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"/>
@@ -239,6 +206,43 @@
 <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"/>
 <circle x="41.195625" y="14.525625" radius="0.127" width="0.2032" layer="21"/>
+<hole x="42.8625" y="15.24" drill="0.381"/>
+<wire x1="40.64" y1="3.81" x2="40.64" y2="0.873125" width="0" layer="20"/>
+<wire x1="45.085" y1="0.873125" x2="43.815" y2="-0.396875" width="0" layer="20" curve="-90"/>
+<wire x1="43.815" y1="-0.396875" x2="41.91" y2="-0.396875" width="0" layer="20"/>
+<wire x1="41.91" y1="-0.396875" x2="40.64" y2="0.873125" width="0" layer="20" curve="-90"/>
+<hole x="42.8625" y="1.825625" drill="2.54"/>
+<hole x="40.9575" y="3.81" drill="0.381"/>
+<hole x="41.5925" y="3.81" drill="0.381"/>
+<hole x="42.2275" y="3.81" drill="0.381"/>
+<hole x="43.4975" y="3.81" drill="0.381"/>
+<hole x="44.1325" y="3.81" drill="0.381"/>
+<hole x="44.7675" y="3.81" drill="0.381"/>
+<hole x="42.8625" y="3.81" drill="0.381"/>
+<wire x1="4.445" y1="3.81" x2="4.445" y2="0.873125" width="0" layer="20"/>
+<wire x1="4.445" y1="0.873125" x2="3.175" y2="-0.396875" width="0" layer="20" curve="-90"/>
+<wire x1="3.175" y1="-0.396875" x2="1.27" y2="-0.396875" width="0" layer="20"/>
+<wire x1="1.27" y1="-0.396875" x2="0" y2="0.873125" width="0" layer="20" curve="-90"/>
+<hole x="2.2225" y="1.825625" drill="2.54"/>
+<hole x="0.3175" y="3.81" drill="0.381"/>
+<hole x="0.9525" y="3.81" drill="0.381"/>
+<hole x="1.5875" y="3.81" drill="0.381"/>
+<hole x="2.8575" y="3.81" drill="0.381"/>
+<hole x="3.4925" y="3.81" drill="0.381"/>
+<hole x="4.1275" y="3.81" drill="0.381"/>
+<hole x="2.2225" y="3.81" drill="0.381"/>
+<wire x1="4.445" y1="15.24" x2="4.445" y2="18.176875" width="0" layer="20"/>
+<wire x1="0" y1="18.176875" x2="1.27" y2="19.446875" width="0" layer="20" curve="-90"/>
+<wire x1="1.27" y1="19.446875" x2="3.175" y2="19.446875" width="0" layer="20"/>
+<wire x1="3.175" y1="19.446875" x2="4.445" y2="18.176875" width="0" layer="20" curve="-90"/>
+<hole x="2.2225" y="17.224375" drill="2.54"/>
+<hole x="4.1275" y="15.24" drill="0.381"/>
+<hole x="3.4925" y="15.24" drill="0.381"/>
+<hole x="2.8575" y="15.24" drill="0.381"/>
+<hole x="1.5875" y="15.24" drill="0.381"/>
+<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"/>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -2331,7 +2335,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 
@@ -2410,7 +2414,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"/>
@@ -2595,14 +2599,12 @@ design rules under a new name.</descript
 <contactref element="C8" pad="1"/>
 <contactref element="C5" pad="1"/>
 <contactref element="C7" pad="2"/>
-<polygon width="0.254" layer="16">
+<polygon width="0.254" layer="16" isolate="0.2032">
 <vertex x="0" y="3.81"/>
 <vertex x="45.085" y="3.81"/>
 <vertex x="45.085" y="15.24"/>
 <vertex x="0" y="15.24"/>
 </polygon>
-<wire x1="21.59" y1="10.5076" x2="21.59" y2="11.89125" width="0.2032" layer="1"/>
-<wire x1="21.59" y1="11.89125" x2="22.08125" y2="12.3825" width="0.2032" layer="1"/>
 <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="21.510625" y="5.635625" extent="1-16" drill="0.3048"/>
@@ -2621,7 +2623,6 @@ design rules under a new name.</descript
 <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="8.325" x2="0.8125" y2="7.11" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="9.925" x2="0.8125" y2="8.325" width="0.2032" layer="1"/>
 <via x="14.525625" y="9.68375" extent="1-16" drill="0.3048"/>
 <wire x1="8.335" y1="10.66625" x2="5.08" y2="10.66625" width="0.2032" layer="16"/>
@@ -2653,16 +2654,11 @@ design rules under a new name.</descript
 <wire x1="43.84625" y1="5.525" x2="44.370625" y2="5.000625" width="0.2032" layer="1"/>
 <wire x1="14.525625" y1="9.68375" x2="15.775625" y2="10.93375" width="0.2032" layer="1"/>
 <contactref element="R3" pad="1"/>
-<wire x1="0.8125" y1="7.11" x2="0.84625" y2="7.14375" width="0.2032" layer="1"/>
-<wire x1="0.84625" y1="7.14375" x2="0.9375" y2="6.985" width="0.2032" layer="1"/>
 <via x="0.873125" y="6.0325" extent="1-16" drill="0.3048"/>
-<wire x1="0.873125" y1="6.0325" x2="0.873125" y2="7.12875" width="0.2032" layer="1"/>
-<wire x1="0.873125" y1="7.12875" x2="0.9375" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="0.873125" y1="6.0325" x2="0.873125" y2="7.049375" width="0.2032" layer="1"/>
 <contactref element="U3" pad="1"/>
 <wire x1="21.510625" y1="5.635625" x2="21.11375" y2="5.635625" width="0.2032" layer="1"/>
 <wire x1="21.11375" y1="5.635625" x2="20.955" y2="5.794375" width="0.2032" layer="1"/>
-<wire x1="20.955" y1="5.794375" x2="20.955" y2="6.6525" width="0.2032" layer="1"/>
-<wire x1="20.955" y1="6.6525" x2="20.94" y2="6.588125" width="0.2032" layer="1"/>
 <wire x1="29.36875" y1="9.525" x2="25.4" y2="9.525" width="0.2032" layer="1"/>
 <wire x1="25.4" y1="9.525" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
 <wire x1="23.97125" y1="8.795625" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
@@ -2670,6 +2666,16 @@ design rules under a new name.</descript
 <wire x1="29.36875" y1="10.706875" x2="29.36875" y2="9.525" width="0.2032" layer="1"/>
 <wire x1="29.36875" y1="9.525" x2="29.36875" y2="8.651875" width="0.2032" layer="1"/>
 <wire x1="11.7475" y1="14.366875" x2="12.84375" y2="14.366875" 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="20.955" y1="5.794375" x2="20.955" y2="6.573125" width="0.2032" layer="1"/>
+<wire x1="20.955" y1="6.573125" x2="20.94" y2="6.588125" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
 <via x="4.445" y="13.6525" extent="1-16" drill="0.3048"/>
@@ -2681,15 +2687,15 @@ design rules under a new name.</descript
 </signal>
 <signal name="N$2">
 <via x="5.3975" y="13.890625" extent="1-16" drill="0.3048"/>
-<wire x1="5.3975" y1="13.890625" x2="5.45125" y2="13.91625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="1"/>
-<wire x1="5.45125" y1="13.91625" x2="8.335" y2="13.91625" width="0.2032" layer="16"/>
 <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="4.841875" y2="14.44625" width="0.2032" layer="1"/>
 <wire x1="4.841875" y1="14.44625" x2="5.3975" y2="13.890625" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="13.91625" x2="5.423125" y2="13.91625" width="0.2032" layer="16"/>
+<wire x1="5.423125" y1="13.91625" x2="5.3975" y2="13.890625" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$3">
 <via x="4.445" y="12.065" extent="1-16" drill="0.3048"/>
@@ -2753,8 +2759,11 @@ design rules under a new name.</descript
 <via x="3.81" y="11.27125" extent="1-16" drill="0.3048"/>
 <wire x1="22.5425" y1="7.9099" x2="22.5425" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="22.5425" y1="8.969375" x2="20.558125" y2="8.969375" width="0.2032" layer="1"/>
-<wire x1="20.558125" y1="8.969375" x2="20.0025" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="20.0025" y1="9.525" x2="20.0025" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="20.558125" y1="8.969375" x2="19.84375" y2="9.68375" width="0.2032" layer="1"/>
+<wire x1="19.84375" y1="9.68375" x2="19.84375" y2="11.0603625" width="0.2032" layer="1"/>
+<wire x1="19.84375" y1="11.0603625" x2="19.4741125" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="19.4741125" y1="11.43" x2="18.653125" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="18.653125" y1="11.43" x2="18.494375" y2="11.58875" width="0.2032" layer="1"/>
 <contactref element="LCD1" pad="5"/>
 <contactref element="LCD1" pad="7"/>
 <wire x1="8.335" y1="10.01625" x2="8.35" y2="10.00125" width="0.2032" layer="16"/>
@@ -2770,7 +2779,6 @@ design rules under a new name.</descript
 <via x="4.60375" y="10.00125" extent="1-16" drill="0.3048"/>
 <via x="10.16" y="8.09625" extent="1-16" drill="0.3048"/>
 <wire x1="10.16" y1="8.09625" x2="10.16" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="20.0025" y1="11.43" x2="19.764375" y2="11.668125" width="0.2032" layer="1"/>
 <wire x1="14.3025" y1="12.006875" x2="14.275625" y2="12.03375" width="0.2032" layer="1"/>
 <wire x1="8.35" y1="10.00125" x2="10.16" y2="10.00125" width="0.2032" layer="16"/>
 <wire x1="10.33375" y1="6.985" x2="10.33375" y2="7.9225" width="0.2032" layer="1"/>
@@ -2782,9 +2790,7 @@ design rules under a new name.</descript
 <wire x1="10.16" y1="10.00125" x2="10.16" y2="11.31625" width="0.2032" layer="16"/>
 <wire x1="8.335" y1="11.31625" x2="10.16" y2="11.31625" width="0.2032" layer="16"/>
 <wire x1="16.275625" y1="12.03375" x2="16.275625" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="19.764375" y1="11.668125" x2="18.57375" y2="11.668125" width="0.2032" layer="1"/>
-<wire x1="18.57375" y1="11.668125" x2="18.494375" y2="11.7475" width="0.2032" layer="1"/>
-<wire x1="18.494375" y1="11.7475" x2="18.494375" y2="12.3675" width="0.2032" layer="1"/>
+<wire x1="18.494375" y1="11.58875" x2="18.494375" y2="12.3675" width="0.2032" layer="1"/>
 <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.859375" y2="12.3825" width="0.2032" layer="1"/>
 <wire x1="17.859375" y1="12.3825" x2="17.383125" y2="12.85875" width="0.2032" layer="1"/>
@@ -2796,7 +2802,7 @@ design rules under a new name.</descript
 <wire x1="10.16" y1="11.31625" x2="10.16" y2="11.826875" width="0.2032" layer="16"/>
 <wire x1="10.16" y1="11.826875" x2="11.350625" y2="13.0175" width="0.2032" layer="16"/>
 <wire x1="14.275625" y1="12.85875" x2="14.275625" y2="13.49375" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="13.49375" x2="14.275625" y2="13.996875" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="13.49375" x2="14.275625" y2="14.235" width="0.2032" layer="1"/>
 <wire x1="8.335" y1="10.01625" x2="4.61875" y2="10.01625" width="0.2032" layer="16"/>
 <wire x1="4.61875" y1="10.01625" x2="4.60375" y2="10.00125" width="0.2032" layer="16"/>
 <wire x1="2.3625" y1="9.925" x2="4.5275" y2="9.925" width="0.2032" layer="1"/>
@@ -2813,9 +2819,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"/>
-<wire x1="14.275625" y1="13.996875" x2="14.14375" y2="14.366875" width="0.2032" layer="1"/>
 <wire x1="11.350625" y1="13.0175" x2="11.826875" y2="13.49375" width="0.2032" layer="1"/>
 <wire x1="11.826875" y1="13.49375" x2="14.275625" y2="13.49375" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="14.235" x2="14.14375" y2="14.366875" width="0.2032" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="JP2" pad="P1"/>
@@ -2839,11 +2845,9 @@ design rules under a new name.</descript
 <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.32125" y1="13.0175" x2="29.845" y2="12.54125" width="0.2032" layer="16"/>
-<wire x1="29.845" y1="12.54125" x2="23.65375" y2="12.54125" width="0.2032" layer="16"/>
-<wire x1="30.32125" y1="13.0175" x2="30.32125" y2="14.366875" width="0.2032" layer="16"/>
-<wire x1="30.32125" y1="14.366875" x2="30.559375" y2="14.605" width="0.2032" layer="16"/>
-<wire x1="30.559375" y1="14.605" x2="31.115" y2="14.605" width="0.2032" layer="16"/>
+<wire x1="23.65375" y1="12.54125" x2="30.216975" y2="12.54125" width="0.2032" layer="16"/>
+<wire x1="30.216975" y1="12.54125" 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"/>
 </signal>
 <signal name="SW-A">
 <contactref element="SW1" pad="1"/>
@@ -2881,17 +2885,17 @@ design rules under a new name.</descript
 <signal name="SW-B">
 <contactref element="SW1" pad="4"/>
 <via x="35.2425" y="11.826875" extent="1-16" drill="0.3048"/>
-<via x="19.3675" y="11.033125" extent="1-16" drill="0.3048"/>
-<wire x1="19.3675" y1="11.033125" x2="18.25625" y2="11.033125" width="0.2032" layer="1"/>
-<wire x1="18.25625" y1="11.033125" x2="17.656875" y2="10.43375" width="0.2032" layer="1"/>
+<via x="18.0975" y="11.033125" extent="1-16" drill="0.3048"/>
 <contactref element="U1" pad="30"/>
-<wire x1="16.875625" y1="10.43375" x2="17.656875" y2="10.43375" width="0.2032" layer="1"/>
-<wire x1="32.54375" y1="10.874375" x2="19.52625" y2="10.874375" width="0.2032" layer="16"/>
-<wire x1="19.52625" y1="10.874375" x2="19.3675" y2="11.033125" width="0.2032" layer="16"/>
+<wire x1="16.875625" y1="10.43375" x2="17.498125" y2="10.43375" width="0.2032" layer="1"/>
+<wire x1="32.54375" y1="10.874375" x2="20.0025" y2="10.874375" 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.54375" y1="10.874375" x2="33.49625" y2="11.826875" width="0.2032" layer="16"/>
 <wire x1="33.49625" y1="11.826875" x2="35.2425" y2="11.826875" width="0.2032" layer="16"/>
+<wire x1="20.0025" y1="10.874375" x2="19.84375" y2="11.033125" width="0.2032" layer="16"/>
+<wire x1="19.84375" y1="11.033125" x2="18.0975" y2="11.033125" width="0.2032" layer="16"/>
+<wire x1="17.498125" y1="10.43375" x2="18.0975" y2="11.033125" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-D">
 <contactref element="SW1" pad="6"/>
@@ -2914,13 +2918,13 @@ design rules under a new name.</descript
 <contactref element="J2" pad="D+"/>
 <contactref element="U1" pad="22"/>
 <wire x1="24.13" y1="6.429375" x2="24.13" y2="5.731878125" width="0.2032" layer="1"/>
-<wire x1="24.13" y1="5.731878125" x2="23.001871875" y2="4.60375" width="0.2032" layer="1"/>
-<wire x1="23.001871875" y1="4.60375" x2="18.735625" y2="4.60375" width="0.2032" layer="1"/>
+<wire x1="24.13" y1="5.731878125" x2="23.319371875" y2="4.92125" width="0.2032" layer="1"/>
+<wire x1="23.319371875" y1="4.92125" x2="18.418125" y2="4.92125" width="0.2032" layer="1"/>
 <wire x1="15.275625" y1="7.33375" x2="15.275625" y2="6.314375" width="0.2032" layer="1"/>
 <contactref element="J1" pad="5"/>
 <wire x1="17.700625" y1="4.683125" x2="17.700625" y2="5.63875" width="0.2032" layer="16"/>
 <via x="17.700625" y="5.63875" extent="1-16" drill="0.3048"/>
-<wire x1="18.735625" y1="4.60375" x2="17.700625" y2="5.63875" width="0.2032" layer="1"/>
+<wire x1="18.418125" y1="4.92125" x2="17.700625" y2="5.63875" width="0.2032" layer="1"/>
 <wire x1="17.700625" y1="5.63875" x2="17.38625" y2="5.953125" width="0.2032" layer="1"/>
 <wire x1="17.38625" y1="5.953125" x2="15.636875" y2="5.953125" width="0.2032" layer="1"/>
 <wire x1="15.636875" y1="5.953125" x2="15.275625" y2="6.314375" width="0.2032" layer="1"/>
@@ -2928,8 +2932,9 @@ design rules under a new name.</descript
 <via x="24.13" y="6.429375" extent="1-16" drill="0.3048"/>
 <wire x1="39.0525" y1="9.50824375" x2="41.14824375" y2="9.50824375" width="0.2032" layer="1"/>
 <wire x1="41.14824375" y1="9.50824375" x2="41.165" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="39.0525" y1="9.50824375" x2="35.97363125" y2="6.429375" width="0.2032" layer="16"/>
-<wire x1="35.97363125" y1="6.429375" x2="24.13" y2="6.429375" width="0.2032" layer="16"/>
+<wire x1="36.67125" y1="6.429375" x2="24.13" y2="6.429375" width="0.2032" layer="16"/>
+<wire x1="36.67125" y1="6.429375" x2="39.0525" y2="8.810625" width="0.2032" layer="16"/>
+<wire x1="39.0525" y1="8.810625" x2="39.0525" y2="9.50824375" width="0.2032" layer="16"/>
 </signal>
 <signal name="D-">
 <contactref element="J2" pad="D-"/>
@@ -2939,15 +2944,15 @@ design rules under a new name.</descript
 <via x="15.39875" y="4.683125" extent="1-16" drill="0.3048"/>
 <wire x1="14.775625" y1="6.179375" x2="15.39875" y2="5.55625" width="0.2032" layer="1"/>
 <wire x1="16.430625" y1="4.683125" x2="15.39875" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="18.25625" y1="4.206875" x2="16.906875" y2="5.55625" width="0.2032" layer="1"/>
+<wire x1="17.93875" y1="4.524375" x2="16.906875" y2="5.55625" width="0.2032" layer="1"/>
 <wire x1="16.906875" y1="5.55625" x2="15.39875" y2="5.55625" width="0.2032" layer="1"/>
 <wire x1="15.39875" y1="5.55625" x2="15.39875" y2="4.683125" width="0.2032" layer="1"/>
 <via x="39.6875" y="8.89" extent="1-16" drill="0.3048"/>
 <wire x1="36.83" y1="6.0325" x2="25.0825" y2="6.0325" width="0.2032" layer="16"/>
 <wire x1="25.0825" y1="6.0325" x2="24.765" y2="5.715" width="0.2032" layer="16"/>
 <via x="24.765" y="5.715" extent="1-16" drill="0.3048"/>
-<wire x1="18.25625" y1="4.206875" x2="23.256875" y2="4.206875" width="0.2032" layer="1"/>
-<wire x1="23.256875" y1="4.206875" x2="24.765" y2="5.715" width="0.2032" layer="1"/>
+<wire x1="17.93875" y1="4.524375" x2="23.574375" y2="4.524375" width="0.2032" layer="1"/>
+<wire x1="23.574375" y1="4.524375" x2="24.765" y2="5.715" width="0.2032" layer="1"/>
 <wire x1="39.6875" y1="8.89" x2="41.15" y2="8.89" width="0.2032" layer="1"/>
 <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="39.6875" y2="8.89" width="0.2032" layer="16"/>
@@ -2967,10 +2972,10 @@ design rules under a new name.</descript
 <wire x1="42.38625" y1="14.035" x2="42.38625" y2="8.255" width="0.2032" layer="1"/>
 <wire x1="42.35625" y1="8.225" x2="42.38625" y2="8.255" width="0.2032" layer="1"/>
 <wire x1="39.84625" y1="4.28625" x2="23.97125" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="23.97125" y1="4.28625" x2="23.574375" y2="4.683125" width="0.2032" layer="16"/>
 <wire x1="23.574375" y1="4.683125" x2="22.780625" y2="4.683125" width="0.2032" layer="16"/>
 <wire x1="42.38625" y1="8.255" x2="42.38625" y2="6.82625" width="0.2032" layer="1"/>
 <wire x1="42.38625" y1="6.82625" x2="41.11625" y2="5.55625" width="0.2032" layer="1"/>
+<wire x1="23.97125" y1="4.28625" x2="23.574375" y2="4.683125" width="0.2032" layer="16"/>
 </signal>
 <signal name="SSR+">
 <contactref element="JP3" pad="P1"/>
@@ -2990,10 +2995,10 @@ design rules under a new name.</descript
 <signal name="LED_PWR">
 <contactref element="R1" pad="1"/>
 <contactref element="U1" pad="32"/>
-<wire x1="19.52625" y1="11.668125" x2="19.923125" y2="11.27125" width="0.2032" layer="16"/>
-<wire x1="19.923125" y1="11.27125" x2="32.385" y2="11.27125" width="0.2032" layer="16"/>
+<wire x1="19.764375" y1="11.668125" x2="20.16125" y2="11.27125" width="0.2032" layer="16"/>
+<wire x1="20.16125" y1="11.27125" x2="32.385" y2="11.27125" width="0.2032" layer="16"/>
 <via x="41.195625" y="12.85875" extent="1-16" drill="0.3048"/>
-<wire x1="19.52625" y1="11.668125" x2="17.62125" y2="11.668125" width="0.2032" layer="16"/>
+<wire x1="19.764375" y1="11.668125" x2="17.62125" y2="11.668125" width="0.2032" layer="16"/>
 <via x="17.62125" y="11.668125" extent="1-16" drill="0.3048"/>
 <wire x1="17.62125" y1="11.668125" x2="17.145" y2="11.668125" width="0.2032" layer="1"/>
 <wire x1="17.145" y1="11.668125" x2="16.875625" y2="11.39875" width="0.2032" layer="1"/>
@@ -3025,9 +3030,9 @@ design rules under a new name.</descript
 <contactref element="LCD1" pad="10"/>
 <wire x1="8.335" y1="8.06625" x2="6.53875" y2="8.06625" width="0.2032" layer="16"/>
 <contactref element="U1" pad="10"/>
-<wire x1="12.175625" y1="10.93375" x2="7.75875" y2="10.93375" width="0.2032" layer="1"/>
-<wire x1="7.75875" y1="10.93375" x2="6.50875" y2="9.68375" width="0.2032" layer="1"/>
-<wire x1="6.50875" y1="9.68375" x2="6.50875" y2="8.09625" width="0.2032" layer="1"/>
+<wire x1="12.175625" y1="10.93375" x2="7.485803125" y2="10.93375" width="0.2032" layer="1"/>
+<wire x1="7.485803125" y1="10.93375" x2="6.50875" y2="9.956696875" width="0.2032" layer="1"/>
+<wire x1="6.50875" y1="9.956696875" x2="6.50875" y2="8.09625" width="0.2032" layer="1"/>
 </signal>
 <signal name="T-">
 <contactref element="JP4" pad="P2"/>
@@ -3066,13 +3071,13 @@ design rules under a new name.</descript
 <via x="6.50875" y="6.746875" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="12"/>
 <contactref element="U1" pad="13"/>
-<wire x1="11.350625" y1="8.969375" x2="8.95" y2="8.969375" width="0.2032" layer="1"/>
+<wire x1="11.43" y1="8.969375" x2="9.2675" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="8.335" y1="6.76625" x2="6.528125" y2="6.76625" width="0.2032" layer="16"/>
 <wire x1="6.528125" y1="6.76625" x2="6.50875" y2="6.746875" width="0.2032" layer="16"/>
-<wire x1="8.95" y1="8.969375" x2="6.7275" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="6.7275" y1="6.746875" x2="6.50875" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="12.175625" y1="9.43375" x2="11.815" y2="9.43375" width="0.2032" layer="1"/>
-<wire x1="11.815" y1="9.43375" x2="11.350625" y2="8.969375" width="0.2032" layer="1"/>
+<wire x1="9.2675" y1="8.969375" x2="7.045" y2="6.746875" width="0.2032" layer="1"/>
+<wire x1="7.045" y1="6.746875" x2="6.50875" y2="6.746875" width="0.2032" layer="1"/>
+<wire x1="12.175625" y1="9.43375" x2="11.894375" y2="9.43375" width="0.2032" layer="1"/>
+<wire x1="11.894375" y1="9.43375" x2="11.43" y2="8.969375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MISO">
 <contactref element="U3" pad="7"/>
@@ -3085,9 +3090,8 @@ design rules under a new name.</descript
 <wire x1="13.05498125" y1="7.223125" x2="11.191875" y2="9.08623125" width="0.2032" layer="16"/>
 <via x="11.191875" y="9.604375" extent="1-16" drill="0.3048"/>
 <wire x1="26.114375" y1="8.493125" x2="26.590625" y2="8.016875" width="0.2032" layer="16"/>
-<wire x1="26.590625" y1="8.016875" x2="27.860625" y2="8.016875" width="0.2032" layer="16"/>
-<wire x1="27.860625" y1="8.016875" x2="28.09875" y2="8.255" width="0.2032" layer="16"/>
-<wire x1="28.09875" y1="8.255" x2="28.09875" y2="8.651875" 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"/>
 <wire x1="12.175625" y1="9.93375" x2="11.52125" y2="9.93375" width="0.2032" layer="1"/>
 <wire x1="11.52125" y1="9.93375" x2="11.191875" y2="9.604375" width="0.2032" layer="1"/>
 <wire x1="11.191875" y1="9.08623125" x2="11.191875" y2="9.604375" width="0.2032" layer="16"/>
@@ -3099,7 +3103,6 @@ design rules under a new name.</descript
 <via x="25.55875" y="7.77875" extent="1-16" drill="0.3048"/>
 <contactref element="U1" pad="11"/>
 <via x="10.795" y="10.31875" extent="1-16" drill="0.3048"/>
-<wire x1="10.556875" y1="9.042859375" x2="12.852859375" y2="6.82625" width="0.2032" layer="16"/>
 <wire x1="12.852859375" y1="6.82625" x2="19.685" y2="6.82625" width="0.2032" layer="16"/>
 <wire x1="19.685" y1="6.82625" x2="20.955" y2="8.09625" width="0.2032" layer="16"/>
 <wire x1="20.955" y1="8.09625" x2="25.24125" y2="8.09625" width="0.2032" layer="16"/>
@@ -3107,14 +3110,15 @@ design rules under a new name.</descript
 <wire x1="25.55875" y1="5.306875" x2="25.55875" y2="7.77875" width="0.2032" layer="1"/>
 <wire x1="8.335" y1="7.41625" x2="6.0775" y2="7.41625" width="0.2032" layer="16"/>
 <wire x1="6.0775" y1="7.41625" x2="6.0325" y2="7.46125" width="0.2032" layer="16"/>
-<wire x1="6.82625" y1="7.41625" x2="6.0775" y2="7.41625" width="0.2032" layer="1"/>
+<wire x1="7.064375" y1="7.41625" x2="6.0775" y2="7.41625" width="0.2032" layer="1"/>
 <wire x1="6.0775" y1="7.41625" x2="6.0325" y2="7.46125" width="0.2032" layer="1"/>
-<wire x1="6.82625" y1="7.41625" x2="9.72875" y2="10.31875" width="0.2032" layer="1"/>
-<wire x1="9.72875" y1="10.31875" x2="10.795" y2="10.31875" width="0.2032" layer="1"/>
+<wire x1="7.064375" y1="7.41625" x2="9.966875" y2="10.31875" width="0.2032" layer="1"/>
+<wire x1="9.966875" y1="10.31875" x2="10.795" y2="10.31875" width="0.2032" layer="1"/>
 <wire x1="12.175625" y1="10.43375" x2="10.91" y2="10.43375" width="0.2032" layer="1"/>
 <wire x1="10.91" y1="10.43375" x2="10.795" y2="10.31875" width="0.2032" layer="1"/>
-<wire x1="10.556875" y1="9.042859375" x2="10.556875" y2="10.080625" width="0.2032" layer="16"/>
 <wire x1="10.556875" y1="10.080625" x2="10.795" y2="10.31875" width="0.2032" layer="16"/>
+<wire x1="12.852859375" y1="6.82625" x2="10.556875" y2="9.122234375" width="0.2032" layer="16"/>
+<wire x1="10.556875" y1="9.122234375" x2="10.556875" y2="10.080625" width="0.2032" layer="16"/>
 </signal>
 <signal name="!CS_OLED">
 <contactref element="LCD1" pad="8"/>
@@ -3129,7 +3133,6 @@ design rules under a new name.</descript
 <contactref element="U3" pad="6"/>
 <contactref element="U1" pad="25"/>
 <wire x1="19.52625" y1="7.77875" x2="20.6375" y2="8.89" width="0.2032" layer="16"/>
-<wire x1="20.6375" y1="8.89" x2="26.67" y2="8.89" width="0.2032" layer="16"/>
 <via x="26.82875" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="26.82875" y1="8.651875" x2="26.82875" y2="5.306875" width="0.2032" layer="1"/>
 <wire x1="19.52625" y1="7.77875" x2="18.0975" y2="7.77875" width="0.2032" layer="16"/>
@@ -3137,7 +3140,8 @@ design rules under a new name.</descript
 <via x="18.018125" y="7.858125" extent="1-16" drill="0.3048"/>
 <wire x1="16.875625" y1="7.93375" x2="17.9425" y2="7.93375" width="0.2032" layer="1"/>
 <wire x1="17.9425" y1="7.93375" x2="18.018125" y2="7.858125" width="0.2032" layer="1"/>
-<wire x1="26.67" y1="8.89" x2="26.82875" y2="8.651875" width="0.2032" layer="16"/>
+<wire x1="20.6375" y1="8.89" x2="26.590625" y2="8.89" width="0.2032" layer="16"/>
+<wire x1="26.590625" y1="8.89" x2="26.82875" y2="8.651875" width="0.2032" layer="16"/>
 </signal>
 <signal name="AUX-TX">
 <contactref element="U1" pad="19"/>