diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -6,13 +6,13 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="yes" altdistance="12.5" altunitdist="mil" altunit="mil"/>
+<grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="no" altdistance="12.5" altunitdist="mil" altunit="mil"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
-<layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
+<layer number="19" name="Unrouted" color="6" fill="1" visible="no" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
@@ -44,8 +44,8 @@
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
@@ -129,7 +129,7 @@
 <layer number="206" name="206bmp" color="7" fill="10" visible="no" active="yes"/>
 <layer number="207" name="207bmp" color="8" fill="10" visible="no" active="yes"/>
 <layer number="208" name="208bmp" color="9" fill="10" visible="no" active="yes"/>
-<layer number="209" name="209bmp" color="7" fill="1" visible="no" active="yes"/>
+<layer number="209" name="209bmp" color="14" fill="1" visible="yes" active="yes"/>
 <layer number="210" name="210bmp" color="7" fill="1" visible="no" active="yes"/>
 <layer number="211" name="211bmp" color="7" fill="1" visible="no" active="yes"/>
 <layer number="212" name="212bmp" color="7" fill="1" visible="no" active="yes"/>
@@ -154,10 +154,12 @@
 </layers>
 <board>
 <plain>
-<wire x1="0" y1="0" x2="45.39" y2="0" width="0" layer="20"/>
-<wire x1="45.39" y1="0" x2="45.39" y2="12.69" width="0" layer="20"/>
-<wire x1="45.39" y1="12.69" x2="0" y2="12.69" width="0" layer="20"/>
-<wire x1="0" y1="12.69" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="0" x2="45.3898" y2="0" width="0" layer="20"/>
+<wire x1="45.3898" y1="0" x2="45.3898" y2="12.6746" width="0" layer="20"/>
+<wire x1="45.3898" y1="12.6746" x2="0" y2="12.6746" width="0" layer="20"/>
+<wire x1="0" y1="12.6746" x2="0" y2="0" width="0" layer="20"/>
+<dimension x1="0" y1="0" x2="45.4025" y2="-0.9525" x3="22.70125" y3="19.05" textsize="1.778" layer="209" dtype="horizontal" unit="inch" precision="6" visible="yes"/>
+<dimension x1="46.6598" y1="0" x2="45.3898" y2="12.6746" x3="-8.255" y3="6.3373" textsize="1.778" layer="209" dtype="vertical" unit="inch" precision="6" visible="yes"/>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -700,7 +702,7 @@ chip</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="Fusion_eagle_rule_v1.1">
+<designrules name="Fusion_eagle_rule_v1.1 *">
 <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 
@@ -720,7 +722,7 @@ design rules under a new name.</descript
 <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="6mil"/>
+<param name="mdWireWire" value="8mil"/>
 <param name="mdWirePad" value="6mil"/>
 <param name="mdWireVia" value="6mil"/>
 <param name="mdPadPad" value="6mil"/>
@@ -734,7 +736,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="6mil"/>
+<param name="msWidth" value="8mil"/>
 <param name="msDrill" value="12mil"/>
 <param name="msMicroVia" value="12mil"/>
 <param name="msBlindViaRatio" value="0.5"/>
@@ -882,14 +884,14 @@ design rules under a new name.</descript
 <element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="UG-2832HSWEG04" x="0.635" y="6.35" rot="R180"/>
 <element name="C1" library="microbuilder" package="0402" value="1.0uF" x="1.905" y="11.43"/>
 <element name="C2" library="microbuilder" package="0402" value="1.0uF" x="1.905" y="10.16"/>
-<element name="R1" library="microbuilder" package="0402" value="390K" x="1.905" y="8.255"/>
+<element name="R1" library="microbuilder" package="0402" value="390K" x="1.905" y="6.0325"/>
 <element name="SW1" library="dp_devices" package="JOYSTICK_SF303GJ26-3" value="JOYSTICK_SF303GJ26-3" x="34.925" y="6.35" rot="R90"/>
 <element name="JP2" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="44.1325" y="6.35" rot="R90">
 <attribute name="PROD_ID" value="CONN-09505" x="78.4225" y="34.29" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
 <element name="IC1" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="26.3525" y="6.35" rot="R180"/>
-<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="" x="21.2725" y="6.6675" rot="R180">
-<attribute name="PROD_ID" value="VREG-00822" x="-14.2875" y="39.6875" size="1.778" layer="27" rot="R180" display="off"/>
+<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="" x="21.59" y="6.6675" rot="R180">
+<attribute name="PROD_ID" value="VREG-00822" x="-13.97" y="39.6875" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
 <element name="U$1" library="Protofusion" package="UFQFPN48" value="STM32L100C6U6" x="11.43" y="5.08" rot="R270"/>
 <element name="LED1" library="SparkFun-LED" package="LED-0603" value="" x="39.37" y="10.16" rot="R180"/>
@@ -898,22 +900,22 @@ design rules under a new name.</descript
 <element name="JP3" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="15.875" y="11.43" rot="MR180"/>
 <element name="JP4" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="26.67" y="11.43" rot="MR180"/>
 <element name="D1" library="SparkFun-DiscreteSemi" package="SOD523" value="" x="41.275" y="1.5875"/>
-<element name="R2" library="SparkFun-Passives" package="0402-RES" value="" x="20.955" y="3.81"/>
-<element name="R3" library="SparkFun-Passives" package="0402-RES" value="" x="20.955" y="2.54"/>
+<element name="R2" library="SparkFun-Passives" package="0402-RES" value="" x="20.955" y="2.54"/>
+<element name="R3" library="SparkFun-Passives" package="0402-RES" value="" x="20.955" y="1.27"/>
 <element name="C7" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="17.145" y="2.54"/>
-<element name="C8" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="6.985" y="11.43"/>
+<element name="C8" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="5.715" y="11.1125" rot="R90"/>
 <element name="C9" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="16.8275" y="9.2075" rot="R180"/>
-<element name="C10" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="4.7625" y="3.4925" rot="R90"/>
-<element name="C11" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="20.955" y="9.525" rot="R180"/>
-<element name="C12" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="1.905" y="6.6675" rot="R180"/>
+<element name="C10" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="1.905" y="0.9525"/>
+<element name="C11" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="9.525" rot="R180"/>
+<element name="C12" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="20.955" y="3.81" rot="R180"/>
 <element name="R4" library="SparkFun-Passives" package="0402-RES" value="" x="34.925" y="11.43"/>
 <element name="R5" library="SparkFun-Passives" package="0402-RES" value="" x="34.925" y="1.27"/>
-<element name="C13" library="SparkFun-Passives" package="0402-CAP" value="22pf" x="9.2075" y="10.795" rot="R270"/>
-<element name="C14" library="SparkFun-Passives" package="0402-CAP" value="22pf" x="13.97" y="10.795" rot="R90"/>
-<element name="Y2" library="microbuilder" package="CRYSTAL_2.5X2" value="" x="11.43" y="10.795"/>
+<element name="C13" library="SparkFun-Passives" package="0402-CAP" value="22pf" x="8.89" y="11.43"/>
+<element name="C14" library="SparkFun-Passives" package="0402-CAP" value="22pf" x="14.2875" y="10.795" rot="R90"/>
+<element name="Y2" library="microbuilder" package="CRYSTAL_2.5X2" value="" x="12.065" y="10.795"/>
 <element name="C15" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="29.845" y="9.2075" rot="R270"/>
-<element name="U$14" library="Protofusion" package="POGOPROG-CONN-OH-SMALLERVIAS" value="POGOPIN-CONNWITHVIAS-SMV" x="26.67" y="1.27" rot="MR90"/>
-<element name="U$15" library="Protofusion" package="0603-ARV-4" value="2.2uF" x="1.905" y="3.81" rot="R270"/>
+<element name="U$14" library="Protofusion" package="POGOPROG-CONN-OH-SMALLERVIAS" value="POGOPIN-CONNWITHVIAS-SMV" x="27.94" y="1.27" rot="MR90"/>
+<element name="U$15" library="Protofusion" package="0603-ARV-4" value="2.2uF" x="1.905" y="3.4925" rot="R270"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -921,7 +923,6 @@ design rules under a new name.</descript
 <contactref element="R1" pad="1"/>
 <contactref element="JP1" pad="P1"/>
 <contactref element="U2" pad="2"/>
-<contactref element="SW1" pad="2"/>
 <contactref element="SW1" pad="5"/>
 <contactref element="JP2" pad="GND"/>
 <contactref element="JP2" pad="MT1"/>
@@ -951,202 +952,75 @@ design rules under a new name.</descript
 <contactref element="U$15" pad="6"/>
 <contactref element="U$15" pad="7"/>
 <contactref element="U$15" pad="8"/>
