diff --git a/ZonCoffeeTiny.brd b/ZonCoffeeTiny.brd
--- a/ZonCoffeeTiny.brd
+++ b/ZonCoffeeTiny.brd
@@ -9,10 +9,10 @@
 <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="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
-<layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
+<layer number="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="14" fill="1" visible="no" active="yes"/>
@@ -433,52 +433,6 @@ chip</description>
 <hole x="-2.2" y="1" drill="0.9"/>
 <hole x="2.2" y="1" drill="0.9"/>
 </package>
-<package name="LCD1602">
-<wire x1="0" y1="0" x2="80" y2="0" width="0.127" layer="21"/>
-<wire x1="80" y1="0" x2="80" y2="36" width="0.127" layer="21"/>
-<wire x1="80" y1="36" x2="0" y2="36" width="0.127" layer="21"/>
-<wire x1="0" y1="36" x2="0" y2="0" width="0.127" layer="21"/>
-<wire x1="4" y1="30" x2="76" y2="30" width="0.127" layer="21"/>
-<wire x1="76" y1="30" x2="76" y2="6" width="0.127" layer="21"/>
-<wire x1="76" y1="6" x2="4" y2="6" width="0.127" layer="21"/>
-<wire x1="4" y1="6" x2="4" y2="30" width="0.127" layer="21"/>
-<wire x1="6" y1="28" x2="74" y2="28" width="0.127" layer="21"/>
-<wire x1="74" y1="28" x2="74" y2="27" width="0.127" layer="21"/>
-<wire x1="74" y1="27" x2="6" y2="27" width="0.127" layer="21"/>
-<wire x1="6" y1="27" x2="6" y2="28" width="0.127" layer="21"/>
-<wire x1="6" y1="8" x2="74" y2="8" width="0.127" layer="21"/>
-<wire x1="74" y1="8" x2="74" y2="9" width="0.127" layer="21"/>
-<wire x1="74" y1="9" x2="6" y2="9" width="0.127" layer="21"/>
-<wire x1="6" y1="9" x2="6" y2="8" width="0.127" layer="21"/>
-<wire x1="11" y1="25" x2="8" y2="22" width="0.127" layer="21" curve="90"/>
-<wire x1="8" y1="22" x2="8" y2="14" width="0.127" layer="21"/>
-<wire x1="8" y1="14" x2="11" y2="11" width="0.127" layer="21" curve="90"/>
-<wire x1="11" y1="11" x2="69" y2="11" width="0.127" layer="21"/>
-<wire x1="69" y1="11" x2="72" y2="14" width="0.127" layer="21" curve="90"/>
-<wire x1="72" y1="14" x2="72" y2="22" width="0.127" layer="21"/>
-<wire x1="72" y1="22" x2="69" y2="25" width="0.127" layer="21" curve="90"/>
-<wire x1="69" y1="25" x2="11" y2="25" width="0.127" layer="21"/>
-<pad name="1" x="8" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="2" x="10.54" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="3" x="13.08" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="4" x="15.62" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="5" x="18.16" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="6" x="20.7" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="7" x="23.24" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="8" x="25.78" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="9" x="28.32" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="10" x="30.86" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="11" x="33.4" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="12" x="35.94" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="13" x="38.48" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="14" x="41.02" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="15" x="43.56" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="16" x="46.1" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<hole x="2.54" y="2.54" drill="2.8"/>
-<hole x="2.54" y="33.46" drill="2.8"/>
-<hole x="77.46" y="33.46" drill="2.8"/>
-<hole x="77.46" y="2.54" drill="2.8"/>
-</package>
 </packages>
 </library>
 <library name="jumper">
@@ -3598,19 +3552,19 @@ Please make sure your boards conform to 
 </pass>
 </autorouter>
 <elements>
-<element name="R1" library="adafruit" package="R0603" value="22" x="11.176" y="34.29"/>
-<element name="R2" library="adafruit" package="R0603" value="22" x="11.176" y="32.258"/>
-<element name="L1" library="adafruit" package="R1206" value="500mA" x="12.065" y="36.195"/>
-<element name="C1" library="adafruit" package="C0603" value="0.1uF" x="11.176" y="28.702" rot="R180"/>
-<element name="C4" library="adafruit" package="C0603" value="0.1uF" x="6.985" y="39.497"/>
-<element name="X3" library="adaprog" package="NX5032" value="16MHz" x="32.766" y="33.528" rot="R180"/>
-<element name="C2" library="adafruit" package="C0603" value="18pF" x="31.369" y="36.703" rot="R180"/>
-<element name="C3" library="adafruit" package="C0603" value="18pF" x="30.861" y="29.845" rot="R270"/>
+<element name="R1" library="adafruit" package="R0603" value="22" x="11.176" y="34.671"/>
+<element name="R2" library="adafruit" package="R0603" value="22" x="11.176" y="32.385"/>
+<element name="L1" library="adafruit" package="R1206" value="500mA" x="12.065" y="36.957"/>
+<element name="C1" library="adafruit" package="C0603" value="0.1uF" x="11.176" y="30.099" rot="R180"/>
+<element name="C4" library="adafruit" package="C0603" value="0.1uF" x="7.239" y="39.497"/>
+<element name="X3" library="adaprog" package="NX5032" value="16MHz" x="32.766" y="27.94" rot="R180"/>
+<element name="C2" library="adafruit" package="C0603" value="18pF" x="34.417" y="30.861" rot="R180"/>
+<element name="C3" library="adafruit" package="C0603" value="18pF" x="31.115" y="30.861"/>
 <element name="IC1" library="adaprog" package="TQFP44" value="ATMEGA32U4-AU" x="21.844" y="33.401"/>
-<element name="C6" library="adafruit" package="C0603" value="0.1uF" x="38.354" y="27.94" rot="R270"/>
-<element name="C7" library="adafruit" package="C0603" value="0.1uF" x="28.4073" y="38.9154" rot="R180"/>
+<element name="C6" library="adafruit" package="C0603" value="0.1uF" x="43.688" y="32.004" rot="R180"/>
+<element name="C7" library="adafruit" package="C0603" value="0.1uF" x="28.4073" y="39.4234" rot="R180"/>
 <element name="CN1" library="adafruit" package="USB-MINIB" value="MiniB USB" x="3.81" y="32.385" rot="R270"/>
-<element name="SJ2" library="jumper" package="SJ" value="VCC" x="7.112" y="42.418" rot="R180"/>
+<element name="SJ2" library="jumper" package="SJ" value="VCC" x="7.239" y="42.672" rot="R180"/>
 <element name="READY" library="SparkFun" package="LED-0603" value="WHITE" x="2.286" y="25.4" rot="R270"/>
 <element name="TMP" library="SparkFun" package="SCREWTERMINAL-3.5MM-2" value="7PH" x="53.34" y="26.67" rot="R90"/>
 <element name="SSR" library="SparkFun" package="SCREWTERMINAL-3.5MM-2" value="3PH" x="53.34" y="34.925" rot="R90"/>
@@ -3618,39 +3572,36 @@ Please make sure your boards conform to 
 <element name="ENC" library="SparkFun" package="SCREWTERMINAL-3.5MM-4" value="5PH" x="15.113" y="22.225"/>
 <element name="BZ" library="SparkFun" package="SCREWTERMINAL-3.5MM-2" value="9PH" x="6.35" y="22.225"/>
 <element name="EXTPWR" library="SparkFun" package="SCREWTERMINAL-3.5MM-2" value="3PH" x="43.815" y="22.225"/>
-<element name="C8" library="adafruit" package="C0603" value="0.1uF" x="11.176" y="30.353" rot="R180"/>
-<element name="J1" library="SparkFun" package="2X3" value="AVR_SPI_PRG_6PTH" x="47.244" y="33.782" rot="R90"/>
+<element name="C8" library="adafruit" package="C0603" value="0.1uF" x="14.859" y="39.497" rot="R180"/>
+<element name="J1" library="SparkFun" package="2X3" value="AVR_SPI_PRG_6PTH" x="45.212" y="39.624" rot="R270"/>
 <element name="WHT-CURRLIM" library="adafruit" package="R0603" value="10K" x="15.621" y="27.686"/>
 <element name="U$1" library="ethanzonca" package="ZONCOFFEE-LOGO" value="" x="10.1092" y="35.8902" rot="R270"/>
-<element name="Q1" library="SparkFun" package="SOT23-3" value="NPN" x="40.386" y="34.798"/>
+<element name="Q1" library="SparkFun" package="SOT23-3" value="NPN" x="34.036" y="38.862" rot="R270"/>
 <element name="IC2" library="AlexW-Eagle-Libraries" package="SOIC8" value="MAX31855" x="43.688" y="28.702" rot="R90"/>
-<element name="C11" library="SparkFun" package="0603-CAP" value=".1uF" x="11.176" y="39.243" rot="R180"/>
-<element name="R4" library="SparkFun" package="0603-RES" value="10k" x="38.354" y="31.369" rot="R90"/>
-<element name="X1" library="adafruit" package="LCD1602" value="HD44780LCD-1602" x="62.23" y="88.392" rot="R180"/>
+<element name="R4" library="SparkFun" package="0603-RES" value="10k" x="38.1" y="31.369" rot="R90"/>
 <element name="C9" library="SparkFun" package="0603-CAP" value="NOPOP" x="48.641" y="28.702" rot="R90"/>
-<element name="R3" library="resistor" package="RTRIM3103" value="" x="40.386" y="38.989" rot="R180"/>
-<element name="JP1" library="SparkFun" package="1X16" value="M16PTH" x="49.022" y="43.18" rot="R180"/>
-<element name="C5" library="adafruit" package="C0805" value="10uF" x="3.048" y="39.624"/>
+<element name="R3" library="resistor" package="RTRIM3103" value="" x="40.259" y="38.862" rot="R270"/>
+<element name="C5" library="adafruit" package="C0805" value="10uF" x="2.54" y="39.497"/>
+<element name="JP1" library="SparkFun" package="1X16" value="M16PTH" x="49.53" y="42.926" rot="R180"/>
 </elements>
 <signals>
 <signal name="N$3">
 <contactref element="R1" pad="2"/>
 <contactref element="IC1" pad="3"/>
-<wire x1="13.4112" y1="34.29" x2="12.026" y2="34.29" width="0.254" layer="1"/>
-<wire x1="13.4112" y1="34.5948" x2="13.4112" y2="34.29" width="0.254" layer="1"/>
-<wire x1="14.478" y1="35.6616" x2="13.4112" y2="34.5948" width="0.254" layer="16"/>
-<wire x1="14.7828" y1="35.6616" x2="14.478" y2="35.6616" width="0.254" layer="16"/>
-<wire x1="16.002" y1="35.6616" x2="14.7828" y2="35.6616" width="0.254" layer="1"/>
+<wire x1="14.478" y1="34.7472" x2="12.0396" y2="34.7472" width="0.254" layer="1"/>
+<wire x1="14.478" y1="34.8996" x2="14.478" y2="34.7472" width="0.254" layer="1"/>
+<wire x1="15.24" y1="35.6616" x2="14.478" y2="34.8996" width="0.254" layer="1"/>
+<wire x1="16.002" y1="35.6616" x2="15.24" y2="35.6616" width="0.254" layer="1"/>
+<wire x1="12.0396" y1="34.7472" x2="12.026" y2="34.671" width="0.254" layer="1"/>
 <wire x1="16.002" y1="35.6616" x2="16.044" y2="35.801" width="0.254" layer="1"/>
-<via x="13.4112" y="34.5948" extent="1-16" drill="0.3302"/>
-<via x="14.7828" y="35.6616" extent="1-16" drill="0.3302"/>
 </signal>
 <signal name="N$4">
 <contactref element="R2" pad="2"/>
 <contactref element="IC1" pad="4"/>
-<wire x1="14.6304" y1="34.8996" x2="12.0396" y2="32.3088" width="0.254" layer="1"/>
-<wire x1="16.002" y1="34.8996" x2="14.6304" y2="34.8996" width="0.254" layer="1"/>
-<wire x1="12.0396" y1="32.3088" x2="12.026" y2="32.258" width="0.254" layer="1"/>
+<wire x1="12.8016" y1="32.4612" x2="12.0396" y2="32.4612" width="0.254" layer="1"/>
+<wire x1="15.24" y1="34.8996" x2="12.8016" y2="32.4612" width="0.254" layer="1"/>
+<wire x1="16.002" y1="34.8996" x2="15.24" y2="34.8996" width="0.254" layer="1"/>
+<wire x1="12.0396" y1="32.4612" x2="12.026" y2="32.385" width="0.254" layer="1"/>
 <wire x1="16.002" y1="34.8996" x2="16.044" y2="35.001" width="0.254" layer="1"/>
 </signal>
 <signal name="GND" class="2">
@@ -3673,12 +3624,6 @@ Please make sure your boards conform to 
 <contactref element="C8" pad="2"/>
 <contactref element="J1" pad="6"/>
 <contactref element="SSR" pad="1"/>
-<polygon width="0.6096" layer="1">
-<vertex x="-1.27" y="45.72"/>
-<vertex x="59.69" y="45.72"/>
-<vertex x="59.69" y="17.145"/>
-<vertex x="-1.27" y="17.145"/>
-</polygon>
 <polygon width="0.6096" layer="16">
 <vertex x="-1.905" y="46.355"/>
 <vertex x="58.42" y="46.355"/>
@@ -3687,61 +3632,87 @@ Please make sure your boards conform to 
 </polygon>
 <contactref element="Q1" pad="2"/>
 <contactref element="IC2" pad="1"/>
-<contactref element="C11" pad="2"/>
 <contactref element="IC2" pad="1"/>
 <contactref element="R3" pad="1"/>
 <contactref element="C5" pad="2"/>
-<contactref element="JP1" pad="16"/>
-<contactref element="JP1" pad="12"/>
 <contactref element="EXTPWR" pad="2"/>
-<wire x1="7.9248" y1="30.48" x2="10.2108" y2="30.48" width="0.381" layer="1"/>
-<wire x1="7.9248" y1="30.7848" x2="7.9248" y2="30.48" width="0.381" layer="1"/>
-<wire x1="10.2108" y1="30.48" x2="10.326" y2="30.353" width="0.381" layer="1"/>
+<contactref element="JP1" pad="1"/>
+<contactref element="JP1" pad="5"/>
+<wire x1="7.9248" y1="30.1752" x2="10.2108" y2="30.1752" width="0.381" layer="1"/>
+<wire x1="7.9248" y1="30.7848" x2="7.9248" y2="30.1752" width="0.381" layer="1"/>
+<wire x1="10.2108" y1="30.1752" x2="10.326" y2="30.099" width="0.381" layer="1"/>
 <wire x1="7.9248" y1="30.7848" x2="7.874" y2="30.785" width="0.381" layer="1"/>
-<wire x1="14.6304" y1="34.1376" x2="14.7828" y2="34.1376" width="0.381" layer="1"/>
-<wire x1="14.7828" y1="34.1376" x2="16.002" y2="34.1376" width="0.381" layer="1"/>
-<wire x1="14.6304" y1="33.3756" x2="14.6304" y2="34.1376" width="0.381" layer="1"/>
-<wire x1="12.954" y1="31.6992" x2="14.6304" y2="33.3756" width="0.381" layer="1"/>
-<wire x1="12.954" y1="31.5468" x2="12.954" y2="31.6992" width="0.381" layer="1"/>
-<wire x1="12.6492" y1="31.242" x2="12.954" y2="31.5468" width="0.381" layer="1"/>
-<wire x1="10.2108" y1="31.242" x2="12.6492" y2="31.242" width="0.381" layer="1"/>
-<wire x1="10.2108" y1="30.6324" x2="10.2108" y2="31.242" width="0.381" layer="1"/>
+<wire x1="15.24" y1="34.1376" x2="16.002" y2="34.1376" width="0.381" layer="1"/>
+<wire x1="12.954" y1="31.8516" x2="15.24" y2="34.1376" width="0.381" layer="1"/>
+<wire x1="12.954" y1="31.6992" x2="12.954" y2="31.8516" width="0.381" layer="1"/>
+<wire x1="12.3444" y1="31.0896" x2="12.954" y2="31.6992" width="0.381" layer="1"/>
+<wire x1="10.2108" y1="31.0896" x2="12.3444" y2="31.0896" width="0.381" layer="1"/>
+<wire x1="10.2108" y1="30.3276" x2="10.2108" y2="31.0896" width="0.381" layer="1"/>
 <wire x1="16.002" y1="34.1376" x2="16.044" y2="34.201" width="0.381" layer="1"/>
