diff --git a/therm.brd b/therm.brd
--- a/therm.brd
+++ b/therm.brd
@@ -8,8 +8,8 @@
 </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="yes" active="yes"/>
-<layer number="2" name="PWR" color="1" fill="3" visible="no" active="yes"/>
+<layer number="1" name="Top" color="4" fill="1" visible="no" active="yes"/>
+<layer number="2" name="PWR" color="12" 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"/>
 <layer number="5" name="Route5" color="4" fill="4" visible="no" active="no"/>
@@ -22,18 +22,18 @@
 <layer number="12" name="Route12" color="1" fill="5" visible="no" active="no"/>
 <layer number="13" name="Route13" color="4" fill="5" visible="no" active="no"/>
 <layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
-<layer number="15" name="GND" color="4" fill="6" visible="no" active="yes"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="yes"/>
+<layer number="15" name="GND" color="9" fill="6" visible="no" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" 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="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="yes" active="yes"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="no" 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="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="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"/>
@@ -58,8 +58,8 @@
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
 <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="yes" active="yes"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="yes"/>
+<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="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"/>
@@ -192,50 +192,48 @@
 <text x="29.68625" y="14.906625" size="0.8128" layer="21" ratio="16" rot="R270">pwr</text>
 <text x="18.44675" y="14.82725" size="0.8128" layer="21" ratio="16" rot="R270">ssr</text>
 <text x="24.28875" y="14.732" size="0.8128" layer="21" ratio="16" rot="R270">tc</text>
-<text x="17.81175" y="10.493375" size="0.8128" layer="22" ratio="16" rot="SMR180">ssr</text>
-<text x="28.79725" y="10.366375" size="0.8128" layer="22" ratio="16" rot="SMR180">power</text>
+<text x="17.81175" y="10.366375" size="0.8128" layer="22" ratio="16" rot="SMR180">ssr</text>
+<text x="28.54325" y="10.366375" size="0.8128" layer="22" ratio="16" rot="SMR180">power</text>
 <text x="23.78075" y="10.366375" size="0.8128" layer="22" ratio="16" rot="SMR180">t/c</text>
-<text x="16.8275" y="10.525125" size="0.8128" layer="22" ratio="16" rot="SMR180">+</text>
-<text x="20.748625" y="10.525125" size="0.8128" layer="22" ratio="16" rot="SMR180">-</text>
-<text x="32.623125" y="10.525125" size="0.8128" layer="22" ratio="16" rot="SMR180">-</text>
+<text x="16.8275" y="10.44575" size="0.8128" layer="22" ratio="16" rot="SMR180">+</text>
+<text x="20.494625" y="10.44575" size="0.8128" layer="22" ratio="16" rot="SMR180">-</text>
+<text x="32.115125" y="10.525125" size="0.8128" layer="22" ratio="16" rot="SMR180">-</text>
 <text x="27.7495" y="10.44575" size="0.8128" layer="22" ratio="16" rot="SMR180">+</text>
 <text x="22.875875" y="10.44575" size="0.8128" layer="22" ratio="16" rot="SMR180">-</text>
-<text x="26.38425" y="10.44575" size="0.8128" layer="22" ratio="16" rot="SMR180">+</text>
+<text x="26.13025" y="10.44575" size="0.8128" layer="22" ratio="16" rot="SMR180">+</text>
 <wire x1="42.799" y1="15.24" x2="42.799" y2="18.176875" width="0" layer="20"/>
 <wire x1="42.799" y1="18.176875" x2="44.069" y2="19.446875" width="0" layer="20" curve="-90"/>
 <wire x1="44.069" y1="19.446875" x2="45.974" y2="19.446875" width="0" layer="20"/>
 <wire x1="45.974" y1="19.446875" x2="47.244" y2="18.176875" width="0" layer="20" curve="-90"/>
-<hole x="44.7675" y="17.224375" drill="2.54"/>
+<hole x="45.0215" y="17.224375" drill="2.54"/>
 <wire x1="42.799" y1="3.81" x2="4.445" y2="3.81" width="0" layer="20"/>
 <wire x1="4.445" y1="15.24" x2="42.799" y2="15.24" width="0" layer="20"/>