-<wire x1="41.275" y1="3.302" x2="39.37" y2="3.302" width="0.1524" layer="1"/>
-<wire x1="41.275" y1="1.27" x2="41.275" y2="3.302" width="0.1524" layer="1"/>
-<wire x1="41.529" y1="1.016" x2="41.275" y2="1.27" width="0.1524" layer="1"/>
-<wire x1="44.069" y1="1.016" x2="41.529" y2="1.016" width="0.1524" layer="1"/>
-<wire x1="44.069" y1="2.286" x2="44.069" y2="1.016" width="0.1524" layer="1"/>
-<wire x1="39.37" y1="3.302" x2="39.37" y2="3.417" width="0.1524" layer="1"/>
-<wire x1="44.069" y1="2.286" x2="44.1325" y2="2.35" width="0.1524" layer="1"/>
-<wire x1="41.402" y1="9.271" x2="39.37" y2="9.271" width="0.1524" layer="1"/>
-<wire x1="41.402" y1="7.747" x2="41.402" y2="9.271" width="0.1524" layer="1"/>
-<wire x1="39.37" y1="9.271" x2="39.37" y2="9.283" width="0.1524" layer="1"/>
-<wire x1="41.402" y1="7.747" x2="41.4825" y2="7.65" width="0.1524" layer="1"/>
-<wire x1="41.402" y1="10.287" x2="42.926" y2="10.287" width="0.1524" layer="1"/>
-<wire x1="42.926" y1="10.287" x2="44.069" y2="10.287" width="0.1524" layer="1"/>
-<wire x1="41.402" y1="9.271" x2="41.402" y2="10.287" width="0.1524" layer="1"/>
-<wire x1="44.069" y1="10.287" x2="44.1325" y2="10.35" width="0.1524" layer="1"/>
-<wire x1="42.926" y1="3.556" x2="44.069" y2="2.413" width="0.1524" layer="1"/>
-<wire x1="42.926" y1="10.287" x2="42.926" y2="3.556" width="0.1524" layer="1"/>
-<wire x1="44.069" y1="2.413" x2="44.1325" y2="2.35" width="0.1524" layer="1"/>
-<wire x1="34.925" y1="9.675" x2="34.925" y2="5.588" width="0.1524" layer="1"/>
-<wire x1="34.925" y1="5.588" x2="34.925" y2="3.025" width="0.1524" layer="1"/>
-<wire x1="29.21" y1="1.27" x2="27.94" y2="1.27" width="0.1524" layer="16"/>
-<wire x1="28.321" y1="9.779" x2="29.083" y2="9.779" width="0.1524" layer="1"/>
-<wire x1="29.083" y1="9.779" x2="29.845" y2="9.779" width="0.1524" layer="1"/>
-<wire x1="28.321" y1="9.144" x2="28.321" y2="9.779" width="0.1524" layer="1"/>
-<wire x1="28.321" y1="9.144" x2="28.2575" y2="9.04" width="0.1524" layer="1"/>
-<wire x1="29.083" y1="1.397" x2="29.21" y2="1.27" width="0.1524" layer="1"/>
-<wire x1="29.083" y1="9.779" x2="29.083" y2="1.397" width="0.1524" layer="1"/>
-<wire x1="32.004" y1="5.588" x2="34.925" y2="5.588" width="0.1524" layer="1"/>
-<wire x1="32.004" y1="7.62" x2="32.004" y2="5.588" width="0.1524" layer="1"/>
-<wire x1="29.845" y1="9.779" x2="32.004" y2="7.62" width="0.1524" layer="1"/>
-<wire x1="29.845" y1="9.779" x2="29.845" y2="9.8575" width="0.1524" layer="1"/>
-<wire x1="39.497" y1="12.192" x2="41.402" y2="10.287" width="0.1524" layer="1"/>
-<wire x1="34.925" y1="12.192" x2="39.497" y2="12.192" width="0.1524" layer="1"/>
-<wire x1="34.925" y1="9.675" x2="34.925" y2="12.192" width="0.1524" layer="1"/>
-<wire x1="21.336" y1="9.271" x2="21.59" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="21.336" y1="8.001" x2="21.336" y2="9.271" width="0.1524" layer="1"/>
-<wire x1="21.59" y1="9.525" x2="21.605" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="21.336" y1="8.001" x2="21.2725" y2="7.9676" width="0.1524" layer="1"/>
-<wire x1="23.622" y1="11.43" x2="21.717" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="23.8125" y1="11.43" x2="23.622" y2="11.43" width="0.1524" layer="1"/>
-<wire x1="21.717" y1="9.525" x2="21.605" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="18.415" y1="10.16" x2="17.78" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="17.78" y1="9.525" x2="17.526" y2="9.271" width="0.1524" layer="1"/>
-<wire x1="18.415" y1="11.43" x2="18.415" y2="10.287" width="0.1524" layer="1"/>
-<wire x1="18.415" y1="10.287" x2="18.415" y2="10.16" width="0.1524" layer="1"/>
-<wire x1="17.526" y1="9.271" x2="17.4775" y2="9.2075" width="0.1524" layer="1"/>
-<wire x1="17.78" y1="9.525" x2="17.78" y2="7.493" width="0.1524" layer="1"/>
-<wire x1="17.78" y1="7.493" x2="17.78" y2="2.54" width="0.1524" layer="1"/>
-<wire x1="17.78" y1="2.54" x2="17.795" y2="2.54" width="0.1524" layer="1"/>
-<wire x1="17.78" y1="9.525" x2="17.4775" y2="9.2075" width="0.1524" layer="1"/>
-<wire x1="15.494" y1="10.16" x2="13.97" y2="10.16" width="0.1524" layer="1"/>
-<wire x1="15.621" y1="10.287" x2="15.494" y2="10.16" width="0.1524" layer="1"/>
-<wire x1="18.415" y1="10.287" x2="15.621" y2="10.287" width="0.1524" layer="1"/>
-<wire x1="13.97" y1="10.16" x2="13.97" y2="10.145" width="0.1524" layer="1"/>
-<wire x1="22.733" y1="10.414" x2="23.749" y2="11.43" width="0.1524" layer="16"/>
-<wire x1="19.431" y1="10.414" x2="22.733" y2="10.414" width="0.1524" layer="16"/>
-<wire x1="18.415" y1="11.43" x2="19.431" y2="10.414" width="0.1524" layer="16"/>
-<wire x1="23.749" y1="11.43" x2="23.8125" y2="11.43" width="0.1524" layer="16"/>
-<wire x1="1.27" y1="8.255" x2="1.27" y2="6.731" width="0.1524" layer="1"/>
-<wire x1="1.27" y1="6.731" x2="1.255" y2="6.6675" width="0.1524" layer="1"/>
-<wire x1="1.27" y1="8.255" x2="1.255" y2="8.255" width="0.1524" layer="1"/>
-<wire x1="1.016" y1="3.302" x2="1.016" y2="2.667" width="0.1524" layer="1"/>
-<wire x1="1.016" y1="2.667" x2="1.06045" y2="2.6289" width="0.1524" layer="1"/>
-<wire x1="1.016" y1="3.302" x2="1.06045" y2="3.4163" width="0.1524" layer="1"/>
-<wire x1="1.016" y1="4.953" x2="1.016" y2="4.318" width="0.1524" layer="1"/>
-<wire x1="1.016" y1="4.318" x2="1.06045" y2="4.2037" width="0.1524" layer="1"/>
-<wire x1="1.016" y1="4.953" x2="1.06045" y2="4.9911" width="0.1524" layer="1"/>
-<wire x1="1.016" y1="4.191" x2="1.016" y2="3.429" width="0.1524" layer="1"/>
-<wire x1="1.016" y1="3.429" x2="1.06045" y2="3.4163" width="0.1524" layer="1"/>
-<wire x1="1.016" y1="4.191" x2="1.06045" y2="4.2037" width="0.1524" layer="1"/>
-<wire x1="1.143" y1="5.08" x2="1.143" y2="6.604" width="0.1524" layer="1"/>
-<wire x1="1.143" y1="6.604" x2="1.255" y2="6.6675" width="0.1524" layer="1"/>
-<wire x1="1.143" y1="5.08" x2="1.06045" y2="4.9911" width="0.1524" layer="1"/>
-<wire x1="4.826" y1="3.048" x2="7.62" y2="3.048" width="0.1524" layer="1"/>
-<wire x1="4.826" y1="2.921" x2="4.826" y2="3.048" width="0.1524" layer="1"/>
-<wire x1="7.62" y1="3.048" x2="7.73" y2="3.08" width="0.1524" layer="1"/>
-<wire x1="4.826" y1="2.921" x2="4.7625" y2="2.8425" width="0.1524" layer="1"/>
-<wire x1="9.144" y1="11.43" x2="7.635" y2="11.43" width="0.1524" layer="1"/>
-<wire x1="9.144" y1="11.43" x2="9.2075" y2="11.445" width="0.1524" layer="1"/>
-<wire x1="13.335" y1="3.175" x2="13.335" y2="1.905" width="0.1524" layer="1"/>
-<wire x1="11.18" y1="5.33" x2="13.335" y2="3.175" width="0.1524" layer="1"/>
-<wire x1="13.335" y1="1.905" x2="13.43" y2="1.88" width="0.1524" layer="1"/>
-<wire x1="11.303" y1="5.969" x2="14.097" y2="5.969" width="0.1524" layer="1"/>
-<wire x1="14.097" y1="5.969" x2="14.605" y2="5.969" width="0.1524" layer="1"/>
-<wire x1="11.303" y1="5.334" x2="11.303" y2="5.969" width="0.1524" layer="1"/>
-<wire x1="14.605" y1="5.969" x2="14.63" y2="6.08" width="0.1524" layer="1"/>
-<wire x1="11.303" y1="5.334" x2="11.18" y2="5.33" width="0.1524" layer="1"/>
-<wire x1="14.097" y1="7.493" x2="14.605" y2="7.493" width="0.1524" layer="1"/>
-<wire x1="14.097" y1="5.969" x2="14.097" y2="7.493" width="0.1524" layer="1"/>
-<wire x1="14.605" y1="7.493" x2="14.63" y2="7.58" width="0.1524" layer="1"/>
-<wire x1="10.541" y1="6.731" x2="10.541" y2="8.763" width="0.1524" layer="1"/>
-<wire x1="11.303" y1="5.969" x2="10.541" y2="6.731" width="0.1524" layer="1"/>
-<wire x1="10.541" y1="8.763" x2="10.43" y2="8.78" width="0.1524" layer="1"/>
-<wire x1="11.303" y1="5.969" x2="11.18" y2="5.33" width="0.1524" layer="1"/>
-<wire x1="9.906" y1="10.795" x2="9.271" y2="11.43" width="0.1524" layer="1"/>
-<wire x1="9.906" y1="9.652" x2="9.906" y2="10.795" width="0.1524" layer="1"/>
-<wire x1="10.414" y1="9.144" x2="9.906" y2="9.652" width="0.1524" layer="1"/>
-<wire x1="10.414" y1="8.89" x2="10.414" y2="9.144" width="0.1524" layer="1"/>
-<wire x1="9.271" y1="11.43" x2="9.2075" y2="11.445" width="0.1524" layer="1"/>
-<wire x1="10.414" y1="8.89" x2="10.43" y2="8.78" width="0.1524" layer="1"/>
-<wire x1="11.176" y1="3.175" x2="7.747" y2="3.175" width="0.1524" layer="1"/>
-<wire x1="11.176" y1="5.207" x2="11.176" y2="3.175" width="0.1524" layer="1"/>
-<wire x1="7.747" y1="3.175" x2="7.73" y2="3.08" width="0.1524" layer="1"/>
-<wire x1="11.176" y1="5.207" x2="11.18" y2="5.33" width="0.1524" layer="1"/>
-<wire x1="15.494" y1="7.62" x2="8.382" y2="7.62" width="0.1524" layer="16"/>
-<wire x1="14.732" y1="7.62" x2="15.494" y2="7.62" width="0.1524" layer="1"/>
-<wire x1="8.382" y1="7.62" x2="8.335" y2="7.65" width="0.1524" layer="16"/>
-<wire x1="14.732" y1="7.62" x2="14.63" y2="7.58" width="0.1524" layer="1"/>
-<wire x1="1.397" y1="2.286" x2="1.143" y2="2.54" width="0.1524" layer="1"/>
-<wire x1="1.397" y1="1.905" x2="1.397" y2="2.286" width="0.1524" layer="1"/>
-<wire x1="1.651" y1="2.159" x2="1.397" y2="1.905" width="0.1524" layer="16"/>
-<wire x1="3.937" y1="2.159" x2="1.651" y2="2.159" width="0.1524" layer="16"/>
-<wire x1="4.699" y1="2.921" x2="3.937" y2="2.159" width="0.1524" layer="1"/>
-<wire x1="1.143" y1="2.54" x2="1.06045" y2="2.6289" width="0.1524" layer="1"/>
-<wire x1="4.699" y1="2.921" x2="4.7625" y2="2.8425" width="0.1524" layer="1"/>
-<wire x1="15.494" y1="7.493" x2="17.78" y2="7.493" width="0.1524" layer="1"/>
-<wire x1="15.494" y1="7.62" x2="15.494" y2="7.493" width="0.1524" layer="1"/>
-<wire x1="27.813" y1="10.287" x2="28.321" y2="9.779" width="0.1524" layer="1"/>
-<wire x1="27.686" y1="10.414" x2="27.813" y2="10.287" width="0.1524" layer="16"/>
-<wire x1="22.733" y1="10.414" x2="27.686" y2="10.414" width="0.1524" layer="16"/>
-<wire x1="28.321" y1="9.779" x2="28.2575" y2="9.04" width="0.1524" layer="1"/>
-<via x="15.494" y="7.62" extent="1-16" drill="0.3048"/>
-<via x="1.397" y="1.905" extent="1-16" drill="0.3048"/>
-<via x="3.937" y="2.159" extent="1-16" drill="0.3048"/>
-<via x="27.813" y="10.287" extent="1-16" drill="0.3048"/>
+<polygon width="0.254" layer="16">
+<vertex x="-1.27" y="-1.905"/>
+<vertex x="46.99" y="-1.905"/>
+<vertex x="46.99" y="15.875"/>
+<vertex x="-1.27" y="15.875"/>
+</polygon>
+<wire x1="41.4825" y1="7.65" x2="44.1325" y2="10.35" width="0" layer="19" extent="1-1"/>
+<wire x1="39.37" y1="9.283" x2="41.4825" y2="7.65" width="0" layer="19" extent="1-1"/>
+<wire x1="34.925" y1="9.675" x2="39.37" y2="9.283" width="0" layer="19" extent="1-1"/>
+<wire x1="39.37" y1="3.417" x2="41.4825" y2="7.65" width="0" layer="19" extent="1-1"/>
+<wire x1="44.1325" y1="2.35" x2="39.37" y2="3.417" width="0" layer="19" extent="1-1"/>
+<wire x1="29.845" y1="9.8575" x2="34.925" y2="9.675" width="0" layer="19" extent="1-1"/>
+<wire x1="28.2575" y1="9.04" x2="29.845" y2="9.8575" width="0" layer="19" extent="1-1"/>
+<wire x1="23.8125" y1="11.43" x2="28.2575" y2="9.04" width="0" layer="19" extent="1-1"/>
+<wire x1="10.43" y1="8.78" x2="8.335" y2="7.65" width="0" layer="19" extent="1-16"/>
+<wire x1="17.4775" y1="9.2075" x2="18.415" y2="11.43" width="0" layer="19" extent="1-1"/>
+<wire x1="22.24" y1="9.525" x2="23.8125" y2="11.43" width="0" layer="19" extent="1-1"/>
+<wire x1="21.59" y1="7.9676" x2="22.24" y2="9.525" width="0" layer="19" extent="1-1"/>
+<wire x1="14.63" y1="7.58" x2="17.4775" y2="9.2075" width="0" layer="19" extent="1-1"/>
+<wire x1="14.63" y1="6.08" x2="14.63" y2="7.58" width="0" layer="19" extent="1-1"/>
+<wire x1="14.2875" y1="10.145" x2="14.63" y2="7.58" width="0" layer="19" extent="1-1"/>
+<wire x1="8.24" y1="11.43" x2="10.43" y2="8.78" width="0" layer="19" extent="1-1"/>
+<wire x1="5.715" y1="11.7625" x2="8.24" y2="11.43" width="0" layer="19" extent="1-1"/>
+<wire x1="11.18" y1="5.33" x2="10.43" y2="8.78" width="0" layer="19" extent="1-1"/>
+<wire x1="13.43" y1="1.88" x2="11.18" y2="5.33" width="0" layer="19" extent="1-1"/>
+<wire x1="7.73" y1="3.08" x2="11.18" y2="5.33" width="0" layer="19" extent="1-1"/>
+<wire x1="20.305" y1="3.81" x2="21.59" y2="7.9676" width="0" layer="19" extent="1-1"/>
+<wire x1="17.795" y1="2.54" x2="20.305" y2="3.81" width="0" layer="19" extent="1-1"/>
+<wire x1="1.06045" y1="3.0988" x2="7.73" y2="3.08" width="0" layer="19" extent="1-1"/>
+<wire x1="1.06045" y1="3.8862" x2="1.06045" y2="3.0988" width="0" layer="19" extent="1-1"/>
+<wire x1="1.06045" y1="4.6736" x2="1.06045" y2="3.8862" width="0" layer="19" extent="1-1"/>
+<wire x1="1.06045" y1="2.3114" x2="1.06045" y2="3.0988" width="0" layer="19" extent="1-1"/>
+<wire x1="1.255" y1="6.0325" x2="1.06045" y2="4.6736" width="0" layer="19" extent="1-1"/>
+<wire x1="1.255" y1="0.9525" x2="1.06045" y2="2.3114" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$1">
 <contactref element="LCD1" pad="2"/>
 <contactref element="C1" pad="1"/>
