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.3.0">
+<eagle version="7.4.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
@@ -29,9 +29,9 @@
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="22" name="bPlace" 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="yes" active="yes"/>
-<layer number="24" name="bOrigins" 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="no" active="yes"/>
 <layer number="27" name="tValues" 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="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"/>
@@ -64,6 +64,7 @@
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
 <layer number="57" name="tCAD" color="7" fill="1" visible="no" active="no"/>
+<layer number="59" name="tCarbon" color="7" fill="1" visible="no" active="no"/>
 <layer number="60" name="bCarbon" color="7" fill="1" visible="no" active="no"/>
 <layer number="90" name="Modules" color="7" fill="1" visible="no" active="no"/>
 <layer number="91" name="Nets" color="2" fill="1" visible="no" active="no"/>
@@ -161,6 +162,13 @@
 <layer number="222" name="222bmp" color="23" fill="1" visible="no" active="no"/>
 <layer number="223" name="223bmp" color="24" fill="1" visible="no" active="no"/>
 <layer number="224" name="224bmp" color="25" fill="1" visible="no" active="no"/>
+<layer number="225" name="225bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="226" name="226bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="227" name="227bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="228" name="228bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="229" name="229bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="230" name="230bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="231" name="231bmp" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="248" name="Housing" color="7" fill="1" visible="no" active="yes"/>
 <layer number="249" name="Edge" color="7" fill="1" visible="no" active="yes"/>
 <layer number="250" name="Descript" color="3" fill="1" visible="no" active="no"/>
@@ -170,24 +178,30 @@
 </layers>
 <board>
 <plain>
-<wire x1="39.37" y1="15.24" x2="39.37" y2="19.3675" width="0" layer="20"/>
-<wire x1="39.37" y1="19.3675" x2="40.9575" y2="20.955" width="0" layer="20" curve="-90"/>
-<wire x1="40.9575" y1="20.955" x2="43.4975" y2="20.955" width="0" layer="20"/>
-<wire x1="43.4975" y1="20.955" x2="45.085" y2="19.3675" width="0" layer="20" curve="-90"/>
-<wire x1="40.9575" y1="-1.905" x2="43.4975" y2="-1.905" width="0" layer="20"/>
-<wire x1="43.4975" y1="-1.905" x2="45.085" y2="-0.3175" width="0" layer="20" curve="90"/>
-<wire x1="45.085" y1="-0.3175" x2="45.085" y2="19.3675" width="0" layer="20"/>
-<wire x1="39.37" y1="3.81" x2="39.37" y2="-0.3175" width="0" layer="20"/>
-<wire x1="39.37" y1="-0.3175" x2="40.9575" y2="-1.905" width="0" layer="20" curve="90"/>
-<wire x1="5.715" y1="15.24" x2="5.715" y2="19.3675" width="0" layer="20"/>
-<wire x1="5.715" y1="19.3675" x2="4.1275" y2="20.955" width="0" layer="20" curve="90"/>
-<wire x1="4.1275" y1="20.955" x2="1.5875" y2="20.955" width="0" layer="20"/>
-<wire x1="1.5875" y1="20.955" x2="0" y2="19.3675" width="0" layer="20" curve="90"/>
-<wire x1="5.715" y1="3.81" x2="5.715" y2="-0.3175" width="0" layer="20"/>
-<wire x1="5.715" y1="-0.3175" x2="4.1275" y2="-1.905" width="0" layer="20" curve="-90"/>
-<wire x1="4.1275" y1="-1.905" x2="1.5875" y2="-1.905" width="0" layer="20"/>
-<wire x1="1.5875" y1="-1.905" x2="0" y2="-0.3175" width="0" layer="20" curve="-90"/>
-<wire x1="0" y1="-0.3175" x2="0" y2="19.3675" width="0" layer="20"/>
+<wire x1="42.605246875" y1="20.955" x2="41.929765625" y2="20.955" width="0" layer="20"/>
+<wire x1="41.929765625" y1="20.955" x2="39.37" y2="18.395234375" width="0" layer="20" curve="90"/>
+<wire x1="5.715" y1="18.475246875" x2="5.715" y2="15.5575" width="0" layer="20"/>
+<wire x1="5.715" y1="15.5575" x2="6.0325" y2="15.24" width="0" layer="20" curve="90"/>
+<wire x1="6.0325" y1="15.24" x2="39.0525" y2="15.24" width="0" layer="20"/>
+<wire x1="39.0525" y1="15.24" x2="39.37" y2="15.5575" width="0" layer="20" curve="90"/>
+<wire x1="39.37" y1="15.5575" x2="39.37" y2="18.395234375" width="0" layer="20"/>
+<wire x1="45.085" y1="0.574753125" x2="45.085" y2="18.475246875" width="0" layer="20"/>
+<wire x1="45.085" y1="18.475246875" x2="42.605246875" y2="20.955" width="0" layer="20" curve="90"/>
+<wire x1="39.37" y1="0.654765625" x2="39.37" y2="3.4925" width="0" layer="20"/>
+<wire x1="39.37" y1="3.4925" x2="39.0525" y2="3.81" width="0" layer="20" curve="90"/>
+<wire x1="39.0525" y1="3.81" x2="6.0325" y2="3.81" width="0" layer="20"/>
+<wire x1="6.0325" y1="3.81" x2="5.715" y2="3.4925" width="0" layer="20" curve="90"/>
+<wire x1="5.715" y1="3.4925" x2="5.715" y2="0.574753125" width="0" layer="20"/>
+<wire x1="39.37" y1="0.654765625" x2="41.929765625" y2="-1.905" width="0" layer="20" curve="90"/>
+<wire x1="41.929765625" y1="-1.905" x2="42.605246875" y2="-1.905" width="0" layer="20"/>
+<wire x1="42.605246875" y1="-1.905" x2="45.085" y2="0.574753125" width="0" layer="20" curve="90"/>
+<wire x1="2.479753125" y1="20.955" x2="3.235246875" y2="20.955" width="0" layer="20"/>
+<wire x1="3.235246875" y1="20.955" x2="5.715" y2="18.475246875" width="0" layer="20" curve="-90"/>
+<wire x1="0" y1="0.654765625" x2="0" y2="18.475246875" width="0" layer="20"/>
+<wire x1="0" y1="18.475246875" x2="2.479753125" y2="20.955" width="0" layer="20" curve="-90"/>
+<wire x1="5.715" y1="0.574753125" x2="3.235246875" y2="-1.905" width="0" layer="20" curve="-90"/>
+<wire x1="3.235246875" y1="-1.905" x2="2.559765625" y2="-1.905" width="0" layer="20"/>
+<wire x1="2.559765625" y1="-1.905" x2="0" y2="0.654765625" width="0" layer="20" curve="-90"/>
 <text x="44.60875" y="4.445" size="0.8128" layer="22" ratio="16" rot="SMR0">protofusion.org/therm</text>
 <text x="16.66875" y="15.08125" size="0.8128" layer="21" ratio="16" rot="R270">ssr</text>
 <text x="27.46375" y="15.001875" size="0.8128" layer="21" ratio="16" rot="R270">rtd</text>
@@ -195,9 +209,7 @@
 <text x="26.9875" y="10.31875" size="0.8128" layer="22" ratio="16" rot="SMR180">rtd</text>
 <text x="15.24" y="10.4775" size="0.8128" layer="22" ratio="16" rot="SMR180">+</text>
 <text x="18.415" y="10.4775" size="0.8128" layer="22" ratio="16" rot="SMR180">-</text>
-<hole x="42.2275" y="18.0975" drill="3.81"/>
-<wire x1="39.37" y1="3.81" x2="5.715" y2="3.81" width="0" layer="20"/>
-<wire x1="5.715" y1="15.24" x2="39.37" y2="15.24" width="0" layer="20"/>
+<hole x="42.2275" y="18.0975" drill="3.556"/>
 <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"/>
@@ -210,7 +222,8 @@
 <text x="23.33625" y="10.31875" size="0.8128" layer="22" ratio="16" rot="SMR180">rx</text>
 <text x="20.875625" y="10.31875" size="0.8128" layer="22" ratio="16" rot="SMR180">tx</text>
 <text x="22.86" y="12.3825" 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">Reed 2015</text>
+<text x="18.25625" y="4.445" size="0.8128" layer="22" ratio="16" rot="SMR0">Matthew Reed 
+October 2015</text>
 <circle x="41.989375" y="14.366875" radius="0.127" width="0.2032" layer="21"/>
 <hole x="42.8625" y="15.24" drill="0.381"/>
 <hole x="42.2275" y="0.9525" drill="3.81"/>
@@ -221,7 +234,7 @@
 <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"/>
-<hole x="2.8575" y="0.9525" drill="3.81"/>
+<hole x="2.8575" y="0.9525" drill="3.556"/>
 <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"/>
@@ -229,7 +242,7 @@
 <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"/>
-<hole x="2.8575" y="18.0975" drill="3.81"/>
+<hole x="2.8575" y="18.0975" drill="3.556"/>
 <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"/>
@@ -476,13 +489,13 @@ You are welcome to use this library for 
 <package name="1X02_2.54_SCREWTERM">
 <pad name="P2" x="0" y="0" drill="1.016" shape="square"/>
 <pad name="P1" x="2.54" y="0" drill="1.016" shape="square"/>
-<wire x1="-1.5" y1="3.25" x2="4" y2="3.25" width="0.127" layer="21"/>
-<wire x1="4" y1="3.25" x2="4" y2="2.5" width="0.127" layer="21"/>
-<wire x1="4" y1="2.5" x2="4" y2="-3.25" width="0.127" layer="21"/>
-<wire x1="4" y1="-3.25" x2="-1.5" y2="-3.25" width="0.127" layer="21"/>
-<wire x1="-1.5" y1="-3.25" x2="-1.5" y2="2.5" width="0.127" layer="21"/>
-<wire x1="-1.5" y1="2.5" x2="-1.5" y2="3.25" width="0.127" layer="21"/>
-<wire x1="-1.5" y1="2.5" x2="4" y2="2.5" width="0.127" layer="21"/>
+<wire x1="-1.5" y1="3.25" x2="4" y2="3.25" width="0.2032" layer="21"/>
+<wire x1="4" y1="3.25" x2="4" y2="2.5" width="0.2032" layer="21"/>
+<wire x1="4" y1="2.5" x2="4" y2="-3.25" width="0.2032" layer="21"/>
+<wire x1="4" y1="-3.25" x2="-1.5" y2="-3.25" width="0.2032" layer="21"/>
+<wire x1="-1.5" y1="-3.25" x2="-1.5" y2="2.5" width="0.2032" layer="21"/>
+<wire x1="-1.5" y1="2.5" x2="-1.5" y2="3.25" width="0.2032" layer="21"/>
+<wire x1="-1.5" y1="2.5" x2="4" y2="2.5" width="0.2032" layer="21"/>
 </package>
 </packages>
 </library>
@@ -497,13 +510,18 @@ You are welcome to use this library for 
 <packages>
 <package name="SOT23-5">
 <description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;</description>
-<wire x1="1.4224" y1="0.4294" x2="1.4224" y2="-0.4294" width="0.2032" layer="21"/>
+<wire x1="1.27" y1="0.4294" x2="1.27" y2="-0.4294" width="0.2032" layer="21"/>
 <wire x1="1.4" y1="-0.8" x2="-1.4" y2="-0.8" width="0.1524" layer="51"/>
-<wire x1="-1.4224" y1="-0.4294" x2="-1.4224" y2="0.4294" width="0.2032" layer="21"/>
+<wire x1="-1.27" y1="-0.4294" x2="-1.27" y2="0.4294" width="0.2032" layer="21"/>
 <wire x1="-1.4" y1="0.8" x2="1.4" y2="0.8" width="0.1524" layer="51"/>
-<wire x1="-0.2684" y1="0.8104" x2="0.2684" y2="0.8104" width="0.2032" layer="21"/>
+<wire x1="-0.2684" y1="0.7088" x2="0.2684" y2="0.7088" width="0.2032" layer="21"/>
 <wire x1="1.4" y1="0.8" x2="1.4" y2="-0.8" width="0.1524" layer="51"/>
 <wire x1="-1.4" y1="0.8" x2="-1.4" y2="-0.8" width="0.1524" layer="51"/>
+<rectangle x1="-1.2" y1="-1.5" x2="-0.7" y2="-0.85" layer="51"/>
+<rectangle x1="-0.25" y1="-1.5" x2="0.25" y2="-0.85" layer="51"/>
+<rectangle x1="0.7" y1="-1.5" x2="1.2" y2="-0.85" layer="51"/>
+<rectangle x1="0.7" y1="0.85" x2="1.2" y2="1.5" layer="51"/>
+<rectangle x1="-1.2" y1="0.85" x2="-0.7" y2="1.5" layer="51"/>
 <smd name="1" x="-0.95" y="-1.3001" dx="0.55" dy="1.2" layer="1"/>
 <smd name="2" x="0" y="-1.3001" dx="0.55" dy="1.2" layer="1"/>
 <smd name="3" x="0.95" y="-1.3001" dx="0.55" dy="1.2" layer="1"/>
