diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="6.5.0">
+<eagle version="7.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
@@ -29,15 +29,15 @@
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
-<layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
+<layer number="30" name="bStop" color="7" fill="6" visible="yes" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
 <layer number="32" name="bCream" color="7" fill="5" visible="no" active="yes"/>
 <layer number="33" name="tFinish" color="6" fill="3" visible="no" active="yes"/>
@@ -64,6 +64,8 @@
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
 <layer number="57" name="tCAD" color="7" fill="1" visible="no" active="no"/>
+<layer number="60" name="bCarbon" color="7" fill="1" visible="no" active="no"/>
+<layer number="90" name="Modules" color="7" fill="1" visible="no" active="no"/>
 <layer number="91" name="Nets" color="2" fill="1" visible="no" active="no"/>
 <layer number="92" name="Busses" color="1" fill="1" visible="no" active="no"/>
 <layer number="93" name="Pins" color="2" fill="1" visible="no" active="no"/>
@@ -201,7 +203,7 @@
 <dimension x1="0" y1="19.685" x2="45.085" y2="19.685" x3="22.5425" y3="-5.08" textsize="1.27" layer="209" dtype="horizontal" unit="inch"/>
 <text x="16.66875" y="9.2075" size="0.8128" layer="22" ratio="16" rot="MR180">rx</text>
 <text x="14.366875" y="9.2075" size="0.8128" layer="22" ratio="16" rot="MR180">tx</text>
-<text x="16.589375" y="4.1275" size="0.8128" layer="21" ratio="16" rot="R90">uart</text>
+<text x="24.209375" y="0.3175" size="0.8128" layer="21" ratio="16" rot="R90">uart</text>
 <text x="0.396875" y="6.270625" size="0.8128" layer="22" ratio="16" rot="SMR90">Zonca 2014</text>
 <circle x="29.36875" y="11.90625" radius="0.127" width="0.2032" layer="21"/>
 <circle x="31.75" y="14.605" radius="0.127" width="0.2032" layer="21"/>
@@ -244,6 +246,7 @@
 <hole x="0.3175" y="15.24" drill="0.381"/>
 <hole x="2.2225" y="15.24" drill="0.381"/>
 <circle x="14.12875" y="14.44625" radius="0.127" width="0.2032" layer="21"/>
+<text x="20.32" y="-3.175" size="1.778" layer="1">progconn orientation?</text>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -257,10 +260,10 @@
 <wire x1="-5.516" y1="-2.109" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
 <wire x1="-5.516" y1="3.475" x2="-5.516" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
 <wire x1="-27.9" y1="3.475" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="51"/>
-<wire x1="0" y1="5.575" x2="0" y2="-5.75" width="0.2032" layer="51"/>
-<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="51"/>
-<wire x1="-30" y1="5.575" x2="-30" y2="-5.75" width="0.2032" layer="51"/>
+<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="21"/>
+<wire x1="0" y1="5.575" x2="0" y2="-5.75" width="0.2032" layer="21"/>
+<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
+<wire x1="-30" y1="5.575" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
 <smd name="15" x="-7.7" y="4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="14" x="-7.7" y="3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="13" x="-7.7" y="3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
@@ -276,8 +279,25 @@
 <smd name="3" x="-7.7" y="-3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="2" x="-7.7" y="-3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="1" x="-7.7" y="-4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<text x="-23" y="1" size="1.016" layer="51">Active Area 0.91"</text>
+<text x="-22" y="-1" size="1.016" layer="51">128x32 Pixels</text>
 <text x="-30" y="6.5" size="0.8128" layer="25" ratio="18">&gt;NAME</text>
 <text x="-30" y="-7.5" size="0.4064" layer="27" ratio="10">&gt;VALUE</text>
+<rectangle x1="-8.2" y1="4.375" x2="-6.4" y2="4.725" layer="51"/>
+<rectangle x1="-8.2" y1="3.725" x2="-6.4" y2="4.075" layer="51"/>
+<rectangle x1="-8.2" y1="3.075" x2="-6.4" y2="3.425" layer="51"/>
+<rectangle x1="-8.2" y1="2.425" x2="-6.4" y2="2.775" layer="51"/>
+<rectangle x1="-8.2" y1="1.775" x2="-6.4" y2="2.125" layer="51"/>
+<rectangle x1="-8.2" y1="1.125" x2="-6.4" y2="1.475" layer="51"/>
+<rectangle x1="-8.2" y1="0.475" x2="-6.4" y2="0.825" layer="51"/>
+<rectangle x1="-8.2" y1="-0.175" x2="-6.4" y2="0.175" layer="51"/>
+<rectangle x1="-8.2" y1="-0.825" x2="-6.4" y2="-0.475" layer="51"/>
+<rectangle x1="-8.2" y1="-1.475" x2="-6.4" y2="-1.125" layer="51"/>
+<rectangle x1="-8.2" y1="-2.125" x2="-6.4" y2="-1.775" layer="51"/>
+<rectangle x1="-8.2" y1="-2.775" x2="-6.4" y2="-2.425" layer="51"/>
+<rectangle x1="-8.2" y1="-3.425" x2="-6.4" y2="-3.075" layer="51"/>
+<rectangle x1="-8.2" y1="-4.075" x2="-6.4" y2="-3.725" layer="51"/>
+<rectangle x1="-8.2" y1="-4.725" x2="-6.4" y2="-4.375" layer="51"/>
 </package>
 </packages>
 </library>
@@ -1943,29 +1963,6 @@ You are welcome to use this library for 
 <text x="-1.5875" y="1.27" size="1.27" layer="25">&gt;NAME</text>
 <text x="-1.5875" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
 </package>
-<package name="POGOPROG-CONN-ALLSMT">
-<smd name="3" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="1" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="5" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
-<wire x1="-0.635" y1="3.175" x2="0.635" y2="3.175" width="0.127" layer="21"/>
-<wire x1="0.635" y1="3.175" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="3.175" width="0.127" layer="21"/>
-<smd name="6" x="0" y="-3.81" dx="0.889" dy="0.8128" layer="1"/>
-<polygon width="0.127" layer="21">
-<vertex x="-0.635" y="1.905"/>
-<vertex x="0.635" y="1.905"/>
-<vertex x="0.635" y="3.175"/>
-<vertex x="-0.635" y="3.175"/>
-</polygon>
-<text x="-1.27" y="6.35" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
-<wire x1="0" y1="5.08" x2="0" y2="3.81" width="0.127" layer="21"/>
-<wire x1="0.3175" y1="4.1275" x2="0" y2="3.81" width="0.127" layer="21"/>
-<wire x1="0" y1="3.81" x2="-0.3175" y2="4.1275" width="0.127" layer="21"/>
-</package>
 <package name="THERM_LOGO_SMALL_0.2">
 <rectangle x1="0.0762" y1="0.0254" x2="0.3302" y2="0.0762" layer="21"/>
 <rectangle x1="1.651" y1="0.0254" x2="1.905" y2="0.0762" layer="21"/>
@@ -2229,6 +2226,27 @@ You are welcome to use this library for 
 <rectangle x1="0.215" y1="3.5" x2="0.585" y2="4.5" layer="51" rot="R180"/>
 <rectangle x1="1.015" y1="3.5" x2="1.385" y2="4.5" layer="51" rot="R180"/>
 </package>
