diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -189,17 +189,16 @@
 <text x="26.51125" y="7.77875" size="0.8128" layer="22" ratio="16" rot="SMR180">+</text>
 <text x="33.81375" y="11.033125" size="0.8128" layer="22" ratio="16" rot="SMR180">Ethan Zonca 2014</text>
 <text x="43.33875" y="7.381875" size="0.8128" layer="22" ratio="16" rot="MR270">SWD</text>
-<text x="-1.27" y="12.7" size="0.8128" layer="1" ratio="16">LED placement?
+<text x="-1.27" y="12.7" size="0.8128" layer="21" ratio="16">LED placement?
 </text>
 <text x="-0.635" y="20.32" size="1.778" layer="21">Add slight corner bevel</text>
-<text x="1.27" y="15.24" size="1.778" layer="1">Change all drills to 12</text>
+<text x="1.27" y="15.24" size="1.778" layer="21">Change all drills to 12</text>
 <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">
@@ -2344,7 +2343,7 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <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 
+Die Standard-Design-Rules sind so gewählt, dass sie für 
 die meisten Anwendungen passen. Sollte ihre Platine 
 besondere Anforderungen haben, treffen Sie die erforderlichen
 Einstellungen hier und speichern die Design Rules unter 
@@ -2428,7 +2427,7 @@ design rules under a new name.</descript
 </designrules>
 <autorouter>
 <pass name="Default">
-<param name="RoutingGrid" value="5mil"/>
+<param name="RoutingGrid" value="12.5mil"/>
 <param name="AutoGrid" value="1"/>
 <param name="Efforts" value="0"/>
 <param name="TopRouterVariant" value="1"/>
@@ -2562,9 +2561,9 @@ design rules under a new name.</descript
 <attribute name="NAME" x="31.0134" y="12.6238" size="0.8128" layer="25" ratio="16"/>
 <attribute name="VALUE" x="32.3342" y="11.0744" size="0.4064" layer="27"/>
 </element>
-<element name="C107" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.43125" y="9.763125" smashed="yes" rot="R180">
-<attribute name="NAME" x="21.68525" y="11.445875" size="0.8128" layer="25" ratio="16" rot="R180"/>
-<attribute name="VALUE" x="22.51075" y="10.906125" size="0.4064" layer="27" rot="R180"/>
+<element name="C107" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.43125" y="9.8425" smashed="yes" rot="R180">
+<attribute name="NAME" x="21.68525" y="11.52525" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="22.51075" y="10.9855" size="0.4064" layer="27" rot="R180"/>
 </element>
 <element name="C110" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="4.1275" smashed="yes">
 <attribute name="NAME" x="23.241" y="4.191" size="0.8128" layer="25" ratio="16"/>
@@ -2592,7 +2591,7 @@ design rules under a new name.</descript
 </element>
 <element name="U$13" library="Protofusion" package="UFQFPN32" value="STM32F042K" x="14.525625" y="6.746875" rot="R270"/>
 <element name="C5" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.604375" y="10.00125" rot="R180"/>
-<element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="19.129375" y="9.763125"/>
+<element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="19.129375" y="9.8425"/>
 <element name="C7" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.68375" y="4.445" rot="R180"/>
 <element name="RA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="6.985" rot="R270"/>
 <element name="TP1" library="testpad" package="TP06R" value="TPTP06R" x="18.25625" y="4.445">
@@ -2624,10 +2623,10 @@ design rules under a new name.</descript
 <vertex x="46.99" y="15.875"/>
 <vertex x="-1.27" y="15.875"/>
 </polygon>
-<wire x1="21.59" y1="7.9676" x2="21.59" y2="9.271875" width="0.2032" layer="1"/>
-<wire x1="21.59" y1="9.271875" x2="22.08125" y2="9.763125" width="0.2032" layer="1"/>
-<via x="22.86" y="9.763125" extent="1-16" drill="0.3048"/>
-<wire x1="22.08125" y1="9.763125" x2="22.86" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="21.59" y1="7.9676" x2="21.59" y2="9.35125" width="0.2032" layer="1"/>
+<wire x1="21.59" y1="9.35125" x2="22.08125" y2="9.8425" width="0.2032" layer="1"/>
+<via x="22.86" y="9.8425" extent="1-16" drill="0.3048"/>
+<wire x1="22.08125" y1="9.8425" x2="22.86" y2="9.8425" width="0.2032" layer="1"/>
 <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"/>