@@ -511,11 +529,7 @@ You are welcome to use this library for 
 <smd name="5" x="-0.95" y="1.3001" dx="0.55" dy="1.2" layer="1"/>
 <text x="-0.889" y="2.159" size="0.4064" layer="25">&gt;NAME</text>
 <text x="-0.9525" y="-0.1905" size="0.4064" layer="27">&gt;VALUE</text>
-<rectangle x1="-1.2" y1="-1.5" x2="-0.7" y2="-0.85" layer="51"/>
-<rectangle x1="-0.25" y1="-1.5" x2="0.25" y2="-0.85" layer="51"/>
-<rectangle x1="0.7" y1="-1.5" x2="1.2" y2="-0.85" layer="51"/>
-<rectangle x1="0.7" y1="0.85" x2="1.2" y2="1.5" layer="51"/>
-<rectangle x1="-1.2" y1="0.85" x2="-0.7" y2="1.5" layer="51"/>
+<circle x="-1.6002" y="-1.016" radius="0.127" width="0" layer="21"/>
 </package>
 </packages>
 </library>
@@ -636,40 +650,40 @@ You are welcome to use this library for 
 <rectangle x1="0.215" y1="3.5" x2="0.585" y2="4.5" layer="51" rot="R180"/>
 <rectangle x1="1.015" y1="3.5" x2="1.385" y2="4.5" layer="51" rot="R180"/>
 </package>
-<package name="QFN20">
-<wire x1="-2" y1="2" x2="2" y2="2" width="0.127" layer="21"/>
-<wire x1="2" y1="2" x2="2" y2="-2" width="0.127" layer="21"/>
-<wire x1="2" y1="-2" x2="-2" y2="-2" width="0.127" layer="21"/>
-<wire x1="-2" y1="-2" x2="-2" y2="2" width="0.127" layer="21"/>
-<circle x="-2.5" y="1.7" radius="0.2236" width="0.127" layer="21"/>
-<smd name="1" x="-2" y="1" dx="0.75" dy="0.3" layer="1"/>
-<smd name="2" x="-2" y="0.5" dx="0.75" dy="0.3" layer="1"/>
-<smd name="3" x="-2" y="0" dx="0.75" dy="0.3" layer="1"/>
-<smd name="4" x="-2" y="-0.5" dx="0.75" dy="0.3" layer="1"/>
-<smd name="5" x="-2" y="-1" dx="0.75" dy="0.3" layer="1"/>
-<smd name="6" x="-1" y="-2" dx="0.75" dy="0.3" layer="1" rot="R90"/>
-<smd name="7" x="-0.5" y="-2" dx="0.75" dy="0.3" layer="1" rot="R90"/>
-<smd name="8" x="0" y="-2" dx="0.75" dy="0.3" layer="1" rot="R90"/>
-<smd name="9" x="0.5" y="-2" dx="0.75" dy="0.3" layer="1" rot="R90"/>
-<smd name="10" x="1" y="-2" dx="0.75" dy="0.3" layer="1" rot="R90"/>
-<smd name="11" x="2" y="-1" dx="0.75" dy="0.3" layer="1" rot="R180"/>
-<smd name="12" x="2" y="-0.5" dx="0.75" dy="0.3" layer="1" rot="R180"/>
-<smd name="13" x="2" y="0" dx="0.75" dy="0.3" layer="1" rot="R180"/>
-<smd name="14" x="2" y="0.5" dx="0.75" dy="0.3" layer="1" rot="R180"/>
-<smd name="15" x="2" y="1" dx="0.75" dy="0.3" layer="1" rot="R180"/>
-<smd name="16" x="1" y="2" dx="0.75" dy="0.3" layer="1" rot="R270"/>
-<smd name="17" x="0.5" y="2" dx="0.75" dy="0.3" layer="1" rot="R270"/>
-<smd name="18" x="0" y="2" dx="0.75" dy="0.3" layer="1" rot="R270"/>
-<smd name="19" x="-0.5" y="2" dx="0.75" dy="0.3" layer="1" rot="R270"/>
-<smd name="20" x="-1" y="2" dx="0.75" dy="0.3" layer="1" rot="R270"/>
-<text x="-2.6" y="-4.1" size="1.27" layer="25" font="vector">&gt;NAME</text>
-<text x="-2.5" y="-5.8" size="1.27" layer="25" font="vector">&gt;VALUE</text>
+<package name="QFN20-5X5">
+<wire x1="-2.4" y1="2.4" x2="2.4" y2="2.4" width="0.127" layer="21"/>
+<wire x1="2.4" y1="2.4" x2="2.4" y2="-2.4" width="0.127" layer="21"/>
+<wire x1="2.4" y1="-2.4" x2="-2.4" y2="-2.4" width="0.127" layer="21"/>
+<wire x1="-2.4" y1="-2.4" x2="-2.4" y2="2.4" width="0.127" layer="21"/>
+<circle x="-2.9" y="2.1" radius="0.2236" width="0.127" layer="21"/>
+<smd name="1" x="-2.34" y="1.3" dx="0.95" dy="0.35" layer="1"/>
+<smd name="2" x="-2.34" y="0.65" dx="0.95" dy="0.35" layer="1"/>
+<smd name="3" x="-2.34" y="0" dx="0.95" dy="0.35" layer="1"/>
+<smd name="4" x="-2.34" y="-0.65" dx="0.95" dy="0.35" layer="1"/>
+<smd name="5" x="-2.34" y="-1.3" dx="0.95" dy="0.35" layer="1"/>
+<smd name="6" x="-1.3" y="-2.34" dx="0.95" dy="0.35" layer="1" rot="R90"/>
+<smd name="7" x="-0.65" y="-2.34" dx="0.95" dy="0.35" layer="1" rot="R90"/>
+<smd name="8" x="0" y="-2.34" dx="0.95" dy="0.35" layer="1" rot="R90"/>
+<smd name="9" x="0.65" y="-2.34" dx="0.95" dy="0.35" layer="1" rot="R90"/>
+<smd name="10" x="1.3" y="-2.34" dx="0.95" dy="0.35" layer="1" rot="R90"/>
+<smd name="11" x="2.34" y="-1.3" dx="0.95" dy="0.35" layer="1" rot="R180"/>
+<smd name="12" x="2.34" y="-0.65" dx="0.95" dy="0.35" layer="1" rot="R180"/>
+<smd name="13" x="2.34" y="0" dx="0.95" dy="0.35" layer="1" rot="R180"/>
+<smd name="14" x="2.34" y="0.65" dx="0.95" dy="0.35" layer="1" rot="R180"/>
+<smd name="15" x="2.34" y="1.3" dx="0.95" dy="0.35" layer="1" rot="R180"/>
+<smd name="16" x="1.3" y="2.34" dx="0.95" dy="0.35" layer="1" rot="R270"/>
+<smd name="17" x="0.65" y="2.34" dx="0.95" dy="0.35" layer="1" rot="R270"/>
+<smd name="18" x="0" y="2.34" dx="0.95" dy="0.35" layer="1" rot="R270"/>
+<smd name="19" x="-0.65" y="2.34" dx="0.95" dy="0.35" layer="1" rot="R270"/>
+<smd name="20" x="-1.3" y="2.34" dx="0.95" dy="0.35" layer="1" rot="R270"/>
+<text x="-2.6" y="3.7" size="1.27" layer="25" font="vector">&gt;NAME</text>
+<text x="-2.5" y="-5" size="1.27" layer="25" font="vector">&gt;VALUE</text>
 <rectangle x1="-1.3" y1="-1.3" x2="1.3" y2="1.3" layer="29"/>
 <rectangle x1="-1.2" y1="0.4" x2="-0.4" y2="1.2" layer="31"/>
 <rectangle x1="0.4" y1="0.4" x2="1.2" y2="1.2" layer="31"/>
 <rectangle x1="0.4" y1="-1.2" x2="1.2" y2="-0.4" layer="31"/>
 <rectangle x1="-1.2" y1="-1.2" x2="-0.4" y2="-0.4" layer="31"/>
-<smd name="P$1" x="0" y="0" dx="2.5" dy="2.5" layer="1"/>
+<smd name="P$1" x="0" y="0" dx="3.25" dy="3.25" layer="1"/>
 </package>
 <package name="THERM_LOGO_SMALL_0.3">
 <rectangle x1="0.0762" y1="-0.0254" x2="0.3302" y2="0.0254" layer="21"/>
@@ -2013,7 +2027,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 
@@ -2092,7 +2106,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"/>
@@ -2246,11 +2260,11 @@ design rules under a new name.</descript
 <element name="C9" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="13.49375" rot="R180"/>
 <element name="R3" library="SparkFun-Passives" package="0402-RES" value="390k" x="1.5875" y="8.73125"/>
 <element name="C3" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="11.90625"/>
-<element name="C4" library="SparkFun-Passives" package="0402-CAP" value="0.01uF" x="27.305" y="12.065"/>
+<element name="C4" library="SparkFun-Passives" package="0402-CAP" value="0.01uF" x="27.305" y="12.3825"/>
 <element name="U1" library="Protofusion" package="LQFP32" value="STM32F042K-T" x="10.795" y="9.525" smashed="yes" rot="R270"/>
-<element name="U$8" library="Protofusion" package="QFN20" value="MAX31865QFN20" x="27.305" y="8.89" rot="R180"/>
-<element name="C10" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="26.035" y="5.08"/>
-<element name="R2" library="SparkFun-Passives" package="0402-RES" value="10k" x="28.575" y="5.08"/>
+<element name="U$8" library="Protofusion" package="QFN20-5X5" value="MAX31865QFN20-5X5" x="27.14625" y="8.89" rot="R180"/>
+<element name="C10" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="26.9875" y="5.08"/>
+<element name="R2" library="SparkFun-Passives" package="0402-RES" value="10k" x="29.845" y="5.08"/>
 <element name="C8" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="1.5875" y="10.31875"/>
 <element name="C11" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="1.5875" y="7.14375"/>
 <element name="C12" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="1.5875" y="5.55625"/>
@@ -2304,27 +2318,19 @@ design rules under a new name.</descript
 <via x="19.84375" y="14.605" extent="1-16" drill="0.3302"/>
 <via x="0.9525" y="4.60375" extent="1-16" drill="0.3302"/>
 <contactref element="U$8" pad="P$1"/>
-<via x="26.82875" y="9.36625" extent="1-16" drill="0.3302"/>
-<via x="27.78125" y="9.36625" extent="1-16" drill="0.3302"/>
-<via x="27.78125" y="8.41375" extent="1-16" drill="0.3302"/>
-<via x="26.82875" y="8.41375" extent="1-16" drill="0.3302"/>
-<wire x1="26.305" y1="10.89" x2="26.305" y2="9.89" width="0.2032" layer="1"/>
-<wire x1="26.305" y1="9.89" x2="26.82875" y2="9.36625" width="0.2032" layer="1"/>
-<wire x1="28.305" y1="10.89" x2="28.305" y2="9.89" width="0.2032" layer="1"/>
-<wire x1="28.305" y1="9.89" x2="27.78125" y2="9.36625" width="0.2032" layer="1"/>
-<wire x1="26.82875" y1="8.41375" x2="27.305" y2="8.89" width="0.2032" layer="1"/>
-<wire x1="25.305" y1="7.89" x2="26.305" y2="7.89" width="0.2032" layer="1"/>
-<wire x1="26.305" y1="6.89" x2="26.305" y2="7.89" width="0.2032" layer="1"/>
-<wire x1="26.305" y1="7.89" x2="26.82875" y2="8.41375" width="0.2032" layer="1"/>
+<via x="26.67" y="9.36625" extent="1-16" drill="0.3302"/>
+<via x="27.6225" y="9.36625" extent="1-16" drill="0.3302"/>
+<via x="27.6225" y="8.41375" extent="1-16" drill="0.3302"/>
+<via x="26.67" y="8.41375" extent="1-16" drill="0.3302"/>
+<wire x1="26.305" y1="9.73125" x2="26.67" y2="9.36625" width="0.2032" layer="1"/>
+<wire x1="26.67" y1="8.41375" x2="27.14625" y2="8.89" width="0.2032" layer="1"/>
 <via x="36.195" y="10.795" extent="1-16" drill="0.3302"/>
 <via x="42.2275" y="5.3975" extent="1-16" drill="0.3302"/>
 <via x="42.2275" y="13.6525" extent="1-16" drill="0.3302"/>
-<via x="14.44625" y="5.000625" extent="1-16" drill="0.3302"/>
 <via x="18.335625" y="4.92125" extent="1-16" drill="0.3302"/>
 <wire x1="8.335" y1="10.825" x2="9.951875" y2="10.825" width="0.2032" layer="16"/>
 <contactref element="U2" pad="2"/>
 <wire x1="9.951875" y1="10.825" x2="10.63625" y2="11.509375" width="0.2032" layer="16"/>