+<package name="POGOPROG-CONN-4-ALLSMT">
+<smd name="3" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="1" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<wire x1="-0.635" y1="1.905" x2="0.635" y2="1.905" width="0.127" layer="21"/>
+<wire x1="0.635" y1="1.905" x2="0.635" y2="-3.175" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-3.175" x2="-0.635" y2="-3.175" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-3.175" x2="-0.635" y2="1.905" width="0.127" layer="21"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="0.635"/>
+<vertex x="0.635" y="0.635"/>
+<vertex x="0.635" y="1.905"/>
+<vertex x="-0.635" y="1.905"/>
+</polygon>
+<text x="-2.54" y="3.81" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-5.08" size="1.27" layer="27">&gt;VALUE</text>
+<wire x1="0" y1="3.81" x2="0" y2="2.54" width="0.127" layer="21"/>
+<wire x1="0.3175" y1="2.8575" x2="0" y2="2.54" width="0.127" layer="21"/>
+<wire x1="0" y1="2.54" x2="-0.3175" y2="2.8575" width="0.127" layer="21"/>
+</package>
 </packages>
 </library>
 <library name="SparkFun-DiscreteSemi">
@@ -2416,6 +2434,9 @@ design rules under a new name.</descript
 <autorouter>
 <pass name="Default">
 <param name="RoutingGrid" value="12.5mil"/>
+<param name="AutoGrid" value="1"/>
+<param name="Efforts" value="0"/>
+<param name="TopRouterVariant" value="1"/>
 <param name="tpViaShape" value="round"/>
 <param name="PrefDir.1" value="|"/>
 <param name="PrefDir.2" value="0"/>
@@ -2570,14 +2591,16 @@ design rules under a new name.</descript
 <attribute name="NAME" x="3.571875" y="10.63625" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="-0.9525" y="11.1125" size="1.27" layer="27" rot="R270"/>
 </element>
-<element name="JP1" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="15.001875" y="4.841875" rot="MR180"/>
-<element name="J1" library="Protofusion" package="POGOPROG-CONN-ALLSMT" value="POGOPIN-CONNALLSMT" x="23.415625" y="4.683125" rot="MR90"/>
 <element name="C9" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="13.6525" rot="R180"/>
 <element name="R3" library="SparkFun-Passives" package="0402-RES" value="390k" x="1.5875" y="6.985"/>
 <element name="C3" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="12.065"/>
 <element name="U$6" library="Protofusion" package="THERM_LOGO_SMALL_0.2" value="" x="36.195" y="3.96875"/>
 <element name="C4" library="SparkFun-Passives" package="0402-CAP" value="0.01uF" x="27.46375" y="12.303125" rot="R180"/>
 <element name="U1" library="Protofusion" package="LQFP32" value="STM32F042K-T" x="10.63625" y="9.525" smashed="yes" rot="R270"/>
+<element name="J1" library="Protofusion" package="POGOPROG-CONN-4-ALLSMT" value="POGOPIN-CONN-4" x="23.1775" y="4.7625" rot="MR90"/>
+<element name="R2" library="SparkFun-Passives" package="0402-RES" value="" x="12.7" y="5.08" rot="MR90"/>
+<element name="C10" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="11.43" y="5.08" rot="MR90"/>
+<element name="JP1" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="14.9225" y="5.08" rot="MR180"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -2599,7 +2622,7 @@ design rules under a new name.</descript
 <vertex x="0" y="15.24"/>
 </polygon>
 <via x="24.13" y="12.3825" extent="1-16" drill="0.3048"/>
-<via x="23.574375" y="7.3025" extent="1-16" drill="0.3048"/>
+<via x="23.01875" y="6.35" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="6"/>
 <contactref element="C1" pad="2"/>
 <contactref element="C2" pad="2"/>
@@ -2621,7 +2644,6 @@ design rules under a new name.</descript
 <via x="5.08" y="14.605" extent="1-16" drill="0.3048"/>
 <wire x1="40.247" y1="14.2875" x2="41.036875" y2="14.2875" width="0.2032" layer="1"/>
 <wire x1="41.036875" y1="14.2875" x2="41.43375" y2="13.890625" width="0.2032" layer="1"/>
-<contactref element="J1" pad="2"/>
 <wire x1="43.97375" y1="13.49375" x2="43.84625" y2="13.49375" width="0.2032" layer="1"/>
 <wire x1="43.84625" y1="13.49375" x2="43.815" y2="13.525" width="0.2032" layer="1"/>
 <via x="42.38625" y="5.635625" extent="1-16" drill="0.3048"/>
@@ -2636,9 +2658,7 @@ design rules under a new name.</descript
 <wire x1="29.36875" y1="9.36625" x2="25.24125" y2="9.36625" width="0.2032" layer="1"/>
 <wire x1="25.24125" y1="9.36625" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
 <wire x1="23.97125" y1="8.795625" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
-<via x="29.36875" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="29.36875" y1="10.706875" x2="29.36875" y2="9.36625" width="0.2032" layer="1"/>
-<wire x1="29.36875" y1="9.36625" x2="29.36875" y2="8.651875" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="8.325" x2="0.8125" y2="7.11" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="7.11" x2="0.9375" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="7.12875" x2="0.873125" y2="7.049375" width="0.2032" layer="1"/>
@@ -2656,9 +2676,7 @@ design rules under a new name.</descript
 <wire x1="4.97875" y1="6.725" x2="4.048125" y2="5.794375" width="0.2032" layer="1"/>
 <wire x1="4.048125" y1="5.794375" x2="4.048125" y2="5.174375" width="0.2032" layer="1"/>
 <wire x1="4.048125" y1="5.174375" x2="3.95375" y2="5.08" width="0.2032" layer="1"/>
-<wire x1="22.24" y1="6.35" x2="22.621875" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="22.621875" y1="6.35" x2="23.574375" y2="7.3025" width="0.2032" layer="1"/>
-<wire x1="24.685625" y1="4.683125" x2="24.685625" y2="4.92125" width="0.2032" layer="16"/>
+<wire x1="22.24" y1="6.35" x2="23.01875" y2="6.35" width="0.2032" layer="1"/>
 <wire x1="41.165" y1="10.825" x2="40.054375" y2="10.825" width="0.2032" layer="1"/>
 <wire x1="40.054375" y1="10.825" x2="39.84625" y2="11.033125" width="0.2032" layer="1"/>
 <wire x1="39.84625" y1="11.033125" x2="39.84625" y2="11.7475" width="0.2032" layer="1"/>
@@ -2677,6 +2695,19 @@ design rules under a new name.</descript
 <wire x1="21.59" y1="11.215" x2="22.519375" y2="12.144375" width="0.2032" layer="1"/>
 <wire x1="22.519375" y1="12.144375" x2="23.891875" y2="12.144375" width="0.2032" layer="1"/>
 <wire x1="23.891875" y1="12.144375" x2="24.13" y2="12.3825" width="0.2032" layer="1"/>
+<contactref element="J1" pad="2"/>
+<contactref element="R2" pad="2"/>
+<contactref element="C10" pad="2"/>
+<via x="24.28875" y="6.985" extent="1-16" drill="0.3048"/>
+<wire x1="23.97125" y1="8.795625" x2="24.27375" y2="8.795625" width="0.2032" layer="1"/>
+<wire x1="24.27375" y1="8.795625" x2="24.28875" y2="8.810625" width="0.2032" layer="1"/>
+<wire x1="24.28875" y1="8.810625" x2="24.28875" y2="6.985" width="0.2032" layer="1"/>
+<via x="16.430625" y="6.50875" extent="1-16" drill="0.3048"/>
+<wire x1="16.430625" y1="6.50875" x2="19.20875" y2="6.50875" width="0.2032" layer="1"/>
+<wire x1="19.20875" y1="6.50875" x2="20.32" y2="5.3975" width="0.2032" layer="1"/>
+<wire x1="20.32" y1="5.3975" x2="22.70125" y2="5.3975" width="0.2032" layer="1"/>
+<wire x1="22.70125" y1="5.3975" x2="23.01875" y2="5.715" width="0.2032" layer="1"/>
+<wire x1="23.01875" y1="5.715" x2="23.01875" y2="6.35" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
 <via x="3.175" y="13.6525" extent="1-16" drill="0.3048"/>