-<wire x1="0.635" y1="10.922" x2="1.143" y2="11.43" width="0.1524" layer="1"/>
-<wire x1="0.635" y1="9.271" x2="0.635" y2="10.922" width="0.1524" layer="1"/>
-<wire x1="1.651" y1="10.287" x2="0.635" y2="9.271" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="10.287" x2="1.651" y2="10.287" width="0.1524" layer="16"/>
-<wire x1="1.143" y1="11.43" x2="1.255" y2="11.43" width="0.1524" layer="1"/>
-<wire x1="8.255" y1="10.287" x2="8.335" y2="10.25" width="0.1524" layer="16"/>
-<via x="0.635" y="9.271" extent="1-16" drill="0.3048"/>
+<wire x1="1.255" y1="11.43" x2="8.335" y2="10.25" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$2">
 <contactref element="C1" pad="2"/>
 <contactref element="LCD1" pad="1"/>
-<wire x1="4.191" y1="11.43" x2="2.555" y2="11.43" width="0.1524" layer="1"/>
-<wire x1="4.699" y1="10.922" x2="4.191" y2="11.43" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="10.922" x2="4.699" y2="10.922" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="10.922" x2="8.335" y2="10.9" width="0.1524" layer="16"/>
-<via x="4.191" y="11.43" extent="1-16" drill="0.3048"/>
+<wire x1="2.555" y1="11.43" x2="8.335" y2="10.9" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$3">
 <contactref element="LCD1" pad="4"/>
 <contactref element="C2" pad="1"/>
-<wire x1="1.905" y1="9.525" x2="1.27" y2="10.16" width="0.1524" layer="1"/>
-<wire x1="1.905" y1="9.271" x2="1.905" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="2.159" y1="9.017" x2="1.905" y2="9.271" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="9.017" x2="2.159" y2="9.017" width="0.1524" layer="16"/>
-<wire x1="1.27" y1="10.16" x2="1.255" y2="10.16" width="0.1524" layer="1"/>
-<wire x1="8.255" y1="9.017" x2="8.335" y2="8.95" width="0.1524" layer="16"/>
-<via x="1.905" y="9.271" extent="1-16" drill="0.3048"/>
+<wire x1="1.255" y1="10.16" x2="8.335" y2="8.95" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$4">
 <contactref element="C2" pad="2"/>
 <contactref element="LCD1" pad="3"/>
-<wire x1="4.318" y1="10.16" x2="2.555" y2="10.16" width="0.1524" layer="1"/>
-<wire x1="4.318" y1="9.652" x2="4.318" y2="10.16" width="0.1524" layer="1"/>
-<wire x1="8.255" y1="9.652" x2="4.318" y2="9.652" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="9.652" x2="8.335" y2="9.6" width="0.1524" layer="16"/>
-<via x="4.318" y="9.652" extent="1-16" drill="0.3048"/>
+<wire x1="2.555" y1="10.16" x2="8.335" y2="9.6" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$8">
 <contactref element="LCD1" pad="13"/>
 <contactref element="R1" pad="2"/>
-<wire x1="4.445" y1="6.477" x2="2.667" y2="8.255" width="0.1524" layer="1"/>
-<wire x1="4.445" y1="4.953" x2="4.445" y2="6.477" width="0.1524" layer="1"/>
-<wire x1="6.223" y1="3.175" x2="4.445" y2="4.953" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="3.175" x2="6.223" y2="3.175" width="0.1524" layer="16"/>
-<wire x1="2.667" y1="8.255" x2="2.555" y2="8.255" width="0.1524" layer="1"/>
-<wire x1="8.255" y1="3.175" x2="8.335" y2="3.1" width="0.1524" layer="16"/>
-<via x="4.445" y="4.953" extent="1-16" drill="0.3048"/>
+<wire x1="2.555" y1="6.0325" x2="8.335" y2="3.1" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$9">
 <contactref element="LCD1" pad="14"/>
 <contactref element="U$15" pad="3"/>
-<wire x1="3.81" y1="3.302" x2="2.794" y2="3.302" width="0.1524" layer="1"/>
-<wire x1="4.572" y1="2.54" x2="3.81" y2="3.302" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="2.54" x2="4.572" y2="2.54" width="0.1524" layer="16"/>
-<wire x1="2.794" y1="3.302" x2="2.74955" y2="3.4163" width="0.1524" layer="1"/>
-<wire x1="8.255" y1="2.54" x2="8.335" y2="2.45" width="0.1524" layer="16"/>
-<via x="3.81" y="3.302" extent="1-16" drill="0.3048"/>
+<wire x1="2.74955" y1="3.0988" x2="8.335" y2="2.45" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$15">
 <contactref element="LCD1" pad="15"/>
 <contactref element="U$15" pad="4"/>
-<wire x1="3.937" y1="1.397" x2="2.794" y2="2.54" width="0.1524" layer="1"/>
-<wire x1="4.318" y1="1.778" x2="3.937" y2="1.397" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="1.778" x2="4.318" y2="1.778" width="0.1524" layer="16"/>
-<wire x1="2.794" y1="2.54" x2="2.74955" y2="2.6289" width="0.1524" layer="1"/>
-<wire x1="8.255" y1="1.778" x2="8.335" y2="1.8" width="0.1524" layer="16"/>
-<via x="3.937" y="1.397" extent="1-16" drill="0.3048"/>
+<wire x1="2.74955" y1="2.3114" x2="8.335" y2="1.8" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="3.3V">
 <contactref element="LCD1" pad="5"/>