-<hole x="46.6725" y="15.24" drill="0.381"/>
-<hole x="46.0375" y="15.24" drill="0.381"/>
-<hole x="45.4025" 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.8625" y="15.24" drill="0.381"/>
+<hole x="46.9265" y="15.24" drill="0.381"/>
+<hole x="46.2915" y="15.24" drill="0.381"/>
+<hole x="45.6565" y="15.24" drill="0.381"/>
+<hole x="44.3865" y="15.24" drill="0.381"/>
+<hole x="43.7515" y="15.24" drill="0.381"/>
+<hole x="43.1165" y="15.24" drill="0.381"/>
 <dimension x1="1.27" y1="0" x2="47.625" y2="19.05" x3="-8.89" y3="9.525" textsize="1.27" layer="209" dtype="vertical" unit="inch"/>
 <dimension x1="47.625" y1="3.81" x2="47.625" 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="46.99" y2="19.685" x3="23.495" y3="-5.08" textsize="1.27" layer="209" dtype="horizontal" unit="inch"/>
-<text x="14.00175" y="10.3505" size="0.8128" layer="22" ratio="16" rot="SMR180">rx</text>
-<text x="11.699875" y="10.3505" size="0.8128" layer="22" ratio="16" rot="SMR180">tx</text>
 <text x="12.874625" y="15.0495" size="0.8128" layer="21" ratio="16" rot="R270">aux</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="43.354625" y="14.525625" radius="0.127" width="0.2032" layer="21"/>
-<hole x="44.7675" y="15.24" drill="0.381"/>
+<circle x="43.354625" y="14.525625" radius="0.1016" width="0.2032" layer="21"/>
+<hole x="45.0215" y="15.24" drill="0.381"/>
 <wire x1="42.799" y1="3.81" x2="42.799" y2="0.873125" width="0" layer="20"/>
 <wire x1="47.244" y1="0.873125" x2="45.974" y2="-0.396875" width="0" layer="20" curve="-90"/>
 <wire x1="45.974" y1="-0.396875" x2="44.069" y2="-0.396875" width="0" layer="20"/>
 <wire x1="44.069" y1="-0.396875" x2="42.799" y2="0.873125" width="0" layer="20" curve="-90"/>
-<hole x="44.7675" y="1.825625" drill="2.54"/>
-<hole x="42.8625" 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="45.4025" y="3.81" drill="0.381"/>
-<hole x="46.0375" y="3.81" drill="0.381"/>
-<hole x="46.6725" y="3.81" drill="0.381"/>
-<hole x="44.7675" y="3.81" drill="0.381"/>
+<hole x="45.0215" y="1.825625" drill="2.54"/>
+<hole x="43.1165" y="3.81" drill="0.381"/>
+<hole x="43.7515" y="3.81" drill="0.381"/>
+<hole x="44.3865" y="3.81" drill="0.381"/>
+<hole x="45.6565" y="3.81" drill="0.381"/>
+<hole x="46.2915" y="3.81" drill="0.381"/>
+<hole x="46.9265" y="3.81" drill="0.381"/>
+<hole x="45.0215" 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"/>
@@ -261,60 +259,15 @@
 <hole x="0.3175" y="15.24" drill="0.381"/>
 <hole x="2.2225" y="15.24" drill="0.381"/>
 <circle x="12.09675" y="10.12825" radius="0.1016" width="0.2032" layer="21"/>
-<text x="11.557" y="9.271" size="0.8128" layer="22" ratio="16" rot="SMR180">ntc or</text>
+<text x="10.922" y="10.366375" size="0.8128" layer="22" ratio="16" rot="SMR180">aux ntc</text>
 <text x="40.767" y="14.605" size="0.8128" layer="22" ratio="16" rot="SMR180">swd</text>
+<circle x="41.830625" y="5.381625" radius="0.1016" width="0.2032" layer="21"/>
+<circle x="27.352625" y="6.143625" radius="0.1016" width="0.2032" layer="21"/>
+<circle x="10.080625" y="6.651625" radius="0.1016" width="0.2032" layer="21"/>
 </plain>
 <libraries>
 <library name="microbuilder">
 <packages>
