diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="6.5.0">
+<eagle version="7.1.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="no" altdistance="6.25" altunitdist="mil" altunit="mil"/>
+<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="no" altdistance="3.125" altunitdist="mil" altunit="mil"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
@@ -52,7 +52,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="no" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
@@ -196,6 +196,10 @@
 <text x="-0.635" y="22.86" size="1.778" layer="21">Add breakaway mounting tabs</text>
 <text x="-0.635" y="25.4" size="1.778" layer="21">Add GPIO breakaway?</text>
 <text x="-0.635" y="28.575" size="1.778" layer="21">Add pogos for USB? (pads for SWD too?) Right next to eachother...</text>
+<wire x1="-8.89" y1="12.7" x2="-8.89" y2="16.51" width="0" layer="20"/>
+<wire x1="-8.89" y1="16.51" x2="-5.08" y2="16.51" width="0" layer="20"/>
+<wire x1="-5.08" y1="16.51" x2="-5.08" y2="12.7" width="0" layer="20"/>
+<hole x="-6.985" y="14.605" drill="127.2794"/>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -2337,7 +2341,7 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="Fusion_eagle_rule_v1.1 *">
+<designrules name="Elecrow_2-layer_eagle_rule">
 <description language="de">&lt;b&gt;EAGLE Design Rules&lt;/b&gt;
 &lt;p&gt;
 Die Standard-Design-Rules sind so gewählt, dass sie für 
@@ -2352,12 +2356,12 @@ a wide range of applications. Your parti
 may have different requirements, so please make the
 necessary adjustments and save your customized
 design rules under a new name.</description>
-<description language="zh">&lt;b&gt;Seeed Studio EAGLE Design Rules&lt;/b&gt;
+<description language="zh">&lt;b&gt;Elecrow EAGLE Design Rules&lt;/b&gt;
 </description>
 <param name="layerSetup" value="(1*16)"/>
 <param name="mtCopper" value="0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm"/>
 <param name="mtIsolate" value="1.5mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm"/>
-<param name="mdWireWire" value="8mil"/>
+<param name="mdWireWire" value="6mil"/>
 <param name="mdWirePad" value="6mil"/>
 <param name="mdWireVia" value="6mil"/>
 <param name="mdPadPad" value="6mil"/>
@@ -2371,7 +2375,7 @@ design rules under a new name.</descript
 <param name="mdCopperDimension" value="10mil"/>
 <param name="mdDrill" value="10mil"/>
 <param name="mdSmdStop" value="0mil"/>
-<param name="msWidth" value="8mil"/>
+<param name="msWidth" value="6mil"/>
 <param name="msDrill" value="12mil"/>
 <param name="msMicroVia" value="12mil"/>
 <param name="msBlindViaRatio" value="0.5"/>
@@ -2416,7 +2420,7 @@ design rules under a new name.</descript
 <param name="dpMaxLengthDifference" value="10mm"/>
 <param name="dpGapFactor" value="2.5"/>
 <param name="checkGrid" value="0"/>
-<param name="checkAngle" value="1"/>
+<param name="checkAngle" value="0"/>
 <param name="checkFont" value="1"/>
 <param name="checkRestrict" value="0"/>
 <param name="useDiameter" value="13"/>
@@ -2425,6 +2429,9 @@ design rules under a new name.</descript
 <autorouter>
 <pass name="Default">
 <param name="RoutingGrid" value="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"/>
@@ -2624,7 +2631,7 @@ design rules under a new name.</descript
 <wire x1="28.2575" y1="9.525" x2="28.575" y2="9.8425" width="0.2032" layer="1"/>
 <wire x1="28.575" y1="9.8425" x2="29.83" y2="9.8425" width="0.2032" layer="1"/>
 <wire x1="29.83" y1="9.8425" x2="29.845" y2="9.8575" width="0.2032" layer="1"/>