-<wire x1="10.2108" y1="30.6324" x2="10.326" y2="30.353" width="0.381" layer="1"/>
+<wire x1="10.2108" y1="30.3276" x2="10.326" y2="30.099" width="0.381" layer="1"/>
+<wire x1="33.528" y1="30.9372" x2="32.004" y2="30.9372" width="0.381" layer="1"/>
+<wire x1="32.004" y1="30.9372" x2="31.965" y2="30.861" width="0.381" layer="1"/>
+<wire x1="33.528" y1="30.9372" x2="33.567" y2="30.861" width="0.381" layer="1"/>
+<wire x1="29.4132" y1="27.5844" x2="28.3464" y2="28.6512" width="0.381" layer="1"/>
+<wire x1="28.3464" y1="28.6512" x2="27.7368" y2="29.2608" width="0.381" layer="1"/>
+<wire x1="29.4132" y1="26.5176" x2="29.4132" y2="27.5844" width="0.381" layer="1"/>
+<wire x1="29.5656" y1="26.3652" x2="29.4132" y2="26.5176" width="0.381" layer="1"/>
+<wire x1="32.1564" y1="26.3652" x2="29.5656" y2="26.3652" width="0.381" layer="1"/>
+<wire x1="32.1564" y1="30.7848" x2="32.1564" y2="26.3652" width="0.381" layer="1"/>
+<wire x1="27.7368" y1="29.2608" x2="27.644" y2="29.401" width="0.381" layer="1"/>
+<wire x1="32.1564" y1="30.7848" x2="31.965" y2="30.861" width="0.381" layer="1"/>
 <wire x1="18.7452" y1="38.4048" x2="18.7452" y2="39.1668" width="0.381" layer="1"/>
-<wire x1="20.2692" y1="36.8808" x2="18.7452" y2="38.4048" width="0.381" layer="1"/>
+<wire x1="19.9644" y1="37.1856" x2="19.3548" y2="37.7952" width="0.381" layer="1"/>
+<wire x1="19.3548" y1="37.7952" x2="18.7452" y2="38.4048" width="0.381" layer="1"/>
+<wire x1="25.146" y1="37.1856" x2="19.9644" y2="37.1856" width="0.381" layer="1"/>
+<wire x1="25.146" y1="39.1668" x2="25.146" y2="37.1856" width="0.381" layer="1"/>
 <wire x1="18.7452" y1="39.1668" x2="18.644" y2="39.201" width="0.381" layer="1"/>
-<wire x1="30.48" y1="36.576" x2="30.48" y2="35.6616" width="0.381" layer="1"/>
-<wire x1="30.48" y1="36.576" x2="30.519" y2="36.703" width="0.381" layer="1"/>
-<wire x1="38.4048" y1="26.9748" x2="39.4716" y2="26.9748" width="0.381" layer="1"/>
-<wire x1="38.4048" y1="26.9748" x2="38.354" y2="27.09" width="0.381" layer="1"/>
-<wire x1="10.3632" y1="27.432" x2="13.4112" y2="27.432" width="0.381" layer="1"/>
-<wire x1="10.3632" y1="28.6512" x2="10.3632" y2="27.432" width="0.381" layer="1"/>
-<wire x1="10.3632" y1="28.6512" x2="10.326" y2="28.702" width="0.381" layer="1"/>
-<wire x1="32.3088" y1="35.6616" x2="30.48" y2="35.6616" width="0.381" layer="1"/>
-<wire x1="32.3088" y1="33.3756" x2="32.3088" y2="35.6616" width="0.381" layer="1"/>
-<wire x1="34.29" y1="31.3944" x2="32.3088" y2="33.3756" width="0.381" layer="16"/>
-<wire x1="32.6136" y1="29.718" x2="34.29" y2="31.3944" width="0.381" layer="1"/>
-<wire x1="32.6136" y1="29.5656" x2="32.6136" y2="29.718" width="0.381" layer="1"/>
-<wire x1="32.1564" y1="29.1084" x2="32.6136" y2="29.5656" width="0.381" layer="1"/>
-<wire x1="30.9372" y1="29.1084" x2="32.1564" y2="29.1084" width="0.381" layer="1"/>
-<wire x1="30.9372" y1="29.1084" x2="30.861" y2="28.995" width="0.381" layer="1"/>
-<wire x1="20.2692" y1="27.5844" x2="20.244" y2="27.601" width="0.381" layer="1"/>
-<wire x1="20.2692" y1="27.5844" x2="20.24398125" y2="27.5844" width="0.381" layer="1"/>
-<via x="20.2692" y="36.8808" extent="1-16" drill="0.3302"/>
-<via x="30.48" y="35.6616" extent="1-16" drill="0.3302"/>
-<via x="14.7828" y="34.1376" extent="1-16" drill="0.3302"/>
-<via x="39.4716" y="26.9748" extent="1-16" drill="0.3302"/>
-<via x="13.4112" y="27.432" extent="1-16" drill="0.3302"/>
-<via x="32.3088" y="33.3756" extent="1-16" drill="0.3302"/>
-<via x="34.29" y="31.3944" extent="1-16" drill="0.3302"/>
-<wire x1="25.044" y1="39.201" x2="27.5573" y2="38.9154" width="0" layer="19" extent="1-1"/>
-<wire x1="30.519" y1="36.703" x2="27.5573" y2="38.9154" width="0" layer="19" extent="1-1"/>
-<wire x1="27.644" y1="29.401" x2="30.861" y2="28.995" width="0" layer="19" extent="1-1"/>
-<wire x1="41.386" y1="40.214" x2="44.704" y2="38.862" width="0" layer="19" extent="1-1"/>
-<wire x1="10.326" y1="39.243" x2="10.922" y2="43.18" width="0" layer="19" extent="1-1"/>
-<wire x1="3.898" y1="39.624" x2="7.835" y2="39.497" width="0" layer="19" extent="1-1"/>
-<wire x1="20.244" y1="27.601" x2="13.4112" y2="27.432" width="0" layer="19" extent="1-1"/>
+<wire x1="25.146" y1="39.1668" x2="25.044" y2="39.201" width="0.381" layer="1"/>
+<wire x1="13.8684" y1="39.4716" x2="11.1252" y2="39.4716" width="0.381" layer="1"/>
+<wire x1="11.1252" y1="39.4716" x2="8.2296" y2="39.4716" width="0.381" layer="1"/>
+<wire x1="8.2296" y1="39.4716" x2="8.089" y2="39.497" width="0.381" layer="1"/>
+<wire x1="13.8684" y1="39.4716" x2="14.009" y2="39.497" width="0.381" layer="1"/>
+<wire x1="46.3296" y1="26.8224" x2="46.288" y2="26.797" width="0.381" layer="1"/>
+<wire x1="6.2484" y1="25.2984" x2="3.5052" y2="25.2984" width="0.381" layer="1"/>
+<wire x1="3.5052" y1="25.2984" x2="3.048" y2="25.2984" width="0.381" layer="1"/>
+<wire x1="6.2484" y1="22.2504" x2="6.2484" y2="25.2984" width="0.381" layer="1"/>
+<wire x1="3.048" y1="25.2984" x2="3.036" y2="25.4" width="0.381" layer="1"/>
+<wire x1="6.2484" y1="22.2504" x2="6.35" y2="22.225" width="0.381" layer="1"/>
+<wire x1="33.0708" y1="38.862" x2="33.0708" y2="37.9476" width="0.381" layer="1"/>
+<wire x1="33.0708" y1="37.9476" x2="33.036" y2="37.912" width="0.381" layer="1"/>
+<wire x1="27.5844" y1="38.4048" x2="27.5844" y2="39.3192" width="0.381" layer="1"/>
+<wire x1="27.5844" y1="39.3192" x2="27.5573" y2="39.4234" width="0.381" layer="1"/>
+<wire x1="44.196" y1="33.2232" x2="42.9768" y2="32.004" width="0.381" layer="1"/>
+<wire x1="47.7012" y1="33.2232" x2="44.196" y2="33.2232" width="0.381" layer="1"/>
+<wire x1="47.7012" y1="34.4424" x2="47.7012" y2="33.2232" width="0.381" layer="1"/>
+<wire x1="42.9768" y1="32.004" x2="42.838" y2="32.004" width="0.381" layer="1"/>
+<wire x1="47.7012" y1="34.4424" x2="47.752" y2="34.544" width="0.381" layer="1"/>
+<wire x1="39.3192" y1="40.0812" x2="39.1668" y2="39.9288" width="0.381" layer="1"/>
+<wire x1="39.3192" y1="42.8244" x2="39.3192" y2="40.0812" width="0.381" layer="1"/>
+<wire x1="39.1668" y1="39.9288" x2="39.034" y2="39.862" width="0.381" layer="1"/>
+<wire x1="39.3192" y1="42.8244" x2="39.37" y2="42.926" width="0.381" layer="1"/>
+<wire x1="3.5052" y1="25.2984" x2="3.5052" y2="32.9184" width="0.381" layer="1"/>
+<wire x1="3.5052" y1="32.9184" x2="3.5052" y2="39.4716" width="0.381" layer="1"/>
+<wire x1="3.5052" y1="39.4716" x2="3.39" y2="39.497" width="0.381" layer="1"/>
+<wire x1="20.1168" y1="26.67" x2="20.1168" y2="27.5844" width="0.381" layer="1"/>
+<wire x1="15.6972" y1="22.2504" x2="20.1168" y2="26.67" width="0.381" layer="1"/>
+<wire x1="15.24" y1="22.2504" x2="15.6972" y2="22.2504" width="0.381" layer="1"/>
+<wire x1="20.1168" y1="27.5844" x2="20.244" y2="27.601" width="0.381" layer="1"/>
+<wire x1="15.24" y1="22.2504" x2="15.113" y2="22.225" width="0.381" layer="1"/>
+<wire x1="47.244" y1="25.7556" x2="46.3296" y2="26.67" width="0.381" layer="1"/>
+<wire x1="47.244" y1="22.2504" x2="47.244" y2="25.7556" width="0.381" layer="1"/>
+<wire x1="46.3296" y1="26.67" x2="46.288" y2="26.797" width="0.381" layer="1"/>
+<wire x1="47.244" y1="22.2504" x2="47.315" y2="22.225" width="0.381" layer="1"/>
+<wire x1="5.6388" y1="30.9372" x2="7.7724" y2="30.9372" width="0.381" layer="1"/>
+<wire x1="3.6576" y1="32.9184" x2="5.6388" y2="30.9372" width="0.381" layer="1"/>
+<wire x1="7.7724" y1="30.9372" x2="7.874" y2="30.785" width="0.381" layer="1"/>
+<wire x1="3.6576" y1="32.9184" x2="3.5052" y2="32.9184" width="0.381" layer="1"/>
+<via x="33.0708" y="38.862" extent="1-16" drill="0.3302"/>
+<via x="27.5844" y="38.4048" extent="1-16" drill="0.3302"/>
+<via x="11.1252" y="39.4716" extent="1-16" drill="0.3302"/>
+<via x="19.3548" y="37.7952" extent="1-16" drill="0.3302"/>
+<via x="28.3464" y="28.6512" extent="1-16" drill="0.3302"/>
+<wire x1="27.5573" y1="39.4234" x2="25.146" y2="39.1668" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="+5V">
 <contactref element="L1" pad="2"/>
@@ -3756,132 +3727,126 @@ Please make sure your boards conform to 
 <wire x1="16.1544" y1="36.576" x2="16.764" y2="36.576" width="0.254" layer="1"/>
 <wire x1="16.1544" y1="32.6136" x2="16.044" y2="32.601" width="0.254" layer="1"/>
 <wire x1="16.1544" y1="36.576" x2="16.044" y2="36.601" width="0.254" layer="1"/>
-<wire x1="14.478" y1="36.2712" x2="13.5636" y2="36.2712" width="0.254" layer="1"/>
-<wire x1="14.7828" y1="36.576" x2="14.478" y2="36.2712" width="0.254" layer="1"/>
-<wire x1="16.002" y1="36.576" x2="14.7828" y2="36.576" width="0.254" layer="1"/>
-<wire x1="13.5636" y1="36.2712" x2="13.487" y2="36.195" width="0.254" layer="1"/>
-<wire x1="16.002" y1="36.576" x2="16.044" y2="36.601" width="0.254" layer="1"/>
-<wire x1="6.2484" y1="42.3672" x2="6.2484" y2="40.6908" width="0.254" layer="1"/>
-<wire x1="6.2484" y1="40.6908" x2="6.2484" y2="39.624" width="0.254" layer="1"/>
-<wire x1="6.2484" y1="39.624" x2="6.135" y2="39.497" width="0.254" layer="1"/>
-<wire x1="6.2484" y1="42.3672" x2="6.35" y2="42.418" width="0.254" layer="1"/>
-<wire x1="2.8956" y1="40.2336" x2="2.286" y2="39.624" width="0.254" layer="1"/>
-<wire x1="2.8956" y1="40.5384" x2="2.8956" y2="40.2336" width="0.254" layer="1"/>
-<wire x1="3.048" y1="40.6908" x2="2.8956" y2="40.5384" width="0.254" layer="1"/>
-<wire x1="6.2484" y1="40.6908" x2="3.048" y2="40.6908" width="0.254" layer="1"/>
-<wire x1="2.286" y1="39.624" x2="2.198" y2="39.624" width="0.254" layer="1"/>
-<wire x1="11.2776" y1="38.4048" x2="13.4112" y2="36.2712" width="0.254" layer="1"/>
-<wire x1="6.2484" y1="38.4048" x2="11.2776" y2="38.4048" width="0.254" layer="1"/>
-<wire x1="6.2484" y1="39.4716" x2="6.2484" y2="38.4048" width="0.254" layer="1"/>
-<wire x1="13.4112" y1="36.2712" x2="13.487" y2="36.195" width="0.254" layer="1"/>
-<wire x1="6.2484" y1="39.4716" x2="6.135" y2="39.497" width="0.254" layer="1"/>
+<wire x1="15.0876" y1="36.8808" x2="13.5636" y2="36.8808" width="0.254" layer="1"/>
+<wire x1="15.24" y1="36.7284" x2="15.0876" y2="36.8808" width="0.254" layer="1"/>
+<wire x1="16.002" y1="36.7284" x2="15.24" y2="36.7284" width="0.254" layer="1"/>
+<wire x1="13.5636" y1="36.8808" x2="13.487" y2="36.957" width="0.254" layer="1"/>
+<wire x1="16.002" y1="36.7284" x2="16.044" y2="36.601" width="0.254" layer="1"/>
+<wire x1="6.4008" y1="42.672" x2="6.4008" y2="40.5384" width="0.254" layer="1"/>
+<wire x1="6.4008" y1="40.5384" x2="6.4008" y2="39.624" width="0.254" layer="1"/>
+<wire x1="6.4008" y1="39.624" x2="6.389" y2="39.497" width="0.254" layer="1"/>
+<wire x1="6.4008" y1="42.672" x2="6.477" y2="42.672" width="0.254" layer="1"/>
+<wire x1="2.4384" y1="40.2336" x2="1.8288" y2="39.624" width="0.254" layer="1"/>
+<wire x1="2.4384" y1="40.386" x2="2.4384" y2="40.2336" width="0.254" layer="1"/>
+<wire x1="2.5908" y1="40.5384" x2="2.4384" y2="40.386" width="0.254" layer="1"/>
+<wire x1="6.4008" y1="40.5384" x2="2.5908" y2="40.5384" width="0.254" layer="1"/>
+<wire x1="1.8288" y1="39.624" x2="1.69" y2="39.497" width="0.254" layer="1"/>
+<wire x1="11.7348" y1="38.7096" x2="13.4112" y2="37.0332" width="0.254" layer="1"/>
+<wire x1="6.4008" y1="38.7096" x2="11.7348" y2="38.7096" width="0.254" layer="1"/>
+<wire x1="6.4008" y1="39.4716" x2="6.4008" y2="38.7096" width="0.254" layer="1"/>
+<wire x1="13.4112" y1="37.0332" x2="13.487" y2="36.957" width="0.254" layer="1"/>
+<wire x1="6.4008" y1="39.4716" x2="6.389" y2="39.497" width="0.254" layer="1"/>
 </signal>
 <signal name="MOSI">
 <contactref element="IC1" pad="10"/>
 <contactref element="J1" pad="4"/>