@@ -2751,8 +2782,12 @@ design rules under a new name.</descript
 <wire x1="2.3625" y1="8.325" x2="3.105" y2="8.325" width="0.2032" layer="1"/>
 <wire x1="3.105" y1="8.325" x2="3.175" y2="8.255" width="0.2032" layer="1"/>
 <wire x1="3.175" y1="8.255" x2="3.175" y2="7.77875" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="4.975" x2="3.904921875" y2="4.975" width="0.2032" layer="16"/>
-<wire x1="3.904921875" y1="4.975" x2="2.8575" y2="6.022421875" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="4.975" x2="7.169375" y2="4.975" width="0.2032" layer="16"/>
+<wire x1="7.169375" y1="4.975" x2="7.14375" y2="5.000625" width="0.2032" layer="16"/>
+<wire x1="7.14375" y1="5.000625" x2="7.223125" y2="5.000625" width="0.2032" layer="16"/>
+<wire x1="7.223125" y1="5.000625" x2="7.14375" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="7.14375" y1="5.08" x2="3.799921875" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="3.799921875" y1="5.08" x2="2.8575" y2="6.022421875" width="0.2032" layer="16"/>
 </signal>
 <signal name="3.3V">
 <contactref element="U2" pad="5"/>
@@ -2771,14 +2806,12 @@ design rules under a new name.</descript
 <contactref element="CA1" pad="C1B"/>
 <contactref element="CA1" pad="C2B"/>
 <via x="3.33375" y="10.00125" extent="1-16" drill="0.3048"/>
-<wire x1="10.239375" y1="11.43" x2="10.239375" y2="12.461875" width="0.2032" layer="16"/>
 <wire x1="2.3625" y1="10.725" x2="2.62875" y2="10.725" width="0.2032" layer="1"/>
 <wire x1="2.62875" y1="10.725" x2="3.175" y2="11.27125" width="0.2032" layer="1"/>
 <wire x1="17.383125" y1="12.22375" x2="16.748125" y2="12.85875" width="0.2032" layer="1"/>
 <wire x1="2.3625" y1="9.925" x2="3.2575" y2="9.925" width="0.2032" layer="1"/>
 <wire x1="3.2575" y1="9.925" x2="3.33375" y2="10.00125" width="0.2032" layer="1"/>
 <contactref element="U3" pad="4"/>
-<wire x1="22.463125" y1="7.830525" x2="22.490725" y2="7.858125" width="0.2032" layer="1"/>
 <wire x1="23.97125" y1="10.095625" x2="23.97125" y2="10.63625" width="0.2032" layer="1"/>
 <wire x1="23.97125" y1="10.63625" x2="24.13" y2="10.795" width="0.2032" layer="1"/>
 <wire x1="24.13" y1="10.795" x2="25.470625" y2="10.795" width="0.2032" layer="1"/>
@@ -2788,7 +2821,6 @@ design rules under a new name.</descript
 <contactref element="U1" pad="1"/>
 <contactref element="U1" pad="5"/>
 <contactref element="U1" pad="17"/>
-<via x="10.63625" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="13.43625" y1="13.625" x2="13.43625" y2="14.6625" width="0.2032" layer="1"/>
 <wire x1="13.43625" y1="14.6625" x2="13.255625" y2="14.843125" width="0.2032" layer="1"/>
 <wire x1="13.255625" y1="14.843125" x2="10.23625" y2="14.843125" width="0.2032" layer="1"/>
@@ -2796,21 +2828,13 @@ design rules under a new name.</descript
 <via x="10.239375" y="12.461875" extent="1-16" drill="0.3048"/>
 <wire x1="10.239375" y1="12.461875" x2="10.239375" y2="13.621875" width="0.2032" layer="1"/>
 <wire x1="10.239375" y1="13.621875" x2="10.23625" y2="13.625" width="0.2032" layer="1"/>
-<wire x1="10.63625" y1="8.651875" x2="10.00271875" y2="8.651875" width="0.2032" layer="1"/>
-<wire x1="10.00271875" y1="8.651875" x2="7.858125" y2="6.50728125" width="0.2032" layer="1"/>
-<wire x1="7.858125" y1="6.50728125" x2="7.858125" y2="5.446875" width="0.2032" layer="1"/>
 <wire x1="7.858125" y1="5.446875" x2="7.83625" y2="5.425" width="0.2032" layer="1"/>
 <wire x1="10.23625" y1="14.843125" x2="6.746875" y2="14.843125" width="0.2032" layer="1"/>
-<wire x1="20.94" y1="6.35" x2="20.94" y2="6.49375" width="0.2032" layer="1"/>
-<wire x1="20.94" y1="6.49375" x2="22.06625" y2="7.62" width="0.2032" layer="1"/>
-<wire x1="22.490725" y1="7.858125" x2="22.54" y2="7.9074" width="0.2032" layer="1"/>
 <wire x1="20.558125" y1="8.969375" x2="18.003125" y2="11.524375" width="0.2032" layer="1"/>
 <wire x1="7.83625" y1="5.425" x2="7.83625" y2="5.101875" width="0.2032" layer="1"/>
 <wire x1="7.83625" y1="5.101875" x2="7.858125" y2="5.08" width="0.2032" layer="1"/>
-<wire x1="7.858125" y1="5.08" x2="5.25375" y2="5.08" width="0.2032" layer="1"/>
-<wire x1="22.490725" y1="7.858125" x2="22.490725" y2="7.671775" width="0.2032" layer="1"/>
-<wire x1="22.490725" y1="7.671775" x2="22.5425" y2="7.62" width="0.2032" layer="1"/>
-<wire x1="22.5425" y1="7.62" x2="22.06625" y2="7.62" width="0.2032" layer="1"/>
+<wire x1="7.858125" y1="5.08" x2="7.77875" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="6.6675" y1="5.08" x2="5.25375" y2="5.08" width="0.2032" layer="1"/>
 <wire x1="6.746875" y1="14.843125" x2="6.429375" y2="14.525625" width="0.2032" layer="1"/>
 <wire x1="6.429375" y1="14.525625" x2="6.429375" y2="13.6375" width="0.2032" layer="1"/>
 <wire x1="6.429375" y1="13.6375" x2="6.365" y2="13.573125" width="0.2032" layer="1"/>
@@ -2818,19 +2842,41 @@ design rules under a new name.</descript
 <wire x1="3.37875" y1="11.475" x2="3.175" y2="11.27125" width="0.2032" layer="16"/>
 <wire x1="3.33375" y1="10.00125" x2="3.4925" y2="10.16" width="0.2032" layer="16"/>
 <wire x1="3.4925" y1="10.16" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