-<via x="31.115" y="10.95375" extent="1-16" drill="0.3048"/>
+<via x="31.035625" y="11.27125" extent="1-16" drill="0.3048"/>
 <via x="43.97375" y="10.95375" extent="1-16" drill="0.3048"/>
 <via x="43.97375" y="2.8575" extent="1-16" drill="0.3048"/>
 <wire x1="43.815" y1="10.985" x2="43.9425" y2="11.62" width="0.2032" layer="1"/>
@@ -2636,9 +2643,6 @@ design rules under a new name.</descript
 <wire x1="43.815" y1="2.985" x2="43.6875" y2="2.35" width="0.2032" layer="1"/>
 <wire x1="43.6875" y1="2.35" x2="43.4975" y2="2.54" width="0.2032" layer="1"/>
 <contactref element="LCD1" pad="6"/>
-<wire x1="29.845" y1="9.8575" x2="30.01875" y2="10.01625" width="0.2032" layer="1"/>
-<wire x1="30.01875" y1="10.01625" x2="30.48" y2="10.4775" width="0.2032" layer="1"/>
-<wire x1="30.48" y1="10.4775" x2="31.115" y2="10.95375" width="0.2032" layer="1"/>
 <wire x1="28.2575" y1="9.04" x2="28.2575" y2="9.525" width="0.2032" layer="1"/>
 <contactref element="C6" pad="2"/>
 <contactref element="C5" pad="2"/>
@@ -2681,6 +2685,8 @@ design rules under a new name.</descript
 <via x="8.89" y="11.985625" extent="1-16" drill="0.3048"/>
 <wire x1="8.954375" y1="10.00125" x2="8.954375" y2="11.92125" width="0.2032" layer="1"/>
 <wire x1="8.954375" y1="11.92125" x2="8.89" y2="11.985625" width="0.2032" layer="1"/>
+<wire x1="29.845" y1="9.8575" x2="31.035625" y2="11.048125" width="0.2032" layer="1"/>
+<wire x1="31.035625" y1="11.048125" x2="31.035625" y2="11.27125" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="C106" pad="1"/>
@@ -2793,8 +2799,8 @@ design rules under a new name.</descript
 <wire x1="2.3625" y1="7.385" x2="4.21" y2="7.385" width="0.2032" layer="1"/>
 <wire x1="4.21" y1="7.385" x2="4.445" y2="7.62" width="0.2032" layer="1"/>
 <via x="4.445" y="7.62" extent="1-16" drill="0.3048"/>
-<via x="10.16" y="5.715" extent="1-16" drill="0.3048"/>
-<wire x1="10.16" y1="5.715" x2="10.16" y2="7.46125" width="0.2032" layer="16"/>
+<via x="10.16" y="5.55625" extent="1-16" drill="0.3048"/>
+<wire x1="10.16" y1="5.55625" x2="10.16" y2="7.46125" width="0.2032" layer="16"/>
 <wire x1="10.16" y1="7.46125" x2="10.16" y2="8.255" width="0.2032" layer="16"/>
 <wire x1="20.0025" y1="8.810625" x2="19.764375" y2="9.04875" width="0.2032" layer="1"/>
 <wire x1="19.764375" y1="9.04875" x2="19.19375" y2="9.04875" width="0.2032" layer="1"/>
@@ -2810,8 +2816,8 @@ design rules under a new name.</descript
 <wire x1="8.35" y1="7.46125" x2="10.16" y2="7.46125" width="0.2032" layer="16"/>
 <wire x1="10.33375" y1="4.445" x2="12.7275" y2="4.445" width="0.2032" layer="1"/>
 <wire x1="12.7275" y1="4.445" x2="12.775625" y2="4.396875" width="0.2032" layer="1"/>