-<via x="23.33625" y="7.62" extent="1-16" drill="0.3302"/>
 <via x="24.4475" y="5.3975" extent="1-16" drill="0.3302"/>
 <wire x1="0.9525" y1="4.60375" x2="3.413125" y2="4.60375" width="0.2032" layer="16"/>
 <wire x1="3.413125" y1="4.60375" x2="3.65125" y2="4.365625" width="0.2032" layer="16"/>
@@ -2343,14 +2349,12 @@ design rules under a new name.</descript
 <via x="0.9525" y="6.35" extent="1-16" drill="0.3302"/>
 <via x="0.9525" y="7.9375" extent="1-16" drill="0.3302"/>
 <via x="0.9525" y="9.525" extent="1-16" drill="0.3302"/>
-<via x="15.71625" y="5.000625" extent="1-16" drill="0.3302"/>
-<via x="30.48" y="9.2075" extent="1-16" drill="0.3302"/>
+<via x="30.7975" y="9.2075" extent="1-16" drill="0.3302"/>
 <via x="30.559375" y="13.255625" extent="1-16" drill="0.3302"/>
 <via x="39.0525" y="7.62" extent="1-16" drill="0.3302"/>
-<via x="30.7975" y="5.3975" extent="1-16" drill="0.3302"/>
+<via x="31.4325" y="5.3975" extent="1-16" drill="0.3302"/>
 <via x="36.83" y="5.3975" extent="1-16" drill="0.3302"/>
 <via x="35.56" y="7.3025" extent="1-16" drill="0.3302"/>
-<via x="30.63875" y="6.985" extent="1-16" drill="0.3302"/>
 <via x="25.24125" y="14.44625" extent="1-16" drill="0.3302"/>
 <via x="25.24125" y="12.85875" extent="1-16" drill="0.3302"/>
 <via x="12.938125" y="8.175625" extent="1-16" drill="0.3302"/>
@@ -2364,6 +2368,10 @@ design rules under a new name.</descript
 <wire x1="17.4775" y1="5.08" x2="17.4625" y2="5.065" width="0.3048" layer="1"/>
 <wire x1="4.985625" y1="13.97" x2="4.985625" y2="14.513071875" width="0.2032" layer="1"/>
 <wire x1="4.985625" y1="14.513071875" x2="4.814321875" y2="14.684375" width="0.2032" layer="1"/>
+<wire x1="25.84625" y1="6.55" x2="25.84625" y2="7.59" width="0.2032" layer="1"/>
+<wire x1="25.84625" y1="7.59" x2="26.67" y2="8.41375" width="0.2032" layer="1"/>
+<wire x1="28.44625" y1="11.23" x2="28.44625" y2="10.19" width="0.2032" layer="1"/>
+<wire x1="28.44625" y1="10.19" x2="27.6225" y2="9.36625" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="LCD1" pad="2"/>
@@ -2447,9 +2455,7 @@ design rules under a new name.</descript
 <contactref element="U$8" pad="20"/>
 <contactref element="U$8" pad="19"/>
 <contactref element="C10" pad="2"/>
-<wire x1="28.305" y1="6.89" x2="27.805" y2="6.89" width="0.3048" layer="1"/>
-<wire x1="27.805" y1="6.89" x2="27.805" y2="6.2" width="0.3048" layer="1"/>
-<wire x1="7.9675" y1="5.08" x2="7.995" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="28.44625" y1="6.55" x2="27.79625" y2="6.55" width="0.3048" layer="1"/>
 <contactref element="C8" pad="2"/>
 <contactref element="LCD1" pad="5"/>
 <wire x1="8.335" y1="11.475" x2="6.35" y2="11.475" width="0.3048" layer="16"/>
@@ -2461,8 +2467,6 @@ design rules under a new name.</descript
 <wire x1="3.4925" y1="11.1125" x2="3.01625" y2="11.1125" width="0.3048" layer="1"/>
 <wire x1="3.4925" y1="11.1125" x2="3.96875" y2="11.1125" width="0.3048" layer="16"/>
 <wire x1="3.96875" y1="11.1125" x2="4.33125" y2="11.475" width="0.3048" layer="16"/>
-<wire x1="26.685" y1="5.08" x2="26.685" y2="4.93625" width="0.3048" layer="1"/>
-<wire x1="26.685" y1="4.93625" x2="26.035" y2="4.28625" width="0.3048" layer="1"/>
 <wire x1="13.595" y1="13.625" x2="13.595" y2="14.50375" width="0.3048" layer="1"/>
 <wire x1="13.595" y1="14.50375" x2="13.335" y2="14.76375" width="0.3048" layer="1"/>
 <wire x1="13.335" y1="14.76375" x2="10.398125" y2="14.76375" width="0.3048" layer="1"/>
@@ -2474,22 +2478,22 @@ design rules under a new name.</descript
 <wire x1="8.335" y1="10.175" x2="6.667853125" y2="10.175" width="0.3048" layer="16"/>
 <wire x1="6.667853125" y1="10.175" x2="6.35" y2="10.492853125" width="0.3048" layer="16"/>
 <wire x1="6.35" y1="10.492853125" x2="6.35" y2="11.475" width="0.3048" layer="16"/>
-<wire x1="7.995" y1="5.425" x2="7.995" y2="6.09" width="0.3048" layer="1"/>
+<wire x1="7.995" y1="5.425" x2="7.995" y2="5.455" width="0.3048" layer="1"/>
 <wire x1="13.595" y1="13.625" x2="13.595" y2="13.0175" width="0.254" layer="1"/>
 <wire x1="13.595" y1="13.0175" x2="13.75375" y2="12.85875" width="0.254" layer="1"/>
 <wire x1="7.995" y1="5.425" x2="7.995" y2="4.54625" width="0.3048" layer="1"/>
 <wire x1="7.995" y1="4.54625" x2="8.255" y2="4.28625" width="0.3048" layer="1"/>
 <wire x1="8.255" y1="4.28625" x2="16.51" y2="4.28625" width="0.3048" layer="1"/>
-<wire x1="16.51" y1="4.28625" x2="26.035" y2="4.28625" width="0.3048" layer="1"/>
+<wire x1="16.51" y1="4.28625" x2="26.84375" y2="4.28625" width="0.3048" layer="1"/>
 <wire x1="19.0525" y1="8.2851" x2="19.0525" y2="10.8075" width="0.3048" layer="1"/>
 <wire x1="3.01625" y1="11.1125" x2="3.01625" y2="11.0975" width="0.3048" layer="1"/>
 <wire x1="3.01625" y1="11.0975" x2="2.2375" y2="10.31875" width="0.3048" layer="1"/>
 <wire x1="3.65125" y1="11.1125" x2="3.4925" y2="11.1125" width="0.3048" layer="1"/>
 <wire x1="5.26875" y1="12.73" x2="3.65125" y2="11.1125" width="0.3048" layer="1"/>
 <wire x1="19.05" y1="8.2826" x2="19.0525" y2="8.2851" width="0.3048" layer="1"/>
-<wire x1="17.4625" y1="6.365" x2="17.16" y2="6.365" width="0.3048" layer="1"/>
-<wire x1="17.16" y1="6.365" x2="16.51" y2="5.715" width="0.3048" layer="1"/>
-<wire x1="16.51" y1="5.715" x2="16.51" y2="4.28625" width="0.3048" layer="1"/>
+<wire x1="17.4625" y1="6.365" x2="16.8425" y2="6.365" width="0.3048" layer="1"/>
+<wire x1="16.8425" y1="6.365" x2="16.51" y2="6.0325" width="0.3048" layer="1"/>
+<wire x1="16.51" y1="6.0325" x2="16.51" y2="4.28625" width="0.3048" layer="1"/>
 <wire x1="18.7475" y1="11.90625" x2="18.7475" y2="12.05" width="0.3048" layer="1"/>
 <wire x1="18.57375" y1="12.85875" x2="16.66875" y2="12.85875" width="0.3048" layer="1"/>
 <wire x1="6.270625" y1="13.955" x2="6.285625" y2="13.97" width="0.3048" layer="1"/>
@@ -2507,7 +2511,11 @@ design rules under a new name.</descript
 <wire x1="19.0525" y1="8.2851" x2="18.449071875" y2="8.2851" width="0.3048" layer="1"/>
 <wire x1="18.449071875" y1="8.2851" x2="17.4625" y2="7.298528125" width="0.3048" layer="1"/>
 <wire x1="17.4625" y1="7.298528125" x2="17.4625" y2="6.365" width="0.3048" layer="1"/>
-<wire x1="27.805" y1="6.2" x2="26.685" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="26.84375" y1="4.28625" x2="27.6375" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="27.79625" y1="6.55" x2="27.79625" y2="5.23875" width="0.3048" layer="1"/>
+<wire x1="27.79625" y1="5.23875" x2="27.6375" y2="5.08" width="0.3048" layer="1"/>
+<wire x1="7.9675" y1="5.08" x2="7.9675" y2="5.3975" width="0.2032" layer="1"/>
+<wire x1="7.9675" y1="5.3975" x2="7.995" y2="5.425" width="0.2032" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="U2" pad="3"/>
@@ -2520,8 +2528,7 @@ design rules under a new name.</descript
 <wire x1="20.875625" y1="4.9399875" x2="20.875625" y2="5.608025" width="0.2032" layer="1"/>
 <wire x1="20.875625" y1="5.608025" x2="20.9525" y2="5.6849" width="0.2032" layer="1"/>
 <wire x1="40.560625" y1="6.270625" x2="25.7175" y2="6.270625" width="0.3048" layer="16"/>
-<via x="23.8125" y="6.270625" extent="1-16" drill="0.3302"/>
-<wire x1="25.7175" y1="6.270625" x2="23.8125" y2="6.270625" width="0.3048" layer="16"/>
+<via x="23.1775" y="6.429375" extent="1-16" drill="0.3302"/>
 <wire x1="20.9525" y1="5.6849" x2="22.0401" y2="5.6849" width="0.3048" layer="1"/>
 <wire x1="22.0401" y1="5.6849" x2="22.225" y2="5.5" width="0.3048" layer="1"/>
 <wire x1="40.560625" y1="6.270625" x2="41.275" y2="6.985" width="0.3048" layer="16"/>
@@ -2531,9 +2538,10 @@ design rules under a new name.</descript
 <wire x1="25.7175" y1="5.3975" x2="25.7175" y2="6.270625" width="0.3048" layer="16"/>
 <wire x1="41.165" y1="8.225" x2="41.165" y2="7.095" width="0.3048" layer="1"/>
 <wire x1="41.165" y1="7.095" x2="41.275" y2="6.985" width="0.3048" layer="1"/>
-<wire x1="22.225" y1="5.5" x2="23.5975" y2="5.5" width="0.3048" layer="1"/>
-<wire x1="23.5975" y1="5.5" x2="23.8125" y2="5.715" width="0.3048" layer="1"/>
-<wire x1="23.8125" y1="5.715" x2="23.8125" y2="6.270625" width="0.3048" layer="1"/>
+<wire x1="22.225" y1="5.5" x2="22.248125" y2="5.5" width="0.3048" layer="1"/>
+<wire x1="22.248125" y1="5.5" x2="23.1775" y2="6.429375" width="0.3048" layer="1"/>
+<wire x1="25.7175" y1="6.270625" x2="23.33625" y2="6.270625" width="0.3048" layer="16"/>
+<wire x1="23.33625" y1="6.270625" x2="23.1775" y2="6.429375" width="0.3048" layer="16"/>
 </signal>
 <signal name="SW-A">
 <contactref element="SW1" pad="1"/>
@@ -2652,9 +2660,9 @@ design rules under a new name.</descript
 <signal name="N$23">
 <contactref element="LED1" pad="A"/>
 <contactref element="R1" pad="2"/>
-<wire x1="34.701875" y1="14.525625" x2="34.066875" y2="14.62" width="0.2032" layer="1"/>
-<wire x1="34.066875" y1="14.62" x2="34.210625" y2="14.76375" width="0.2032" layer="1"/>
-<wire x1="34.210625" y1="14.76375" x2="38.01675" y2="14.76375" width="0.2032" layer="1"/>
+<wire x1="34.701875" y1="14.525625" x2="34.701875" y2="14.62" width="0.2032" layer="1"/>
+<wire x1="34.701875" y1="14.62" x2="34.845625" y2="14.76375" width="0.2032" layer="1"/>
+<wire x1="34.845625" y1="14.76375" x2="38.01675" y2="14.76375" width="0.2032" layer="1"/>
 <wire x1="38.01675" y1="14.76375" x2="38.731125" y2="14.049375" width="0.2032" layer="1"/>
 </signal>
 <signal name="LED_PWR">