@@ -2667,26 +2666,27 @@ design rules under a new name.</descript
 <wire x1="0.9525" y1="3.175" x2="1.27" y2="1.905" width="0.2032" layer="16"/>
 <via x="14.12875" y="6.746875" extent="1-16" drill="0.3048"/>
 <wire x1="14.12875" y1="6.746875" x2="14.525625" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="19.779375" y1="9.763125" x2="18.58875" y2="11.25625" width="0.2032" layer="1"/>
+<wire x1="19.779375" y1="9.8425" x2="18.58875" y2="11.25625" width="0.2032" layer="1"/>
 <wire x1="18.58875" y1="11.25625" x2="18.415" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="8.12625" x2="3.81" y2="8.12625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="8.12625" x2="5.08" y2="8.12625" width="0.2032" layer="16"/>
 <wire x1="22.24" y1="4.1275" x2="23.098125" y2="4.1275" width="0.2032" layer="1"/>
 <wire x1="23.098125" y1="4.1275" x2="23.33625" y2="4.365625" width="0.2032" layer="1"/>
 <via x="10.16" y="3.413125" extent="1-16" drill="0.3048"/>
 <via x="36.35375" y="8.255" extent="1-16" drill="0.3048"/>
 <wire x1="37.276128125" y1="9.336128125" x2="37.276128125" y2="9.177378125" width="0.2032" layer="1"/>
 <wire x1="37.276128125" y1="9.177378125" x2="36.35375" y2="8.255" width="0.2032" layer="1"/>
-<wire x1="39.9295" y1="11.7475" x2="41.11625" y2="11.7475" width="0.2032" layer="1"/>
-<via x="41.11625" y="11.7475" extent="1-16" drill="0.3048"/>
+<via x="41.195625" y="11.191875" extent="1-16" drill="0.3048"/>
 <wire x1="10.16" y1="3.413125" x2="9.286875" y2="3.413125" width="0.2032" layer="1"/>
 <wire x1="9.286875" y1="3.413125" x2="9.04875" y2="3.65125" width="0.2032" layer="1"/>
 <wire x1="9.04875" y1="3.65125" x2="9.04875" y2="4.43" width="0.2032" layer="1"/>
 <wire x1="9.04875" y1="4.43" x2="9.03375" y2="4.445" width="0.2032" layer="1"/>
-<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"/>
+<via x="8.89" y="12.065" extent="1-16" drill="0.3048"/>
+<wire x1="8.954375" y1="10.00125" x2="8.954375" y2="12.000625" width="0.2032" layer="1"/>
+<wire x1="8.954375" y1="12.000625" x2="8.89" y2="12.065" 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"/>
+<wire x1="39.9295" y1="11.7475" x2="40.64" y2="11.7475" width="0.2032" layer="1"/>
+<wire x1="40.64" y1="11.7475" x2="41.195625" y2="11.191875" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="C106" pad="1"/>
@@ -2767,21 +2767,21 @@ design rules under a new name.</descript
 <contactref element="C110" pad="1"/>
 <wire x1="22.5425" y1="5.3699" x2="22.54" y2="5.3674" width="0.2032" layer="1"/>
 <via x="10.16" y="11.1125" extent="1-16" drill="0.3048"/>
-<via x="4.445" y="8.73125" extent="1-16" drill="0.3048"/>
-<wire x1="4.445" y1="7.62" x2="4.58875" y2="7.47625" width="0.2032" layer="16"/>
+<via x="3.81" y="8.73125" extent="1-16" drill="0.3048"/>
+<wire x1="4.60375" y1="7.46125" x2="4.668125" y2="7.47625" width="0.2032" layer="16"/>
 <wire x1="22.5425" y1="5.3699" x2="22.5425" y2="6.35" width="0.2032" layer="1"/>
 <wire x1="22.5425" y1="6.35" x2="20.6375" y2="6.35" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="6.35" x2="20.0025" y2="6.985" width="0.2032" layer="1"/>
-<wire x1="20.0025" y1="6.985" x2="20.0025" y2="8.810625" width="0.2032" layer="1"/>
+<wire x1="20.0025" y1="6.985" x2="20.0025" y2="8.89" width="0.2032" layer="1"/>
 <wire x1="29.86" y1="8.5725" x2="29.845" y2="8.5575" width="0.2032" layer="1"/>
 <wire x1="10.115" y1="8.77625" x2="10.16" y2="8.255" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="5"/>
 <contactref element="LCD1" pad="7"/>