@@ -1167,83 +1041,23 @@ design rules under a new name.</descript
 <contactref element="U$14" pad="6"/>
 <contactref element="U$15" pad="2"/>
 <contactref element="U$15" pad="1"/>
-<wire x1="15.748" y1="9.144" x2="14.986" y2="8.382" width="0.1524" layer="1"/>
-<wire x1="14.986" y1="8.382" x2="14.732" y2="8.128" width="0.1524" layer="1"/>
-<wire x1="16.129" y1="9.144" x2="15.748" y2="9.144" width="0.1524" layer="1"/>
-<wire x1="14.732" y1="8.128" x2="14.63" y2="8.08" width="0.1524" layer="1"/>
-<wire x1="16.129" y1="9.144" x2="16.1775" y2="9.2075" width="0.1524" layer="1"/>
-<wire x1="14.605" y1="8.763" x2="14.986" y2="8.382" width="0.1524" layer="1"/>
-<wire x1="14.224" y1="8.382" x2="14.605" y2="8.763" width="0.1524" layer="16"/>
-<wire x1="8.382" y1="8.382" x2="14.224" y2="8.382" width="0.1524" layer="16"/>
-<wire x1="8.382" y1="8.382" x2="8.335" y2="8.3" width="0.1524" layer="16"/>
-<wire x1="4.572" y1="6.985" x2="5.334" y2="6.985" width="0.1524" layer="16"/>
-<wire x1="5.334" y1="6.985" x2="8.255" y2="6.985" width="0.1524" layer="16"/>
-<wire x1="4.064" y1="7.493" x2="4.572" y2="6.985" width="0.1524" layer="16"/>
-<wire x1="4.064" y1="8.255" x2="4.064" y2="7.493" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="8.255" x2="4.064" y2="8.255" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="6.985" x2="8.335" y2="7" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="8.255" x2="8.335" y2="8.3" width="0.1524" layer="16"/>
-<wire x1="9.779" y1="9.017" x2="9.906" y2="8.89" width="0.1524" layer="1"/>
-<wire x1="9.779" y1="9.271" x2="9.779" y2="9.017" width="0.1524" layer="1"/>
-<wire x1="9.525" y1="9.525" x2="9.779" y2="9.271" width="0.1524" layer="1"/>
-<wire x1="6.35" y1="9.525" x2="9.525" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="6.35" y1="11.43" x2="6.35" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="9.906" y1="8.89" x2="9.93" y2="8.78" width="0.1524" layer="1"/>
-<wire x1="6.35" y1="11.43" x2="6.335" y2="11.43" width="0.1524" layer="1"/>
-<wire x1="2.794" y1="4.191" x2="4.699" y2="4.191" width="0.1524" layer="1"/>
-<wire x1="4.699" y1="4.191" x2="4.7625" y2="4.1425" width="0.1524" layer="1"/>
-<wire x1="2.794" y1="4.191" x2="2.74955" y2="4.2037" width="0.1524" layer="1"/>
-<wire x1="5.461" y1="0.381" x2="7.62" y2="2.54" width="0.1524" layer="1"/>
-<wire x1="2.032" y1="0.381" x2="5.461" y2="0.381" width="0.1524" layer="1"/>
-<wire x1="2.032" y1="4.318" x2="2.032" y2="0.381" width="0.1524" layer="1"/>
-<wire x1="2.667" y1="4.953" x2="2.413" y2="4.699" width="0.1524" layer="1"/>
-<wire x1="2.413" y1="4.699" x2="2.032" y2="4.318" width="0.1524" layer="1"/>
-<wire x1="7.62" y1="2.54" x2="7.73" y2="2.58" width="0.1524" layer="1"/>
-<wire x1="2.667" y1="4.953" x2="2.74955" y2="4.9911" width="0.1524" layer="1"/>
-<wire x1="2.667" y1="5.08" x2="2.667" y2="6.604" width="0.1524" layer="1"/>
-<wire x1="2.667" y1="6.604" x2="2.555" y2="6.6675" width="0.1524" layer="1"/>
-<wire x1="2.667" y1="5.08" x2="2.74955" y2="4.9911" width="0.1524" layer="1"/>
-<wire x1="2.413" y1="4.572" x2="2.667" y2="4.318" width="0.1524" layer="1"/>
-<wire x1="2.413" y1="4.699" x2="2.413" y2="4.572" width="0.1524" layer="1"/>
-<wire x1="2.667" y1="4.318" x2="2.74955" y2="4.2037" width="0.1524" layer="1"/>
-<wire x1="5.334" y1="8.509" x2="6.35" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="5.334" y1="4.826" x2="5.334" y2="6.985" width="0.1524" layer="1"/>
-<wire x1="5.334" y1="6.985" x2="5.334" y2="8.509" width="0.1524" layer="1"/>
-<wire x1="4.826" y1="4.318" x2="5.334" y2="4.826" width="0.1524" layer="1"/>
-<wire x1="4.826" y1="4.191" x2="4.826" y2="4.318" width="0.1524" layer="1"/>
-<wire x1="4.826" y1="4.191" x2="4.7625" y2="4.1425" width="0.1524" layer="1"/>
-<wire x1="24.384" y1="7.62" x2="22.225" y2="5.461" width="0.1524" layer="1"/>
-<wire x1="24.384" y1="9.017" x2="24.384" y2="7.62" width="0.1524" layer="1"/>
-<wire x1="22.225" y1="5.461" x2="22.2225" y2="5.3674" width="0.1524" layer="1"/>
-<wire x1="16.383" y1="1.905" x2="13.97" y2="1.905" width="0.1524" layer="1"/>
-<wire x1="16.383" y1="2.54" x2="16.383" y2="1.905" width="0.1524" layer="1"/>
-<wire x1="13.97" y1="1.905" x2="13.93" y2="1.88" width="0.1524" layer="1"/>
-<wire x1="16.383" y1="2.54" x2="16.495" y2="2.54" width="0.1524" layer="1"/>
-<wire x1="22.86" y1="1.27" x2="24.13" y2="1.27" width="0.1524" layer="16"/>
-<wire x1="29.591" y1="8.255" x2="29.845" y2="8.509" width="0.1524" layer="1"/>
-<wire x1="29.591" y1="2.286" x2="29.591" y2="8.255" width="0.1524" layer="1"/>
-<wire x1="29.972" y1="1.905" x2="29.591" y2="2.286" width="0.1524" layer="1"/>
-<wire x1="29.972" y1="0.508" x2="29.972" y2="1.905" width="0.1524" layer="16"/>
-<wire x1="24.892" y1="0.508" x2="29.972" y2="0.508" width="0.1524" layer="16"/>
-<wire x1="24.13" y1="1.27" x2="24.892" y2="0.508" width="0.1524" layer="16"/>
-<wire x1="29.845" y1="8.509" x2="29.845" y2="8.5575" width="0.1524" layer="1"/>
-<wire x1="17.272" y1="1.016" x2="16.383" y2="1.905" width="0.1524" layer="1"/>
-<wire x1="21.717" y1="1.016" x2="17.272" y2="1.016" width="0.1524" layer="16"/>
-<wire x1="21.971" y1="1.27" x2="21.717" y2="1.016" width="0.1524" layer="16"/>
-<wire x1="22.86" y1="1.27" x2="21.971" y2="1.27" width="0.1524" layer="16"/>
-<wire x1="23.114" y1="4.445" x2="22.225" y2="5.334" width="0.1524" layer="1"/>
-<wire x1="23.114" y1="1.524" x2="23.114" y2="4.445" width="0.1524" layer="1"/>
-<wire x1="22.86" y1="1.27" x2="23.114" y2="1.524" width="0.1524" layer="1"/>
-<wire x1="22.225" y1="5.334" x2="22.2225" y2="5.3674" width="0.1524" layer="1"/>
-<wire x1="23.368" y1="8.763" x2="14.605" y2="8.763" width="0.1524" layer="16"/>
-<wire x1="23.622" y1="9.017" x2="23.368" y2="8.763" width="0.1524" layer="16"/>
-<wire x1="24.384" y1="9.017" x2="23.622" y2="9.017" width="0.1524" layer="1"/>
-<wire x1="24.384" y1="9.017" x2="24.4475" y2="9.04" width="0.1524" layer="1"/>
-<via x="14.605" y="8.763" extent="1-16" drill="0.3048"/>
-<via x="5.334" y="6.985" extent="1-16" drill="0.3048"/>
-<via x="29.972" y="1.905" extent="1-16" drill="0.3048"/>
-<via x="17.272" y="1.016" extent="1-16" drill="0.3048"/>
-<via x="23.622" y="9.017" extent="1-16" drill="0.3048"/>
+<wire x1="24.4475" y1="9.04" x2="29.845" y2="8.5575" width="0" layer="19" extent="1-1"/>
+<wire x1="22.54" y1="5.3674" x2="24.4475" y2="9.04" width="0" layer="19" extent="1-1"/>
+<wire x1="21.605" y1="3.81" x2="22.54" y2="5.3674" width="0" layer="19" extent="1-1"/>
+<wire x1="24.13" y1="1.27" x2="21.605" y2="3.81" width="0" layer="19" extent="1-1"/>
+<wire x1="25.4" y1="1.27" x2="24.13" y2="1.27" width="0" layer="19" extent="16-16"/>
+<wire x1="16.495" y1="2.54" x2="21.605" y2="3.81" width="0" layer="19" extent="1-1"/>
+<wire x1="13.93" y1="1.88" x2="16.495" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="14.63" y1="8.08" x2="16.495" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="16.1775" y1="9.2075" x2="14.63" y2="8.08" width="0" layer="19" extent="1-1"/>
+<wire x1="9.93" y1="8.78" x2="14.63" y2="8.08" width="0" layer="19" extent="1-1"/>
+<wire x1="8.335" y1="8.3" x2="9.93" y2="8.78" width="0" layer="19" extent="1-16"/>
+<wire x1="8.335" y1="7" x2="8.335" y2="8.3" width="0" layer="19" extent="16-16"/>
+<wire x1="5.715" y1="10.4625" x2="8.335" y2="8.3" width="0" layer="19" extent="1-16"/>
+<wire x1="7.73" y1="2.58" x2="8.335" y2="7" width="0" layer="19" extent="1-16"/>
+<wire x1="2.74955" y1="3.8862" x2="7.73" y2="2.58" width="0" layer="19" extent="1-1"/>
+<wire x1="2.74955" y1="4.6736" x2="2.74955" y2="3.8862" width="0" layer="19" extent="1-1"/>
+<wire x1="2.555" y1="0.9525" x2="2.74955" y2="3.8862" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VLCD">
 <contactref element="U$1" pad="1"/>