-<package name="UG-2832HSWEG04_WRAPAROUND">
-<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.127" layer="51"/>
-<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.127" layer="51"/>
-<wire x1="-30" y1="5.575" x2="-30" y2="-5.575" width="0.127" layer="51"/>
-<wire x1="0" y1="5.575" x2="0" y2="-5.575" width="0.127" layer="51"/>
-<wire x1="-5.516" y1="3.475" x2="-27.9" y2="3.475" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="-5.516" y1="-2.109" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="-5.516" y1="3.475" x2="-5.516" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="-27.9" y1="3.475" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="21"/>
-<wire x1="0" y1="5.575" x2="0" y2="-5.75" width="0.2032" layer="21"/>
-<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
-<wire x1="-30" y1="5.575" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
-<smd name="15" x="-7.7" y="4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="14" x="-7.7" y="3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="13" x="-7.7" y="3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="12" x="-7.7" y="2.6" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="11" x="-7.7" y="1.95" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="10" x="-7.7" y="1.3" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="9" x="-7.7" y="0.65" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="8" x="-7.7" y="0" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="7" x="-7.7" y="-0.65" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="6" x="-7.7" y="-1.3" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="5" x="-7.7" y="-1.95" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="4" x="-7.7" y="-2.6" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="3" x="-7.7" y="-3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="2" x="-7.7" y="-3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="1" x="-7.7" y="-4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<text x="-23" y="1" size="1.016" layer="51">Active Area 0.91"</text>
-<text x="-22" y="-1" size="1.016" layer="51">128x32 Pixels</text>
-<text x="-30" y="6.5" size="0.8128" layer="25" ratio="18">&gt;NAME</text>
-<text x="-30" y="-7.5" size="0.4064" layer="27" ratio="10">&gt;VALUE</text>
-<rectangle x1="-8.2" y1="4.375" x2="-6.4" y2="4.725" layer="51"/>
-<rectangle x1="-8.2" y1="3.725" x2="-6.4" y2="4.075" layer="51"/>
-<rectangle x1="-8.2" y1="3.075" x2="-6.4" y2="3.425" layer="51"/>
-<rectangle x1="-8.2" y1="2.425" x2="-6.4" y2="2.775" layer="51"/>
-<rectangle x1="-8.2" y1="1.775" x2="-6.4" y2="2.125" layer="51"/>
-<rectangle x1="-8.2" y1="1.125" x2="-6.4" y2="1.475" layer="51"/>
-<rectangle x1="-8.2" y1="0.475" x2="-6.4" y2="0.825" layer="51"/>
-<rectangle x1="-8.2" y1="-0.175" x2="-6.4" y2="0.175" layer="51"/>
-<rectangle x1="-8.2" y1="-0.825" x2="-6.4" y2="-0.475" layer="51"/>
-<rectangle x1="-8.2" y1="-1.475" x2="-6.4" y2="-1.125" layer="51"/>
-<rectangle x1="-8.2" y1="-2.125" x2="-6.4" y2="-1.775" layer="51"/>
-<rectangle x1="-8.2" y1="-2.775" x2="-6.4" y2="-2.425" layer="51"/>
-<rectangle x1="-8.2" y1="-3.425" x2="-6.4" y2="-3.075" layer="51"/>
-<rectangle x1="-8.2" y1="-4.075" x2="-6.4" y2="-3.725" layer="51"/>
-<rectangle x1="-8.2" y1="-4.725" x2="-6.4" y2="-4.375" layer="51"/>
-</package>
 <package name="TSSOP14">
 <description>&lt;b&gt;Thin Shrink Small Outline Plastic 14&lt;/b&gt;&lt;p&gt;</description>
 <wire x1="-2.5146" y1="-2.2828" x2="2.5146" y2="-2.2828" width="0.2032" layer="51"/>
@@ -633,10 +586,10 @@ You are welcome to use this library for 
 <text x="-1.5875" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
 </package>
 <package name="POGOPROG-CONN-4-ALLSMT">