@@ -2733,14 +2741,14 @@ design rules under a new name.</descript
 <wire x1="15.478125" y1="9.286875" x2="17.065625" y2="7.699375" width="0.2032" layer="16"/>
 <wire x1="17.065625" y1="7.699375" x2="18.89125" y2="7.699375" width="0.2032" layer="16"/>
 <wire x1="18.89125" y1="7.699375" x2="19.764375" y2="8.5725" width="0.2032" layer="16"/>
-<wire x1="19.764375" y1="8.5725" x2="21.9075" y2="8.5725" width="0.2032" layer="16"/>
-<wire x1="21.9075" y1="8.5725" x2="22.225" y2="8.255" width="0.2032" layer="16"/>
-<via x="22.225" y="8.255" extent="1-16" drill="0.3302"/>
-<wire x1="25.305" y1="9.89" x2="22.9934875" y2="9.89" width="0.2032" layer="1"/>
-<wire x1="22.9934875" y1="9.89" x2="22.225" y2="9.1215125" width="0.2032" layer="1"/>
-<wire x1="22.225" y1="9.1215125" x2="22.225" y2="8.255" width="0.2032" layer="1"/>
+<wire x1="19.764375" y1="8.5725" x2="21.59" y2="8.5725" width="0.2032" layer="16"/>
+<wire x1="21.59" y1="8.5725" x2="21.9075" y2="8.255" width="0.2032" layer="16"/>
+<via x="21.9075" y="8.255" extent="1-16" drill="0.3302"/>
+<wire x1="22.9759875" y1="10.19" x2="21.9075" y2="9.1215125" width="0.2032" layer="1"/>
+<wire x1="21.9075" y1="9.1215125" x2="21.9075" y2="8.255" width="0.2032" layer="1"/>
 <wire x1="3.4925" y1="7.14375" x2="3.96875" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="3.96875" y1="7.14375" x2="4.1875" y2="6.925" width="0.2032" layer="16"/>
+<wire x1="24.80625" y1="10.19" x2="22.9759875" y2="10.19" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MISO">
 <contactref element="U1" pad="12"/>
@@ -2751,13 +2759,13 @@ design rules under a new name.</descript
 <wire x1="15.954375" y1="10.080625" x2="17.541875" y2="8.493125" width="0.2032" layer="16"/>
 <wire x1="17.541875" y1="8.493125" x2="18.494375" y2="8.493125" width="0.2032" layer="16"/>
 <wire x1="18.494375" y1="8.493125" x2="19.3675" y2="9.36625" width="0.2032" layer="16"/>
-<wire x1="19.3675" y1="9.36625" x2="24.050625" y2="9.36625" width="0.2032" layer="16"/>
-<wire x1="24.050625" y1="9.36625" x2="24.4475" y2="8.969375" width="0.2032" layer="16"/>
-<wire x1="24.4475" y1="8.969375" x2="24.4475" y2="8.41375" width="0.2032" layer="16"/>
-<via x="24.4475" y="8.41375" extent="1-16" drill="0.3302"/>
+<wire x1="19.3675" y1="9.36625" x2="23.574375" y2="9.36625" width="0.2032" layer="16"/>
+<wire x1="23.574375" y1="9.36625" x2="23.8125" y2="9.128125" width="0.2032" layer="16"/>
+<wire x1="23.8125" y1="9.128125" x2="23.8125" y2="8.5725" width="0.2032" layer="16"/>
+<via x="23.8125" y="8.5725" extent="1-16" drill="0.3302"/>
 <wire x1="10.004375" y1="9.925" x2="10.16" y2="10.080625" width="0.2032" layer="1"/>
-<wire x1="25.305" y1="8.39" x2="24.47125" y2="8.39" width="0.2032" layer="1"/>
-<wire x1="24.47125" y1="8.39" x2="24.4475" y2="8.41375" width="0.2032" layer="1"/>
+<wire x1="24.80625" y1="8.24" x2="24.145" y2="8.24" width="0.2032" layer="1"/>
+<wire x1="24.145" y1="8.24" x2="23.8125" y2="8.5725" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_SCK">
 <contactref element="LCD1" pad="11"/>
@@ -2778,16 +2786,15 @@ design rules under a new name.</descript
 <wire x1="10.63625" y1="9.68375" x2="15.71625" y2="9.68375" width="0.2032" layer="16"/>
 <wire x1="17.30375" y1="8.09625" x2="18.7325" y2="8.09625" width="0.2032" layer="16"/>
 <wire x1="18.7325" y1="8.09625" x2="19.605625" y2="8.969375" width="0.2032" layer="16"/>
-<wire x1="19.605625" y1="8.969375" x2="22.621875" y2="8.969375" width="0.2032" layer="16"/>
-<wire x1="22.621875" y1="8.969375" x2="22.86" y2="8.73125" width="0.2032" layer="16"/>
-<via x="22.86" y="8.73125" extent="1-16" drill="0.3302"/>
-<wire x1="22.86" y1="9.04875" x2="22.86" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="19.605625" y1="8.969375" x2="22.304375" y2="8.969375" width="0.2032" layer="16"/>
+<wire x1="22.304375" y1="8.969375" x2="22.5425" y2="8.73125" width="0.2032" layer="16"/>
+<via x="22.5425" y="8.73125" extent="1-16" drill="0.3302"/>
 <wire x1="3.4925" y1="7.9375" x2="4.1275" y2="7.9375" width="0.2032" layer="16"/>
 <wire x1="4.1275" y1="7.9375" x2="4.49" y2="7.575" width="0.2032" layer="16"/>
-<wire x1="22.86" y1="9.04875" x2="23.256875" y2="9.445625" width="0.2032" layer="1"/>
-<wire x1="25.305" y1="9.39" x2="24.820625" y2="9.39" width="0.2032" layer="1"/>
-<wire x1="24.820625" y1="9.39" x2="24.765" y2="9.445625" width="0.2032" layer="1"/>
-<wire x1="24.765" y1="9.445625" x2="23.256875" y2="9.445625" width="0.2032" layer="1"/>
+<wire x1="22.5425" y1="8.73125" x2="22.5425" y2="9.2075" width="0.2032" layer="1"/>
+<wire x1="22.5425" y1="9.2075" x2="22.939375" y2="9.604375" width="0.2032" layer="1"/>
+<wire x1="22.939375" y1="9.604375" x2="24.741875" y2="9.604375" width="0.2032" layer="1"/>
+<wire x1="24.741875" y1="9.604375" x2="24.80625" y2="9.54" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_OLED">
 <contactref element="LCD1" pad="8"/>
@@ -2813,17 +2820,17 @@ design rules under a new name.</descript
 <via x="18.25625" y="9.128125" extent="1-16" drill="0.3302"/>
 <wire x1="18.25625" y1="9.128125" x2="18.89125" y2="9.763125" width="0.2032" layer="16"/>
 <wire x1="18.89125" y1="9.763125" x2="24.28875" y2="9.763125" width="0.2032" layer="16"/>
-<wire x1="25.0825" y1="8.09625" x2="24.765" y2="7.77875" width="0.2032" layer="16"/>
-<wire x1="24.765" y1="7.77875" x2="24.13" y2="7.77875" width="0.2032" layer="16"/>
-<wire x1="24.13" y1="7.77875" x2="23.65375" y2="8.255" width="0.2032" layer="16"/>
-<wire x1="23.65375" y1="8.255" x2="23.65375" y2="8.73125" width="0.2032" layer="16"/>
-<via x="23.65375" y="8.73125" extent="1-16" drill="0.3302"/>
-<wire x1="23.65375" y1="8.73125" x2="23.97125" y2="9.04875" width="0.2032" layer="1"/>
-<wire x1="23.97125" y1="9.04875" x2="24.685625" y2="9.04875" width="0.2032" layer="1"/>
-<wire x1="25.305" y1="8.89" x2="24.844375" y2="8.89" width="0.2032" layer="1"/>
-<wire x1="24.844375" y1="8.89" x2="24.685625" y2="9.04875" width="0.2032" layer="1"/>
-<wire x1="24.28875" y1="9.763125" x2="25.0825" y2="8.969375" width="0.2032" layer="16"/>
-<wire x1="25.0825" y1="8.969375" x2="25.0825" y2="8.09625" width="0.2032" layer="16"/>
+<wire x1="24.765" y1="8.09625" x2="24.4475" y2="7.77875" width="0.2032" layer="16"/>
+<wire x1="24.4475" y1="7.77875" x2="23.495" y2="7.77875" width="0.2032" layer="16"/>
+<wire x1="23.495" y1="7.77875" x2="23.1775" y2="8.09625" width="0.2032" layer="16"/>
+<via x="23.1775" y="8.09625" extent="1-16" drill="0.3302"/>
+<wire x1="24.28875" y1="9.763125" x2="24.765" y2="9.286875" width="0.2032" layer="16"/>
+<wire x1="24.765" y1="9.286875" x2="24.765" y2="8.09625" width="0.2032" layer="16"/>
+<wire x1="24.80625" y1="8.89" x2="24.4475" y2="8.89" width="0.2032" layer="1"/>
+<wire x1="24.4475" y1="8.89" x2="24.13" y2="9.2075" width="0.2032" layer="1"/>
+<wire x1="24.13" y1="9.2075" x2="23.574375" y2="9.2075" width="0.2032" layer="1"/>
+<wire x1="23.574375" y1="9.2075" x2="23.1775" y2="8.810625" width="0.2032" layer="1"/>
+<wire x1="23.1775" y1="8.810625" x2="23.1775" y2="8.09625" width="0.2032" layer="1"/>
 </signal>
 <signal name="AUX-TX">
 <contactref element="JP1" pad="P1"/>
@@ -2867,9 +2874,8 @@ design rules under a new name.</descript
 <via x="13.6525" y="7.62" extent="1-16" drill="0.3302"/>
 <wire x1="13.6525" y1="7.62" x2="14.366875" y2="6.905625" width="0.2032" layer="16"/>
 <wire x1="14.366875" y1="6.905625" x2="21.034375" y2="6.905625" width="0.2032" layer="16"/>
-<wire x1="23.1775" y1="5.3975" x2="23.1775" y2="6.0325" width="0.2032" layer="16"/>
-<wire x1="23.1775" y1="6.0325" x2="22.86" y2="6.35" width="0.2032" layer="16"/>
-<wire x1="22.86" y1="6.35" x2="21.59" y2="6.35" width="0.2032" layer="16"/>
+<wire x1="23.1775" y1="5.3975" x2="22.225" y2="6.35" width="0.2032" layer="16"/>
+<wire x1="22.225" y1="6.35" x2="21.59" y2="6.35" width="0.2032" layer="16"/>
 <wire x1="21.59" y1="6.35" x2="21.034375" y2="6.905625" width="0.2032" layer="16"/>
 </signal>
 <signal name="SWDIO">
@@ -2892,64 +2898,57 @@ design rules under a new name.</descript
 <wire x1="11.033125" y1="8.651875" x2="11.27125" y2="8.89" width="0.2032" layer="16"/>
 <wire x1="11.27125" y1="8.89" x2="15.24" y2="8.89" width="0.2032" layer="16"/>
 <wire x1="15.24" y1="8.89" x2="16.8275" y2="7.3025" width="0.2032" layer="16"/>
-<wire x1="16.8275" y1="7.3025" x2="21.2725" y2="7.3025" width="0.2032" layer="16"/>
-<wire x1="21.2725" y1="7.3025" x2="21.669375" y2="6.905625" width="0.2032" layer="16"/>
-<wire x1="21.669375" y1="6.905625" x2="25.479375" y2="6.905625" width="0.2032" layer="16"/>
-<wire x1="25.479375" y1="6.905625" x2="25.55875" y2="6.985" width="0.2032" layer="16"/>
-<via x="25.55875" y="6.985" extent="1-16" drill="0.3302"/>
-<wire x1="25.55875" y1="6.985" x2="25.55875" y2="6.477440625" width="0.2032" layer="1"/>
-<wire x1="25.55875" y1="6.477440625" x2="25.844940625" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="25.844940625" y1="6.19125" x2="27.14625" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="27.14625" y1="6.19125" x2="27.305" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="27.305" y1="6.35" x2="27.305" y2="6.89" width="0.2032" layer="1"/>
+<wire x1="16.8275" y1="7.3025" x2="24.050625" y2="7.3025" width="0.2032" layer="16"/>
+<wire x1="24.050625" y1="7.3025" x2="24.4475" y2="6.905625" width="0.2032" layer="16"/>
+<via x="24.4475" y="6.905625" extent="1-16" drill="0.3302"/>
+<wire x1="24.4475" y1="6.905625" x2="24.4475" y2="6.588125" width="0.2032" layer="1"/>
+<wire x1="24.4475" y1="6.588125" x2="25.24125" y2="5.794375" width="0.2032" layer="1"/>
+<wire x1="25.24125" y1="5.794375" x2="26.9875" y2="5.794375" width="0.2032" layer="1"/>
+<wire x1="26.9875" y1="5.794375" x2="27.14625" y2="5.953125" width="0.2032" layer="1"/>
+<wire x1="27.14625" y1="5.953125" x2="27.14625" y2="6.55" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$8" pad="2"/>
 <contactref element="U$8" pad="1"/>
 <contactref element="R2" pad="1"/>