@@ -1254,164 +1068,55 @@ design rules under a new name.</descript
 <contactref element="U2" pad="1"/>
 <contactref element="D1" pad="C"/>
 <contactref element="C11" pad="2"/>
-<wire x1="20.32" y1="8.001" x2="20.32" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="20.32" y1="8.001" x2="20.3225" y2="7.9676" width="0.1524" layer="1"/>
-<wire x1="21.209" y1="10.414" x2="20.32" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="21.209" y1="11.43" x2="21.209" y2="10.414" width="0.1524" layer="1"/>
-<wire x1="20.32" y1="9.525" x2="20.305" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="21.209" y1="11.43" x2="21.2725" y2="11.43" width="0.1524" layer="1"/>
-<wire x1="39.624" y1="0.508" x2="40.64" y2="1.524" width="0.1524" layer="1"/>
-<wire x1="25.019" y1="0.508" x2="39.624" y2="0.508" width="0.1524" layer="1"/>
-<wire x1="25.019" y1="9.906" x2="25.019" y2="0.508" width="0.1524" layer="1"/>
-<wire x1="24.765" y1="10.16" x2="25.019" y2="9.906" width="0.1524" layer="1"/>
-<wire x1="22.86" y1="10.16" x2="24.765" y2="10.16" width="0.1524" layer="1"/>
-<wire x1="22.86" y1="8.636" x2="22.86" y2="10.16" width="0.1524" layer="1"/>
-<wire x1="22.225" y1="8.001" x2="22.86" y2="8.636" width="0.1524" layer="1"/>
-<wire x1="40.64" y1="1.524" x2="40.675" y2="1.5875" width="0.1524" layer="1"/>
-<wire x1="22.225" y1="8.001" x2="22.2225" y2="7.9676" width="0.1524" layer="1"/>
-<wire x1="20.701" y1="7.62" x2="20.447" y2="7.874" width="0.1524" layer="1"/>
-<wire x1="20.701" y1="7.239" x2="20.701" y2="7.62" width="0.1524" layer="1"/>
-<wire x1="20.828" y1="7.112" x2="20.701" y2="7.239" width="0.1524" layer="1"/>
-<wire x1="22.098" y1="7.112" x2="20.828" y2="7.112" width="0.1524" layer="1"/>
-<wire x1="22.098" y1="7.874" x2="22.098" y2="7.112" width="0.1524" layer="1"/>
-<wire x1="20.447" y1="7.874" x2="20.3225" y2="7.9676" width="0.1524" layer="1"/>
-<wire x1="22.098" y1="7.874" x2="22.2225" y2="7.9676" width="0.1524" layer="1"/>
+<wire x1="22.54" y1="7.9676" x2="40.675" y2="1.5875" width="0" layer="19" extent="1-1"/>
+<wire x1="20.64" y1="7.9676" x2="22.54" y2="7.9676" width="0" layer="19" extent="1-1"/>
+<wire x1="20.94" y1="9.525" x2="20.64" y2="7.9676" width="0" layer="19" extent="1-1"/>
+<wire x1="21.2725" y1="11.43" x2="20.94" y2="9.525" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SW-A">
 <contactref element="SW1" pad="1"/>
 <contactref element="U$1" pad="40"/>
-<wire x1="16.51" y1="4.064" x2="14.732" y2="4.064" width="0.1524" layer="1"/>
-<wire x1="16.891" y1="4.445" x2="16.51" y2="4.064" width="0.1524" layer="16"/>
-<wire x1="26.162" y1="4.445" x2="16.891" y2="4.445" width="0.1524" layer="16"/>
-<wire x1="26.289" y1="4.318" x2="26.162" y2="4.445" width="0.1524" layer="16"/>
-<wire x1="31.623" y1="4.318" x2="26.289" y2="4.318" width="0.1524" layer="16"/>
-<wire x1="31.877" y1="4.572" x2="31.623" y2="4.318" width="0.1524" layer="16"/>
-<wire x1="33.401" y1="3.048" x2="31.877" y2="4.572" width="0.1524" layer="1"/>
-<wire x1="14.732" y1="4.064" x2="14.63" y2="4.08" width="0.1524" layer="1"/>
-<wire x1="33.401" y1="3.048" x2="33.525" y2="3.025" width="0.1524" layer="1"/>
-<via x="16.51" y="4.064" extent="1-16" drill="0.3048"/>
-<via x="31.877" y="4.572" extent="1-16" drill="0.3048"/>
+<wire x1="14.63" y1="4.08" x2="33.525" y2="3.025" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SW-C">
 <contactref element="SW1" pad="3"/>
 <contactref element="U$1" pad="41"/>
-<wire x1="16.256" y1="4.572" x2="14.732" y2="4.572" width="0.1524" layer="1"/>
-<wire x1="16.383" y1="4.699" x2="16.256" y2="4.572" width="0.1524" layer="1"/>
-<wire x1="17.145" y1="4.699" x2="16.383" y2="4.699" width="0.1524" layer="1"/>
-<wire x1="17.145" y1="2.032" x2="17.145" y2="4.699" width="0.1524" layer="1"/>
-<wire x1="17.399" y1="1.778" x2="17.145" y2="2.032" width="0.1524" layer="1"/>
-<wire x1="18.415" y1="1.778" x2="17.399" y2="1.778" width="0.1524" layer="1"/>
-<wire x1="18.415" y1="6.731" x2="18.415" y2="1.778" width="0.1524" layer="1"/>
-<wire x1="19.685" y1="8.001" x2="18.415" y2="6.731" width="0.1524" layer="16"/>
-<wire x1="35.179" y1="8.001" x2="19.685" y2="8.001" width="0.1524" layer="16"/>
-<wire x1="35.56" y1="7.62" x2="35.179" y2="8.001" width="0.1524" layer="16"/>
-<wire x1="35.941" y1="7.239" x2="35.56" y2="7.62" width="0.1524" layer="1"/>
-<wire x1="35.941" y1="3.429" x2="35.941" y2="7.239" width="0.1524" layer="1"/>
-<wire x1="36.322" y1="3.048" x2="35.941" y2="3.429" width="0.1524" layer="1"/>
-<wire x1="14.732" y1="4.572" x2="14.63" y2="4.58" width="0.1524" layer="1"/>
-<wire x1="36.322" y1="3.048" x2="36.325" y2="3.025" width="0.1524" layer="1"/>
-<via x="18.415" y="6.731" extent="1-16" drill="0.3048"/>
-<via x="35.56" y="7.62" extent="1-16" drill="0.3048"/>
+<wire x1="14.63" y1="4.58" x2="36.325" y2="3.025" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SW-B">
 <contactref element="SW1" pad="4"/>
 <contactref element="U$1" pad="43"/>
-<wire x1="16.51" y1="5.588" x2="14.732" y2="5.588" width="0.1524" layer="1"/>
-<wire x1="16.51" y1="5.715" x2="16.51" y2="5.588" width="0.1524" layer="1"/>
-<wire x1="16.891" y1="6.096" x2="16.51" y2="5.715" width="0.1524" layer="16"/>
-<wire x1="25.654" y1="6.096" x2="16.891" y2="6.096" width="0.1524" layer="16"/>
-<wire x1="26.289" y1="6.731" x2="25.654" y2="6.096" width="0.1524" layer="16"/>
-<wire x1="32.385" y1="6.731" x2="26.289" y2="6.731" width="0.1524" layer="16"/>
-<wire x1="32.766" y1="7.112" x2="32.385" y2="6.731" width="0.1524" layer="16"/>
-<wire x1="33.655" y1="7.112" x2="32.766" y2="7.112" width="0.1524" layer="16"/>
-<wire x1="33.782" y1="6.985" x2="33.655" y2="7.112" width="0.1524" layer="16"/>
-<wire x1="33.528" y1="7.239" x2="33.782" y2="6.985" width="0.1524" layer="1"/>
-<wire x1="33.528" y1="9.652" x2="33.528" y2="7.239" width="0.1524" layer="1"/>
-<wire x1="14.732" y1="5.588" x2="14.63" y2="5.58" width="0.1524" layer="1"/>
-<wire x1="33.528" y1="9.652" x2="33.525" y2="9.675" width="0.1524" layer="1"/>
-<via x="16.51" y="5.715" extent="1-16" drill="0.3048"/>
-<via x="33.782" y="6.985" extent="1-16" drill="0.3048"/>
+<wire x1="14.63" y1="5.58" x2="33.525" y2="9.675" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SW-D">
 <contactref element="SW1" pad="6"/>
 <contactref element="U$1" pad="42"/>
-<wire x1="17.145" y1="5.08" x2="14.63" y2="5.08" width="0.1524" layer="1"/>
-<wire x1="17.145" y1="6.858" x2="17.145" y2="5.08" width="0.1524" layer="1"/>
-<wire x1="18.669" y1="8.382" x2="17.145" y2="6.858" width="0.1524" layer="16"/>
-<wire x1="35.941" y1="8.382" x2="18.669" y2="8.382" width="0.1524" layer="16"/>
-<wire x1="36.068" y1="8.255" x2="35.941" y2="8.382" width="0.1524" layer="16"/>
-<wire x1="36.322" y1="8.509" x2="36.068" y2="8.255" width="0.1524" layer="1"/>
-<wire x1="36.322" y1="9.652" x2="36.322" y2="8.509" width="0.1524" layer="1"/>
-<wire x1="36.322" y1="9.652" x2="36.325" y2="9.675" width="0.1524" layer="1"/>
-<via x="17.145" y="6.858" extent="1-16" drill="0.3048"/>
-<via x="36.068" y="8.255" extent="1-16" drill="0.3048"/>
+<wire x1="14.63" y1="5.08" x2="36.325" y2="9.675" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="D+">
 <contactref element="JP2" pad="D+"/>
 <contactref element="R2" pad="2"/>
-<wire x1="22.479" y1="3.81" x2="21.605" y2="3.81" width="0.1524" layer="1"/>
-<wire x1="22.606" y1="3.937" x2="22.479" y2="3.81" width="0.1524" layer="16"/>
-<wire x1="41.91" y1="3.937" x2="22.606" y2="3.937" width="0.1524" layer="16"/>
-<wire x1="42.291" y1="4.318" x2="41.91" y2="3.937" width="0.1524" layer="16"/>
-<wire x1="42.418" y1="4.445" x2="42.291" y2="4.318" width="0.1524" layer="1"/>
-<wire x1="42.418" y1="5.969" x2="42.418" y2="4.445" width="0.1524" layer="1"/>
-<wire x1="42.037" y1="6.35" x2="42.418" y2="5.969" width="0.1524" layer="1"/>
-<wire x1="41.4825" y1="6.35" x2="42.037" y2="6.35" width="0.1524" layer="1"/>
-<via x="22.479" y="3.81" extent="1-16" drill="0.3048"/>
-<via x="42.291" y="4.318" extent="1-16" drill="0.3048"/>
+<wire x1="21.605" y1="2.54" x2="41.4825" y2="6.35" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="D-">
 <contactref element="JP2" pad="D-"/>
 <contactref element="R3" pad="2"/>