-<smd name="3" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="1" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="3" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1" cream="no"/>
+<smd name="2" x="0" y="0" dx="0.889" dy="0.8128" layer="1" cream="no"/>
+<smd name="4" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1" cream="no"/>
+<smd name="1" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1" cream="no"/>
 <wire x1="-0.635" y1="1.905" x2="0.635" y2="1.905" width="0.127" layer="21"/>
 <wire x1="0.635" y1="1.905" x2="0.635" y2="-3.175" width="0.127" layer="21"/>
 <wire x1="0.635" y1="-3.175" x2="-0.635" y2="-3.175" width="0.127" layer="21"/>
@@ -772,6 +725,54 @@ You are welcome to use this library for 
 <vertex x="-1.75" y="-1.5"/>
 </polygon>
 </package>
+<package name="UG-2832HSWEG04_WRAPAROUND">
+<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.127" layer="51"/>
+<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.127" layer="51"/>
+<wire x1="-30" y1="5.575" x2="-30" y2="-5.575" width="0.127" layer="51"/>
+<wire x1="0" y1="5.575" x2="0" y2="-5.575" width="0.127" layer="51"/>
+<wire x1="-5.516" y1="3.475" x2="-27.9" y2="3.475" width="0.2032" layer="51" style="shortdash"/>
+<wire x1="-5.516" y1="-2.109" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
+<wire x1="-5.516" y1="3.475" x2="-5.516" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
+<wire x1="-27.9" y1="3.475" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
+<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="51"/>
+<wire x1="0" y1="5.575" x2="0" y2="-5.75" width="0.2032" layer="51"/>
+<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="51"/>
+<wire x1="-30" y1="5.575" x2="-30" y2="-5.75" width="0.2032" layer="51"/>
+<smd name="15" x="-7.7" y="4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="14" x="-7.7" y="3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="13" x="-7.7" y="3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="12" x="-7.7" y="2.6" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="11" x="-7.7" y="1.95" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="10" x="-7.7" y="1.3" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="9" x="-7.7" y="0.65" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="8" x="-7.7" y="0" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="7" x="-7.7" y="-0.65" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="6" x="-7.7" y="-1.3" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="5" x="-7.7" y="-1.95" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="4" x="-7.7" y="-2.6" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="3" x="-7.7" y="-3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="2" x="-7.7" y="-3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="1" x="-7.7" y="-4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<text x="-23" y="1" size="1.016" layer="51">Active Area 0.91"</text>
+<text x="-22" y="-1" size="1.016" layer="51">128x32 Pixels</text>
+<text x="-30" y="6.5" size="0.8128" layer="25" ratio="18">&gt;NAME</text>
+<text x="-30" y="-7.5" size="0.4064" layer="27" ratio="10">&gt;VALUE</text>
+<rectangle x1="-8.2" y1="4.375" x2="-6.4" y2="4.725" layer="51"/>
+<rectangle x1="-8.2" y1="3.725" x2="-6.4" y2="4.075" layer="51"/>
+<rectangle x1="-8.2" y1="3.075" x2="-6.4" y2="3.425" layer="51"/>
+<rectangle x1="-8.2" y1="2.425" x2="-6.4" y2="2.775" layer="51"/>
+<rectangle x1="-8.2" y1="1.775" x2="-6.4" y2="2.125" layer="51"/>
+<rectangle x1="-8.2" y1="1.125" x2="-6.4" y2="1.475" layer="51"/>
+<rectangle x1="-8.2" y1="0.475" x2="-6.4" y2="0.825" layer="51"/>
+<rectangle x1="-8.2" y1="-0.175" x2="-6.4" y2="0.175" layer="51"/>
+<rectangle x1="-8.2" y1="-0.825" x2="-6.4" y2="-0.475" layer="51"/>
+<rectangle x1="-8.2" y1="-1.475" x2="-6.4" y2="-1.125" layer="51"/>
+<rectangle x1="-8.2" y1="-2.125" x2="-6.4" y2="-1.775" layer="51"/>
+<rectangle x1="-8.2" y1="-2.775" x2="-6.4" y2="-2.425" layer="51"/>
+<rectangle x1="-8.2" y1="-3.425" x2="-6.4" y2="-3.075" layer="51"/>
+<rectangle x1="-8.2" y1="-4.075" x2="-6.4" y2="-3.725" layer="51"/>
+<rectangle x1="-8.2" y1="-4.725" x2="-6.4" y2="-4.375" layer="51"/>
+</package>
 </packages>
 </library>
 <library name="SparkFun-DiscreteSemi">