-<wire x1="10.33375" y1="4.445" x2="10.33375" y2="5.54125" width="0.2032" layer="1"/>
-<wire x1="10.33375" y1="5.54125" x2="10.16" y2="5.715" width="0.2032" layer="1"/>
+<wire x1="10.33375" y1="4.445" x2="10.33375" y2="5.3825" width="0.2032" layer="1"/>
+<wire x1="10.33375" y1="5.3825" x2="10.16" y2="5.55625" width="0.2032" layer="1"/>
 <wire x1="16.271875" y1="9.763125" x2="14.275625" y2="9.763125" width="0.2032" layer="1"/>
 <wire x1="10.33375" y1="9.763125" x2="10.254375" y2="10.00125" width="0.2032" layer="1"/>
 <wire x1="10.254375" y1="10.00125" x2="10.254375" y2="11.018125" width="0.2032" layer="1"/>
@@ -2888,44 +2894,47 @@ design rules under a new name.</descript
 </signal>
 <signal name="SW-B">
 <contactref element="SW101" pad="4"/>
-<via x="19.05" y="8.09625" extent="1-16" drill="0.3048"/>
+<via x="19.288125" y="8.41375" extent="1-16" drill="0.3048"/>
 <via x="35.2425" y="8.09625" extent="1-16" drill="0.3048"/>
 <contactref element="U$13" pad="31"/>
-<wire x1="19.05" y1="8.09625" x2="19.446875" y2="8.09625" width="0.2032" layer="16"/>
-<wire x1="19.446875" y1="8.09625" x2="19.685" y2="8.334375" width="0.2032" layer="16"/>
-<wire x1="19.685" y1="8.334375" x2="32.464375" y2="8.334375" width="0.2032" layer="16"/>
-<wire x1="16.875625" y1="7.996875" x2="18.950625" y2="7.996875" width="0.2032" layer="1"/>
-<wire x1="18.950625" y1="7.996875" x2="19.05" y2="8.09625" width="0.2032" layer="1"/>
+<wire x1="19.288125" y1="8.41375" x2="32.464375" y2="8.334375" width="0.2032" layer="16"/>
 <wire x1="36.286178125" y1="10.326078125" x2="35.2425" y2="9.2824" width="0.2032" layer="1"/>
 <wire x1="35.2425" y1="9.2824" x2="35.2425" y2="8.09625" width="0.2032" layer="1"/>
 <wire x1="32.464375" y1="8.334375" x2="33.17875" y2="7.62" width="0.2032" layer="16"/>
 <wire x1="33.17875" y1="7.62" x2="34.76625" y2="7.62" width="0.2032" layer="16"/>
 <wire x1="34.76625" y1="7.62" x2="35.2425" y2="8.09625" width="0.2032" layer="16"/>
+<wire x1="16.875625" y1="7.996875" x2="17.28375" y2="7.996875" width="0.2032" layer="1"/>
+<wire x1="17.28375" y1="7.996875" x2="17.4625" y2="8.09625" width="0.2032" layer="1"/>
+<wire x1="17.4625" y1="8.09625" x2="18.7325" y2="8.09625" width="0.2032" layer="1"/>
+<wire x1="18.7325" y1="8.09625" x2="19.05" y2="8.41375" width="0.2032" layer="1"/>
+<wire x1="19.05" y1="8.41375" x2="19.288125" y2="8.41375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-D">
 <contactref element="SW101" pad="6"/>
-<via x="18.494375" y="7.46125" extent="1-16" drill="0.3048"/>
+<via x="19.446875" y="7.699375" extent="1-16" drill="0.3048"/>
 <via x="36.98875" y="7.14375" extent="1-16" drill="0.3048"/>
 <contactref element="U$13" pad="30"/>
-<wire x1="18.494375" y1="7.46125" x2="19.3675" y2="7.46125" width="0.2032" layer="16"/>
-<wire x1="19.3675" y1="7.46125" x2="19.84375" y2="7.9375" width="0.2032" layer="16"/>
-<wire x1="19.84375" y1="7.9375" x2="32.305625" y2="7.9375" width="0.2032" layer="16"/>
+<wire x1="20.0025" y1="7.9375" x2="32.305625" y2="7.9375" width="0.2032" layer="16"/>
 <wire x1="16.875625" y1="7.496875" x2="18.45875" y2="7.496875" width="0.2032" layer="1"/>