-<wire x1="10.63625" y1="8.651875" x2="10.63625" y2="9.823240625" width="0.2032" layer="16"/>
-<wire x1="10.63625" y1="9.823240625" x2="10.299490625" y2="10.16" width="0.2032" layer="16"/>
-<wire x1="10.299490625" y1="10.16" x2="10.239375" y2="10.16" width="0.2032" layer="16"/>
-<wire x1="10.239375" y1="10.16" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
-<wire x1="8.335" y1="11.475" x2="8.38" y2="11.43" width="0.2032" layer="16"/>
-<wire x1="8.38" y1="11.43" x2="10.239375" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="10.16" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
 <wire x1="16.748125" y1="12.85875" x2="14.843125" y2="12.85875" width="0.2032" layer="1"/>
 <wire x1="14.843125" y1="12.85875" x2="14.049375" y2="13.6525" width="0.2032" layer="1"/>
 <wire x1="14.049375" y1="13.6525" x2="13.46375" y2="13.6525" width="0.2032" layer="1"/>
 <wire x1="13.46375" y1="13.6525" x2="13.43625" y2="13.625" width="0.2032" layer="1"/>
-<wire x1="10.239375" y1="11.43" x2="10.239375" y2="10.16" width="0.2032" layer="16"/>
 <wire x1="18.003125" y1="12.22375" x2="17.383125" y2="12.22375" width="0.2032" layer="1"/>
 <wire x1="18.003125" y1="11.524375" x2="18.003125" y2="12.22375" width="0.2032" layer="1"/>
+<contactref element="J1" pad="1"/>
+<wire x1="10.795" y1="10.16" x2="10.795" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="11.43" x2="10.795" y2="11.826875" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="11.826875" x2="10.239375" y2="12.461875" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="11.475" x2="10.75" y2="11.475" width="0.2032" layer="16"/>
+<wire x1="10.75" y1="11.475" x2="10.795" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="10.16" x2="10.795" y2="7.77875" width="0.2032" layer="16"/>
+<wire x1="10.00125" y1="4.524375" x2="9.68375" y2="4.206875" width="0.2032" layer="16"/>
+<via x="6.6675" y="4.445" extent="1-16" drill="0.3048"/>
+<wire x1="10.00125" y1="4.524375" x2="10.00125" y2="6.985" width="0.2032" layer="16"/>
+<wire x1="10.00125" y1="6.985" x2="10.795" y2="7.77875" width="0.2032" layer="16"/>
+<wire x1="9.68375" y1="4.206875" x2="6.905625" y2="4.206875" width="0.2032" layer="16"/>
+<wire x1="6.905625" y1="4.206875" x2="6.6675" y2="4.445" width="0.2032" layer="16"/>
+<wire x1="7.83625" y1="5.425" x2="7.83625" y2="5.1375" width="0.2032" layer="1"/>
+<wire x1="7.83625" y1="5.1375" x2="7.77875" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="7.77875" y1="5.08" x2="6.6675" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="6.6675" y1="5.08" x2="6.6675" y2="4.445" width="0.2032" layer="1"/>
+<wire x1="20.94" y1="6.35" x2="20.94" y2="6.414375" width="0.2032" layer="1"/>
+<wire x1="20.94" y1="6.414375" x2="22.145625" y2="7.62" width="0.2032" layer="1"/>
+<wire x1="22.145625" y1="7.62" x2="22.69875" y2="7.62" width="0.2032" layer="1"/>
+<wire x1="22.69875" y1="7.62" x2="22.54" y2="7.6225" width="0.2032" layer="1"/>
+<wire x1="24.4475" y1="4.7625" x2="24.4475" y2="5.635625" width="0.2032" layer="16"/>
+<via x="24.4475" y="5.635625" extent="1-16" drill="0.3048"/>
+<wire x1="22.54" y1="7.9074" x2="22.54" y2="7.6225" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="7.6225" x2="23.175" y2="7.6225" width="0.2032" layer="1"/>
+<wire x1="23.175" y1="7.6225" x2="23.65375" y2="7.14375" width="0.2032" layer="1"/>
+<wire x1="23.65375" y1="7.14375" x2="23.65375" y2="6.429375" width="0.2032" layer="1"/>
+<wire x1="23.65375" y1="6.429375" x2="24.4475" y2="5.635625" width="0.2032" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="JP2" pad="P1"/>
@@ -2865,31 +2911,31 @@ design rules under a new name.</descript
 <contactref element="SW1" pad="1"/>
 <via x="32.54375" y="9.128125" extent="1-16" drill="0.3048"/>
 <wire x1="19.3675" y1="10.398125" x2="31.27375" y2="10.398125" width="0.2032" layer="16"/>
-<via x="17.93875" y="10.239375" extent="1-16" drill="0.3048"/>
+<via x="18.018125" y="10.239375" extent="1-16" drill="0.3048"/>
 <wire x1="31.58391875" y1="8.16381875" x2="32.54375" y2="9.12365" width="0.2032" layer="1"/>
 <wire x1="32.54375" y1="9.12365" x2="32.54375" y2="9.128125" width="0.2032" layer="1"/>
 <wire x1="31.27375" y1="10.398125" x2="32.54375" y2="9.128125" width="0.2032" layer="16"/>
 <contactref element="U1" pad="28"/>
 <wire x1="14.73625" y1="9.125" x2="15.63375" y2="9.125" width="0.2032" layer="1"/>
-<wire x1="16.748125" y1="10.239375" x2="17.93875" y2="10.239375" width="0.2032" layer="1"/>
+<wire x1="16.748125" y1="10.239375" x2="18.018125" y2="10.239375" width="0.2032" layer="1"/>
 <wire x1="19.3675" y1="10.398125" x2="19.20875" y2="10.239375" width="0.2032" layer="16"/>
-<wire x1="19.20875" y1="10.239375" x2="17.93875" y2="10.239375" width="0.2032" layer="16"/>
+<wire x1="19.20875" y1="10.239375" x2="18.018125" y2="10.239375" width="0.2032" layer="16"/>
 <wire x1="15.63375" y1="9.125" x2="16.748125" y2="10.239375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-C">
 <contactref element="SW1" pad="3"/>
 <wire x1="33.56381875" y1="6.18391875" x2="33.48891875" y2="6.18391875" width="0.2032" layer="1"/>
 <via x="34.6075" y="7.14375" extent="1-16" drill="0.3048"/>
-<wire x1="19.129375" y1="8.969375" x2="19.764375" y2="9.604375" width="0.2032" layer="16"/>
-<wire x1="19.764375" y1="9.604375" x2="30.32125" y2="9.604375" width="0.2032" layer="16"/>
-<via x="19.129375" y="8.969375" extent="1-16" drill="0.3048"/>
+<wire x1="19.288125" y1="8.969375" x2="19.923125" y2="9.604375" width="0.2032" layer="16"/>
+<wire x1="19.923125" y1="9.604375" x2="30.32125" y2="9.604375" width="0.2032" layer="16"/>
+<via x="19.288125" y="8.969375" extent="1-16" drill="0.3048"/>
 <wire x1="33.56381875" y1="6.18391875" x2="33.64766875" y2="6.18391875" width="0.2032" layer="1"/>
 <wire x1="33.64766875" y1="6.18391875" x2="34.6075" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="30.32125" y1="9.604375" x2="32.781875" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="32.781875" y1="7.14375" x2="34.6075" y2="7.14375" width="0.2032" layer="16"/>
 <contactref element="U1" pad="26"/>
 <wire x1="14.73625" y1="7.525" x2="15.541875" y2="7.525" width="0.2032" layer="1"/>
-<wire x1="16.98625" y1="8.969375" x2="19.129375" y2="8.969375" width="0.2032" layer="1"/>
+<wire x1="16.98625" y1="8.969375" x2="19.288125" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="15.541875" y1="7.525" x2="16.98625" y2="8.969375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-B">
@@ -2926,81 +2972,65 @@ design rules under a new name.</descript
 </signal>
 <signal name="D+">
 <contactref element="J2" pad="D+"/>