-<wire x1="4.58875" y1="7.47625" x2="8.335" y2="7.47625" width="0.2032" layer="16"/>
+<wire x1="4.668125" y1="7.47625" x2="8.335" y2="7.47625" width="0.2032" layer="16"/>
 <wire x1="8.335" y1="8.77625" x2="10.115" y2="8.77625" width="0.2032" layer="16"/>
 <wire x1="8.335" y1="7.47625" x2="8.35" y2="7.46125" width="0.2032" layer="16"/>
-<wire x1="4.445" y1="8.73125" x2="4.55875" y2="8.77625" width="0.2032" layer="16"/>
-<wire x1="4.55875" y1="8.77625" x2="8.335" y2="8.77625" width="0.2032" layer="16"/>
+<wire x1="3.81" y1="8.73125" x2="3.92375" y2="8.77625" width="0.2032" layer="16"/>
+<wire x1="3.92375" y1="8.77625" x2="8.335" y2="8.77625" width="0.2032" layer="16"/>
 <wire x1="22.5425" y1="6.35" x2="23.65375" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="23.65375" y1="7.46125" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="24.4475" y1="7.46125" x2="29.845" y2="7.46125" width="0.2032" layer="1"/>
@@ -2796,16 +2796,15 @@ design rules under a new name.</descript
 <contactref element="C7" pad="1"/>
 <contactref element="RA1" pad="C1B"/>
 <contactref element="RA1" pad="C2B"/>
-<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"/>
+<wire x1="2.3625" y1="7.385" x2="4.606875" y2="7.385" width="0.2032" layer="1"/>
+<wire x1="4.606875" y1="7.385" x2="4.60375" y2="7.46125" width="0.2032" layer="1"/>
+<via x="4.60375" y="7.46125" extent="1-16" drill="0.3048"/>
 <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"/>
-<wire x1="19.19375" y1="9.04875" x2="18.479375" y2="9.763125" width="0.2032" layer="1"/>
-<wire x1="18.479375" y1="9.763125" x2="16.271875" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="20.0025" y1="8.89" x2="19.764375" y2="9.128125" width="0.2032" layer="1"/>
+<wire x1="19.764375" y1="9.128125" x2="19.19375" y2="9.128125" width="0.2032" layer="1"/>
+<wire x1="19.19375" y1="9.128125" x2="18.479375" y2="9.8425" width="0.2032" layer="1"/>
 <wire x1="14.223125" y1="9.149375" x2="14.275625" y2="9.096875" width="0.2032" layer="1"/>
 <wire x1="16.275625" y1="9.096875" x2="16.275625" y2="9.759375" width="0.2032" layer="1"/>
 <wire x1="16.275625" y1="9.759375" x2="16.271875" y2="9.763125" width="0.2032" layer="1"/>
@@ -2818,7 +2817,8 @@ design rules under a new name.</descript
 <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.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="16.271875" y1="9.763125" x2="15.875" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="15.875" 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"/>
 <wire x1="10.254375" y1="11.018125" x2="10.16" y2="11.1125" width="0.2032" layer="1"/>
@@ -2827,8 +2827,10 @@ design rules under a new name.</descript
 <wire x1="14.275625" y1="10.330625" x2="13.6525" y2="10.95375" width="0.2032" layer="1"/>
 <wire x1="13.6525" y1="10.95375" x2="10.31875" y2="10.95375" width="0.2032" layer="1"/>
 <wire x1="10.31875" y1="10.95375" x2="10.16" y2="11.1125" width="0.2032" layer="1"/>
-<wire x1="2.3625" y1="8.185" x2="3.89875" y2="8.185" width="0.2032" layer="1"/>
-<wire x1="3.89875" y1="8.185" x2="4.445" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="2.3625" y1="8.185" x2="3.26375" y2="8.185" width="0.2032" layer="1"/>
+<wire x1="3.26375" y1="8.185" x2="3.81" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="18.479375" y1="9.8425" x2="18.4" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="18.4" y1="9.763125" x2="16.271875" y2="9.763125" width="0.2032" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="JP101" pad="P1"/>
@@ -2837,14 +2839,14 @@ design rules under a new name.</descript
 <contactref element="D101" pad="C"/>
 <contactref element="C107" pad="2"/>
 <wire x1="20.64" y1="7.9676" x2="20.64" y2="9.38375" width="0.2032" layer="1"/>