-<wire x1="20.955" y1="3.175" x2="21.59" y2="2.54" width="0.1524" layer="1"/>
-<wire x1="20.955" y1="6.096" x2="20.955" y2="3.175" width="0.1524" layer="1"/>
-<wire x1="19.431" y1="7.62" x2="20.955" y2="6.096" width="0.1524" layer="1"/>
-<wire x1="19.431" y1="9.398" x2="19.431" y2="7.62" width="0.1524" layer="1"/>
-<wire x1="19.685" y1="9.652" x2="19.431" y2="9.398" width="0.1524" layer="16"/>
-<wire x1="37.719" y1="9.652" x2="19.685" y2="9.652" width="0.1524" layer="16"/>
-<wire x1="39.751" y1="7.62" x2="37.719" y2="9.652" width="0.1524" layer="1"/>
-<wire x1="40.513" y1="7.62" x2="39.751" y2="7.62" width="0.1524" layer="1"/>
-<wire x1="40.513" y1="6.096" x2="40.513" y2="7.62" width="0.1524" layer="1"/>
-<wire x1="40.894" y1="5.715" x2="40.513" y2="6.096" width="0.1524" layer="1"/>
-<wire x1="41.402" y1="5.715" x2="40.894" y2="5.715" width="0.1524" layer="1"/>
-<wire x1="21.59" y1="2.54" x2="21.605" y2="2.54" width="0.1524" layer="1"/>
-<wire x1="41.402" y1="5.715" x2="41.4825" y2="5.7" width="0.1524" layer="1"/>
-<via x="19.431" y="9.398" extent="1-16" drill="0.3048"/>
-<via x="37.719" y="9.652" extent="1-16" drill="0.3048"/>
+<wire x1="21.605" y1="1.27" x2="41.4825" y2="5.7" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$10">
 <contactref element="JP2" pad="VBUS"/>
 <contactref element="D1" pad="A"/>
-<wire x1="41.656" y1="1.905" x2="41.91" y2="1.651" width="0.1524" layer="1"/>
-<wire x1="41.656" y1="4.826" x2="41.656" y2="1.905" width="0.1524" layer="1"/>
-<wire x1="41.529" y1="4.953" x2="41.656" y2="4.826" width="0.1524" layer="1"/>
-<wire x1="41.91" y1="1.651" x2="41.975" y2="1.5875" width="0.1524" layer="1"/>
-<wire x1="41.529" y1="4.953" x2="41.4825" y2="5.05" width="0.1524" layer="1"/>
+<wire x1="41.975" y1="1.5875" x2="41.4825" y2="5.05" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$6">
 <contactref element="U$1" pad="33"/>
 <contactref element="R2" pad="1"/>
-<wire x1="12.573" y1="1.651" x2="12.446" y2="1.778" width="0.1524" layer="1"/>
-<wire x1="12.573" y1="1.143" x2="12.573" y2="1.651" width="0.1524" layer="1"/>
-<wire x1="13.335" y1="0.381" x2="12.573" y2="1.143" width="0.1524" layer="1"/>
-<wire x1="18.796" y1="0.381" x2="13.335" y2="0.381" width="0.1524" layer="1"/>
-<wire x1="18.796" y1="2.413" x2="18.796" y2="0.381" width="0.1524" layer="1"/>
-<wire x1="20.193" y1="3.81" x2="18.796" y2="2.413" width="0.1524" layer="1"/>
-<wire x1="12.446" y1="1.778" x2="12.43" y2="1.88" width="0.1524" layer="1"/>
-<wire x1="20.193" y1="3.81" x2="20.305" y2="3.81" width="0.1524" layer="1"/>
+<wire x1="12.43" y1="1.88" x2="20.305" y2="2.54" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$7">
 <contactref element="U$1" pad="32"/>
 <contactref element="R3" pad="1"/>
-<wire x1="11.938" y1="1.016" x2="11.938" y2="1.778" width="0.1524" layer="1"/>
-<wire x1="12.954" y1="2.032" x2="11.938" y2="1.016" width="0.1524" layer="16"/>
-<wire x1="19.431" y1="2.032" x2="12.954" y2="2.032" width="0.1524" layer="16"/>
-<wire x1="20.193" y1="2.032" x2="19.431" y2="2.032" width="0.1524" layer="1"/>
-<wire x1="20.193" y1="2.54" x2="20.193" y2="2.032" width="0.1524" layer="1"/>
-<wire x1="11.938" y1="1.778" x2="11.93" y2="1.88" width="0.1524" layer="1"/>
-<wire x1="20.193" y1="2.54" x2="20.305" y2="2.54" width="0.1524" layer="1"/>
-<via x="11.938" y="1.016" extent="1-16" drill="0.3048"/>
-<via x="19.431" y="2.032" extent="1-16" drill="0.3048"/>
+<wire x1="11.93" y1="1.88" x2="20.305" y2="1.27" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SPI1_MISO">
 <contactref element="U$1" pad="16"/>
@@ -1419,43 +1124,12 @@ design rules under a new name.</descript
 <signal name="SPI1_MOSI">
 <contactref element="U$1" pad="17"/>
 <contactref element="LCD1" pad="12"/>
-<wire x1="7.112" y1="6.096" x2="7.62" y2="6.096" width="0.1524" layer="1"/>
-<wire x1="6.604" y1="6.604" x2="7.112" y2="6.096" width="0.1524" layer="1"/>
-<wire x1="5.969" y1="6.604" x2="6.604" y2="6.604" width="0.1524" layer="1"/>
-<wire x1="5.969" y1="6.223" x2="5.969" y2="6.604" width="0.1524" layer="1"/>
-<wire x1="5.715" y1="5.969" x2="5.969" y2="6.223" width="0.1524" layer="1"/>
-<wire x1="5.715" y1="4.445" x2="5.715" y2="5.969" width="0.1524" layer="1"/>
-<wire x1="6.35" y1="3.81" x2="5.715" y2="4.445" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="3.81" x2="6.35" y2="3.81" width="0.1524" layer="16"/>
-<wire x1="7.62" y1="6.096" x2="7.73" y2="6.08" width="0.1524" layer="1"/>
-<wire x1="8.255" y1="3.81" x2="8.335" y2="3.75" width="0.1524" layer="16"/>
-<via x="5.715" y="4.445" extent="1-16" drill="0.3048"/>
+<wire x1="8.335" y1="3.75" x2="7.73" y2="6.08" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="SPI1_SCK">
 <contactref element="U$1" pad="15"/>
 <contactref element="LCD1" pad="11"/>
-<wire x1="6.223" y1="7.112" x2="7.62" y2="7.112" width="0.1524" layer="1"/>
-<wire x1="6.223" y1="7.62" x2="6.223" y2="7.112" width="0.1524" layer="1"/>
-<wire x1="4.699" y1="7.62" x2="6.223" y2="7.62" width="0.1524" layer="16"/>
-<wire x1="4.953" y1="7.874" x2="4.699" y2="7.62" width="0.1524" layer="1"/>
-<wire x1="4.953" y1="11.557" x2="4.953" y2="7.874" width="0.1524" layer="1"/>
-<wire x1="5.08" y1="11.43" x2="4.953" y2="11.557" width="0.1524" layer="16"/>
-<wire x1="13.462" y1="11.43" x2="5.08" y2="11.43" width="0.1524" layer="16"/>
-<wire x1="15.367" y1="9.525" x2="13.462" y2="11.43" width="0.1524" layer="16"/>
-<wire x1="15.748" y1="9.906" x2="15.367" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="16.764" y1="9.906" x2="15.748" y2="9.906" width="0.1524" layer="1"/>
-<wire x1="16.764" y1="8.128" x2="16.764" y2="9.906" width="0.1524" layer="1"/>
-<wire x1="13.97" y1="5.334" x2="16.764" y2="8.128" width="0.1524" layer="16"/>
-<wire x1="10.541" y1="5.334" x2="13.97" y2="5.334" width="0.1524" layer="16"/>
-<wire x1="9.652" y1="4.445" x2="10.541" y2="5.334" width="0.1524" layer="16"/>
-<wire x1="8.382" y1="4.445" x2="9.652" y2="4.445" width="0.1524" layer="16"/>
-<wire x1="7.62" y1="7.112" x2="7.73" y2="7.08" width="0.1524" layer="1"/>
-<wire x1="8.382" y1="4.445" x2="8.335" y2="4.4" width="0.1524" layer="16"/>
-<via x="6.223" y="7.62" extent="1-16" drill="0.3048"/>
-<via x="4.699" y="7.62" extent="1-16" drill="0.3048"/>
-<via x="4.953" y="11.557" extent="1-16" drill="0.3048"/>
-<via x="15.367" y="9.525" extent="1-16" drill="0.3048"/>
-<via x="16.764" y="8.128" extent="1-16" drill="0.3048"/>
+<wire x1="8.335" y1="4.4" x2="7.73" y2="7.08" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="SPI2_MOSI">
 <contactref element="U$1" pad="28"/>
@@ -1463,32 +1137,12 @@ design rules under a new name.</descript
 <signal name="SPI2_MISO">
 <contactref element="U$1" pad="27"/>
 <contactref element="IC1" pad="7"/>
-<wire x1="9.525" y1="1.524" x2="9.525" y2="1.778" width="0.1524" layer="1"/>
-<wire x1="10.033" y1="1.016" x2="9.525" y2="1.524" width="0.1524" layer="1"/>
-<wire x1="13.97" y1="4.953" x2="10.033" y2="1.016" width="0.1524" layer="16"/>
-<wire x1="26.416" y1="4.953" x2="13.97" y2="4.953" width="0.1524" layer="16"/>
-<wire x1="26.924" y1="4.445" x2="26.416" y2="4.953" width="0.1524" layer="1"/>
-<wire x1="26.924" y1="3.683" x2="26.924" y2="4.445" width="0.1524" layer="1"/>
-<wire x1="9.525" y1="1.778" x2="9.43" y2="1.88" width="0.1524" layer="1"/>
-<wire x1="26.924" y1="3.683" x2="26.9875" y2="3.64" width="0.1524" layer="1"/>
-<via x="10.033" y="1.016" extent="1-16" drill="0.3048"/>
-<via x="26.416" y="4.953" extent="1-16" drill="0.3048"/>
+<wire x1="9.43" y1="1.88" x2="26.9875" y2="3.64" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SPI2_SCK">
 <contactref element="U$1" pad="26"/>
 <contactref element="IC1" pad="5"/>