-<wire x1="14.7828" y1="30.3276" x2="16.002" y2="30.3276" width="0.254" layer="1"/>
-<wire x1="19.3548" y1="34.8996" x2="14.7828" y2="30.3276" width="0.254" layer="16"/>
-<wire x1="42.9768" y1="34.8996" x2="19.3548" y2="34.8996" width="0.254" layer="16"/>
-<wire x1="44.3484" y1="36.2712" x2="42.9768" y2="34.8996" width="0.254" layer="16"/>
-<wire x1="44.6532" y1="36.2712" x2="44.3484" y2="36.2712" width="0.254" layer="16"/>
-<wire x1="16.002" y1="30.3276" x2="16.044" y2="30.201" width="0.254" layer="1"/>
-<wire x1="44.6532" y1="36.2712" x2="44.704" y2="36.322" width="0.254" layer="16"/>
-<via x="14.7828" y="30.3276" extent="1-16" drill="0.3302"/>
+<wire x1="19.05" y1="30.3276" x2="16.1544" y2="30.3276" width="0.254" layer="1"/>
+<wire x1="21.1836" y1="32.4612" x2="19.05" y2="30.3276" width="0.254" layer="16"/>
+<wire x1="44.958" y1="32.4612" x2="21.1836" y2="32.4612" width="0.254" layer="16"/>
+<wire x1="46.482" y1="33.9852" x2="44.958" y2="32.4612" width="0.254" layer="16"/>
+<wire x1="46.482" y1="37.0332" x2="46.482" y2="33.9852" width="0.254" layer="16"/>
+<wire x1="47.7012" y1="37.0332" x2="46.482" y2="37.0332" width="0.254" layer="16"/>
+<wire x1="16.1544" y1="30.3276" x2="16.044" y2="30.201" width="0.254" layer="1"/>
+<wire x1="47.7012" y1="37.0332" x2="47.752" y2="37.084" width="0.254" layer="16"/>
+<via x="19.05" y="30.3276" extent="1-16" drill="0.3302"/>
 </signal>
 <signal name="MISO">
 <contactref element="IC1" pad="11"/>
 <contactref element="J1" pad="1"/>
 <contactref element="IC2" pad="7"/>
-<wire x1="18.7452" y1="29.2608" x2="16.1544" y2="29.2608" width="0.254" layer="1"/>
-<wire x1="20.1168" y1="27.8892" x2="18.7452" y2="29.2608" width="0.254" layer="16"/>
-<wire x1="39.3192" y1="27.8892" x2="20.1168" y2="27.8892" width="0.254" layer="16"/>
-<wire x1="40.9956" y1="27.8892" x2="39.3192" y2="27.8892" width="0.254" layer="1"/>
+<wire x1="19.6596" y1="29.4132" x2="16.1544" y2="29.4132" width="0.254" layer="1"/>
+<wire x1="19.6596" y1="29.718" x2="19.6596" y2="29.4132" width="0.254" layer="1"/>
+<wire x1="21.4884" y1="27.8892" x2="19.6596" y2="29.718" width="0.254" layer="16"/>
+<wire x1="39.4716" y1="27.8892" x2="21.4884" y2="27.8892" width="0.254" layer="16"/>
+<wire x1="40.9956" y1="27.8892" x2="39.624" y2="27.8892" width="0.254" layer="1"/>
 <wire x1="40.9956" y1="28.0416" x2="40.9956" y2="27.8892" width="0.254" layer="1"/>
-<wire x1="16.1544" y1="29.2608" x2="16.044" y2="29.401" width="0.254" layer="1"/>
+<wire x1="16.1544" y1="29.4132" x2="16.044" y2="29.401" width="0.254" layer="1"/>
 <wire x1="40.9956" y1="28.0416" x2="41.088" y2="28.067" width="0.254" layer="1"/>
-<wire x1="41.4528" y1="27.8892" x2="47.244" y2="33.6804" width="0.254" layer="16"/>
-<wire x1="39.3192" y1="27.8892" x2="41.4528" y2="27.8892" width="0.254" layer="16"/>
-<wire x1="47.244" y1="33.6804" x2="47.244" y2="33.782" width="0.254" layer="16"/>
-<via x="18.7452" y="29.2608" extent="1-16" drill="0.3302"/>
-<via x="39.3192" y="27.8892" extent="1-16" drill="0.3302"/>
+<wire x1="39.624" y1="34.1376" x2="45.1104" y2="39.624" width="0.254" layer="1"/>
+<wire x1="39.624" y1="27.8892" x2="39.624" y2="34.1376" width="0.254" layer="1"/>
+<wire x1="45.1104" y1="39.624" x2="45.212" y2="39.624" width="0.254" layer="1"/>
+<wire x1="39.624" y1="27.8892" x2="39.4716" y2="27.8892" width="0.254" layer="1"/>
+<via x="19.6596" y="29.718" extent="1-16" drill="0.3302"/>
+<via x="39.4716" y="27.8892" extent="1-16" drill="0.3302"/>
 </signal>
 <signal name="SCK">
 <contactref element="IC1" pad="9"/>
 <contactref element="J1" pad="3"/>
 <contactref element="IC2" pad="5"/>
-<wire x1="18.7452" y1="30.9372" x2="16.1544" y2="30.9372" width="0.254" layer="1"/>
-<wire x1="18.7452" y1="30.6324" x2="18.7452" y2="30.9372" width="0.254" layer="1"/>
-<wire x1="39.4716" y1="30.6324" x2="18.7452" y2="30.6324" width="0.254" layer="16"/>
-<wire x1="40.9956" y1="30.6324" x2="40.5384" y2="30.6324" width="0.254" layer="1"/>
-<wire x1="40.5384" y1="30.6324" x2="39.4716" y2="30.6324" width="0.254" layer="1"/>
-<wire x1="16.1544" y1="30.9372" x2="16.044" y2="31.001" width="0.254" layer="1"/>
-<wire x1="40.9956" y1="30.6324" x2="41.088" y2="30.607" width="0.254" layer="1"/>
-<wire x1="46.0248" y1="35.052" x2="47.244" y2="36.2712" width="0.254" layer="1"/>
-<wire x1="40.5384" y1="35.052" x2="46.0248" y2="35.052" width="0.254" layer="1"/>
-<wire x1="40.5384" y1="30.6324" x2="40.5384" y2="35.052" width="0.254" layer="1"/>
-<wire x1="47.244" y1="36.2712" x2="47.244" y2="36.322" width="0.254" layer="1"/>
-<wire x1="40.5384" y1="30.6324" x2="41.088" y2="30.607" width="0.254" layer="1"/>
-<via x="18.7452" y="30.6324" extent="1-16" drill="0.3302"/>
-<via x="39.4716" y="30.6324" extent="1-16" drill="0.3302"/>
+<wire x1="19.6596" y1="31.0896" x2="16.1544" y2="31.0896" width="0.254" layer="1"/>
+<wire x1="19.6596" y1="34.4424" x2="19.6596" y2="31.0896" width="0.254" layer="1"/>
+<wire x1="22.2504" y1="37.0332" x2="19.6596" y2="34.4424" width="0.254" layer="16"/>
+<wire x1="45.1104" y1="37.0332" x2="22.2504" y2="37.0332" width="0.254" layer="16"/>
+<wire x1="16.1544" y1="31.0896" x2="16.044" y2="31.001" width="0.254" layer="1"/>
+<wire x1="45.1104" y1="37.0332" x2="45.212" y2="37.084" width="0.254" layer="16"/>
+<wire x1="41.91" y1="31.3944" x2="41.148" y2="30.6324" width="0.254" layer="1"/>
+<wire x1="41.91" y1="33.8328" x2="41.91" y2="31.3944" width="0.254" layer="1"/>
+<wire x1="45.1104" y1="37.0332" x2="41.91" y2="33.8328" width="0.254" layer="1"/>
+<wire x1="41.148" y1="30.6324" x2="41.088" y2="30.607" width="0.254" layer="1"/>
+<wire x1="45.1104" y1="37.0332" x2="45.212" y2="37.084" width="0.254" layer="1"/>
+<via x="19.6596" y="34.4424" extent="1-16" drill="0.3302"/>
 </signal>
 <signal name="RST">
 <contactref element="IC1" pad="13"/>
 <contactref element="J1" pad="5"/>
-<wire x1="18.4404" y1="27.432" x2="18.5928" y2="27.5844" width="0.254" layer="1"/>
-<wire x1="18.4404" y1="23.9268" x2="18.4404" y2="27.432" width="0.254" layer="1"/>
-<wire x1="17.2212" y1="22.7076" x2="18.4404" y2="23.9268" width="0.254" layer="1"/>
-<wire x1="17.2212" y1="21.6408" x2="17.2212" y2="22.7076" width="0.254" layer="1"/>
-<wire x1="18.4404" y1="20.4216" x2="17.2212" y2="21.6408" width="0.254" layer="1"/>
-<wire x1="51.6636" y1="20.4216" x2="18.4404" y2="20.4216" width="0.254" layer="1"/>
-<wire x1="51.6636" y1="22.86" x2="51.6636" y2="20.4216" width="0.254" layer="1"/>
-<wire x1="54.102" y1="25.2984" x2="51.6636" y2="22.86" width="0.254" layer="1"/>
-<wire x1="54.7116" y1="25.2984" x2="54.102" y2="25.2984" width="0.254" layer="1"/>
-<wire x1="54.7116" y1="39.0144" x2="54.7116" y2="25.2984" width="0.254" layer="1"/>
-<wire x1="53.6448" y1="40.0812" x2="54.7116" y2="39.0144" width="0.254" layer="1"/>
-<wire x1="49.2252" y1="40.0812" x2="53.6448" y2="40.0812" width="0.254" layer="1"/>
-<wire x1="48.006" y1="38.862" x2="49.2252" y2="40.0812" width="0.254" layer="16"/>
-<wire x1="47.244" y1="38.862" x2="48.006" y2="38.862" width="0.254" layer="16"/>
-<wire x1="18.5928" y1="27.5844" x2="18.644" y2="27.601" width="0.254" layer="1"/>
-<via x="49.2252" y="40.0812" extent="1-16" drill="0.3302"/>
+<wire x1="18.4404" y1="27.8892" x2="18.5928" y2="27.7368" width="0.254" layer="1"/>
+<wire x1="18.4404" y1="28.4988" x2="18.4404" y2="27.8892" width="0.254" layer="1"/>
+<wire x1="18.1356" y1="28.8036" x2="18.4404" y2="28.4988" width="0.254" layer="1"/>
+<wire x1="14.9352" y1="28.8036" x2="18.1356" y2="28.8036" width="0.254" layer="1"/>
+<wire x1="21.7932" y1="35.6616" x2="14.9352" y2="28.8036" width="0.254" layer="16"/>
+<wire x1="43.1292" y1="35.6616" x2="21.7932" y2="35.6616" width="0.254" layer="16"/>
+<wire x1="44.196" y1="34.5948" x2="43.1292" y2="35.6616" width="0.254" layer="16"/>
+<wire x1="45.1104" y1="34.5948" x2="44.196" y2="34.5948" width="0.254" layer="16"/>
+<wire x1="18.5928" y1="27.7368" x2="18.644" y2="27.601" width="0.254" layer="1"/>
+<wire x1="45.1104" y1="34.5948" x2="45.212" y2="34.544" width="0.254" layer="16"/>
+<via x="14.9352" y="28.8036" extent="1-16" drill="0.3302"/>
 </signal>
 <signal name="N$9">
 <contactref element="X3" pad="P$1"/>
 <contactref element="C3" pad="1"/>
 <contactref element="IC1" pad="16"/>
-<wire x1="30.7848" y1="33.528" x2="30.7848" y2="31.6992" width="0.254" layer="1"/>
-<wire x1="30.7848" y1="31.6992" x2="30.7848" y2="30.7848" width="0.254" layer="1"/>
-<wire x1="30.7848" y1="30.7848" x2="30.861" y2="30.695" width="0.254" layer="1"/>
-<wire x1="30.7848" y1="33.528" x2="30.766" y2="33.528" width="0.254" layer="1"/>
+<wire x1="30.6324" y1="30.48" x2="30.3276" y2="30.7848" width="0.254" layer="1"/>
+<wire x1="30.6324" y1="28.0416" x2="30.6324" y2="29.4132" width="0.254" layer="1"/>
+<wire x1="30.6324" y1="29.4132" x2="30.6324" y2="30.48" width="0.254" layer="1"/>
+<wire x1="30.3276" y1="30.7848" x2="30.265" y2="30.861" width="0.254" layer="1"/>
+<wire x1="30.6324" y1="28.0416" x2="30.766" y2="27.94" width="0.254" layer="1"/>
 <wire x1="21.1836" y1="28.3464" x2="21.1836" y2="27.7368" width="0.254" layer="1"/>
-<wire x1="24.2316" y1="31.3944" x2="21.1836" y2="28.3464" width="0.254" layer="1"/>
-<wire x1="25.2984" y1="31.3944" x2="24.2316" y2="31.3944" width="0.254" layer="1"/>
-<wire x1="25.6032" y1="31.6992" x2="25.2984" y2="31.3944" width="0.254" layer="16"/>
-<wire x1="28.956" y1="31.6992" x2="25.6032" y2="31.6992" width="0.254" layer="16"/>
-<wire x1="30.7848" y1="31.6992" x2="28.956" y2="31.6992" width="0.254" layer="1"/>
+<wire x1="22.2504" y1="29.4132" x2="21.1836" y2="28.3464" width="0.254" layer="1"/>
+<wire x1="26.3652" y1="29.4132" x2="22.2504" y2="29.4132" width="0.254" layer="1"/>
+<wire x1="28.956" y1="29.4132" x2="26.3652" y2="29.4132" width="0.254" layer="16"/>
+<wire x1="30.6324" y1="29.4132" x2="28.956" y2="29.4132" width="0.254" layer="1"/>
 <wire x1="21.1836" y1="27.7368" x2="21.044" y2="27.601" width="0.254" layer="1"/>
-<via x="25.2984" y="31.3944" extent="1-16" drill="0.3302"/>
-<via x="28.956" y="31.6992" extent="1-16" drill="0.3302"/>
+<via x="26.3652" y="29.4132" extent="1-16" drill="0.3302"/>
+<via x="28.956" y="29.4132" extent="1-16" drill="0.3302"/>
 </signal>
 <signal name="N$8">
 <contactref element="X3" pad="P$2"/>
 <contactref element="C2" pad="1"/>
 <contactref element="IC1" pad="17"/>