-<wire x1="29.305" y1="8.39" x2="29.305" y2="7.89" width="0.2032" layer="1"/>
-<wire x1="29.305" y1="7.89" x2="29.305" y2="6.28625" width="0.2032" layer="1"/>
-<wire x1="29.305" y1="6.28625" x2="28.8925" y2="5.87375" width="0.2032" layer="1"/>
-<wire x1="28.8925" y1="5.87375" x2="28.09875" y2="5.87375" width="0.2032" layer="1"/>
-<wire x1="28.09875" y1="5.87375" x2="27.94" y2="5.715" width="0.2032" layer="1"/>
-<wire x1="27.94" y1="5.715" x2="27.94" y2="5.095" width="0.2032" layer="1"/>
-<wire x1="27.94" y1="5.095" x2="27.925" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="29.48625" y1="8.24" x2="29.48625" y2="7.59" width="0.2032" layer="1"/>
+<wire x1="29.48625" y1="7.59" x2="29.48625" y2="5.37125" width="0.2032" layer="1"/>
+<wire x1="29.48625" y1="5.37125" x2="29.195" y2="5.08" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$6">
 <contactref element="U$8" pad="3"/>
 <contactref element="U$8" pad="4"/>
 <contactref element="R2" pad="2"/>
-<wire x1="29.225" y1="5.08" x2="29.225" y2="5.095" width="0.2032" layer="1"/>
-<wire x1="30.00375" y1="5.23875" x2="30.00375" y2="8.73125" width="0.2032" layer="1"/>
-<wire x1="30.00375" y1="8.73125" x2="29.845" y2="8.89" width="0.2032" layer="1"/>
-<wire x1="29.845" y1="8.89" x2="29.305" y2="8.89" width="0.2032" layer="1"/>
-<wire x1="29.305" y1="9.39" x2="29.305" y2="8.89" width="0.2032" layer="1"/>
-<wire x1="30.00375" y1="5.23875" x2="29.845" y2="5.08" width="0.2032" layer="1"/>
-<wire x1="29.845" y1="5.08" x2="29.225" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="30.495" y1="5.08" x2="30.495" y2="6.335" width="0.2032" layer="1"/>
+<wire x1="30.495" y1="6.335" x2="30.241875" y2="6.588125" width="0.2032" layer="1"/>
+<wire x1="30.241875" y1="6.588125" x2="30.241875" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="29.48625" y1="8.89" x2="30.083125" y2="8.89" width="0.2032" layer="1"/>
+<wire x1="30.083125" y1="8.89" x2="30.241875" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="29.48625" y1="9.54" x2="29.48625" y2="8.89" width="0.2032" layer="1"/>
 </signal>
 <signal name="RTC-">
 <contactref element="JP4" pad="P1"/>
 <contactref element="C4" pad="1"/>
 <contactref element="U$8" pad="8"/>
 <contactref element="U$8" pad="9"/>
-<wire x1="26.655" y1="12.065" x2="26.655" y2="13.955" width="0.2032" layer="1"/>
-<wire x1="26.805" y1="10.89" x2="26.805" y2="11.915" width="0.2032" layer="1"/>
-<wire x1="26.805" y1="11.915" x2="26.655" y2="12.065" width="0.2032" layer="1"/>
-<wire x1="26.805" y1="10.89" x2="27.305" y2="10.89" width="0.2032" layer="1"/>
-<wire x1="26.67" y1="13.97" x2="26.655" y2="13.955" width="0.2032" layer="1"/>
+<wire x1="26.49625" y1="11.23" x2="27.14625" y2="11.23" width="0.2032" layer="1"/>
+<wire x1="26.655" y1="12.3825" x2="26.655" y2="13.955" width="0.2032" layer="1"/>
+<wire x1="26.655" y1="13.955" x2="26.67" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="26.49625" y1="11.23" x2="26.49625" y2="12.22375" width="0.2032" layer="1"/>
+<wire x1="26.49625" y1="12.22375" x2="26.655" y2="12.3825" width="0.2032" layer="1"/>
 </signal>
 <signal name="RTC+">
 <contactref element="JP4" pad="P2"/>
 <contactref element="C4" pad="2"/>
 <contactref element="U$8" pad="5"/>
 <contactref element="U$8" pad="7"/>
-<wire x1="27.955" y1="12.065" x2="27.955" y2="12.715" width="0.2032" layer="1"/>
-<wire x1="27.805" y1="10.89" x2="27.805" y2="11.915" width="0.2032" layer="1"/>
-<wire x1="27.805" y1="11.915" x2="27.955" y2="12.065" width="0.2032" layer="1"/>
-<wire x1="29.305" y1="9.89" x2="29.305" y2="11.335" width="0.2032" layer="1"/>
-<wire x1="29.305" y1="11.335" x2="28.575" y2="12.065" width="0.2032" layer="1"/>
-<wire x1="28.575" y1="12.065" x2="27.955" y2="12.065" width="0.2032" layer="1"/>
-<wire x1="27.955" y1="12.715" x2="29.21" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="29.48625" y1="10.19" x2="29.48625" y2="11.78875" width="0.2032" layer="1"/>
+<wire x1="29.48625" y1="11.78875" x2="28.8925" y2="12.3825" width="0.2032" layer="1"/>
+<wire x1="28.8925" y1="12.3825" x2="27.955" y2="12.3825" width="0.2032" layer="1"/>
+<wire x1="29.21" y1="13.97" x2="29.21" y2="12.7" width="0.2032" layer="1"/>
+<wire x1="29.21" y1="12.7" x2="28.8925" y2="12.3825" width="0.2032" layer="1"/>
+<wire x1="27.79625" y1="11.23" x2="27.79625" y2="12.22375" width="0.2032" layer="1"/>
+<wire x1="27.79625" y1="12.22375" x2="27.955" y2="12.3825" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$7">
 <polygon width="0" layer="16" pour="cutout">
@@ -3002,4 +3001,10 @@ design rules under a new name.</descript
 </signals>
 </board>
 </drawing>
+<compatibility>
+<note version="6.3" minversion="6.2.2" severity="warning">
+Since Version 6.2.2 text objects can contain more than one line,
+which will not be processed correctly with this version.
+</note>
+</compatibility>
 </eagle>
diff --git a/therm.sch b/therm.sch
--- a/therm.sch
+++ b/therm.sch
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="7.3.0">
+<eagle version="7.4.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
@@ -8,34 +8,34 @@
 </settings>
 <grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="no" active="no"/>
-<layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
-<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"/>
-<layer number="6" name="Route6" color="1" fill="8" visible="no" active="no"/>
-<layer number="7" name="Route7" color="4" fill="8" visible="no" active="no"/>
-<layer number="8" name="Route8" color="1" fill="2" visible="no" active="no"/>
-<layer number="9" name="Route9" color="4" fill="2" visible="no" active="no"/>
-<layer number="10" name="Route10" color="1" fill="7" visible="no" active="no"/>
-<layer number="11" name="Route11" color="4" fill="7" visible="no" active="no"/>
-<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="Route15" color="4" fill="6" visible="no" active="no"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="no"/>
-<layer number="17" name="Pads" color="2" fill="1" visible="no" active="no"/>
-<layer number="18" name="Vias" color="2" fill="1" visible="no" active="no"/>
-<layer number="19" name="Unrouted" color="6" fill="1" visible="no" active="no"/>
-<layer number="20" name="Dimension" color="15" fill="1" visible="no" active="no"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="no"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="no"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="no"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="no"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="no" active="no"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="no" active="no"/>
-<layer number="27" name="tValues" color="7" fill="1" visible="no" active="no"/>
-<layer number="28" name="bValues" color="7" fill="1" visible="no" active="no"/>
+<layer number="1" name="Top" color="4" fill="1" visible="yes" active="no"/>
+<layer number="2" name="Route2" color="1" fill="3" visible="yes" active="no"/>
+<layer number="3" name="Route3" color="4" fill="3" visible="yes" active="no"/>
+<layer number="4" name="Route4" color="1" fill="4" visible="yes" active="no"/>
+<layer number="5" name="Route5" color="4" fill="4" visible="yes" active="no"/>
+<layer number="6" name="Route6" color="1" fill="8" visible="yes" active="no"/>
+<layer number="7" name="Route7" color="4" fill="8" visible="yes" active="no"/>
+<layer number="8" name="Route8" color="1" fill="2" visible="yes" active="no"/>
+<layer number="9" name="Route9" color="4" fill="2" visible="yes" active="no"/>
+<layer number="10" name="Route10" color="1" fill="7" visible="yes" active="no"/>
+<layer number="11" name="Route11" color="4" fill="7" visible="yes" active="no"/>
+<layer number="12" name="Route12" color="1" fill="5" visible="yes" active="no"/>
+<layer number="13" name="Route13" color="4" fill="5" visible="yes" active="no"/>
+<layer number="14" name="Route14" color="1" fill="6" visible="yes" active="no"/>
+<layer number="15" name="Route15" color="4" fill="6" visible="yes" active="no"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="no"/>
+<layer number="17" name="Pads" color="2" fill="1" visible="yes" active="no"/>
+<layer number="18" name="Vias" color="2" fill="1" visible="yes" active="no"/>
+<layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="no"/>
+<layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="no"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="no"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="no"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="no"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="no"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="no"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="no"/>
+<layer number="27" name="tValues" color="7" fill="1" visible="yes" active="no"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="yes" active="no"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="no"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="no"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="no"/>
@@ -44,8 +44,8 @@
 <layer number="34" name="bFinish" color="6" fill="6" visible="no" active="no"/>
 <layer number="35" name="tGlue" color="7" fill="4" visible="no" active="no"/>
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="no"/>
-<layer number="37" name="tTest" color="7" fill="1" visible="no" active="no"/>
-<layer number="38" name="bTest" color="7" fill="1" visible="no" active="no"/>
+<layer number="37" name="tTest" color="7" fill="1" visible="yes" active="no"/>
+<layer number="38" name="bTest" color="7" fill="1" visible="yes" active="no"/>
 <layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="no"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="no"/>
 <layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="no"/>
@@ -53,18 +53,19 @@
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="no"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="no"/>
 <layer number="45" name="Holes" color="7" fill="1" visible="no" active="no"/>
-<layer number="46" name="Milling" color="3" fill="1" visible="no" active="no"/>
-<layer number="47" name="Measures" color="7" fill="1" visible="no" active="no"/>
-<layer number="48" name="Document" color="7" fill="1" visible="no" active="no"/>
-<layer number="49" name="Reference" color="7" fill="1" visible="no" active="no"/>
-<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="no"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="no"/>
-<layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
-<layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
-<layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
-<layer number="57" name="tCAD" color="7" fill="1" visible="no" active="no"/>
-<layer number="60" name="bCarbon" color="7" fill="1" visible="no" active="no"/>
+<layer number="46" name="Milling" color="3" fill="1" visible="yes" active="no"/>
+<layer number="47" name="Measures" color="7" fill="1" visible="yes" active="no"/>
+<layer number="48" name="Document" color="7" fill="1" visible="yes" active="no"/>
+<layer number="49" name="Reference" color="7" fill="1" visible="yes" active="no"/>
+<layer number="50" name="dxf" color="7" fill="1" visible="yes" active="no"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="no"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="no"/>
+<layer number="53" name="tGND_GNDA" color="7" fill="9" visible="yes" active="no"/>
+<layer number="54" name="bGND_GNDA" color="1" fill="9" visible="yes" active="no"/>
+<layer number="56" name="wert" color="7" fill="1" visible="yes" active="no"/>
+<layer number="57" name="tCAD" color="7" fill="1" visible="yes" active="no"/>
+<layer number="59" name="tCarbon" color="7" fill="1" visible="yes" active="no"/>
+<layer number="60" name="bCarbon" color="7" fill="1" visible="yes" active="no"/>
 <layer number="90" name="Modules" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="91" name="Nets" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="92" name="Busses" color="1" fill="1" visible="yes" active="yes"/>
@@ -161,6 +162,13 @@
 <layer number="222" name="222bmp" color="23" fill="1" visible="no" active="no"/>
 <layer number="223" name="223bmp" color="24" fill="1" visible="no" active="no"/>
 <layer number="224" name="224bmp" color="25" fill="1" visible="no" active="no"/>
+<layer number="225" name="225bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="226" name="226bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="227" name="227bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="228" name="228bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="229" name="229bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="230" name="230bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="231" name="231bmp" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="248" name="Housing" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="249" name="Edge" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="250" name="Descript" color="3" fill="1" visible="no" active="no"/>
@@ -733,6 +741,20 @@ 5MM Through-hole LED&lt;br&gt;
 <vertex x="-1.6" y="0.25"/>
 <vertex x="-1.6" y="0.5"/>
 </polygon>