-<wire x1="9.017" y1="1.016" x2="9.017" y2="1.778" width="0.1524" layer="1"/>
-<wire x1="9.652" y1="0.381" x2="9.017" y2="1.016" width="0.1524" layer="16"/>
-<wire x1="21.844" y1="0.381" x2="9.652" y2="0.381" width="0.1524" layer="16"/>
-<wire x1="22.098" y1="0.635" x2="21.844" y2="0.381" width="0.1524" layer="16"/>
-<wire x1="22.479" y1="0.635" x2="22.098" y2="0.635" width="0.1524" layer="1"/>
-<wire x1="22.606" y1="0.508" x2="22.479" y2="0.635" width="0.1524" layer="1"/>
-<wire x1="24.384" y1="0.508" x2="22.606" y2="0.508" width="0.1524" layer="1"/>
-<wire x1="24.384" y1="3.556" x2="24.384" y2="0.508" width="0.1524" layer="1"/>
-<wire x1="9.017" y1="1.778" x2="8.93" y2="1.88" width="0.1524" layer="1"/>
-<wire x1="24.384" y1="3.556" x2="24.4475" y2="3.64" width="0.1524" layer="1"/>
-<via x="9.017" y="1.016" extent="1-16" drill="0.3048"/>
-<via x="22.098" y="0.635" extent="1-16" drill="0.3048"/>
+<wire x1="8.93" y1="1.88" x2="24.4475" y2="3.64" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SPI1_!SS">
 <contactref element="U$1" pad="14"/>
@@ -1499,155 +1153,81 @@ design rules under a new name.</descript
 <signal name="SWCLK">
 <contactref element="U$1" pad="37"/>
 <contactref element="U$14" pad="3"/>
-<wire x1="15.621" y1="2.667" x2="14.732" y2="2.667" width="0.1524" layer="1"/>
-<wire x1="25.273" y1="2.667" x2="15.621" y2="2.667" width="0.1524" layer="16"/>
-<wire x1="26.67" y1="1.27" x2="25.273" y2="2.667" width="0.1524" layer="16"/>
-<wire x1="14.732" y1="2.667" x2="14.63" y2="2.58" width="0.1524" layer="1"/>
-<via x="15.621" y="2.667" extent="1-16" drill="0.3048"/>
+<wire x1="14.63" y1="2.58" x2="27.94" y2="1.27" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="SWDIO">
 <contactref element="U$1" pad="34"/>
 <contactref element="U$14" pad="4"/>
-<wire x1="13.081" y1="1.651" x2="12.954" y2="1.778" width="0.1524" layer="1"/>
-<wire x1="13.081" y1="1.397" x2="13.081" y2="1.651" width="0.1524" layer="1"/>
-<wire x1="13.462" y1="1.016" x2="13.081" y2="1.397" width="0.1524" layer="1"/>
-<wire x1="14.097" y1="1.651" x2="13.462" y2="1.016" width="0.1524" layer="16"/>
-<wire x1="19.05" y1="1.651" x2="14.097" y2="1.651" width="0.1524" layer="16"/>
-<wire x1="19.304" y1="1.397" x2="19.05" y2="1.651" width="0.1524" layer="16"/>
-<wire x1="21.59" y1="1.397" x2="19.304" y2="1.397" width="0.1524" layer="16"/>
-<wire x1="22.225" y1="2.032" x2="21.59" y2="1.397" width="0.1524" layer="16"/>
-<wire x1="24.638" y1="2.032" x2="22.225" y2="2.032" width="0.1524" layer="16"/>
-<wire x1="25.4" y1="1.27" x2="24.638" y2="2.032" width="0.1524" layer="16"/>
-<wire x1="12.954" y1="1.778" x2="12.93" y2="1.88" width="0.1524" layer="1"/>
-<via x="13.462" y="1.016" extent="1-16" drill="0.3048"/>
+<wire x1="12.93" y1="1.88" x2="26.67" y2="1.27" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$23">
 <contactref element="LED1" pad="A"/>
 <contactref element="R4" pad="2"/>
-<wire x1="39.37" y1="11.43" x2="35.575" y2="11.43" width="0.1524" layer="1"/>
-<wire x1="39.37" y1="11.037" x2="39.37" y2="11.43" width="0.1524" layer="1"/>
+<wire x1="35.575" y1="11.43" x2="39.37" y2="11.037" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$24">
 <contactref element="LED2" pad="A"/>
 <contactref element="R5" pad="2"/>
-<wire x1="39.37" y1="1.27" x2="35.575" y2="1.27" width="0.1524" layer="1"/>
-<wire x1="39.37" y1="1.663" x2="39.37" y2="1.27" width="0.1524" layer="1"/>
+<wire x1="35.575" y1="1.27" x2="39.37" y2="1.663" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="LED_PWR">
 <contactref element="R4" pad="1"/>
-</signal>
-<signal name="LED_ACT">
-<contactref element="R5" pad="1"/>
+<contactref element="U$1" pad="46"/>
+<wire x1="14.63" y1="7.08" x2="34.275" y2="11.43" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="!CS">
 <contactref element="LCD1" pad="8"/>
 <contactref element="U$1" pad="19"/>
-<wire x1="7.112" y1="5.08" x2="7.73" y2="5.08" width="0.1524" layer="1"/>
-<wire x1="7.112" y1="5.334" x2="7.112" y2="5.08" width="0.1524" layer="1"/>
-<wire x1="6.477" y1="5.969" x2="7.112" y2="5.334" width="0.1524" layer="1"/>
-<wire x1="6.858" y1="6.35" x2="6.477" y2="5.969" width="0.1524" layer="16"/>
-<wire x1="8.335" y1="6.35" x2="6.858" y2="6.35" width="0.1524" layer="16"/>
-<via x="6.477" y="5.969" extent="1-16" drill="0.3048"/>
+<wire x1="7.73" y1="5.08" x2="8.335" y2="6.35" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="!RES">
 <contactref element="LCD1" pad="9"/>
 <contactref element="U$1" pad="20"/>
-<wire x1="7.112" y1="4.572" x2="7.62" y2="4.572" width="0.1524" layer="1"/>
-<wire x1="6.477" y1="5.207" x2="7.112" y2="4.572" width="0.1524" layer="1"/>
-<wire x1="6.858" y1="5.588" x2="6.477" y2="5.207" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="5.588" x2="6.858" y2="5.588" width="0.1524" layer="16"/>
-<wire x1="7.62" y1="4.572" x2="7.73" y2="4.58" width="0.1524" layer="1"/>
-<wire x1="8.255" y1="5.588" x2="8.335" y2="5.7" width="0.1524" layer="16"/>
-<via x="6.477" y="5.207" extent="1-16" drill="0.3048"/>
+<wire x1="7.73" y1="4.58" x2="8.335" y2="5.7" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="D/!C">
 <contactref element="LCD1" pad="10"/>
 <contactref element="U$1" pad="21"/>
-<wire x1="6.477" y1="4.191" x2="7.62" y2="4.191" width="0.1524" layer="1"/>
-<wire x1="6.477" y1="4.445" x2="6.477" y2="4.191" width="0.1524" layer="1"/>
-<wire x1="6.985" y1="4.953" x2="6.477" y2="4.445" width="0.1524" layer="16"/>
-<wire x1="8.255" y1="4.953" x2="6.985" y2="4.953" width="0.1524" layer="16"/>
-<wire x1="7.62" y1="4.191" x2="7.73" y2="4.08" width="0.1524" layer="1"/>
-<wire x1="8.255" y1="4.953" x2="8.335" y2="5.05" width="0.1524" layer="16"/>
-<via x="6.477" y="4.445" extent="1-16" drill="0.3048"/>
+<wire x1="7.73" y1="4.08" x2="8.335" y2="5.05" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="T-">
 <contactref element="IC1" pad="2"/>
 <contactref element="JP4" pad="P1"/>
-<wire x1="27.686" y1="8.382" x2="27.051" y2="9.017" width="0.1524" layer="1"/>
-<wire x1="27.686" y1="7.366" x2="27.686" y2="8.382" width="0.1524" layer="1"/>
-<wire x1="27.94" y1="7.62" x2="27.686" y2="7.366" width="0.1524" layer="16"/>
-<wire x1="34.798" y1="7.62" x2="27.94" y2="7.62" width="0.1524" layer="16"/>
-<wire x1="35.433" y1="6.985" x2="34.798" y2="7.62" width="0.1524" layer="16"/>
-<wire x1="35.814" y1="6.985" x2="35.433" y2="6.985" width="0.1524" layer="16"/>
-<wire x1="38.354" y1="9.525" x2="35.814" y2="6.985" width="0.1524" layer="16"/>
-<wire x1="38.354" y1="11.43" x2="38.354" y2="9.525" width="0.1524" layer="16"/>
-<wire x1="29.21" y1="11.43" x2="38.354" y2="11.43" width="0.1524" layer="16"/>
-<wire x1="27.051" y1="9.017" x2="26.9875" y2="9.04" width="0.1524" layer="1"/>
-<via x="27.686" y="7.366" extent="1-16" drill="0.3048"/>
+<wire x1="26.9875" y1="9.04" x2="29.21" y2="11.43" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="T+">
 <contactref element="IC1" pad="3"/>
 <contactref element="JP4" pad="P2"/>
-<wire x1="26.416" y1="9.779" x2="25.781" y2="9.144" width="0.1524" layer="1"/>
-<wire x1="26.416" y1="11.176" x2="26.416" y2="9.779" width="0.1524" layer="1"/>
-<wire x1="26.67" y1="11.43" x2="26.416" y2="11.176" width="0.1524" layer="1"/>
-<wire x1="25.781" y1="9.144" x2="25.7175" y2="9.04" width="0.1524" layer="1"/>
+<wire x1="25.7175" y1="9.04" x2="26.67" y2="11.43" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$12">
 <contactref element="C14" pad="2"/>
 <contactref element="U$1" pad="5"/>
 <contactref element="Y2" pad="3"/>