-<wire x1="34.7472" y1="34.1376" x2="32.3088" y2="36.576" width="0.254" layer="1"/>
-<wire x1="34.7472" y1="33.528" x2="34.7472" y2="34.1376" width="0.254" layer="1"/>
-<wire x1="32.3088" y1="36.576" x2="32.219" y2="36.703" width="0.254" layer="1"/>
+<wire x1="34.8996" y1="30.48" x2="35.2044" y2="30.7848" width="0.254" layer="1"/>
+<wire x1="34.8996" y1="28.0416" x2="34.8996" y2="30.48" width="0.254" layer="1"/>
+<wire x1="35.2044" y1="30.7848" x2="35.267" y2="30.861" width="0.254" layer="1"/>
+<wire x1="34.8996" y1="28.0416" x2="34.766" y2="27.94" width="0.254" layer="1"/>
 <wire x1="22.098" y1="27.8892" x2="21.9456" y2="27.7368" width="0.254" layer="1"/>
 <wire x1="22.098" y1="28.4988" x2="22.098" y2="27.8892" width="0.254" layer="1"/>
-<wire x1="22.4028" y1="28.8036" x2="22.098" y2="28.4988" width="0.254" layer="1"/>
-<wire x1="29.2608" y1="28.8036" x2="22.4028" y2="28.8036" width="0.254" layer="1"/>
-<wire x1="29.2608" y1="28.956" x2="29.2608" y2="28.8036" width="0.254" layer="1"/>
-<wire x1="30.1752" y1="29.8704" x2="29.2608" y2="28.956" width="0.254" layer="16"/>
-<wire x1="31.8516" y1="29.8704" x2="30.1752" y2="29.8704" width="0.254" layer="16"/>
-<wire x1="34.7472" y1="32.766" x2="31.8516" y2="29.8704" width="0.254" layer="1"/>
-<wire x1="34.7472" y1="33.528" x2="34.7472" y2="32.766" width="0.254" layer="1"/>
+<wire x1="22.2504" y1="28.6512" x2="22.098" y2="28.4988" width="0.254" layer="1"/>
+<wire x1="27.5844" y1="28.6512" x2="22.2504" y2="28.6512" width="0.254" layer="1"/>
+<wire x1="27.5844" y1="27.5844" x2="27.5844" y2="28.6512" width="0.254" layer="1"/>
+<wire x1="29.4132" y1="25.7556" x2="27.5844" y2="27.5844" width="0.254" layer="1"/>
+<wire x1="34.7472" y1="25.7556" x2="29.4132" y2="25.7556" width="0.254" layer="1"/>
+<wire x1="34.7472" y1="27.8892" x2="34.7472" y2="25.7556" width="0.254" layer="1"/>
 <wire x1="21.9456" y1="27.7368" x2="21.844" y2="27.601" width="0.254" layer="1"/>
-<wire x1="34.7472" y1="33.528" x2="34.766" y2="33.528" width="0.254" layer="1"/>
-<via x="29.2608" y="28.956" extent="1-16" drill="0.3302"/>
-<via x="31.8516" y="29.8704" extent="1-16" drill="0.3302"/>
+<wire x1="34.7472" y1="27.8892" x2="34.766" y2="27.94" width="0.254" layer="1"/>
 </signal>
 <signal name="HWB">
 <contactref element="IC1" pad="33"/>
@@ -3889,16 +3854,18 @@ Please make sure your boards conform to 
 <signal name="N$2">
 <contactref element="CN1" pad="D+"/>
 <contactref element="R2" pad="1"/>
-<wire x1="7.9248" y1="32.3088" x2="10.2108" y2="32.3088" width="0.254" layer="1"/>
-<wire x1="10.2108" y1="32.3088" x2="10.326" y2="32.258" width="0.254" layer="1"/>
-<wire x1="7.9248" y1="32.3088" x2="7.874" y2="32.385" width="0.254" layer="1"/>
+<wire x1="7.9248" y1="32.4612" x2="10.2108" y2="32.4612" width="0.254" layer="1"/>
+<wire x1="10.2108" y1="32.4612" x2="10.326" y2="32.385" width="0.254" layer="1"/>
+<wire x1="7.9248" y1="32.4612" x2="7.874" y2="32.385" width="0.254" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="CN1" pad="D-"/>
 <contactref element="R1" pad="1"/>
-<wire x1="9.144" y1="33.2232" x2="10.2108" y2="34.29" width="0.254" layer="1"/>
-<wire x1="7.9248" y1="33.2232" x2="9.144" y2="33.2232" width="0.254" layer="1"/>
-<wire x1="10.2108" y1="34.29" x2="10.326" y2="34.29" width="0.254" layer="1"/>
+<wire x1="9.4488" y1="33.8328" x2="10.2108" y2="34.5948" width="0.254" layer="1"/>
+<wire x1="9.4488" y1="33.6804" x2="9.4488" y2="33.8328" width="0.254" layer="1"/>
+<wire x1="8.9916" y1="33.2232" x2="9.4488" y2="33.6804" width="0.254" layer="1"/>
+<wire x1="7.9248" y1="33.2232" x2="8.9916" y2="33.2232" width="0.254" layer="1"/>
+<wire x1="10.2108" y1="34.5948" x2="10.326" y2="34.671" width="0.254" layer="1"/>
 <wire x1="7.9248" y1="33.2232" x2="7.874" y2="33.185" width="0.254" layer="1"/>
 </signal>
 <signal name="VCC" class="1">
@@ -3911,124 +3878,131 @@ Please make sure your boards conform to 
 <contactref element="C6" pad="1"/>
 <contactref element="J1" pad="2"/>
 <contactref element="LCD" pad="3"/>
-<contactref element="C11" pad="1"/>
 <contactref element="IC2" pad="4"/>
 <contactref element="R4" pad="2"/>
 <contactref element="R3" pad="3"/>
-<contactref element="JP1" pad="15"/>
+<contactref element="EXTPWR" pad="1"/>
 <contactref element="JP1" pad="2"/>
-<contactref element="EXTPWR" pad="1"/>
-<wire x1="13.4112" y1="40.6908" x2="12.3444" y2="39.624" width="0.508" layer="1"/>
-<wire x1="12.3444" y1="39.624" x2="12.0396" y2="39.3192" width="0.508" layer="1"/>
-<wire x1="13.4112" y1="43.1292" x2="13.4112" y2="40.6908" width="0.508" layer="1"/>
-<wire x1="12.0396" y1="39.3192" x2="12.026" y2="39.243" width="0.508" layer="1"/>
-<wire x1="13.4112" y1="43.1292" x2="13.462" y2="43.18" width="0.508" layer="1"/>
-<wire x1="12.3444" y1="39.3192" x2="17.8308" y2="39.3192" width="0.508" layer="1"/>
-<wire x1="17.8308" y1="39.3192" x2="17.844" y2="39.201" width="0.508" layer="1"/>
-<wire x1="12.3444" y1="39.3192" x2="12.026" y2="39.243" width="0.508" layer="1"/>
-<wire x1="19.5072" y1="36.7284" x2="19.5072" y2="32.3088" width="0.508" layer="1"/>
-<wire x1="19.5072" y1="32.3088" x2="19.5072" y2="27.7368" width="0.508" layer="1"/>
-<wire x1="17.9832" y1="38.2524" x2="19.5072" y2="36.7284" width="0.508" layer="1"/>
-<wire x1="17.9832" y1="39.0144" x2="17.9832" y2="38.2524" width="0.508" layer="1"/>
-<wire x1="19.5072" y1="27.7368" x2="19.444" y2="27.601" width="0.508" layer="1"/>
-<wire x1="17.9832" y1="39.0144" x2="17.844" y2="39.201" width="0.508" layer="1"/>
-<wire x1="9.7536" y1="42.3672" x2="7.9248" y2="42.3672" width="0.508" layer="1"/>
-<wire x1="12.192" y1="39.9288" x2="9.7536" y2="42.3672" width="0.508" layer="1"/>
-<wire x1="12.192" y1="39.7764" x2="12.192" y2="39.9288" width="0.508" layer="1"/>
-<wire x1="7.9248" y1="42.3672" x2="7.874" y2="42.418" width="0.508" layer="1"/>
-<wire x1="12.192" y1="39.7764" x2="12.3444" y2="39.624" width="0.508" layer="1"/>
-<wire x1="44.8056" y1="32.004" x2="45.5676" y2="31.242" width="0.508" layer="1"/>
-<wire x1="45.5676" y1="31.242" x2="46.1772" y2="30.6324" width="0.508" layer="1"/>
-<wire x1="44.8056" y1="33.6804" x2="44.8056" y2="32.004" width="0.508" layer="1"/>
-<wire x1="46.1772" y1="30.6324" x2="46.288" y2="30.607" width="0.508" layer="1"/>
-<wire x1="44.8056" y1="33.6804" x2="44.704" y2="33.782" width="0.508" layer="1"/>
-<wire x1="48.4632" y1="41.148" x2="46.482" y2="43.1292" width="0.508" layer="1"/>
-<wire x1="48.4632" y1="39.624" x2="48.4632" y2="41.148" width="0.508" layer="1"/>
-<wire x1="48.6156" y1="39.4716" x2="48.4632" y2="39.624" width="0.508" layer="1"/>
-<wire x1="48.6156" y1="33.0708" x2="48.6156" y2="39.4716" width="0.508" layer="1"/>
-<wire x1="46.3296" y1="30.7848" x2="48.6156" y2="33.0708" width="0.508" layer="1"/>
-<wire x1="46.482" y1="43.1292" x2="46.482" y2="43.18" width="0.508" layer="1"/>
+<contactref element="JP1" pad="15"/>
+<wire x1="39.0144" y1="33.2232" x2="38.1" y2="32.3088" width="0.508" layer="1"/>
+<wire x1="39.0144" y1="37.7952" x2="39.0144" y2="33.2232" width="0.508" layer="1"/>
+<wire x1="38.1" y1="32.3088" x2="38.1" y2="32.219" width="0.508" layer="1"/>
+<wire x1="39.0144" y1="37.7952" x2="39.034" y2="37.862" width="0.508" layer="1"/>
+<wire x1="39.0144" y1="31.3944" x2="38.2524" y2="32.1564" width="0.508" layer="1"/>
+<wire x1="39.0144" y1="28.4988" x2="39.0144" y2="31.3944" width="0.508" layer="1"/>
+<wire x1="38.7096" y1="28.194" x2="39.0144" y2="28.4988" width="0.508" layer="1"/>
+<wire x1="38.7096" y1="22.2504" x2="38.7096" y2="28.194" width="0.508" layer="1"/>
+<wire x1="38.2524" y1="32.1564" x2="38.1" y2="32.219" width="0.508" layer="1"/>
+<wire x1="38.7096" y1="22.2504" x2="38.75" y2="22.225" width="0.508" layer="1"/>
+<wire x1="47.0916" y1="40.2336" x2="47.7012" y2="39.624" width="0.508" layer="1"/>
+<wire x1="47.0916" y1="42.8244" x2="47.0916" y2="40.9956" width="0.508" layer="1"/>
+<wire x1="47.0916" y1="40.9956" x2="47.0916" y2="40.2336" width="0.508" layer="1"/>
+<wire x1="47.7012" y1="39.624" x2="47.752" y2="39.624" width="0.508" layer="1"/>
+<wire x1="47.0916" y1="42.8244" x2="46.99" y2="42.926" width="0.508" layer="1"/>
+<wire x1="46.1772" y1="30.48" x2="44.6532" y2="32.004" width="0.508" layer="1"/>
+<wire x1="44.6532" y1="32.004" x2="44.538" y2="32.004" width="0.508" layer="1"/>
+<wire x1="46.1772" y1="30.48" x2="46.288" y2="30.607" width="0.508" layer="1"/>
+<wire x1="43.8912" y1="29.1084" x2="45.5676" y2="30.7848" width="0.508" layer="1"/>
+<wire x1="43.8912" y1="22.2504" x2="43.8912" y2="29.1084" width="0.508" layer="1"/>
+<wire x1="45.5676" y1="30.7848" x2="46.288" y2="30.607" width="0.508" layer="1"/>
+<wire x1="43.8912" y1="22.2504" x2="43.815" y2="22.225" width="0.508" layer="1"/>
+<wire x1="49.2252" y1="38.1" x2="47.8536" y2="39.4716" width="0.508" layer="1"/>
+<wire x1="49.2252" y1="33.6804" x2="49.2252" y2="38.1" width="0.508" layer="1"/>
+<wire x1="46.3296" y1="30.7848" x2="49.2252" y2="33.6804" width="0.508" layer="1"/>
+<wire x1="47.8536" y1="39.4716" x2="47.752" y2="39.624" width="0.508" layer="1"/>
 <wire x1="46.3296" y1="30.7848" x2="46.288" y2="30.607" width="0.508" layer="1"/>
-<wire x1="43.7388" y1="22.2504" x2="38.862" y2="22.2504" width="0.508" layer="1"/>
-<wire x1="38.862" y1="22.2504" x2="38.75" y2="22.225" width="0.508" layer="1"/>
-<wire x1="43.7388" y1="22.2504" x2="43.815" y2="22.225" width="0.508" layer="1"/>
-<wire x1="37.338" y1="29.718" x2="38.2524" y2="28.8036" width="0.508" layer="1"/>
-<wire x1="37.338" y1="31.242" x2="37.338" y2="29.718" width="0.508" layer="1"/>
-<wire x1="38.2524" y1="32.1564" x2="37.338" y2="31.242" width="0.508" layer="1"/>
-<wire x1="38.2524" y1="28.8036" x2="38.354" y2="28.79" width="0.508" layer="1"/>
-<wire x1="38.2524" y1="32.1564" x2="38.354" y2="32.219" width="0.508" layer="1"/>
-<wire x1="38.2524" y1="39.0144" x2="39.3192" y2="40.0812" width="0.508" layer="1"/>
-<wire x1="38.2524" y1="32.3088" x2="38.2524" y2="39.0144" width="0.508" layer="1"/>
-<wire x1="39.3192" y1="40.0812" x2="39.386" y2="40.214" width="0.508" layer="1"/>
-<wire x1="38.2524" y1="32.3088" x2="38.354" y2="32.219" width="0.508" layer="1"/>
-<wire x1="28.194" y1="39.9288" x2="29.1084" y2="39.0144" width="0.508" layer="1"/>
-<wire x1="25.908" y1="39.9288" x2="28.194" y2="39.9288" width="0.508" layer="1"/>
-<wire x1="25.908" y1="39.3192" x2="25.908" y2="39.9288" width="0.508" layer="1"/>
-<wire x1="29.1084" y1="39.0144" x2="29.2573" y2="38.9154" width="0.508" layer="1"/>
+<wire x1="42.5196" y1="37.7952" x2="39.1668" y2="37.7952" width="0.508" layer="1"/>
+<wire x1="42.5196" y1="37.9476" x2="42.5196" y2="37.7952" width="0.508" layer="1"/>
+<wire x1="43.7388" y1="39.1668" x2="42.5196" y2="37.9476" width="0.508" layer="1"/>
+<wire x1="43.7388" y1="40.0812" x2="43.7388" y2="39.1668" width="0.508" layer="1"/>
+<wire x1="44.6532" y1="40.9956" x2="43.7388" y2="40.0812" width="0.508" layer="1"/>
+<wire x1="47.0916" y1="40.9956" x2="44.6532" y2="40.9956" width="0.508" layer="1"/>
+<wire x1="39.1668" y1="37.7952" x2="39.034" y2="37.862" width="0.508" layer="1"/>
+<wire x1="17.6784" y1="39.4716" x2="17.8308" y2="39.3192" width="0.508" layer="1"/>
+<wire x1="17.6784" y1="39.9288" x2="17.6784" y2="39.4716" width="0.508" layer="1"/>
+<wire x1="16.1544" y1="41.4528" x2="17.6784" y2="39.9288" width="0.508" layer="1"/>
+<wire x1="14.0208" y1="41.4528" x2="16.1544" y2="41.4528" width="0.508" layer="1"/>
+<wire x1="14.0208" y1="42.8244" x2="14.0208" y2="41.4528" width="0.508" layer="1"/>
+<wire x1="17.8308" y1="39.3192" x2="17.844" y2="39.201" width="0.508" layer="1"/>
+<wire x1="14.0208" y1="42.8244" x2="13.97" y2="42.926" width="0.508" layer="1"/>
+<wire x1="10.0584" y1="40.6908" x2="8.0772" y2="42.672" width="0.508" layer="1"/>
+<wire x1="13.8684" y1="40.6908" x2="10.0584" y2="40.6908" width="0.508" layer="1"/>
+<wire x1="13.8684" y1="41.3004" x2="13.8684" y2="40.6908" width="0.508" layer="1"/>
+<wire x1="8.0772" y1="42.672" x2="8.001" y2="42.672" width="0.508" layer="1"/>
+<wire x1="13.8684" y1="41.3004" x2="14.0208" y2="41.4528" width="0.508" layer="1"/>
+<wire x1="28.6512" y1="39.9288" x2="29.1084" y2="39.4716" width="0.508" layer="1"/>
+<wire x1="28.6512" y1="40.0812" x2="28.6512" y2="39.9288" width="0.508" layer="1"/>
+<wire x1="28.3464" y1="40.386" x2="28.6512" y2="40.0812" width="0.508" layer="1"/>
+<wire x1="25.908" y1="40.386" x2="28.3464" y2="40.386" width="0.508" layer="1"/>
+<wire x1="25.908" y1="39.3192" x2="25.908" y2="40.386" width="0.508" layer="1"/>
+<wire x1="29.1084" y1="39.4716" x2="29.2573" y2="39.4234" width="0.508" layer="1"/>
 <wire x1="25.908" y1="39.3192" x2="25.844" y2="39.201" width="0.508" layer="1"/>