+<wire x1="1.016" y1="1.016" x2="2.7686" y2="1.016" width="0.127" layer="21"/>
+<wire x1="2.7686" y1="1.016" x2="2.7686" y2="-1.016" width="0.127" layer="21"/>
+<wire x1="2.7686" y1="-1.016" x2="1.016" y2="-1.016" width="0.127" layer="21"/>
+<wire x1="3.175" y1="0" x2="3.3528" y2="0" width="0.127" layer="21"/>
+<wire x1="-1.016" y1="-1.016" x2="-2.7686" y2="-1.016" width="0.127" layer="21"/>
+<wire x1="-2.7686" y1="-1.016" x2="-2.7686" y2="1.016" width="0.127" layer="21"/>
+<wire x1="-2.7686" y1="1.016" x2="-1.016" y2="1.016" width="0.127" layer="21"/>
+<text x="-2.54" y="1.27" size="1.27" layer="25">&gt;NAME</text>
+<text x="-2.54" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
+<wire x1="-3.175" y1="0" x2="-3.81" y2="0" width="0.254" layer="21"/>
+<wire x1="-3.48741875" y1="-0.368296875" x2="-3.48741875" y2="0.3556" width="0.254" layer="21"/>
+<wire x1="3.175" y1="0" x2="3.81" y2="0" width="0.254" layer="21"/>
+<wire x1="-3.489959375" y1="0.37591875" x2="-3.48741875" y2="0.373378125" width="0.254" layer="21"/>
+<wire x1="-3.48741875" y1="0.373378125" x2="-3.48741875" y2="-0.370840625" width="0.254" layer="21"/>
 </package>
 </packages>
 <symbols>
@@ -762,7 +784,7 @@ 5MM Through-hole LED&lt;br&gt;
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="LED" prefix="LED" uservalue="yes">
+<deviceset name="LED" prefix="D" uservalue="yes">
 <description>&lt;b&gt;LEDs&lt;/b&gt;
 Standard schematic elements and footprints for 5mm, 3mm, 1206, and 0603 sized LEDs. 5mm - Spark Fun Electronics SKU : COM-00529 (and others)</description>
 <gates>
@@ -1337,46 +1359,6 @@ For boards designed to be plugged direct
 <pad name="1" x="0" y="0" drill="1.016" diameter="1.8796" shape="square"/>
 <pad name="2" x="2.54" y="0" drill="1.016" diameter="1.8796"/>
 </package>
-<package name="SCREWTERMINAL-3.5MM-2">
-<wire x1="-1.75" y1="3.4" x2="5.25" y2="3.4" width="0.2032" layer="21"/>
-<wire x1="5.25" y1="3.4" x2="5.25" y2="-2.8" width="0.2032" layer="21"/>
-<wire x1="5.25" y1="-2.8" x2="5.25" y2="-3.6" width="0.2032" layer="21"/>
-<wire x1="5.25" y1="-3.6" x2="-1.75" y2="-3.6" width="0.2032" layer="21"/>
-<wire x1="-1.75" y1="-3.6" x2="-1.75" y2="-2.8" width="0.2032" layer="21"/>
-<wire x1="-1.75" y1="-2.8" x2="-1.75" y2="3.4" width="0.2032" layer="21"/>
-<wire x1="5.25" y1="-2.8" x2="-1.75" y2="-2.8" width="0.2032" layer="21"/>
-<wire x1="-1.75" y1="-1.35" x2="-2.15" y2="-1.35" width="0.2032" layer="51"/>
-<wire x1="-2.15" y1="-1.35" x2="-2.15" y2="-2.35" width="0.2032" layer="51"/>
-<wire x1="-2.15" y1="-2.35" x2="-1.75" y2="-2.35" width="0.2032" layer="51"/>
-<wire x1="5.25" y1="3.15" x2="5.65" y2="3.15" width="0.2032" layer="51"/>
-<wire x1="5.65" y1="3.15" x2="5.65" y2="2.15" width="0.2032" layer="51"/>
-<wire x1="5.65" y1="2.15" x2="5.25" y2="2.15" width="0.2032" layer="51"/>
-<circle x="2" y="3" radius="0.2828" width="0.127" layer="51"/>
-<pad name="1" x="0" y="0" drill="1.2" diameter="2.032" shape="square"/>
-<pad name="2" x="3.5" y="0" drill="1.2" diameter="2.032"/>
-<text x="-1.27" y="2.54" size="0.4064" layer="25">&gt;NAME</text>
-<text x="-1.27" y="1.27" size="0.4064" layer="27">&gt;VALUE</text>
-</package>
-<package name="JST-2-SMD">
-<description>2mm SMD side-entry connector. tDocu layer indicates the actual physical plastic housing. +/- indicate SparkFun standard batteries and wiring.</description>
-<wire x1="-4" y1="-1" x2="-4" y2="-4.5" width="0.2032" layer="21"/>
-<wire x1="-4" y1="-4.5" x2="-3.2" y2="-4.5" width="0.2032" layer="21"/>
-<wire x1="-3.2" y1="-4.5" x2="-3.2" y2="-2" width="0.2032" layer="21"/>
-<wire x1="-3.2" y1="-2" x2="-2" y2="-2" width="0.2032" layer="21"/>
-<wire x1="2" y1="-2" x2="3.2" y2="-2" width="0.2032" layer="21"/>
-<wire x1="3.2" y1="-2" x2="3.2" y2="-4.5" width="0.2032" layer="21"/>
-<wire x1="3.2" y1="-4.5" x2="4" y2="-4.5" width="0.2032" layer="21"/>
-<wire x1="4" y1="-4.5" x2="4" y2="-1" width="0.2032" layer="21"/>
-<wire x1="2" y1="3" x2="-2" y2="3" width="0.2032" layer="21"/>
-<smd name="1" x="-1" y="-3.7" dx="1" dy="4.6" layer="1"/>
-<smd name="2" x="1" y="-3.7" dx="1" dy="4.6" layer="1"/>
-<smd name="NC1" x="-3.4" y="1.5" dx="3.4" dy="1.6" layer="1" rot="R90"/>
-<smd name="NC2" x="3.4" y="1.5" dx="3.4" dy="1.6" layer="1" rot="R90"/>
-<text x="-1.27" y="1.27" size="0.4064" layer="25">&gt;Name</text>
-<text x="-1.27" y="0" size="0.4064" layer="27">&gt;Value</text>
-<text x="2.159" y="-4.445" size="1.27" layer="51">+</text>
-<text x="-2.921" y="-4.445" size="1.27" layer="51">-</text>
-</package>
 <package name="1X02_BIG">
 <wire x1="-1.27" y1="1.27" x2="-1.27" y2="-1.27" width="0.127" layer="21"/>
 <wire x1="-1.27" y1="-1.27" x2="5.08" y2="-1.27" width="0.127" layer="21"/>
@@ -1532,21 +1514,6 @@ will be further integrated into the Spar
 <rectangle x1="2.286" y1="-0.254" x2="2.794" y2="0.254" layer="51"/>
 <rectangle x1="-0.254" y1="-0.254" x2="0.254" y2="0.254" layer="51"/>
 </package>
-<package name="JST-2-PTH">
-<wire x1="-2" y1="0" x2="-2" y2="-1.6" width="0.2032" layer="21"/>
-<wire x1="-2" y1="-1.6" x2="-2.95" y2="-1.6" width="0.2032" layer="21"/>
-<wire x1="-2.95" y1="-1.6" x2="-2.95" y2="6" width="0.2032" layer="21"/>
-<wire x1="-2.95" y1="6" x2="2.95" y2="6" width="0.2032" layer="21"/>
-<wire x1="2.95" y1="6" x2="2.95" y2="-1.6" width="0.2032" layer="21"/>
-<wire x1="2.95" y1="-1.6" x2="2" y2="-1.6" width="0.2032" layer="21"/>
-<wire x1="2" y1="-1.6" x2="2" y2="0" width="0.2032" layer="21"/>
-<pad name="1" x="-1" y="0" drill="0.7" diameter="1.4478"/>
-<pad name="2" x="1" y="0" drill="0.7" diameter="1.4478"/>
-<text x="-1.27" y="5.27" size="0.4064" layer="25">&gt;Name</text>
-<text x="-1.27" y="4" size="0.4064" layer="27">&gt;Value</text>
-<text x="0.6" y="0.7" size="1.27" layer="51">+</text>
-<text x="-1.4" y="0.7" size="1.27" layer="51">-</text>
-</package>
 <package name="1X02_XTRA_BIG">
 <wire x1="-5.08" y1="2.54" x2="-5.08" y2="-2.54" width="0.127" layer="21"/>
 <wire x1="-5.08" y1="-2.54" x2="5.08" y2="-2.54" width="0.127" layer="21"/>
@@ -1583,21 +1550,6 @@ will be further integrated into the Spar
 <text x="-1.27" y="2.54" size="0.4064" layer="25">&gt;NAME</text>
 <text x="-1.27" y="1.27" size="0.4064" layer="27">&gt;VALUE</text>
 </package>
-<package name="JST-2-PTH-NS">
-<wire x1="-2" y1="0" x2="-2" y2="-1.8" width="0.2032" layer="51"/>
-<wire x1="-2" y1="-1.8" x2="-3" y2="-1.8" width="0.2032" layer="51"/>
-<wire x1="-3" y1="-1.8" x2="-3" y2="6" width="0.2032" layer="51"/>
-<wire x1="-3" y1="6" x2="3" y2="6" width="0.2032" layer="51"/>
-<wire x1="3" y1="6" x2="3" y2="-1.8" width="0.2032" layer="51"/>
-<wire x1="3" y1="-1.8" x2="2" y2="-1.8" width="0.2032" layer="51"/>
-<wire x1="2" y1="-1.8" x2="2" y2="0" width="0.2032" layer="51"/>
-<pad name="1" x="-1" y="0" drill="0.7" diameter="1.4478"/>
-<pad name="2" x="1" y="0" drill="0.7" diameter="1.4478"/>
-<text x="-1.27" y="5.27" size="0.4064" layer="25">&gt;Name</text>
-<text x="-1.27" y="4" size="0.4064" layer="27">&gt;Value</text>
-<text x="0.6" y="0.7" size="1.27" layer="51">+</text>
-<text x="-1.4" y="0.7" size="1.27" layer="51">-</text>
-</package>
 <package name="JST-2-PTH-KIT">
 <description>&lt;H3&gt;JST-2-PTH-KIT&lt;/h3&gt;
 2-Pin JST, through-hole connector&lt;br&gt;
@@ -1663,13 +1615,81 @@ 2-Pin JST, through-hole connector&lt;br&
 <package name="1X02_2.54_SCREWTERM">
 <pad name="P2" x="0" y="0" drill="1.016" shape="square"/>
 <pad name="P1" x="2.54" y="0" drill="1.016" shape="square"/>