-<wire x1="12.065" y1="9.017" x2="11.938" y2="8.89" width="0.1524" layer="1"/>
-<wire x1="12.065" y1="9.271" x2="12.065" y2="9.017" width="0.1524" layer="1"/>
-<wire x1="12.319" y1="9.525" x2="12.065" y2="9.271" width="0.1524" layer="1"/>
-<wire x1="12.954" y1="9.525" x2="12.319" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="12.954" y1="10.668" x2="12.954" y2="10.414" width="0.1524" layer="1"/>
-<wire x1="12.954" y1="10.414" x2="12.954" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="12.319" y1="11.303" x2="12.954" y2="10.668" width="0.1524" layer="1"/>
-<wire x1="11.938" y1="8.89" x2="11.93" y2="8.78" width="0.1524" layer="1"/>
-<wire x1="12.319" y1="11.303" x2="12.255" y2="11.42" width="0.1524" layer="1"/>
-<wire x1="12.954" y1="10.414" x2="13.97" y2="11.43" width="0.1524" layer="1"/>
-<wire x1="13.97" y1="11.43" x2="13.97" y2="11.445" width="0.1524" layer="1"/>
+<wire x1="12.89" y1="11.42" x2="14.2875" y2="11.445" width="0" layer="19" extent="1-1"/>
+<wire x1="11.93" y1="8.78" x2="12.89" y2="11.42" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$13">
 <contactref element="C13" pad="2"/>
 <contactref element="Y2" pad="1"/>
 <contactref element="U$1" pad="6"/>
-<wire x1="11.303" y1="9.017" x2="11.43" y2="8.89" width="0.1524" layer="1"/>
-<wire x1="11.303" y1="9.525" x2="11.303" y2="9.017" width="0.1524" layer="1"/>
-<wire x1="10.668" y1="10.16" x2="11.303" y2="9.525" width="0.1524" layer="1"/>
-<wire x1="11.43" y1="8.89" x2="11.43" y2="8.78" width="0.1524" layer="1"/>
-<wire x1="10.668" y1="10.16" x2="10.605" y2="10.17" width="0.1524" layer="1"/>
-<wire x1="6.985" y1="10.16" x2="9.144" y2="10.16" width="0.1524" layer="1"/>
-<wire x1="6.985" y1="11.938" x2="6.985" y2="10.16" width="0.1524" layer="1"/>
-<wire x1="7.239" y1="12.192" x2="6.985" y2="11.938" width="0.1524" layer="1"/>
-<wire x1="11.303" y1="12.192" x2="7.239" y2="12.192" width="0.1524" layer="1"/>
-<wire x1="11.303" y1="9.525" x2="11.303" y2="12.192" width="0.1524" layer="1"/>
-<wire x1="9.144" y1="10.16" x2="9.2075" y2="10.145" width="0.1524" layer="1"/>
+<wire x1="11.43" y1="8.78" x2="11.24" y2="10.17" width="0" layer="19" extent="1-1"/>
+<wire x1="9.54" y1="11.43" x2="11.24" y2="10.17" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SPI2_!SS">
 <contactref element="IC1" pad="6"/>
 <contactref element="U$1" pad="25"/>
-<wire x1="8.382" y1="0.889" x2="8.382" y2="1.778" width="0.1524" layer="1"/>
-<wire x1="8.89" y1="0.381" x2="8.382" y2="0.889" width="0.1524" layer="1"/>
-<wire x1="11.176" y1="0.381" x2="8.89" y2="0.381" width="0.1524" layer="1"/>
-<wire x1="11.176" y1="1.016" x2="11.176" y2="0.381" width="0.1524" layer="1"/>
-<wire x1="13.462" y1="3.302" x2="11.176" y2="1.016" width="0.1524" layer="16"/>
-<wire x1="22.225" y1="3.302" x2="13.462" y2="3.302" width="0.1524" layer="16"/>
-<wire x1="22.352" y1="3.175" x2="22.225" y2="3.302" width="0.1524" layer="16"/>
-<wire x1="42.164" y1="3.175" x2="22.352" y2="3.175" width="0.1524" layer="16"/>
-<wire x1="42.926" y1="3.937" x2="42.164" y2="3.175" width="0.1524" layer="16"/>
-<wire x1="42.926" y1="5.461" x2="42.926" y2="3.937" width="0.1524" layer="16"/>
-<wire x1="26.67" y1="5.461" x2="42.926" y2="5.461" width="0.1524" layer="16"/>
-<wire x1="26.543" y1="5.588" x2="26.67" y2="5.461" width="0.1524" layer="16"/>
-<wire x1="25.908" y1="5.588" x2="26.543" y2="5.588" width="0.1524" layer="16"/>
-<wire x1="25.781" y1="5.461" x2="25.908" y2="5.588" width="0.1524" layer="1"/>
-<wire x1="25.781" y1="3.683" x2="25.781" y2="5.461" width="0.1524" layer="1"/>
-<wire x1="8.382" y1="1.778" x2="8.43" y2="1.88" width="0.1524" layer="1"/>
-<wire x1="25.781" y1="3.683" x2="25.7175" y2="3.64" width="0.1524" layer="1"/>
-<via x="11.176" y="1.016" extent="1-16" drill="0.3048"/>
-<via x="25.908" y="5.588" extent="1-16" drill="0.3048"/>
+<wire x1="8.43" y1="1.88" x2="25.7175" y2="3.64" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="LED_STAT">
+<contactref element="U$1" pad="38"/>
+<contactref element="R5" pad="1"/>
+<wire x1="14.63" y1="3.08" x2="34.275" y2="1.27" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="SW-BTN">
+<contactref element="SW1" pad="2"/>
+<contactref element="U$1" pad="39"/>
+<wire x1="14.63" y1="3.58" x2="34.925" y2="3.025" width="0" layer="19" extent="1-1"/>
 </signal>
 </signals>
 </board>
diff --git a/zoncoffee.sch b/zoncoffee.sch
--- a/zoncoffee.sch
+++ b/zoncoffee.sch
@@ -4610,7 +4610,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="SUPPLY3" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
 <part name="GND2" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="SUPPLY4" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="U$3" library="microbuilder" deviceset="GND" device=""/>
 <part name="U$4" library="microbuilder" deviceset="GND" device=""/>
 <part name="U$5" library="microbuilder" deviceset="GND" device=""/>
 <part name="D1" library="SparkFun-DiscreteSemi" deviceset="DIODE" device="SOD523"/>
@@ -4683,7 +4682,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <instance part="SUPPLY3" gate="G$1" x="116.84" y="124.46"/>
 <instance part="GND2" gate="1" x="116.84" y="106.68"/>
 <instance part="SUPPLY4" gate="G$1" x="142.24" y="124.46"/>
-<instance part="U$3" gate="G$1" x="129.54" y="40.64"/>
 <instance part="U$4" gate="G$1" x="165.1" y="40.64"/>
 <instance part="U$5" gate="G$1" x="139.7" y="22.86"/>
 <instance part="D1" gate="G$1" x="132.08" y="27.94" rot="R180"/>
@@ -4717,7 +4715,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <instance part="U$11" gate="G$1" x="-48.26" y="58.42"/>
 <instance part="GND6" gate="1" x="139.7" y="76.2"/>
 <instance part="SUPPLY10" gate="G$1" x="139.7" y="96.52"/>
-<instance part="U$12" gate="G$1" x="91.44" y="60.96"/>
+<instance part="U$12" gate="G$1" x="96.52" y="55.88"/>
 <instance part="U$13" gate="G$1" x="45.72" y="-2.54"/>
 <instance part="GND7" gate="1" x="104.14" y="109.22"/>
 <instance part="GND8" gate="1" x="147.32" y="106.68"/>
@@ -4802,12 +4800,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="GND2" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="SW1" gate="SW" pin="CENTER"/>
-<pinref part="U$3" gate="G$1" pin="GND"/>
-<wire x1="139.7" y1="45.72" x2="129.54" y2="45.72" width="0.1524" layer="91"/>
-<wire x1="129.54" y1="45.72" x2="129.54" y2="43.18" width="0.1524" layer="91"/>
-</segment>
-<segment>
 <pinref part="SW1" gate="SW" pin="COMMON"/>
 <pinref part="U$4" gate="G$1" pin="GND"/>
 <wire x1="154.94" y1="45.72" x2="165.1" y2="45.72" width="0.1524" layer="91"/>
@@ -4904,8 +4896,7 @@ Standard 0603 ceramic capacitor, and 0.1
 </segment>
 <segment>
 <pinref part="U$1" gate="G$1" pin="BOOT0"/>
-<wire x1="83.82" y1="58.42" x2="86.36" y2="58.42" width="0.1524" layer="91"/>
-<wire x1="86.36" y1="58.42" x2="91.44" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="83.82" y1="58.42" x2="96.52" y2="58.42" width="0.1524" layer="91"/>
 <pinref part="U$12" gate="G$1" pin="GND"/>
 </segment>
 <segment>
@@ -5275,12 +5266,10 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="175.26" y1="132.08" x2="177.8" y2="132.08" width="0.1524" layer="91"/>
 <label x="175.26" y="132.08" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
-</net>
-<net name="LED_ACT" class="0">
 <segment>
-<pinref part="R5" gate="G$1" pin="1"/>
-<wire x1="175.26" y1="121.92" x2="177.8" y2="121.92" width="0.1524" layer="91"/>
-<label x="175.26" y="121.92" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U$1" gate="G$1" pin="I2C1_SDA/PB9"/>
+<wire x1="86.36" y1="63.5" x2="83.82" y2="63.5" width="0.1524" layer="91"/>
+<label x="86.36" y="63.5" size="1.016" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="!CS" class="0">
@@ -5380,6 +5369,30 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="86.36" y="10.16" size="1.016" layer="95" xref="yes"/>
 </segment>
 </net>
+<net name="LED_STAT" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="JTDI/PA15"/>
+<wire x1="86.36" y1="43.18" x2="83.82" y2="43.18" width="0.1524" layer="91"/>
+<label x="86.36" y="43.18" size="1.016" layer="95" xref="yes"/>
+</segment>
+<segment>
+<pinref part="R5" gate="G$1" pin="1"/>
+<wire x1="175.26" y1="121.92" x2="177.8" y2="121.92" width="0.1524" layer="91"/>
+<label x="175.26" y="121.92" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+</net>
+<net name="SW-BTN" class="0">
+<segment>
+<pinref part="SW1" gate="SW" pin="CENTER"/>
+<wire x1="139.7" y1="45.72" x2="129.54" y2="45.72" width="0.1524" layer="91"/>
+<label x="129.54" y="45.72" size="1.016" layer="95" rot="R180" xref="yes"/>
+</segment>
+<segment>
+<pinref part="U$1" gate="G$1" pin="JTDO/PB3"/>
+<wire x1="83.82" y1="45.72" x2="86.36" y2="45.72" width="0.1524" layer="91"/>
+<label x="86.36" y="45.72" size="1.016" layer="95" xref="yes"/>
+</segment>
+</net>
 </nets>
 </sheet>
 </sheets>