-<contactref element="J1" pad="5"/>
-<wire x1="20.875625" y1="4.683125" x2="20.875625" y2="5.400625" width="0.2032" layer="16"/>
-<via x="20.875625" y="5.400625" extent="1-16" drill="0.3048"/>
 <via x="38.4175" y="8.55574375" extent="1-16" drill="0.3048"/>
-<via x="24.765" y="7.064375" extent="1-16" drill="0.3048"/>
 <wire x1="41.14824375" y1="9.50824375" x2="41.165" y2="9.525" width="0.2032" layer="1"/>
 <wire x1="36.67125" y1="6.429375" x2="38.4175" y2="8.175625" width="0.2032" layer="16"/>
 <wire x1="38.4175" y1="8.175625" x2="38.4175" y2="8.55574375" width="0.2032" layer="16"/>
 <contactref element="U1" pad="22"/>
-<via x="11.826875" y="7.9375" extent="1-16" drill="0.3048"/>
-<wire x1="11.826875" y1="5.434375" x2="11.83625" y2="5.425" width="0.2032" layer="1"/>
-<wire x1="20.875625" y1="5.400625" x2="20.875625" y2="5.794375" width="0.2032" layer="16"/>
-<wire x1="20.875625" y1="5.794375" x2="20.558125" y2="6.111875" width="0.2032" layer="16"/>
-<wire x1="20.558125" y1="6.111875" x2="18.89125" y2="6.111875" width="0.2032" layer="16"/>
-<wire x1="18.89125" y1="6.111875" x2="17.541875" y2="7.46125" width="0.2032" layer="16"/>
-<wire x1="17.541875" y1="7.46125" x2="12.303125" y2="7.46125" width="0.2032" layer="16"/>
-<wire x1="11.826875" y1="5.434375" x2="11.826875" y2="7.9375" width="0.2032" layer="1"/>
-<wire x1="12.303125" y1="7.46125" x2="11.826875" y2="7.9375" width="0.2032" layer="16"/>
-<wire x1="36.67125" y1="6.429375" x2="25.4" y2="6.429375" width="0.2032" layer="16"/>
-<wire x1="25.4" y1="6.429375" x2="24.765" y2="7.064375" width="0.2032" layer="16"/>
-<wire x1="20.875625" y1="5.400625" x2="22.545625" y2="5.400625" width="0.2032" layer="1"/>
-<wire x1="22.545625" y1="5.400625" x2="24.209375" y2="7.064375" width="0.2032" layer="1"/>
-<wire x1="24.209375" y1="7.064375" x2="24.765" y2="7.064375" width="0.2032" layer="1"/>
+<via x="12.85875" y="8.89" extent="1-16" drill="0.3048"/>
 <wire x1="41.14824375" y1="9.50824375" x2="39.37" y2="9.50824375" width="0.2032" layer="1"/>
 <wire x1="39.37" y1="9.50824375" x2="38.4175" y2="8.55574375" width="0.2032" layer="1"/>
+<wire x1="36.67125" y1="6.429375" x2="32.623125" y2="6.429375" width="0.2032" layer="16"/>
+<wire x1="32.623125" y1="6.429375" x2="31.511875" y2="7.540625" width="0.2032" layer="16"/>
+<wire x1="12.85875" y1="8.89" x2="17.30375" y2="8.89" width="0.2032" layer="16"/>
+<wire x1="22.06625" y1="8.016875" x2="20.973" y2="6.923625" width="0.2032" layer="16"/>
+<wire x1="20.973" y1="6.923625" x2="19.270125" y2="6.923625" width="0.2032" layer="16"/>
+<wire x1="19.270125" y1="6.923625" x2="17.30375" y2="8.89" width="0.2032" layer="16"/>
+<wire x1="31.511875" y1="7.540625" x2="25.24125" y2="7.540625" width="0.2032" layer="16"/>
+<wire x1="25.24125" y1="7.540625" x2="24.765" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="24.765" y1="8.016875" x2="22.06625" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="11.826875" y1="7.349878125" x2="12.85875" y2="8.381753125" width="0.2032" layer="1"/>
+<wire x1="12.85875" y1="8.381753125" x2="12.85875" y2="8.89" width="0.2032" layer="1"/>
+<wire x1="11.826875" y1="5.434375" x2="11.826875" y2="7.349878125" width="0.2032" layer="1"/>
+<wire x1="11.826875" y1="5.434375" x2="11.83625" y2="5.425" width="0.2032" layer="1"/>
 </signal>
 <signal name="D-">
 <contactref element="J2" pad="D-"/>
-<contactref element="J1" pad="6"/>
-<via x="16.98625" y="6.35" extent="1-16" drill="0.3048"/>
 <via x="39.0525" y="7.9375" extent="1-16" drill="0.3048"/>
-<via x="24.28875" y="6.270625" extent="1-16" drill="0.3048"/>
-<wire x1="22.5425" y1="4.524375" x2="24.28875" y2="6.270625" width="0.2032" layer="1"/>
 <wire x1="41.15" y1="8.89" x2="41.165" y2="8.875" width="0.2032" layer="1"/>
 <wire x1="36.83" y1="6.0325" x2="38.735" y2="7.9375" width="0.2032" layer="16"/>
 <wire x1="38.735" y1="7.9375" x2="39.0525" y2="7.9375" width="0.2032" layer="16"/>
 <contactref element="U1" pad="21"/>
-<wire x1="11.191875" y1="7.064375" x2="11.033125" y2="7.223125" width="0.2032" layer="16"/>
-<via x="11.033125" y="7.223125" extent="1-16" drill="0.3048"/>
-<wire x1="11.191875" y1="7.064375" x2="16.51" y2="7.064375" width="0.2032" layer="16"/>
-<wire x1="16.98625" y1="7.064375" x2="17.383125" y2="7.064375" width="0.2032" layer="16"/>
-<wire x1="36.83" y1="6.0325" x2="24.526875" y2="6.0325" width="0.2032" layer="16"/>
-<wire x1="24.526875" y1="6.0325" x2="24.28875" y2="6.270625" width="0.2032" layer="16"/>
-<wire x1="16.98625" y1="6.35" x2="18.57375" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="18.57375" y1="6.35" x2="20.399375" y2="4.524375" width="0.2032" layer="1"/>
-<wire x1="20.399375" y1="4.524375" x2="22.5425" y2="4.524375" width="0.2032" layer="1"/>
-<wire x1="16.98625" y1="6.35" x2="16.98625" y2="7.064375" width="0.2032" layer="16"/>
+<via x="11.826875" y="8.175625" extent="1-16" drill="0.3048"/>
 <wire x1="41.15" y1="8.89" x2="40.005" y2="8.89" width="0.2032" layer="1"/>
 <wire x1="40.005" y1="8.89" x2="39.0525" y2="7.9375" width="0.2032" layer="1"/>