-<wire x1="-1.5" y1="3.25" x2="4" y2="3.25" width="0.127" layer="21"/>
-<wire x1="4" y1="3.25" x2="4" y2="2.5" width="0.127" layer="21"/>
-<wire x1="4" y1="2.5" x2="4" y2="-3.25" width="0.127" layer="21"/>
-<wire x1="4" y1="-3.25" x2="-1.5" y2="-3.25" width="0.127" layer="21"/>
-<wire x1="-1.5" y1="-3.25" x2="-1.5" y2="2.5" width="0.127" layer="21"/>
-<wire x1="-1.5" y1="2.5" x2="-1.5" y2="3.25" width="0.127" layer="21"/>
-<wire x1="-1.5" y1="2.5" x2="4" y2="2.5" width="0.127" layer="21"/>
+<wire x1="-1.5" y1="3.25" x2="4" y2="3.25" width="0.2032" layer="21"/>
+<wire x1="4" y1="3.25" x2="4" y2="2.5" width="0.2032" layer="21"/>
+<wire x1="4" y1="2.5" x2="4" y2="-3.25" width="0.2032" layer="21"/>
+<wire x1="4" y1="-3.25" x2="-1.5" y2="-3.25" width="0.2032" layer="21"/>
+<wire x1="-1.5" y1="-3.25" x2="-1.5" y2="2.5" width="0.2032" layer="21"/>
+<wire x1="-1.5" y1="2.5" x2="-1.5" y2="3.25" width="0.2032" layer="21"/>
+<wire x1="-1.5" y1="2.5" x2="4" y2="2.5" width="0.2032" layer="21"/>
+</package>
+<package name="SCREWTERMINAL-3.5MM-2">
+<circle x="2" y="3" radius="0.2828" width="0.127" layer="51"/>
+<wire x1="-1.75" y1="3.4" x2="5.25" y2="3.4" width="0.2032" layer="21"/>
+<wire x1="5.25" y1="3.4" x2="5.25" y2="-2.8" width="0.2032" layer="21"/>
+<wire x1="5.25" y1="-2.8" x2="5.25" y2="-3.6" width="0.2032" layer="21"/>
+<wire x1="5.25" y1="-3.6" x2="-1.75" y2="-3.6" width="0.2032" layer="21"/>
+<wire x1="-1.75" y1="-3.6" x2="-1.75" y2="-2.8" width="0.2032" layer="21"/>
+<wire x1="-1.75" y1="-2.8" x2="-1.75" y2="3.4" width="0.2032" layer="21"/>
+<wire x1="5.25" y1="-2.8" x2="-1.75" y2="-2.8" width="0.2032" layer="21"/>
+<wire x1="-1.75" y1="-1.35" x2="-2.25" y2="-1.35" width="0.2032" layer="51"/>
+<wire x1="-2.25" y1="-1.35" x2="-2.25" y2="-2.35" width="0.2032" layer="51"/>
+<wire x1="-2.25" y1="-2.35" x2="-1.75" y2="-2.35" width="0.2032" layer="51"/>
+<wire x1="5.25" y1="3.15" x2="5.75" y2="3.15" width="0.2032" layer="51"/>
+<wire x1="5.75" y1="3.15" x2="5.75" y2="2.15" width="0.2032" layer="51"/>
+<wire x1="5.75" y1="2.15" x2="5.25" y2="2.15" width="0.2032" layer="51"/>
+<pad name="1" x="0" y="0" drill="1.2" diameter="2.032" shape="square"/>
+<pad name="2" x="3.5" y="0" drill="1.2" diameter="2.032"/>
+<text x="-1.27" y="2.54" size="0.4064" layer="25">&gt;NAME</text>
+<text x="-1.27" y="1.27" size="0.4064" layer="27">&gt;VALUE</text>
+</package>
+<package name="JST-2-SMD">
+<description>2mm SMD side-entry connector. tDocu layer indicates the actual physical plastic housing. +/- indicate SparkFun standard batteries and wiring.</description>
+<wire x1="-4" y1="-1" x2="-4" y2="-4.5" width="0.2032" layer="21"/>
+<wire x1="-4" y1="-4.5" x2="-3.2" y2="-4.5" width="0.2032" layer="21"/>
+<wire x1="-3.2" y1="-4.5" x2="-3.2" y2="-2" width="0.2032" layer="21"/>
+<wire x1="-3.2" y1="-2" x2="-2" y2="-2" width="0.2032" layer="21"/>
+<wire x1="2" y1="-2" x2="3.2" y2="-2" width="0.2032" layer="21"/>
+<wire x1="3.2" y1="-2" x2="3.2" y2="-4.5" width="0.2032" layer="21"/>
+<wire x1="3.2" y1="-4.5" x2="4" y2="-4.5" width="0.2032" layer="21"/>
+<wire x1="4" y1="-4.5" x2="4" y2="-1" width="0.2032" layer="21"/>
+<wire x1="2" y1="3" x2="-2" y2="3" width="0.2032" layer="21"/>
+<smd name="1" x="-1" y="-3.7" dx="1" dy="4.6" layer="1"/>
+<smd name="2" x="1" y="-3.7" dx="1" dy="4.6" layer="1"/>
+<smd name="NC1" x="-3.4" y="1.5" dx="3.4" dy="1.6" layer="1" rot="R90"/>
+<smd name="NC2" x="3.4" y="1.5" dx="3.4" dy="1.6" layer="1" rot="R90"/>
+<text x="-1.27" y="1.27" size="0.4064" layer="25">&gt;Name</text>
+<text x="-1.27" y="0" size="0.4064" layer="27">&gt;Value</text>
+</package>
+<package name="JST-2-PTH">
+<pad name="1" x="-1" y="0" drill="0.7" diameter="1.6"/>
+<pad name="2" x="1" y="0" drill="0.7" diameter="1.6"/>
+<text x="-1.27" y="5.27" size="0.4064" layer="25">&gt;Name</text>
+<text x="-1.27" y="4" size="0.4064" layer="27">&gt;Value</text>
+<text x="0.6" y="0.7" size="1.27" layer="51">+</text>
+<text x="-1.4" y="0.7" size="1.27" layer="51">-</text>
+<wire x1="-2.95" y1="-1.6" x2="-2.95" y2="6" width="0.2032" layer="21"/>
+<wire x1="-2.95" y1="6" x2="2.95" y2="6" width="0.2032" layer="21"/>
+<wire x1="2.95" y1="6" x2="2.95" y2="-1.6" width="0.2032" layer="21"/>
+<wire x1="-2.95" y1="-1.6" x2="-2.3" y2="-1.6" width="0.2032" layer="21"/>
+<wire x1="2.95" y1="-1.6" x2="2.3" y2="-1.6" width="0.2032" layer="21"/>
+<wire x1="-2.3" y1="-1.6" x2="-2.3" y2="0" width="0.2032" layer="21"/>
+<wire x1="2.3" y1="-1.6" x2="2.3" y2="0" width="0.2032" layer="21"/>
+</package>
+<package name="JST-2-PTH-NS">
+<wire x1="-2" y1="0" x2="-2" y2="-1.8" width="0.2032" layer="51"/>
+<wire x1="-2" y1="-1.8" x2="-3" y2="-1.8" width="0.2032" layer="51"/>
+<wire x1="-3" y1="-1.8" x2="-3" y2="6" width="0.2032" layer="51"/>
+<wire x1="-3" y1="6" x2="3" y2="6" width="0.2032" layer="51"/>
+<wire x1="3" y1="6" x2="3" y2="-1.8" width="0.2032" layer="51"/>
+<wire x1="3" y1="-1.8" x2="2" y2="-1.8" width="0.2032" layer="51"/>
+<wire x1="2" y1="-1.8" x2="2" y2="0" width="0.2032" layer="51"/>
+<pad name="1" x="-1" y="0" drill="0.7" diameter="1.6"/>
+<pad name="2" x="1" y="0" drill="0.7" diameter="1.6"/>
+<text x="-1.27" y="5.27" size="0.4064" layer="25">&gt;Name</text>
+<text x="-1.27" y="4" size="0.4064" layer="27">&gt;Value</text>
+<text x="0.6" y="0.7" size="1.27" layer="51">+</text>
+<text x="-1.4" y="0.7" size="1.27" layer="51">-</text>
 </package>
 <package name="JST-2-PTH-VERT">
 <wire x1="-2.95" y1="-2.25" x2="-2.95" y2="2.25" width="0.2032" layer="21"/>
@@ -1680,8 +1700,8 @@ 2-Pin JST, through-hole connector&lt;br&
 <wire x1="-1" y1="-1.75" x2="1" y2="-1.75" width="0.2032" layer="21"/>
 <wire x1="1" y1="-1.75" x2="1" y2="-2.25" width="0.2032" layer="21"/>
 <wire x1="-1" y1="-1.75" x2="-1" y2="-2.25" width="0.2032" layer="21"/>
-<pad name="1" x="-1" y="-0.55" drill="0.7" diameter="1.6256"/>
-<pad name="2" x="1" y="-0.55" drill="0.7" diameter="1.6256"/>
+<pad name="1" x="-1" y="-0.55" drill="0.7" diameter="1.6"/>
+<pad name="2" x="1" y="-0.55" drill="0.7" diameter="1.6"/>
 <text x="-1.984" y="3" size="0.4064" layer="25">&gt;Name</text>
 <text x="2.016" y="3" size="0.4064" layer="27">&gt;Value</text>
 <text x="0.616" y="0.75" size="1.27" layer="51">+</text>
@@ -1698,6 +1718,8 @@ 2-Pin JST, through-hole connector&lt;br&
 <pin name="D-" x="-2.54" y="5.08" visible="pad" length="short"/>
 <pin name="VBUS" x="-2.54" y="2.54" visible="pad" length="short"/>
 <pin name="GND" x="-2.54" y="0" visible="pad" length="short"/>
+<text x="0" y="9.525" size="1.778" layer="95">&gt;NAME</text>
+<text x="0" y="-3.81" size="1.778" layer="96">&gt;VALUE</text>
 </symbol>
 <symbol name="M02">
 <wire x1="3.81" y1="-2.54" x2="-2.54" y2="-2.54" width="0.4064" layer="94"/>
@@ -1729,13 +1751,15 @@ 2-Pin JST, through-hole connector&lt;br&
 <devices>
 <device name="-A-H" package="USB-A-H">
 <connects>
-<connect gate="G$1" pin="D+" pad="D-"/>
-<connect gate="G$1" pin="D-" pad="D+"/>
-<connect gate="G$1" pin="GND" pad="VBUS"/>
-<connect gate="G$1" pin="VBUS" pad="GND"/>
+<connect gate="G$1" pin="D+" pad="D+"/>
+<connect gate="G$1" pin="D-" pad="D-"/>
+<connect gate="G$1" pin="GND" pad="GND"/>
+<connect gate="G$1" pin="VBUS" pad="VBUS"/>
 </connects>
 <technologies>
-<technology name=""/>
+<technology name="">
+<attribute name="PROD_ID" value="CONN-08367"/>
+</technology>
 </technologies>
 </device>
 <device name="-A-S" package="USB-A-S">
@@ -1804,7 +1828,9 @@ 2-Pin JST, through-hole connector&lt;br&
 <connect gate="G$1" pin="VBUS" pad="4"/>
 </connects>
 <technologies>
-<technology name=""/>
+<technology name="">
+<attribute name="PROD_ID" value="CONN-08193" constant="no"/>
+</technology>
 </technologies>
 </device>
 <device name="SMD" package="USB-MINIB">
@@ -1925,7 +1951,7 @@ 2-Pin JST, through-hole connector&lt;br&
 </device>
 </devices>
 </deviceset>
-<deviceset name="M02" prefix="JP">
+<deviceset name="M02" prefix="JP" uservalue="yes">
 <description>Standard 2-pin 0.1" header. Use with &lt;br&gt;
 - straight break away headers ( PRT-00116)&lt;br&gt;
 - right angle break away headers (PRT-00553)&lt;br&gt;
@@ -1939,7 +1965,7 @@ 2.54_SCREWTERM for use with  PRT-10571.&
 
 3.5mm Screw Terminal footprints for  PRT-08084&lt;br&gt;&lt;br&gt;
 
-5mm Screw Terminal footprints for use with PRT-08433</description>
+5mm Screw Terminal footprints for use with PRT-08432</description>
 <gates>
 <gate name="G$1" symbol="M02" x="-2.54" y="0"/>
 </gates>
@@ -1968,7 +1994,9 @@ 5mm Screw Terminal footprints for use wi
 <connect gate="G$1" pin="2" pad="2"/>
 </connects>
 <technologies>
-<technology name=""/>
+<technology name="">
+<attribute name="PROD_ID" value="CONN-08399" constant="no"/>
+</technology>
 </technologies>
 </device>
 <device name="-JST-2MM-SMT" package="JST-2-SMD">
@@ -1978,7 +2006,7 @@ 5mm Screw Terminal footprints for use wi
 </connects>
 <technologies>
 <technology name="">
-<attribute name="PROD_ID" value="CONN-08352"/>
+<attribute name="PROD_ID" value="CONN-11443"/>
 </technology>
 </technologies>
 </device>
@@ -2015,7 +2043,9 @@ 5mm Screw Terminal footprints for use wi
 <connect gate="G$1" pin="2" pad="2"/>
 </connects>
 <technologies>
-<technology name=""/>
+<technology name="">
+<attribute name="STOREFRONT_ID" value="PRT-08432" constant="no"/>
+</technology>
 </technologies>
 </device>
 <device name="LOCK" package="1X02_LOCK">
@@ -2051,7 +2081,9 @@ 5mm Screw Terminal footprints for use wi
 <connect gate="G$1" pin="2" pad="2"/>
 </connects>
 <technologies>
-<technology name=""/>
+<technology name="">
+<attribute name="PROD_ID" value="CONN-08399" constant="no"/>
+</technology>
 </technologies>
 </device>
 <device name="PTH3" package="1X02_LONGPADS">
@@ -2079,6 +2111,7 @@ 5mm Screw Terminal footprints for use wi
 </connects>
 <technologies>
 <technology name="">
+<attribute name="PROD_ID" value="CONN-09863" constant="no"/>
 <attribute name="SKU" value="PRT-09914" constant="no"/>
 </technology>
 </technologies>
@@ -2107,7 +2140,9 @@ 5mm Screw Terminal footprints for use wi
 <connect gate="G$1" pin="2" pad="2"/>
 </connects>
 <technologies>
-<technology name=""/>
+<technology name="">
+<attribute name="PROD_ID" value="CONN-08399" constant="no"/>
+</technology>
 </technologies>
 </device>
 <device name="-JST-2-PTH-NO_SILK" package="JST-2-PTH-NS">
@@ -2170,13 +2205,18 @@ You are welcome to use this library for 
 <packages>
 <package name="SOT23-5">
 <description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;</description>
-<wire x1="1.4224" y1="0.4294" x2="1.4224" y2="-0.4294" width="0.2032" layer="21"/>
+<wire x1="1.27" y1="0.4294" x2="1.27" y2="-0.4294" width="0.2032" layer="21"/>
 <wire x1="1.4" y1="-0.8" x2="-1.4" y2="-0.8" width="0.1524" layer="51"/>