-<wire x1="26.0604" y1="30.3276" x2="27.5844" y2="30.3276" width="0.508" layer="1"/>
-<wire x1="26.0604" y1="39.1668" x2="26.0604" y2="32.3088" width="0.508" layer="1"/>
-<wire x1="26.0604" y1="32.3088" x2="26.0604" y2="30.3276" width="0.508" layer="1"/>
-<wire x1="27.5844" y1="30.3276" x2="27.644" y2="30.201" width="0.508" layer="1"/>
-<wire x1="26.0604" y1="39.1668" x2="25.844" y2="39.201" width="0.508" layer="1"/>
-<wire x1="29.4132" y1="39.0144" x2="38.2524" y2="39.0144" width="0.508" layer="1"/>
-<wire x1="29.4132" y1="39.0144" x2="29.2573" y2="38.9154" width="0.508" layer="1"/>
-<wire x1="37.338" y1="23.7744" x2="38.7096" y2="22.4028" width="0.508" layer="1"/>
-<wire x1="37.338" y1="27.8892" x2="37.338" y2="23.7744" width="0.508" layer="1"/>
-<wire x1="38.1" y1="28.6512" x2="37.338" y2="27.8892" width="0.508" layer="1"/>
-<wire x1="38.7096" y1="22.4028" x2="38.75" y2="22.225" width="0.508" layer="1"/>
-<wire x1="38.1" y1="28.6512" x2="38.354" y2="28.79" width="0.508" layer="1"/>
-<wire x1="43.8912" y1="29.5656" x2="45.5676" y2="31.242" width="0.508" layer="1"/>
-<wire x1="43.8912" y1="22.4028" x2="43.8912" y2="29.5656" width="0.508" layer="1"/>
-<wire x1="43.8912" y1="22.4028" x2="43.815" y2="22.225" width="0.508" layer="1"/>
-<wire x1="26.0604" y1="32.3088" x2="19.5072" y2="32.3088" width="0.508" layer="1"/>
+<wire x1="19.5072" y1="27.8892" x2="19.3548" y2="27.7368" width="0.508" layer="1"/>
+<wire x1="19.5072" y1="28.4988" x2="19.5072" y2="27.8892" width="0.508" layer="1"/>
+<wire x1="21.1836" y1="30.1752" x2="19.5072" y2="28.4988" width="0.508" layer="1"/>
+<wire x1="27.5844" y1="30.1752" x2="25.908" y2="30.1752" width="0.508" layer="1"/>
+<wire x1="25.908" y1="30.1752" x2="21.1836" y2="30.1752" width="0.508" layer="1"/>
+<wire x1="19.3548" y1="27.7368" x2="19.444" y2="27.601" width="0.508" layer="1"/>
+<wire x1="27.5844" y1="30.1752" x2="27.644" y2="30.201" width="0.508" layer="1"/>
+<wire x1="25.908" y1="30.1752" x2="25.908" y2="39.0144" width="0.508" layer="1"/>
+<wire x1="25.908" y1="39.0144" x2="25.844" y2="39.201" width="0.508" layer="1"/>
+<wire x1="17.8308" y1="37.338" x2="17.8308" y2="39.0144" width="0.508" layer="1"/>
+<wire x1="21.0312" y1="34.1376" x2="17.8308" y2="37.338" width="0.508" layer="1"/>
+<wire x1="21.0312" y1="30.3276" x2="21.0312" y2="34.1376" width="0.508" layer="1"/>
+<wire x1="17.8308" y1="39.0144" x2="17.844" y2="39.201" width="0.508" layer="1"/>
+<wire x1="21.0312" y1="30.3276" x2="21.1836" y2="30.1752" width="0.508" layer="1"/>
+<wire x1="33.9852" y1="37.338" x2="38.862" y2="37.338" width="0.508" layer="1"/>
+<wire x1="33.9852" y1="40.386" x2="33.9852" y2="37.338" width="0.508" layer="1"/>
+<wire x1="33.6804" y1="40.6908" x2="33.9852" y2="40.386" width="0.508" layer="1"/>
+<wire x1="28.4988" y1="40.6908" x2="33.6804" y2="40.6908" width="0.508" layer="1"/>
+<wire x1="28.4988" y1="40.5384" x2="28.4988" y2="40.6908" width="0.508" layer="1"/>
+<wire x1="38.862" y1="37.338" x2="39.034" y2="37.862" width="0.508" layer="1"/>
+<wire x1="28.4988" y1="40.5384" x2="28.3464" y2="40.386" width="0.508" layer="1"/>
 </signal>
 <signal name="AREF">
 <contactref element="IC1" pad="42"/>
 <contactref element="C8" pad="1"/>
-<wire x1="11.1252" y1="29.5656" x2="11.8872" y2="30.3276" width="0.254" layer="1"/>
-<wire x1="5.7912" y1="29.5656" x2="11.1252" y2="29.5656" width="0.254" layer="1"/>
-<wire x1="5.7912" y1="35.5092" x2="5.7912" y2="29.5656" width="0.254" layer="1"/>
-<wire x1="2.7432" y1="38.5572" x2="5.7912" y2="35.5092" width="0.254" layer="1"/>
-<wire x1="0.9144" y1="38.5572" x2="2.7432" y2="38.5572" width="0.254" layer="1"/>
-<wire x1="0.9144" y1="43.2816" x2="0.9144" y2="38.5572" width="0.254" layer="1"/>
-<wire x1="2.1336" y1="44.5008" x2="0.9144" y2="43.2816" width="0.254" layer="1"/>
-<wire x1="17.2212" y1="44.5008" x2="2.1336" y2="44.5008" width="0.254" layer="1"/>
-<wire x1="17.2212" y1="42.0624" x2="17.2212" y2="44.5008" width="0.254" layer="1"/>
-<wire x1="19.3548" y1="39.9288" x2="17.2212" y2="42.0624" width="0.254" layer="1"/>
-<wire x1="19.3548" y1="39.3192" x2="19.3548" y2="39.9288" width="0.254" layer="1"/>
-<wire x1="11.8872" y1="30.3276" x2="12.026" y2="30.353" width="0.254" layer="1"/>
+<wire x1="16.9164" y1="39.624" x2="15.8496" y2="39.624" width="0.254" layer="1"/>
+<wire x1="17.9832" y1="40.6908" x2="16.9164" y2="39.624" width="0.254" layer="16"/>
+<wire x1="19.2024" y1="40.6908" x2="17.9832" y2="40.6908" width="0.254" layer="1"/>
+<wire x1="19.2024" y1="39.4716" x2="19.2024" y2="40.6908" width="0.254" layer="1"/>
+<wire x1="19.3548" y1="39.3192" x2="19.2024" y2="39.4716" width="0.254" layer="1"/>
+<wire x1="15.8496" y1="39.624" x2="15.709" y2="39.497" width="0.254" layer="1"/>
 <wire x1="19.3548" y1="39.3192" x2="19.444" y2="39.201" width="0.254" layer="1"/>
+<via x="16.9164" y="39.624" extent="1-16" drill="0.3302"/>
+<via x="17.9832" y="40.6908" extent="1-16" drill="0.3302"/>
 </signal>
 <signal name="VBUS">
 <contactref element="L1" pad="1"/>
 <contactref element="CN1" pad="VBUS"/>
-<wire x1="8.382" y1="33.9852" x2="10.5156" y2="36.1188" width="0.254" layer="1"/>
-<wire x1="7.9248" y1="33.9852" x2="8.382" y2="33.9852" width="0.254" layer="1"/>
-<wire x1="10.5156" y1="36.1188" x2="10.643" y2="36.195" width="0.254" layer="1"/>
+<wire x1="7.9248" y1="34.29" x2="10.5156" y2="36.8808" width="0.254" layer="1"/>
+<wire x1="7.9248" y1="33.9852" x2="7.9248" y2="34.29" width="0.254" layer="1"/>
+<wire x1="10.5156" y1="36.8808" x2="10.643" y2="36.957" width="0.254" layer="1"/>
 <wire x1="7.9248" y1="33.9852" x2="7.874" y2="33.985" width="0.254" layer="1"/>
 </signal>
 <signal name="N$25">
 <contactref element="READY" pad="A"/>
 <contactref element="WHT-CURRLIM" pad="1"/>
-<wire x1="2.8956" y1="26.67" x2="1.6764" y2="25.4508" width="0.254" layer="1"/>
-<wire x1="14.6304" y1="26.67" x2="2.8956" y2="26.67" width="0.254" layer="1"/>
-<wire x1="14.6304" y1="27.5844" x2="14.6304" y2="26.67" width="0.254" layer="1"/>
-<wire x1="1.6764" y1="25.4508" x2="1.536" y2="25.4" width="0.254" layer="1"/>
+<wire x1="3.2004" y1="23.7744" x2="1.6764" y2="25.2984" width="0.254" layer="1"/>
+<wire x1="5.0292" y1="23.7744" x2="3.2004" y2="23.7744" width="0.254" layer="1"/>
+<wire x1="5.0292" y1="21.0312" x2="5.0292" y2="23.7744" width="0.254" layer="1"/>
+<wire x1="5.1816" y1="20.8788" x2="5.0292" y2="21.0312" width="0.254" layer="1"/>
+<wire x1="13.716" y1="20.8788" x2="5.1816" y2="20.8788" width="0.254" layer="1"/>
+<wire x1="13.716" y1="26.67" x2="13.716" y2="20.8788" width="0.254" layer="1"/>
+<wire x1="14.6304" y1="27.5844" x2="13.716" y2="26.67" width="0.254" layer="1"/>
+<wire x1="1.6764" y1="25.2984" x2="1.536" y2="25.4" width="0.254" layer="1"/>
 <wire x1="14.6304" y1="27.5844" x2="14.771" y2="27.686" width="0.254" layer="1"/>
 </signal>
 <signal name="BUZZ">
 <contactref element="BZ" pad="2"/>
 <contactref element="IC1" pad="30"/>
 <wire x1="28.956" y1="34.8996" x2="27.7368" y2="34.8996" width="0.254" layer="1"/>
-<wire x1="28.956" y1="34.1376" x2="28.956" y2="34.8996" width="0.254" layer="1"/>
-<wire x1="26.9748" y1="32.1564" x2="28.956" y2="34.1376" width="0.254" layer="16"/>
-<wire x1="19.3548" y1="32.1564" x2="26.9748" y2="32.1564" width="0.254" layer="16"/>
-<wire x1="9.906" y1="22.7076" x2="19.3548" y2="32.1564" width="0.254" layer="16"/>
-<wire x1="9.906" y1="22.2504" x2="9.906" y2="22.7076" width="0.254" layer="16"/>
+<wire x1="26.9748" y1="32.9184" x2="28.956" y2="34.8996" width="0.254" layer="16"/>
+<wire x1="20.4216" y1="32.9184" x2="26.9748" y2="32.9184" width="0.254" layer="16"/>
+<wire x1="9.7536" y1="22.2504" x2="20.4216" y2="32.9184" width="0.254" layer="16"/>
 <wire x1="27.7368" y1="34.8996" x2="27.644" y2="35.001" width="0.254" layer="1"/>
-<wire x1="9.906" y1="22.2504" x2="9.85" y2="22.225" width="0.254" layer="16"/>
-<via x="28.956" y="34.1376" extent="1-16" drill="0.3302"/>
+<wire x1="9.7536" y1="22.2504" x2="9.85" y2="22.225" width="0.254" layer="16"/>
+<via x="28.956" y="34.8996" extent="1-16" drill="0.3302"/>
 </signal>
 <signal name="ENCA">
 <contactref element="ENC" pad="2"/>
@@ -4058,19 +4032,16 @@ Please make sure your boards conform to 
 <signal name="SSR+">
 <contactref element="IC1" pad="22"/>
 <contactref element="SSR" pad="2"/>
-<wire x1="36.7284" y1="27.5844" x2="25.908" y2="27.5844" width="0.254" layer="1"/>
-<wire x1="36.7284" y1="22.4028" x2="36.7284" y2="27.5844" width="0.254" layer="1"/>
-<wire x1="38.2524" y1="20.8788" x2="36.7284" y2="22.4028" width="0.254" layer="1"/>
-<wire x1="45.1104" y1="20.8788" x2="38.2524" y2="20.8788" width="0.254" layer="1"/>
-<wire x1="45.1104" y1="26.0604" x2="45.1104" y2="20.8788" width="0.254" layer="1"/>
-<wire x1="44.8056" y1="26.3652" x2="45.1104" y2="26.0604" width="0.254" layer="1"/>
-<wire x1="44.8056" y1="29.718" x2="44.8056" y2="26.3652" width="0.254" layer="1"/>
-<wire x1="45.1104" y1="30.0228" x2="44.8056" y2="29.718" width="0.254" layer="1"/>
-<wire x1="47.8536" y1="30.0228" x2="45.1104" y2="30.0228" width="0.254" layer="1"/>
-<wire x1="47.8536" y1="31.5468" x2="47.8536" y2="30.0228" width="0.254" layer="1"/>
-<wire x1="51.9684" y1="35.6616" x2="47.8536" y2="31.5468" width="0.254" layer="1"/>
-<wire x1="51.9684" y1="37.0332" x2="51.9684" y2="35.6616" width="0.254" layer="1"/>
-<wire x1="53.34" y1="38.4048" x2="51.9684" y2="37.0332" width="0.254" layer="1"/>
+<wire x1="29.4132" y1="24.0792" x2="25.908" y2="27.5844" width="0.254" layer="1"/>
+<wire x1="36.8808" y1="24.0792" x2="29.4132" y2="24.0792" width="0.254" layer="1"/>
+<wire x1="36.8808" y1="20.7264" x2="36.8808" y2="24.0792" width="0.254" layer="1"/>
+<wire x1="37.1856" y1="20.4216" x2="36.8808" y2="20.7264" width="0.254" layer="1"/>
+<wire x1="51.6636" y1="20.4216" x2="37.1856" y2="20.4216" width="0.254" layer="1"/>
+<wire x1="51.6636" y1="22.86" x2="51.6636" y2="20.4216" width="0.254" layer="1"/>
+<wire x1="54.102" y1="25.2984" x2="51.6636" y2="22.86" width="0.254" layer="1"/>
+<wire x1="54.7116" y1="25.2984" x2="54.102" y2="25.2984" width="0.254" layer="1"/>
+<wire x1="54.7116" y1="37.0332" x2="54.7116" y2="25.2984" width="0.254" layer="1"/>
+<wire x1="53.34" y1="38.4048" x2="54.7116" y2="37.0332" width="0.254" layer="1"/>
 <wire x1="25.908" y1="27.5844" x2="25.844" y2="27.601" width="0.254" layer="1"/>
 <wire x1="53.34" y1="38.4048" x2="53.34" y2="38.425" width="0.254" layer="1"/>
 </signal>