@@ -2526,7 +2527,7 @@ chip</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="Elecrow_4-layer_PCB_eagle_rule">
+<designrules name="Elecrow_4-layer_PCB_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 
@@ -2605,7 +2606,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"/>
@@ -2743,7 +2744,7 @@ design rules under a new name.</descript
 <attribute name="NAME" x="43.053" y="12.319" size="0.8128" layer="25" ratio="16" rot="R180"/>
 <attribute name="VALUE" x="42.6085" y="14.1605" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="SSD1306-SPI" x="0.635" y="9.525" smashed="yes" rot="R180">
+<element name="LCD1" library="Protofusion" package="UG-2832HSWEG04_WRAPAROUND" value="SSD1306-SPI" x="0.635" y="9.525" smashed="yes" rot="R180">
 <attribute name="VALUE" x="32.54" y="17.025" size="0.4064" layer="27" ratio="10" rot="R180"/>
 </element>
 <element name="CA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="9.525" smashed="yes" rot="R270">
@@ -2820,9 +2821,7 @@ design rules under a new name.</descript
 <contactref element="C11" pad="1"/>
 <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="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"/>
@@ -2834,14 +2833,11 @@ design rules under a new name.</descript
 <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"/>
 <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"/>
+<wire x1="23.29125" y1="6.78125" x2="21.4662" y2="6.78125" 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"/>
 <wire x1="13.99" y1="9.378" x2="14.605" y2="8.763" width="0.254" layer="1"/>
 <wire x1="14.605" y1="8.763" x2="14.605" y2="8.6995" width="0.254" layer="1"/>
-<wire x1="14.605" y1="8.6995" x2="15.24" y2="8.1915" width="0.254" layer="1"/>
 <wire x1="12.89" y1="7.4415" x2="14.5535" y2="7.4415" width="0.254" layer="1"/>
 <wire x1="14.5535" y1="7.4415" x2="15.24" y2="8.128" width="0.254" layer="1"/>
 <wire x1="16.256" y1="6.858" x2="16.256" y2="7.112" width="0.254" layer="1"/>
@@ -2868,24 +2864,20 @@ design rules under a new name.</descript
 <via x="10.16" y="4.445" extent="1-16" drill="0.3048"/>
 <wire x1="7.62" y1="10.61" x2="6.789" y2="10.61" width="0.254" layer="1"/>
 <wire x1="6.789" y1="10.61" x2="6.604" y2="10.795" width="0.254" layer="1"/>
-<wire x1="13.4675" y1="10.437" x2="13.49" y2="10.5415" width="0.254" layer="1"/>
 <wire x1="12.89" y1="7.4415" x2="11.511" y2="7.4415" width="0.254" layer="1"/>
 <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.3975" 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="30.734" y1="11.215" 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"/>
 <wire x1="13.589" y1="9.779" x2="13.99" y2="9.378" width="0.254" layer="1"/>
-<wire x1="9.652" y1="5.519" x2="9.652" y2="4.953" width="0.254" layer="1"/>
+<via x="36.068" y="12.954" extent="1-16" drill="0.3048"/>
 <wire x1="9.652" y1="4.953" x2="10.16" y2="4.445" width="0.254" layer="1"/>
-<via x="36.068" y="12.954" extent="1-16" drill="0.3048"/>
 <wire x1="36.576" y1="14.31925" x2="36.576" y2="13.462" width="0.254" layer="16"/>
 <wire x1="36.576" y1="13.462" x2="36.068" y2="12.954" width="0.254" layer="16"/>
 <wire x1="10.16" y1="12.827" x2="10.16" y2="13.52" width="0.254" layer="1"/>
-<wire x1="13.4675" y1="10.437" x2="13.4675" y2="10.6625" width="0.254" layer="1"/>
+<wire x1="13.4675" y1="10.519" x2="13.4675" y2="10.6625" width="0.254" layer="1"/>
 <wire x1="13.4675" y1="10.6625" x2="13.208" y2="10.922" width="0.254" layer="1"/>
 <wire x1="13.208" y1="10.922" x2="13.208" y2="11.488" width="0.254" layer="1"/>
 <wire x1="13.208" y1="11.488" x2="13.2135" y2="11.4935" width="0.254" layer="1"/>