-<wire x1="11.033125" y1="7.223125" x2="11.03625" y2="7.22" width="0.2032" layer="1"/>
-<wire x1="11.03625" y1="7.22" x2="11.03625" y2="5.425" width="0.2032" layer="1"/>
-<wire x1="17.383125" y1="7.064375" x2="18.7325" y2="5.715" width="0.2032" layer="16"/>
-<wire x1="18.7325" y1="5.715" x2="19.3675" y2="5.715" width="0.2032" layer="16"/>
-<wire x1="19.3675" y1="5.715" x2="19.605625" y2="5.476875" width="0.2032" layer="16"/>
-<wire x1="19.605625" y1="5.476875" x2="19.605625" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="16.98625" y1="7.064375" x2="16.51" y2="7.064375" width="0.2032" layer="16"/>
+<wire x1="36.83" y1="6.0325" x2="32.385" y2="6.0325" width="0.2032" layer="16"/>
+<wire x1="32.385" y1="6.0325" x2="31.4325" y2="6.985" width="0.2032" layer="16"/>
+<wire x1="11.826875" y1="8.175625" x2="12.938125" y2="8.175625" width="0.2032" layer="16"/>
+<wire x1="12.938125" y1="8.175625" x2="13.255625" y2="8.493125" width="0.2032" layer="16"/>
+<wire x1="13.255625" y1="8.493125" x2="17.145" y2="8.493125" width="0.2032" layer="16"/>
+<wire x1="17.145" y1="8.493125" x2="19.0885875" y2="6.5495375" width="0.2032" layer="16"/>
+<wire x1="19.0885875" y1="6.5495375" x2="21.2339125" y2="6.5495375" width="0.2032" layer="16"/>
+<wire x1="21.2339125" y1="6.5495375" x2="22.304375" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="31.4325" y1="6.985" x2="25.24125" y2="6.985" width="0.2032" layer="16"/>
+<wire x1="25.24125" y1="6.985" x2="24.60625" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="24.60625" y1="7.62" x2="22.304375" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="11.03625" y1="5.425" x2="11.03625" y2="6.035625" width="0.2032" layer="1"/>
+<wire x1="11.03625" y1="6.035625" x2="11.43" y2="6.429375" width="0.2032" layer="1"/>
+<wire x1="11.43" y1="6.429375" x2="11.43" y2="7.77875" width="0.2032" layer="1"/>
+<wire x1="11.43" y1="7.77875" x2="11.826875" y2="8.175625" width="0.2032" layer="1"/>
 </signal>
 <signal name="VUSB">
 <contactref element="J2" pad="VBUS"/>
 <contactref element="D1" pad="A"/>
-<wire x1="41.165" y1="8.225" x2="42.35625" y2="8.225" width="0.2032" layer="1"/>
 <via x="42.38625" y="14.035" extent="1-16" drill="0.3048"/>
 <wire x1="42.38625" y1="14.035" x2="41.81625" y2="14.605" width="0.2032" layer="16"/>
 <wire x1="41.81625" y1="14.605" x2="34.925" y2="14.605" width="0.2032" layer="16"/>
 <via x="34.925" y="14.605" extent="1-16" drill="0.3048"/>
 <wire x1="34.925" y1="14.605" x2="33.72" y2="14.605" width="0.2032" layer="1"/>
-<contactref element="J1" pad="1"/>
-<via x="41.11625" y="5.55625" extent="1-16" drill="0.3048"/>
-<wire x1="39.84625" y1="4.28625" x2="41.11625" y2="5.55625" width="0.2032" layer="16"/>
 <wire x1="42.38625" y1="14.035" x2="42.38625" y2="8.255" width="0.2032" layer="1"/>
 <wire x1="42.35625" y1="8.225" x2="42.38625" y2="8.255" width="0.2032" layer="1"/>
-<wire x1="39.84625" y1="4.28625" x2="26.3525" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="42.38625" y1="8.255" x2="42.38625" y2="6.82625" width="0.2032" layer="1"/>
-<wire x1="42.38625" y1="6.82625" x2="41.11625" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="26.3525" y1="4.28625" x2="25.955625" y2="4.683125" width="0.2032" layer="16"/>
+<wire x1="41.165" y1="8.225" x2="42.35625" y2="8.225" width="0.2032" layer="1"/>
 </signal>
 <signal name="SSR+">
 <contactref element="JP3" pad="P1"/>
@@ -3084,11 +3114,11 @@ design rules under a new name.</descript
 <wire x1="30.48" y1="10.00125" x2="32.305625" y2="8.175625" width="0.2032" layer="16"/>
 <wire x1="33.575625" y1="8.175625" x2="32.57386875" y2="7.17386875" width="0.2032" layer="1"/>
 <wire x1="19.605625" y1="10.00125" x2="19.20875" y2="9.604375" width="0.2032" layer="16"/>
-<wire x1="19.20875" y1="9.604375" x2="18.57375" y2="9.604375" width="0.2032" layer="16"/>
-<via x="18.57375" y="9.604375" extent="1-16" drill="0.3048"/>
+<wire x1="19.20875" y1="9.604375" x2="18.7325" y2="9.604375" width="0.2032" layer="16"/>
+<via x="18.7325" y="9.604375" extent="1-16" drill="0.3048"/>
 <contactref element="U1" pad="27"/>
 <wire x1="14.73625" y1="8.325" x2="15.6275" y2="8.325" width="0.2032" layer="1"/>
-<wire x1="16.906875" y1="9.604375" x2="18.57375" y2="9.604375" width="0.2032" layer="1"/>
+<wire x1="16.906875" y1="9.604375" x2="18.7325" y2="9.604375" width="0.2032" layer="1"/>
 <wire x1="15.6275" y1="8.325" x2="16.906875" y2="9.604375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MOSI">
@@ -3106,114 +3136,133 @@ design rules under a new name.</descript
 <contactref element="U3" pad="7"/>
 <wire x1="28.09875" y1="5.306875" x2="28.09875" y2="8.651875" width="0.2032" layer="1"/>
 <via x="28.09875" y="8.651875" extent="1-16" drill="0.3048"/>
-<wire x1="25.796875" y1="8.810625" x2="21.034375" y2="8.810625" width="0.2032" layer="16"/>
+<wire x1="25.796875" y1="8.810625" x2="21.669375" y2="8.810625" width="0.2032" layer="16"/>
 <wire x1="25.796875" y1="8.810625" x2="26.590625" y2="8.016875" width="0.2032" layer="16"/>
 <wire x1="26.590625" y1="8.016875" x2="27.46375" y2="8.016875" width="0.2032" layer="16"/>
 <wire x1="27.46375" y1="8.016875" x2="28.09875" y2="8.651875" width="0.2032" layer="16"/>
 <contactref element="U1" pad="12"/>
-<via x="11.985625" y="10.16" extent="1-16" drill="0.3048"/>
-<wire x1="19.52625" y1="7.699375" x2="17.065625" y2="10.16" width="0.2032" layer="16"/>
-<wire x1="17.065625" y1="10.16" x2="11.985625" y2="10.16" width="0.2032" layer="16"/>
-<wire x1="19.52625" y1="7.699375" x2="19.923125" y2="7.699375" width="0.2032" layer="16"/>
-<wire x1="19.923125" y1="7.699375" x2="21.034375" y2="8.810625" width="0.2032" layer="16"/>
+<via x="12.779375" y="10.16" extent="1-16" drill="0.3048"/>
+<wire x1="19.685" y1="7.699375" x2="17.224375" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="17.224375" y1="10.16" x2="12.779375" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="19.685" y1="7.699375" x2="20.558125" y2="7.699375" width="0.2032" layer="16"/>
+<wire x1="20.558125" y1="7.699375" x2="21.669375" y2="8.810625" width="0.2032" layer="16"/>
 <wire x1="6.53625" y1="9.925" x2="9.29" y2="9.925" width="0.2032" layer="1"/>
 <wire x1="9.29" y1="9.925" x2="9.525" y2="10.16" width="0.2032" layer="1"/>
-<wire x1="9.525" y1="10.16" x2="11.985625" y2="10.16" width="0.2032" layer="1"/>
+<wire x1="9.525" y1="10.16" x2="12.779375" y2="10.16" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_SCK">
 <contactref element="LCD1" pad="11"/>
 <contactref element="U3" pad="5"/>
 <via x="25.479375" y="8.175625" extent="1-16" drill="0.3048"/>