@@ -4098,96 +4069,81 @@ Please make sure your boards conform to 
 </signal>
 <signal name="AUX0">
 <contactref element="IC1" pad="41"/>
-<contactref element="JP1" pad="13"/>
-<wire x1="20.1168" y1="41.6052" x2="20.1168" y2="39.3192" width="0.254" layer="1"/>
-<wire x1="18.542" y1="43.18" x2="20.1168" y2="41.6052" width="0.254" layer="1"/>
+<contactref element="JP1" pad="14"/>
+<wire x1="20.1168" y1="40.386" x2="20.1168" y2="39.3192" width="0.254" layer="1"/>
+<wire x1="18.8976" y1="41.6052" x2="20.1168" y2="40.386" width="0.254" layer="1"/>
+<wire x1="16.764" y1="41.6052" x2="18.8976" y2="41.6052" width="0.254" layer="1"/>
+<wire x1="16.764" y1="42.672" x2="16.764" y2="41.6052" width="0.254" layer="1"/>
+<wire x1="16.51" y1="42.926" x2="16.764" y2="42.672" width="0.254" layer="1"/>
 <wire x1="20.1168" y1="39.3192" x2="20.244" y2="39.201" width="0.254" layer="1"/>
 </signal>
 <signal name="AUX1">
 <contactref element="IC1" pad="40"/>
-<contactref element="JP1" pad="11"/>
-<wire x1="21.1836" y1="40.6908" x2="21.1836" y2="39.3192" width="0.254" layer="1"/>
-<wire x1="23.622" y1="43.1292" x2="21.1836" y2="40.6908" width="0.254" layer="1"/>
-<wire x1="21.1836" y1="39.3192" x2="21.044" y2="39.201" width="0.254" layer="1"/>
-<wire x1="23.622" y1="43.1292" x2="23.622" y2="43.18" width="0.254" layer="1"/>
+<contactref element="JP1" pad="13"/>
+<wire x1="20.8788" y1="39.4716" x2="21.0312" y2="39.3192" width="0.254" layer="1"/>
+<wire x1="20.8788" y1="40.9956" x2="20.8788" y2="39.4716" width="0.254" layer="1"/>
+<wire x1="19.05" y1="42.8244" x2="20.8788" y2="40.9956" width="0.254" layer="1"/>
+<wire x1="21.0312" y1="39.3192" x2="21.044" y2="39.201" width="0.254" layer="1"/>
+<wire x1="19.05" y1="42.8244" x2="19.05" y2="42.926" width="0.254" layer="1"/>
 </signal>
 <signal name="AUX2">
 <contactref element="IC1" pad="39"/>
-<contactref element="JP1" pad="6"/>
-<wire x1="22.098" y1="39.4716" x2="21.9456" y2="39.3192" width="0.254" layer="1"/>
-<wire x1="22.098" y1="40.0812" x2="22.098" y2="39.4716" width="0.254" layer="1"/>
-<wire x1="23.9268" y1="41.91" x2="22.098" y2="40.0812" width="0.254" layer="1"/>
-<wire x1="24.384" y1="41.91" x2="23.9268" y2="41.91" width="0.254" layer="1"/>
-<wire x1="24.384" y1="42.2148" x2="24.384" y2="41.91" width="0.254" layer="1"/>
-<wire x1="24.8412" y1="42.672" x2="24.384" y2="42.2148" width="0.254" layer="1"/>
-<wire x1="24.8412" y1="43.5864" x2="24.8412" y2="42.672" width="0.254" layer="1"/>
-<wire x1="25.7556" y1="44.5008" x2="24.8412" y2="43.5864" width="0.254" layer="1"/>
-<wire x1="36.2712" y1="44.5008" x2="25.7556" y2="44.5008" width="0.254" layer="1"/>
-<wire x1="36.2712" y1="43.2816" x2="36.2712" y2="44.5008" width="0.254" layer="1"/>
-<wire x1="21.9456" y1="39.3192" x2="21.844" y2="39.201" width="0.254" layer="1"/>
-<wire x1="36.2712" y1="43.2816" x2="36.322" y2="43.18" width="0.254" layer="1"/>
+<contactref element="JP1" pad="12"/>
+<wire x1="21.6408" y1="39.4716" x2="21.7932" y2="39.3192" width="0.254" layer="1"/>
+<wire x1="21.6408" y1="42.8244" x2="21.6408" y2="39.4716" width="0.254" layer="1"/>
+<wire x1="21.7932" y1="39.3192" x2="21.844" y2="39.201" width="0.254" layer="1"/>
+<wire x1="21.6408" y1="42.8244" x2="21.59" y2="42.926" width="0.254" layer="1"/>
 </signal>
 <signal name="AUX3">
 <contactref element="IC1" pad="38"/>
-<contactref element="JP1" pad="5"/>
-<wire x1="22.86" y1="39.0144" x2="22.7076" y2="39.1668" width="0.254" layer="1"/>
-<wire x1="22.86" y1="38.2524" x2="22.86" y2="39.0144" width="0.254" layer="1"/>
-<wire x1="23.1648" y1="37.9476" x2="22.86" y2="38.2524" width="0.254" layer="1"/>
-<wire x1="25.2984" y1="37.9476" x2="23.1648" y2="37.9476" width="0.254" layer="1"/>
-<wire x1="26.9748" y1="39.624" x2="25.2984" y2="37.9476" width="0.254" layer="16"/>
-<wire x1="35.6616" y1="39.624" x2="26.9748" y2="39.624" width="0.254" layer="16"/>
-<wire x1="38.862" y1="42.8244" x2="35.6616" y2="39.624" width="0.254" layer="16"/>
-<wire x1="38.862" y1="43.18" x2="38.862" y2="42.8244" width="0.254" layer="16"/>
-<wire x1="22.7076" y1="39.1668" x2="22.644" y2="39.201" width="0.254" layer="1"/>
-<via x="25.2984" y="37.9476" extent="1-16" drill="0.3302"/>
+<contactref element="JP1" pad="11"/>
+<wire x1="22.86" y1="39.4716" x2="22.7076" y2="39.3192" width="0.254" layer="1"/>
+<wire x1="22.86" y1="41.6052" x2="22.86" y2="39.4716" width="0.254" layer="1"/>
+<wire x1="24.0792" y1="42.8244" x2="22.86" y2="41.6052" width="0.254" layer="1"/>
+<wire x1="22.7076" y1="39.3192" x2="22.644" y2="39.201" width="0.254" layer="1"/>
+<wire x1="24.0792" y1="42.8244" x2="24.13" y2="42.926" width="0.254" layer="1"/>
 </signal>
 <signal name="AUX4">
 <contactref element="IC1" pad="37"/>
-<contactref element="JP1" pad="4"/>
+<contactref element="JP1" pad="6"/>
 <wire x1="23.622" y1="39.4716" x2="23.4696" y2="39.3192" width="0.254" layer="1"/>
-<wire x1="23.622" y1="40.2336" x2="23.622" y2="39.4716" width="0.254" layer="1"/>
-<wire x1="24.6888" y1="41.3004" x2="23.622" y2="40.2336" width="0.254" layer="1"/>
-<wire x1="24.6888" y1="42.5196" x2="24.6888" y2="41.3004" width="0.254" layer="16"/>
-<wire x1="24.8412" y1="42.672" x2="24.6888" y2="42.5196" width="0.254" layer="16"/>
-<wire x1="24.8412" y1="44.5008" x2="24.8412" y2="42.672" width="0.254" layer="16"/>
-<wire x1="40.0812" y1="44.5008" x2="24.8412" y2="44.5008" width="0.254" layer="16"/>
-<wire x1="41.402" y1="43.18" x2="40.0812" y2="44.5008" width="0.254" layer="16"/>
+<wire x1="23.622" y1="40.0812" x2="23.622" y2="39.4716" width="0.254" layer="1"/>
+<wire x1="25.146" y1="41.6052" x2="23.622" y2="40.0812" width="0.254" layer="1"/>
+<wire x1="36.7284" y1="41.6052" x2="25.146" y2="41.6052" width="0.254" layer="1"/>
+<wire x1="36.7284" y1="42.8244" x2="36.7284" y2="41.6052" width="0.254" layer="1"/>
 <wire x1="23.4696" y1="39.3192" x2="23.444" y2="39.201" width="0.254" layer="1"/>
-<via x="24.6888" y="41.3004" extent="1-16" drill="0.3302"/>
+<wire x1="36.7284" y1="42.8244" x2="36.83" y2="42.926" width="0.254" layer="1"/>
 </signal>
 <signal name="AUX5">
 <contactref element="IC1" pad="36"/>
-<contactref element="JP1" pad="3"/>
-<wire x1="24.384" y1="40.0812" x2="24.384" y2="39.3192" width="0.254" layer="1"/>
-<wire x1="25.7556" y1="41.4528" x2="24.384" y2="40.0812" width="0.254" layer="1"/>
-<wire x1="37.338" y1="41.4528" x2="25.7556" y2="41.4528" width="0.254" layer="1"/>
-<wire x1="37.7952" y1="41.91" x2="37.338" y2="41.4528" width="0.254" layer="1"/>
-<wire x1="43.8912" y1="41.91" x2="37.7952" y2="41.91" width="0.254" layer="1"/>
-<wire x1="43.8912" y1="43.1292" x2="43.8912" y2="41.91" width="0.254" layer="1"/>
-<wire x1="24.384" y1="39.3192" x2="24.244" y2="39.201" width="0.254" layer="1"/>
-<wire x1="43.8912" y1="43.1292" x2="43.942" y2="43.18" width="0.254" layer="1"/>
+<contactref element="JP1" pad="4"/>
+<wire x1="24.384" y1="37.9476" x2="24.384" y2="39.1668" width="0.254" layer="1"/>
+<wire x1="27.1272" y1="40.6908" x2="24.384" y2="37.9476" width="0.254" layer="16"/>
+<wire x1="40.0812" y1="40.6908" x2="27.1272" y2="40.6908" width="0.254" layer="16"/>
+<wire x1="41.91" y1="42.5196" x2="40.0812" y2="40.6908" width="0.254" layer="16"/>
+<wire x1="41.91" y1="42.926" x2="41.91" y2="42.5196" width="0.254" layer="16"/>
+<wire x1="24.384" y1="39.1668" x2="24.244" y2="39.201" width="0.254" layer="1"/>
+<via x="24.384" y="37.9476" extent="1-16" drill="0.3302"/>
 </signal>
 <signal name="MAX-CS">
 <contactref element="IC1" pad="25"/>
 <contactref element="IC2" pad="6"/>
 <contactref element="R4" pad="1"/>
-<wire x1="38.7096" y1="30.48" x2="38.4048" y2="30.48" width="0.254" layer="1"/>
-<wire x1="39.7764" y1="29.4132" x2="39.3954" y2="29.7942" width="0.254" layer="1"/>
-<wire x1="39.3954" y1="29.7942" x2="38.7096" y2="30.48" width="0.254" layer="1"/>
-<wire x1="40.9956" y1="29.4132" x2="39.7764" y2="29.4132" width="0.254" layer="1"/>
-<wire x1="38.4048" y1="30.48" x2="38.354" y2="30.519" width="0.254" layer="1"/>
-<wire x1="40.9956" y1="29.4132" x2="41.088" y2="29.337" width="0.254" layer="1"/>
-<wire x1="30.0228" y1="30.9372" x2="27.7368" y2="30.9372" width="0.254" layer="1"/>
-<wire x1="30.0228" y1="28.3464" x2="30.0228" y2="30.9372" width="0.254" layer="1"/>
-<wire x1="30.3276" y1="28.0416" x2="30.0228" y2="28.3464" width="0.254" layer="1"/>
-<wire x1="36.7284" y1="28.0416" x2="30.3276" y2="28.0416" width="0.254" layer="1"/>
-<wire x1="36.7284" y1="28.956" x2="36.7284" y2="28.0416" width="0.254" layer="1"/>
-<wire x1="37.4904" y1="29.718" x2="36.7284" y2="28.956" width="0.254" layer="16"/>
-<wire x1="39.3192" y1="29.718" x2="37.4904" y2="29.718" width="0.254" layer="16"/>
-<wire x1="27.7368" y1="30.9372" x2="27.644" y2="31.001" width="0.254" layer="1"/>
-<wire x1="39.3192" y1="29.718" x2="39.3954" y2="29.7942" width="0.254" layer="1"/>
-<via x="36.7284" y="28.956" extent="1-16" drill="0.3302"/>
-<via x="39.3192" y="29.718" extent="1-16" drill="0.3302"/>
+<wire x1="36.1188" y1="32.6136" x2="37.4142" y2="31.3182" width="0.254" layer="1"/>
+<wire x1="37.4142" y1="31.3182" x2="38.1" y2="30.6324" width="0.254" layer="1"/>
+<wire x1="28.8036" y1="32.6136" x2="36.1188" y2="32.6136" width="0.254" layer="1"/>
+<wire x1="28.8036" y1="31.5468" x2="28.8036" y2="32.6136" width="0.254" layer="1"/>
+<wire x1="28.3464" y1="31.0896" x2="28.8036" y2="31.5468" width="0.254" layer="1"/>
+<wire x1="27.7368" y1="31.0896" x2="28.3464" y2="31.0896" width="0.254" layer="1"/>
+<wire x1="38.1" y1="30.6324" x2="38.1" y2="30.519" width="0.254" layer="1"/>
+<wire x1="27.7368" y1="31.0896" x2="27.644" y2="31.001" width="0.254" layer="1"/>
+<wire x1="42.5196" y1="29.2608" x2="41.148" y2="29.2608" width="0.254" layer="1"/>
+<wire x1="42.5196" y1="24.0792" x2="42.5196" y2="29.2608" width="0.254" layer="1"/>
+<wire x1="39.3192" y1="20.8788" x2="42.5196" y2="24.0792" width="0.254" layer="1"/>
+<wire x1="37.338" y1="20.8788" x2="39.3192" y2="20.8788" width="0.254" layer="1"/>
+<wire x1="37.338" y1="31.242" x2="37.338" y2="20.8788" width="0.254" layer="1"/>
+<wire x1="41.148" y1="29.2608" x2="41.088" y2="29.337" width="0.254" layer="1"/>
+<wire x1="37.338" y1="31.242" x2="37.4142" y2="31.3182" width="0.254" layer="1"/>
 </signal>
 <signal name="LED">
 <contactref element="IC1" pad="12"/>