-<wire x1="20.64" y1="9.38375" x2="20.78125" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="20.64" y1="9.38375" x2="20.78125" y2="9.8425" width="0.2032" layer="1"/>
 <wire x1="22.54" y1="7.9676" x2="22.54" y2="7.14125" width="0.2032" layer="1"/>
 <wire x1="22.54" y1="7.14125" x2="22.38375" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="22.38375" y1="6.985" x2="20.79625" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="20.79625" y1="6.985" x2="20.6375" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="7.14375" x2="20.6375" y2="7.9701" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="7.9701" x2="20.64" y2="7.9676" width="0.2032" layer="1"/>
-<wire x1="20.78125" y1="9.763125" x2="20.78125" y2="10.93875" width="0.2032" layer="1"/>
+<wire x1="20.78125" y1="9.8425" x2="20.78125" y2="10.93875" width="0.2032" layer="1"/>
 <wire x1="20.78125" y1="10.93875" x2="21.2725" y2="11.43" width="0.2032" layer="1"/>
 <wire x1="30.48" y1="12.22375" x2="30.32125" y2="12.065" width="0.2032" layer="16"/>
 <wire x1="30.32125" y1="12.065" x2="30.32125" y2="10.4775" width="0.2032" layer="16"/>
@@ -2862,17 +2864,19 @@ design rules under a new name.</descript
 </signal>
 <signal name="SW-A">
 <contactref element="SW101" pad="1"/>
-<via x="19.129375" y="6.985" extent="1-16" drill="0.3048"/>
 <via x="31.75" y="7.14375" extent="1-16" drill="0.3048"/>
 <contactref element="U$13" pad="29"/>
-<wire x1="19.129375" y1="6.985" x2="19.605625" y2="6.985" width="0.2032" layer="16"/>
-<wire x1="19.605625" y1="6.985" x2="20.16125" y2="7.540625" width="0.2032" layer="16"/>
 <wire x1="20.16125" y1="7.540625" x2="31.353125" y2="7.540625" width="0.2032" layer="16"/>
-<wire x1="16.875625" y1="6.996875" x2="19.1175" y2="6.996875" width="0.2032" layer="1"/>
-<wire x1="19.1175" y1="6.996875" x2="19.129375" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="31.353125" y1="7.540625" x2="31.75" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="31.75" y1="7.14375" x2="31.75" y2="5.7899" width="0.2032" layer="1"/>
 <wire x1="31.75" y1="5.7899" x2="31.58391875" y2="5.62381875" width="0.2032" layer="1"/>
+<wire x1="20.16125" y1="7.540625" x2="19.84375" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="19.84375" y1="7.223125" x2="18.335625" y2="7.223125" width="0.2032" layer="16"/>
+<via x="18.335625" y="7.223125" extent="1-16" drill="0.3048"/>
+<wire x1="18.335625" y1="7.223125" x2="18.018125" y2="7.223125" width="0.2032" layer="1"/>
+<wire x1="18.018125" y1="7.223125" x2="17.78" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="16.875625" y1="6.996875" x2="17.768125" y2="6.996875" width="0.2032" layer="1"/>
+<wire x1="17.768125" y1="6.996875" x2="17.78" y2="6.985" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-C">
 <contactref element="SW101" pad="3"/>
@@ -2881,50 +2885,47 @@ design rules under a new name.</descript
 <wire x1="34.76625" y1="4.7625" x2="34.44875" y2="4.445" width="0.2032" layer="16"/>
 <wire x1="34.44875" y1="4.445" x2="33.02" y2="4.445" width="0.2032" layer="16"/>
 <wire x1="33.02" y1="4.445" x2="30.718125" y2="6.746875" width="0.2032" layer="16"/>
-<via x="19.05" y="5.87375" extent="1-16" drill="0.3048"/>
 <contactref element="U$13" pad="27"/>
-<wire x1="19.05" y1="5.87375" x2="19.605625" y2="5.87375" width="0.2032" layer="16"/>
 <wire x1="19.605625" y1="5.87375" x2="20.47875" y2="6.746875" width="0.2032" layer="16"/>
 <wire x1="20.47875" y1="6.746875" x2="30.718125" y2="6.746875" width="0.2032" layer="16"/>
-<wire x1="16.875625" y1="5.996875" x2="17.815625" y2="5.996875" width="0.2032" layer="1"/>
-<wire x1="17.815625" y1="5.996875" x2="17.93875" y2="5.87375" width="0.2032" layer="1"/>
-<wire x1="17.93875" y1="5.87375" x2="19.05" y2="5.87375" width="0.2032" layer="1"/>
 <wire x1="34.76625" y1="4.7625" x2="34.6824" y2="4.7625" width="0.2032" layer="1"/>
 <wire x1="34.6824" y1="4.7625" x2="33.56381875" y2="3.64391875" width="0.2032" layer="1"/>