-<wire x1="-1.4224" y1="-0.4294" x2="-1.4224" y2="0.4294" width="0.2032" layer="21"/>
+<wire x1="-1.27" y1="-0.4294" x2="-1.27" y2="0.4294" width="0.2032" layer="21"/>
 <wire x1="-1.4" y1="0.8" x2="1.4" y2="0.8" width="0.1524" layer="51"/>
-<wire x1="-0.2684" y1="0.8104" x2="0.2684" y2="0.8104" width="0.2032" layer="21"/>
+<wire x1="-0.2684" y1="0.7088" x2="0.2684" y2="0.7088" width="0.2032" layer="21"/>
 <wire x1="1.4" y1="0.8" x2="1.4" y2="-0.8" width="0.1524" layer="51"/>
 <wire x1="-1.4" y1="0.8" x2="-1.4" y2="-0.8" width="0.1524" layer="51"/>
+<rectangle x1="-1.2" y1="-1.5" x2="-0.7" y2="-0.85" layer="51"/>
+<rectangle x1="-0.25" y1="-1.5" x2="0.25" y2="-0.85" layer="51"/>
+<rectangle x1="0.7" y1="-1.5" x2="1.2" y2="-0.85" layer="51"/>
+<rectangle x1="0.7" y1="0.85" x2="1.2" y2="1.5" layer="51"/>
+<rectangle x1="-1.2" y1="0.85" x2="-0.7" y2="1.5" layer="51"/>
 <smd name="1" x="-0.95" y="-1.3001" dx="0.55" dy="1.2" layer="1"/>
 <smd name="2" x="0" y="-1.3001" dx="0.55" dy="1.2" layer="1"/>
 <smd name="3" x="0.95" y="-1.3001" dx="0.55" dy="1.2" layer="1"/>
@@ -2184,11 +2224,7 @@ You are welcome to use this library for 
 <smd name="5" x="-0.95" y="1.3001" dx="0.55" dy="1.2" layer="1"/>
 <text x="-0.889" y="2.159" size="0.4064" layer="25">&gt;NAME</text>
 <text x="-0.9525" y="-0.1905" size="0.4064" layer="27">&gt;VALUE</text>
-<rectangle x1="-1.2" y1="-1.5" x2="-0.7" y2="-0.85" layer="51"/>
-<rectangle x1="-0.25" y1="-1.5" x2="0.25" y2="-0.85" layer="51"/>
-<rectangle x1="0.7" y1="-1.5" x2="1.2" y2="-0.85" layer="51"/>
-<rectangle x1="0.7" y1="0.85" x2="1.2" y2="1.5" layer="51"/>
-<rectangle x1="-1.2" y1="0.85" x2="-0.7" y2="1.5" layer="51"/>
+<circle x="-1.6002" y="-1.016" radius="0.127" width="0" layer="21"/>
 </package>
 </packages>
 <symbols>
@@ -2200,10 +2236,10 @@ You are welcome to use this library for 
 <text x="-7.62" y="9.144" size="1.778" layer="95">&gt;NAME</text>
 <text x="-7.62" y="-11.43" size="1.778" layer="96">&gt;VALUE</text>
 <pin name="IN" x="-10.16" y="5.08" visible="pin" length="short" direction="in"/>
-<pin name="GND" x="-10.16" y="0" visible="pin" length="short" direction="in"/>
+<pin name="GND" x="-10.16" y="-5.08" visible="pin" length="short" direction="in"/>
 <pin name="OUT" x="7.62" y="5.08" visible="pin" length="short" direction="pas" rot="R180"/>
-<pin name="EN" x="-10.16" y="-5.08" visible="pin" length="short" direction="in"/>
-<pin name="BP" x="7.62" y="-5.08" visible="pin" length="short" direction="in" rot="R180"/>
+<pin name="EN" x="-10.16" y="0" visible="pin" length="short" direction="in"/>
+<pin name="ADJ" x="7.62" y="-5.08" visible="pin" length="short" direction="in" rot="R180"/>
 </symbol>
 </symbols>
 <devicesets>
@@ -2217,7 +2253,7 @@ 5V - VREG-00823</description>
 <devices>
 <device name="3.3V" package="SOT23-5">
 <connects>
-<connect gate="G$1" pin="BP" pad="4"/>
+<connect gate="G$1" pin="ADJ" pad="4"/>
 <connect gate="G$1" pin="EN" pad="3"/>
 <connect gate="G$1" pin="GND" pad="2"/>
 <connect gate="G$1" pin="IN" pad="1"/>
@@ -2231,7 +2267,7 @@ 5V - VREG-00823</description>
 </device>
 <device name="5V" package="SOT23-5">
 <connects>
-<connect gate="G$1" pin="BP" pad="4"/>
+<connect gate="G$1" pin="ADJ" pad="4"/>
 <connect gate="G$1" pin="EN" pad="3"/>
 <connect gate="G$1" pin="GND" pad="2"/>
 <connect gate="G$1" pin="IN" pad="1"/>
@@ -2534,6 +2570,41 @@ 5V - VREG-00823</description>
 <rectangle x1="-1.2" y1="-1.2" x2="-0.4" y2="-0.4" layer="31"/>
 <smd name="P$1" x="0" y="0" dx="2.5" dy="2.5" layer="1"/>
 </package>
+<package name="QFN20-5X5">
+<wire x1="-2.4" y1="2.4" x2="2.4" y2="2.4" width="0.127" layer="21"/>
+<wire x1="2.4" y1="2.4" x2="2.4" y2="-2.4" width="0.127" layer="21"/>
+<wire x1="2.4" y1="-2.4" x2="-2.4" y2="-2.4" width="0.127" layer="21"/>
+<wire x1="-2.4" y1="-2.4" x2="-2.4" y2="2.4" width="0.127" layer="21"/>
+<circle x="-2.9" y="2.1" radius="0.2236" width="0.127" layer="21"/>
+<smd name="1" x="-2.34" y="1.3" dx="0.95" dy="0.35" layer="1"/>
+<smd name="2" x="-2.34" y="0.65" dx="0.95" dy="0.35" layer="1"/>
+<smd name="3" x="-2.34" y="0" dx="0.95" dy="0.35" layer="1"/>
+<smd name="4" x="-2.34" y="-0.65" dx="0.95" dy="0.35" layer="1"/>
+<smd name="5" x="-2.34" y="-1.3" dx="0.95" dy="0.35" layer="1"/>
+<smd name="6" x="-1.3" y="-2.34" dx="0.95" dy="0.35" layer="1" rot="R90"/>
+<smd name="7" x="-0.65" y="-2.34" dx="0.95" dy="0.35" layer="1" rot="R90"/>
+<smd name="8" x="0" y="-2.34" dx="0.95" dy="0.35" layer="1" rot="R90"/>
+<smd name="9" x="0.65" y="-2.34" dx="0.95" dy="0.35" layer="1" rot="R90"/>
+<smd name="10" x="1.3" y="-2.34" dx="0.95" dy="0.35" layer="1" rot="R90"/>
+<smd name="11" x="2.34" y="-1.3" dx="0.95" dy="0.35" layer="1" rot="R180"/>
+<smd name="12" x="2.34" y="-0.65" dx="0.95" dy="0.35" layer="1" rot="R180"/>
+<smd name="13" x="2.34" y="0" dx="0.95" dy="0.35" layer="1" rot="R180"/>
+<smd name="14" x="2.34" y="0.65" dx="0.95" dy="0.35" layer="1" rot="R180"/>
+<smd name="15" x="2.34" y="1.3" dx="0.95" dy="0.35" layer="1" rot="R180"/>
+<smd name="16" x="1.3" y="2.34" dx="0.95" dy="0.35" layer="1" rot="R270"/>
+<smd name="17" x="0.65" y="2.34" dx="0.95" dy="0.35" layer="1" rot="R270"/>
+<smd name="18" x="0" y="2.34" dx="0.95" dy="0.35" layer="1" rot="R270"/>
+<smd name="19" x="-0.65" y="2.34" dx="0.95" dy="0.35" layer="1" rot="R270"/>
+<smd name="20" x="-1.3" y="2.34" dx="0.95" dy="0.35" layer="1" rot="R270"/>
+<text x="-2.6" y="3.7" size="1.27" layer="25" font="vector">&gt;NAME</text>
+<text x="-2.5" y="-5" size="1.27" layer="25" font="vector">&gt;VALUE</text>
+<rectangle x1="-1.3" y1="-1.3" x2="1.3" y2="1.3" layer="29"/>
+<rectangle x1="-1.2" y1="0.4" x2="-0.4" y2="1.2" layer="31"/>
+<rectangle x1="0.4" y1="0.4" x2="1.2" y2="1.2" layer="31"/>
+<rectangle x1="0.4" y1="-1.2" x2="1.2" y2="-0.4" layer="31"/>
+<rectangle x1="-1.2" y1="-1.2" x2="-0.4" y2="-0.4" layer="31"/>
+<smd name="P$1" x="0" y="0" dx="3.25" dy="3.25" layer="1"/>
+</package>
 </packages>
 <symbols>
 <symbol name="POGOPROG-CONN">
@@ -2813,6 +2884,32 @@ short conditions is included.</descripti
 <technology name=""/>
 </technologies>
 </device>
+<device name="QFN20-5X5" package="QFN20-5X5">
+<connects>
+<connect gate="G$1" pin="!CS" pad="13"/>
+<connect gate="G$1" pin="!DRDY" pad="18"/>
+<connect gate="G$1" pin="BIAS" pad="1"/>
+<connect gate="G$1" pin="DGND" pad="15"/>
+<connect gate="G$1" pin="DVDD" pad="19"/>
+<connect gate="G$1" pin="FORCE+" pad="5"/>
+<connect gate="G$1" pin="FORCE-" pad="9"/>
+<connect gate="G$1" pin="FORCE2" pad="6"/>
+<connect gate="G$1" pin="GND1" pad="16 P$1"/>
+<connect gate="G$1" pin="GND2" pad="10"/>
+<connect gate="G$1" pin="ISENSOR" pad="4"/>
+<connect gate="G$1" pin="REFIN+" pad="2"/>
+<connect gate="G$1" pin="REFIN-" pad="3"/>
+<connect gate="G$1" pin="RTDIN+" pad="7"/>
+<connect gate="G$1" pin="RTDIN-" pad="8"/>
+<connect gate="G$1" pin="SCLK" pad="12"/>
+<connect gate="G$1" pin="SDI" pad="11"/>
+<connect gate="G$1" pin="SDO" pad="14"/>
+<connect gate="G$1" pin="VDD" pad="20"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
 </devices>
 </deviceset>
 </devicesets>
@@ -3708,7 +3805,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="SUPPLY2" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <part name="C4" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.01uF"/>
 <part name="U1" library="Protofusion" deviceset="STM32F042K-T" device=""/>
-<part name="U$8" library="Protofusion" deviceset="MAX31865" device="QFN20"/>
+<part name="U$8" library="Protofusion" deviceset="MAX31865" device="QFN20-5X5" value="MAX31865QFN20-5X5"/>
 <part name="C10" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
 <part name="U$9" library="microbuilder" deviceset="GND" device=""/>
 <part name="R2" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES" value="10k"/>
@@ -3902,9 +3999,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="129.54" y1="55.88" x2="129.54" y2="58.42" width="0.1524" layer="91"/>
 <pinref part="U2" gate="G$1" pin="GND"/>
 <wire x1="129.54" y1="58.42" x2="129.54" y2="60.96" width="0.1524" layer="91"/>
-<wire x1="139.7" y1="66.04" x2="134.62" y2="66.04" width="0.1524" layer="91"/>
-<wire x1="134.62" y1="66.04" x2="134.62" y2="58.42" width="0.1524" layer="91"/>
-<wire x1="134.62" y1="58.42" x2="129.54" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="60.96" x2="137.16" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="137.16" y1="60.96" x2="137.16" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="137.16" y1="58.42" x2="129.54" y2="58.42" width="0.1524" layer="91"/>
 <junction x="129.54" y="58.42"/>
 </segment>
 <segment>
@@ -4062,8 +4159,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <net name="V_BATT" class="0">
 <segment>
 <pinref part="U2" gate="G$1" pin="EN"/>
-<wire x1="139.7" y1="60.96" x2="137.16" y2="60.96" width="0.1524" layer="91"/>
-<wire x1="137.16" y1="60.96" x2="137.16" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="66.04" x2="137.16" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="137.16" y1="66.04" x2="137.16" y2="71.12" width="0.1524" layer="91"/>
 <pinref part="U2" gate="G$1" pin="IN"/>
 <wire x1="137.16" y1="71.12" x2="139.7" y2="71.12" width="0.1524" layer="91"/>
 <wire x1="137.16" y1="71.12" x2="129.54" y2="71.12" width="0.1524" layer="91"/>