@@ -4199,21 +4155,21 @@ Please make sure your boards conform to 
 <signal name="UCAP">
 <contactref element="C1" pad="1"/>
 <contactref element="IC1" pad="6"/>
-<wire x1="14.9352" y1="31.6992" x2="12.0396" y2="28.8036" width="0.254" layer="1"/>
-<wire x1="14.9352" y1="32.9184" x2="14.9352" y2="31.6992" width="0.254" layer="1"/>
+<wire x1="14.9352" y1="30.1752" x2="12.0396" y2="30.1752" width="0.254" layer="1"/>
+<wire x1="14.9352" y1="32.9184" x2="14.9352" y2="30.1752" width="0.254" layer="1"/>
 <wire x1="15.3924" y1="33.3756" x2="14.9352" y2="32.9184" width="0.254" layer="1"/>
 <wire x1="16.002" y1="33.3756" x2="15.3924" y2="33.3756" width="0.254" layer="1"/>
-<wire x1="12.0396" y1="28.8036" x2="12.026" y2="28.702" width="0.254" layer="1"/>
+<wire x1="12.0396" y1="30.1752" x2="12.026" y2="30.099" width="0.254" layer="1"/>
 <wire x1="16.002" y1="33.3756" x2="16.044" y2="33.401" width="0.254" layer="1"/>
 </signal>
 <signal name="T-">
 <contactref element="TMP" pad="1"/>
 <contactref element="IC2" pad="2"/>
 <contactref element="C9" pad="1"/>
-<wire x1="46.6344" y1="27.8892" x2="48.6156" y2="27.8892" width="0.254" layer="1"/>
-<wire x1="46.3296" y1="28.194" x2="46.6344" y2="27.8892" width="0.254" layer="1"/>
+<wire x1="46.3296" y1="27.8892" x2="48.6156" y2="27.8892" width="0.254" layer="1"/>
+<wire x1="46.3296" y1="28.0416" x2="46.3296" y2="27.8892" width="0.254" layer="1"/>
 <wire x1="48.6156" y1="27.8892" x2="48.641" y2="27.852" width="0.254" layer="1"/>
-<wire x1="46.3296" y1="28.194" x2="46.288" y2="28.067" width="0.254" layer="1"/>
+<wire x1="46.3296" y1="28.0416" x2="46.288" y2="28.067" width="0.254" layer="1"/>
 <wire x1="53.34" y1="27.7368" x2="48.768" y2="27.7368" width="0.254" layer="1"/>
 <wire x1="53.34" y1="26.67" x2="53.34" y2="27.7368" width="0.254" layer="1"/>
 <wire x1="48.768" y1="27.7368" x2="48.641" y2="27.852" width="0.254" layer="1"/>
@@ -4230,52 +4186,32 @@ Please make sure your boards conform to 
 <signal name="AUX9">
 <contactref element="IC1" pad="32"/>
 <contactref element="Q1" pad="1"/>
-<wire x1="39.0144" y1="34.1376" x2="39.3192" y2="33.8328" width="0.254" layer="1"/>
-<wire x1="39.0144" y1="35.6616" x2="39.0144" y2="34.1376" width="0.254" layer="1"/>
-<wire x1="38.862" y1="35.814" x2="39.0144" y2="35.6616" width="0.254" layer="16"/>
-<wire x1="37.4904" y1="35.814" x2="38.862" y2="35.814" width="0.254" layer="16"/>
-<wire x1="33.6804" y1="35.814" x2="37.4904" y2="35.814" width="0.254" layer="1"/>
-<wire x1="33.6804" y1="36.7284" x2="33.6804" y2="35.814" width="0.254" layer="1"/>
-<wire x1="32.9184" y1="37.4904" x2="33.6804" y2="36.7284" width="0.254" layer="1"/>
-<wire x1="28.8036" y1="37.4904" x2="32.9184" y2="37.4904" width="0.254" layer="1"/>
-<wire x1="28.8036" y1="37.0332" x2="28.8036" y2="37.4904" width="0.254" layer="1"/>
-<wire x1="28.4988" y1="36.7284" x2="28.8036" y2="37.0332" width="0.254" layer="1"/>
-<wire x1="27.7368" y1="36.7284" x2="28.4988" y2="36.7284" width="0.254" layer="1"/>
-<wire x1="39.3192" y1="33.8328" x2="39.436" y2="33.798" width="0.254" layer="1"/>
+<wire x1="29.8704" y1="36.7284" x2="32.9184" y2="39.7764" width="0.254" layer="1"/>
+<wire x1="27.7368" y1="36.7284" x2="29.8704" y2="36.7284" width="0.254" layer="1"/>
+<wire x1="32.9184" y1="39.7764" x2="33.036" y2="39.812" width="0.254" layer="1"/>
 <wire x1="27.7368" y1="36.7284" x2="27.644" y2="36.601" width="0.254" layer="1"/>
-<via x="39.0144" y="35.6616" extent="1-16" drill="0.3302"/>
-<via x="37.4904" y="35.814" extent="1-16" drill="0.3302"/>
 </signal>
 <signal name="PUX6">
 <contactref element="Q1" pad="3"/>
-<contactref element="JP1" pad="1"/>
-<wire x1="43.434" y1="39.0144" x2="40.386" y2="35.9664" width="0.254" layer="1"/>
-<wire x1="43.434" y1="40.8432" x2="43.434" y2="39.0144" width="0.254" layer="1"/>
-<wire x1="45.2628" y1="42.672" x2="43.434" y2="40.8432" width="0.254" layer="1"/>
-<wire x1="45.2628" y1="43.7388" x2="45.2628" y2="42.672" width="0.254" layer="1"/>
-<wire x1="46.0248" y1="44.5008" x2="45.2628" y2="43.7388" width="0.254" layer="1"/>
-<wire x1="48.9204" y1="44.5008" x2="46.0248" y2="44.5008" width="0.254" layer="1"/>
-<wire x1="48.9204" y1="43.2816" x2="48.9204" y2="44.5008" width="0.254" layer="1"/>
-<wire x1="40.386" y1="35.9664" x2="40.386" y2="35.898" width="0.254" layer="1"/>
-<wire x1="48.9204" y1="43.2816" x2="49.022" y2="43.18" width="0.254" layer="1"/>
+<contactref element="JP1" pad="16"/>
+<wire x1="35.9664" y1="38.1" x2="35.2044" y2="38.862" width="0.254" layer="1"/>
+<wire x1="37.338" y1="39.4716" x2="35.9664" y2="38.1" width="0.254" layer="16"/>
+<wire x1="38.1" y1="40.2336" x2="37.338" y2="39.4716" width="0.254" layer="1"/>
+<wire x1="38.1" y1="43.434" x2="38.1" y2="40.2336" width="0.254" layer="1"/>
+<wire x1="37.338" y1="44.196" x2="38.1" y2="43.434" width="0.254" layer="1"/>
+<wire x1="11.43" y1="44.196" x2="37.338" y2="44.196" width="0.254" layer="1"/>
+<wire x1="11.43" y1="42.926" x2="11.43" y2="44.196" width="0.254" layer="1"/>
+<wire x1="35.2044" y1="38.862" x2="35.136" y2="38.862" width="0.254" layer="1"/>
+<via x="35.9664" y="38.1" extent="1-16" drill="0.3302"/>
+<via x="37.338" y="39.4716" extent="1-16" drill="0.3302"/>
 </signal>
 <signal name="CST">
 <contactref element="R3" pad="2"/>
-<contactref element="JP1" pad="14"/>
-<wire x1="40.386" y1="40.8432" x2="40.386" y2="37.689" width="0.254" layer="1"/>
-<wire x1="40.0812" y1="41.148" x2="40.386" y2="40.8432" width="0.254" layer="1"/>
-<wire x1="37.6428" y1="41.148" x2="40.0812" y2="41.148" width="0.254" layer="1"/>
-<wire x1="37.6428" y1="40.9956" x2="37.6428" y2="41.148" width="0.254" layer="1"/>
-<wire x1="37.0332" y1="40.386" x2="37.6428" y2="40.9956" width="0.254" layer="1"/>
-<wire x1="28.8036" y1="40.386" x2="37.0332" y2="40.386" width="0.254" layer="1"/>
-<wire x1="28.6512" y1="40.5384" x2="28.8036" y2="40.386" width="0.254" layer="16"/>
-<wire x1="24.5364" y1="40.5384" x2="28.6512" y2="40.5384" width="0.254" layer="16"/>
-<wire x1="22.4028" y1="42.672" x2="24.5364" y2="40.5384" width="0.254" layer="16"/>
-<wire x1="22.4028" y1="44.5008" x2="22.4028" y2="42.672" width="0.254" layer="16"/>
-<wire x1="17.2212" y1="44.5008" x2="22.4028" y2="44.5008" width="0.254" layer="16"/>
-<wire x1="16.002" y1="43.2816" x2="17.2212" y2="44.5008" width="0.254" layer="16"/>
-<wire x1="16.002" y1="43.2816" x2="16.002" y2="43.18" width="0.254" layer="16"/>
-<via x="28.8036" y="40.386" extent="1-16" drill="0.3302"/>
+<contactref element="JP1" pad="3"/>
+<wire x1="44.3484" y1="41.6052" x2="41.6052" y2="38.862" width="0.254" layer="1"/>
+<wire x1="44.3484" y1="42.8244" x2="44.3484" y2="41.6052" width="0.254" layer="1"/>
+<wire x1="41.6052" y1="38.862" x2="41.559" y2="38.862" width="0.254" layer="1"/>
+<wire x1="44.3484" y1="42.8244" x2="44.45" y2="42.926" width="0.254" layer="1"/>
 </signal>
 </signals>
 </board>
diff --git a/ZonCoffeeTiny.sch b/ZonCoffeeTiny.sch
--- a/ZonCoffeeTiny.sch
+++ b/ZonCoffeeTiny.sch
@@ -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="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="14" 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="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="14" 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="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="yes" active="no"/>
-<layer number="38" name="bTest" color="7" fill="1" visible="yes" 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="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,16 +53,16 @@
 <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="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="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="91" name="Nets" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="92" name="Busses" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="93" name="Pins" color="2" fill="1" visible="no" active="yes"/>
@@ -3710,52 +3710,6 @@ 4Ucon #18732</description>
 <rectangle x1="-0.9" y1="-0.3" x2="0.9" y2="0.3" layer="21"/>
 <rectangle x1="-0.6" y1="-0.3" x2="0.5" y2="0.3" layer="21"/>
 </package>
-<package name="LCD1602">
-<wire x1="0" y1="0" x2="80" y2="0" width="0.127" layer="21"/>
-<wire x1="80" y1="0" x2="80" y2="36" width="0.127" layer="21"/>
-<wire x1="80" y1="36" x2="0" y2="36" width="0.127" layer="21"/>
-<wire x1="0" y1="36" x2="0" y2="0" width="0.127" layer="21"/>
-<wire x1="4" y1="30" x2="76" y2="30" width="0.127" layer="21"/>
-<wire x1="76" y1="30" x2="76" y2="6" width="0.127" layer="21"/>
-<wire x1="76" y1="6" x2="4" y2="6" width="0.127" layer="21"/>
-<wire x1="4" y1="6" x2="4" y2="30" width="0.127" layer="21"/>
-<wire x1="6" y1="28" x2="74" y2="28" width="0.127" layer="21"/>
-<wire x1="74" y1="28" x2="74" y2="27" width="0.127" layer="21"/>
-<wire x1="74" y1="27" x2="6" y2="27" width="0.127" layer="21"/>
-<wire x1="6" y1="27" x2="6" y2="28" width="0.127" layer="21"/>
-<wire x1="6" y1="8" x2="74" y2="8" width="0.127" layer="21"/>
-<wire x1="74" y1="8" x2="74" y2="9" width="0.127" layer="21"/>
-<wire x1="74" y1="9" x2="6" y2="9" width="0.127" layer="21"/>
-<wire x1="6" y1="9" x2="6" y2="8" width="0.127" layer="21"/>
-<wire x1="11" y1="25" x2="8" y2="22" width="0.127" layer="21" curve="90"/>
-<wire x1="8" y1="22" x2="8" y2="14" width="0.127" layer="21"/>
-<wire x1="8" y1="14" x2="11" y2="11" width="0.127" layer="21" curve="90"/>
-<wire x1="11" y1="11" x2="69" y2="11" width="0.127" layer="21"/>
-<wire x1="69" y1="11" x2="72" y2="14" width="0.127" layer="21" curve="90"/>
-<wire x1="72" y1="14" x2="72" y2="22" width="0.127" layer="21"/>
-<wire x1="72" y1="22" x2="69" y2="25" width="0.127" layer="21" curve="90"/>
-<wire x1="69" y1="25" x2="11" y2="25" width="0.127" layer="21"/>
-<pad name="1" x="8" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="2" x="10.54" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="3" x="13.08" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="4" x="15.62" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="5" x="18.16" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="6" x="20.7" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="7" x="23.24" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="8" x="25.78" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="9" x="28.32" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="10" x="30.86" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="11" x="33.4" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="12" x="35.94" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="13" x="38.48" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="14" x="41.02" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="15" x="43.56" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<pad name="16" x="46.1" y="33.46" drill="0.8" shape="long" rot="R90"/>
-<hole x="2.54" y="2.54" drill="2.8"/>
-<hole x="2.54" y="33.46" drill="2.8"/>
-<hole x="77.46" y="33.46" drill="2.8"/>
-<hole x="77.46" y="2.54" drill="2.8"/>
-</package>
 </packages>
 <symbols>
 <symbol name="C-US">
@@ -3826,40 +3780,6 @@ 4Ucon #18732</description>
 <pin name="1" x="-5.08" y="2.54" visible="off" length="short" direction="pas" swaplevel="1"/>
 <pin name="2" x="5.08" y="2.54" visible="off" length="short" direction="pas" swaplevel="1" rot="R180"/>
 </symbol>
-<symbol name="CLCD">
-<wire x1="25.4" y1="12.7" x2="-25.4" y2="12.7" width="0.254" layer="94"/>
-<wire x1="-25.4" y1="12.7" x2="-25.4" y2="-10.16" width="0.254" layer="94"/>
-<wire x1="-25.4" y1="-10.16" x2="25.4" y2="-10.16" width="0.254" layer="94"/>
-<wire x1="25.4" y1="-10.16" x2="25.4" y2="12.7" width="0.254" layer="94"/>
-<wire x1="-20.32" y1="-0.46" x2="-17.32" y2="2.54" width="0.254" layer="94" curve="-90"/>
-<wire x1="-17.32" y1="2.54" x2="17.32" y2="2.54" width="0.254" layer="94"/>
-<wire x1="17.32" y1="2.54" x2="20.32" y2="-0.46" width="0.254" layer="94" curve="-90"/>
-<wire x1="20.32" y1="-0.46" x2="20.32" y2="-4.62" width="0.254" layer="94"/>
-<wire x1="20.32" y1="-4.62" x2="17.32" y2="-7.62" width="0.254" layer="94" curve="-90"/>
-<wire x1="17.32" y1="-7.62" x2="-17.32" y2="-7.62" width="0.254" layer="94"/>
-<wire x1="-17.32" y1="-7.62" x2="-20.32" y2="-4.62" width="0.254" layer="94" curve="-90"/>
-<wire x1="-20.32" y1="-4.62" x2="-20.32" y2="-0.46" width="0.254" layer="94"/>
-<text x="-17.78" y="-2.54" size="2.1844" layer="94" font="vector" ratio="24">HELLO WORLD!</text>
-<text x="-17.78" y="-5.08" size="2.1844" layer="94" font="vector" ratio="24">HD44780 LCD </text>
-<text x="-25.4" y="-12.7" size="2.1844" layer="95" font="vector">&gt;NAME</text>
-<text x="-10.16" y="-12.7" size="2.1844" layer="96" font="vector">&gt;VALUE</text>
-<pin name="K" x="15.24" y="17.78" length="middle" direction="in" rot="R270"/>
-<pin name="A" x="12.7" y="17.78" length="middle" direction="in" rot="R270"/>
-<pin name="DB7" x="10.16" y="17.78" length="middle" rot="R270"/>
-<pin name="DB6" x="7.62" y="17.78" length="middle" rot="R270"/>
-<pin name="DB5" x="5.08" y="17.78" length="middle" rot="R270"/>
-<pin name="DB4" x="2.54" y="17.78" length="middle" rot="R270"/>
-<pin name="DB3" x="0" y="17.78" length="middle" rot="R270"/>
-<pin name="DB2" x="-2.54" y="17.78" length="middle" rot="R270"/>
-<pin name="DB1" x="-5.08" y="17.78" length="middle" rot="R270"/>
-<pin name="DB0" x="-7.62" y="17.78" length="middle" rot="R270"/>
-<pin name="E" x="-10.16" y="17.78" length="middle" direction="in" rot="R270"/>
-<pin name="RW" x="-12.7" y="17.78" length="middle" direction="in" rot="R270"/>
-<pin name="RS" x="-15.24" y="17.78" length="middle" direction="in" rot="R270"/>
-<pin name="VO" x="-17.78" y="17.78" length="middle" direction="in" rot="R270"/>
-<pin name="VDD" x="-20.32" y="17.78" length="middle" direction="sup" rot="R270"/>
-<pin name="VSS" x="-22.86" y="17.78" length="middle" direction="sup" rot="R270"/>
-</symbol>
 </symbols>
 <devicesets>
 <deviceset name="C-US" prefix="C" uservalue="yes">