+<wire x1="19.605625" y1="5.87375" x2="18.89125" y2="5.87375" width="0.2032" layer="16"/>
+<via x="18.89125" y="5.87375" extent="1-16" drill="0.3048"/>
+<wire x1="16.875625" y1="5.996875" x2="18.768125" y2="5.996875" width="0.2032" layer="1"/>
+<wire x1="18.768125" y1="5.996875" x2="18.89125" y2="5.87375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-B">
 <contactref element="SW101" pad="4"/>
-<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.288125" y1="8.41375" x2="32.464375" y2="8.334375" width="0.2032" layer="16"/>
+<wire x1="19.3675" y1="8.493125" x2="32.146875" 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"/>
+<wire x1="32.146875" y1="8.334375" x2="32.940625" y2="7.540625" width="0.2032" layer="16"/>
+<wire x1="32.940625" y1="7.540625" x2="34.686875" y2="7.540625" width="0.2032" layer="16"/>
+<wire x1="34.686875" y1="7.540625" x2="35.2425" y2="8.09625" width="0.2032" layer="16"/>
+<via x="19.3675" y="8.493125" extent="1-16" drill="0.3048"/>
+<wire x1="19.3675" y1="8.493125" x2="17.93875" y2="8.493125" width="0.2032" layer="1"/>
+<wire x1="17.93875" y1="8.493125" x2="17.4425" y2="7.996875" width="0.2032" layer="1"/>
+<wire x1="16.875625" y1="7.996875" x2="17.4425" y2="7.996875" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-D">
 <contactref element="SW101" pad="6"/>
-<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="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="19.446875" y2="7.699375" width="0.2032" layer="1"/>
+<wire x1="20.0025" y1="7.9375" x2="31.90875" y2="7.9375" width="0.2032" layer="16"/>
 <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="31.90875" y1="7.9375" x2="32.7025" y2="7.14375" width="0.2032" layer="16"/>
+<wire x1="32.7025" y1="7.14375" x2="36.98875" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="19.764375" y1="7.699375" x2="20.0025" y2="7.9375" width="0.2032" layer="16"/>
+<wire x1="19.764375" y1="7.699375" x2="18.970625" y2="7.699375" width="0.2032" layer="16"/>
+<wire x1="18.970625" y1="7.699375" x2="18.811875" y2="7.858125" width="0.2032" layer="16"/>
+<via x="18.811875" y="7.858125" extent="1-16" drill="0.3048"/>
+<wire x1="18.811875" y1="7.858125" x2="18.018125" y2="7.858125" width="0.2032" layer="1"/>
+<wire x1="18.018125" y1="7.858125" x2="17.656875" y2="7.496875" width="0.2032" layer="1"/>
+<wire x1="16.875625" y1="7.496875" x2="17.656875" y2="7.496875" width="0.2032" layer="1"/>
 </signal>
 <signal name="D+">
 <contactref element="J101" pad="D+"/>
@@ -2977,27 +2978,25 @@ design rules under a new name.</descript
 </signal>
 <signal name="LED_PWR">
 <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="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.940625" y1="8.810625" x2="33.655" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="19.52625" y1="9.128125" x2="19.764375" y2="8.89" width="0.2032" layer="16"/>
+<wire x1="19.764375" y1="8.89" x2="32.940625" y2="8.89" width="0.2032" layer="16"/>
+<wire x1="32.940625" y1="8.89" 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"/>
+<wire x1="19.52625" y1="9.128125" x2="17.62125" y2="9.128125" width="0.2032" layer="16"/>
+<via x="17.62125" y="9.128125" extent="1-16" drill="0.3048"/>
+<wire x1="17.62125" y1="9.128125" x2="17.145" y2="9.128125" width="0.2032" layer="1"/>
+<wire x1="17.145" y1="9.128125" x2="16.875625" y2="8.85875" width="0.2032" layer="1"/>
+<wire x1="16.875625" y1="8.85875" x2="16.875625" y2="8.496875" width="0.2032" layer="1"/>
 </signal>
 <signal name="!RES">
 <via x="5.715" y="5.87375" extent="1-16" drill="0.3048"/>
 <wire x1="8.32" y1="6.19125" x2="8.255" y2="6.19125" width="0.2032" layer="16"/>