@@ -2914,6 +2906,20 @@ design rules under a new name.</descript
 <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"/>
+<wire x1="30.734" y1="10.5076" x2="30.734" y2="11.215" width="0.254" layer="1"/>
+<wire x1="23.29125" y1="6.78125" x2="23.542625" y2="7.032625" width="0.254" layer="1"/>
+<wire x1="13.4675" y1="10.437" x2="13.4675" y2="10.519" width="0.254" layer="1"/>
+<wire x1="13.4675" y1="10.519" x2="13.49" y2="10.5415" width="0.254" layer="1"/>
+<wire x1="27.770875" y1="11.858625" x2="27.770875" y2="12.403875" width="0.254" layer="1"/>
+<wire x1="27.770875" y1="12.403875" x2="27.987625" y2="12.620625" width="0.254" layer="1"/>
+<wire x1="28.5115" y1="12.620625" x2="27.987625" y2="12.620625" width="0.254" layer="1"/>
+<wire x1="14.605" y1="8.6995" x2="14.6685" y2="8.6995" width="0.254" layer="1"/>
+<wire x1="14.6685" y1="8.6995" x2="15.24" y2="8.128" width="0.254" layer="1"/>
+<wire x1="15.24" y1="8.1915" x2="15.24" y2="8.128" width="0.254" layer="1"/>
+<wire x1="9.652" y1="5.519" x2="9.652" y2="5.334" width="0.254" layer="1"/>
+<wire x1="9.652" y1="5.334" x2="9.652" y2="4.953" width="0.254" layer="1"/>
+<wire x1="9.6575" y1="5.3975" x2="9.6575" y2="5.3395" width="0.254" layer="1"/>
+<wire x1="9.6575" y1="5.3395" x2="9.652" y2="5.334" width="0.254" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="LCD1" pad="2"/>
@@ -3023,8 +3029,6 @@ design rules under a new name.</descript
 <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="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"/>
@@ -3033,7 +3037,6 @@ design rules under a new name.</descript
 <wire x1="20.489125" y1="11.8745" x2="20.489125" y2="11.006875" width="0.254" layer="1"/>
 <wire x1="12.89" y1="9.9415" x2="12.89" y2="10.351" width="0.254" layer="1"/>
 <wire x1="12.89" y1="10.351" x2="12.3135" y2="10.9275" width="0.254" layer="1"/>
-<wire x1="12.7615" y1="7.943" x2="12.89" y2="7.9415" width="0.254" layer="1"/>
 <wire x1="12.89" y1="7.9415" x2="12.3785" y2="7.9415" width="0.254" layer="1"/>
 <wire x1="12.3785" y1="7.9415" x2="11.996" y2="8.324" width="0.254" layer="1"/>
 <wire x1="11.4935" y1="8.324" x2="11.996" y2="8.324" width="0.254" layer="1"/>
@@ -3057,6 +3060,10 @@ design rules under a new name.</descript
 <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"/>
+<wire x1="31.684" y1="7.9074" x2="31.684" y2="7.046" width="0.254" layer="1"/>
+<wire x1="31.684" y1="7.046" x2="31.496" y2="6.858" width="0.254" layer="1"/>
+<wire x1="31.496" y1="6.858" x2="31.496" y2="6.081" width="0.254" layer="1"/>
+<wire x1="31.496" y1="6.081" x2="31.4475" y2="6.0325" width="0.254" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="U2" pad="3"/>
@@ -3102,7 +3109,6 @@ design rules under a new name.</descript
 <signal name="SW-C">
 <contactref element="SW1" pad="3"/>
 <wire x1="35.72281875" y1="6.18391875" x2="35.33041875" y2="6.18391875" width="0.254" layer="1"/>
-<wire x1="35.33041875" y1="6.18391875" x2="35.4965" y2="5.715" width="0.254" layer="1"/>
 <via x="33.909" y="5.715" extent="1-16" drill="0.3048"/>
 <contactref element="U4" pad="14"/>
 <wire x1="15.99" y1="5.8415" x2="15.99" y2="5.092" width="0.254" layer="1"/>