-<wire x1="21.193125" y1="8.41375" x2="25.24125" y2="8.41375" width="0.2032" layer="16"/>
+<wire x1="21.828125" y1="8.41375" x2="25.24125" y2="8.41375" width="0.2032" layer="16"/>
 <wire x1="25.24125" y1="8.41375" x2="25.479375" y2="8.175625" width="0.2032" layer="16"/>
-<wire x1="11.350625" y1="8.493125" x2="11.350625" y2="9.36625" width="0.2032" layer="16"/>
 <contactref element="U1" pad="11"/>
-<via x="10.95375" y="10.795" extent="1-16" drill="0.3048"/>
-<wire x1="11.350625" y1="9.36625" x2="11.350625" y2="10.398125" width="0.2032" layer="16"/>
-<wire x1="11.350625" y1="10.398125" x2="10.95375" y2="10.795" width="0.2032" layer="16"/>
-<wire x1="6.53625" y1="10.725" x2="10.88375" y2="10.725" width="0.2032" layer="1"/>
-<wire x1="10.88375" y1="10.725" x2="10.95375" y2="10.795" width="0.2032" layer="1"/>
-<wire x1="19.3675" y1="7.3025" x2="17.30375" y2="9.36625" width="0.2032" layer="16"/>
-<wire x1="17.30375" y1="9.36625" x2="11.350625" y2="9.36625" width="0.2032" layer="16"/>
-<wire x1="19.3675" y1="7.3025" x2="20.081875" y2="7.3025" width="0.2032" layer="16"/>
-<wire x1="20.081875" y1="7.3025" x2="21.193125" y2="8.41375" width="0.2032" layer="16"/>
+<via x="12.22375" y="10.795" extent="1-16" drill="0.3048"/>
+<wire x1="19.52625" y1="7.3025" x2="17.30375" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="17.30375" y1="9.525" x2="12.22375" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="19.52625" y1="7.3025" x2="20.716875" y2="7.3025" width="0.2032" layer="16"/>
+<wire x1="20.716875" y1="7.3025" x2="21.828125" y2="8.41375" width="0.2032" layer="16"/>
 <wire x1="25.479375" y1="8.175625" x2="25.479375" y2="5.38625" width="0.2032" layer="1"/>
 <wire x1="25.479375" y1="5.38625" x2="25.55875" y2="5.306875" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="7.575" x2="10.4325" y2="7.575" width="0.2032" layer="16"/>
-<wire x1="10.4325" y1="7.575" x2="11.350625" y2="8.493125" width="0.2032" layer="16"/>
+<via x="11.43" y="8.89" extent="1-16" drill="0.3048"/>
+<via x="10.16" y="8.73125" extent="1-16" drill="0.3048"/>
+<wire x1="10.16" y1="8.73125" x2="11.27125" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="11.27125" y1="8.73125" x2="11.43" y2="8.89" width="0.2032" layer="1"/>
+<wire x1="6.53625" y1="10.725" x2="12.15375" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="12.15375" y1="10.725" x2="12.22375" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="7.575" x2="9.7975" y2="7.575" width="0.2032" layer="16"/>
+<wire x1="9.7975" y1="7.575" x2="10.16" y2="7.9375" width="0.2032" layer="16"/>
+<wire x1="10.16" y1="7.9375" x2="10.16" y2="8.73125" width="0.2032" layer="16"/>
+<wire x1="12.22375" y1="10.795" x2="12.22375" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="11.43" y1="8.89" x2="11.937559375" y2="8.89" width="0.2032" layer="16"/>
+<wire x1="11.937559375" y1="8.89" x2="12.22375" y2="9.176190625" width="0.2032" layer="16"/>
+<wire x1="12.22375" y1="9.176190625" x2="12.22375" y2="9.525" width="0.2032" layer="16"/>
 </signal>
 <signal name="!CS_OLED">
 <contactref element="LCD1" pad="8"/>
 <contactref element="U1" pad="8"/>
 <wire x1="7.83625" y1="13.625" x2="7.83625" y2="12.325" width="0.2032" layer="1"/>
 <wire x1="7.83625" y1="12.325" x2="8.73125" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="8.73125" y1="11.43" x2="11.626059375" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="11.626059375" y1="11.43" x2="12.620625" y2="10.435434375" width="0.2032" layer="1"/>
-<wire x1="12.620625" y1="10.435434375" x2="12.620625" y2="9.763125" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="9.525" x2="10.00125" y2="9.525" width="0.2032" layer="16"/>
-<via x="10.00125" y="9.525" extent="1-16" drill="0.3048"/>
-<wire x1="10.00125" y1="9.525" x2="12.3825" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="12.3825" y1="9.525" x2="12.620625" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="8.73125" y1="11.43" x2="12.419809375" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="12.419809375" y1="11.43" x2="13.414375" y2="10.435434375" width="0.2032" layer="1"/>
+<wire x1="13.414375" y1="10.435434375" x2="13.414375" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="9.525" x2="10.16" y2="9.525" width="0.2032" layer="16"/>
+<via x="10.16" y="9.525" extent="1-16" drill="0.3048"/>
+<wire x1="10.16" y1="9.525" x2="13.17625" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="13.17625" y1="9.525" x2="13.414375" y2="9.763125" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_MAX">
 <contactref element="U3" pad="6"/>
-<wire x1="19.764375" y1="8.334375" x2="20.6375" y2="9.2075" width="0.2032" layer="16"/>
 <via x="26.82875" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="26.82875" y1="8.651875" x2="26.82875" y2="5.306875" width="0.2032" layer="1"/>
-<via x="19.764375" y="8.334375" extent="1-16" drill="0.3048"/>
-<wire x1="20.6375" y1="9.2075" x2="26.273125" y2="9.2075" width="0.2032" layer="16"/>
+<via x="19.84375" y="8.334375" extent="1-16" drill="0.3048"/>
 <wire x1="26.273125" y1="9.2075" x2="26.82875" y2="8.651875" width="0.2032" layer="16"/>
 <contactref element="U1" pad="25"/>
 <wire x1="14.73625" y1="6.725" x2="15.615" y2="6.725" width="0.2032" layer="1"/>
 <wire x1="15.615" y1="6.725" x2="17.224375" y2="8.334375" width="0.2032" layer="1"/>
-<wire x1="19.764375" y1="8.334375" x2="17.224375" y2="8.334375" width="0.2032" layer="1"/>
+<wire x1="19.84375" y1="8.334375" x2="17.224375" y2="8.334375" width="0.2032" layer="1"/>
+<wire x1="26.273125" y1="9.2075" x2="20.716875" y2="9.2075" width="0.2032" layer="16"/>
+<wire x1="20.716875" y1="9.2075" x2="19.84375" y2="8.334375" width="0.2032" layer="16"/>
 </signal>
 <signal name="AUX-TX">
-<contactref element="JP1" pad="P2"/>
 <contactref element="U1" pad="19"/>
-<wire x1="15.001875" y1="4.841875" x2="14.366875" y2="4.206875" width="0.2032" layer="1"/>
-<wire x1="14.366875" y1="4.206875" x2="9.604375" y2="4.206875" width="0.2032" layer="1"/>
+<wire x1="14.049375" y1="4.206875" x2="9.604375" y2="4.206875" width="0.2032" layer="1"/>
 <wire x1="9.604375" y1="4.206875" x2="9.445625" y2="4.365625" width="0.2032" layer="1"/>
 <wire x1="9.445625" y1="4.365625" x2="9.445625" y2="5.415625" width="0.2032" layer="1"/>
 <wire x1="9.445625" y1="5.415625" x2="9.43625" y2="5.425" width="0.2032" layer="1"/>