-<wire x1="18.45875" y1="7.496875" x2="18.494375" y2="7.46125" width="0.2032" layer="1"/>
+<wire x1="18.45875" y1="7.496875" x2="19.446875" y2="7.699375" width="0.2032" layer="1"/>
 <wire x1="36.98875" y1="7.14375" x2="37.06365" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="37.06365" y1="7.14375" x2="38.266078125" y2="8.346178125" width="0.2032" layer="1"/>
 <wire x1="32.305625" y1="7.9375" x2="33.099375" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="33.099375" y1="7.14375" x2="36.98875" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="19.446875" y1="7.699375" x2="19.685" y2="7.62" width="0.2032" layer="16"/>
+<wire x1="19.685" y1="7.62" x2="18.811875" y2="7.699375" width="0.2032" layer="16"/>
+<wire x1="18.811875" y1="7.699375" x2="19.764375" y2="7.699375" width="0.2032" layer="16"/>
+<wire x1="19.764375" y1="7.699375" x2="20.0025" y2="7.9375" width="0.2032" layer="16"/>
 </signal>
 <signal name="D+">
 <contactref element="J101" pad="D+"/>
 <contactref element="RN1" pad="4"/>
 <wire x1="41.165" y1="6.985" x2="40.005" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="40.005" y1="6.985" x2="39.6875" y2="6.6675" width="0.2032" layer="1"/>
-<wire x1="39.6875" y1="6.6675" x2="39.6875" y2="2.8575" width="0.2032" layer="1"/>
-<wire x1="39.6875" y1="2.8575" x2="39.21125" y2="2.38125" width="0.2032" layer="1"/>
-<wire x1="39.21125" y1="2.38125" x2="22.225" y2="2.38125" width="0.2032" layer="1"/>
-<wire x1="22.225" y1="2.38125" x2="21.5075" y2="3.09875" width="0.2032" layer="1"/>
+<wire x1="39.6875" y1="6.6675" x2="39.6875" y2="2.778125" width="0.2032" layer="1"/>
+<wire x1="39.6875" y1="2.778125" x2="39.21125" y2="2.301875" width="0.2032" layer="1"/>
+<wire x1="39.21125" y1="2.301875" x2="22.304375" y2="2.301875" width="0.2032" layer="1"/>
+<wire x1="22.304375" y1="2.301875" x2="21.5075" y2="3.09875" width="0.2032" layer="1"/>
 <wire x1="21.5075" y1="3.09875" x2="20.1425" y2="3.09875" width="0.2032" layer="1"/>
 </signal>
 <signal name="D-">
@@ -2970,10 +2979,13 @@ design rules under a new name.</descript
 <contactref element="R102" pad="1"/>
 <via x="18.57375" y="8.73125" extent="1-16" drill="0.3048"/>
 <contactref element="U$13" pad="32"/>
-<wire x1="18.57375" y1="8.73125" x2="32.86125" y2="8.73125" width="0.2032" layer="16"/>
+<wire x1="18.57375" y1="8.73125" x2="18.89125" y2="9.04875" width="0.2032" layer="16"/>
+<wire x1="18.89125" y1="9.04875" x2="19.605625" y2="9.04875" width="0.2032" layer="16"/>
+<wire x1="19.605625" y1="9.04875" x2="19.84375" y2="8.810625" width="0.2032" layer="16"/>
+<wire x1="19.84375" y1="8.810625" x2="32.940625" y2="8.810625" width="0.2032" layer="16"/>
 <wire x1="16.875625" y1="8.496875" x2="18.339375" y2="8.496875" width="0.2032" layer="1"/>
 <wire x1="18.339375" y1="8.496875" x2="18.57375" y2="8.73125" width="0.2032" layer="1"/>