@@ -3152,8 +3158,8 @@ design rules under a new name.</descript
 <wire x1="19.304" y1="5.842" x2="20.574" y2="4.572" width="0.254" layer="2"/>
 <wire x1="20.574" y1="4.572" x2="34.798" y2="4.572" width="0.254" layer="2"/>
 <wire x1="34.798" y1="4.572" x2="37.211" y2="6.985" width="0.254" layer="2"/>
-<wire x1="37.211" y1="6.985" x2="37.211" y2="8.509" width="0.254" layer="2"/>
-<wire x1="37.211" y1="8.509" x2="37.465" y2="9.017" width="0.254" layer="2"/>
+<wire x1="37.211" y1="6.985" x2="37.211" y2="8.763" width="0.254" layer="2"/>
+<wire x1="37.211" y1="8.763" x2="37.465" y2="9.017" width="0.254" layer="2"/>
 </signal>
 <signal name="D+">
 <contactref element="JP1" pad="D+"/>
@@ -3295,8 +3301,7 @@ design rules under a new name.</descript
 <contactref element="U4" pad="28"/>
 <via x="22.95525" y="7.77875" extent="1-16" drill="0.3048"/>
 <via x="15.621" y="12.0015" extent="1-16" drill="0.3048"/>
-<wire x1="21.4662" y1="8.08125" x2="22.62275" y2="8.08125" width="0.254" layer="1"/>
-<wire x1="22.62275" y1="8.08125" x2="22.95525" y2="7.77875" width="0.254" layer="1"/>
+<wire x1="21.4662" y1="8.08125" x2="22.65275" y2="8.08125" width="0.254" layer="1"/>
 <wire x1="19.812" y1="8.382" x2="17.49044375" y2="8.382" width="0.254" layer="16"/>
 <wire x1="20.41525" y1="7.77875" x2="19.812" y2="8.382" width="0.254" layer="16"/>
 <via x="5.842" y="9.398" extent="1-16" drill="0.3048"/>
@@ -3315,6 +3320,7 @@ design rules under a new name.</descript
 <wire x1="15.49" y1="10.5415" x2="15.49" y2="11.553" width="0.254" layer="1"/>
 <wire x1="15.49" y1="11.553" x2="15.621" y2="11.684" width="0.254" layer="1"/>
 <wire x1="15.621" y1="11.684" x2="15.621" y2="12.0015" width="0.254" layer="1"/>
+<wire x1="22.65275" y1="8.08125" x2="22.95525" y2="7.77875" width="0.254" layer="1"/>
 </signal>
 <signal name="SPI_MISO">
 <contactref element="U3" pad="11"/>
@@ -3323,14 +3329,13 @@ design rules under a new name.</descript
 <wire x1="22.76475" y1="8.73125" x2="22.86" y2="8.636" width="0.254" layer="1"/>
 <via x="22.86" y="8.636" extent="1-16" drill="0.3048"/>
 <via x="16.383" y="11.684" extent="1-16" drill="0.3048"/>
-<wire x1="16.002" y1="10.4265" x2="15.99" y2="10.5415" width="0.254" layer="1"/>
 <wire x1="20.32" y1="8.636" x2="20.066" y2="8.89" width="0.254" layer="16"/>
 <wire x1="16.383" y1="10.227303125" x2="17.720303125" y2="8.89" width="0.254" layer="16"/>
 <wire x1="17.720303125" y1="8.89" x2="20.066" y2="8.89" width="0.254" layer="16"/>
 <wire x1="22.86" y1="8.636" x2="20.32" y2="8.636" width="0.254" layer="16"/>
 <wire x1="15.99" y1="11.291" x2="16.383" y2="11.684" width="0.254" layer="1"/>
+<wire x1="16.383" y1="10.227303125" x2="16.383" y2="11.684" width="0.254" layer="16"/>
 <wire x1="15.99" y1="11.291" x2="15.99" y2="10.5415" width="0.254" layer="1"/>