+<contactref element="R2" pad="1"/>
+<contactref element="U1" pad="15"/>
+<wire x1="6.53625" y1="7.525" x2="8.588125" y2="7.525" width="0.2032" layer="1"/>
+<wire x1="8.588125" y1="7.525" x2="9.43625" y2="6.676875" width="0.2032" layer="1"/>
+<wire x1="9.43625" y1="5.425" x2="9.43625" y2="6.676875" width="0.2032" layer="1"/>
+<contactref element="JP1" pad="P2"/>
+<contactref element="C10" pad="1"/>
+<wire x1="14.049375" y1="4.206875" x2="14.9225" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="11.43" y1="4.43" x2="12.7" y2="4.43" width="0.2032" layer="16"/>
+<wire x1="12.7" y1="4.43" x2="14.2725" y2="4.43" width="0.2032" layer="16"/>
+<wire x1="14.2725" y1="4.43" x2="14.9225" y2="5.08" width="0.2032" layer="16"/>
 </signal>
 <signal name="AUX-RX">
+<contactref element="U1" pad="20"/>
+<via x="10.795" y="6.6675" extent="1-16" drill="0.3048"/>
+<contactref element="U1" pad="14"/>
+<wire x1="6.53625" y1="8.325" x2="9.7725" y2="8.325" width="0.2032" layer="1"/>
 <contactref element="JP1" pad="P1"/>
-<contactref element="U1" pad="20"/>
-<wire x1="10.23625" y1="5.425" x2="10.23625" y2="6.664375" width="0.2032" layer="1"/>
-<wire x1="10.23625" y1="6.664375" x2="10.239375" y2="6.6675" width="0.2032" layer="1"/>
-<via x="10.239375" y="6.6675" extent="1-16" drill="0.3048"/>
-<wire x1="16.271875" y1="5.000625" x2="16.430625" y2="4.841875" width="0.2032" layer="16"/>
-<wire x1="16.430625" y1="4.841875" x2="17.541875" y2="4.841875" width="0.2032" layer="16"/>
-<wire x1="16.271875" y1="5.000625" x2="16.271875" y2="6.270625" width="0.2032" layer="16"/>
-<wire x1="10.239375" y1="6.6675" x2="10.398125" y2="6.50875" width="0.2032" layer="16"/>
-<wire x1="10.398125" y1="6.50875" x2="16.03375" y2="6.50875" width="0.2032" layer="16"/>
-<wire x1="16.03375" y1="6.50875" x2="16.271875" y2="6.270625" width="0.2032" layer="16"/>
+<wire x1="9.7725" y1="8.325" x2="10.239375" y2="7.858125" width="0.2032" layer="1"/>
+<wire x1="10.239375" y1="7.858125" x2="10.239375" y2="6.6675" width="0.2032" layer="1"/>
+<wire x1="10.239375" y1="6.6675" x2="10.239375" y2="5.428125" width="0.2032" layer="1"/>
+<wire x1="10.239375" y1="5.428125" x2="10.23625" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="10.795" y1="6.6675" x2="10.239375" y2="6.6675" width="0.2032" layer="1"/>
+<wire x1="17.4625" y1="6.50875" x2="17.4625" y2="5.08" width="0.2032" layer="16"/>
+<wire x1="17.4625" y1="6.50875" x2="16.748125" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="16.748125" y1="7.223125" x2="14.366875" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="14.366875" y1="7.223125" x2="13.81125" y2="6.6675" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="6.6675" x2="13.81125" y2="6.6675" width="0.2032" layer="16"/>
 </signal>
 <signal name="SWCLK">
-<contactref element="J1" pad="3"/>
 <contactref element="U1" pad="24"/>
-<via x="13.414375" y="8.5725" extent="1-16" drill="0.3048"/>
-<wire x1="13.414375" y1="8.5725" x2="13.414375" y2="5.446875" width="0.2032" layer="1"/>
+<via x="13.414375" y="7.858125" extent="1-16" drill="0.3048"/>
 <wire x1="13.414375" y1="5.446875" x2="13.43625" y2="5.425" width="0.2032" layer="1"/>
-<wire x1="23.415625" y1="4.683125" x2="23.415625" y2="5.3975" width="0.2032" layer="16"/>
-<wire x1="23.415625" y1="5.3975" x2="21.9075" y2="6.905625" width="0.2032" layer="16"/>
-<wire x1="21.9075" y1="6.905625" x2="19.20875" y2="6.905625" width="0.2032" layer="16"/>
-<wire x1="19.20875" y1="6.905625" x2="17.541875" y2="8.5725" width="0.2032" layer="16"/>
-<wire x1="17.541875" y1="8.5725" x2="13.414375" y2="8.5725" width="0.2032" layer="16"/>
+<contactref element="J1" pad="3"/>
+<wire x1="13.414375" y1="7.858125" x2="13.573125" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="13.573125" y1="8.016875" x2="17.065625" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="17.065625" y1="8.016875" x2="18.89125" y2="6.19125" width="0.2032" layer="16"/>
+<wire x1="18.89125" y1="6.19125" x2="21.11375" y2="6.19125" width="0.2032" layer="16"/>
+<wire x1="13.414375" y1="5.446875" x2="13.414375" y2="7.858125" width="0.2032" layer="1"/>
+<wire x1="21.11375" y1="6.19125" x2="21.9075" y2="5.3975" width="0.2032" layer="16"/>
+<wire x1="21.9075" y1="5.3975" x2="21.9075" y2="4.7625" width="0.2032" layer="16"/>
 </signal>
 <signal name="SWDIO">
+<contactref element="U1" pad="23"/>
 <contactref element="J1" pad="4"/>
-<contactref element="U1" pad="23"/>
-<via x="12.620625" y="8.255" extent="1-16" drill="0.3048"/>
+<wire x1="20.6375" y1="4.7625" x2="19.764375" y2="4.7625" width="0.2032" layer="16"/>
+<wire x1="19.764375" y1="4.7625" x2="16.906875" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="16.906875" y1="7.62" x2="14.12875" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="14.12875" y1="7.62" x2="13.6525" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="13.6525" y1="7.14375" x2="12.620625" y2="7.14375" width="0.2032" layer="16"/>
+<via x="12.620625" y="7.14375" extent="1-16" drill="0.3048"/>
+<wire x1="12.620625" y1="7.14375" x2="12.620625" y2="5.440625" width="0.2032" layer="1"/>
 <wire x1="12.620625" y1="5.440625" x2="12.63625" y2="5.425" width="0.2032" layer="1"/>
-<wire x1="22.145625" y1="4.683125" x2="22.145625" y2="6.0325" width="0.2032" layer="16"/>
-<wire x1="22.145625" y1="6.0325" x2="21.669375" y2="6.50875" width="0.2032" layer="16"/>
-<wire x1="21.669375" y1="6.50875" x2="19.05" y2="6.50875" width="0.2032" layer="16"/>
-<wire x1="19.05" y1="6.50875" x2="17.700625" y2="7.858125" width="0.2032" layer="16"/>
-<wire x1="17.700625" y1="7.858125" x2="13.0175" y2="7.858125" width="0.2032" layer="16"/>
-<wire x1="12.620625" y1="5.440625" x2="12.620625" y2="8.255" width="0.2032" layer="1"/>
-<wire x1="13.0175" y1="7.858125" x2="12.620625" y2="8.255" width="0.2032" layer="16"/>
 </signal>
 </signals>
 </board>