-<wire x1="8.255" y1="6.19125" x2="6.985" y2="6.19125" width="0.2032" layer="16"/>
-<wire x1="6.985" y1="6.19125" x2="6.6675" y2="6.50875" width="0.2032" layer="16"/>
-<wire x1="6.6675" y1="6.50875" x2="5.87375" y2="6.50875" width="0.2032" layer="16"/>
-<wire x1="5.87375" y1="6.50875" x2="5.715" y2="6.35" width="0.2032" layer="16"/>
-<wire x1="5.715" y1="6.35" x2="5.715" y2="5.87375" width="0.2032" layer="16"/>
+<wire x1="8.255" y1="6.19125" x2="5.87375" y2="6.19125" width="0.2032" layer="16"/>
+<wire x1="5.87375" y1="6.19125" x2="5.715" y2="6.0325" width="0.2032" layer="16"/>
+<wire x1="5.715" y1="6.0325" x2="5.715" y2="5.87375" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="9"/>
 <wire x1="8.335" y1="6.17625" x2="8.27" y2="6.17625" width="0.2032" layer="16"/>
 <wire x1="8.27" y1="6.17625" x2="8.255" y2="6.19125" width="0.2032" layer="16"/>
@@ -3008,14 +3007,14 @@ design rules under a new name.</descript
 <wire x1="5.794375" y1="5.953125" x2="5.715" y2="5.87375" width="0.2032" layer="1"/>
 </signal>
 <signal name="D/!C">
-<via x="6.50875" y="5.87375" extent="1-16" drill="0.3048"/>
-<wire x1="6.85625" y1="5.52625" x2="6.50875" y2="5.87375" width="0.2032" layer="16"/>
+<via x="6.50875" y="5.55625" extent="1-16" drill="0.3048"/>
+<wire x1="6.53875" y1="5.52625" x2="6.50875" y2="5.55625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="10"/>
-<wire x1="8.335" y1="5.52625" x2="6.85625" y2="5.52625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="5.52625" x2="6.53875" y2="5.52625" width="0.2032" layer="16"/>
 <contactref element="U$13" pad="10"/>
 <wire x1="12.175625" y1="7.996875" x2="7.361875" y2="7.996875" width="0.2032" layer="1"/>
 <wire x1="7.361875" y1="7.996875" x2="6.50875" y2="7.14375" width="0.2032" layer="1"/>
-<wire x1="6.50875" y1="7.14375" x2="6.50875" y2="5.87375" width="0.2032" layer="1"/>
+<wire x1="6.50875" y1="7.14375" x2="6.50875" y2="5.55625" width="0.2032" layer="1"/>
 </signal>
 <signal name="T-">
 <contactref element="U104" pad="2"/>
@@ -3033,17 +3032,17 @@ design rules under a new name.</descript
 </signal>
 <signal name="SW-BTN">
 <contactref element="SW101" pad="2"/>
-<via x="18.494375" y="6.429375" extent="1-16" drill="0.3048"/>
 <wire x1="32.385" y1="5.715" x2="33.655" y2="5.715" width="0.2032" layer="16"/>
 <via x="33.655" y="5.715" extent="1-16" drill="0.3048"/>
 <contactref element="U$13" pad="28"/>
-<wire x1="18.494375" y1="6.429375" x2="19.605625" y2="6.429375" width="0.2032" layer="16"/>
-<wire x1="19.605625" y1="6.429375" x2="20.32" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="20.32" y1="7.14375" x2="30.95625" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="30.95625" y1="7.14375" x2="32.385" y2="5.715" width="0.2032" layer="16"/>
-<wire x1="16.875625" y1="6.496875" x2="18.426875" y2="6.496875" width="0.2032" layer="1"/>
-<wire x1="18.426875" y1="6.496875" x2="18.494375" y2="6.429375" width="0.2032" layer="1"/>
 <wire x1="33.655" y1="5.715" x2="32.57386875" y2="4.63386875" width="0.2032" layer="1"/>
+<wire x1="20.32" y1="7.14375" x2="19.764375" y2="6.588125" width="0.2032" layer="16"/>
+<wire x1="19.764375" y1="6.588125" x2="19.288125" y2="6.588125" width="0.2032" layer="16"/>
+<via x="19.288125" y="6.588125" extent="1-16" drill="0.3048"/>
+<wire x1="16.875625" y1="6.496875" x2="19.196875" y2="6.496875" width="0.2032" layer="1"/>
+<wire x1="19.196875" y1="6.496875" x2="19.288125" y2="6.588125" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="U$13" pad="22"/>
@@ -3060,18 +3059,16 @@ design rules under a new name.</descript
 <wire x1="16.11625" y1="2.29875" x2="18.5925" y2="2.29875" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MOSI">