-<wire x1="16.383" y1="10.227303125" x2="16.383" y2="11.684" width="0.254" layer="16"/>
 </signal>
 <signal name="SPI_SCK">
 <contactref element="LCD1" pad="11"/>
@@ -3381,7 +3386,8 @@ design rules under a new name.</descript
 <wire x1="18.698978125" y1="10.765021875" x2="18.131021875" y2="10.765021875" width="0.254" layer="1"/>
 <wire x1="18.131021875" y1="10.765021875" x2="17.78" y2="10.414" width="0.254" layer="1"/>
 <wire x1="17.78" y1="10.414" x2="16.9905" y2="10.414" width="0.254" layer="1"/>
-<wire x1="16.9905" y1="10.414" x2="16.99" y2="10.5415" width="0.254" layer="1"/>
+<wire x1="16.9905" y1="10.414" x2="16.9905" y2="10.541" width="0.254" layer="1"/>
+<wire x1="16.9905" y1="10.541" x2="16.99" y2="10.5415" width="0.254" layer="1"/>
 </signal>
 <signal name="AUX-TX">
 <contactref element="R3" pad="1"/>
@@ -3405,8 +3411,7 @@ design rules under a new name.</descript
 <signal name="AUX-RX">
 <contactref element="JP5" pad="P1"/>
 <contactref element="U4" pad="20"/>
-<wire x1="17.59" y1="7.9415" x2="18.6015" y2="7.9415" width="0.254" layer="1"/>
-<wire x1="18.6015" y1="7.9415" x2="19.05" y2="7.5438" width="0.254" layer="1"/>
+<wire x1="17.59" y1="7.9415" x2="18.6523" y2="7.9415" width="0.254" layer="1"/>
 <via x="19.05" y="7.5438" extent="1-16" drill="0.3048"/>
 <wire x1="14.478" y1="10.681409375" x2="17.344909375" y2="7.8145" width="0.254" layer="16"/>
 <wire x1="14.478" y1="10.681409375" x2="13.702590625" y2="10.681409375" width="0.254" layer="16"/>
@@ -3415,6 +3420,7 @@ design rules under a new name.</descript
 <wire x1="13.208" y1="12.573" x2="14.605" y2="13.97" width="0.254" layer="16"/>
 <wire x1="17.344909375" y1="7.8145" x2="18.7793" y2="7.8145" width="0.254" layer="16"/>
 <wire x1="18.7793" y1="7.8145" x2="19.05" y2="7.5438" width="0.254" layer="16"/>
+<wire x1="18.6523" y1="7.9415" x2="19.05" y2="7.5438" width="0.254" layer="1"/>
 </signal>
 <signal name="SWCLK">
 <contactref element="J1" pad="3"/>
@@ -3437,8 +3443,7 @@ design rules under a new name.</descript
 <signal name="SWDIO">
 <contactref element="J1" pad="4"/>
 <contactref element="U4" pad="23"/>
-<wire x1="17.59" y1="9.4415" x2="19.0065" y2="9.4415" width="0.254" layer="1"/>
-<wire x1="19.0065" y1="9.4415" x2="19.304" y2="9.652" width="0.254" layer="1"/>
+<wire x1="17.59" y1="9.4415" x2="19.0935" y2="9.4415" width="0.254" layer="1"/>
 <via x="19.304" y="9.652" extent="1-16" drill="0.3048"/>
 <wire x1="19.304" y1="9.652" x2="19.05" y2="9.398" width="0.254" layer="16"/>
 <wire x1="19.05" y1="9.398" x2="18.034" y2="9.398" width="0.254" layer="16"/>
@@ -3454,6 +3459,7 @@ design rules under a new name.</descript
 <wire x1="33.468040625" y1="11.684" x2="34.036" y2="12.251959375" width="0.254" layer="16"/>
 <wire x1="34.036" y1="12.251959375" x2="34.036" y2="14.31925" width="0.254" layer="16"/>
 <wire x1="28.956" y1="10.668" x2="29.972" y2="11.684" width="0.254" layer="16"/>
+<wire x1="19.0935" y1="9.4415" x2="19.304" y2="9.652" width="0.254" layer="1"/>
 </signal>
 <signal name="N$6">
 <contactref element="U4" pad="2"/>