@@ -5248,39 +5168,6 @@ Thru-hole RA Female Mini-B USB Connector
 </device>
 </devices>
 </deviceset>
-<deviceset name="HD44780LCD" prefix="X">
-<description>&lt;b&gt;HD44780 LCD&lt;/b&gt;
-&lt;p&gt;
-Standard character type LCDs, available in sizes from 8x1 to 40x4!</description>
-<gates>
-<gate name="G$1" symbol="CLCD" x="2.54" y="2.54"/>
-</gates>
-<devices>
-<device name="-1602" package="LCD1602">
-<connects>
-<connect gate="G$1" pin="A" pad="15"/>
-<connect gate="G$1" pin="DB0" pad="7"/>
-<connect gate="G$1" pin="DB1" pad="8"/>
-<connect gate="G$1" pin="DB2" pad="9"/>
-<connect gate="G$1" pin="DB3" pad="10"/>
-<connect gate="G$1" pin="DB4" pad="11"/>
-<connect gate="G$1" pin="DB5" pad="12"/>
-<connect gate="G$1" pin="DB6" pad="13"/>
-<connect gate="G$1" pin="DB7" pad="14"/>
-<connect gate="G$1" pin="E" pad="6"/>
-<connect gate="G$1" pin="K" pad="16"/>
-<connect gate="G$1" pin="RS" pad="4"/>
-<connect gate="G$1" pin="RW" pad="5"/>
-<connect gate="G$1" pin="VDD" pad="2"/>
-<connect gate="G$1" pin="VO" pad="3"/>
-<connect gate="G$1" pin="VSS" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
 </devicesets>
 </library>
 <library name="jumper">
@@ -10810,16 +10697,14 @@ Cermet, abgedichtet nach IP67</descripti
 <part name="P+6" library="supply1" deviceset="VCC" device=""/>
 <part name="GND10" library="supply1" deviceset="GND" device=""/>
 <part name="IC2" library="AlexW-Eagle-Libraries" deviceset="MAX31855" device=""/>
-<part name="C11" library="SparkFun" deviceset="CAP" device="0603-CAP" value=".1uF"/>
 <part name="SUPPLY1" library="supply2" deviceset="GND" device=""/>
 <part name="P+7" library="supply1" deviceset="VCC" device=""/>
 <part name="R4" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="10k"/>
 <part name="P+3" library="supply1" deviceset="VCC" device=""/>
-<part name="X1" library="adafruit" deviceset="HD44780LCD" device="-1602"/>
 <part name="C9" library="SparkFun" deviceset="CAP" device="0603-CAP" value="NOPOP"/>
 <part name="R3" library="resistor" deviceset="R-TRIMM" device="3103"/>
+<part name="C5" library="adafruit" deviceset="C-US" device="C0805" value="10uF"/>
 <part name="JP1" library="SparkFun" deviceset="M16" device="PTH"/>
-<part name="C5" library="adafruit" deviceset="C-US" device="C0805" value="10uF"/>
 </parts>
 <sheets>
 <sheet>
@@ -10895,16 +10780,14 @@ Cermet, abgedichtet nach IP67</descripti
 <instance part="P+6" gate="VCC" x="411.48" y="129.54"/>
 <instance part="GND10" gate="1" x="411.48" y="109.22" rot="MR0"/>
 <instance part="IC2" gate="G$1" x="264.16" y="43.18"/>
-<instance part="C11" gate="G$1" x="233.68" y="48.26"/>
 <instance part="SUPPLY1" gate="GND" x="233.68" y="40.64"/>
 <instance part="P+7" gate="VCC" x="233.68" y="60.96"/>
 <instance part="R4" gate="G$1" x="292.1" y="50.8" rot="R90"/>
 <instance part="P+3" gate="VCC" x="292.1" y="60.96"/>
-<instance part="X1" gate="G$1" x="358.14" y="175.26" rot="R180"/>
 <instance part="C9" gate="G$1" x="256.54" y="22.86" rot="R270"/>
 <instance part="R3" gate="G$1" x="411.48" y="119.38"/>
-<instance part="JP1" gate="G$1" x="363.22" y="154.94" rot="R270"/>
 <instance part="C5" gate="G$1" x="431.8" y="101.6"/>
+<instance part="JP1" gate="G$1" x="312.42" y="116.84" rot="MR270"/>
 </instances>
 <busses>
 </busses>
@@ -11026,21 +10909,18 @@ Cermet, abgedichtet nach IP67</descripti
 </segment>
 <segment>
 <pinref part="SUPPLY1" gate="GND" pin="GND"/>
-<pinref part="C11" gate="G$1" pin="2"/>
-<wire x1="233.68" y1="43.18" x2="233.68" y2="45.72" width="0.1524" layer="91"/>
 <pinref part="IC2" gate="G$1" pin="GND"/>
 <wire x1="251.46" y1="43.18" x2="233.68" y2="43.18" width="0.1524" layer="91"/>
-<junction x="233.68" y="43.18"/>
-</segment>
-<segment>
-<pinref part="JP1" gate="G$1" pin="16"/>
-<wire x1="381" y1="144.78" x2="381" y2="137.16" width="0.1524" layer="91"/>
-<label x="381" y="137.16" size="1.778" layer="95" rot="R90"/>
-</segment>
-<segment>
-<pinref part="JP1" gate="G$1" pin="12"/>
-<wire x1="370.84" y1="144.78" x2="370.84" y2="137.16" width="0.1524" layer="91"/>
-<label x="370.84" y="137.16" size="1.778" layer="95" rot="R90"/>
+</segment>
+<segment>
+<wire x1="332.74" y1="106.68" x2="332.74" y2="99.06" width="0.1524" layer="91"/>
+<label x="332.74" y="99.06" size="1.778" layer="95" rot="R90"/>
+<pinref part="JP1" gate="G$1" pin="1"/>
+</segment>
+<segment>
+<wire x1="322.58" y1="106.68" x2="322.58" y2="99.06" width="0.1524" layer="91"/>
+<label x="322.58" y="99.06" size="1.778" layer="95" rot="R90"/>
+<pinref part="JP1" gate="G$1" pin="5"/>
 </segment>
 <segment>
 <wire x1="452.12" y1="-2.54" x2="459.74" y2="-2.54" width="0.1524" layer="91"/>
@@ -11221,10 +11101,8 @@ Cermet, abgedichtet nach IP67</descripti
 <pinref part="R3" gate="G$1" pin="A"/>
 </segment>
 <segment>
-<pinref part="C11" gate="G$1" pin="1"/>
 <pinref part="IC2" gate="G$1" pin="VCC"/>
 <wire x1="233.68" y1="53.34" x2="251.46" y2="53.34" width="0.1524" layer="91"/>
-<junction x="233.68" y="53.34"/>
 <pinref part="P+7" gate="VCC" pin="VCC"/>
 <wire x1="233.68" y1="53.34" x2="233.68" y2="58.42" width="0.1524" layer="91"/>
 </segment>
@@ -11234,14 +11112,14 @@ Cermet, abgedichtet nach IP67</descripti
 <pinref part="P+3" gate="VCC" pin="VCC"/>
 </segment>
 <segment>
+<wire x1="330.2" y1="106.68" x2="330.2" y2="99.06" width="0.1524" layer="91"/>
+<label x="330.2" y="99.06" size="1.778" layer="95" rot="R90"/>
+<pinref part="JP1" gate="G$1" pin="2"/>
+</segment>
+<segment>
+<wire x1="297.18" y1="106.68" x2="297.18" y2="99.06" width="0.1524" layer="91"/>
+<label x="297.18" y="99.06" size="1.778" layer="95" rot="R90"/>
 <pinref part="JP1" gate="G$1" pin="15"/>
-<wire x1="378.46" y1="144.78" x2="378.46" y2="137.16" width="0.1524" layer="91"/>
-<label x="378.46" y="137.16" size="1.778" layer="95" rot="R90"/>
-</segment>
-<segment>
-<pinref part="JP1" gate="G$1" pin="2"/>
-<wire x1="345.44" y1="144.78" x2="345.44" y2="137.16" width="0.1524" layer="91"/>
-<label x="345.44" y="137.16" size="1.778" layer="95" rot="R90"/>
 </segment>
 <segment>
 <wire x1="459.74" y1="0" x2="452.12" y2="0" width="0.1524" layer="91"/>
@@ -11372,9 +11250,9 @@ Cermet, abgedichtet nach IP67</descripti
 <pinref part="IC1" gate="G$1" pin="PF0(ADC0)"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="13"/>
-<wire x1="373.38" y1="144.78" x2="373.38" y2="137.16" width="0.1524" layer="91"/>
-<label x="373.38" y="137.16" size="1.778" layer="95" rot="R90"/>
+<wire x1="299.72" y1="106.68" x2="299.72" y2="99.06" width="0.1524" layer="91"/>
+<label x="299.72" y="99.06" size="1.778" layer="95" rot="R90"/>
+<pinref part="JP1" gate="G$1" pin="14"/>
 </segment>
 </net>
 <net name="AUX1" class="0">
@@ -11384,9 +11262,9 @@ Cermet, abgedichtet nach IP67</descripti
 <pinref part="IC1" gate="G$1" pin="PF1(ADC1)"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="11"/>
-<wire x1="368.3" y1="144.78" x2="368.3" y2="137.16" width="0.1524" layer="91"/>
-<label x="368.3" y="137.16" size="1.778" layer="95" rot="R90"/>
+<wire x1="302.26" y1="106.68" x2="302.26" y2="99.06" width="0.1524" layer="91"/>
+<label x="302.26" y="99.06" size="1.778" layer="95" rot="R90"/>
+<pinref part="JP1" gate="G$1" pin="13"/>
 </segment>
 </net>
 <net name="AUX2" class="0">
@@ -11397,9 +11275,9 @@ Cermet, abgedichtet nach IP67</descripti
 <pinref part="IC1" gate="G$1" pin="PF4(ADC4/TCK)"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="6"/>
-<wire x1="355.6" y1="144.78" x2="355.6" y2="137.16" width="0.1524" layer="91"/>
-<label x="355.6" y="137.16" size="1.778" layer="95" rot="R90"/>
+<wire x1="304.8" y1="106.68" x2="304.8" y2="99.06" width="0.1524" layer="91"/>
+<label x="304.8" y="99.06" size="1.778" layer="95" rot="R90"/>
+<pinref part="JP1" gate="G$1" pin="12"/>
 </segment>
 </net>
 <net name="AUX3" class="0">
@@ -11409,9 +11287,9 @@ Cermet, abgedichtet nach IP67</descripti
 <pinref part="IC1" gate="G$1" pin="PF5(ADC5/TMS)"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="5"/>
-<wire x1="353.06" y1="144.78" x2="353.06" y2="137.16" width="0.1524" layer="91"/>
-<label x="353.06" y="137.16" size="1.778" layer="95" rot="R90"/>
+<wire x1="307.34" y1="106.68" x2="307.34" y2="99.06" width="0.1524" layer="91"/>
+<label x="307.34" y="99.06" size="1.778" layer="95" rot="R90"/>
+<pinref part="JP1" gate="G$1" pin="11"/>
 </segment>
 </net>
 <net name="AUX4" class="0">
@@ -11421,9 +11299,9 @@ Cermet, abgedichtet nach IP67</descripti
 <pinref part="IC1" gate="G$1" pin="PF6(ADC6/TDO)"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="4"/>
-<wire x1="350.52" y1="144.78" x2="350.52" y2="137.16" width="0.1524" layer="91"/>
-<label x="350.52" y="137.16" size="1.778" layer="95" rot="R90"/>
+<wire x1="320.04" y1="106.68" x2="320.04" y2="99.06" width="0.1524" layer="91"/>
+<label x="320.04" y="99.06" size="1.778" layer="95" rot="R90"/>
+<pinref part="JP1" gate="G$1" pin="6"/>
 </segment>
 </net>
 <net name="AUX5" class="0">
@@ -11433,9 +11311,9 @@ Cermet, abgedichtet nach IP67</descripti
 <pinref part="IC1" gate="G$1" pin="PF7(ADC7(TDI)"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="3"/>
-<wire x1="347.98" y1="144.78" x2="347.98" y2="137.16" width="0.1524" layer="91"/>
-<label x="347.98" y="137.16" size="1.778" layer="95" rot="R90"/>
+<wire x1="325.12" y1="106.68" x2="325.12" y2="99.06" width="0.1524" layer="91"/>
+<label x="325.12" y="99.06" size="1.778" layer="95" rot="R90"/>
+<pinref part="JP1" gate="G$1" pin="4"/>
 </segment>
 </net>
 <net name="MAX-CS" class="0">
@@ -11531,9 +11409,9 @@ Cermet, abgedichtet nach IP67</descripti
 <label x="347.98" y="10.16" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="1"/>
-<wire x1="342.9" y1="144.78" x2="342.9" y2="137.16" width="0.1524" layer="91"/>
-<label x="342.9" y="137.16" size="1.778" layer="95" rot="R90"/>
+<wire x1="294.64" y1="106.68" x2="294.64" y2="99.06" width="0.1524" layer="91"/>
+<label x="294.64" y="99.06" size="1.778" layer="95" rot="R90"/>
+<pinref part="JP1" gate="G$1" pin="16"/>
 </segment>
 </net>
 <net name="CST" class="0">
@@ -11543,9 +11421,9 @@ Cermet, abgedichtet nach IP67</descripti
 <pinref part="R3" gate="G$1" pin="S"/>
 </segment>
 <segment>
-<pinref part="JP1" gate="G$1" pin="14"/>
-<wire x1="375.92" y1="144.78" x2="375.92" y2="137.16" width="0.1524" layer="91"/>
-<label x="375.92" y="137.16" size="1.778" layer="95" rot="R90"/>
+<wire x1="327.66" y1="106.68" x2="327.66" y2="99.06" width="0.1524" layer="91"/>
+<label x="327.66" y="99.06" size="1.778" layer="95" rot="R90"/>
+<pinref part="JP1" gate="G$1" pin="3"/>
 </segment>
 </net>
 </nets>