-<via x="5.23875" y="4.28625" extent="1-16" drill="0.3048"/>
+<via x="6.50875" y="4.206875" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="12"/>
-<wire x1="8.335" y1="4.22625" x2="5.29875" y2="4.22625" width="0.2032" layer="16"/>
-<wire x1="5.29875" y1="4.22625" x2="5.23875" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="5.159375" y1="4.365625" x2="5.23875" y2="4.28625" width="0.2032" layer="1"/>
 <contactref element="U$13" pad="13"/>
-<wire x1="12.175625" y1="6.496875" x2="11.894375" y2="6.496875" width="0.2032" layer="1"/>
-<wire x1="11.894375" y1="6.496875" x2="11.58875" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="11.58875" y1="6.19125" x2="8.711875" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="8.711875" y1="6.19125" x2="6.746875" y2="4.22625" width="0.2032" layer="1"/>
-<wire x1="6.746875" y1="4.22625" x2="5.29875" y2="4.22625" width="0.2032" layer="1"/>
-<wire x1="5.29875" y1="4.22625" x2="5.23875" y2="4.28625" width="0.2032" layer="1"/>
+<wire x1="12.175625" y1="6.496875" x2="11.815" y2="6.496875" width="0.2032" layer="1"/>
+<wire x1="11.815" y1="6.496875" x2="11.509375" y2="6.19125" width="0.2032" layer="1"/>
+<wire x1="11.509375" y1="6.19125" x2="8.711875" y2="6.19125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="4.22625" x2="6.528125" y2="4.22625" width="0.2032" layer="16"/>
+<wire x1="6.528125" y1="4.22625" x2="6.50875" y2="4.206875" width="0.2032" layer="16"/>
+<wire x1="8.711875" y1="6.19125" x2="6.7275" y2="4.206875" width="0.2032" layer="1"/>
+<wire x1="6.7275" y1="4.206875" x2="6.50875" y2="4.206875" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MISO">
 <contactref element="U104" pad="7"/>
@@ -3093,13 +3090,8 @@ design rules under a new name.</descript
 <wire x1="26.9875" y1="5.55625" x2="26.9875" y2="5.715" width="0.2032" layer="16"/>
 </signal>
 <signal name="SPI_SCK">
-<via x="4.445" y="4.7625" extent="1-16" drill="0.3048"/>
-<wire x1="4.55875" y1="4.87625" x2="4.445" y2="4.7625" width="0.2032" layer="16"/>
+<via x="6.0325" y="4.92125" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="11"/>
-<wire x1="8.335" y1="4.87625" x2="5.91875" y2="4.87625" width="0.2032" layer="16"/>
-<wire x1="5.91875" y1="4.87625" x2="5.715" y2="5.08" width="0.2032" layer="16"/>
-<wire x1="5.715" y1="5.08" x2="4.7625" y2="5.08" width="0.2032" layer="16"/>
-<wire x1="4.7625" y1="5.08" x2="4.445" y2="4.7625" width="0.2032" layer="16"/>
 <contactref element="U104" pad="5"/>
 <via x="24.13" y="5.23875" extent="1-16" drill="0.3048"/>
 <contactref element="U$13" pad="11"/>
@@ -3109,12 +3101,12 @@ design rules under a new name.</descript
 <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"/>
-<wire x1="7.735" y1="7.496875" x2="7.223125" y2="6.985" width="0.2032" layer="1"/>
-<wire x1="7.223125" y1="6.985" x2="7.223125" y2="5.67" width="0.2032" layer="1"/>
-<wire x1="7.223125" y1="5.67" x2="6.429375" y2="4.87625" width="0.2032" layer="1"/>
-<wire x1="6.429375" y1="4.87625" x2="4.55875" y2="4.87625" width="0.2032" layer="1"/>
-<wire x1="4.55875" y1="4.87625" x2="4.445" y2="4.7625" width="0.2032" layer="1"/>
+<wire x1="10.795" y1="7.496875" x2="8.131875" y2="7.496875" width="0.2032" layer="1"/>
+<wire x1="8.131875" y1="7.496875" x2="7.62" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="7.62" y1="6.985" x2="7.62" y2="5.67" width="0.2032" layer="1"/>
+<wire x1="7.62" y1="5.67" x2="6.82625" y2="4.87625" width="0.2032" layer="1"/>
+<wire x1="6.82625" y1="4.87625" x2="5.9875" y2="4.87625" width="0.2032" layer="1"/>
+<wire x1="5.9875" y1="4.87625" x2="6.0325" y2="4.92125" width="0.2032" layer="1"/>
 <wire x1="10.830625" y1="7.4175" x2="10.830625" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="10.830625" y1="7.46125" x2="10.795" y2="7.496875" width="0.2032" layer="1"/>
 <wire x1="20.0025" y1="4.28625" x2="21.193125" y2="5.476875" width="0.2032" layer="16"/>