-<wire x1="32.86125" y1="8.73125" x2="33.655" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="32.940625" y1="8.810625" x2="33.655" y2="9.525" width="0.2032" layer="16"/>
 <wire x1="33.655" y1="9.525" x2="40.005" y2="9.525" width="0.2032" layer="16"/>
 <via x="40.005" y="9.525" extent="1-16" drill="0.3048"/>
 <wire x1="40.005" y1="9.525" x2="40.02" y2="10.4775" width="0.2032" layer="1"/>
@@ -3072,12 +3084,11 @@ design rules under a new name.</descript
 <wire x1="24.526875" y1="5.953125" x2="21.034375" y2="5.953125" width="0.2032" layer="16"/>
 <wire x1="21.034375" y1="5.953125" x2="19.84375" y2="4.7625" width="0.2032" layer="16"/>
 <wire x1="19.84375" y1="4.7625" x2="12.97560625" y2="4.7625" width="0.2032" layer="16"/>
-<wire x1="12.97560625" y1="4.7625" x2="11.191875" y2="6.54623125" width="0.2032" layer="16"/>
-<wire x1="11.191875" y1="6.54623125" x2="11.191875" y2="6.746875" width="0.2032" layer="16"/>
-<via x="11.27125" y="6.82625" extent="1-16" drill="0.3048"/>
-<wire x1="12.175625" y1="6.996875" x2="11.441875" y2="6.996875" width="0.2032" layer="1"/>
-<wire x1="11.441875" y1="6.996875" x2="11.27125" y2="6.82625" width="0.2032" layer="1"/>
-<wire x1="11.191875" y1="6.746875" x2="11.27125" y2="6.82625" width="0.2032" layer="16"/>
+<wire x1="12.97560625" y1="4.7625" x2="11.43" y2="6.38748125" width="0.2032" layer="16"/>
+<wire x1="11.43" y1="6.38748125" x2="11.43" y2="6.905625" width="0.2032" layer="16"/>
+<via x="11.43" y="6.905625" extent="1-16" drill="0.3048"/>
+<wire x1="12.175625" y1="6.996875" x2="11.52125" y2="6.996875" width="0.2032" layer="1"/>
+<wire x1="11.52125" y1="6.996875" x2="11.43" y2="6.905625" width="0.2032" layer="1"/>
 <wire x1="26.19375" y1="5.000625" x2="26.9875" y2="5.55625" width="0.2032" layer="16"/>
 <wire x1="26.9875" y1="5.55625" x2="26.9875" y2="5.715" width="0.2032" layer="16"/>
 </signal>
@@ -3092,10 +3103,10 @@ design rules under a new name.</descript
 <contactref element="U104" pad="5"/>
 <via x="24.13" y="5.23875" extent="1-16" drill="0.3048"/>
 <contactref element="U$13" pad="11"/>
-<wire x1="10.830625" y1="7.4175" x2="10.715625" y2="7.3025" width="0.2032" layer="1"/>
-<via x="10.715625" y="7.3025" extent="1-16" drill="0.3048"/>
-<wire x1="10.715625" y1="7.3025" x2="10.715625" y2="6.423484375" width="0.2032" layer="16"/>
-<wire x1="10.715625" y1="6.423484375" x2="12.852859375" y2="4.28625" width="0.2032" layer="16"/>
+<wire x1="10.830625" y1="7.4175" x2="10.795" y2="7.381875" width="0.2032" layer="1"/>
+<via x="10.795" y="7.381875" extent="1-16" drill="0.3048"/>
+<wire x1="10.795" y1="7.381875" x2="10.795" y2="6.344109375" width="0.2032" layer="16"/>
+<wire x1="10.795" y1="6.344109375" x2="12.852859375" y2="4.28625" width="0.2032" layer="16"/>
 <wire x1="12.852859375" y1="4.28625" x2="20.0025" y2="4.28625" width="0.2032" layer="16"/>
 <wire x1="12.175625" y1="7.496875" x2="10.795" y2="7.496875" width="0.2032" layer="1"/>
 <wire x1="10.795" y1="7.496875" x2="7.735" y2="7.496875" width="0.2032" layer="1"/>