@@ -3122,29 +3114,33 @@ design rules under a new name.</descript
 <wire x1="24.4475" y1="3.64" x2="24.45875" y2="4.91" width="0.2032" layer="1"/>
 <wire x1="24.45875" y1="4.91" x2="24.13" y2="5.23875" width="0.2032" layer="1"/>
 <wire x1="23.891875" y1="5.476875" x2="24.13" y2="5.23875" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="4.87625" x2="6.14625" y2="4.87625" width="0.2032" layer="16"/>
+<wire x1="6.14625" y1="4.87625" x2="6.0325" y2="4.92125" width="0.2032" layer="16"/>
 </signal>
 <signal name="!CS_OLED">
 <contactref element="LCD1" pad="8"/>
-<via x="4.60375" y="6.82625" extent="1-16" drill="0.3048"/>
-<wire x1="4.60375" y1="6.82625" x2="4.683125" y2="6.905625" width="0.2032" layer="16"/>
-<wire x1="8.335" y1="6.82625" x2="4.60375" y2="6.82625" width="0.2032" layer="16"/>
+<via x="5.159375" y="6.82625" extent="1-16" drill="0.3048"/>
+<wire x1="8.335" y1="6.82625" x2="5.159375" y2="6.82625" width="0.2032" layer="16"/>
 <contactref element="U$13" pad="8"/>
 <wire x1="12.775625" y1="9.096875" x2="6.874375" y2="9.096875" width="0.2032" layer="1"/>
-<wire x1="6.874375" y1="9.096875" x2="4.60375" y2="6.82625" width="0.2032" layer="1"/>
+<wire x1="6.874375" y1="9.096875" x2="5.159375" y2="7.381875" width="0.2032" layer="1"/>
+<wire x1="5.159375" y1="7.381875" x2="5.159375" y2="6.82625" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_MAX">
 <contactref element="U104" pad="6"/>
 <contactref element="U$13" pad="25"/>
-<wire x1="16.875625" y1="4.996875" x2="17.77625" y2="4.996875" width="0.2032" layer="1"/>
-<wire x1="17.77625" y1="4.996875" x2="18.018125" y2="5.23875" width="0.2032" layer="1"/>
-<via x="18.018125" y="5.23875" extent="1-16" drill="0.3048"/>
-<wire x1="18.018125" y1="5.23875" x2="19.52625" y2="5.23875" width="0.2032" layer="16"/>
 <wire x1="19.52625" y1="5.23875" x2="20.6375" y2="6.35" width="0.2032" layer="16"/>
 <wire x1="20.6375" y1="6.35" x2="24.765" y2="6.35" width="0.2032" layer="16"/>
 <wire x1="24.765" y1="6.35" x2="24.844375" y2="6.270625" width="0.2032" layer="16"/>
 <wire x1="24.844375" y1="6.270625" x2="25.7175" y2="5.794375" width="0.2032" layer="16"/>
 <via x="25.7175" y="5.794375" extent="1-16" drill="0.3048"/>
 <wire x1="25.7175" y1="5.794375" x2="25.7175" y2="3.64" width="0.2032" layer="1"/>
+<wire x1="19.52625" y1="5.23875" x2="18.176875" y2="5.23875" width="0.2032" layer="16"/>
+<wire x1="18.176875" y1="5.23875" x2="18.018125" y2="5.3975" width="0.2032" layer="16"/>
+<via x="18.018125" y="5.3975" extent="1-16" drill="0.3048"/>
+<wire x1="18.018125" y1="5.3975" x2="17.62125" y2="5.000625" width="0.2032" layer="1"/>
+<wire x1="17.62125" y1="5.000625" x2="16.879375" y2="5.000625" width="0.2032" layer="1"/>
+<wire x1="16.879375" y1="5.000625" x2="16.875625" y2="4.996875" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$13" pad="24"/>