From a25df1b44503d70fac7901f1021e45248a10b506 Mon Sep 17 00:00:00 2001
From: Davide Bongiovanni <davidebongiov@gmail.com>
Date: Wed, 24 Apr 2019 22:54:32 +0200
Subject: [PATCH] Finished routing. Still missing some ground connections

---
 eagle.epf               |  94 +-----
 esp8266-wifi-remote.b#1 | 649 +++++++++++++++++++++++++--------------
 esp8266-wifi-remote.b#2 | 664 ++++++++++++++++++++++++++--------------
 esp8266-wifi-remote.b#3 | 663 +++++++++++++++++++++++++--------------
 esp8266-wifi-remote.b#4 | 629 +++++++++++++++++++++++--------------
 esp8266-wifi-remote.b#5 | 614 ++++++++++++++++++++++++-------------
 esp8266-wifi-remote.b#6 | 627 ++++++++++++++++++++++++-------------
 esp8266-wifi-remote.b#7 | 569 +++++++++++++++++++++-------------
 esp8266-wifi-remote.b#8 | 568 +++++++++++++++++++++-------------
 esp8266-wifi-remote.b#9 | 563 +++++++++++++++++++++-------------
 esp8266-wifi-remote.brd | 636 ++++++++++++++++++++++++--------------
 esp8266-wifi-remote.s#1 | 131 ++++----
 esp8266-wifi-remote.s#2 | 138 ++++++---
 esp8266-wifi-remote.s#3 |  72 ++++-
 esp8266-wifi-remote.s#4 |  63 +++-
 esp8266-wifi-remote.s#5 | 155 ++++++++--
 esp8266-wifi-remote.s#6 | 157 +++++++++-
 esp8266-wifi-remote.s#7 | 262 ++++++++++++++--
 esp8266-wifi-remote.s#8 | 237 ++++++++++++--
 esp8266-wifi-remote.s#9 | 258 +++++++++++++---
 esp8266-wifi-remote.sch | 131 ++++----
 21 files changed, 5267 insertions(+), 2613 deletions(-)

diff --git a/eagle.epf b/eagle.epf
index 2cf9265..492d386 100644
--- a/eagle.epf
+++ b/eagle.epf
@@ -15,107 +15,15 @@ UsedLibraryUrn="urn:adsk.eagle:library:10278406"
 UsedLibraryUrn="urn:adsk.eagle:library:10291251"
 UsedLibraryUrn="urn:adsk.eagle:library:10292857"
 UsedLibraryUrn="urn:adsk.eagle:library:10292913"
-UsedLibraryUrn="urn:adsk.eagle:library:10491909"
 UsedLibraryUrn="urn:adsk.eagle:library:10480998"
 UsedLibraryUrn="urn:adsk.eagle:library:10476605"
+UsedLibraryUrn="urn:adsk.eagle:library:10491909"
 UsedLibraryUrn="urn:adsk.eagle:library:10516572"
 
 [Win_1]
 Type="Control Panel"
 Number=0
 
-[Win_2]
-Type="Board Editor"
-Number=2
-File="esp8266-wifi-remote.brd"
-View="1.32856 -10.5303 54.2132 13.6568"
-WireWidths=" 0.0762 0.1016 0.127 0.15 0.2 0.2032 0.254 0.3048 0.4064 0.508 0.6096 0.8128 1.016 1.27 2.54 0.1524"
-PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-PadDrills=" 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.65 0.7 0.75 0.8 0.85 0.9 1 0.6"
-ViaDiameters=" 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 1 1.05 1.1 1.15 1.2 1.3 0"
-ViaDrills=" 0.2 0.25 0.3 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 1 0.35"
-HoleDrills=" 0.2 0.25 0.3 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 1 0.35"
-TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778"
-PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27"
-PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0"
-DimensionWidths=" 0 0.127 0.254 0.1 0.26 0.13"
-DimensionExtWidths=" 0.127 0.254 0.1 0.13 0.26 0"
-DimensionExtLengths=" 1.27 2.54 1 2 3 0"
-DimensionExtOffsets=" 1.27 2.54 1 2 3 0"
-SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
-WireBend=1
-WireBendSet=0
-WireCap=1
-MiterStyle=1
-PadShape=0
-ViaShape=1
-PolygonPour=0
-PolygonRank=1
-PolygonThermals=1
-PolygonOrphans=0
-TextRatio=8
-DimensionUnit=1
-DimensionPrecision=2
-DimensionShowUnit=0
-PinDirection=3
-PinFunction=0
-PinLength=2
-PinVisible=3
-SwapLevel=0
-ArcDirection=0
-AddLevel=2
-PadsSameType=0
-Layer=1
-
-[Win_3]
-Type="Schematic Editor"
-Number=1
-File="esp8266-wifi-remote.sch"
-View="-16.1069 17.9217 180.037 91.6563"
-WireWidths=" 0.0762 0.1016 0.127 0.15 0.2 0.2032 0.254 0.3048 0.4064 0.508 0.6096 0.8128 1.016 1.27 2.54 0.1524"
-PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-PadDrills=" 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.65 0.7 0.75 0.8 0.85 0.9 1 0.6"
-ViaDiameters=" 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 1 1.05 1.1 1.15 1.2 1.3 0"
-ViaDrills=" 0.2 0.25 0.3 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 1 0.35"
-HoleDrills=" 0.2 0.25 0.3 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 1 0.35"
-TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778"
-PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27"
-PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0"
-DimensionWidths=" 0 0.127 0.254 0.1 0.26 0.13"
-DimensionExtWidths=" 0.127 0.254 0.1 0.13 0.26 0"
-DimensionExtLengths=" 1.27 2.54 1 2 3 0"
-DimensionExtOffsets=" 1.27 2.54 1 2 3 0"
-SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
-WireBend=0
-WireBendSet=31
-WireCap=1
-MiterStyle=1
-PadShape=0
-ViaShape=1
-PolygonPour=0
-PolygonRank=0
-PolygonThermals=1
-PolygonOrphans=0
-TextRatio=8
-DimensionUnit=1
-DimensionPrecision=2
-DimensionShowUnit=0
-PinDirection=3
-PinFunction=0
-PinLength=2
-PinVisible=3
-SwapLevel=0
-ArcDirection=0
-AddLevel=2
-PadsSameType=0
-Layer=91
-Views=" 1: -16.1069 17.9217 180.037 91.6563 2: 23.9104 7.68943 202.633 105.341"
-Sheet="1"
-
 [Desktop]
 Screen="3840 1080"
 Window="Win_1"
-Window="Win_2"
-Window="Win_3"
diff --git a/esp8266-wifi-remote.b#1 b/esp8266-wifi-remote.b#1
index 24e0b24..926ae23 100644
--- a/esp8266-wifi-remote.b#1
+++ b/esp8266-wifi-remote.b#1
@@ -3,10 +3,10 @@
 <eagle version="9.3.2">
 <drawing>
 <settings>
-<setting alwaysvectorfont="no"/>
+<setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.5" altunitdist="mm" altunit="mm"/>
+<grid distance="0.1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.05" altunitdist="mm" altunit="mm"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="16" fill="1" visible="no" active="no"/>
@@ -157,13 +157,20 @@
 <layer number="255" name="routoute" color="7" fill="1" visible="no" active="yes"/>
 </layers>
 <board>
-<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="1b573db7-ea5e-6f0b-fd8c-026be2f409d2"/>
+<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="0d554165-aa44-83fe-abf8-41d2d7c0dd71"/>
 <plain>
-<wire x1="0" y1="0" x2="39" y2="0" width="0" layer="20"/>
-<wire x1="39" y1="0" x2="39" y2="58" width="0" layer="20"/>
-<wire x1="39" y1="58" x2="0" y2="58" width="0" layer="20"/>
-<wire x1="0" y1="58" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="0" x2="56" y2="0" width="0" layer="20"/>
+<wire x1="56" y1="0" x2="56" y2="68" width="0" layer="20"/>
+<wire x1="56" y1="68" x2="0" y2="68" width="0" layer="20"/>
+<wire x1="0" y1="68" x2="0" y2="0" width="0" layer="20"/>
 <hole x="3" y="3" drill="3.2"/>
+<hole x="53" y="3" drill="3.2"/>
+<hole x="53" y="65" drill="3.2"/>
+<text x="12.8" y="3.6" size="1.778" layer="21">BAT</text>
+<text x="10.3" y="0.9" size="1.778" layer="21">+</text>
+<text x="8" y="1" size="1.778" layer="21">-</text>
+<text x="9" y="38.4" size="1.778" layer="21">BOOT</text>
+<text x="3.3" y="34" size="1.778" layer="21" rot="R90" align="bottom-right">RST</text>
 </plain>
 <libraries>
 <library name="rcl" urn="urn:adsk.eagle:library:334">
@@ -1412,7 +1419,7 @@ CONN_02
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -1421,10 +1428,16 @@ CONN_02
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/1" type="box" library_version="3">
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
 <packageinstances>
 <packageinstance name="ELAB_PUSHBUTTON_1"/>
 </packageinstances>
@@ -1553,7 +1566,7 @@ CONN_02
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -1582,7 +1595,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -1654,7 +1667,7 @@ package type OT</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="default">
+<designrules name="default *">
 <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 
@@ -1683,7 +1696,7 @@ design rules under a new name.</description>
 <param name="mdSmdSmd" value="6mil"/>
 <param name="mdViaViaSameLayer" value="6mil"/>
 <param name="mnLayersViaInSmd" value="2"/>
-<param name="mdCopperDimension" value="40mil"/>
+<param name="mdCopperDimension" value="20mil"/>
 <param name="mdDrill" value="6mil"/>
 <param name="mdSmdStop" value="0mil"/>
 <param name="msWidth" value="6mil"/>
@@ -1838,152 +1851,127 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-30.48" y="55.88" smashed="yes">
-<attribute name="NAME" x="-31.115" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-31.115" y="53.975" size="1.27" layer="27"/>
+<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="8" y="8.5" smashed="yes">
+<attribute name="NAME" x="3.965" y="7.935" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="38.48" y="-47.38" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-44.45" y="49.53" smashed="yes">
-<attribute name="NAME" x="-45.72" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-45.72" y="46.99" size="1.27" layer="27"/>
+<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="17.25" y="10.15" smashed="yes" rot="R270">
+<attribute name="NAME" x="16.1" y="6.4" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="-32.28" y="-34.3" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-49.53" y="49.53" smashed="yes">
-<attribute name="NAME" x="-50.8" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-50.8" y="46.99" size="1.27" layer="27"/>
+<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="13.39" y="10.65" smashed="yes">
+<attribute name="NAME" x="14.32" y="9.32" size="1.27" layer="25" rot="R180"/>
+<attribute name="SPICEPREFIX" value="C" x="62.92" y="-38.88" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-34.29" y="49.53" smashed="yes">
-<attribute name="NAME" x="-35.56" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-35.56" y="46.99" size="1.27" layer="27"/>
+<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.11" y="30.44" smashed="yes">
+<attribute name="NAME" x="11.62" y="26.5" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="43.4" y="-19.09" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-39.37" y="49.53" smashed="yes">
-<attribute name="NAME" x="-40.64" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-40.64" y="46.99" size="1.27" layer="27"/>
+<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.12" y="28.38" smashed="yes">
+<attribute name="NAME" x="11.43" y="31.41" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="48.49" y="-21.15" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-36.83" y="55.88" smashed="yes">
-<attribute name="NAME" x="-37.465" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="53.975" size="1.27" layer="27"/>
+<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="9.33" y="22.82" smashed="yes" rot="R180">
+<attribute name="NAME" x="7.565" y="23.385" size="1.27" layer="25" rot="R180"/>
+<attribute name="SPICEPREFIX" value="C" x="-27.5" y="78.7" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="-34.29" y="33.02" smashed="yes">
-<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="Molex" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MP" value="1050170001" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="-38.60026875" y="36.66023125" size="1.27008125" layer="25"/>
-<attribute name="PACKAGE" value="None" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-38.6027" y="28.76733125" size="1.2708" layer="27"/>
+<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="27.91" y="1.82" smashed="yes">
+<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="Molex" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MP" value="1050170001" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="NAME" x="23.59973125" y="5.46023125" size="1.27008125" layer="25"/>
+<attribute name="PACKAGE" value="None" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="23.5973" y="-2.43266875" size="1.2708" layer="27"/>
 </element>
-<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="-17.78" y="66.04" smashed="yes">
-<attribute name="NAME" x="-19.05" y="67.437" size="0.6096" layer="25" font="vector" ratio="20"/>
-<attribute name="VALUE" x="-19.05" y="64.008" size="0.6096" layer="27" font="vector" ratio="20"/>
+<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="8.42" y="4.44" smashed="yes">
+<attribute name="NAME" x="5.75" y="4.237" size="0.6096" layer="25" font="vector" ratio="20"/>
+<attribute name="VALUE" x="7.15" y="2.408" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/1" value="ELAB_PUSHBUTTON_1" x="28" y="6" smashed="yes"/>
-<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/1" value="ELAB_PUSHBUTTON_1" x="28" y="32" smashed="yes" rot="R180"/>
-<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="-25.6" y="65.23" smashed="yes" rot="R180"/>
-<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="-55.88" y="48.26" smashed="yes">
-<attribute name="NAME" x="-56.515" y="48.895" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-56.515" y="46.355" size="1.27" layer="27"/>
+<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="12" smashed="yes"/>
+<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="40" smashed="yes" rot="R180"/>
+<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="6.53" y="25.5" smashed="yes" rot="R90"/>
+<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="10.1" y="12" smashed="yes" rot="R90">
+<attribute name="NAME" x="10.665" y="13.765" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="58.36" y="67.88" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="55.88" smashed="yes">
-<attribute name="NAME" x="-42.545" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="53.975" size="1.27" layer="27"/>
+<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="43.4" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="43.965" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-12.48" y="18.99" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-36.83" y="60.96" smashed="yes">
-<attribute name="NAME" x="-37.465" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="59.055" size="1.27" layer="27"/>
+<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="41.765" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="102.06" y="91.03" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="55.88" smashed="yes">
-<attribute name="NAME" x="-47.625" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="53.975" size="1.27" layer="27"/>
+<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="39.465" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="94.68" y="101.19" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-52.07" y="55.88" smashed="yes">
-<attribute name="NAME" x="-52.705" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-52.705" y="53.975" size="1.27" layer="27"/>
+<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="37.165" y="55.965" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="92.38" y="106.27" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-57.15" y="55.88" smashed="yes">
-<attribute name="NAME" x="-57.785" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.785" y="53.975" size="1.27" layer="27"/>
+<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="39.365" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-17.08" y="3.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-16.51" y="60.96" smashed="yes">
-<attribute name="NAME" x="-17.145" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-17.145" y="59.055" size="1.27" layer="27"/>
+<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="37.065" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-24.46" y="44.39" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="60.96" smashed="yes">
-<attribute name="NAME" x="-42.545" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="59.055" size="1.27" layer="27"/>
+<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7" x="7.29" y="15.16" smashed="yes">
+<attribute name="NAME" x="6.655" y="15.795" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="49.2" y="-45.8" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="-50.8" y="60.96" smashed="yes">
-<attribute name="NAME" x="-51.435" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-51.435" y="59.055" size="1.27" layer="27"/>
+<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="16.2" y="16.86" smashed="yes">
+<attribute name="NAME" x="15.065" y="18.195" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="67" y="-44.1" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="-17.78" y="55.88" smashed="yes">
-<attribute name="NAME" x="-18.415" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-18.415" y="53.975" size="1.27" layer="27"/>
+<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="3.4" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="3.965" y="45.565" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="59.28" y="67.28" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="-24.13" y="55.88" smashed="yes">
-<attribute name="NAME" x="-24.765" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-24.765" y="53.975" size="1.27" layer="27"/>
+<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="1.3" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="1.865" y="45.365" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="57.18" y="73.63" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-21.59" y="60.96" smashed="yes">
-<attribute name="NAME" x="-22.225" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-22.225" y="59.055" size="1.27" layer="27"/>
+<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="10.8" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="10.3" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-50.16" y="27.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-26.67" y="60.96" smashed="yes">
-<attribute name="NAME" x="-27.305" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-27.305" y="59.055" size="1.27" layer="27"/>
+<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="15.04" y="49.53" smashed="yes" rot="R90">
+<attribute name="NAME" x="14.5" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="76" y="76.2" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-31.75" y="60.96" smashed="yes">
-<attribute name="NAME" x="-32.385" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-32.385" y="59.055" size="1.27" layer="27"/>
+<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="8.7" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="8.2" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-52.26" y="17.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="60.96" smashed="yes">
-<attribute name="NAME" x="-47.625" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="59.055" size="1.27" layer="27"/>
+<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="41.665" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-19.86" y="13.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="10.64" y="50.2" smashed="yes">
-<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="2.64" y="63.2" size="1.27" layer="25"/>
-<attribute name="PINS" value="16" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="PITCH" value="0.078&quot; / 2 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="2.64" y="39.1" size="1.27" layer="27"/>
+<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="11.79" y="61.15" smashed="yes">
+<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PINS" value="16" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PITCH" value="0.078&quot; / 2 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="6.69" y="60.25" size="1.27" layer="27"/>
 </element>
-<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="48" smashed="yes"/>
-<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="-54.61" y="60.96" smashed="yes"/>
-<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="-29.21" y="49.53" smashed="yes">
-<attribute name="NAME" x="-31.115" y="51.435" size="1.27" layer="25"/>
-<attribute name="VALUE" x="-31.115" y="46.101" size="1.27" layer="27"/>
+<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="58" smashed="yes"/>
+<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="7.5" y="11.8" smashed="yes"/>
+<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="15.63" y="13.91" smashed="yes" rot="R270">
+<attribute name="NAME" x="18.035" y="15.015" size="1.27" layer="25" rot="R270"/>
 </element>
-<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="-21.59" y="66.04" smashed="yes"/>
-<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="-56" y="-2" smashed="yes"/>
-<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-57" y="-6" smashed="yes">
-<attribute name="NAME" x="-57.635" y="-5.365" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="-57" y="-6" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.635" y="-7.905" size="1.27" layer="27"/>
+<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="10.04" y="25.49" smashed="yes" rot="R270"/>
+<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="2.7" y="36.8" smashed="yes" rot="R90"/>
+<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="12.9" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="12.4" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="12.9" y="49.5" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R17" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="0" x="-57" y="-11" smashed="yes">
-<attribute name="NAME" x="-57.635" y="-10.365" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="-57" y="-11" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.635" y="-12.905" size="1.27" layer="27"/>
+<element name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="13.6" y="42.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.87" y="40.803" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="14.87" y="44.232" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 </elements>
 <signals>
@@ -1991,8 +1979,6 @@ design rules under a new name.</description>
 <contactref element="U$1" pad="VCC"/>
 <contactref element="R6" pad="2"/>
 <contactref element="R8" pad="2"/>
-<contactref element="J4" pad="P$2"/>
-<contactref element="J4" pad="P$3"/>
 <contactref element="J3" pad="P$2"/>
 <contactref element="J3" pad="P$3"/>
 <contactref element="U4" pad="P$1"/>
@@ -2000,17 +1986,29 @@ design rules under a new name.</description>
 <contactref element="C5" pad="1"/>
 <contactref element="C4" pad="1"/>
 <contactref element="R16" pad="1"/>
-<wire x1="25.5" y1="28.2" x2="25.5" y2="35.8" width="0" layer="19" extent="1-1"/>
-<wire x1="30.5" y1="9.8" x2="25.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="30.5" y1="2.2" x2="30.5" y2="9.8" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="42.095" x2="25.5" y2="35.8" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.74" y1="60.96" x2="2.44" y2="42.095" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="64.765" x2="-20.74" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="67.315" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.9" y1="60.96" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.24" y1="49.53" x2="-30.9" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-40.32" y1="49.53" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-57.85" y1="-6" x2="-40.32" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="53.045" x2="4.455" y2="53.045" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.8" x2="8.7" y2="48.65" width="0.3" layer="1"/>
+<wire x1="4.455" y1="53.045" x2="8.7" y2="48.8" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.65" x2="12.9" y2="48.65" width="0.3" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.1" y="26.4"/>
+<vertex x="8.38" y="26.4"/>
+<vertex x="7.52" y="27.26"/>
+<vertex x="7.52" y="31.2"/>
+<vertex x="8.8" y="31.2"/>
+<vertex x="8.82" y="31.18"/>
+<vertex x="8.82" y="26.98"/>
+<vertex x="9.1" y="26.7"/>
+</polygon>
+<wire x1="8.7" y1="48.65" x2="8.7" y2="32.04" width="0.3" layer="1"/>
+<wire x1="8.7" y1="32.04" x2="8.7" y2="30.98" width="0.3" layer="1"/>
+<wire x1="8.7" y1="30.98" x2="8.16" y2="30.44" width="0.3" layer="1"/>
+<wire x1="11.315" y1="26.49" x2="11.315" y2="31.525" width="0.3" layer="1"/>
+<wire x1="10.8" y1="32.04" x2="8.7" y2="32.04" width="0.3" layer="1"/>
+<wire x1="11.315" y1="31.525" x2="10.8" y2="32.04" width="0.3" layer="1"/>
+<wire x1="12.9" y1="48.65" x2="10.8" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="15.8" x2="11.315" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="8.2" x2="30.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="GND">
 <contactref element="J1" pad="SH1"/>
@@ -2041,181 +2039,317 @@ design rules under a new name.</description>
 <contactref element="C3" pad="2"/>
 <contactref element="R5" pad="1"/>
 <contactref element="J5" pad="P$1"/>
-<contactref element="R17" pad="2"/>
-<wire x1="28" y1="40.38" x2="28" y2="55.62" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="42.095" x2="28" y2="40.38" width="0" layer="19" extent="1-1"/>
-<wire x1="-24.98" y1="55.88" x2="18.84" y2="42.095" width="0" layer="19" extent="1-1"/>
-<wire x1="-27.52" y1="60.96" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="64.765" x2="-27.52" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="66.04" x2="-21.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.09" y1="67.315" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.21" y1="48.23" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.34" y1="49.53" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-38.42" y1="49.53" x2="-33.34" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-43.5" y1="49.53" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-48.58" y1="49.53" x2="-43.5" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.68" y1="55.88" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-42.76" y1="60.96" x2="-37.68" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-51.65" y1="60.96" x2="-42.76" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.61" y1="60.96" x2="-51.65" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="62.31" x2="-54.61" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.79" y1="35.37" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-32.99" y1="35.37" x2="-31.79" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.29" y1="32.67" x2="-32.99" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.39" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.79" y1="32.67" x2="-31.39" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.29" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.19" y1="32.67" x2="-35.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.79" y1="32.67" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-36.79" y1="35.37" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-57.375" y1="-2" x2="-37.79" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.15" y1="-11" x2="-57.375" y2="-2" width="0" layer="19" extent="1-1"/>
+<contactref element="J6" pad="1"/>
+<contactref element="J4" pad="P$1"/>
+<contactref element="J4" pad="P$4"/>
+<wire x1="8.765" y1="25.49" x2="10" y2="25.49" width="0.2" layer="1"/>
+<wire x1="10" y1="25.49" x2="10.04" y2="25.49" width="0.2" layer="1"/>
+<wire x1="11.315" y1="25.99" x2="10.5" y2="25.99" width="0.2" layer="1"/>
+<wire x1="10.5" y1="25.99" x2="10" y2="25.49" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.5" y="31.14"/>
+<vertex x="9.5" y="21.98"/>
+<vertex x="10.58" y="21.98"/>
+<vertex x="10.58" y="31.14"/>
+</polygon>
+<polygon width="0.3" layer="1" rank="2">
+<vertex x="0" y="0"/>
+<vertex x="0" y="68"/>
+<vertex x="56" y="68"/>
+<vertex x="56" y="0"/>
+</polygon>
+<polygon width="0.3" layer="16" rank="2">
+<vertex x="0" y="0"/>
+<vertex x="0" y="68"/>
+<vertex x="56" y="68"/>
+<vertex x="56" y="0"/>
+</polygon>
 </signal>
 <signal name="+5V">
 <contactref element="J1" pad="1"/>
 <contactref element="C2" pad="1"/>
 <contactref element="U3" pad="1"/>
 <contactref element="U3" pad="4"/>
-<wire x1="-30.16" y1="48.23" x2="-28.26" y2="50.83" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.59" y1="35.37" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-45.4" y1="49.53" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
+<wire x1="16.93" y1="12.96" x2="16.72" y2="12.96" width="0.3" layer="1"/>
+<wire x1="16.93" y1="12.96" x2="17" y2="12.89" width="0.3" layer="1"/>
+<wire x1="26.61" y1="4.17" x2="26.61" y2="5.45" width="0.4" layer="1"/>
+<wire x1="17" y1="10.82" x2="17.25" y2="11.1" width="0.4" layer="1"/>
+<wire x1="26.61" y1="5.45" x2="25.76" y2="6.3" width="0.4" layer="1"/>
+<wire x1="25.76" y1="6.3" x2="22.42" y2="6.3" width="0.4" layer="1"/>
+<wire x1="22.42" y1="6.3" x2="17.62" y2="11.1" width="0.4" layer="1"/>
+<wire x1="17.62" y1="11.1" x2="17.25" y2="11.1" width="0.4" layer="1"/>
+<wire x1="16.93" y1="12.96" x2="16.93" y2="11.42" width="0.4" layer="1"/>
+<wire x1="16.93" y1="11.42" x2="17.25" y2="11.1" width="0.4" layer="1"/>
+<wire x1="14.33" y1="14.86" x2="15.64" y2="14.86" width="0.2" layer="1"/>
+<wire x1="16.93" y1="13.57" x2="16.93" y2="12.96" width="0.2" layer="1"/>
+<wire x1="15.64" y1="14.86" x2="16.93" y2="13.57" width="0.2" layer="1"/>
 </signal>
 <signal name="UART_RX">
 <contactref element="J1" pad="2"/>
 <contactref element="U$1" pad="RX"/>
 <contactref element="R9" pad="2"/>
-<wire x1="-34.94" y1="35.37" x2="-46.14" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="54" x2="-34.94" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="64.95" x2="20.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="20.75" y1="64.95" x2="21.7" y2="64" width="0.3" layer="1"/>
+<wire x1="21.7" y1="64" x2="22.9" y2="64" width="0.3" layer="1"/>
+<via x="22.9" y="64" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="22.9" y1="64" x2="41.5" y2="64" width="0.3" layer="16"/>
+<wire x1="41.5" y1="64" x2="44.8" y2="60.7" width="0.3" layer="16"/>
+<wire x1="44.8" y1="60.7" x2="44.8" y2="58.4" width="0.3" layer="16"/>
+<wire x1="44.8" y1="58.4" x2="44.7" y2="58.3" width="0.3" layer="16"/>
+<via x="44.7" y="58.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="44.7" y1="58.3" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="60.05" width="0.3" layer="1"/>
+<wire x1="43.9" y1="57.5" x2="42.2" y2="57.5" width="0.3" layer="1"/>
+<wire x1="42.2" y1="57.5" x2="41.1" y2="58.6" width="0.3" layer="1"/>
+<wire x1="27.26" y1="4.17" x2="27.26" y2="5.3" width="0.3" layer="1"/>
+<wire x1="27.26" y1="5.3" x2="28.3" y2="6.34" width="0.3" layer="1"/>
+<wire x1="28.3" y1="6.34" x2="33.26" y2="6.34" width="0.3" layer="1"/>
+<wire x1="33.26" y1="6.34" x2="38.28" y2="11.36" width="0.3" layer="1"/>
+<wire x1="38.28" y1="11.36" x2="38.28" y2="49.34" width="0.3" layer="1"/>
+<wire x1="38.28" y1="49.34" x2="38.28" y2="50.22" width="0.3" layer="1"/>
+<wire x1="38.28" y1="50.22" x2="38.82" y2="50.76" width="0.3" layer="1"/>
+<wire x1="38.82" y1="50.76" x2="41.76" y2="50.76" width="0.3" layer="1"/>
+<wire x1="43.9" y1="52.9" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.76" y1="50.76" x2="43.9" y2="52.9" width="0.3" layer="1"/>
 </signal>
 <signal name="UART_TX">
 <contactref element="J1" pad="3"/>
 <contactref element="U$1" pad="TX"/>
 <contactref element="R12" pad="2"/>
-<wire x1="-34.29" y1="35.37" x2="-46.14" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="56" x2="-34.29" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="66.95" x2="18.25" y2="66.95" width="0.3" layer="1"/>
+<wire x1="18.25" y1="66.95" x2="17.7" y2="66.4" width="0.3" layer="1"/>
+<wire x1="17.7" y1="66.4" x2="17.7" y2="61" width="0.3" layer="1"/>
+<via x="17.7" y="61" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.7" y1="61" x2="32.9" y2="61" width="0.3" layer="16"/>
+<wire x1="32.9" y1="61" x2="35" y2="58.9" width="0.3" layer="16"/>
+<via x="35" y="58.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="35" y1="58.9" x2="36.5" y2="57.4" width="0.3" layer="1"/>
+<wire x1="36.5" y1="57.4" x2="38" y2="57.4" width="0.3" layer="1"/>
+<wire x1="38" y1="57.4" x2="38.7" y2="56.7" width="0.3" layer="1"/>
+<wire x1="38.7" y1="55.15" x2="38.8" y2="55.05" width="0.3" layer="1"/>
+<wire x1="38.7" y1="56.7" x2="38.7" y2="55.15" width="0.3" layer="1"/>
+<wire x1="27.91" y1="4.17" x2="27.91" y2="5.11" width="0.3" layer="1"/>
+<wire x1="27.91" y1="5.11" x2="28.56" y2="5.76" width="0.3" layer="1"/>
+<wire x1="28.56" y1="5.76" x2="33.44" y2="5.76" width="0.3" layer="1"/>
+<wire x1="39.22" y1="49.82" x2="39.14" y2="49.9" width="0.3" layer="1"/>
+<wire x1="39.22" y1="49.82" x2="39.22" y2="11.54" width="0.3" layer="1"/>
+<via x="39.14" y="49.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="39.1" y1="56.3" x2="39.1" y2="49.94" width="0.3" layer="16"/>
+<wire x1="39.14" y1="49.9" x2="39.1" y2="49.94" width="0.3" layer="16"/>
+<wire x1="39.1" y1="56.3" x2="38.7" y2="56.7" width="0.3" layer="16"/>
+<via x="38.7" y="56.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="33.44" y1="5.76" x2="39.22" y2="11.54" width="0.3" layer="1"/>
 </signal>
 <signal name="VBAT_D">
 <contactref element="U$1" pad="ADC"/>
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
-<wire x1="-23.28" y1="55.88" x2="-16.93" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="54" x2="-23.28" y2="55.88" width="0" layer="19" extent="1-1"/>
+<contactref element="J4" pad="P$2"/>
+<contactref element="J4" pad="P$3"/>
+<wire x1="3.4" y1="50.35" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="1.6" y1="50.35" x2="1.3" y2="50.35" width="0.3" layer="1"/>
+<wire x1="3.59" y1="64.95" x2="2.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="1.2" y1="50.75" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="2.75" y1="64.95" x2="1.2" y2="63.4" width="0.3" layer="1"/>
+<wire x1="1.2" y1="63.4" x2="1.2" y2="50.75" width="0.3" layer="1"/>
+<wire x1="25.5" y1="36.2" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.4" y1="50.35" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RST">
 <contactref element="U$1" pad="REST"/>
 <contactref element="U$1" pad="GPIO16"/>
 <contactref element="R6" pad="1"/>
 <contactref element="J5" pad="P$2"/>
-<wire x1="2.44" y1="50" x2="2.44" y2="56" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.44" y1="60.96" x2="2.44" y2="56" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.625" y1="-2" x2="-22.44" y2="60.96" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$1">
-<contactref element="U$1" pad="GPIO15"/>
-<contactref element="R7" pad="2"/>
-<contactref element="J4" pad="P$1"/>
-<contactref element="J4" pad="P$4"/>
-<wire x1="30.5" y1="28.2" x2="-25.82" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="30.5" y1="35.8" x2="30.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="44" x2="30.5" y2="35.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="66.95" x2="6.55" y2="66.95" width="0.3" layer="1"/>
+<wire x1="6.55" y1="66.95" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<via x="6.7" y="66.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="6.7" y1="66.8" x2="6.7" y2="55.9" width="0.3" layer="16"/>
+<wire x1="10.7" y1="51.9" x2="10.8" y2="51.9" width="0.3" layer="16"/>
+<via x="10.8" y="51.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="50.35" width="0.3" layer="1"/>
+<wire x1="6.7" y1="55.9" x2="10.7" y2="51.9" width="0.3" layer="16"/>
+<wire x1="3.59" y1="60.95" x2="5.25" y2="60.95" width="0.3" layer="1"/>
+<wire x1="5.25" y1="60.95" x2="6.7" y2="62.4" width="0.3" layer="1"/>
+<wire x1="6.7" y1="62.4" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="47.7" width="0.3" layer="16"/>
+<wire x1="10.8" y1="47.7" x2="2.7" y2="39.6" width="0.3" layer="16"/>
+<via x="2.7" y="39.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="2.7" y1="39.6" x2="2.7" y2="38.175" width="0.3" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="R8" pad="1"/>
 <contactref element="U$1" pad="CH_PD"/>
-<wire x1="2.44" y1="52" x2="-32.6" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="62.95" x2="5.55" y2="62.95" width="0.3" layer="1"/>
+<wire x1="5.55" y1="62.95" x2="5.6" y2="62.9" width="0.3" layer="1"/>
+<via x="5.6" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="5.6" y1="62.9" x2="5.6" y2="54.7" width="0.3" layer="16"/>
+<wire x1="5.6" y1="54.7" x2="8.7" y2="51.6" width="0.3" layer="16"/>
+<via x="8.7" y="51.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="8.7" y1="51.6" x2="8.7" y2="50.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="GPIO2"/>
 <contactref element="J3" pad="P$1"/>
 <contactref element="J3" pad="P$4"/>
-<wire x1="25.5" y1="9.8" x2="25.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="46" x2="25.5" y2="9.8" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="15.8" x2="19.99" y2="56.95" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="8.2" x2="25.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="U$1" pad="GPIO4"/>
 <contactref element="R10" pad="2"/>
-<wire x1="18.84" y1="52" x2="-41.06" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="62.95" x2="24.25" y2="62.95" width="0.3" layer="1"/>
+<wire x1="24.25" y1="62.95" x2="24.3" y2="62.9" width="0.3" layer="1"/>
+<via x="24.3" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="24.3" y1="62.9" x2="40.8" y2="62.9" width="0.3" layer="16"/>
+<wire x1="40.8" y1="62.9" x2="43.4" y2="60.3" width="0.3" layer="16"/>
+<wire x1="43.4" y1="60.3" x2="43.4" y2="58.8" width="0.3" layer="16"/>
+<via x="43.4" y="58.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="43.4" y1="58.8" x2="43.4" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="U$1" pad="GPIO5"/>
 <contactref element="R11" pad="2"/>
-<wire x1="18.84" y1="50" x2="-35.98" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="60.95" x2="34.65" y2="60.95" width="0.3" layer="1"/>
+<wire x1="34.65" y1="60.95" x2="34.7" y2="60.9" width="0.3" layer="1"/>
+<via x="34.7" y="60.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="34.7" y1="60.9" x2="38.8" y2="60.9" width="0.3" layer="16"/>
+<wire x1="38.8" y1="60.9" x2="41.1" y2="58.6" width="0.3" layer="16"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="56.3" width="0.3" layer="16"/>
+<via x="41.1" y="56.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="41.1" y1="56.3" x2="41.1" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_E">
 <contactref element="U$1" pad="GPIO14"/>
 <contactref element="R13" pad="2"/>
-<wire x1="-51.22" y1="55.88" x2="2.44" y2="48" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="58.95" x2="6.85" y2="58.95" width="0.3" layer="1"/>
+<wire x1="6.85" y1="58.95" x2="7.4" y2="58.4" width="0.3" layer="1"/>
+<via x="7.4" y="58.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="7.4" y1="58.4" x2="9.4" y2="56.4" width="0.3" layer="16"/>
+<wire x1="9.4" y1="56.4" x2="36.4" y2="56.4" width="0.3" layer="16"/>
+<via x="36.4" y="56.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="36.4" y1="56.4" x2="36.5" y2="56.3" width="0.3" layer="1"/>
+<wire x1="36.5" y1="56.3" x2="36.5" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_F">
 <contactref element="U$1" pad="GPIO12"/>
 <contactref element="R14" pad="2"/>
-<wire x1="-56.3" y1="55.88" x2="2.44" y2="46" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="56.95" x2="7.45" y2="56.95" width="0.3" layer="1"/>
+<wire x1="7.45" y1="56.95" x2="9.2" y2="58.7" width="0.3" layer="1"/>
+<via x="9.2" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38" y1="57.9" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="9.2" y1="58.7" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="38" y1="57.9" x2="38.8" y2="58.7" width="0.3" layer="16"/>
+<via x="38.8" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38.8" y1="58.7" x2="38.8" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_G">
 <contactref element="U$1" pad="GPIO13"/>
 <contactref element="R15" pad="2"/>
-<wire x1="2.44" y1="44" x2="-15.66" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="54.95" x2="7.05" y2="54.95" width="0.3" layer="1"/>
+<wire x1="36.4" y1="59.95" x2="36.5" y2="60.05" width="0.3" layer="1"/>
+<wire x1="7.05" y1="54.95" x2="12.05" y2="59.95" width="0.3" layer="1"/>
+<wire x1="12.05" y1="59.95" x2="36.4" y2="59.95" width="0.3" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="U$2" pad="P$10"/>
 <contactref element="R15" pad="1"/>
-<wire x1="22.92" y1="55.62" x2="-17.36" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="65.62" x2="26.79" y2="61.75" width="0.3" layer="1"/>
+<wire x1="26.79" y1="61.75" x2="36.5" y2="61.75" width="0.3" layer="1"/>
 </signal>
 <signal name="N$14">
 <contactref element="R14" pad="1"/>
 <contactref element="U$2" pad="P$9"/>
-<wire x1="-58" y1="55.88" x2="25.46" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="65.62" x2="27.68" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38.8" y1="62.6" x2="38.8" y2="61.75" width="0.3" layer="1"/>
+<wire x1="27.68" y1="63.4" x2="38" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38" y1="63.4" x2="38.8" y2="62.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$15">
 <contactref element="R13" pad="1"/>
 <contactref element="U$2" pad="P$1"/>
-<wire x1="-52.92" y1="55.88" x2="22.92" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="50.38" x2="25.89" y2="53.35" width="0.3" layer="1"/>
+<wire x1="25.89" y1="53.35" x2="36.5" y2="53.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="R11" pad="1"/>
 <contactref element="U$2" pad="P$4"/>
-<wire x1="-37.68" y1="60.96" x2="30.54" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="50.38" x2="31.76" y2="51.6" width="0.3" layer="1"/>
+<wire x1="41.1" y1="52.4" x2="41.1" y2="53.35" width="0.3" layer="1"/>
+<wire x1="31.76" y1="51.6" x2="40.3" y2="51.6" width="0.3" layer="1"/>
+<wire x1="40.3" y1="51.6" x2="41.1" y2="52.4" width="0.3" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="R9" pad="1"/>
 <contactref element="U$2" pad="P$7"/>
-<wire x1="-47.84" y1="60.96" x2="30.54" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="65.62" x2="31.76" y2="64.4" width="0.3" layer="1"/>
+<wire x1="41.1" y1="62.9" x2="41.1" y2="61.75" width="0.3" layer="1"/>
+<wire x1="31.76" y1="64.4" x2="39.6" y2="64.4" width="0.3" layer="1"/>
+<wire x1="39.6" y1="64.4" x2="41.1" y2="62.9" width="0.3" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="R10" pad="1"/>
 <contactref element="U$2" pad="P$6"/>
-<wire x1="33.08" y1="55.62" x2="-42.76" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="33.08" y1="65.62" x2="41.38" y2="65.62" width="0.3" layer="1"/>
+<wire x1="43.4" y1="63.6" x2="43.4" y2="61.75" width="0.3" layer="1"/>
+<wire x1="41.38" y1="65.62" x2="43.4" y2="63.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$19">
 <contactref element="U$2" pad="P$2"/>
 <contactref element="R12" pad="1"/>
-<wire x1="-47.84" y1="55.88" x2="25.46" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="50.38" x2="27.38" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.8" y1="52.6" x2="38.8" y2="53.35" width="0.3" layer="1"/>
+<wire x1="27.38" y1="52.3" x2="38.5" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.5" y1="52.3" x2="38.8" y2="52.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="L1" pad="P$2"/>
 <contactref element="U4" pad="P$2"/>
-<wire x1="-26.35" y1="65.23" x2="-22.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.79" y1="25.99" x2="6.53" y2="26.25" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.12" y="25.9"/>
+<vertex x="5.64" y="25.9"/>
+<vertex x="5.64" y="26.6"/>
+<vertex x="7.66" y="26.6"/>
+<vertex x="8.18" y="26.08"/>
+<vertex x="9.1" y="26.08"/>
+<vertex x="9.12" y="26.06"/>
+</polygon>
 </signal>
 <signal name="N$4">
 <contactref element="L1" pad="P$1"/>
 <contactref element="U4" pad="P$4"/>
-<wire x1="-24.85" y1="65.23" x2="-21.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.77" y1="24.99" x2="6.53" y2="24.75" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="9.07" y="25.03"/>
+<vertex x="9.07" y="24.96"/>
+<vertex x="8.01" y="24.96"/>
+<vertex x="7.44" y="24.39"/>
+<vertex x="5.64" y="24.39"/>
+<vertex x="5.64" y="25.03"/>
+</polygon>
 </signal>
 <signal name="N$6">
 <contactref element="J2" pad="1"/>
 <contactref element="U2" pad="P$1"/>
 <contactref element="U2" pad="P$2"/>
 <contactref element="C1" pad="1"/>
-<wire x1="-31.33" y1="55.88" x2="-17.78" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.435" y1="59.61" x2="-31.33" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="59.61" x2="-54.435" y2="59.61" width="0" layer="19" extent="1-1"/>
+<polygon width="0.3" layer="1" thermals="no">
+<vertex x="6.68" y="10.54"/>
+<vertex x="7.72" y="10.54"/>
+<vertex x="7.72" y="7.1"/>
+<vertex x="9.48" y="5.34"/>
+<vertex x="9.48" y="2.9"/>
+<vertex x="6.68" y="2.9"/>
+</polygon>
 </signal>
 <signal name="N$7">
 <contactref element="C1" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="U2" pad="P$3"/>
-<wire x1="-53.835" y1="59.61" x2="-29.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.73" y1="48.26" x2="-53.835" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="8.275" y1="10.45" x2="8.275" y2="9.075" width="0.3" layer="1"/>
+<wire x1="8.275" y1="9.075" x2="8.85" y2="8.5" width="0.3" layer="1"/>
+<wire x1="8.275" y1="10.45" x2="9.4" y2="10.45" width="0.3" layer="1"/>
+<wire x1="9.4" y1="10.45" x2="10.1" y2="11.15" width="0.3" layer="1"/>
 </signal>
 <signal name="N$9">
 <contactref element="J2" pad="2"/>
@@ -2227,34 +2361,87 @@ design rules under a new name.</description>
 <contactref element="U4" pad="P$6"/>
 <contactref element="C6" pad="2"/>
 <contactref element="R4" pad="1"/>
-<wire x1="-20.59" y1="67.315" x2="-15.24" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="67.315" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.59" y1="64.765" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-18.63" y1="55.88" x2="-20.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-28.26" y1="48.23" x2="-18.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.98" y1="55.88" x2="-28.26" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-50.48" y1="49.53" x2="-35.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.03" y1="48.26" x2="-50.48" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="25.49" x2="11.84" y2="25.49" width="0.2" layer="1"/>
+<wire x1="12.05" y1="25.7" x2="12.7" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.84" y1="25.49" x2="12.05" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.315" y1="24.49" x2="11.61" y2="24.49" width="0.2" layer="1"/>
+<wire x1="12.7" y1="24.3" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="11.61" y1="24.49" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="12.7" y1="25.7" x2="13.1" y2="25.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="24.7" x2="12.7" y2="24.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="25.3" x2="13.1" y2="24.7" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="8.26" y="24.54"/>
+<vertex x="9.06" y="24.54"/>
+<vertex x="9.06" y="21.12"/>
+<vertex x="12.1" y="18.08"/>
+<vertex x="12.1" y="13.94"/>
+<vertex x="12.9" y="13.14"/>
+<vertex x="14.84" y="13.14"/>
+<vertex x="14.84" y="12.78"/>
+<vertex x="14.3" y="12.78"/>
+<vertex x="13" y="11.48"/>
+<vertex x="13" y="2.95263125"/>
+<vertex x="11.9" y="2.923684375"/>
+<vertex x="11.896315625" y="2.92"/>
+<vertex x="10.04" y="2.92"/>
+<vertex x="10.04" y="7.8"/>
+<vertex x="10.94" y="8.7"/>
+<vertex x="10.94" y="12.22"/>
+<vertex x="10.72" y="12.44"/>
+<vertex x="9.36" y="12.44"/>
+<vertex x="9.36" y="16.26"/>
+<vertex x="7.9" y="17.72"/>
+<vertex x="7.9" y="24.18"/>
+</polygon>
+<wire x1="12.7" y1="24.3" x2="12.7" y2="18.62" width="0.3" layer="1"/>
+<wire x1="12.7" y1="18.62" x2="11.76" y2="17.68" width="0.3" layer="1"/>
+<wire x1="3.4" y1="48.65" x2="4.82" y2="47.23" width="0.3" layer="1"/>
+<wire x1="4.82" y1="23.5" x2="5.82" y2="22.5" width="0.3" layer="1"/>
+<wire x1="5.82" y1="22.5" x2="8.16" y2="22.5" width="0.3" layer="1"/>
+<wire x1="8.16" y1="22.5" x2="8.48" y2="22.82" width="0.3" layer="1"/>
+<wire x1="4.82" y1="47.23" x2="4.82" y2="23.5" width="0.3" layer="1"/>
 </signal>
 <signal name="N$11">
 <contactref element="U2" pad="P$5"/>
 <contactref element="R2" pad="2"/>
-<wire x1="-54.435" y1="62.31" x2="-41.06" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="7.675" y1="13.15" x2="7.675" y2="14.695" width="0.3" layer="1"/>
+<wire x1="7.675" y1="14.695" x2="8.14" y2="15.16" width="0.3" layer="1"/>
 </signal>
 <signal name="N$12">
 <contactref element="R3" pad="2"/>
 <contactref element="U3" pad="5"/>
-<wire x1="-49.95" y1="60.96" x2="-30.16" y2="50.83" width="0" layer="19" extent="1-1"/>
+<wire x1="17.05" y1="16.86" x2="17.05" y2="14.98" width="0.3" layer="1"/>
+<wire x1="17.05" y1="14.98" x2="16.93" y2="14.86" width="0.3" layer="1"/>
 </signal>
 <signal name="PS">
 <contactref element="U4" pad="P$7"/>
+<contactref element="U$1" pad="GPIO15"/>
+<contactref element="R7" pad="2"/>
+<wire x1="19.99" y1="54.95" x2="17.85" y2="54.95" width="0.3" layer="1"/>
+<wire x1="15.04" y1="52.14" x2="15.04" y2="50.38" width="0.3" layer="1"/>
+<wire x1="17.85" y1="54.95" x2="15.04" y2="52.14" width="0.3" layer="1"/>
+<wire x1="15.06" y1="52.14" x2="17.3" y2="49.9" width="0.2" layer="16"/>
+<wire x1="15.06" y1="52.14" x2="15.04" y2="52.14" width="0.2" layer="16"/>
+<via x="15.04" y="52.14" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.3" y1="28.6" x2="13.7" y2="25" width="0.2" layer="16"/>
+<wire x1="13.7" y1="25" x2="12.3" y2="25" width="0.2" layer="16"/>
+<via x="12.3" y="25" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="12.3" y1="25" x2="11.325" y2="25" width="0.2" layer="1"/>
+<wire x1="11.325" y1="25" x2="11.315" y2="24.99" width="0.2" layer="1"/>
+<wire x1="17.3" y1="49.9" x2="17.3" y2="28.6" width="0.2" layer="16"/>
 </signal>
 <signal name="N$20">
 <contactref element="U$1" pad="GPIO0"/>
 <contactref element="R16" pad="2"/>
-<contactref element="R17" pad="1"/>
-<wire x1="-56.15" y1="-6" x2="-57.85" y2="-11" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="48" x2="-56.15" y2="-6" width="0" layer="19" extent="1-1"/>
+<contactref element="J6" pad="2"/>
+<wire x1="19.99" y1="58.95" x2="16.35" y2="58.95" width="0.3" layer="1"/>
+<wire x1="12.9" y1="55.5" x2="12.9" y2="51.8" width="0.3" layer="1"/>
+<wire x1="12.9" y1="51.8" x2="12.9" y2="50.35" width="0.3" layer="1"/>
+<wire x1="16.35" y1="58.95" x2="12.9" y2="55.5" width="0.3" layer="1"/>
+<wire x1="11.06" y1="42.2" x2="12.9" y2="44.04" width="0.3" layer="16"/>
+<wire x1="12.9" y1="44.04" x2="12.9" y2="51.8" width="0.3" layer="16"/>
+<via x="12.9" y="51.8" extent="1-16" drill="0.35" diameter="0.6"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
diff --git a/esp8266-wifi-remote.b#2 b/esp8266-wifi-remote.b#2
index acf8b1e..b2832ec 100644
--- a/esp8266-wifi-remote.b#2
+++ b/esp8266-wifi-remote.b#2
@@ -3,10 +3,10 @@
 <eagle version="9.3.2">
 <drawing>
 <settings>
-<setting alwaysvectorfont="no"/>
+<setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.5" altunitdist="mm" altunit="mm"/>
+<grid distance="0.02" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.05" altunitdist="mm" altunit="mm"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="16" fill="1" visible="no" active="no"/>
@@ -52,7 +52,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
@@ -157,12 +157,20 @@
 <layer number="255" name="routoute" color="7" fill="1" visible="no" active="yes"/>
 </layers>
 <board>
-<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="1b573db7-ea5e-6f0b-fd8c-026be2f409d2"/>
+<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="c7a73c68-2407-04ba-dc3a-388155fd8543"/>
 <plain>
-<wire x1="0" y1="0" x2="160" y2="0" width="0" layer="20"/>
-<wire x1="160" y1="0" x2="160" y2="100" width="0" layer="20"/>
-<wire x1="160" y1="100" x2="0" y2="100" width="0" layer="20"/>
-<wire x1="0" y1="100" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="0" x2="56" y2="0" width="0" layer="20"/>
+<wire x1="56" y1="0" x2="56" y2="68" width="0" layer="20"/>
+<wire x1="56" y1="68" x2="0" y2="68" width="0" layer="20"/>
+<wire x1="0" y1="68" x2="0" y2="0" width="0" layer="20"/>
+<hole x="3" y="3" drill="3.2"/>
+<hole x="53" y="3" drill="3.2"/>
+<hole x="53" y="65" drill="3.2"/>
+<text x="12.8" y="3.6" size="1.778" layer="21">BAT</text>
+<text x="10.3" y="0.9" size="1.778" layer="21">+</text>
+<text x="8" y="1" size="1.778" layer="21">-</text>
+<text x="9" y="38.4" size="1.778" layer="21">BOOT</text>
+<text x="3.3" y="34" size="1.778" layer="21" rot="R90" align="bottom-right">RST</text>
 </plain>
 <libraries>
 <library name="rcl" urn="urn:adsk.eagle:library:334">
@@ -1411,7 +1419,7 @@ CONN_02
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -1420,10 +1428,16 @@ CONN_02
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/1" type="box" library_version="3">
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
 <packageinstances>
 <packageinstance name="ELAB_PUSHBUTTON_1"/>
 </packageinstances>
@@ -1552,7 +1566,7 @@ CONN_02
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -1581,7 +1595,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -1653,7 +1667,7 @@ package type OT</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="default">
+<designrules name="default *">
 <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 
@@ -1682,7 +1696,7 @@ design rules under a new name.</description>
 <param name="mdSmdSmd" value="6mil"/>
 <param name="mdViaViaSameLayer" value="6mil"/>
 <param name="mnLayersViaInSmd" value="2"/>
-<param name="mdCopperDimension" value="40mil"/>
+<param name="mdCopperDimension" value="20mil"/>
 <param name="mdDrill" value="6mil"/>
 <param name="mdSmdStop" value="0mil"/>
 <param name="msWidth" value="6mil"/>
@@ -1837,152 +1851,127 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-30.48" y="55.88" smashed="yes">
-<attribute name="NAME" x="-31.115" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-31.115" y="53.975" size="1.27" layer="27"/>
+<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="8" y="8.5" smashed="yes">
+<attribute name="NAME" x="3.965" y="7.935" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="38.48" y="-47.38" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-44.45" y="49.53" smashed="yes">
-<attribute name="NAME" x="-45.72" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-45.72" y="46.99" size="1.27" layer="27"/>
+<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="17.25" y="10.15" smashed="yes" rot="R270">
+<attribute name="NAME" x="16.1" y="6.4" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="-32.28" y="-34.3" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-49.53" y="49.53" smashed="yes">
-<attribute name="NAME" x="-50.8" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-50.8" y="46.99" size="1.27" layer="27"/>
+<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="13.39" y="10.65" smashed="yes">
+<attribute name="NAME" x="14.32" y="9.32" size="1.27" layer="25" rot="R180"/>
+<attribute name="SPICEPREFIX" value="C" x="62.92" y="-38.88" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-34.29" y="49.53" smashed="yes">
-<attribute name="NAME" x="-35.56" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-35.56" y="46.99" size="1.27" layer="27"/>
+<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.11" y="30.44" smashed="yes">
+<attribute name="NAME" x="11.62" y="26.5" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="43.4" y="-19.09" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-39.37" y="49.53" smashed="yes">
-<attribute name="NAME" x="-40.64" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-40.64" y="46.99" size="1.27" layer="27"/>
+<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.12" y="28.38" smashed="yes">
+<attribute name="NAME" x="11.43" y="31.41" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="48.49" y="-21.15" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-36.83" y="55.88" smashed="yes">
-<attribute name="NAME" x="-37.465" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="53.975" size="1.27" layer="27"/>
+<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="9.33" y="22.82" smashed="yes" rot="R180">
+<attribute name="NAME" x="7.565" y="23.385" size="1.27" layer="25" rot="R180"/>
+<attribute name="SPICEPREFIX" value="C" x="-27.5" y="78.7" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="-34.29" y="33.02" smashed="yes">
-<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="Molex" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MP" value="1050170001" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="-38.60026875" y="36.66023125" size="1.27008125" layer="25"/>
-<attribute name="PACKAGE" value="None" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-38.6027" y="28.76733125" size="1.2708" layer="27"/>
+<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="27.91" y="1.82" smashed="yes">
+<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="Molex" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MP" value="1050170001" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="NAME" x="23.59973125" y="5.46023125" size="1.27008125" layer="25"/>
+<attribute name="PACKAGE" value="None" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="23.5973" y="-2.43266875" size="1.2708" layer="27"/>
 </element>
-<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="-17.78" y="66.04" smashed="yes">
-<attribute name="NAME" x="-19.05" y="67.437" size="0.6096" layer="25" font="vector" ratio="20"/>
-<attribute name="VALUE" x="-19.05" y="64.008" size="0.6096" layer="27" font="vector" ratio="20"/>
+<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="8.42" y="4.44" smashed="yes">
+<attribute name="NAME" x="5.75" y="4.237" size="0.6096" layer="25" font="vector" ratio="20"/>
+<attribute name="VALUE" x="7.15" y="2.408" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/1" value="ELAB_PUSHBUTTON_1" x="28" y="6" smashed="yes"/>
-<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/1" value="ELAB_PUSHBUTTON_1" x="28" y="32" smashed="yes" rot="R180"/>
-<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="-25.4" y="64.77" smashed="yes"/>
-<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="-55.88" y="48.26" smashed="yes">
-<attribute name="NAME" x="-56.515" y="48.895" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-56.515" y="46.355" size="1.27" layer="27"/>
+<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="12" smashed="yes"/>
+<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="40" smashed="yes" rot="R180"/>
+<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="6.53" y="25.5" smashed="yes" rot="R90"/>
+<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="10.1" y="12" smashed="yes" rot="R90">
+<attribute name="NAME" x="10.665" y="13.765" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="58.36" y="67.88" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="55.88" smashed="yes">
-<attribute name="NAME" x="-42.545" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="53.975" size="1.27" layer="27"/>
+<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="43.4" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="43.965" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-12.48" y="18.99" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-36.83" y="60.96" smashed="yes">
-<attribute name="NAME" x="-37.465" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="59.055" size="1.27" layer="27"/>
+<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="41.765" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="102.06" y="91.03" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="55.88" smashed="yes">
-<attribute name="NAME" x="-47.625" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="53.975" size="1.27" layer="27"/>
+<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="39.465" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="94.68" y="101.19" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-52.07" y="55.88" smashed="yes">
-<attribute name="NAME" x="-52.705" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-52.705" y="53.975" size="1.27" layer="27"/>
+<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="37.165" y="55.965" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="92.38" y="106.27" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-57.15" y="55.88" smashed="yes">
-<attribute name="NAME" x="-57.785" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.785" y="53.975" size="1.27" layer="27"/>
+<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="39.365" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-17.08" y="3.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-16.51" y="60.96" smashed="yes">
-<attribute name="NAME" x="-17.145" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-17.145" y="59.055" size="1.27" layer="27"/>
+<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="37.065" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-24.46" y="44.39" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="60.96" smashed="yes">
-<attribute name="NAME" x="-42.545" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="59.055" size="1.27" layer="27"/>
+<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7" x="7.29" y="15.16" smashed="yes">
+<attribute name="NAME" x="6.655" y="15.795" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="49.2" y="-45.8" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="-50.8" y="60.96" smashed="yes">
-<attribute name="NAME" x="-51.435" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-51.435" y="59.055" size="1.27" layer="27"/>
+<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="16.2" y="16.86" smashed="yes">
+<attribute name="NAME" x="15.065" y="18.195" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="67" y="-44.1" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="-17.78" y="55.88" smashed="yes">
-<attribute name="NAME" x="-18.415" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-18.415" y="53.975" size="1.27" layer="27"/>
+<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="3.4" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="3.965" y="45.565" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="59.28" y="67.28" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="-24.13" y="55.88" smashed="yes">
-<attribute name="NAME" x="-24.765" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-24.765" y="53.975" size="1.27" layer="27"/>
+<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="1.3" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="1.865" y="45.365" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="57.18" y="73.63" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-21.59" y="60.96" smashed="yes">
-<attribute name="NAME" x="-22.225" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-22.225" y="59.055" size="1.27" layer="27"/>
+<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="10.8" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="10.3" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-50.16" y="27.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-26.67" y="60.96" smashed="yes">
-<attribute name="NAME" x="-27.305" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-27.305" y="59.055" size="1.27" layer="27"/>
+<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="15.04" y="49.53" smashed="yes" rot="R90">
+<attribute name="NAME" x="14.5" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="76" y="76.2" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-31.75" y="60.96" smashed="yes">
-<attribute name="NAME" x="-32.385" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-32.385" y="59.055" size="1.27" layer="27"/>
+<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="8.7" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="8.2" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-52.26" y="17.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="60.96" smashed="yes">
-<attribute name="NAME" x="-47.625" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="59.055" size="1.27" layer="27"/>
+<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="41.665" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-19.86" y="13.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="10.64" y="50.2" smashed="yes">
-<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="2.64" y="63.2" size="1.27" layer="25"/>
-<attribute name="PINS" value="16" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="PITCH" value="0.078&quot; / 2 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="2.64" y="39.1" size="1.27" layer="27"/>
+<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="11.79" y="61.15" smashed="yes">
+<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PINS" value="16" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PITCH" value="0.078&quot; / 2 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="6.69" y="60.25" size="1.27" layer="27"/>
 </element>
-<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="48" smashed="yes"/>
-<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="-54.61" y="60.96" smashed="yes"/>
-<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="-29.21" y="49.53" smashed="yes">
-<attribute name="NAME" x="-31.115" y="51.435" size="1.27" layer="25"/>
-<attribute name="VALUE" x="-31.115" y="46.101" size="1.27" layer="27"/>
+<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="58" smashed="yes"/>
+<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="7.5" y="11.8" smashed="yes"/>
+<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="15.63" y="13.91" smashed="yes" rot="R270">
+<attribute name="NAME" x="18.035" y="15.015" size="1.27" layer="25" rot="R270"/>
 </element>
-<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="-21.59" y="66.04" smashed="yes"/>
-<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="-56" y="-2" smashed="yes"/>
-<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-57" y="-6" smashed="yes">
-<attribute name="NAME" x="-57.635" y="-5.365" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="-57" y="-6" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.635" y="-7.905" size="1.27" layer="27"/>
+<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="10.04" y="25.49" smashed="yes" rot="R270"/>
+<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="2.7" y="36.8" smashed="yes" rot="R90"/>
+<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="12.9" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="12.4" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="12.9" y="49.5" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R17" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="0" x="-57" y="-11" smashed="yes">
-<attribute name="NAME" x="-57.635" y="-10.365" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="-57" y="-11" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.635" y="-12.905" size="1.27" layer="27"/>
+<element name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="13.6" y="42.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.87" y="40.803" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="14.87" y="44.232" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 </elements>
 <signals>
@@ -1990,8 +1979,6 @@ design rules under a new name.</description>
 <contactref element="U$1" pad="VCC"/>
 <contactref element="R6" pad="2"/>
 <contactref element="R8" pad="2"/>
-<contactref element="J4" pad="P$2"/>
-<contactref element="J4" pad="P$3"/>
 <contactref element="J3" pad="P$2"/>
 <contactref element="J3" pad="P$3"/>
 <contactref element="U4" pad="P$1"/>
@@ -1999,17 +1986,29 @@ design rules under a new name.</description>
 <contactref element="C5" pad="1"/>
 <contactref element="C4" pad="1"/>
 <contactref element="R16" pad="1"/>
-<wire x1="25.5" y1="28.2" x2="25.5" y2="35.8" width="0" layer="19" extent="1-1"/>
-<wire x1="30.5" y1="9.8" x2="25.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="30.5" y1="2.2" x2="30.5" y2="9.8" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="42.095" x2="25.5" y2="35.8" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.74" y1="60.96" x2="2.44" y2="42.095" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="64.765" x2="-20.74" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="67.315" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.9" y1="60.96" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.24" y1="49.53" x2="-30.9" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-40.32" y1="49.53" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-57.85" y1="-6" x2="-40.32" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="53.045" x2="4.455" y2="53.045" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.8" x2="8.7" y2="48.65" width="0.3" layer="1"/>
+<wire x1="4.455" y1="53.045" x2="8.7" y2="48.8" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.65" x2="12.9" y2="48.65" width="0.3" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.1" y="26.4"/>
+<vertex x="8.38" y="26.4"/>
+<vertex x="7.52" y="27.26"/>
+<vertex x="7.52" y="31.2"/>
+<vertex x="8.8" y="31.2"/>
+<vertex x="8.82" y="31.18"/>
+<vertex x="8.82" y="26.98"/>
+<vertex x="9.1" y="26.7"/>
+</polygon>
+<wire x1="8.7" y1="48.65" x2="8.7" y2="32.04" width="0.3" layer="1"/>
+<wire x1="8.7" y1="32.04" x2="8.7" y2="30.98" width="0.3" layer="1"/>
+<wire x1="8.7" y1="30.98" x2="8.16" y2="30.44" width="0.3" layer="1"/>
+<wire x1="11.315" y1="26.49" x2="11.315" y2="31.525" width="0.3" layer="1"/>
+<wire x1="10.8" y1="32.04" x2="8.7" y2="32.04" width="0.3" layer="1"/>
+<wire x1="11.315" y1="31.525" x2="10.8" y2="32.04" width="0.3" layer="1"/>
+<wire x1="12.9" y1="48.65" x2="10.8" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="15.8" x2="11.315" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="8.2" x2="30.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="GND">
 <contactref element="J1" pad="SH1"/>
@@ -2040,181 +2039,329 @@ design rules under a new name.</description>
 <contactref element="C3" pad="2"/>
 <contactref element="R5" pad="1"/>
 <contactref element="J5" pad="P$1"/>
-<contactref element="R17" pad="2"/>
-<wire x1="28" y1="40.38" x2="28" y2="55.62" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="42.095" x2="28" y2="40.38" width="0" layer="19" extent="1-1"/>
-<wire x1="-24.98" y1="55.88" x2="18.84" y2="42.095" width="0" layer="19" extent="1-1"/>
-<wire x1="-27.52" y1="60.96" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="64.765" x2="-27.52" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="66.04" x2="-21.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.09" y1="67.315" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.21" y1="48.23" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.34" y1="49.53" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-38.42" y1="49.53" x2="-33.34" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-43.5" y1="49.53" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-48.58" y1="49.53" x2="-43.5" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.68" y1="55.88" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-42.76" y1="60.96" x2="-37.68" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-51.65" y1="60.96" x2="-42.76" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.61" y1="60.96" x2="-51.65" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="62.31" x2="-54.61" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.79" y1="35.37" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-32.99" y1="35.37" x2="-31.79" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.29" y1="32.67" x2="-32.99" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.39" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.79" y1="32.67" x2="-31.39" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.29" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.19" y1="32.67" x2="-35.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.79" y1="32.67" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-36.79" y1="35.37" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-57.375" y1="-2" x2="-37.79" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.15" y1="-11" x2="-57.375" y2="-2" width="0" layer="19" extent="1-1"/>
+<contactref element="J6" pad="1"/>
+<contactref element="J4" pad="P$1"/>
+<contactref element="J4" pad="P$4"/>
+<wire x1="8.765" y1="25.49" x2="10" y2="25.49" width="0.2" layer="1"/>
+<wire x1="10" y1="25.49" x2="10.04" y2="25.49" width="0.2" layer="1"/>
+<wire x1="11.315" y1="25.99" x2="10.5" y2="25.99" width="0.2" layer="1"/>
+<wire x1="10.5" y1="25.99" x2="10" y2="25.49" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.5" y="31.14"/>
+<vertex x="9.5" y="21.98"/>
+<vertex x="10.58" y="21.98"/>
+<vertex x="10.58" y="31.14"/>
+</polygon>
+<wire x1="19.99" y1="53.045" x2="28" y2="65.62" width="0" layer="19" extent="1-1"/>
+<wire x1="15.04" y1="48.68" x2="19.99" y2="53.045" width="0" layer="19" extent="1-1"/>
+<wire x1="13.6" y1="42.2" x2="15.04" y2="48.68" width="0" layer="19" extent="1-1"/>
+<wire x1="28" y1="50.38" x2="19.99" y2="53.045" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="43.8" x2="28" y2="50.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="36.2" x2="30.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="10.06" y1="30.44" x2="13.6" y2="42.2" width="0" layer="19" extent="1-1"/>
+<wire x1="15.35" y1="16.86" x2="10.18" y2="22.82" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="13.91" x2="15.35" y2="16.86" width="0" layer="19" extent="1-1"/>
+<wire x1="14.34" y1="10.65" x2="14.33" y2="13.91" width="0" layer="19" extent="1-1"/>
+<wire x1="17.25" y1="9.2" x2="14.34" y2="10.65" width="0" layer="19" extent="1-1"/>
+<wire x1="7.5" y1="11.8" x2="14.34" y2="10.65" width="0" layer="19" extent="1-1"/>
+<wire x1="6.9" y1="13.15" x2="7.5" y2="11.8" width="0" layer="19" extent="1-1"/>
+<wire x1="6.44" y1="15.16" x2="6.9" y2="13.15" width="0" layer="19" extent="1-1"/>
+<wire x1="2.7" y1="35.425" x2="10.06" y2="30.44" width="0" layer="19" extent="1-1"/>
+<wire x1="25.41" y1="4.17" x2="17.25" y2="9.2" width="0" layer="19" extent="1-1"/>
+<wire x1="25.01" y1="1.47" x2="25.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="24.41" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="26.91" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="28.91" y1="1.47" x2="26.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.81" y1="1.47" x2="28.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="31.41" y1="1.47" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.41" y1="4.17" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="29.21" y1="4.17" x2="30.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="1.3" y1="48.65" x2="2.7" y2="35.425" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="+5V">
 <contactref element="J1" pad="1"/>
 <contactref element="C2" pad="1"/>
 <contactref element="U3" pad="1"/>
 <contactref element="U3" pad="4"/>
-<wire x1="-30.16" y1="48.23" x2="-28.26" y2="50.83" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.59" y1="35.37" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-45.4" y1="49.53" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="14.86" x2="14.82" y2="14.86" width="0.3" layer="1"/>
+<wire x1="16.93" y1="12.96" x2="16.72" y2="12.96" width="0.3" layer="1"/>
+<wire x1="16.72" y1="12.96" x2="14.82" y2="14.86" width="0.3" layer="1"/>
+<wire x1="16.93" y1="12.96" x2="17" y2="12.89" width="0.3" layer="1"/>
+<wire x1="26.61" y1="4.17" x2="26.61" y2="5.45" width="0.4" layer="1"/>
+<wire x1="17" y1="10.82" x2="17.25" y2="11.1" width="0.4" layer="1"/>
+<wire x1="26.61" y1="5.45" x2="25.76" y2="6.3" width="0.4" layer="1"/>
+<wire x1="25.76" y1="6.3" x2="22.42" y2="6.3" width="0.4" layer="1"/>
+<wire x1="22.42" y1="6.3" x2="17.62" y2="11.1" width="0.4" layer="1"/>
+<wire x1="17.62" y1="11.1" x2="17.25" y2="11.1" width="0.4" layer="1"/>
+<wire x1="16.93" y1="12.96" x2="16.93" y2="11.42" width="0.4" layer="1"/>
+<wire x1="16.93" y1="11.42" x2="17.25" y2="11.1" width="0.4" layer="1"/>
 </signal>
 <signal name="UART_RX">
 <contactref element="J1" pad="2"/>
 <contactref element="U$1" pad="RX"/>
 <contactref element="R9" pad="2"/>
-<wire x1="-34.94" y1="35.37" x2="-46.14" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="54" x2="-34.94" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="64.95" x2="20.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="20.75" y1="64.95" x2="21.7" y2="64" width="0.3" layer="1"/>
+<wire x1="21.7" y1="64" x2="22.9" y2="64" width="0.3" layer="1"/>
+<via x="22.9" y="64" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="22.9" y1="64" x2="41.5" y2="64" width="0.3" layer="16"/>
+<wire x1="41.5" y1="64" x2="44.8" y2="60.7" width="0.3" layer="16"/>
+<wire x1="44.8" y1="60.7" x2="44.8" y2="58.4" width="0.3" layer="16"/>
+<wire x1="44.8" y1="58.4" x2="44.7" y2="58.3" width="0.3" layer="16"/>
+<via x="44.7" y="58.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="44.7" y1="58.3" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="60.05" width="0.3" layer="1"/>
+<wire x1="43.9" y1="57.5" x2="42.2" y2="57.5" width="0.3" layer="1"/>
+<wire x1="42.2" y1="57.5" x2="41.1" y2="58.6" width="0.3" layer="1"/>
+<wire x1="27.26" y1="4.17" x2="27.26" y2="5.3" width="0.3" layer="1"/>
+<wire x1="27.26" y1="5.3" x2="28.3" y2="6.34" width="0.3" layer="1"/>
+<wire x1="28.3" y1="6.34" x2="33.26" y2="6.34" width="0.3" layer="1"/>
+<wire x1="33.26" y1="6.34" x2="38.28" y2="11.36" width="0.3" layer="1"/>
+<wire x1="38.28" y1="11.36" x2="38.28" y2="49.34" width="0.3" layer="1"/>
+<wire x1="38.28" y1="49.34" x2="38.28" y2="50.22" width="0.3" layer="1"/>
+<wire x1="38.28" y1="50.22" x2="38.82" y2="50.76" width="0.3" layer="1"/>
+<wire x1="38.82" y1="50.76" x2="41.76" y2="50.76" width="0.3" layer="1"/>
+<wire x1="43.9" y1="52.9" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.76" y1="50.76" x2="43.9" y2="52.9" width="0.3" layer="1"/>
 </signal>
 <signal name="UART_TX">
 <contactref element="J1" pad="3"/>
 <contactref element="U$1" pad="TX"/>
 <contactref element="R12" pad="2"/>
-<wire x1="-34.29" y1="35.37" x2="-46.14" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="56" x2="-34.29" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="66.95" x2="18.25" y2="66.95" width="0.3" layer="1"/>
+<wire x1="18.25" y1="66.95" x2="17.7" y2="66.4" width="0.3" layer="1"/>
+<wire x1="17.7" y1="66.4" x2="17.7" y2="61" width="0.3" layer="1"/>
+<via x="17.7" y="61" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.7" y1="61" x2="32.9" y2="61" width="0.3" layer="16"/>
+<wire x1="32.9" y1="61" x2="35" y2="58.9" width="0.3" layer="16"/>
+<via x="35" y="58.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="35" y1="58.9" x2="36.5" y2="57.4" width="0.3" layer="1"/>
+<wire x1="36.5" y1="57.4" x2="38" y2="57.4" width="0.3" layer="1"/>
+<wire x1="38" y1="57.4" x2="38.7" y2="56.7" width="0.3" layer="1"/>
+<wire x1="38.7" y1="55.15" x2="38.8" y2="55.05" width="0.3" layer="1"/>
+<wire x1="38.7" y1="56.7" x2="38.7" y2="55.15" width="0.3" layer="1"/>
+<wire x1="27.91" y1="4.17" x2="27.91" y2="5.11" width="0.3" layer="1"/>
+<wire x1="27.91" y1="5.11" x2="28.56" y2="5.76" width="0.3" layer="1"/>
+<wire x1="28.56" y1="5.76" x2="33.44" y2="5.76" width="0.3" layer="1"/>
+<wire x1="39.22" y1="49.82" x2="39.14" y2="49.9" width="0.3" layer="1"/>
+<wire x1="39.22" y1="49.82" x2="39.22" y2="11.54" width="0.3" layer="1"/>
+<via x="39.14" y="49.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="39.1" y1="56.3" x2="39.1" y2="49.94" width="0.3" layer="16"/>
+<wire x1="39.14" y1="49.9" x2="39.1" y2="49.94" width="0.3" layer="16"/>
+<wire x1="39.1" y1="56.3" x2="38.7" y2="56.7" width="0.3" layer="16"/>
+<via x="38.7" y="56.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="33.44" y1="5.76" x2="39.22" y2="11.54" width="0.3" layer="1"/>
 </signal>
 <signal name="VBAT_D">
 <contactref element="U$1" pad="ADC"/>
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
-<wire x1="-23.28" y1="55.88" x2="-16.93" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="54" x2="-23.28" y2="55.88" width="0" layer="19" extent="1-1"/>
+<contactref element="J4" pad="P$2"/>
+<contactref element="J4" pad="P$3"/>
+<wire x1="3.4" y1="50.35" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="1.6" y1="50.35" x2="1.3" y2="50.35" width="0.3" layer="1"/>
+<wire x1="3.59" y1="64.95" x2="2.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="1.2" y1="50.75" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="2.75" y1="64.95" x2="1.2" y2="63.4" width="0.3" layer="1"/>
+<wire x1="1.2" y1="63.4" x2="1.2" y2="50.75" width="0.3" layer="1"/>
+<wire x1="25.5" y1="36.2" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.4" y1="50.35" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RST">
 <contactref element="U$1" pad="REST"/>
 <contactref element="U$1" pad="GPIO16"/>
 <contactref element="R6" pad="1"/>
 <contactref element="J5" pad="P$2"/>
-<wire x1="2.44" y1="50" x2="2.44" y2="56" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.44" y1="60.96" x2="2.44" y2="56" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.625" y1="-2" x2="-22.44" y2="60.96" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$1">
-<contactref element="U$1" pad="GPIO15"/>
-<contactref element="R7" pad="2"/>
-<contactref element="J4" pad="P$1"/>
-<contactref element="J4" pad="P$4"/>
-<wire x1="30.5" y1="28.2" x2="-25.82" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="30.5" y1="35.8" x2="30.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="44" x2="30.5" y2="35.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="66.95" x2="6.55" y2="66.95" width="0.3" layer="1"/>
+<wire x1="6.55" y1="66.95" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<via x="6.7" y="66.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="6.7" y1="66.8" x2="6.7" y2="55.9" width="0.3" layer="16"/>
+<wire x1="10.7" y1="51.9" x2="10.8" y2="51.9" width="0.3" layer="16"/>
+<via x="10.8" y="51.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="50.35" width="0.3" layer="1"/>
+<wire x1="6.7" y1="55.9" x2="10.7" y2="51.9" width="0.3" layer="16"/>
+<wire x1="3.59" y1="60.95" x2="5.25" y2="60.95" width="0.3" layer="1"/>
+<wire x1="5.25" y1="60.95" x2="6.7" y2="62.4" width="0.3" layer="1"/>
+<wire x1="6.7" y1="62.4" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="47.7" width="0.3" layer="16"/>
+<wire x1="10.8" y1="47.7" x2="2.7" y2="39.6" width="0.3" layer="16"/>
+<via x="2.7" y="39.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="2.7" y1="39.6" x2="2.7" y2="38.175" width="0.3" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="R8" pad="1"/>
 <contactref element="U$1" pad="CH_PD"/>
-<wire x1="2.44" y1="52" x2="-32.6" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="62.95" x2="5.55" y2="62.95" width="0.3" layer="1"/>
+<wire x1="5.55" y1="62.95" x2="5.6" y2="62.9" width="0.3" layer="1"/>
+<via x="5.6" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="5.6" y1="62.9" x2="5.6" y2="54.7" width="0.3" layer="16"/>
+<wire x1="5.6" y1="54.7" x2="8.7" y2="51.6" width="0.3" layer="16"/>
+<via x="8.7" y="51.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="8.7" y1="51.6" x2="8.7" y2="50.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="GPIO2"/>
 <contactref element="J3" pad="P$1"/>
 <contactref element="J3" pad="P$4"/>
-<wire x1="25.5" y1="9.8" x2="25.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="46" x2="25.5" y2="9.8" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="15.8" x2="19.99" y2="56.95" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="8.2" x2="25.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="U$1" pad="GPIO4"/>
 <contactref element="R10" pad="2"/>
-<wire x1="18.84" y1="52" x2="-41.06" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="62.95" x2="24.25" y2="62.95" width="0.3" layer="1"/>
+<wire x1="24.25" y1="62.95" x2="24.3" y2="62.9" width="0.3" layer="1"/>
+<via x="24.3" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="24.3" y1="62.9" x2="40.8" y2="62.9" width="0.3" layer="16"/>
+<wire x1="40.8" y1="62.9" x2="43.4" y2="60.3" width="0.3" layer="16"/>
+<wire x1="43.4" y1="60.3" x2="43.4" y2="58.8" width="0.3" layer="16"/>
+<via x="43.4" y="58.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="43.4" y1="58.8" x2="43.4" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="U$1" pad="GPIO5"/>
 <contactref element="R11" pad="2"/>
-<wire x1="18.84" y1="50" x2="-35.98" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="60.95" x2="34.65" y2="60.95" width="0.3" layer="1"/>
+<wire x1="34.65" y1="60.95" x2="34.7" y2="60.9" width="0.3" layer="1"/>
+<via x="34.7" y="60.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="34.7" y1="60.9" x2="38.8" y2="60.9" width="0.3" layer="16"/>
+<wire x1="38.8" y1="60.9" x2="41.1" y2="58.6" width="0.3" layer="16"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="56.3" width="0.3" layer="16"/>
+<via x="41.1" y="56.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="41.1" y1="56.3" x2="41.1" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_E">
 <contactref element="U$1" pad="GPIO14"/>
 <contactref element="R13" pad="2"/>
-<wire x1="-51.22" y1="55.88" x2="2.44" y2="48" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="58.95" x2="6.85" y2="58.95" width="0.3" layer="1"/>
+<wire x1="6.85" y1="58.95" x2="7.4" y2="58.4" width="0.3" layer="1"/>
+<via x="7.4" y="58.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="7.4" y1="58.4" x2="9.4" y2="56.4" width="0.3" layer="16"/>
+<wire x1="9.4" y1="56.4" x2="36.4" y2="56.4" width="0.3" layer="16"/>
+<via x="36.4" y="56.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="36.4" y1="56.4" x2="36.5" y2="56.3" width="0.3" layer="1"/>
+<wire x1="36.5" y1="56.3" x2="36.5" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_F">
 <contactref element="U$1" pad="GPIO12"/>
 <contactref element="R14" pad="2"/>
-<wire x1="-56.3" y1="55.88" x2="2.44" y2="46" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="56.95" x2="7.45" y2="56.95" width="0.3" layer="1"/>
+<wire x1="7.45" y1="56.95" x2="9.2" y2="58.7" width="0.3" layer="1"/>
+<via x="9.2" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38" y1="57.9" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="9.2" y1="58.7" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="38" y1="57.9" x2="38.8" y2="58.7" width="0.3" layer="16"/>
+<via x="38.8" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38.8" y1="58.7" x2="38.8" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_G">
 <contactref element="U$1" pad="GPIO13"/>
 <contactref element="R15" pad="2"/>
-<wire x1="2.44" y1="44" x2="-15.66" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="54.95" x2="7.05" y2="54.95" width="0.3" layer="1"/>
+<wire x1="36.4" y1="59.95" x2="36.5" y2="60.05" width="0.3" layer="1"/>
+<wire x1="7.05" y1="54.95" x2="12.05" y2="59.95" width="0.3" layer="1"/>
+<wire x1="12.05" y1="59.95" x2="36.4" y2="59.95" width="0.3" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="U$2" pad="P$10"/>
 <contactref element="R15" pad="1"/>
-<wire x1="22.92" y1="55.62" x2="-17.36" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="65.62" x2="26.79" y2="61.75" width="0.3" layer="1"/>
+<wire x1="26.79" y1="61.75" x2="36.5" y2="61.75" width="0.3" layer="1"/>
 </signal>
 <signal name="N$14">
 <contactref element="R14" pad="1"/>
 <contactref element="U$2" pad="P$9"/>
-<wire x1="-58" y1="55.88" x2="25.46" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="65.62" x2="27.68" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38.8" y1="62.6" x2="38.8" y2="61.75" width="0.3" layer="1"/>
+<wire x1="27.68" y1="63.4" x2="38" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38" y1="63.4" x2="38.8" y2="62.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$15">
 <contactref element="R13" pad="1"/>
 <contactref element="U$2" pad="P$1"/>
-<wire x1="-52.92" y1="55.88" x2="22.92" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="50.38" x2="25.89" y2="53.35" width="0.3" layer="1"/>
+<wire x1="25.89" y1="53.35" x2="36.5" y2="53.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="R11" pad="1"/>
 <contactref element="U$2" pad="P$4"/>
-<wire x1="-37.68" y1="60.96" x2="30.54" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="50.38" x2="31.76" y2="51.6" width="0.3" layer="1"/>
+<wire x1="41.1" y1="52.4" x2="41.1" y2="53.35" width="0.3" layer="1"/>
+<wire x1="31.76" y1="51.6" x2="40.3" y2="51.6" width="0.3" layer="1"/>
+<wire x1="40.3" y1="51.6" x2="41.1" y2="52.4" width="0.3" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="R9" pad="1"/>
 <contactref element="U$2" pad="P$7"/>
-<wire x1="-47.84" y1="60.96" x2="30.54" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="65.62" x2="31.76" y2="64.4" width="0.3" layer="1"/>
+<wire x1="41.1" y1="62.9" x2="41.1" y2="61.75" width="0.3" layer="1"/>
+<wire x1="31.76" y1="64.4" x2="39.6" y2="64.4" width="0.3" layer="1"/>
+<wire x1="39.6" y1="64.4" x2="41.1" y2="62.9" width="0.3" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="R10" pad="1"/>
 <contactref element="U$2" pad="P$6"/>
-<wire x1="33.08" y1="55.62" x2="-42.76" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="33.08" y1="65.62" x2="41.38" y2="65.62" width="0.3" layer="1"/>
+<wire x1="43.4" y1="63.6" x2="43.4" y2="61.75" width="0.3" layer="1"/>
+<wire x1="41.38" y1="65.62" x2="43.4" y2="63.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$19">
 <contactref element="U$2" pad="P$2"/>
 <contactref element="R12" pad="1"/>
-<wire x1="-47.84" y1="55.88" x2="25.46" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="50.38" x2="27.38" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.8" y1="52.6" x2="38.8" y2="53.35" width="0.3" layer="1"/>
+<wire x1="27.38" y1="52.3" x2="38.5" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.5" y1="52.3" x2="38.8" y2="52.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="L1" pad="P$2"/>
 <contactref element="U4" pad="P$2"/>
-<wire x1="-24.65" y1="64.77" x2="-22.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.79" y1="25.99" x2="6.53" y2="26.25" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.12" y="25.9"/>
+<vertex x="5.64" y="25.9"/>
+<vertex x="5.64" y="26.6"/>
+<vertex x="7.66" y="26.6"/>
+<vertex x="8.18" y="26.08"/>
+<vertex x="9.1" y="26.08"/>
+<vertex x="9.12" y="26.06"/>
+</polygon>
 </signal>
 <signal name="N$4">
 <contactref element="L1" pad="P$1"/>
 <contactref element="U4" pad="P$4"/>
-<wire x1="-26.15" y1="64.77" x2="-21.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.77" y1="24.99" x2="6.53" y2="24.75" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="9.07" y="25.03"/>
+<vertex x="9.07" y="24.96"/>
+<vertex x="8.01" y="24.96"/>
+<vertex x="7.44" y="24.39"/>
+<vertex x="5.64" y="24.39"/>
+<vertex x="5.64" y="25.03"/>
+</polygon>
 </signal>
 <signal name="N$6">
 <contactref element="J2" pad="1"/>
 <contactref element="U2" pad="P$1"/>
 <contactref element="U2" pad="P$2"/>
 <contactref element="C1" pad="1"/>
-<wire x1="-31.33" y1="55.88" x2="-17.78" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.435" y1="59.61" x2="-31.33" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="59.61" x2="-54.435" y2="59.61" width="0" layer="19" extent="1-1"/>
+<polygon width="0.3" layer="1" thermals="no">
+<vertex x="6.68" y="10.54"/>
+<vertex x="7.72" y="10.54"/>
+<vertex x="7.72" y="7.1"/>
+<vertex x="9.48" y="5.34"/>
+<vertex x="9.48" y="2.9"/>
+<vertex x="6.68" y="2.9"/>
+</polygon>
 </signal>
 <signal name="N$7">
 <contactref element="C1" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="U2" pad="P$3"/>
-<wire x1="-53.835" y1="59.61" x2="-29.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.73" y1="48.26" x2="-53.835" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="8.275" y1="10.45" x2="8.275" y2="9.075" width="0.3" layer="1"/>
+<wire x1="8.275" y1="9.075" x2="8.85" y2="8.5" width="0.3" layer="1"/>
+<wire x1="8.275" y1="10.45" x2="9.4" y2="10.45" width="0.3" layer="1"/>
+<wire x1="9.4" y1="10.45" x2="10.1" y2="11.15" width="0.3" layer="1"/>
 </signal>
 <signal name="N$9">
 <contactref element="J2" pad="2"/>
@@ -2226,34 +2373,87 @@ design rules under a new name.</description>
 <contactref element="U4" pad="P$6"/>
 <contactref element="C6" pad="2"/>
 <contactref element="R4" pad="1"/>
-<wire x1="-20.59" y1="67.315" x2="-15.24" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="67.315" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.59" y1="64.765" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-18.63" y1="55.88" x2="-20.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-28.26" y1="48.23" x2="-18.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.98" y1="55.88" x2="-28.26" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-50.48" y1="49.53" x2="-35.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.03" y1="48.26" x2="-50.48" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="25.49" x2="11.84" y2="25.49" width="0.2" layer="1"/>
+<wire x1="12.05" y1="25.7" x2="12.7" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.84" y1="25.49" x2="12.05" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.315" y1="24.49" x2="11.61" y2="24.49" width="0.2" layer="1"/>
+<wire x1="12.7" y1="24.3" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="11.61" y1="24.49" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="12.7" y1="25.7" x2="13.1" y2="25.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="24.7" x2="12.7" y2="24.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="25.3" x2="13.1" y2="24.7" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="8.26" y="24.54"/>
+<vertex x="9.06" y="24.54"/>
+<vertex x="9.06" y="21.12"/>
+<vertex x="12.1" y="18.08"/>
+<vertex x="12.1" y="14.74"/>
+<vertex x="13.7" y="13.14"/>
+<vertex x="14.84" y="13.14"/>
+<vertex x="14.84" y="12.78"/>
+<vertex x="14.3" y="12.78"/>
+<vertex x="13" y="11.48"/>
+<vertex x="13" y="2.95263125"/>
+<vertex x="11.9" y="2.923684375"/>
+<vertex x="11.896315625" y="2.92"/>
+<vertex x="10.04" y="2.92"/>
+<vertex x="10.04" y="7.8"/>
+<vertex x="10.94" y="8.7"/>
+<vertex x="10.94" y="12.22"/>
+<vertex x="10.72" y="12.44"/>
+<vertex x="9.36" y="12.44"/>
+<vertex x="9.36" y="16.26"/>
+<vertex x="7.9" y="17.72"/>
+<vertex x="7.9" y="24.18"/>
+</polygon>
+<wire x1="12.7" y1="24.3" x2="12.7" y2="18.62" width="0.3" layer="1"/>
+<wire x1="12.7" y1="18.62" x2="11.76" y2="17.68" width="0.3" layer="1"/>
+<wire x1="3.4" y1="48.65" x2="4.82" y2="47.23" width="0.3" layer="1"/>
+<wire x1="4.82" y1="23.5" x2="5.82" y2="22.5" width="0.3" layer="1"/>
+<wire x1="5.82" y1="22.5" x2="8.16" y2="22.5" width="0.3" layer="1"/>
+<wire x1="8.16" y1="22.5" x2="8.48" y2="22.82" width="0.3" layer="1"/>
+<wire x1="4.82" y1="47.23" x2="4.82" y2="23.5" width="0.3" layer="1"/>
 </signal>
 <signal name="N$11">
 <contactref element="U2" pad="P$5"/>
 <contactref element="R2" pad="2"/>
-<wire x1="-54.435" y1="62.31" x2="-41.06" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="7.675" y1="13.15" x2="7.675" y2="14.695" width="0.3" layer="1"/>
+<wire x1="7.675" y1="14.695" x2="8.14" y2="15.16" width="0.3" layer="1"/>
 </signal>
 <signal name="N$12">
 <contactref element="R3" pad="2"/>
 <contactref element="U3" pad="5"/>
-<wire x1="-49.95" y1="60.96" x2="-30.16" y2="50.83" width="0" layer="19" extent="1-1"/>
+<wire x1="17.05" y1="16.86" x2="17.05" y2="14.98" width="0.3" layer="1"/>
+<wire x1="17.05" y1="14.98" x2="16.93" y2="14.86" width="0.3" layer="1"/>
 </signal>
 <signal name="PS">
 <contactref element="U4" pad="P$7"/>
+<contactref element="U$1" pad="GPIO15"/>
+<contactref element="R7" pad="2"/>
+<wire x1="19.99" y1="54.95" x2="17.85" y2="54.95" width="0.3" layer="1"/>
+<wire x1="15.04" y1="52.14" x2="15.04" y2="50.38" width="0.3" layer="1"/>
+<wire x1="17.85" y1="54.95" x2="15.04" y2="52.14" width="0.3" layer="1"/>
+<wire x1="15.06" y1="52.14" x2="17.3" y2="49.9" width="0.2" layer="16"/>
+<wire x1="15.06" y1="52.14" x2="15.04" y2="52.14" width="0.2" layer="16"/>
+<via x="15.04" y="52.14" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.3" y1="28.6" x2="13.7" y2="25" width="0.2" layer="16"/>
+<wire x1="13.7" y1="25" x2="12.3" y2="25" width="0.2" layer="16"/>
+<via x="12.3" y="25" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="12.3" y1="25" x2="11.325" y2="25" width="0.2" layer="1"/>
+<wire x1="11.325" y1="25" x2="11.315" y2="24.99" width="0.2" layer="1"/>
+<wire x1="17.3" y1="49.9" x2="17.3" y2="28.6" width="0.2" layer="16"/>
 </signal>
 <signal name="N$20">
 <contactref element="U$1" pad="GPIO0"/>
 <contactref element="R16" pad="2"/>
-<contactref element="R17" pad="1"/>
-<wire x1="-56.15" y1="-6" x2="-57.85" y2="-11" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="48" x2="-56.15" y2="-6" width="0" layer="19" extent="1-1"/>
+<contactref element="J6" pad="2"/>
+<wire x1="19.99" y1="58.95" x2="16.35" y2="58.95" width="0.3" layer="1"/>
+<wire x1="12.9" y1="55.5" x2="12.9" y2="51.8" width="0.3" layer="1"/>
+<wire x1="12.9" y1="51.8" x2="12.9" y2="50.35" width="0.3" layer="1"/>
+<wire x1="16.35" y1="58.95" x2="12.9" y2="55.5" width="0.3" layer="1"/>
+<wire x1="11.06" y1="42.2" x2="12.9" y2="44.04" width="0.3" layer="16"/>
+<wire x1="12.9" y1="44.04" x2="12.9" y2="51.8" width="0.3" layer="16"/>
+<via x="12.9" y="51.8" extent="1-16" drill="0.35" diameter="0.6"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
diff --git a/esp8266-wifi-remote.b#3 b/esp8266-wifi-remote.b#3
index 0871c13..3008c96 100644
--- a/esp8266-wifi-remote.b#3
+++ b/esp8266-wifi-remote.b#3
@@ -3,10 +3,10 @@
 <eagle version="9.3.2">
 <drawing>
 <settings>
-<setting alwaysvectorfont="no"/>
+<setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.5" altunitdist="mm" altunit="mm"/>
+<grid distance="0.02" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.05" altunitdist="mm" altunit="mm"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="16" fill="1" visible="no" active="no"/>
@@ -52,7 +52,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
@@ -157,12 +157,20 @@
 <layer number="255" name="routoute" color="7" fill="1" visible="no" active="yes"/>
 </layers>
 <board>
-<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="1b573db7-ea5e-6f0b-fd8c-026be2f409d2"/>
+<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="c7a73c68-2407-04ba-dc3a-388155fd8543"/>
 <plain>
-<wire x1="0" y1="0" x2="160" y2="0" width="0" layer="20"/>
-<wire x1="160" y1="0" x2="160" y2="100" width="0" layer="20"/>
-<wire x1="160" y1="100" x2="0" y2="100" width="0" layer="20"/>
-<wire x1="0" y1="100" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="0" x2="56" y2="0" width="0" layer="20"/>
+<wire x1="56" y1="0" x2="56" y2="68" width="0" layer="20"/>
+<wire x1="56" y1="68" x2="0" y2="68" width="0" layer="20"/>
+<wire x1="0" y1="68" x2="0" y2="0" width="0" layer="20"/>
+<hole x="3" y="3" drill="3.2"/>
+<hole x="53" y="3" drill="3.2"/>
+<hole x="53" y="65" drill="3.2"/>
+<text x="12.8" y="3.6" size="1.778" layer="21">BAT</text>
+<text x="10.3" y="0.9" size="1.778" layer="21">+</text>
+<text x="8" y="1" size="1.778" layer="21">-</text>
+<text x="9" y="38.4" size="1.778" layer="21">BOOT</text>
+<text x="3.3" y="34" size="1.778" layer="21" rot="R90" align="bottom-right">RST</text>
 </plain>
 <libraries>
 <library name="rcl" urn="urn:adsk.eagle:library:334">
@@ -1411,7 +1419,7 @@ CONN_02
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -1420,10 +1428,16 @@ CONN_02
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/1" type="box" library_version="3">
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
 <packageinstances>
 <packageinstance name="ELAB_PUSHBUTTON_1"/>
 </packageinstances>
@@ -1552,7 +1566,7 @@ CONN_02
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -1581,7 +1595,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -1653,7 +1667,7 @@ package type OT</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="default">
+<designrules name="default *">
 <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 
@@ -1682,7 +1696,7 @@ design rules under a new name.</description>
 <param name="mdSmdSmd" value="6mil"/>
 <param name="mdViaViaSameLayer" value="6mil"/>
 <param name="mnLayersViaInSmd" value="2"/>
-<param name="mdCopperDimension" value="40mil"/>
+<param name="mdCopperDimension" value="20mil"/>
 <param name="mdDrill" value="6mil"/>
 <param name="mdSmdStop" value="0mil"/>
 <param name="msWidth" value="6mil"/>
@@ -1837,152 +1851,127 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-30.48" y="55.88" smashed="yes">
-<attribute name="NAME" x="-31.115" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-31.115" y="53.975" size="1.27" layer="27"/>
+<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="8" y="8.5" smashed="yes">
+<attribute name="NAME" x="3.965" y="7.935" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="38.48" y="-47.38" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-44.45" y="49.53" smashed="yes">
-<attribute name="NAME" x="-45.72" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-45.72" y="46.99" size="1.27" layer="27"/>
+<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="17.25" y="10.15" smashed="yes" rot="R270">
+<attribute name="NAME" x="16.1" y="6.4" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="-32.28" y="-34.3" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-49.53" y="49.53" smashed="yes">
-<attribute name="NAME" x="-50.8" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-50.8" y="46.99" size="1.27" layer="27"/>
+<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="13.39" y="10.65" smashed="yes">
+<attribute name="NAME" x="14.32" y="9.32" size="1.27" layer="25" rot="R180"/>
+<attribute name="SPICEPREFIX" value="C" x="62.92" y="-38.88" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-34.29" y="49.53" smashed="yes">
-<attribute name="NAME" x="-35.56" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-35.56" y="46.99" size="1.27" layer="27"/>
+<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.11" y="30.44" smashed="yes">
+<attribute name="NAME" x="11.62" y="26.5" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="43.4" y="-19.09" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-39.37" y="49.53" smashed="yes">
-<attribute name="NAME" x="-40.64" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-40.64" y="46.99" size="1.27" layer="27"/>
+<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.12" y="28.38" smashed="yes">
+<attribute name="NAME" x="11.43" y="31.41" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="48.49" y="-21.15" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-36.83" y="55.88" smashed="yes">
-<attribute name="NAME" x="-37.465" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="53.975" size="1.27" layer="27"/>
+<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="9.33" y="22.82" smashed="yes" rot="R180">
+<attribute name="NAME" x="7.565" y="23.385" size="1.27" layer="25" rot="R180"/>
+<attribute name="SPICEPREFIX" value="C" x="-27.5" y="78.7" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="-34.29" y="33.02" smashed="yes">
-<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="Molex" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MP" value="1050170001" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="-38.60026875" y="36.66023125" size="1.27008125" layer="25"/>
-<attribute name="PACKAGE" value="None" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-38.6027" y="28.76733125" size="1.2708" layer="27"/>
+<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="27.91" y="1.82" smashed="yes">
+<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="Molex" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MP" value="1050170001" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="NAME" x="23.59973125" y="5.46023125" size="1.27008125" layer="25"/>
+<attribute name="PACKAGE" value="None" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="23.5973" y="-2.43266875" size="1.2708" layer="27"/>
 </element>
-<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="-17.78" y="66.04" smashed="yes">
-<attribute name="NAME" x="-19.05" y="67.437" size="0.6096" layer="25" font="vector" ratio="20"/>
-<attribute name="VALUE" x="-19.05" y="64.008" size="0.6096" layer="27" font="vector" ratio="20"/>
+<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="8.42" y="4.44" smashed="yes">
+<attribute name="NAME" x="5.75" y="4.237" size="0.6096" layer="25" font="vector" ratio="20"/>
+<attribute name="VALUE" x="7.15" y="2.408" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/1" value="ELAB_PUSHBUTTON_1" x="28" y="6" smashed="yes"/>
-<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/1" value="ELAB_PUSHBUTTON_1" x="28" y="32" smashed="yes" rot="R180"/>
-<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="-25.4" y="64.77" smashed="yes"/>
-<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="-55.88" y="48.26" smashed="yes">
-<attribute name="NAME" x="-56.515" y="48.895" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-56.515" y="46.355" size="1.27" layer="27"/>
+<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="12" smashed="yes"/>
+<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="40" smashed="yes" rot="R180"/>
+<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="6.53" y="25.5" smashed="yes" rot="R90"/>
+<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="10.1" y="12" smashed="yes" rot="R90">
+<attribute name="NAME" x="10.665" y="13.765" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="58.36" y="67.88" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="55.88" smashed="yes">
-<attribute name="NAME" x="-42.545" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="53.975" size="1.27" layer="27"/>
+<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="43.4" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="43.965" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-12.48" y="18.99" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-36.83" y="60.96" smashed="yes">
-<attribute name="NAME" x="-37.465" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="59.055" size="1.27" layer="27"/>
+<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="41.765" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="102.06" y="91.03" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="55.88" smashed="yes">
-<attribute name="NAME" x="-47.625" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="53.975" size="1.27" layer="27"/>
+<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="39.465" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="94.68" y="101.19" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-52.07" y="55.88" smashed="yes">
-<attribute name="NAME" x="-52.705" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-52.705" y="53.975" size="1.27" layer="27"/>
+<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="37.165" y="55.965" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="92.38" y="106.27" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-57.15" y="55.88" smashed="yes">
-<attribute name="NAME" x="-57.785" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.785" y="53.975" size="1.27" layer="27"/>
+<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="39.365" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-17.08" y="3.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-16.51" y="60.96" smashed="yes">
-<attribute name="NAME" x="-17.145" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-17.145" y="59.055" size="1.27" layer="27"/>
+<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="37.065" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-24.46" y="44.39" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="60.96" smashed="yes">
-<attribute name="NAME" x="-42.545" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="59.055" size="1.27" layer="27"/>
+<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7" x="7.29" y="15.16" smashed="yes">
+<attribute name="NAME" x="6.655" y="15.795" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="49.2" y="-45.8" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="-50.8" y="60.96" smashed="yes">
-<attribute name="NAME" x="-51.435" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-51.435" y="59.055" size="1.27" layer="27"/>
+<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="16.2" y="16.86" smashed="yes">
+<attribute name="NAME" x="15.065" y="18.195" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="67" y="-44.1" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="-17.78" y="55.88" smashed="yes">
-<attribute name="NAME" x="-18.415" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-18.415" y="53.975" size="1.27" layer="27"/>
+<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="3.4" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="3.965" y="45.565" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="59.28" y="67.28" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="-24.13" y="55.88" smashed="yes">
-<attribute name="NAME" x="-24.765" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-24.765" y="53.975" size="1.27" layer="27"/>
+<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="1.3" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="1.865" y="45.365" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="57.18" y="73.63" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-21.59" y="60.96" smashed="yes">
-<attribute name="NAME" x="-22.225" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-22.225" y="59.055" size="1.27" layer="27"/>
+<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="10.8" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="10.3" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-50.16" y="27.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-26.67" y="60.96" smashed="yes">
-<attribute name="NAME" x="-27.305" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-27.305" y="59.055" size="1.27" layer="27"/>
+<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="15.04" y="49.53" smashed="yes" rot="R90">
+<attribute name="NAME" x="14.5" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="76" y="76.2" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-31.75" y="60.96" smashed="yes">
-<attribute name="NAME" x="-32.385" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-32.385" y="59.055" size="1.27" layer="27"/>
+<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="8.7" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="8.2" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-52.26" y="17.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="60.96" smashed="yes">
-<attribute name="NAME" x="-47.625" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="59.055" size="1.27" layer="27"/>
+<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="41.665" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-19.86" y="13.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="10.64" y="50.2" smashed="yes">
-<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="2.64" y="63.2" size="1.27" layer="25"/>
-<attribute name="PINS" value="16" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="PITCH" value="0.078&quot; / 2 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="2.64" y="39.1" size="1.27" layer="27"/>
+<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="11.79" y="61.15" smashed="yes">
+<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PINS" value="16" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PITCH" value="0.078&quot; / 2 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="6.69" y="60.25" size="1.27" layer="27"/>
 </element>
-<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="48" smashed="yes"/>
-<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="-54.61" y="60.96" smashed="yes"/>
-<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="-29.21" y="49.53" smashed="yes">
-<attribute name="NAME" x="-31.115" y="51.435" size="1.27" layer="25"/>
-<attribute name="VALUE" x="-31.115" y="46.101" size="1.27" layer="27"/>
+<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="58" smashed="yes"/>
+<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="7.5" y="11.8" smashed="yes"/>
+<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="15.63" y="13.91" smashed="yes" rot="R270">
+<attribute name="NAME" x="18.035" y="15.015" size="1.27" layer="25" rot="R270"/>
 </element>
-<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="-21.59" y="66.04" smashed="yes"/>
-<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="-56" y="-2" smashed="yes"/>
-<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-57" y="-6" smashed="yes">
-<attribute name="NAME" x="-57.635" y="-5.365" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="-57" y="-6" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.635" y="-7.905" size="1.27" layer="27"/>
+<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="10.04" y="25.49" smashed="yes" rot="R270"/>
+<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="2.7" y="36.8" smashed="yes" rot="R90"/>
+<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="12.9" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="12.4" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="12.9" y="49.5" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R17" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="0" x="-57" y="-11" smashed="yes">
-<attribute name="NAME" x="-57.635" y="-10.365" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="-57" y="-11" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.635" y="-12.905" size="1.27" layer="27"/>
+<element name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="13.6" y="42.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.87" y="40.803" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="14.87" y="44.232" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 </elements>
 <signals>
@@ -1990,24 +1979,36 @@ design rules under a new name.</description>
 <contactref element="U$1" pad="VCC"/>
 <contactref element="R6" pad="2"/>
 <contactref element="R8" pad="2"/>
-<contactref element="J4" pad="P$2"/>
-<contactref element="J4" pad="P$3"/>
 <contactref element="J3" pad="P$2"/>
 <contactref element="J3" pad="P$3"/>
 <contactref element="U4" pad="P$1"/>
 <contactref element="U4" pad="P$10"/>
 <contactref element="C5" pad="1"/>
 <contactref element="C4" pad="1"/>
-<wire x1="30.5" y1="9.8" x2="30.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="42.095" x2="30.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="25.5" y1="35.8" x2="2.44" y2="42.095" width="0" layer="19" extent="1-1"/>
-<wire x1="25.5" y1="28.2" x2="25.5" y2="35.8" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.24" y1="49.53" x2="25.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-40.32" y1="49.53" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.9" y1="60.96" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="64.765" x2="-30.9" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="67.315" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.74" y1="60.96" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
+<contactref element="R16" pad="1"/>
+<wire x1="3.59" y1="53.045" x2="4.455" y2="53.045" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.8" x2="8.7" y2="48.65" width="0.3" layer="1"/>
+<wire x1="4.455" y1="53.045" x2="8.7" y2="48.8" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.65" x2="12.9" y2="48.65" width="0.3" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.1" y="26.4"/>
+<vertex x="8.38" y="26.4"/>
+<vertex x="7.52" y="27.26"/>
+<vertex x="7.52" y="31.2"/>
+<vertex x="8.8" y="31.2"/>
+<vertex x="8.82" y="31.18"/>
+<vertex x="8.82" y="26.98"/>
+<vertex x="9.1" y="26.7"/>
+</polygon>
+<wire x1="8.7" y1="48.65" x2="8.7" y2="32.04" width="0.3" layer="1"/>
+<wire x1="8.7" y1="32.04" x2="8.7" y2="30.98" width="0.3" layer="1"/>
+<wire x1="8.7" y1="30.98" x2="8.16" y2="30.44" width="0.3" layer="1"/>
+<wire x1="11.315" y1="26.49" x2="11.315" y2="31.525" width="0.3" layer="1"/>
+<wire x1="10.8" y1="32.04" x2="8.7" y2="32.04" width="0.3" layer="1"/>
+<wire x1="11.315" y1="31.525" x2="10.8" y2="32.04" width="0.3" layer="1"/>
+<wire x1="12.9" y1="48.65" x2="10.8" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="15.8" x2="11.315" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="8.2" x2="30.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="GND">
 <contactref element="J1" pad="SH1"/>
@@ -2038,179 +2039,329 @@ design rules under a new name.</description>
 <contactref element="C3" pad="2"/>
 <contactref element="R5" pad="1"/>
 <contactref element="J5" pad="P$1"/>
-<wire x1="28" y1="40.38" x2="28" y2="55.62" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="42.095" x2="28" y2="40.38" width="0" layer="19" extent="1-1"/>
-<wire x1="-24.98" y1="55.88" x2="18.84" y2="42.095" width="0" layer="19" extent="1-1"/>
-<wire x1="-27.52" y1="60.96" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="64.765" x2="-27.52" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="66.04" x2="-21.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.09" y1="67.315" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.21" y1="48.23" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.34" y1="49.53" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-38.42" y1="49.53" x2="-33.34" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-43.5" y1="49.53" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-48.58" y1="49.53" x2="-43.5" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.68" y1="55.88" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-42.76" y1="60.96" x2="-37.68" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-51.65" y1="60.96" x2="-42.76" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.61" y1="60.96" x2="-51.65" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="62.31" x2="-54.61" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.79" y1="35.37" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-32.99" y1="35.37" x2="-31.79" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.29" y1="32.67" x2="-32.99" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.39" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.79" y1="32.67" x2="-31.39" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.29" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.19" y1="32.67" x2="-35.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.79" y1="32.67" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-36.79" y1="35.37" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-57.375" y1="-2" x2="-37.79" y2="32.67" width="0" layer="19" extent="1-1"/>
+<contactref element="J6" pad="1"/>
+<contactref element="J4" pad="P$1"/>
+<contactref element="J4" pad="P$4"/>
+<wire x1="8.765" y1="25.49" x2="10" y2="25.49" width="0.2" layer="1"/>
+<wire x1="10" y1="25.49" x2="10.04" y2="25.49" width="0.2" layer="1"/>
+<wire x1="11.315" y1="25.99" x2="10.5" y2="25.99" width="0.2" layer="1"/>
+<wire x1="10.5" y1="25.99" x2="10" y2="25.49" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.44" y="31.14"/>
+<vertex x="9.44" y="21.98"/>
+<vertex x="10.62" y="21.98"/>
+<vertex x="10.62" y="31.14"/>
+</polygon>
+<wire x1="19.99" y1="53.045" x2="28" y2="65.62" width="0" layer="19" extent="1-1"/>
+<wire x1="15.04" y1="48.68" x2="19.99" y2="53.045" width="0" layer="19" extent="1-1"/>
+<wire x1="13.6" y1="42.2" x2="15.04" y2="48.68" width="0" layer="19" extent="1-1"/>
+<wire x1="28" y1="50.38" x2="19.99" y2="53.045" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="43.8" x2="28" y2="50.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="36.2" x2="30.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="10.06" y1="30.44" x2="13.6" y2="42.2" width="0" layer="19" extent="1-1"/>
+<wire x1="15.35" y1="16.86" x2="10.18" y2="22.82" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="13.91" x2="15.35" y2="16.86" width="0" layer="19" extent="1-1"/>
+<wire x1="14.34" y1="10.65" x2="14.33" y2="13.91" width="0" layer="19" extent="1-1"/>
+<wire x1="17.25" y1="9.2" x2="14.34" y2="10.65" width="0" layer="19" extent="1-1"/>
+<wire x1="7.5" y1="11.8" x2="14.34" y2="10.65" width="0" layer="19" extent="1-1"/>
+<wire x1="6.9" y1="13.15" x2="7.5" y2="11.8" width="0" layer="19" extent="1-1"/>
+<wire x1="6.44" y1="15.16" x2="6.9" y2="13.15" width="0" layer="19" extent="1-1"/>
+<wire x1="2.7" y1="35.425" x2="10.06" y2="30.44" width="0" layer="19" extent="1-1"/>
+<wire x1="25.41" y1="4.17" x2="17.25" y2="9.2" width="0" layer="19" extent="1-1"/>
+<wire x1="25.01" y1="1.47" x2="25.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="24.41" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="26.91" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="28.91" y1="1.47" x2="26.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.81" y1="1.47" x2="28.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="31.41" y1="1.47" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.41" y1="4.17" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="29.21" y1="4.17" x2="30.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="1.3" y1="48.65" x2="2.7" y2="35.425" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="+5V">
 <contactref element="J1" pad="1"/>
 <contactref element="C2" pad="1"/>
 <contactref element="U3" pad="1"/>
 <contactref element="U3" pad="4"/>
-<wire x1="-30.16" y1="48.23" x2="-28.26" y2="50.83" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.59" y1="35.37" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-45.4" y1="49.53" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="14.86" x2="14.82" y2="14.86" width="0.3" layer="1"/>
+<wire x1="16.93" y1="12.96" x2="16.72" y2="12.96" width="0.3" layer="1"/>
+<wire x1="16.72" y1="12.96" x2="14.82" y2="14.86" width="0.3" layer="1"/>
+<wire x1="16.93" y1="12.96" x2="17" y2="12.89" width="0.3" layer="1"/>
+<wire x1="26.61" y1="4.17" x2="26.61" y2="5.45" width="0.4" layer="1"/>
+<wire x1="17" y1="10.82" x2="17.25" y2="11.1" width="0.4" layer="1"/>
+<wire x1="26.61" y1="5.45" x2="25.76" y2="6.3" width="0.4" layer="1"/>
+<wire x1="25.76" y1="6.3" x2="22.42" y2="6.3" width="0.4" layer="1"/>
+<wire x1="22.42" y1="6.3" x2="17.62" y2="11.1" width="0.4" layer="1"/>
+<wire x1="17.62" y1="11.1" x2="17.25" y2="11.1" width="0.4" layer="1"/>
+<wire x1="16.93" y1="12.96" x2="16.93" y2="11.42" width="0.4" layer="1"/>
+<wire x1="16.93" y1="11.42" x2="17.25" y2="11.1" width="0.4" layer="1"/>
 </signal>
 <signal name="UART_RX">
 <contactref element="J1" pad="2"/>
 <contactref element="U$1" pad="RX"/>
 <contactref element="R9" pad="2"/>
-<wire x1="-34.94" y1="35.37" x2="-46.14" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="54" x2="-34.94" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="64.95" x2="20.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="20.75" y1="64.95" x2="21.7" y2="64" width="0.3" layer="1"/>
+<wire x1="21.7" y1="64" x2="22.9" y2="64" width="0.3" layer="1"/>
+<via x="22.9" y="64" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="22.9" y1="64" x2="41.5" y2="64" width="0.3" layer="16"/>
+<wire x1="41.5" y1="64" x2="44.8" y2="60.7" width="0.3" layer="16"/>
+<wire x1="44.8" y1="60.7" x2="44.8" y2="58.4" width="0.3" layer="16"/>
+<wire x1="44.8" y1="58.4" x2="44.7" y2="58.3" width="0.3" layer="16"/>
+<via x="44.7" y="58.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="44.7" y1="58.3" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="60.05" width="0.3" layer="1"/>
+<wire x1="43.9" y1="57.5" x2="42.2" y2="57.5" width="0.3" layer="1"/>
+<wire x1="42.2" y1="57.5" x2="41.1" y2="58.6" width="0.3" layer="1"/>
+<wire x1="27.26" y1="4.17" x2="27.26" y2="5.3" width="0.3" layer="1"/>
+<wire x1="27.26" y1="5.3" x2="28.3" y2="6.34" width="0.3" layer="1"/>
+<wire x1="28.3" y1="6.34" x2="33.26" y2="6.34" width="0.3" layer="1"/>
+<wire x1="33.26" y1="6.34" x2="38.28" y2="11.36" width="0.3" layer="1"/>
+<wire x1="38.28" y1="11.36" x2="38.28" y2="49.34" width="0.3" layer="1"/>
+<wire x1="38.28" y1="49.34" x2="38.28" y2="50.22" width="0.3" layer="1"/>
+<wire x1="38.28" y1="50.22" x2="38.82" y2="50.76" width="0.3" layer="1"/>
+<wire x1="38.82" y1="50.76" x2="41.76" y2="50.76" width="0.3" layer="1"/>
+<wire x1="43.9" y1="52.9" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.76" y1="50.76" x2="43.9" y2="52.9" width="0.3" layer="1"/>
 </signal>
 <signal name="UART_TX">
 <contactref element="J1" pad="3"/>
 <contactref element="U$1" pad="TX"/>
 <contactref element="R12" pad="2"/>
-<wire x1="-34.29" y1="35.37" x2="-46.14" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="56" x2="-34.29" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="66.95" x2="18.25" y2="66.95" width="0.3" layer="1"/>
+<wire x1="18.25" y1="66.95" x2="17.7" y2="66.4" width="0.3" layer="1"/>
+<wire x1="17.7" y1="66.4" x2="17.7" y2="61" width="0.3" layer="1"/>
+<via x="17.7" y="61" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.7" y1="61" x2="32.9" y2="61" width="0.3" layer="16"/>
+<wire x1="32.9" y1="61" x2="35" y2="58.9" width="0.3" layer="16"/>
+<via x="35" y="58.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="35" y1="58.9" x2="36.5" y2="57.4" width="0.3" layer="1"/>
+<wire x1="36.5" y1="57.4" x2="38" y2="57.4" width="0.3" layer="1"/>
+<wire x1="38" y1="57.4" x2="38.7" y2="56.7" width="0.3" layer="1"/>
+<wire x1="38.7" y1="55.15" x2="38.8" y2="55.05" width="0.3" layer="1"/>
+<wire x1="38.7" y1="56.7" x2="38.7" y2="55.15" width="0.3" layer="1"/>
+<wire x1="27.91" y1="4.17" x2="27.91" y2="5.11" width="0.3" layer="1"/>
+<wire x1="27.91" y1="5.11" x2="28.56" y2="5.76" width="0.3" layer="1"/>
+<wire x1="28.56" y1="5.76" x2="33.44" y2="5.76" width="0.3" layer="1"/>
+<wire x1="39.22" y1="49.82" x2="39.14" y2="49.9" width="0.3" layer="1"/>
+<wire x1="39.22" y1="49.82" x2="39.22" y2="11.54" width="0.3" layer="1"/>
+<via x="39.14" y="49.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="39.1" y1="56.3" x2="39.1" y2="49.94" width="0.3" layer="16"/>
+<wire x1="39.14" y1="49.9" x2="39.1" y2="49.94" width="0.3" layer="16"/>
+<wire x1="39.1" y1="56.3" x2="38.7" y2="56.7" width="0.3" layer="16"/>
+<via x="38.7" y="56.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="33.44" y1="5.76" x2="39.22" y2="11.54" width="0.3" layer="1"/>
 </signal>
 <signal name="VBAT_D">
 <contactref element="U$1" pad="ADC"/>
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
-<wire x1="-23.28" y1="55.88" x2="-16.93" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="54" x2="-23.28" y2="55.88" width="0" layer="19" extent="1-1"/>
+<contactref element="J4" pad="P$2"/>
+<contactref element="J4" pad="P$3"/>
+<wire x1="3.4" y1="50.35" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="1.6" y1="50.35" x2="1.3" y2="50.35" width="0.3" layer="1"/>
+<wire x1="3.59" y1="64.95" x2="2.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="1.2" y1="50.75" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="2.75" y1="64.95" x2="1.2" y2="63.4" width="0.3" layer="1"/>
+<wire x1="1.2" y1="63.4" x2="1.2" y2="50.75" width="0.3" layer="1"/>
+<wire x1="25.5" y1="36.2" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.4" y1="50.35" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RST">
 <contactref element="U$1" pad="REST"/>
 <contactref element="U$1" pad="GPIO16"/>
 <contactref element="R6" pad="1"/>
 <contactref element="J5" pad="P$2"/>
-<wire x1="2.44" y1="50" x2="2.44" y2="56" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.44" y1="60.96" x2="2.44" y2="56" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.625" y1="-2" x2="-22.44" y2="60.96" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$1">
-<contactref element="U$1" pad="GPIO15"/>
-<contactref element="R7" pad="2"/>
-<contactref element="J4" pad="P$1"/>
-<contactref element="J4" pad="P$4"/>
-<wire x1="30.5" y1="28.2" x2="-25.82" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="30.5" y1="35.8" x2="30.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="44" x2="30.5" y2="35.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="66.95" x2="6.55" y2="66.95" width="0.3" layer="1"/>
+<wire x1="6.55" y1="66.95" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<via x="6.7" y="66.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="6.7" y1="66.8" x2="6.7" y2="55.9" width="0.3" layer="16"/>
+<wire x1="10.7" y1="51.9" x2="10.8" y2="51.9" width="0.3" layer="16"/>
+<via x="10.8" y="51.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="50.35" width="0.3" layer="1"/>
+<wire x1="6.7" y1="55.9" x2="10.7" y2="51.9" width="0.3" layer="16"/>
+<wire x1="3.59" y1="60.95" x2="5.25" y2="60.95" width="0.3" layer="1"/>
+<wire x1="5.25" y1="60.95" x2="6.7" y2="62.4" width="0.3" layer="1"/>
+<wire x1="6.7" y1="62.4" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="47.7" width="0.3" layer="16"/>
+<wire x1="10.8" y1="47.7" x2="2.7" y2="39.6" width="0.3" layer="16"/>
+<via x="2.7" y="39.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="2.7" y1="39.6" x2="2.7" y2="38.175" width="0.3" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="R8" pad="1"/>
 <contactref element="U$1" pad="CH_PD"/>
-<wire x1="2.44" y1="52" x2="-32.6" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="62.95" x2="5.55" y2="62.95" width="0.3" layer="1"/>
+<wire x1="5.55" y1="62.95" x2="5.6" y2="62.9" width="0.3" layer="1"/>
+<via x="5.6" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="5.6" y1="62.9" x2="5.6" y2="54.7" width="0.3" layer="16"/>
+<wire x1="5.6" y1="54.7" x2="8.7" y2="51.6" width="0.3" layer="16"/>
+<via x="8.7" y="51.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="8.7" y1="51.6" x2="8.7" y2="50.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="GPIO2"/>
 <contactref element="J3" pad="P$1"/>
 <contactref element="J3" pad="P$4"/>
-<wire x1="25.5" y1="9.8" x2="25.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="46" x2="25.5" y2="9.8" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="15.8" x2="19.99" y2="56.95" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="8.2" x2="25.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="U$1" pad="GPIO4"/>
 <contactref element="R10" pad="2"/>
-<wire x1="18.84" y1="52" x2="-41.06" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="62.95" x2="24.25" y2="62.95" width="0.3" layer="1"/>
+<wire x1="24.25" y1="62.95" x2="24.3" y2="62.9" width="0.3" layer="1"/>
+<via x="24.3" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="24.3" y1="62.9" x2="40.8" y2="62.9" width="0.3" layer="16"/>
+<wire x1="40.8" y1="62.9" x2="43.4" y2="60.3" width="0.3" layer="16"/>
+<wire x1="43.4" y1="60.3" x2="43.4" y2="58.8" width="0.3" layer="16"/>
+<via x="43.4" y="58.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="43.4" y1="58.8" x2="43.4" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="U$1" pad="GPIO5"/>
 <contactref element="R11" pad="2"/>
-<wire x1="18.84" y1="50" x2="-35.98" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="60.95" x2="34.65" y2="60.95" width="0.3" layer="1"/>
+<wire x1="34.65" y1="60.95" x2="34.7" y2="60.9" width="0.3" layer="1"/>
+<via x="34.7" y="60.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="34.7" y1="60.9" x2="38.8" y2="60.9" width="0.3" layer="16"/>
+<wire x1="38.8" y1="60.9" x2="41.1" y2="58.6" width="0.3" layer="16"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="56.3" width="0.3" layer="16"/>
+<via x="41.1" y="56.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="41.1" y1="56.3" x2="41.1" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_E">
 <contactref element="U$1" pad="GPIO14"/>
 <contactref element="R13" pad="2"/>
-<wire x1="-51.22" y1="55.88" x2="2.44" y2="48" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="58.95" x2="6.85" y2="58.95" width="0.3" layer="1"/>
+<wire x1="6.85" y1="58.95" x2="7.4" y2="58.4" width="0.3" layer="1"/>
+<via x="7.4" y="58.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="7.4" y1="58.4" x2="9.4" y2="56.4" width="0.3" layer="16"/>
+<wire x1="9.4" y1="56.4" x2="36.4" y2="56.4" width="0.3" layer="16"/>
+<via x="36.4" y="56.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="36.4" y1="56.4" x2="36.5" y2="56.3" width="0.3" layer="1"/>
+<wire x1="36.5" y1="56.3" x2="36.5" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_F">
 <contactref element="U$1" pad="GPIO12"/>
 <contactref element="R14" pad="2"/>
-<wire x1="-56.3" y1="55.88" x2="2.44" y2="46" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="56.95" x2="7.45" y2="56.95" width="0.3" layer="1"/>
+<wire x1="7.45" y1="56.95" x2="9.2" y2="58.7" width="0.3" layer="1"/>
+<via x="9.2" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38" y1="57.9" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="9.2" y1="58.7" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="38" y1="57.9" x2="38.8" y2="58.7" width="0.3" layer="16"/>
+<via x="38.8" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38.8" y1="58.7" x2="38.8" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_G">
 <contactref element="U$1" pad="GPIO13"/>
 <contactref element="R15" pad="2"/>
-<wire x1="2.44" y1="44" x2="-15.66" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="54.95" x2="7.05" y2="54.95" width="0.3" layer="1"/>
+<wire x1="36.4" y1="59.95" x2="36.5" y2="60.05" width="0.3" layer="1"/>
+<wire x1="7.05" y1="54.95" x2="12.05" y2="59.95" width="0.3" layer="1"/>
+<wire x1="12.05" y1="59.95" x2="36.4" y2="59.95" width="0.3" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="U$2" pad="P$10"/>
 <contactref element="R15" pad="1"/>
-<wire x1="22.92" y1="55.62" x2="-17.36" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="65.62" x2="26.79" y2="61.75" width="0.3" layer="1"/>
+<wire x1="26.79" y1="61.75" x2="36.5" y2="61.75" width="0.3" layer="1"/>
 </signal>
 <signal name="N$14">
 <contactref element="R14" pad="1"/>
 <contactref element="U$2" pad="P$9"/>
-<wire x1="-58" y1="55.88" x2="25.46" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="65.62" x2="27.68" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38.8" y1="62.6" x2="38.8" y2="61.75" width="0.3" layer="1"/>
+<wire x1="27.68" y1="63.4" x2="38" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38" y1="63.4" x2="38.8" y2="62.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$15">
 <contactref element="R13" pad="1"/>
 <contactref element="U$2" pad="P$1"/>
-<wire x1="-52.92" y1="55.88" x2="22.92" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="50.38" x2="25.89" y2="53.35" width="0.3" layer="1"/>
+<wire x1="25.89" y1="53.35" x2="36.5" y2="53.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="R11" pad="1"/>
 <contactref element="U$2" pad="P$4"/>
-<wire x1="-37.68" y1="60.96" x2="30.54" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="50.38" x2="31.76" y2="51.6" width="0.3" layer="1"/>
+<wire x1="41.1" y1="52.4" x2="41.1" y2="53.35" width="0.3" layer="1"/>
+<wire x1="31.76" y1="51.6" x2="40.3" y2="51.6" width="0.3" layer="1"/>
+<wire x1="40.3" y1="51.6" x2="41.1" y2="52.4" width="0.3" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="R9" pad="1"/>
 <contactref element="U$2" pad="P$7"/>
-<wire x1="-47.84" y1="60.96" x2="30.54" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="65.62" x2="31.76" y2="64.4" width="0.3" layer="1"/>
+<wire x1="41.1" y1="62.9" x2="41.1" y2="61.75" width="0.3" layer="1"/>
+<wire x1="31.76" y1="64.4" x2="39.6" y2="64.4" width="0.3" layer="1"/>
+<wire x1="39.6" y1="64.4" x2="41.1" y2="62.9" width="0.3" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="R10" pad="1"/>
 <contactref element="U$2" pad="P$6"/>
-<wire x1="33.08" y1="55.62" x2="-42.76" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="33.08" y1="65.62" x2="41.38" y2="65.62" width="0.3" layer="1"/>
+<wire x1="43.4" y1="63.6" x2="43.4" y2="61.75" width="0.3" layer="1"/>
+<wire x1="41.38" y1="65.62" x2="43.4" y2="63.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$19">
 <contactref element="U$2" pad="P$2"/>
 <contactref element="R12" pad="1"/>
-<wire x1="-47.84" y1="55.88" x2="25.46" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="50.38" x2="27.38" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.8" y1="52.6" x2="38.8" y2="53.35" width="0.3" layer="1"/>
+<wire x1="27.38" y1="52.3" x2="38.5" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.5" y1="52.3" x2="38.8" y2="52.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="L1" pad="P$2"/>
 <contactref element="U4" pad="P$2"/>
-<wire x1="-24.65" y1="64.77" x2="-22.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.79" y1="25.99" x2="6.53" y2="26.25" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.12" y="25.9"/>
+<vertex x="5.64" y="25.9"/>
+<vertex x="5.64" y="26.6"/>
+<vertex x="7.66" y="26.6"/>
+<vertex x="8.18" y="26.08"/>
+<vertex x="9.1" y="26.08"/>
+<vertex x="9.12" y="26.06"/>
+</polygon>
 </signal>
 <signal name="N$4">
 <contactref element="L1" pad="P$1"/>
 <contactref element="U4" pad="P$4"/>
-<wire x1="-26.15" y1="64.77" x2="-21.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.77" y1="24.99" x2="6.53" y2="24.75" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="9.07" y="25.03"/>
+<vertex x="9.07" y="24.96"/>
+<vertex x="8.01" y="24.96"/>
+<vertex x="7.44" y="24.39"/>
+<vertex x="5.64" y="24.39"/>
+<vertex x="5.64" y="25.03"/>
+</polygon>
 </signal>
 <signal name="N$6">
 <contactref element="J2" pad="1"/>
 <contactref element="U2" pad="P$1"/>
 <contactref element="U2" pad="P$2"/>
 <contactref element="C1" pad="1"/>
-<wire x1="-31.33" y1="55.88" x2="-17.78" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.435" y1="59.61" x2="-31.33" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="59.61" x2="-54.435" y2="59.61" width="0" layer="19" extent="1-1"/>
+<polygon width="0.3" layer="1" thermals="no">
+<vertex x="6.68" y="10.54"/>
+<vertex x="7.72" y="10.54"/>
+<vertex x="7.72" y="7.1"/>
+<vertex x="9.48" y="5.34"/>
+<vertex x="9.48" y="2.9"/>
+<vertex x="6.68" y="2.9"/>
+</polygon>
 </signal>
 <signal name="N$7">
 <contactref element="C1" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="U2" pad="P$3"/>
-<wire x1="-53.835" y1="59.61" x2="-29.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.73" y1="48.26" x2="-53.835" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="8.275" y1="10.45" x2="8.275" y2="9.075" width="0.3" layer="1"/>
+<wire x1="8.275" y1="9.075" x2="8.85" y2="8.5" width="0.3" layer="1"/>
+<wire x1="8.275" y1="10.45" x2="9.4" y2="10.45" width="0.3" layer="1"/>
+<wire x1="9.4" y1="10.45" x2="10.1" y2="11.15" width="0.3" layer="1"/>
 </signal>
 <signal name="N$9">
 <contactref element="J2" pad="2"/>
@@ -2222,27 +2373,87 @@ design rules under a new name.</description>
 <contactref element="U4" pad="P$6"/>
 <contactref element="C6" pad="2"/>
 <contactref element="R4" pad="1"/>
-<wire x1="-20.59" y1="67.315" x2="-15.24" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="67.315" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.59" y1="64.765" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-18.63" y1="55.88" x2="-20.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-28.26" y1="48.23" x2="-18.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.98" y1="55.88" x2="-28.26" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-50.48" y1="49.53" x2="-35.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.03" y1="48.26" x2="-50.48" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="25.49" x2="11.84" y2="25.49" width="0.2" layer="1"/>
+<wire x1="12.05" y1="25.7" x2="12.7" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.84" y1="25.49" x2="12.05" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.315" y1="24.49" x2="11.61" y2="24.49" width="0.2" layer="1"/>
+<wire x1="12.7" y1="24.3" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="11.61" y1="24.49" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="12.7" y1="25.7" x2="13.1" y2="25.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="24.7" x2="12.7" y2="24.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="25.3" x2="13.1" y2="24.7" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="8.26" y="24.54"/>
+<vertex x="9.06" y="24.54"/>
+<vertex x="9.06" y="21.12"/>
+<vertex x="12.1" y="18.08"/>
+<vertex x="12.1" y="14.74"/>
+<vertex x="13.7" y="13.14"/>
+<vertex x="14.84" y="13.14"/>
+<vertex x="14.84" y="12.78"/>
+<vertex x="14.3" y="12.78"/>
+<vertex x="13" y="11.48"/>
+<vertex x="13" y="2.95263125"/>
+<vertex x="11.9" y="2.923684375"/>
+<vertex x="11.896315625" y="2.92"/>
+<vertex x="10.04" y="2.92"/>
+<vertex x="10.04" y="7.8"/>
+<vertex x="10.94" y="8.7"/>
+<vertex x="10.94" y="12.22"/>
+<vertex x="10.72" y="12.44"/>
+<vertex x="9.36" y="12.44"/>
+<vertex x="9.36" y="16.26"/>
+<vertex x="7.9" y="17.72"/>
+<vertex x="7.9" y="24.18"/>
+</polygon>
+<wire x1="12.7" y1="24.3" x2="12.7" y2="18.62" width="0.3" layer="1"/>
+<wire x1="12.7" y1="18.62" x2="11.76" y2="17.68" width="0.3" layer="1"/>
+<wire x1="3.4" y1="48.65" x2="4.82" y2="47.23" width="0.3" layer="1"/>
+<wire x1="4.82" y1="23.5" x2="5.82" y2="22.5" width="0.3" layer="1"/>
+<wire x1="5.82" y1="22.5" x2="8.16" y2="22.5" width="0.3" layer="1"/>
+<wire x1="8.16" y1="22.5" x2="8.48" y2="22.82" width="0.3" layer="1"/>
+<wire x1="4.82" y1="47.23" x2="4.82" y2="23.5" width="0.3" layer="1"/>
 </signal>
 <signal name="N$11">
 <contactref element="U2" pad="P$5"/>
 <contactref element="R2" pad="2"/>
-<wire x1="-54.435" y1="62.31" x2="-41.06" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="7.675" y1="13.15" x2="7.675" y2="14.695" width="0.3" layer="1"/>
+<wire x1="7.675" y1="14.695" x2="8.14" y2="15.16" width="0.3" layer="1"/>
 </signal>
 <signal name="N$12">
 <contactref element="R3" pad="2"/>
 <contactref element="U3" pad="5"/>
-<wire x1="-49.95" y1="60.96" x2="-30.16" y2="50.83" width="0" layer="19" extent="1-1"/>
+<wire x1="17.05" y1="16.86" x2="17.05" y2="14.98" width="0.3" layer="1"/>
+<wire x1="17.05" y1="14.98" x2="16.93" y2="14.86" width="0.3" layer="1"/>
 </signal>
 <signal name="PS">
 <contactref element="U4" pad="P$7"/>
+<contactref element="U$1" pad="GPIO15"/>
+<contactref element="R7" pad="2"/>
+<wire x1="19.99" y1="54.95" x2="17.85" y2="54.95" width="0.3" layer="1"/>
+<wire x1="15.04" y1="52.14" x2="15.04" y2="50.38" width="0.3" layer="1"/>
+<wire x1="17.85" y1="54.95" x2="15.04" y2="52.14" width="0.3" layer="1"/>
+<wire x1="15.06" y1="52.14" x2="17.3" y2="49.9" width="0.2" layer="16"/>
+<wire x1="15.06" y1="52.14" x2="15.04" y2="52.14" width="0.2" layer="16"/>
+<via x="15.04" y="52.14" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.3" y1="28.6" x2="13.7" y2="25" width="0.2" layer="16"/>
+<wire x1="13.7" y1="25" x2="12.3" y2="25" width="0.2" layer="16"/>
+<via x="12.3" y="25" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="12.3" y1="25" x2="11.325" y2="25" width="0.2" layer="1"/>
+<wire x1="11.325" y1="25" x2="11.315" y2="24.99" width="0.2" layer="1"/>
+<wire x1="17.3" y1="49.9" x2="17.3" y2="28.6" width="0.2" layer="16"/>
+</signal>
+<signal name="N$20">
+<contactref element="U$1" pad="GPIO0"/>
+<contactref element="R16" pad="2"/>
+<contactref element="J6" pad="2"/>
+<wire x1="19.99" y1="58.95" x2="16.35" y2="58.95" width="0.3" layer="1"/>
+<wire x1="12.9" y1="55.5" x2="12.9" y2="51.8" width="0.3" layer="1"/>
+<wire x1="12.9" y1="51.8" x2="12.9" y2="50.35" width="0.3" layer="1"/>
+<wire x1="16.35" y1="58.95" x2="12.9" y2="55.5" width="0.3" layer="1"/>
+<wire x1="11.06" y1="42.2" x2="12.9" y2="44.04" width="0.3" layer="16"/>
+<wire x1="12.9" y1="44.04" x2="12.9" y2="51.8" width="0.3" layer="16"/>
+<via x="12.9" y="51.8" extent="1-16" drill="0.35" diameter="0.6"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
diff --git a/esp8266-wifi-remote.b#4 b/esp8266-wifi-remote.b#4
index 9b0e494..5fdc2d4 100644
--- a/esp8266-wifi-remote.b#4
+++ b/esp8266-wifi-remote.b#4
@@ -3,10 +3,10 @@
 <eagle version="9.3.2">
 <drawing>
 <settings>
-<setting alwaysvectorfont="no"/>
+<setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.5" altunitdist="mm" altunit="mm"/>
+<grid distance="0.02" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.05" altunitdist="mm" altunit="mm"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="16" fill="1" visible="no" active="no"/>
@@ -52,7 +52,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
@@ -157,12 +157,20 @@
 <layer number="255" name="routoute" color="7" fill="1" visible="no" active="yes"/>
 </layers>
 <board>
-<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="1b573db7-ea5e-6f0b-fd8c-026be2f409d2"/>
+<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="c7a73c68-2407-04ba-dc3a-388155fd8543"/>
 <plain>
-<wire x1="0" y1="0" x2="160" y2="0" width="0" layer="20"/>
-<wire x1="160" y1="0" x2="160" y2="100" width="0" layer="20"/>
-<wire x1="160" y1="100" x2="0" y2="100" width="0" layer="20"/>
-<wire x1="0" y1="100" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="0" x2="56" y2="0" width="0" layer="20"/>
+<wire x1="56" y1="0" x2="56" y2="68" width="0" layer="20"/>
+<wire x1="56" y1="68" x2="0" y2="68" width="0" layer="20"/>
+<wire x1="0" y1="68" x2="0" y2="0" width="0" layer="20"/>
+<hole x="3" y="3" drill="3.2"/>
+<hole x="53" y="3" drill="3.2"/>
+<hole x="53" y="65" drill="3.2"/>
+<text x="12.8" y="3.6" size="1.778" layer="21">BAT</text>
+<text x="10.3" y="0.9" size="1.778" layer="21">+</text>
+<text x="8" y="1" size="1.778" layer="21">-</text>
+<text x="9" y="38.4" size="1.778" layer="21">BOOT</text>
+<text x="3.3" y="34" size="1.778" layer="21" rot="R90" align="bottom-right">RST</text>
 </plain>
 <libraries>
 <library name="rcl" urn="urn:adsk.eagle:library:334">
@@ -1411,7 +1419,7 @@ CONN_02
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -1420,10 +1428,16 @@ CONN_02
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/1" type="box" library_version="3">
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
 <packageinstances>
 <packageinstance name="ELAB_PUSHBUTTON_1"/>
 </packageinstances>
@@ -1552,7 +1566,7 @@ CONN_02
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -1581,7 +1595,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -1653,7 +1667,7 @@ package type OT</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="default">
+<designrules name="default *">
 <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 
@@ -1682,7 +1696,7 @@ design rules under a new name.</description>
 <param name="mdSmdSmd" value="6mil"/>
 <param name="mdViaViaSameLayer" value="6mil"/>
 <param name="mnLayersViaInSmd" value="2"/>
-<param name="mdCopperDimension" value="40mil"/>
+<param name="mdCopperDimension" value="20mil"/>
 <param name="mdDrill" value="6mil"/>
 <param name="mdSmdStop" value="0mil"/>
 <param name="msWidth" value="6mil"/>
@@ -1837,147 +1851,127 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-30.48" y="55.88" smashed="yes">
-<attribute name="NAME" x="-31.115" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-31.115" y="53.975" size="1.27" layer="27"/>
+<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="8" y="8.5" smashed="yes">
+<attribute name="NAME" x="3.965" y="7.935" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="38.48" y="-47.38" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-44.45" y="49.53" smashed="yes">
-<attribute name="NAME" x="-45.72" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-45.72" y="46.99" size="1.27" layer="27"/>
+<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="16.05" y="10.87" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.98" y="8.2" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="-28.4" y="60.4" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-49.53" y="49.53" smashed="yes">
-<attribute name="NAME" x="-50.8" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-50.8" y="46.99" size="1.27" layer="27"/>
+<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="12.33" y="11.53" smashed="yes" rot="R270">
+<attribute name="NAME" x="13.1" y="13.8" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="C" x="-37.2" y="-38" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-34.29" y="49.53" smashed="yes">
-<attribute name="NAME" x="-35.56" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-35.56" y="46.99" size="1.27" layer="27"/>
+<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.11" y="30.44" smashed="yes">
+<attribute name="NAME" x="11.62" y="26.5" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="43.4" y="-19.09" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-39.37" y="49.53" smashed="yes">
-<attribute name="NAME" x="-40.64" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-40.64" y="46.99" size="1.27" layer="27"/>
+<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.12" y="28.38" smashed="yes">
+<attribute name="NAME" x="11.43" y="31.41" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="48.49" y="-21.15" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-36.83" y="55.88" smashed="yes">
-<attribute name="NAME" x="-37.465" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="53.975" size="1.27" layer="27"/>
+<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="9.33" y="22.82" smashed="yes" rot="R180">
+<attribute name="NAME" x="7.565" y="23.385" size="1.27" layer="25" rot="R180"/>
+<attribute name="SPICEPREFIX" value="C" x="-27.5" y="78.7" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="-34.29" y="33.02" smashed="yes">
-<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="Molex" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MP" value="1050170001" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="-38.60026875" y="36.66023125" size="1.27008125" layer="25"/>
-<attribute name="PACKAGE" value="None" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-38.6027" y="28.76733125" size="1.2708" layer="27"/>
+<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="27.91" y="1.82" smashed="yes">
+<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="Molex" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MP" value="1050170001" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="NAME" x="23.59973125" y="5.46023125" size="1.27008125" layer="25"/>
+<attribute name="PACKAGE" value="None" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="23.5973" y="-2.43266875" size="1.2708" layer="27"/>
 </element>
-<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="-17.78" y="66.04" smashed="yes">
-<attribute name="NAME" x="-19.05" y="67.437" size="0.6096" layer="25" font="vector" ratio="20"/>
-<attribute name="VALUE" x="-19.05" y="64.008" size="0.6096" layer="27" font="vector" ratio="20"/>
+<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="8.42" y="4.44" smashed="yes">
+<attribute name="NAME" x="5.75" y="4.237" size="0.6096" layer="25" font="vector" ratio="20"/>
+<attribute name="VALUE" x="7.15" y="2.408" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/1" value="ELAB_PUSHBUTTON_1" x="28" y="6" smashed="yes"/>
-<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/1" value="ELAB_PUSHBUTTON_1" x="28" y="32" smashed="yes" rot="R180"/>
-<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="-25.4" y="64.77" smashed="yes"/>
-<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="-55.88" y="48.26" smashed="yes">
-<attribute name="NAME" x="-56.515" y="48.895" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-56.515" y="46.355" size="1.27" layer="27"/>
+<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="12" smashed="yes"/>
+<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="40" smashed="yes" rot="R180"/>
+<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="6.53" y="25.5" smashed="yes" rot="R90"/>
+<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="10.1" y="12" smashed="yes" rot="R90">
+<attribute name="NAME" x="10.665" y="13.765" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="58.36" y="67.88" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="55.88" smashed="yes">
-<attribute name="NAME" x="-42.545" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="53.975" size="1.27" layer="27"/>
+<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="43.4" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="43.965" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-12.48" y="18.99" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-36.83" y="60.96" smashed="yes">
-<attribute name="NAME" x="-37.465" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="59.055" size="1.27" layer="27"/>
+<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="41.765" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="102.06" y="91.03" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="55.88" smashed="yes">
-<attribute name="NAME" x="-47.625" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="53.975" size="1.27" layer="27"/>
+<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="39.465" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="94.68" y="101.19" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-52.07" y="55.88" smashed="yes">
-<attribute name="NAME" x="-52.705" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-52.705" y="53.975" size="1.27" layer="27"/>
+<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="37.165" y="55.965" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="92.38" y="106.27" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-57.15" y="55.88" smashed="yes">
-<attribute name="NAME" x="-57.785" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.785" y="53.975" size="1.27" layer="27"/>
+<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="39.365" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-17.08" y="3.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-16.51" y="60.96" smashed="yes">
-<attribute name="NAME" x="-17.145" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-17.145" y="59.055" size="1.27" layer="27"/>
+<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="37.065" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-24.46" y="44.39" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="60.96" smashed="yes">
-<attribute name="NAME" x="-42.545" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="59.055" size="1.27" layer="27"/>
+<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7" x="7.29" y="15.16" smashed="yes">
+<attribute name="NAME" x="6.655" y="15.795" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="49.2" y="-45.8" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="-50.8" y="60.96" smashed="yes">
-<attribute name="NAME" x="-51.435" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-51.435" y="59.055" size="1.27" layer="27"/>
+<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="16.2" y="16.86" smashed="yes">
+<attribute name="NAME" x="15.065" y="18.195" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="67" y="-44.1" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="-17.78" y="55.88" smashed="yes">
-<attribute name="NAME" x="-18.415" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-18.415" y="53.975" size="1.27" layer="27"/>
+<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="3.4" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="3.965" y="45.565" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="59.28" y="67.28" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="-24.13" y="55.88" smashed="yes">
-<attribute name="NAME" x="-24.765" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-24.765" y="53.975" size="1.27" layer="27"/>
+<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="1.3" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="1.865" y="45.365" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="57.18" y="73.63" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-21.59" y="60.96" smashed="yes">
-<attribute name="NAME" x="-22.225" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-22.225" y="59.055" size="1.27" layer="27"/>
+<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="10.8" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="10.3" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-50.16" y="27.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-26.67" y="60.96" smashed="yes">
-<attribute name="NAME" x="-27.305" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-27.305" y="59.055" size="1.27" layer="27"/>
+<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="15.04" y="49.53" smashed="yes" rot="R90">
+<attribute name="NAME" x="14.5" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="76" y="76.2" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-31.75" y="60.96" smashed="yes">
-<attribute name="NAME" x="-32.385" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-32.385" y="59.055" size="1.27" layer="27"/>
+<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="8.7" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="8.2" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-52.26" y="17.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="60.96" smashed="yes">
-<attribute name="NAME" x="-47.625" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="59.055" size="1.27" layer="27"/>
+<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="41.665" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-19.86" y="13.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="10.64" y="50.2" smashed="yes">
-<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="2.64" y="63.2" size="1.27" layer="25"/>
-<attribute name="PINS" value="16" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="PITCH" value="0.078&quot; / 2 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="2.64" y="39.1" size="1.27" layer="27"/>
+<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="11.79" y="61.15" smashed="yes">
+<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PINS" value="16" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PITCH" value="0.078&quot; / 2 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="6.69" y="60.25" size="1.27" layer="27"/>
 </element>
-<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="48" smashed="yes"/>
-<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="-54.61" y="60.96" smashed="yes"/>
-<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="-29.21" y="49.53" smashed="yes">
-<attribute name="NAME" x="-31.115" y="51.435" size="1.27" layer="25"/>
-<attribute name="VALUE" x="-31.115" y="46.101" size="1.27" layer="27"/>
+<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="58" smashed="yes"/>
+<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="7.5" y="11.8" smashed="yes"/>
+<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="15.63" y="13.91" smashed="yes" rot="R270">
+<attribute name="NAME" x="18.035" y="15.015" size="1.27" layer="25" rot="R270"/>
 </element>
-<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="-21.59" y="66.04" smashed="yes"/>
-<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="-56" y="-2" smashed="yes"/>
-<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-57" y="-6" smashed="yes">
-<attribute name="NAME" x="-57.635" y="-5.365" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="-57" y="-6" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.635" y="-7.905" size="1.27" layer="27"/>
+<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="10.04" y="25.49" smashed="yes" rot="R270"/>
+<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="2.7" y="36.8" smashed="yes" rot="R90"/>
+<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="12.9" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="12.4" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="12.9" y="49.5" size="1.778" layer="27" rot="R90" display="off"/>
+</element>
+<element name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="13.6" y="42.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.87" y="40.803" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="14.87" y="44.232" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 </elements>
 <signals>
@@ -1985,24 +1979,36 @@ design rules under a new name.</description>
 <contactref element="U$1" pad="VCC"/>
 <contactref element="R6" pad="2"/>
 <contactref element="R8" pad="2"/>
-<contactref element="J4" pad="P$2"/>
-<contactref element="J4" pad="P$3"/>
 <contactref element="J3" pad="P$2"/>
 <contactref element="J3" pad="P$3"/>
 <contactref element="U4" pad="P$1"/>
 <contactref element="U4" pad="P$10"/>
 <contactref element="C5" pad="1"/>
 <contactref element="C4" pad="1"/>
-<wire x1="30.5" y1="9.8" x2="30.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="42.095" x2="30.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="25.5" y1="35.8" x2="2.44" y2="42.095" width="0" layer="19" extent="1-1"/>
-<wire x1="25.5" y1="28.2" x2="25.5" y2="35.8" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.24" y1="49.53" x2="25.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-40.32" y1="49.53" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.9" y1="60.96" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="64.765" x2="-30.9" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="67.315" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.74" y1="60.96" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
+<contactref element="R16" pad="1"/>
+<wire x1="3.59" y1="53.045" x2="4.455" y2="53.045" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.8" x2="8.7" y2="48.65" width="0.3" layer="1"/>
+<wire x1="4.455" y1="53.045" x2="8.7" y2="48.8" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.65" x2="12.9" y2="48.65" width="0.3" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.1" y="26.4"/>
+<vertex x="8.38" y="26.4"/>
+<vertex x="7.52" y="27.26"/>
+<vertex x="7.52" y="31.2"/>
+<vertex x="8.8" y="31.2"/>
+<vertex x="8.82" y="31.18"/>
+<vertex x="8.82" y="26.98"/>
+<vertex x="9.1" y="26.7"/>
+</polygon>
+<wire x1="8.7" y1="48.65" x2="8.7" y2="32.04" width="0.3" layer="1"/>
+<wire x1="8.7" y1="32.04" x2="8.7" y2="30.98" width="0.3" layer="1"/>
+<wire x1="8.7" y1="30.98" x2="8.16" y2="30.44" width="0.3" layer="1"/>
+<wire x1="11.315" y1="26.49" x2="11.315" y2="31.525" width="0.3" layer="1"/>
+<wire x1="10.8" y1="32.04" x2="8.7" y2="32.04" width="0.3" layer="1"/>
+<wire x1="11.315" y1="31.525" x2="10.8" y2="32.04" width="0.3" layer="1"/>
+<wire x1="12.9" y1="48.65" x2="10.8" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="15.8" x2="11.315" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="8.2" x2="30.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="GND">
 <contactref element="J1" pad="SH1"/>
@@ -2033,179 +2039,304 @@ design rules under a new name.</description>
 <contactref element="C3" pad="2"/>
 <contactref element="R5" pad="1"/>
 <contactref element="J5" pad="P$1"/>
-<wire x1="28" y1="40.38" x2="28" y2="55.62" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="42.095" x2="28" y2="40.38" width="0" layer="19" extent="1-1"/>
-<wire x1="-24.98" y1="55.88" x2="18.84" y2="42.095" width="0" layer="19" extent="1-1"/>
-<wire x1="-27.52" y1="60.96" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="64.765" x2="-27.52" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="66.04" x2="-21.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.09" y1="67.315" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.21" y1="48.23" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.34" y1="49.53" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-38.42" y1="49.53" x2="-33.34" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-43.5" y1="49.53" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-48.58" y1="49.53" x2="-43.5" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.68" y1="55.88" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-42.76" y1="60.96" x2="-37.68" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-51.65" y1="60.96" x2="-42.76" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.61" y1="60.96" x2="-51.65" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="62.31" x2="-54.61" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.79" y1="35.37" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-32.99" y1="35.37" x2="-31.79" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.29" y1="32.67" x2="-32.99" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.39" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.79" y1="32.67" x2="-31.39" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.29" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.19" y1="32.67" x2="-35.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.79" y1="32.67" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-36.79" y1="35.37" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-57.375" y1="-2" x2="-37.79" y2="32.67" width="0" layer="19" extent="1-1"/>
+<contactref element="J6" pad="1"/>
+<contactref element="J4" pad="P$1"/>
+<contactref element="J4" pad="P$4"/>
+<wire x1="8.765" y1="25.49" x2="10" y2="25.49" width="0.2" layer="1"/>
+<wire x1="10" y1="25.49" x2="10.04" y2="25.49" width="0.2" layer="1"/>
+<wire x1="11.315" y1="25.99" x2="10.5" y2="25.99" width="0.2" layer="1"/>
+<wire x1="10.5" y1="25.99" x2="10" y2="25.49" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.44" y="31.14"/>
+<vertex x="9.44" y="21.98"/>
+<vertex x="10.62" y="21.98"/>
+<vertex x="10.62" y="31.14"/>
+</polygon>
+<wire x1="19.99" y1="53.045" x2="28" y2="65.62" width="0" layer="19" extent="1-1"/>
+<wire x1="15.04" y1="48.68" x2="19.99" y2="53.045" width="0" layer="19" extent="1-1"/>
+<wire x1="13.6" y1="42.2" x2="15.04" y2="48.68" width="0" layer="19" extent="1-1"/>
+<wire x1="28" y1="50.38" x2="19.99" y2="53.045" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="43.8" x2="28" y2="50.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="36.2" x2="30.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="10.06" y1="30.44" x2="13.6" y2="42.2" width="0" layer="19" extent="1-1"/>
+<wire x1="15.35" y1="16.86" x2="10.18" y2="22.82" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="13.91" x2="15.35" y2="16.86" width="0" layer="19" extent="1-1"/>
+<wire x1="15.1" y1="10.87" x2="14.33" y2="13.91" width="0" layer="19" extent="1-1"/>
+<wire x1="12.33" y1="10.58" x2="15.1" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="7.5" y1="11.8" x2="12.33" y2="10.58" width="0" layer="19" extent="1-1"/>
+<wire x1="6.9" y1="13.15" x2="7.5" y2="11.8" width="0" layer="19" extent="1-1"/>
+<wire x1="6.44" y1="15.16" x2="6.9" y2="13.15" width="0" layer="19" extent="1-1"/>
+<wire x1="2.7" y1="35.425" x2="10.06" y2="30.44" width="0" layer="19" extent="1-1"/>
+<wire x1="25.41" y1="4.17" x2="15.1" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="25.01" y1="1.47" x2="25.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="24.41" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="26.91" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="28.91" y1="1.47" x2="26.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.81" y1="1.47" x2="28.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="31.41" y1="1.47" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.41" y1="4.17" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="29.21" y1="4.17" x2="30.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="1.3" y1="48.65" x2="2.7" y2="35.425" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="+5V">
 <contactref element="J1" pad="1"/>
 <contactref element="C2" pad="1"/>
 <contactref element="U3" pad="1"/>
 <contactref element="U3" pad="4"/>
-<wire x1="-30.16" y1="48.23" x2="-28.26" y2="50.83" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.59" y1="35.37" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-45.4" y1="49.53" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="14.86" x2="15.38" y2="14.86" width="0.3" layer="1"/>
+<wire x1="16.93" y1="13.31" x2="16.93" y2="12.96" width="0.3" layer="1"/>
+<wire x1="15.38" y1="14.86" x2="16.93" y2="13.31" width="0.3" layer="1"/>
+<wire x1="16.93" y1="12.96" x2="17" y2="12.89" width="0.3" layer="1"/>
+<wire x1="17" y1="12.89" x2="17" y2="10.87" width="0.3" layer="1"/>
+<wire x1="17" y1="10.87" x2="26.61" y2="4.17" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_RX">
 <contactref element="J1" pad="2"/>
 <contactref element="U$1" pad="RX"/>
 <contactref element="R9" pad="2"/>
-<wire x1="-34.94" y1="35.37" x2="-46.14" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="54" x2="-34.94" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="64.95" x2="20.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="20.75" y1="64.95" x2="21.7" y2="64" width="0.3" layer="1"/>
+<wire x1="21.7" y1="64" x2="22.9" y2="64" width="0.3" layer="1"/>
+<via x="22.9" y="64" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="22.9" y1="64" x2="41.5" y2="64" width="0.3" layer="16"/>
+<wire x1="41.5" y1="64" x2="44.8" y2="60.7" width="0.3" layer="16"/>
+<wire x1="44.8" y1="60.7" x2="44.8" y2="58.4" width="0.3" layer="16"/>
+<wire x1="44.8" y1="58.4" x2="44.7" y2="58.3" width="0.3" layer="16"/>
+<via x="44.7" y="58.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="44.7" y1="58.3" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="60.05" width="0.3" layer="1"/>
+<wire x1="43.9" y1="57.5" x2="42.2" y2="57.5" width="0.3" layer="1"/>
+<wire x1="42.2" y1="57.5" x2="41.1" y2="58.6" width="0.3" layer="1"/>
+<wire x1="27.26" y1="4.17" x2="42.2" y2="57.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_TX">
 <contactref element="J1" pad="3"/>
 <contactref element="U$1" pad="TX"/>
 <contactref element="R12" pad="2"/>
-<wire x1="-34.29" y1="35.37" x2="-46.14" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="56" x2="-34.29" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="66.95" x2="18.25" y2="66.95" width="0.3" layer="1"/>
+<wire x1="18.25" y1="66.95" x2="17.7" y2="66.4" width="0.3" layer="1"/>
+<wire x1="17.7" y1="66.4" x2="17.7" y2="61" width="0.3" layer="1"/>
+<via x="17.7" y="61" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.7" y1="61" x2="32.9" y2="61" width="0.3" layer="16"/>
+<wire x1="32.9" y1="61" x2="35" y2="58.9" width="0.3" layer="16"/>
+<via x="35" y="58.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="35" y1="58.9" x2="36.5" y2="57.4" width="0.3" layer="1"/>
+<wire x1="36.5" y1="57.4" x2="38" y2="57.4" width="0.3" layer="1"/>
+<wire x1="38" y1="57.4" x2="38.7" y2="56.7" width="0.3" layer="1"/>
+<wire x1="38.7" y1="55.15" x2="38.8" y2="55.05" width="0.3" layer="1"/>
+<wire x1="38.7" y1="56.7" x2="38.7" y2="55.15" width="0.3" layer="1"/>
+<wire x1="27.91" y1="4.17" x2="38.8" y2="55.05" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VBAT_D">
 <contactref element="U$1" pad="ADC"/>
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
-<wire x1="-23.28" y1="55.88" x2="-16.93" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="54" x2="-23.28" y2="55.88" width="0" layer="19" extent="1-1"/>
+<contactref element="J4" pad="P$2"/>
+<contactref element="J4" pad="P$3"/>
+<wire x1="3.4" y1="50.35" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="1.6" y1="50.35" x2="1.3" y2="50.35" width="0.3" layer="1"/>
+<wire x1="3.59" y1="64.95" x2="2.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="1.2" y1="50.75" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="2.75" y1="64.95" x2="1.2" y2="63.4" width="0.3" layer="1"/>
+<wire x1="1.2" y1="63.4" x2="1.2" y2="50.75" width="0.3" layer="1"/>
+<wire x1="25.5" y1="36.2" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.4" y1="50.35" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RST">
 <contactref element="U$1" pad="REST"/>
 <contactref element="U$1" pad="GPIO16"/>
 <contactref element="R6" pad="1"/>
 <contactref element="J5" pad="P$2"/>
-<wire x1="2.44" y1="50" x2="2.44" y2="56" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.44" y1="60.96" x2="2.44" y2="56" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.625" y1="-2" x2="-22.44" y2="60.96" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$1">
-<contactref element="U$1" pad="GPIO15"/>
-<contactref element="R7" pad="2"/>
-<contactref element="J4" pad="P$1"/>
-<contactref element="J4" pad="P$4"/>
-<wire x1="30.5" y1="28.2" x2="-25.82" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="30.5" y1="35.8" x2="30.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="44" x2="30.5" y2="35.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="66.95" x2="6.55" y2="66.95" width="0.3" layer="1"/>
+<wire x1="6.55" y1="66.95" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<via x="6.7" y="66.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="6.7" y1="66.8" x2="6.7" y2="55.9" width="0.3" layer="16"/>
+<wire x1="10.7" y1="51.9" x2="10.8" y2="51.9" width="0.3" layer="16"/>
+<via x="10.8" y="51.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="50.35" width="0.3" layer="1"/>
+<wire x1="6.7" y1="55.9" x2="10.7" y2="51.9" width="0.3" layer="16"/>
+<wire x1="3.59" y1="60.95" x2="5.25" y2="60.95" width="0.3" layer="1"/>
+<wire x1="5.25" y1="60.95" x2="6.7" y2="62.4" width="0.3" layer="1"/>
+<wire x1="6.7" y1="62.4" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="47.7" width="0.3" layer="16"/>
+<wire x1="10.8" y1="47.7" x2="2.7" y2="39.6" width="0.3" layer="16"/>
+<via x="2.7" y="39.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="2.7" y1="39.6" x2="2.7" y2="38.175" width="0.3" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="R8" pad="1"/>
 <contactref element="U$1" pad="CH_PD"/>
-<wire x1="2.44" y1="52" x2="-32.6" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="62.95" x2="5.55" y2="62.95" width="0.3" layer="1"/>
+<wire x1="5.55" y1="62.95" x2="5.6" y2="62.9" width="0.3" layer="1"/>
+<via x="5.6" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="5.6" y1="62.9" x2="5.6" y2="54.7" width="0.3" layer="16"/>
+<wire x1="5.6" y1="54.7" x2="8.7" y2="51.6" width="0.3" layer="16"/>
+<via x="8.7" y="51.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="8.7" y1="51.6" x2="8.7" y2="50.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="GPIO2"/>
 <contactref element="J3" pad="P$1"/>
 <contactref element="J3" pad="P$4"/>
-<wire x1="25.5" y1="9.8" x2="25.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="46" x2="25.5" y2="9.8" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="15.8" x2="19.99" y2="56.95" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="8.2" x2="25.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="U$1" pad="GPIO4"/>
 <contactref element="R10" pad="2"/>
-<wire x1="18.84" y1="52" x2="-41.06" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="62.95" x2="24.25" y2="62.95" width="0.3" layer="1"/>
+<wire x1="24.25" y1="62.95" x2="24.3" y2="62.9" width="0.3" layer="1"/>
+<via x="24.3" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="24.3" y1="62.9" x2="40.8" y2="62.9" width="0.3" layer="16"/>
+<wire x1="40.8" y1="62.9" x2="43.4" y2="60.3" width="0.3" layer="16"/>
+<wire x1="43.4" y1="60.3" x2="43.4" y2="58.8" width="0.3" layer="16"/>
+<via x="43.4" y="58.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="43.4" y1="58.8" x2="43.4" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="U$1" pad="GPIO5"/>
 <contactref element="R11" pad="2"/>
-<wire x1="18.84" y1="50" x2="-35.98" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="60.95" x2="34.65" y2="60.95" width="0.3" layer="1"/>
+<wire x1="34.65" y1="60.95" x2="34.7" y2="60.9" width="0.3" layer="1"/>
+<via x="34.7" y="60.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="34.7" y1="60.9" x2="38.8" y2="60.9" width="0.3" layer="16"/>
+<wire x1="38.8" y1="60.9" x2="41.1" y2="58.6" width="0.3" layer="16"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="56.3" width="0.3" layer="16"/>
+<via x="41.1" y="56.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="41.1" y1="56.3" x2="41.1" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_E">
 <contactref element="U$1" pad="GPIO14"/>
 <contactref element="R13" pad="2"/>
-<wire x1="-51.22" y1="55.88" x2="2.44" y2="48" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="58.95" x2="6.85" y2="58.95" width="0.3" layer="1"/>
+<wire x1="6.85" y1="58.95" x2="7.4" y2="58.4" width="0.3" layer="1"/>
+<via x="7.4" y="58.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="7.4" y1="58.4" x2="9.4" y2="56.4" width="0.3" layer="16"/>
+<wire x1="9.4" y1="56.4" x2="36.4" y2="56.4" width="0.3" layer="16"/>
+<via x="36.4" y="56.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="36.4" y1="56.4" x2="36.5" y2="56.3" width="0.3" layer="1"/>
+<wire x1="36.5" y1="56.3" x2="36.5" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_F">
 <contactref element="U$1" pad="GPIO12"/>
 <contactref element="R14" pad="2"/>
-<wire x1="-56.3" y1="55.88" x2="2.44" y2="46" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="56.95" x2="7.45" y2="56.95" width="0.3" layer="1"/>
+<wire x1="7.45" y1="56.95" x2="9.2" y2="58.7" width="0.3" layer="1"/>
+<via x="9.2" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38" y1="57.9" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="9.2" y1="58.7" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="38" y1="57.9" x2="38.8" y2="58.7" width="0.3" layer="16"/>
+<via x="38.8" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38.8" y1="58.7" x2="38.8" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_G">
 <contactref element="U$1" pad="GPIO13"/>
 <contactref element="R15" pad="2"/>
-<wire x1="2.44" y1="44" x2="-15.66" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="54.95" x2="7.05" y2="54.95" width="0.3" layer="1"/>
+<wire x1="36.4" y1="59.95" x2="36.5" y2="60.05" width="0.3" layer="1"/>
+<wire x1="7.05" y1="54.95" x2="12.05" y2="59.95" width="0.3" layer="1"/>
+<wire x1="12.05" y1="59.95" x2="36.4" y2="59.95" width="0.3" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="U$2" pad="P$10"/>
 <contactref element="R15" pad="1"/>
-<wire x1="22.92" y1="55.62" x2="-17.36" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="65.62" x2="26.79" y2="61.75" width="0.3" layer="1"/>
+<wire x1="26.79" y1="61.75" x2="36.5" y2="61.75" width="0.3" layer="1"/>
 </signal>
 <signal name="N$14">
 <contactref element="R14" pad="1"/>
 <contactref element="U$2" pad="P$9"/>
-<wire x1="-58" y1="55.88" x2="25.46" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="65.62" x2="27.68" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38.8" y1="62.6" x2="38.8" y2="61.75" width="0.3" layer="1"/>
+<wire x1="27.68" y1="63.4" x2="38" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38" y1="63.4" x2="38.8" y2="62.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$15">
 <contactref element="R13" pad="1"/>
 <contactref element="U$2" pad="P$1"/>
-<wire x1="-52.92" y1="55.88" x2="22.92" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="50.38" x2="25.89" y2="53.35" width="0.3" layer="1"/>
+<wire x1="25.89" y1="53.35" x2="36.5" y2="53.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="R11" pad="1"/>
 <contactref element="U$2" pad="P$4"/>
-<wire x1="-37.68" y1="60.96" x2="30.54" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="50.38" x2="31.76" y2="51.6" width="0.3" layer="1"/>
+<wire x1="41.1" y1="52.4" x2="41.1" y2="53.35" width="0.3" layer="1"/>
+<wire x1="31.76" y1="51.6" x2="40.3" y2="51.6" width="0.3" layer="1"/>
+<wire x1="40.3" y1="51.6" x2="41.1" y2="52.4" width="0.3" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="R9" pad="1"/>
 <contactref element="U$2" pad="P$7"/>
-<wire x1="-47.84" y1="60.96" x2="30.54" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="65.62" x2="31.76" y2="64.4" width="0.3" layer="1"/>
+<wire x1="41.1" y1="62.9" x2="41.1" y2="61.75" width="0.3" layer="1"/>
+<wire x1="31.76" y1="64.4" x2="39.6" y2="64.4" width="0.3" layer="1"/>
+<wire x1="39.6" y1="64.4" x2="41.1" y2="62.9" width="0.3" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="R10" pad="1"/>
 <contactref element="U$2" pad="P$6"/>
-<wire x1="33.08" y1="55.62" x2="-42.76" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="33.08" y1="65.62" x2="41.38" y2="65.62" width="0.3" layer="1"/>
+<wire x1="43.4" y1="63.6" x2="43.4" y2="61.75" width="0.3" layer="1"/>
+<wire x1="41.38" y1="65.62" x2="43.4" y2="63.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$19">
 <contactref element="U$2" pad="P$2"/>
 <contactref element="R12" pad="1"/>
-<wire x1="-47.84" y1="55.88" x2="25.46" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="50.38" x2="27.38" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.8" y1="52.6" x2="38.8" y2="53.35" width="0.3" layer="1"/>
+<wire x1="27.38" y1="52.3" x2="38.5" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.5" y1="52.3" x2="38.8" y2="52.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="L1" pad="P$2"/>
 <contactref element="U4" pad="P$2"/>
-<wire x1="-24.65" y1="64.77" x2="-22.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.79" y1="25.99" x2="6.53" y2="26.25" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.12" y="25.9"/>
+<vertex x="5.64" y="25.9"/>
+<vertex x="5.64" y="26.6"/>
+<vertex x="7.66" y="26.6"/>
+<vertex x="8.18" y="26.08"/>
+<vertex x="9.1" y="26.08"/>
+<vertex x="9.12" y="26.06"/>
+</polygon>
 </signal>
 <signal name="N$4">
 <contactref element="L1" pad="P$1"/>
 <contactref element="U4" pad="P$4"/>
-<wire x1="-26.15" y1="64.77" x2="-21.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.77" y1="24.99" x2="6.53" y2="24.75" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="9.07" y="25.03"/>
+<vertex x="9.07" y="24.96"/>
+<vertex x="8.01" y="24.96"/>
+<vertex x="7.44" y="24.39"/>
+<vertex x="5.64" y="24.39"/>
+<vertex x="5.64" y="25.03"/>
+</polygon>
 </signal>
 <signal name="N$6">
 <contactref element="J2" pad="1"/>
 <contactref element="U2" pad="P$1"/>
 <contactref element="U2" pad="P$2"/>
 <contactref element="C1" pad="1"/>
-<wire x1="-31.33" y1="55.88" x2="-17.78" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.435" y1="59.61" x2="-31.33" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="59.61" x2="-54.435" y2="59.61" width="0" layer="19" extent="1-1"/>
+<polygon width="0.3" layer="1" thermals="no">
+<vertex x="6.68" y="10.54"/>
+<vertex x="7.72" y="10.54"/>
+<vertex x="7.72" y="7.1"/>
+<vertex x="9.48" y="5.34"/>
+<vertex x="9.48" y="2.9"/>
+<vertex x="6.68" y="2.9"/>
+</polygon>
 </signal>
 <signal name="N$7">
 <contactref element="C1" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="U2" pad="P$3"/>
-<wire x1="-53.835" y1="59.61" x2="-29.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.73" y1="48.26" x2="-53.835" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="8.275" y1="10.45" x2="8.275" y2="9.075" width="0.3" layer="1"/>
+<wire x1="8.275" y1="9.075" x2="8.85" y2="8.5" width="0.3" layer="1"/>
+<wire x1="8.275" y1="10.45" x2="9.4" y2="10.45" width="0.3" layer="1"/>
+<wire x1="9.4" y1="10.45" x2="10.1" y2="11.15" width="0.3" layer="1"/>
 </signal>
 <signal name="N$9">
 <contactref element="J2" pad="2"/>
@@ -2217,27 +2348,81 @@ design rules under a new name.</description>
 <contactref element="U4" pad="P$6"/>
 <contactref element="C6" pad="2"/>
 <contactref element="R4" pad="1"/>
-<wire x1="-20.59" y1="67.315" x2="-15.24" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="67.315" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.59" y1="64.765" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-18.63" y1="55.88" x2="-20.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-28.26" y1="48.23" x2="-18.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.98" y1="55.88" x2="-28.26" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-50.48" y1="49.53" x2="-35.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.03" y1="48.26" x2="-50.48" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="25.49" x2="11.84" y2="25.49" width="0.2" layer="1"/>
+<wire x1="12.05" y1="25.7" x2="12.7" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.84" y1="25.49" x2="12.05" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.315" y1="24.49" x2="11.61" y2="24.49" width="0.2" layer="1"/>
+<wire x1="12.7" y1="24.3" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="11.61" y1="24.49" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="12.7" y1="25.7" x2="13.1" y2="25.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="24.7" x2="12.7" y2="24.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="25.3" x2="13.1" y2="24.7" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="8.26" y="24.54"/>
+<vertex x="9.06" y="24.54"/>
+<vertex x="9.06" y="21.12"/>
+<vertex x="12.1" y="18.08"/>
+<vertex x="12.1" y="14.74"/>
+<vertex x="13.7" y="13.14"/>
+<vertex x="14.84" y="13.14"/>
+<vertex x="14.84" y="12.6"/>
+<vertex x="14.16" y="11.92"/>
+<vertex x="11.08" y="11.92"/>
+<vertex x="10.56" y="12.44"/>
+<vertex x="9.36" y="12.44"/>
+<vertex x="9.36" y="16.26"/>
+<vertex x="7.9" y="17.72"/>
+<vertex x="7.9" y="24.18"/>
+</polygon>
+<wire x1="12.7" y1="24.3" x2="12.7" y2="18.62" width="0.3" layer="1"/>
+<wire x1="12.7" y1="18.62" x2="11.76" y2="17.68" width="0.3" layer="1"/>
+<wire x1="3.4" y1="48.65" x2="4.82" y2="47.23" width="0.3" layer="1"/>
+<wire x1="4.82" y1="23.5" x2="5.82" y2="22.5" width="0.3" layer="1"/>
+<wire x1="5.82" y1="22.5" x2="8.16" y2="22.5" width="0.3" layer="1"/>
+<wire x1="8.16" y1="22.5" x2="8.48" y2="22.82" width="0.3" layer="1"/>
+<wire x1="4.82" y1="47.23" x2="4.82" y2="23.5" width="0.3" layer="1"/>
+<wire x1="12.33" y1="12.48" x2="10.96" y2="4.44" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$11">
 <contactref element="U2" pad="P$5"/>
 <contactref element="R2" pad="2"/>
-<wire x1="-54.435" y1="62.31" x2="-41.06" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="7.675" y1="13.15" x2="7.675" y2="14.695" width="0.3" layer="1"/>
+<wire x1="7.675" y1="14.695" x2="8.14" y2="15.16" width="0.3" layer="1"/>
 </signal>
 <signal name="N$12">
 <contactref element="R3" pad="2"/>
 <contactref element="U3" pad="5"/>
-<wire x1="-49.95" y1="60.96" x2="-30.16" y2="50.83" width="0" layer="19" extent="1-1"/>
+<wire x1="17.05" y1="16.86" x2="17.05" y2="14.98" width="0.3" layer="1"/>
+<wire x1="17.05" y1="14.98" x2="16.93" y2="14.86" width="0.3" layer="1"/>
 </signal>
 <signal name="PS">
 <contactref element="U4" pad="P$7"/>
+<contactref element="U$1" pad="GPIO15"/>
+<contactref element="R7" pad="2"/>
+<wire x1="19.99" y1="54.95" x2="17.85" y2="54.95" width="0.3" layer="1"/>
+<wire x1="15.04" y1="52.14" x2="15.04" y2="50.38" width="0.3" layer="1"/>
+<wire x1="17.85" y1="54.95" x2="15.04" y2="52.14" width="0.3" layer="1"/>
+<wire x1="15.06" y1="52.14" x2="17.3" y2="49.9" width="0.2" layer="16"/>
+<wire x1="15.06" y1="52.14" x2="15.04" y2="52.14" width="0.2" layer="16"/>
+<via x="15.04" y="52.14" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.3" y1="28.6" x2="13.7" y2="25" width="0.2" layer="16"/>
+<wire x1="13.7" y1="25" x2="12.3" y2="25" width="0.2" layer="16"/>
+<via x="12.3" y="25" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="12.3" y1="25" x2="11.325" y2="25" width="0.2" layer="1"/>
+<wire x1="11.325" y1="25" x2="11.315" y2="24.99" width="0.2" layer="1"/>
+<wire x1="17.3" y1="49.9" x2="17.3" y2="28.6" width="0.2" layer="16"/>
+</signal>
+<signal name="N$20">
+<contactref element="U$1" pad="GPIO0"/>
+<contactref element="R16" pad="2"/>
+<contactref element="J6" pad="2"/>
+<wire x1="19.99" y1="58.95" x2="16.35" y2="58.95" width="0.3" layer="1"/>
+<wire x1="12.9" y1="55.5" x2="12.9" y2="51.8" width="0.3" layer="1"/>
+<wire x1="12.9" y1="51.8" x2="12.9" y2="50.35" width="0.3" layer="1"/>
+<wire x1="16.35" y1="58.95" x2="12.9" y2="55.5" width="0.3" layer="1"/>
+<wire x1="11.06" y1="42.2" x2="12.9" y2="44.04" width="0.3" layer="16"/>
+<wire x1="12.9" y1="44.04" x2="12.9" y2="51.8" width="0.3" layer="16"/>
+<via x="12.9" y="51.8" extent="1-16" drill="0.35" diameter="0.6"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
diff --git a/esp8266-wifi-remote.b#5 b/esp8266-wifi-remote.b#5
index f0a7c25..d5f5143 100644
--- a/esp8266-wifi-remote.b#5
+++ b/esp8266-wifi-remote.b#5
@@ -3,10 +3,10 @@
 <eagle version="9.3.2">
 <drawing>
 <settings>
-<setting alwaysvectorfont="no"/>
+<setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.5" altunitdist="mm" altunit="mm"/>
+<grid distance="0.02" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.05" altunitdist="mm" altunit="mm"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="16" fill="1" visible="no" active="no"/>
@@ -52,7 +52,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
@@ -157,12 +157,20 @@
 <layer number="255" name="routoute" color="7" fill="1" visible="no" active="yes"/>
 </layers>
 <board>
-<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="1b573db7-ea5e-6f0b-fd8c-026be2f409d2"/>
+<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="c7a73c68-2407-04ba-dc3a-388155fd8543"/>
 <plain>
-<wire x1="0" y1="0" x2="160" y2="0" width="0" layer="20"/>
-<wire x1="160" y1="0" x2="160" y2="100" width="0" layer="20"/>
-<wire x1="160" y1="100" x2="0" y2="100" width="0" layer="20"/>
-<wire x1="0" y1="100" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="0" x2="56" y2="0" width="0" layer="20"/>
+<wire x1="56" y1="0" x2="56" y2="68" width="0" layer="20"/>
+<wire x1="56" y1="68" x2="0" y2="68" width="0" layer="20"/>
+<wire x1="0" y1="68" x2="0" y2="0" width="0" layer="20"/>
+<hole x="3" y="3" drill="3.2"/>
+<hole x="53" y="3" drill="3.2"/>
+<hole x="53" y="65" drill="3.2"/>
+<text x="12.8" y="3.6" size="1.778" layer="21">BAT</text>
+<text x="10.3" y="0.9" size="1.778" layer="21">+</text>
+<text x="8" y="1" size="1.778" layer="21">-</text>
+<text x="9" y="38.4" size="1.778" layer="21">BOOT</text>
+<text x="3.3" y="34" size="1.778" layer="21" rot="R90" align="bottom-right">RST</text>
 </plain>
 <libraries>
 <library name="rcl" urn="urn:adsk.eagle:library:334">
@@ -1411,7 +1419,7 @@ CONN_02
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -1420,10 +1428,16 @@ CONN_02
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/1" type="box" library_version="3">
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
 <packageinstances>
 <packageinstance name="ELAB_PUSHBUTTON_1"/>
 </packageinstances>
@@ -1552,7 +1566,7 @@ CONN_02
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -1581,7 +1595,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -1653,7 +1667,7 @@ package type OT</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="default">
+<designrules name="default *">
 <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 
@@ -1682,7 +1696,7 @@ design rules under a new name.</description>
 <param name="mdSmdSmd" value="6mil"/>
 <param name="mdViaViaSameLayer" value="6mil"/>
 <param name="mnLayersViaInSmd" value="2"/>
-<param name="mdCopperDimension" value="40mil"/>
+<param name="mdCopperDimension" value="20mil"/>
 <param name="mdDrill" value="6mil"/>
 <param name="mdSmdStop" value="0mil"/>
 <param name="msWidth" value="6mil"/>
@@ -1837,167 +1851,164 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-30.48" y="55.88" smashed="yes">
-<attribute name="NAME" x="-31.115" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-31.115" y="53.975" size="1.27" layer="27"/>
+<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="8" y="8.5" smashed="yes">
+<attribute name="NAME" x="3.965" y="7.935" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="38.48" y="-47.38" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-44.45" y="49.53" smashed="yes">
-<attribute name="NAME" x="-45.72" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-45.72" y="46.99" size="1.27" layer="27"/>
+<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="16.05" y="10.87" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.98" y="8.2" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="-28.4" y="60.4" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-49.53" y="49.53" smashed="yes">
-<attribute name="NAME" x="-50.8" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-50.8" y="46.99" size="1.27" layer="27"/>
+<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="12.33" y="11.53" smashed="yes" rot="R270">
+<attribute name="NAME" x="13.1" y="13.8" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="C" x="-37.2" y="-38" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-34.29" y="49.53" smashed="yes">
-<attribute name="NAME" x="-35.56" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-35.56" y="46.99" size="1.27" layer="27"/>
+<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.11" y="30.44" smashed="yes">
+<attribute name="NAME" x="11.62" y="26.5" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="43.4" y="-19.09" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-39.37" y="49.53" smashed="yes">
-<attribute name="NAME" x="-40.64" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-40.64" y="46.99" size="1.27" layer="27"/>
+<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.12" y="28.38" smashed="yes">
+<attribute name="NAME" x="11.43" y="31.41" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="48.49" y="-21.15" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-36.83" y="55.88" smashed="yes">
-<attribute name="NAME" x="-37.465" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="53.975" size="1.27" layer="27"/>
+<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="9.33" y="22.82" smashed="yes" rot="R180">
+<attribute name="NAME" x="7.565" y="23.385" size="1.27" layer="25" rot="R180"/>
+<attribute name="SPICEPREFIX" value="C" x="-27.5" y="78.7" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="-34.29" y="33.02" smashed="yes">
-<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="Molex" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MP" value="1050170001" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="-38.60026875" y="36.66023125" size="1.27008125" layer="25"/>
-<attribute name="PACKAGE" value="None" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-38.6027" y="28.76733125" size="1.2708" layer="27"/>
+<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="27.91" y="1.82" smashed="yes">
+<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="Molex" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MP" value="1050170001" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="NAME" x="23.59973125" y="5.46023125" size="1.27008125" layer="25"/>
+<attribute name="PACKAGE" value="None" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="23.5973" y="-2.43266875" size="1.2708" layer="27"/>
 </element>
-<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="-17.78" y="66.04" smashed="yes">
-<attribute name="NAME" x="-19.05" y="67.437" size="0.6096" layer="25" font="vector" ratio="20"/>
-<attribute name="VALUE" x="-19.05" y="64.008" size="0.6096" layer="27" font="vector" ratio="20"/>
+<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="8.42" y="4.44" smashed="yes">
+<attribute name="NAME" x="5.75" y="4.237" size="0.6096" layer="25" font="vector" ratio="20"/>
+<attribute name="VALUE" x="7.15" y="2.408" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/1" value="ELAB_PUSHBUTTON_1" x="28" y="6" smashed="yes"/>
-<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/1" value="ELAB_PUSHBUTTON_1" x="28" y="32" smashed="yes" rot="R180"/>
-<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="-25.4" y="64.77" smashed="yes"/>
-<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="-55.88" y="48.26" smashed="yes">
-<attribute name="NAME" x="-56.515" y="48.895" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-56.515" y="46.355" size="1.27" layer="27"/>
+<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="12" smashed="yes"/>
+<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="40" smashed="yes" rot="R180"/>
+<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="6.53" y="25.5" smashed="yes" rot="R90"/>
+<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="10.1" y="12" smashed="yes" rot="R90">
+<attribute name="NAME" x="10.665" y="13.765" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="58.36" y="67.88" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="55.88" smashed="yes">
-<attribute name="NAME" x="-42.545" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="53.975" size="1.27" layer="27"/>
+<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="43.4" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="43.965" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-12.48" y="18.99" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-36.83" y="60.96" smashed="yes">
-<attribute name="NAME" x="-37.465" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="59.055" size="1.27" layer="27"/>
+<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="41.765" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="102.06" y="91.03" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="55.88" smashed="yes">
-<attribute name="NAME" x="-47.625" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="53.975" size="1.27" layer="27"/>
+<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="39.465" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="94.68" y="101.19" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-52.07" y="55.88" smashed="yes">
-<attribute name="NAME" x="-52.705" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-52.705" y="53.975" size="1.27" layer="27"/>
+<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="37.165" y="55.965" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="92.38" y="106.27" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-57.15" y="55.88" smashed="yes">
-<attribute name="NAME" x="-57.785" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.785" y="53.975" size="1.27" layer="27"/>
+<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="39.365" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-17.08" y="3.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-16.51" y="60.96" smashed="yes">
-<attribute name="NAME" x="-17.145" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-17.145" y="59.055" size="1.27" layer="27"/>
+<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="37.065" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-24.46" y="44.39" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="60.96" smashed="yes">
-<attribute name="NAME" x="-42.545" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="59.055" size="1.27" layer="27"/>
+<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7" x="7.29" y="15.16" smashed="yes">
+<attribute name="NAME" x="6.655" y="15.795" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="49.2" y="-45.8" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="-50.8" y="60.96" smashed="yes">
-<attribute name="NAME" x="-51.435" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-51.435" y="59.055" size="1.27" layer="27"/>
+<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="16.2" y="16.86" smashed="yes">
+<attribute name="NAME" x="15.065" y="18.195" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="67" y="-44.1" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="-17.78" y="55.88" smashed="yes">
-<attribute name="NAME" x="-18.415" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-18.415" y="53.975" size="1.27" layer="27"/>
+<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="3.4" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="3.965" y="45.565" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="59.28" y="67.28" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="-24.13" y="55.88" smashed="yes">
-<attribute name="NAME" x="-24.765" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-24.765" y="53.975" size="1.27" layer="27"/>
+<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="1.3" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="1.865" y="45.365" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="57.18" y="73.63" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-21.59" y="60.96" smashed="yes">
-<attribute name="NAME" x="-22.225" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-22.225" y="59.055" size="1.27" layer="27"/>
+<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="10.8" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="10.3" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-50.16" y="27.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-26.67" y="60.96" smashed="yes">
-<attribute name="NAME" x="-27.305" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-27.305" y="59.055" size="1.27" layer="27"/>
+<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="15.04" y="49.53" smashed="yes" rot="R90">
+<attribute name="NAME" x="14.5" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="76" y="76.2" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-31.75" y="60.96" smashed="yes">
-<attribute name="NAME" x="-32.385" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-32.385" y="59.055" size="1.27" layer="27"/>
+<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="8.7" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="8.2" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-52.26" y="17.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="60.96" smashed="yes">
-<attribute name="NAME" x="-47.625" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="59.055" size="1.27" layer="27"/>
+<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="41.665" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-19.86" y="13.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="10.64" y="50.2" smashed="yes">
-<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="2.64" y="63.2" size="1.27" layer="25"/>
-<attribute name="PINS" value="16" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="PITCH" value="0.078&quot; / 2 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="2.64" y="39.1" size="1.27" layer="27"/>
+<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="11.79" y="61.15" smashed="yes">
+<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PINS" value="16" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PITCH" value="0.078&quot; / 2 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="6.69" y="60.25" size="1.27" layer="27"/>
 </element>
-<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="48" smashed="yes"/>
-<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="-54.61" y="60.96" smashed="yes"/>
-<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="-29.21" y="49.53" smashed="yes">
-<attribute name="NAME" x="-31.115" y="51.435" size="1.27" layer="25"/>
-<attribute name="VALUE" x="-31.115" y="46.101" size="1.27" layer="27"/>
+<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="58" smashed="yes"/>
+<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="7.5" y="11.8" smashed="yes"/>
+<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="15.63" y="13.91" smashed="yes" rot="R270">
+<attribute name="NAME" x="18.035" y="15.015" size="1.27" layer="25" rot="R270"/>
+</element>
+<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="10.04" y="25.49" smashed="yes" rot="R270"/>
+<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="2.7" y="36.8" smashed="yes" rot="R90"/>
+<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="12.9" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="12.4" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="12.9" y="49.5" size="1.778" layer="27" rot="R90" display="off"/>
+</element>
+<element name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="13.6" y="42.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.87" y="40.803" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="14.87" y="44.232" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
-<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="-21.59" y="66.04" smashed="yes"/>
-<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="-56" y="-2" smashed="yes"/>
 </elements>
 <signals>
 <signal name="+3V3">
 <contactref element="U$1" pad="VCC"/>
 <contactref element="R6" pad="2"/>
 <contactref element="R8" pad="2"/>
-<contactref element="J4" pad="P$2"/>
-<contactref element="J4" pad="P$3"/>
 <contactref element="J3" pad="P$2"/>
 <contactref element="J3" pad="P$3"/>
 <contactref element="U4" pad="P$1"/>
 <contactref element="U4" pad="P$10"/>
 <contactref element="C5" pad="1"/>
 <contactref element="C4" pad="1"/>
-<wire x1="30.5" y1="9.8" x2="30.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="42.095" x2="30.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="25.5" y1="35.8" x2="2.44" y2="42.095" width="0" layer="19" extent="1-1"/>
-<wire x1="25.5" y1="28.2" x2="25.5" y2="35.8" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.24" y1="49.53" x2="25.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-40.32" y1="49.53" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.9" y1="60.96" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="64.765" x2="-30.9" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="67.315" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.74" y1="60.96" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
+<contactref element="R16" pad="1"/>
+<wire x1="3.59" y1="53.045" x2="4.455" y2="53.045" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.8" x2="8.7" y2="48.65" width="0.3" layer="1"/>
+<wire x1="4.455" y1="53.045" x2="8.7" y2="48.8" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.65" x2="12.9" y2="48.65" width="0.3" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.1" y="26.4"/>
+<vertex x="8.38" y="26.4"/>
+<vertex x="7.52" y="27.26"/>
+<vertex x="7.52" y="31.2"/>
+<vertex x="8.8" y="31.2"/>
+<vertex x="8.82" y="31.18"/>
+<vertex x="8.82" y="26.98"/>
+<vertex x="9.1" y="26.7"/>
+</polygon>
+<wire x1="8.7" y1="48.65" x2="8.7" y2="32.04" width="0.3" layer="1"/>
+<wire x1="8.7" y1="32.04" x2="8.7" y2="30.98" width="0.3" layer="1"/>
+<wire x1="8.7" y1="30.98" x2="8.16" y2="30.44" width="0.3" layer="1"/>
+<wire x1="11.315" y1="26.49" x2="11.315" y2="31.525" width="0.3" layer="1"/>
+<wire x1="10.8" y1="32.04" x2="8.7" y2="32.04" width="0.3" layer="1"/>
+<wire x1="11.315" y1="31.525" x2="10.8" y2="32.04" width="0.3" layer="1"/>
+<wire x1="12.9" y1="48.65" x2="10.8" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="15.8" x2="11.315" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="8.2" x2="30.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="GND">
 <contactref element="J1" pad="SH1"/>
@@ -2028,179 +2039,294 @@ design rules under a new name.</description>
 <contactref element="C3" pad="2"/>
 <contactref element="R5" pad="1"/>
 <contactref element="J5" pad="P$1"/>
-<wire x1="28" y1="40.38" x2="28" y2="55.62" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="42.095" x2="28" y2="40.38" width="0" layer="19" extent="1-1"/>
-<wire x1="-24.98" y1="55.88" x2="18.84" y2="42.095" width="0" layer="19" extent="1-1"/>
-<wire x1="-27.52" y1="60.96" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="64.765" x2="-27.52" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="66.04" x2="-21.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.09" y1="67.315" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.21" y1="48.23" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.34" y1="49.53" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-38.42" y1="49.53" x2="-33.34" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-43.5" y1="49.53" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-48.58" y1="49.53" x2="-43.5" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.68" y1="55.88" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-42.76" y1="60.96" x2="-37.68" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-51.65" y1="60.96" x2="-42.76" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.61" y1="60.96" x2="-51.65" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="62.31" x2="-54.61" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.79" y1="35.37" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-32.99" y1="35.37" x2="-31.79" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.29" y1="32.67" x2="-32.99" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.39" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.79" y1="32.67" x2="-31.39" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.29" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.19" y1="32.67" x2="-35.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.79" y1="32.67" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-36.79" y1="35.37" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-57.375" y1="-2" x2="-37.79" y2="32.67" width="0" layer="19" extent="1-1"/>
+<contactref element="J6" pad="1"/>
+<contactref element="J4" pad="P$1"/>
+<contactref element="J4" pad="P$4"/>
+<wire x1="8.765" y1="25.49" x2="10" y2="25.49" width="0.2" layer="1"/>
+<wire x1="10" y1="25.49" x2="10.04" y2="25.49" width="0.2" layer="1"/>
+<wire x1="11.315" y1="25.99" x2="10.5" y2="25.99" width="0.2" layer="1"/>
+<wire x1="10.5" y1="25.99" x2="10" y2="25.49" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.44" y="31.14"/>
+<vertex x="9.44" y="21.98"/>
+<vertex x="10.62" y="21.98"/>
+<vertex x="10.62" y="31.14"/>
+</polygon>
+<wire x1="19.99" y1="53.045" x2="28" y2="65.62" width="0" layer="19" extent="1-1"/>
+<wire x1="15.04" y1="48.68" x2="19.99" y2="53.045" width="0" layer="19" extent="1-1"/>
+<wire x1="13.6" y1="42.2" x2="15.04" y2="48.68" width="0" layer="19" extent="1-1"/>
+<wire x1="28" y1="50.38" x2="19.99" y2="53.045" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="43.8" x2="28" y2="50.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="36.2" x2="30.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="10.06" y1="30.44" x2="13.6" y2="42.2" width="0" layer="19" extent="1-1"/>
+<wire x1="15.35" y1="16.86" x2="10.18" y2="22.82" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="13.91" x2="15.35" y2="16.86" width="0" layer="19" extent="1-1"/>
+<wire x1="15.1" y1="10.87" x2="14.33" y2="13.91" width="0" layer="19" extent="1-1"/>
+<wire x1="12.33" y1="10.58" x2="15.1" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="7.5" y1="11.8" x2="12.33" y2="10.58" width="0" layer="19" extent="1-1"/>
+<wire x1="6.9" y1="13.15" x2="7.5" y2="11.8" width="0" layer="19" extent="1-1"/>
+<wire x1="6.44" y1="15.16" x2="6.9" y2="13.15" width="0" layer="19" extent="1-1"/>
+<wire x1="2.7" y1="35.425" x2="10.06" y2="30.44" width="0" layer="19" extent="1-1"/>
+<wire x1="25.41" y1="4.17" x2="15.1" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="25.01" y1="1.47" x2="25.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="24.41" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="26.91" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="28.91" y1="1.47" x2="26.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.81" y1="1.47" x2="28.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="31.41" y1="1.47" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.41" y1="4.17" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="29.21" y1="4.17" x2="30.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="1.3" y1="48.65" x2="2.7" y2="35.425" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="+5V">
 <contactref element="J1" pad="1"/>
 <contactref element="C2" pad="1"/>
 <contactref element="U3" pad="1"/>
 <contactref element="U3" pad="4"/>
-<wire x1="-30.16" y1="48.23" x2="-28.26" y2="50.83" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.59" y1="35.37" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-45.4" y1="49.53" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
+<wire x1="17" y1="10.87" x2="26.61" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="16.93" y1="12.96" x2="17" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="14.86" x2="16.93" y2="12.96" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_RX">
 <contactref element="J1" pad="2"/>
 <contactref element="U$1" pad="RX"/>
 <contactref element="R9" pad="2"/>
-<wire x1="-34.94" y1="35.37" x2="-46.14" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="54" x2="-34.94" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="64.95" x2="20.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="20.75" y1="64.95" x2="21.7" y2="64" width="0.3" layer="1"/>
+<wire x1="21.7" y1="64" x2="22.9" y2="64" width="0.3" layer="1"/>
+<via x="22.9" y="64" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="22.9" y1="64" x2="41.5" y2="64" width="0.3" layer="16"/>
+<wire x1="41.5" y1="64" x2="44.8" y2="60.7" width="0.3" layer="16"/>
+<wire x1="44.8" y1="60.7" x2="44.8" y2="58.4" width="0.3" layer="16"/>
+<wire x1="44.8" y1="58.4" x2="44.7" y2="58.3" width="0.3" layer="16"/>
+<via x="44.7" y="58.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="44.7" y1="58.3" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="60.05" width="0.3" layer="1"/>
+<wire x1="43.9" y1="57.5" x2="42.2" y2="57.5" width="0.3" layer="1"/>
+<wire x1="42.2" y1="57.5" x2="41.1" y2="58.6" width="0.3" layer="1"/>
+<wire x1="27.26" y1="4.17" x2="42.2" y2="57.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_TX">
 <contactref element="J1" pad="3"/>
 <contactref element="U$1" pad="TX"/>
 <contactref element="R12" pad="2"/>
-<wire x1="-34.29" y1="35.37" x2="-46.14" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="56" x2="-34.29" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="66.95" x2="18.25" y2="66.95" width="0.3" layer="1"/>
+<wire x1="18.25" y1="66.95" x2="17.7" y2="66.4" width="0.3" layer="1"/>
+<wire x1="17.7" y1="66.4" x2="17.7" y2="61" width="0.3" layer="1"/>
+<via x="17.7" y="61" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.7" y1="61" x2="32.9" y2="61" width="0.3" layer="16"/>
+<wire x1="32.9" y1="61" x2="35" y2="58.9" width="0.3" layer="16"/>
+<via x="35" y="58.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="35" y1="58.9" x2="36.5" y2="57.4" width="0.3" layer="1"/>
+<wire x1="36.5" y1="57.4" x2="38" y2="57.4" width="0.3" layer="1"/>
+<wire x1="38" y1="57.4" x2="38.7" y2="56.7" width="0.3" layer="1"/>
+<wire x1="38.7" y1="55.15" x2="38.8" y2="55.05" width="0.3" layer="1"/>
+<wire x1="38.7" y1="56.7" x2="38.7" y2="55.15" width="0.3" layer="1"/>
+<wire x1="27.91" y1="4.17" x2="38.8" y2="55.05" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VBAT_D">
 <contactref element="U$1" pad="ADC"/>
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
-<wire x1="-23.28" y1="55.88" x2="-16.93" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="54" x2="-23.28" y2="55.88" width="0" layer="19" extent="1-1"/>
+<contactref element="J4" pad="P$2"/>
+<contactref element="J4" pad="P$3"/>
+<wire x1="3.4" y1="50.35" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="1.6" y1="50.35" x2="1.3" y2="50.35" width="0.3" layer="1"/>
+<wire x1="3.59" y1="64.95" x2="2.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="1.2" y1="50.75" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="2.75" y1="64.95" x2="1.2" y2="63.4" width="0.3" layer="1"/>
+<wire x1="1.2" y1="63.4" x2="1.2" y2="50.75" width="0.3" layer="1"/>
+<wire x1="25.5" y1="36.2" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.4" y1="50.35" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RST">
 <contactref element="U$1" pad="REST"/>
 <contactref element="U$1" pad="GPIO16"/>
 <contactref element="R6" pad="1"/>
 <contactref element="J5" pad="P$2"/>
-<wire x1="2.44" y1="50" x2="2.44" y2="56" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.44" y1="60.96" x2="2.44" y2="56" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.625" y1="-2" x2="-22.44" y2="60.96" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$1">
-<contactref element="U$1" pad="GPIO15"/>
-<contactref element="R7" pad="2"/>
-<contactref element="J4" pad="P$1"/>
-<contactref element="J4" pad="P$4"/>
-<wire x1="30.5" y1="28.2" x2="-25.82" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="30.5" y1="35.8" x2="30.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="44" x2="30.5" y2="35.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="66.95" x2="6.55" y2="66.95" width="0.3" layer="1"/>
+<wire x1="6.55" y1="66.95" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<via x="6.7" y="66.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="6.7" y1="66.8" x2="6.7" y2="55.9" width="0.3" layer="16"/>
+<wire x1="10.7" y1="51.9" x2="10.8" y2="51.9" width="0.3" layer="16"/>
+<via x="10.8" y="51.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="50.35" width="0.3" layer="1"/>
+<wire x1="6.7" y1="55.9" x2="10.7" y2="51.9" width="0.3" layer="16"/>
+<wire x1="3.59" y1="60.95" x2="5.25" y2="60.95" width="0.3" layer="1"/>
+<wire x1="5.25" y1="60.95" x2="6.7" y2="62.4" width="0.3" layer="1"/>
+<wire x1="6.7" y1="62.4" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="47.7" width="0.3" layer="16"/>
+<wire x1="10.8" y1="47.7" x2="2.7" y2="39.6" width="0.3" layer="16"/>
+<via x="2.7" y="39.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="2.7" y1="39.6" x2="2.7" y2="38.175" width="0.3" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="R8" pad="1"/>
 <contactref element="U$1" pad="CH_PD"/>
-<wire x1="2.44" y1="52" x2="-32.6" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="62.95" x2="5.55" y2="62.95" width="0.3" layer="1"/>
+<wire x1="5.55" y1="62.95" x2="5.6" y2="62.9" width="0.3" layer="1"/>
+<via x="5.6" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="5.6" y1="62.9" x2="5.6" y2="54.7" width="0.3" layer="16"/>
+<wire x1="5.6" y1="54.7" x2="8.7" y2="51.6" width="0.3" layer="16"/>
+<via x="8.7" y="51.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="8.7" y1="51.6" x2="8.7" y2="50.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="GPIO2"/>
 <contactref element="J3" pad="P$1"/>
 <contactref element="J3" pad="P$4"/>
-<wire x1="25.5" y1="9.8" x2="25.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="46" x2="25.5" y2="9.8" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="15.8" x2="19.99" y2="56.95" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="8.2" x2="25.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="U$1" pad="GPIO4"/>
 <contactref element="R10" pad="2"/>
-<wire x1="18.84" y1="52" x2="-41.06" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="62.95" x2="24.25" y2="62.95" width="0.3" layer="1"/>
+<wire x1="24.25" y1="62.95" x2="24.3" y2="62.9" width="0.3" layer="1"/>
+<via x="24.3" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="24.3" y1="62.9" x2="40.8" y2="62.9" width="0.3" layer="16"/>
+<wire x1="40.8" y1="62.9" x2="43.4" y2="60.3" width="0.3" layer="16"/>
+<wire x1="43.4" y1="60.3" x2="43.4" y2="58.8" width="0.3" layer="16"/>
+<via x="43.4" y="58.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="43.4" y1="58.8" x2="43.4" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="U$1" pad="GPIO5"/>
 <contactref element="R11" pad="2"/>
-<wire x1="18.84" y1="50" x2="-35.98" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="60.95" x2="34.65" y2="60.95" width="0.3" layer="1"/>
+<wire x1="34.65" y1="60.95" x2="34.7" y2="60.9" width="0.3" layer="1"/>
+<via x="34.7" y="60.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="34.7" y1="60.9" x2="38.8" y2="60.9" width="0.3" layer="16"/>
+<wire x1="38.8" y1="60.9" x2="41.1" y2="58.6" width="0.3" layer="16"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="56.3" width="0.3" layer="16"/>
+<via x="41.1" y="56.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="41.1" y1="56.3" x2="41.1" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_E">
 <contactref element="U$1" pad="GPIO14"/>
 <contactref element="R13" pad="2"/>
-<wire x1="-51.22" y1="55.88" x2="2.44" y2="48" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="58.95" x2="6.85" y2="58.95" width="0.3" layer="1"/>
+<wire x1="6.85" y1="58.95" x2="7.4" y2="58.4" width="0.3" layer="1"/>
+<via x="7.4" y="58.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="7.4" y1="58.4" x2="9.4" y2="56.4" width="0.3" layer="16"/>
+<wire x1="9.4" y1="56.4" x2="36.4" y2="56.4" width="0.3" layer="16"/>
+<via x="36.4" y="56.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="36.4" y1="56.4" x2="36.5" y2="56.3" width="0.3" layer="1"/>
+<wire x1="36.5" y1="56.3" x2="36.5" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_F">
 <contactref element="U$1" pad="GPIO12"/>
 <contactref element="R14" pad="2"/>
-<wire x1="-56.3" y1="55.88" x2="2.44" y2="46" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="56.95" x2="7.45" y2="56.95" width="0.3" layer="1"/>
+<wire x1="7.45" y1="56.95" x2="9.2" y2="58.7" width="0.3" layer="1"/>
+<via x="9.2" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38" y1="57.9" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="9.2" y1="58.7" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="38" y1="57.9" x2="38.8" y2="58.7" width="0.3" layer="16"/>
+<via x="38.8" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38.8" y1="58.7" x2="38.8" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_G">
 <contactref element="U$1" pad="GPIO13"/>
 <contactref element="R15" pad="2"/>
-<wire x1="2.44" y1="44" x2="-15.66" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="54.95" x2="7.05" y2="54.95" width="0.3" layer="1"/>
+<wire x1="36.4" y1="59.95" x2="36.5" y2="60.05" width="0.3" layer="1"/>
+<wire x1="7.05" y1="54.95" x2="12.05" y2="59.95" width="0.3" layer="1"/>
+<wire x1="12.05" y1="59.95" x2="36.4" y2="59.95" width="0.3" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="U$2" pad="P$10"/>
 <contactref element="R15" pad="1"/>
-<wire x1="22.92" y1="55.62" x2="-17.36" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="65.62" x2="26.79" y2="61.75" width="0.3" layer="1"/>
+<wire x1="26.79" y1="61.75" x2="36.5" y2="61.75" width="0.3" layer="1"/>
 </signal>
 <signal name="N$14">
 <contactref element="R14" pad="1"/>
 <contactref element="U$2" pad="P$9"/>
-<wire x1="-58" y1="55.88" x2="25.46" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="65.62" x2="27.68" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38.8" y1="62.6" x2="38.8" y2="61.75" width="0.3" layer="1"/>
+<wire x1="27.68" y1="63.4" x2="38" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38" y1="63.4" x2="38.8" y2="62.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$15">
 <contactref element="R13" pad="1"/>
 <contactref element="U$2" pad="P$1"/>
-<wire x1="-52.92" y1="55.88" x2="22.92" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="50.38" x2="25.89" y2="53.35" width="0.3" layer="1"/>
+<wire x1="25.89" y1="53.35" x2="36.5" y2="53.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="R11" pad="1"/>
 <contactref element="U$2" pad="P$4"/>
-<wire x1="-37.68" y1="60.96" x2="30.54" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="50.38" x2="31.76" y2="51.6" width="0.3" layer="1"/>
+<wire x1="41.1" y1="52.4" x2="41.1" y2="53.35" width="0.3" layer="1"/>
+<wire x1="31.76" y1="51.6" x2="40.3" y2="51.6" width="0.3" layer="1"/>
+<wire x1="40.3" y1="51.6" x2="41.1" y2="52.4" width="0.3" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="R9" pad="1"/>
 <contactref element="U$2" pad="P$7"/>
-<wire x1="-47.84" y1="60.96" x2="30.54" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="65.62" x2="31.76" y2="64.4" width="0.3" layer="1"/>
+<wire x1="41.1" y1="62.9" x2="41.1" y2="61.75" width="0.3" layer="1"/>
+<wire x1="31.76" y1="64.4" x2="39.6" y2="64.4" width="0.3" layer="1"/>
+<wire x1="39.6" y1="64.4" x2="41.1" y2="62.9" width="0.3" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="R10" pad="1"/>
 <contactref element="U$2" pad="P$6"/>
-<wire x1="33.08" y1="55.62" x2="-42.76" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="33.08" y1="65.62" x2="41.38" y2="65.62" width="0.3" layer="1"/>
+<wire x1="43.4" y1="63.6" x2="43.4" y2="61.75" width="0.3" layer="1"/>
+<wire x1="41.38" y1="65.62" x2="43.4" y2="63.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$19">
 <contactref element="U$2" pad="P$2"/>
 <contactref element="R12" pad="1"/>
-<wire x1="-47.84" y1="55.88" x2="25.46" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="50.38" x2="27.38" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.8" y1="52.6" x2="38.8" y2="53.35" width="0.3" layer="1"/>
+<wire x1="27.38" y1="52.3" x2="38.5" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.5" y1="52.3" x2="38.8" y2="52.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="L1" pad="P$2"/>
 <contactref element="U4" pad="P$2"/>
-<wire x1="-24.65" y1="64.77" x2="-22.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.79" y1="25.99" x2="6.53" y2="26.25" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.12" y="25.9"/>
+<vertex x="5.64" y="25.9"/>
+<vertex x="5.64" y="26.6"/>
+<vertex x="7.66" y="26.6"/>
+<vertex x="8.18" y="26.08"/>
+<vertex x="9.1" y="26.08"/>
+<vertex x="9.12" y="26.06"/>
+</polygon>
 </signal>
 <signal name="N$4">
 <contactref element="L1" pad="P$1"/>
 <contactref element="U4" pad="P$4"/>
-<wire x1="-26.15" y1="64.77" x2="-21.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.77" y1="24.99" x2="6.53" y2="24.75" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="9.07" y="25.03"/>
+<vertex x="9.07" y="24.96"/>
+<vertex x="8.01" y="24.96"/>
+<vertex x="7.44" y="24.39"/>
+<vertex x="5.64" y="24.39"/>
+<vertex x="5.64" y="25.03"/>
+</polygon>
 </signal>
 <signal name="N$6">
 <contactref element="J2" pad="1"/>
 <contactref element="U2" pad="P$1"/>
 <contactref element="U2" pad="P$2"/>
 <contactref element="C1" pad="1"/>
-<wire x1="-31.33" y1="55.88" x2="-17.78" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.435" y1="59.61" x2="-31.33" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="59.61" x2="-54.435" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="6.9" y1="10.45" x2="7.675" y2="10.45" width="0" layer="19" extent="1-1"/>
+<wire x1="7.15" y1="8.5" x2="6.9" y2="10.45" width="0" layer="19" extent="1-1"/>
+<wire x1="8.42" y1="4.44" x2="7.15" y2="8.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$7">
 <contactref element="C1" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="U2" pad="P$3"/>
-<wire x1="-53.835" y1="59.61" x2="-29.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.73" y1="48.26" x2="-53.835" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="8.275" y1="10.45" x2="10.1" y2="11.15" width="0" layer="19" extent="1-1"/>
+<wire x1="8.85" y1="8.5" x2="8.275" y2="10.45" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$9">
 <contactref element="J2" pad="2"/>
@@ -2212,27 +2338,79 @@ design rules under a new name.</description>
 <contactref element="U4" pad="P$6"/>
 <contactref element="C6" pad="2"/>
 <contactref element="R4" pad="1"/>
-<wire x1="-20.59" y1="67.315" x2="-15.24" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="67.315" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.59" y1="64.765" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-18.63" y1="55.88" x2="-20.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-28.26" y1="48.23" x2="-18.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.98" y1="55.88" x2="-28.26" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-50.48" y1="49.53" x2="-35.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.03" y1="48.26" x2="-50.48" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="25.49" x2="11.84" y2="25.49" width="0.2" layer="1"/>
+<wire x1="12.05" y1="25.7" x2="12.7" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.84" y1="25.49" x2="12.05" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.315" y1="24.49" x2="11.61" y2="24.49" width="0.2" layer="1"/>
+<wire x1="12.7" y1="24.3" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="11.61" y1="24.49" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="12.7" y1="25.7" x2="13.1" y2="25.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="24.7" x2="12.7" y2="24.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="25.3" x2="13.1" y2="24.7" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="8.26" y="24.54"/>
+<vertex x="9.06" y="24.54"/>
+<vertex x="9.06" y="21.12"/>
+<vertex x="12.1" y="18.08"/>
+<vertex x="12.1" y="14.74"/>
+<vertex x="13.7" y="13.14"/>
+<vertex x="14.84" y="13.14"/>
+<vertex x="14.84" y="12.6"/>
+<vertex x="14.16" y="11.92"/>
+<vertex x="11.08" y="11.92"/>
+<vertex x="10.56" y="12.44"/>
+<vertex x="9.36" y="12.44"/>
+<vertex x="9.36" y="16.26"/>
+<vertex x="7.9" y="17.72"/>
+<vertex x="7.9" y="24.18"/>
+</polygon>
+<wire x1="12.7" y1="24.3" x2="12.7" y2="18.62" width="0.3" layer="1"/>
+<wire x1="12.7" y1="18.62" x2="11.76" y2="17.68" width="0.3" layer="1"/>
+<wire x1="3.4" y1="48.65" x2="4.82" y2="47.23" width="0.3" layer="1"/>
+<wire x1="4.82" y1="23.5" x2="5.82" y2="22.5" width="0.3" layer="1"/>
+<wire x1="5.82" y1="22.5" x2="8.16" y2="22.5" width="0.3" layer="1"/>
+<wire x1="8.16" y1="22.5" x2="8.48" y2="22.82" width="0.3" layer="1"/>
+<wire x1="4.82" y1="47.23" x2="4.82" y2="23.5" width="0.3" layer="1"/>
+<wire x1="12.33" y1="12.48" x2="10.96" y2="4.44" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$11">
 <contactref element="U2" pad="P$5"/>
 <contactref element="R2" pad="2"/>
-<wire x1="-54.435" y1="62.31" x2="-41.06" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="8.14" y1="15.16" x2="7.675" y2="13.15" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$12">
 <contactref element="R3" pad="2"/>
 <contactref element="U3" pad="5"/>
-<wire x1="-49.95" y1="60.96" x2="-30.16" y2="50.83" width="0" layer="19" extent="1-1"/>
+<wire x1="16.93" y1="14.86" x2="17.05" y2="16.86" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PS">
 <contactref element="U4" pad="P$7"/>
+<contactref element="U$1" pad="GPIO15"/>
+<contactref element="R7" pad="2"/>
+<wire x1="19.99" y1="54.95" x2="17.85" y2="54.95" width="0.3" layer="1"/>
+<wire x1="15.04" y1="52.14" x2="15.04" y2="50.38" width="0.3" layer="1"/>
+<wire x1="17.85" y1="54.95" x2="15.04" y2="52.14" width="0.3" layer="1"/>
+<wire x1="15.06" y1="52.14" x2="17.3" y2="49.9" width="0.2" layer="16"/>
+<wire x1="15.06" y1="52.14" x2="15.04" y2="52.14" width="0.2" layer="16"/>
+<via x="15.04" y="52.14" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.3" y1="28.6" x2="13.7" y2="25" width="0.2" layer="16"/>
+<wire x1="13.7" y1="25" x2="12.3" y2="25" width="0.2" layer="16"/>
+<via x="12.3" y="25" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="12.3" y1="25" x2="11.325" y2="25" width="0.2" layer="1"/>
+<wire x1="11.325" y1="25" x2="11.315" y2="24.99" width="0.2" layer="1"/>
+<wire x1="17.3" y1="49.9" x2="17.3" y2="28.6" width="0.2" layer="16"/>
+</signal>
+<signal name="N$20">
+<contactref element="U$1" pad="GPIO0"/>
+<contactref element="R16" pad="2"/>
+<contactref element="J6" pad="2"/>
+<wire x1="19.99" y1="58.95" x2="16.35" y2="58.95" width="0.3" layer="1"/>
+<wire x1="12.9" y1="55.5" x2="12.9" y2="51.8" width="0.3" layer="1"/>
+<wire x1="12.9" y1="51.8" x2="12.9" y2="50.35" width="0.3" layer="1"/>
+<wire x1="16.35" y1="58.95" x2="12.9" y2="55.5" width="0.3" layer="1"/>
+<wire x1="11.06" y1="42.2" x2="12.9" y2="44.04" width="0.3" layer="16"/>
+<wire x1="12.9" y1="44.04" x2="12.9" y2="51.8" width="0.3" layer="16"/>
+<via x="12.9" y="51.8" extent="1-16" drill="0.35" diameter="0.6"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
diff --git a/esp8266-wifi-remote.b#6 b/esp8266-wifi-remote.b#6
index dde4050..25442d1 100644
--- a/esp8266-wifi-remote.b#6
+++ b/esp8266-wifi-remote.b#6
@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.5" altunitdist="mm" altunit="mm"/>
+<grid distance="0.02" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.05" altunitdist="mm" altunit="mm"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="16" fill="1" visible="no" active="no"/>
@@ -52,7 +52,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
@@ -157,12 +157,20 @@
 <layer number="255" name="routoute" color="7" fill="1" visible="no" active="yes"/>
 </layers>
 <board>
-<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="1b573db7-ea5e-6f0b-fd8c-026be2f409d2"/>
+<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="c7a73c68-2407-04ba-dc3a-388155fd8543"/>
 <plain>
-<wire x1="0" y1="0" x2="160" y2="0" width="0" layer="20"/>
-<wire x1="160" y1="0" x2="160" y2="100" width="0" layer="20"/>
-<wire x1="160" y1="100" x2="0" y2="100" width="0" layer="20"/>
-<wire x1="0" y1="100" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="0" x2="56" y2="0" width="0" layer="20"/>
+<wire x1="56" y1="0" x2="56" y2="68" width="0" layer="20"/>
+<wire x1="56" y1="68" x2="0" y2="68" width="0" layer="20"/>
+<wire x1="0" y1="68" x2="0" y2="0" width="0" layer="20"/>
+<hole x="3" y="3" drill="3.2"/>
+<hole x="53" y="3" drill="3.2"/>
+<hole x="53" y="65" drill="3.2"/>
+<text x="12.8" y="3.6" size="1.778" layer="21">BAT</text>
+<text x="10.3" y="0.9" size="1.778" layer="21">+</text>
+<text x="8" y="1" size="1.778" layer="21">-</text>
+<text x="9" y="38.4" size="1.778" layer="21">BOOT</text>
+<text x="3.3" y="34" size="1.778" layer="21" rot="R90" align="bottom-right">RST</text>
 </plain>
 <libraries>
 <library name="rcl" urn="urn:adsk.eagle:library:334">
@@ -1411,7 +1419,7 @@ CONN_02
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -1420,10 +1428,16 @@ CONN_02
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/2" type="model" library_version="3" library_locally_modified="yes">
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
 <packageinstances>
 <packageinstance name="ELAB_PUSHBUTTON_1"/>
 </packageinstances>
@@ -1439,9 +1453,7 @@ CONN_02
 </package>
 </packages>
 <packages3d>
-<package3d name="RESC2016X100" urn="urn:adsk.eagle:package:10481001/2" type="model" library_version="2" library_locally_modified="yes">
-<description>Chip, 2.00 X 1.60 X 1.00 mm body
-&lt;p&gt;Chip package with body size 2.00 X 1.60 X 1.00 mm&lt;/p&gt;</description>
+<package3d name="0806(2016-METRIC)" urn="urn:adsk.eagle:package:10481001/1" type="box" library_version="2">
 <packageinstances>
 <packageinstance name="0806(2016-METRIC)"/>
 </packageinstances>
@@ -1518,7 +1530,7 @@ CONN_02
 </package>
 </packages>
 <packages3d>
-<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/2" type="model" library_version="4" library_locally_modified="yes">
+<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/1" type="box" library_version="4">
 <packageinstances>
 <packageinstance name="DIP-10-WIDE"/>
 </packageinstances>
@@ -1628,6 +1640,24 @@ package type OT</description>
 </package3d>
 </packages3d>
 </library>
+<library name="tactile-switches" urn="urn:adsk.eagle:library:10516572">
+<description>&lt;b&gt;Tactile Switches&lt;/b&gt;</description>
+<packages>
+<package name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:footprint:10516573/1" library_version="1">
+<smd name="P$1" x="-1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<smd name="P$2" x="1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<wire x1="-1.45" y1="1.45" x2="1.45" y2="1.45" width="0.127" layer="21"/>
+<wire x1="-1.45" y1="-1.45" x2="1.45" y2="-1.45" width="0.127" layer="21"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:package:10516575/2" type="model" library_version="1" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="3X4X2_MOMENTARY_SWITCH"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -1637,7 +1667,7 @@ package type OT</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="default">
+<designrules name="default *">
 <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 
@@ -1666,7 +1696,7 @@ design rules under a new name.</description>
 <param name="mdSmdSmd" value="6mil"/>
 <param name="mdViaViaSameLayer" value="6mil"/>
 <param name="mnLayersViaInSmd" value="2"/>
-<param name="mdCopperDimension" value="40mil"/>
+<param name="mdCopperDimension" value="20mil"/>
 <param name="mdDrill" value="6mil"/>
 <param name="mdSmdStop" value="0mil"/>
 <param name="msWidth" value="6mil"/>
@@ -1821,166 +1851,160 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-30.48" y="55.88" smashed="yes">
-<attribute name="NAME" x="-31.115" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-31.115" y="53.975" size="1.27" layer="27"/>
+<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="8" y="8.5" smashed="yes">
+<attribute name="NAME" x="3.965" y="7.935" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="38.48" y="-47.38" size="1.778" layer="27" display="off"/>
+</element>
+<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="16.05" y="10.87" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.98" y="8.2" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="-28.4" y="60.4" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-44.45" y="49.53" smashed="yes">
-<attribute name="NAME" x="-45.72" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-45.72" y="46.99" size="1.27" layer="27"/>
+<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="12.33" y="11.53" smashed="yes" rot="R270">
+<attribute name="NAME" x="13.1" y="13.8" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="C" x="-37.2" y="-38" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-49.53" y="49.53" smashed="yes">
-<attribute name="NAME" x="-50.8" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-50.8" y="46.99" size="1.27" layer="27"/>
+<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.11" y="30.44" smashed="yes">
+<attribute name="NAME" x="11.62" y="26.5" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="43.4" y="-19.09" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-34.29" y="49.53" smashed="yes">
-<attribute name="NAME" x="-35.56" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-35.56" y="46.99" size="1.27" layer="27"/>
+<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.12" y="28.38" smashed="yes">
+<attribute name="NAME" x="11.43" y="31.41" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="48.49" y="-21.15" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-39.37" y="49.53" smashed="yes">
-<attribute name="NAME" x="-40.64" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-40.64" y="46.99" size="1.27" layer="27"/>
+<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="9.33" y="22.82" smashed="yes" rot="R180">
+<attribute name="NAME" x="7.565" y="23.385" size="1.27" layer="25" rot="R180"/>
+<attribute name="SPICEPREFIX" value="C" x="-27.5" y="78.7" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-36.83" y="55.88" smashed="yes">
-<attribute name="NAME" x="-37.465" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="53.975" size="1.27" layer="27"/>
+<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="27.91" y="1.82" smashed="yes">
+<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="Molex" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MP" value="1050170001" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="NAME" x="23.59973125" y="5.46023125" size="1.27008125" layer="25"/>
+<attribute name="PACKAGE" value="None" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="23.5973" y="-2.43266875" size="1.2708" layer="27"/>
 </element>
-<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="-34.29" y="33.02" smashed="yes">
-<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="Molex" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MP" value="1050170001" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="-38.60026875" y="36.66023125" size="1.27008125" layer="25"/>
-<attribute name="PACKAGE" value="None" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-38.6027" y="28.76733125" size="1.2708" layer="27"/>
+<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="8.42" y="4.44" smashed="yes">
+<attribute name="NAME" x="5.75" y="4.237" size="0.6096" layer="25" font="vector" ratio="20"/>
+<attribute name="VALUE" x="7.15" y="2.408" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="-17.78" y="66.04" smashed="yes">
-<attribute name="NAME" x="-19.05" y="67.437" size="0.6096" layer="25" font="vector" ratio="20"/>
-<attribute name="VALUE" x="-19.05" y="64.008" size="0.6096" layer="27" font="vector" ratio="20"/>
+<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="12" smashed="yes"/>
+<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="40" smashed="yes" rot="R180"/>
+<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="6.53" y="25.5" smashed="yes" rot="R90"/>
+<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="10.1" y="12" smashed="yes" rot="R90">
+<attribute name="NAME" x="10.665" y="13.765" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="58.36" y="67.88" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/2" value="ELAB_PUSHBUTTON_1" x="28" y="6" smashed="yes"/>
-<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/2" value="ELAB_PUSHBUTTON_1" x="28" y="32" smashed="yes" rot="R180"/>
-<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/2" value="MAKK2016T1R5M" x="-25.4" y="64.77" smashed="yes"/>
-<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="-55.88" y="48.26" smashed="yes">
-<attribute name="NAME" x="-56.515" y="48.895" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-56.515" y="46.355" size="1.27" layer="27"/>
+<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="43.4" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="43.965" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-12.48" y="18.99" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="55.88" smashed="yes">
-<attribute name="NAME" x="-42.545" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="53.975" size="1.27" layer="27"/>
+<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="41.765" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="102.06" y="91.03" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-36.83" y="60.96" smashed="yes">
-<attribute name="NAME" x="-37.465" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="59.055" size="1.27" layer="27"/>
+<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="39.465" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="94.68" y="101.19" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="55.88" smashed="yes">
-<attribute name="NAME" x="-47.625" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="53.975" size="1.27" layer="27"/>
+<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="37.165" y="55.965" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="92.38" y="106.27" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-52.07" y="55.88" smashed="yes">
-<attribute name="NAME" x="-52.705" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-52.705" y="53.975" size="1.27" layer="27"/>
+<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="39.365" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-17.08" y="3.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-57.15" y="55.88" smashed="yes">
-<attribute name="NAME" x="-57.785" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.785" y="53.975" size="1.27" layer="27"/>
+<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="37.065" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-24.46" y="44.39" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-16.51" y="60.96" smashed="yes">
-<attribute name="NAME" x="-17.145" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-17.145" y="59.055" size="1.27" layer="27"/>
+<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7" x="7.29" y="15.16" smashed="yes">
+<attribute name="NAME" x="6.655" y="15.795" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="49.2" y="-45.8" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="60.96" smashed="yes">
-<attribute name="NAME" x="-42.545" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="59.055" size="1.27" layer="27"/>
+<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="16.2" y="16.86" smashed="yes">
+<attribute name="NAME" x="15.065" y="18.195" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="67" y="-44.1" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="-50.8" y="60.96" smashed="yes">
-<attribute name="NAME" x="-51.435" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-51.435" y="59.055" size="1.27" layer="27"/>
+<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="3.4" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="3.965" y="45.565" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="59.28" y="67.28" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="-17.78" y="55.88" smashed="yes">
-<attribute name="NAME" x="-18.415" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-18.415" y="53.975" size="1.27" layer="27"/>
+<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="1.3" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="1.865" y="45.365" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="57.18" y="73.63" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="-24.13" y="55.88" smashed="yes">
-<attribute name="NAME" x="-24.765" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-24.765" y="53.975" size="1.27" layer="27"/>
+<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="10.8" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="10.3" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-50.16" y="27.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-21.59" y="60.96" smashed="yes">
-<attribute name="NAME" x="-22.225" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-22.225" y="59.055" size="1.27" layer="27"/>
+<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="15.04" y="49.53" smashed="yes" rot="R90">
+<attribute name="NAME" x="14.5" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="76" y="76.2" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-26.67" y="60.96" smashed="yes">
-<attribute name="NAME" x="-27.305" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-27.305" y="59.055" size="1.27" layer="27"/>
+<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="8.7" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="8.2" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-52.26" y="17.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-31.75" y="60.96" smashed="yes">
-<attribute name="NAME" x="-32.385" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-32.385" y="59.055" size="1.27" layer="27"/>
+<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="41.665" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-19.86" y="13.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="60.96" smashed="yes">
-<attribute name="NAME" x="-47.625" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="59.055" size="1.27" layer="27"/>
+<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="11.79" y="61.15" smashed="yes">
+<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PINS" value="16" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PITCH" value="0.078&quot; / 2 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="6.69" y="60.25" size="1.27" layer="27"/>
 </element>
-<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="10.64" y="50.2" smashed="yes">
-<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="2.64" y="63.2" size="1.27" layer="25"/>
-<attribute name="PINS" value="16" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="PITCH" value="0.078&quot; / 2 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="2.64" y="39.1" size="1.27" layer="27"/>
+<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="58" smashed="yes"/>
+<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="7.5" y="11.8" smashed="yes"/>
+<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="15.63" y="13.91" smashed="yes" rot="R270">
+<attribute name="NAME" x="18.035" y="15.015" size="1.27" layer="25" rot="R270"/>
 </element>
-<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/2" value="NKR161" x="28" y="48" smashed="yes"/>
-<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="-54.61" y="60.96" smashed="yes"/>
-<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="-29.21" y="49.53" smashed="yes">
-<attribute name="NAME" x="-31.115" y="51.435" size="1.27" layer="25"/>
-<attribute name="VALUE" x="-31.115" y="46.101" size="1.27" layer="27"/>
+<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="10.04" y="25.49" smashed="yes" rot="R270"/>
+<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="2.7" y="36.8" smashed="yes" rot="R90"/>
+<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="12.9" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="12.4" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="12.9" y="49.5" size="1.778" layer="27" rot="R90" display="off"/>
+</element>
+<element name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="13.6" y="42.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.87" y="40.803" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="14.87" y="44.232" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
-<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="-21.59" y="66.04" smashed="yes"/>
 </elements>
 <signals>
 <signal name="+3V3">
 <contactref element="U$1" pad="VCC"/>
 <contactref element="R6" pad="2"/>
 <contactref element="R8" pad="2"/>
-<contactref element="J4" pad="P$2"/>
-<contactref element="J4" pad="P$3"/>
 <contactref element="J3" pad="P$2"/>
 <contactref element="J3" pad="P$3"/>
 <contactref element="U4" pad="P$1"/>
 <contactref element="U4" pad="P$10"/>
 <contactref element="C5" pad="1"/>
 <contactref element="C4" pad="1"/>
-<wire x1="30.5" y1="9.8" x2="30.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="42.095" x2="30.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="25.5" y1="35.8" x2="2.44" y2="42.095" width="0" layer="19" extent="1-1"/>
-<wire x1="25.5" y1="28.2" x2="25.5" y2="35.8" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.24" y1="49.53" x2="25.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-40.32" y1="49.53" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.9" y1="60.96" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="64.765" x2="-30.9" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="67.315" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.74" y1="60.96" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
+<contactref element="R16" pad="1"/>
+<wire x1="3.59" y1="53.045" x2="4.455" y2="53.045" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.8" x2="8.7" y2="48.65" width="0.3" layer="1"/>
+<wire x1="4.455" y1="53.045" x2="8.7" y2="48.8" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.65" x2="12.9" y2="48.65" width="0.3" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.1" y="26.4"/>
+<vertex x="8.38" y="26.4"/>
+<vertex x="7.52" y="27.26"/>
+<vertex x="7.52" y="31.2"/>
+<vertex x="8.8" y="31.2"/>
+<vertex x="8.82" y="31.18"/>
+<vertex x="8.82" y="26.98"/>
+<vertex x="9.1" y="26.7"/>
+</polygon>
+<wire x1="12.9" y1="48.65" x2="10.8" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="8.16" y1="30.44" x2="8.7" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="26.49" x2="8.765" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="15.8" x2="11.315" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="8.2" x2="30.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="GND">
 <contactref element="J1" pad="SH1"/>
@@ -2010,176 +2034,299 @@ design rules under a new name.</description>
 <contactref element="U3" pad="2"/>
 <contactref element="C3" pad="2"/>
 <contactref element="R5" pad="1"/>
-<wire x1="-21.59" y1="64.765" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.09" y1="67.315" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-27.52" y1="60.96" x2="-21.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-24.98" y1="55.88" x2="-27.52" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.21" y1="48.23" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.34" y1="49.53" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-38.42" y1="49.53" x2="-33.34" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-43.5" y1="49.53" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-48.58" y1="49.53" x2="-43.5" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.68" y1="55.88" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-42.76" y1="60.96" x2="-37.68" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-51.65" y1="60.96" x2="-42.76" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.61" y1="60.96" x2="-51.65" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="62.31" x2="-54.61" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.79" y1="35.37" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-32.99" y1="35.37" x2="-31.79" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.29" y1="32.67" x2="-32.99" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.39" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.79" y1="32.67" x2="-31.39" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.29" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.19" y1="32.67" x2="-35.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.79" y1="32.67" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-36.79" y1="35.37" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="28" y1="55.62" x2="-37.79" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="28" y1="40.38" x2="28" y2="55.62" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="42.095" x2="28" y2="40.38" width="0" layer="19" extent="1-1"/>
+<contactref element="J5" pad="P$1"/>
+<contactref element="J6" pad="1"/>
+<contactref element="J4" pad="P$1"/>
+<contactref element="J4" pad="P$4"/>
+<wire x1="8.765" y1="25.49" x2="10" y2="25.49" width="0.2" layer="1"/>
+<wire x1="10" y1="25.49" x2="10.04" y2="25.49" width="0.2" layer="1"/>
+<wire x1="11.315" y1="25.99" x2="10.5" y2="25.99" width="0.2" layer="1"/>
+<wire x1="10.5" y1="25.99" x2="10" y2="25.49" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.44" y="24.48"/>
+<vertex x="9.44" y="21.98"/>
+<vertex x="10.02" y="21.98"/>
+<vertex x="10.62" y="21.98"/>
+<vertex x="10.62" y="24.48"/>
+<vertex x="10.62" y="31.64"/>
+<vertex x="9.86" y="31.64"/>
+<vertex x="9.44" y="31.64"/>
+</polygon>
+<wire x1="19.99" y1="53.045" x2="28" y2="65.62" width="0" layer="19" extent="1-1"/>
+<wire x1="15.04" y1="48.68" x2="19.99" y2="53.045" width="0" layer="19" extent="1-1"/>
+<wire x1="13.6" y1="42.2" x2="15.04" y2="48.68" width="0" layer="19" extent="1-1"/>
+<wire x1="28" y1="50.38" x2="19.99" y2="53.045" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="43.8" x2="28" y2="50.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="36.2" x2="30.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="10.06" y1="30.44" x2="13.6" y2="42.2" width="0" layer="19" extent="1-1"/>
+<wire x1="15.35" y1="16.86" x2="10.18" y2="22.82" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="13.91" x2="15.35" y2="16.86" width="0" layer="19" extent="1-1"/>
+<wire x1="15.1" y1="10.87" x2="14.33" y2="13.91" width="0" layer="19" extent="1-1"/>
+<wire x1="12.33" y1="10.58" x2="15.1" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="7.5" y1="11.8" x2="12.33" y2="10.58" width="0" layer="19" extent="1-1"/>
+<wire x1="6.9" y1="13.15" x2="7.5" y2="11.8" width="0" layer="19" extent="1-1"/>
+<wire x1="6.44" y1="15.16" x2="6.9" y2="13.15" width="0" layer="19" extent="1-1"/>
+<wire x1="2.7" y1="35.425" x2="10.06" y2="30.44" width="0" layer="19" extent="1-1"/>
+<wire x1="25.41" y1="4.17" x2="15.1" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="25.01" y1="1.47" x2="25.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="24.41" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="26.91" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="28.91" y1="1.47" x2="26.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.81" y1="1.47" x2="28.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="31.41" y1="1.47" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.41" y1="4.17" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="29.21" y1="4.17" x2="30.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="1.3" y1="48.65" x2="2.7" y2="35.425" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="+5V">
 <contactref element="J1" pad="1"/>
 <contactref element="C2" pad="1"/>
 <contactref element="U3" pad="1"/>
 <contactref element="U3" pad="4"/>
-<wire x1="-30.16" y1="48.23" x2="-28.26" y2="50.83" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.59" y1="35.37" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-45.4" y1="49.53" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
+<wire x1="17" y1="10.87" x2="26.61" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="16.93" y1="12.96" x2="17" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="14.86" x2="16.93" y2="12.96" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_RX">
 <contactref element="J1" pad="2"/>
 <contactref element="U$1" pad="RX"/>
 <contactref element="R9" pad="2"/>
-<wire x1="-34.94" y1="35.37" x2="-46.14" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="54" x2="-34.94" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="64.95" x2="20.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="20.75" y1="64.95" x2="21.7" y2="64" width="0.3" layer="1"/>
+<wire x1="21.7" y1="64" x2="22.9" y2="64" width="0.3" layer="1"/>
+<via x="22.9" y="64" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="22.9" y1="64" x2="41.5" y2="64" width="0.3" layer="16"/>
+<wire x1="41.5" y1="64" x2="44.8" y2="60.7" width="0.3" layer="16"/>
+<wire x1="44.8" y1="60.7" x2="44.8" y2="58.4" width="0.3" layer="16"/>
+<wire x1="44.8" y1="58.4" x2="44.7" y2="58.3" width="0.3" layer="16"/>
+<via x="44.7" y="58.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="44.7" y1="58.3" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="60.05" width="0.3" layer="1"/>
+<wire x1="43.9" y1="57.5" x2="42.2" y2="57.5" width="0.3" layer="1"/>
+<wire x1="42.2" y1="57.5" x2="41.1" y2="58.6" width="0.3" layer="1"/>
+<wire x1="27.26" y1="4.17" x2="42.2" y2="57.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_TX">
 <contactref element="J1" pad="3"/>
 <contactref element="U$1" pad="TX"/>
 <contactref element="R12" pad="2"/>
-<wire x1="-34.29" y1="35.37" x2="-46.14" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="56" x2="-34.29" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="66.95" x2="18.25" y2="66.95" width="0.3" layer="1"/>
+<wire x1="18.25" y1="66.95" x2="17.7" y2="66.4" width="0.3" layer="1"/>
+<wire x1="17.7" y1="66.4" x2="17.7" y2="61" width="0.3" layer="1"/>
+<via x="17.7" y="61" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.7" y1="61" x2="32.9" y2="61" width="0.3" layer="16"/>
+<wire x1="32.9" y1="61" x2="35" y2="58.9" width="0.3" layer="16"/>
+<via x="35" y="58.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="35" y1="58.9" x2="36.5" y2="57.4" width="0.3" layer="1"/>
+<wire x1="36.5" y1="57.4" x2="38" y2="57.4" width="0.3" layer="1"/>
+<wire x1="38" y1="57.4" x2="38.7" y2="56.7" width="0.3" layer="1"/>
+<wire x1="38.7" y1="55.15" x2="38.8" y2="55.05" width="0.3" layer="1"/>
+<wire x1="38.7" y1="56.7" x2="38.7" y2="55.15" width="0.3" layer="1"/>
+<wire x1="27.91" y1="4.17" x2="38.8" y2="55.05" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VBAT_D">
 <contactref element="U$1" pad="ADC"/>
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
-<wire x1="-23.28" y1="55.88" x2="-16.93" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="54" x2="-23.28" y2="55.88" width="0" layer="19" extent="1-1"/>
+<contactref element="J4" pad="P$2"/>
+<contactref element="J4" pad="P$3"/>
+<wire x1="3.4" y1="50.35" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="1.6" y1="50.35" x2="1.3" y2="50.35" width="0.3" layer="1"/>
+<wire x1="3.59" y1="64.95" x2="2.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="1.2" y1="50.75" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="2.75" y1="64.95" x2="1.2" y2="63.4" width="0.3" layer="1"/>
+<wire x1="1.2" y1="63.4" x2="1.2" y2="50.75" width="0.3" layer="1"/>
+<wire x1="25.5" y1="36.2" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.4" y1="50.35" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RST">
 <contactref element="U$1" pad="REST"/>
 <contactref element="U$1" pad="GPIO16"/>
 <contactref element="R6" pad="1"/>
-<wire x1="2.44" y1="56" x2="-22.44" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="50" x2="2.44" y2="56" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$1">
-<contactref element="U$1" pad="GPIO15"/>
-<contactref element="R7" pad="2"/>
-<contactref element="J4" pad="P$1"/>
-<contactref element="J4" pad="P$4"/>
-<wire x1="30.5" y1="28.2" x2="-25.82" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="30.5" y1="35.8" x2="30.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="44" x2="30.5" y2="35.8" width="0" layer="19" extent="1-1"/>
+<contactref element="J5" pad="P$2"/>
+<wire x1="3.59" y1="66.95" x2="6.55" y2="66.95" width="0.3" layer="1"/>
+<wire x1="6.55" y1="66.95" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<via x="6.7" y="66.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="6.7" y1="66.8" x2="6.7" y2="55.9" width="0.3" layer="16"/>
+<wire x1="10.7" y1="51.9" x2="10.8" y2="51.9" width="0.3" layer="16"/>
+<via x="10.8" y="51.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="50.35" width="0.3" layer="1"/>
+<wire x1="6.7" y1="55.9" x2="10.7" y2="51.9" width="0.3" layer="16"/>
+<wire x1="3.59" y1="60.95" x2="5.25" y2="60.95" width="0.3" layer="1"/>
+<wire x1="5.25" y1="60.95" x2="6.7" y2="62.4" width="0.3" layer="1"/>
+<wire x1="6.7" y1="62.4" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="47.7" width="0.3" layer="16"/>
+<wire x1="10.8" y1="47.7" x2="2.7" y2="39.6" width="0.3" layer="16"/>
+<via x="2.7" y="39.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="2.7" y1="39.6" x2="2.7" y2="38.175" width="0.3" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="R8" pad="1"/>
 <contactref element="U$1" pad="CH_PD"/>
-<wire x1="2.44" y1="52" x2="-32.6" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="62.95" x2="5.55" y2="62.95" width="0.3" layer="1"/>
+<wire x1="5.55" y1="62.95" x2="5.6" y2="62.9" width="0.3" layer="1"/>
+<via x="5.6" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="5.6" y1="62.9" x2="5.6" y2="54.7" width="0.3" layer="16"/>
+<wire x1="5.6" y1="54.7" x2="8.7" y2="51.6" width="0.3" layer="16"/>
+<via x="8.7" y="51.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="8.7" y1="51.6" x2="8.7" y2="50.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="GPIO2"/>
 <contactref element="J3" pad="P$1"/>
 <contactref element="J3" pad="P$4"/>
-<wire x1="25.5" y1="9.8" x2="25.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="46" x2="25.5" y2="9.8" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="15.8" x2="19.99" y2="56.95" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="8.2" x2="25.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="U$1" pad="GPIO4"/>
 <contactref element="R10" pad="2"/>
-<wire x1="18.84" y1="52" x2="-41.06" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="62.95" x2="24.25" y2="62.95" width="0.3" layer="1"/>
+<wire x1="24.25" y1="62.95" x2="24.3" y2="62.9" width="0.3" layer="1"/>
+<via x="24.3" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="24.3" y1="62.9" x2="40.8" y2="62.9" width="0.3" layer="16"/>
+<wire x1="40.8" y1="62.9" x2="43.4" y2="60.3" width="0.3" layer="16"/>
+<wire x1="43.4" y1="60.3" x2="43.4" y2="58.8" width="0.3" layer="16"/>
+<via x="43.4" y="58.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="43.4" y1="58.8" x2="43.4" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="U$1" pad="GPIO5"/>
 <contactref element="R11" pad="2"/>
-<wire x1="18.84" y1="50" x2="-35.98" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="60.95" x2="34.65" y2="60.95" width="0.3" layer="1"/>
+<wire x1="34.65" y1="60.95" x2="34.7" y2="60.9" width="0.3" layer="1"/>
+<via x="34.7" y="60.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="34.7" y1="60.9" x2="38.8" y2="60.9" width="0.3" layer="16"/>
+<wire x1="38.8" y1="60.9" x2="41.1" y2="58.6" width="0.3" layer="16"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="56.3" width="0.3" layer="16"/>
+<via x="41.1" y="56.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="41.1" y1="56.3" x2="41.1" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_E">
 <contactref element="U$1" pad="GPIO14"/>
 <contactref element="R13" pad="2"/>
-<wire x1="-51.22" y1="55.88" x2="2.44" y2="48" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="58.95" x2="6.85" y2="58.95" width="0.3" layer="1"/>
+<wire x1="6.85" y1="58.95" x2="7.4" y2="58.4" width="0.3" layer="1"/>
+<via x="7.4" y="58.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="7.4" y1="58.4" x2="9.4" y2="56.4" width="0.3" layer="16"/>
+<wire x1="9.4" y1="56.4" x2="36.4" y2="56.4" width="0.3" layer="16"/>
+<via x="36.4" y="56.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="36.4" y1="56.4" x2="36.5" y2="56.3" width="0.3" layer="1"/>
+<wire x1="36.5" y1="56.3" x2="36.5" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_F">
 <contactref element="U$1" pad="GPIO12"/>
 <contactref element="R14" pad="2"/>
-<wire x1="-56.3" y1="55.88" x2="2.44" y2="46" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="56.95" x2="7.45" y2="56.95" width="0.3" layer="1"/>
+<wire x1="7.45" y1="56.95" x2="9.2" y2="58.7" width="0.3" layer="1"/>
+<via x="9.2" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38" y1="57.9" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="9.2" y1="58.7" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="38" y1="57.9" x2="38.8" y2="58.7" width="0.3" layer="16"/>
+<via x="38.8" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38.8" y1="58.7" x2="38.8" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_G">
 <contactref element="U$1" pad="GPIO13"/>
 <contactref element="R15" pad="2"/>
-<wire x1="2.44" y1="44" x2="-15.66" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="54.95" x2="7.05" y2="54.95" width="0.3" layer="1"/>
+<wire x1="36.4" y1="59.95" x2="36.5" y2="60.05" width="0.3" layer="1"/>
+<wire x1="7.05" y1="54.95" x2="12.05" y2="59.95" width="0.3" layer="1"/>
+<wire x1="12.05" y1="59.95" x2="36.4" y2="59.95" width="0.3" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="U$2" pad="P$10"/>
 <contactref element="R15" pad="1"/>
-<wire x1="22.92" y1="55.62" x2="-17.36" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="65.62" x2="26.79" y2="61.75" width="0.3" layer="1"/>
+<wire x1="26.79" y1="61.75" x2="36.5" y2="61.75" width="0.3" layer="1"/>
 </signal>
 <signal name="N$14">
 <contactref element="R14" pad="1"/>
 <contactref element="U$2" pad="P$9"/>
-<wire x1="-58" y1="55.88" x2="25.46" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="65.62" x2="27.68" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38.8" y1="62.6" x2="38.8" y2="61.75" width="0.3" layer="1"/>
+<wire x1="27.68" y1="63.4" x2="38" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38" y1="63.4" x2="38.8" y2="62.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$15">
 <contactref element="R13" pad="1"/>
 <contactref element="U$2" pad="P$1"/>
-<wire x1="-52.92" y1="55.88" x2="22.92" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="50.38" x2="25.89" y2="53.35" width="0.3" layer="1"/>
+<wire x1="25.89" y1="53.35" x2="36.5" y2="53.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="R11" pad="1"/>
 <contactref element="U$2" pad="P$4"/>
-<wire x1="-37.68" y1="60.96" x2="30.54" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="50.38" x2="31.76" y2="51.6" width="0.3" layer="1"/>
+<wire x1="41.1" y1="52.4" x2="41.1" y2="53.35" width="0.3" layer="1"/>
+<wire x1="31.76" y1="51.6" x2="40.3" y2="51.6" width="0.3" layer="1"/>
+<wire x1="40.3" y1="51.6" x2="41.1" y2="52.4" width="0.3" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="R9" pad="1"/>
 <contactref element="U$2" pad="P$7"/>
-<wire x1="-47.84" y1="60.96" x2="30.54" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="65.62" x2="31.76" y2="64.4" width="0.3" layer="1"/>
+<wire x1="41.1" y1="62.9" x2="41.1" y2="61.75" width="0.3" layer="1"/>
+<wire x1="31.76" y1="64.4" x2="39.6" y2="64.4" width="0.3" layer="1"/>
+<wire x1="39.6" y1="64.4" x2="41.1" y2="62.9" width="0.3" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="R10" pad="1"/>
 <contactref element="U$2" pad="P$6"/>
-<wire x1="33.08" y1="55.62" x2="-42.76" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="33.08" y1="65.62" x2="41.38" y2="65.62" width="0.3" layer="1"/>
+<wire x1="43.4" y1="63.6" x2="43.4" y2="61.75" width="0.3" layer="1"/>
+<wire x1="41.38" y1="65.62" x2="43.4" y2="63.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$19">
 <contactref element="U$2" pad="P$2"/>
 <contactref element="R12" pad="1"/>
-<wire x1="-47.84" y1="55.88" x2="25.46" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="50.38" x2="27.38" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.8" y1="52.6" x2="38.8" y2="53.35" width="0.3" layer="1"/>
+<wire x1="27.38" y1="52.3" x2="38.5" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.5" y1="52.3" x2="38.8" y2="52.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="L1" pad="P$2"/>
 <contactref element="U4" pad="P$2"/>
-<wire x1="-24.65" y1="64.77" x2="-22.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.79" y1="25.99" x2="6.53" y2="26.25" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.12" y="25.9"/>
+<vertex x="5.64" y="25.9"/>
+<vertex x="5.64" y="26.6"/>
+<vertex x="7.66" y="26.6"/>
+<vertex x="8.18" y="26.08"/>
+<vertex x="9.1" y="26.08"/>
+<vertex x="9.12" y="26.06"/>
+</polygon>
 </signal>
 <signal name="N$4">
 <contactref element="L1" pad="P$1"/>
 <contactref element="U4" pad="P$4"/>
-<wire x1="-26.15" y1="64.77" x2="-21.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.77" y1="24.99" x2="6.53" y2="24.75" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="9.07" y="25.03"/>
+<vertex x="9.07" y="24.96"/>
+<vertex x="8.01" y="24.96"/>
+<vertex x="7.44" y="24.39"/>
+<vertex x="5.64" y="24.39"/>
+<vertex x="5.64" y="25.03"/>
+</polygon>
 </signal>
 <signal name="N$6">
 <contactref element="J2" pad="1"/>
 <contactref element="U2" pad="P$1"/>
 <contactref element="U2" pad="P$2"/>
 <contactref element="C1" pad="1"/>
-<wire x1="-31.33" y1="55.88" x2="-17.78" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.435" y1="59.61" x2="-31.33" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="59.61" x2="-54.435" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="6.9" y1="10.45" x2="7.675" y2="10.45" width="0" layer="19" extent="1-1"/>
+<wire x1="7.15" y1="8.5" x2="6.9" y2="10.45" width="0" layer="19" extent="1-1"/>
+<wire x1="8.42" y1="4.44" x2="7.15" y2="8.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$7">
 <contactref element="C1" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="U2" pad="P$3"/>
-<wire x1="-53.835" y1="59.61" x2="-29.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.73" y1="48.26" x2="-53.835" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="8.275" y1="10.45" x2="10.1" y2="11.15" width="0" layer="19" extent="1-1"/>
+<wire x1="8.85" y1="8.5" x2="8.275" y2="10.45" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$9">
 <contactref element="J2" pad="2"/>
@@ -2191,27 +2338,75 @@ design rules under a new name.</description>
 <contactref element="U4" pad="P$6"/>
 <contactref element="C6" pad="2"/>
 <contactref element="R4" pad="1"/>
-<wire x1="-20.59" y1="67.315" x2="-15.24" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="67.315" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.59" y1="64.765" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-18.63" y1="55.88" x2="-20.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-28.26" y1="48.23" x2="-18.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.98" y1="55.88" x2="-28.26" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-50.48" y1="49.53" x2="-35.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.03" y1="48.26" x2="-50.48" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="25.49" x2="11.84" y2="25.49" width="0.2" layer="1"/>
+<wire x1="12.05" y1="25.7" x2="12.7" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.84" y1="25.49" x2="12.05" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.315" y1="24.49" x2="11.61" y2="24.49" width="0.2" layer="1"/>
+<wire x1="12.7" y1="24.3" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="11.61" y1="24.49" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="12.7" y1="25.7" x2="13.1" y2="25.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="24.7" x2="12.7" y2="24.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="25.3" x2="13.1" y2="24.7" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="8.26" y="24.54"/>
+<vertex x="9.06" y="24.54"/>
+<vertex x="9.06" y="21.12"/>
+<vertex x="12.1" y="18.08"/>
+<vertex x="12.1" y="14.74"/>
+<vertex x="13.7" y="13.14"/>
+<vertex x="14.84" y="13.14"/>
+<vertex x="14.84" y="12.6"/>
+<vertex x="14.16" y="11.92"/>
+<vertex x="11.08" y="11.92"/>
+<vertex x="10.56" y="12.44"/>
+<vertex x="9.36" y="12.44"/>
+<vertex x="9.36" y="16.26"/>
+<vertex x="7.9" y="17.72"/>
+<vertex x="7.9" y="24.18"/>
+</polygon>
+<wire x1="12.7" y1="24.3" x2="12.7" y2="18.62" width="0.3" layer="1"/>
+<wire x1="12.7" y1="18.62" x2="11.76" y2="17.68" width="0.3" layer="1"/>
+<wire x1="11.315" y1="25.49" x2="3.4" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="10.96" y1="4.44" x2="12.33" y2="12.48" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$11">
 <contactref element="U2" pad="P$5"/>
 <contactref element="R2" pad="2"/>
-<wire x1="-54.435" y1="62.31" x2="-41.06" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="8.14" y1="15.16" x2="7.675" y2="13.15" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$12">
 <contactref element="R3" pad="2"/>
 <contactref element="U3" pad="5"/>
-<wire x1="-49.95" y1="60.96" x2="-30.16" y2="50.83" width="0" layer="19" extent="1-1"/>
+<wire x1="16.93" y1="14.86" x2="17.05" y2="16.86" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PS">
 <contactref element="U4" pad="P$7"/>
+<contactref element="U$1" pad="GPIO15"/>
+<contactref element="R7" pad="2"/>
+<wire x1="19.99" y1="54.95" x2="17.85" y2="54.95" width="0.3" layer="1"/>
+<wire x1="15.04" y1="52.14" x2="15.04" y2="50.38" width="0.3" layer="1"/>
+<wire x1="17.85" y1="54.95" x2="15.04" y2="52.14" width="0.3" layer="1"/>
+<wire x1="15.06" y1="52.14" x2="17.3" y2="49.9" width="0.2" layer="16"/>
+<wire x1="15.06" y1="52.14" x2="15.04" y2="52.14" width="0.2" layer="16"/>
+<via x="15.04" y="52.14" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.3" y1="28.6" x2="13.7" y2="25" width="0.2" layer="16"/>
+<wire x1="13.7" y1="25" x2="12.3" y2="25" width="0.2" layer="16"/>
+<via x="12.3" y="25" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="12.3" y1="25" x2="11.325" y2="25" width="0.2" layer="1"/>
+<wire x1="11.325" y1="25" x2="11.315" y2="24.99" width="0.2" layer="1"/>
+<wire x1="17.3" y1="49.9" x2="17.3" y2="28.6" width="0.2" layer="16"/>
+</signal>
+<signal name="N$20">
+<contactref element="U$1" pad="GPIO0"/>
+<contactref element="R16" pad="2"/>
+<contactref element="J6" pad="2"/>
+<wire x1="19.99" y1="58.95" x2="16.35" y2="58.95" width="0.3" layer="1"/>
+<wire x1="12.9" y1="55.5" x2="12.9" y2="51.8" width="0.3" layer="1"/>
+<wire x1="12.9" y1="51.8" x2="12.9" y2="50.35" width="0.3" layer="1"/>
+<wire x1="16.35" y1="58.95" x2="12.9" y2="55.5" width="0.3" layer="1"/>
+<wire x1="11.06" y1="42.2" x2="12.9" y2="44.04" width="0.3" layer="16"/>
+<wire x1="12.9" y1="44.04" x2="12.9" y2="51.8" width="0.3" layer="16"/>
+<via x="12.9" y="51.8" extent="1-16" drill="0.35" diameter="0.6"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
diff --git a/esp8266-wifi-remote.b#7 b/esp8266-wifi-remote.b#7
index 5f112ad..0b02804 100644
--- a/esp8266-wifi-remote.b#7
+++ b/esp8266-wifi-remote.b#7
@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.5" altunitdist="mm" altunit="mm"/>
+<grid distance="0.1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.05" altunitdist="mm" altunit="mm"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="16" fill="1" visible="no" active="no"/>
@@ -52,7 +52,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
@@ -157,12 +157,20 @@
 <layer number="255" name="routoute" color="7" fill="1" visible="no" active="yes"/>
 </layers>
 <board>
-<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="fb63fa54-68c3-cc80-f31b-f38651a3a672"/>
+<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="c7a73c68-2407-04ba-dc3a-388155fd8543"/>
 <plain>
-<wire x1="0" y1="0" x2="160" y2="0" width="0" layer="20"/>
-<wire x1="160" y1="0" x2="160" y2="100" width="0" layer="20"/>
-<wire x1="160" y1="100" x2="0" y2="100" width="0" layer="20"/>
-<wire x1="0" y1="100" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="0" x2="56" y2="0" width="0" layer="20"/>
+<wire x1="56" y1="0" x2="56" y2="68" width="0" layer="20"/>
+<wire x1="56" y1="68" x2="0" y2="68" width="0" layer="20"/>
+<wire x1="0" y1="68" x2="0" y2="0" width="0" layer="20"/>
+<hole x="3" y="3" drill="3.2"/>
+<hole x="53" y="3" drill="3.2"/>
+<hole x="53" y="65" drill="3.2"/>
+<text x="12.8" y="3.6" size="1.778" layer="21">BAT</text>
+<text x="10.3" y="0.9" size="1.778" layer="21">+</text>
+<text x="8" y="1" size="1.778" layer="21">-</text>
+<text x="9" y="38.4" size="1.778" layer="21">BOOT</text>
+<text x="3.3" y="34" size="1.778" layer="21" rot="R90" align="bottom-right">RST</text>
 </plain>
 <libraries>
 <library name="rcl" urn="urn:adsk.eagle:library:334">
@@ -1411,7 +1419,7 @@ CONN_02
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -1420,10 +1428,16 @@ CONN_02
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/2" type="model" library_version="3" library_locally_modified="yes">
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
 <packageinstances>
 <packageinstance name="ELAB_PUSHBUTTON_1"/>
 </packageinstances>
@@ -1439,9 +1453,7 @@ CONN_02
 </package>
 </packages>
 <packages3d>
-<package3d name="RESC2016X100" urn="urn:adsk.eagle:package:10481001/2" type="model" library_version="2" library_locally_modified="yes">
-<description>Chip, 2.00 X 1.60 X 1.00 mm body
-&lt;p&gt;Chip package with body size 2.00 X 1.60 X 1.00 mm&lt;/p&gt;</description>
+<package3d name="0806(2016-METRIC)" urn="urn:adsk.eagle:package:10481001/1" type="box" library_version="2">
 <packageinstances>
 <packageinstance name="0806(2016-METRIC)"/>
 </packageinstances>
@@ -1518,7 +1530,7 @@ CONN_02
 </package>
 </packages>
 <packages3d>
-<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/2" type="model" library_version="4" library_locally_modified="yes">
+<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/1" type="box" library_version="4">
 <packageinstances>
 <packageinstance name="DIP-10-WIDE"/>
 </packageinstances>
@@ -1628,6 +1640,24 @@ package type OT</description>
 </package3d>
 </packages3d>
 </library>
+<library name="tactile-switches" urn="urn:adsk.eagle:library:10516572">
+<description>&lt;b&gt;Tactile Switches&lt;/b&gt;</description>
+<packages>
+<package name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:footprint:10516573/1" library_version="1">
+<smd name="P$1" x="-1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<smd name="P$2" x="1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<wire x1="-1.45" y1="1.45" x2="1.45" y2="1.45" width="0.127" layer="21"/>
+<wire x1="-1.45" y1="-1.45" x2="1.45" y2="-1.45" width="0.127" layer="21"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:package:10516575/2" type="model" library_version="1" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="3X4X2_MOMENTARY_SWITCH"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -1637,7 +1667,7 @@ package type OT</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="default">
+<designrules name="default *">
 <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 
@@ -1666,7 +1696,7 @@ design rules under a new name.</description>
 <param name="mdSmdSmd" value="6mil"/>
 <param name="mdViaViaSameLayer" value="6mil"/>
 <param name="mnLayersViaInSmd" value="2"/>
-<param name="mdCopperDimension" value="40mil"/>
+<param name="mdCopperDimension" value="20mil"/>
 <param name="mdDrill" value="6mil"/>
 <param name="mdSmdStop" value="0mil"/>
 <param name="msWidth" value="6mil"/>
@@ -1821,166 +1851,152 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-30.48" y="55.88" smashed="yes">
-<attribute name="NAME" x="-31.115" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-31.115" y="53.975" size="1.27" layer="27"/>
+<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="8" y="8.5" smashed="yes">
+<attribute name="NAME" x="3.965" y="7.935" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="38.48" y="-47.38" size="1.778" layer="27" display="off"/>
+</element>
+<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="16.05" y="10.87" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.98" y="8.2" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="-28.4" y="60.4" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-44.45" y="49.53" smashed="yes">
-<attribute name="NAME" x="-45.72" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-45.72" y="46.99" size="1.27" layer="27"/>
+<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="12.33" y="11.53" smashed="yes" rot="R270">
+<attribute name="NAME" x="13.1" y="13.8" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="C" x="-37.2" y="-38" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-49.53" y="49.53" smashed="yes">
-<attribute name="NAME" x="-50.8" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-50.8" y="46.99" size="1.27" layer="27"/>
+<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="12.1" y="28.7" smashed="yes" rot="R180">
+<attribute name="NAME" x="10.73" y="29.97" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="-22.19" y="78.23" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-34.29" y="49.53" smashed="yes">
-<attribute name="NAME" x="-35.56" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-35.56" y="46.99" size="1.27" layer="27"/>
+<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="8.1" y="28.7" smashed="yes">
+<attribute name="NAME" x="6.83" y="29.97" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="47.47" y="-20.83" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-39.37" y="49.53" smashed="yes">
-<attribute name="NAME" x="-40.64" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-40.64" y="46.99" size="1.27" layer="27"/>
+<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="9.77" y="22.18" smashed="yes">
+<attribute name="NAME" x="11.535" y="21.615" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="46.6" y="-33.7" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-36.83" y="55.88" smashed="yes">
-<attribute name="NAME" x="-37.465" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="53.975" size="1.27" layer="27"/>
+<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="27.91" y="1.82" smashed="yes">
+<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="Molex" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MP" value="1050170001" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="NAME" x="23.59973125" y="5.46023125" size="1.27008125" layer="25"/>
+<attribute name="PACKAGE" value="None" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="23.5973" y="-2.43266875" size="1.2708" layer="27"/>
 </element>
-<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="-34.29" y="33.02" smashed="yes">
-<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="Molex" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MP" value="1050170001" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="-38.60026875" y="36.66023125" size="1.27008125" layer="25"/>
-<attribute name="PACKAGE" value="None" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-38.6027" y="28.76733125" size="1.2708" layer="27"/>
+<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="8.42" y="4.44" smashed="yes">
+<attribute name="NAME" x="5.75" y="4.237" size="0.6096" layer="25" font="vector" ratio="20"/>
+<attribute name="VALUE" x="7.15" y="2.408" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="-17.78" y="66.04" smashed="yes">
-<attribute name="NAME" x="-19.05" y="67.437" size="0.6096" layer="25" font="vector" ratio="20"/>
-<attribute name="VALUE" x="-19.05" y="64.008" size="0.6096" layer="27" font="vector" ratio="20"/>
+<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="12" smashed="yes"/>
+<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="40" smashed="yes" rot="R180"/>
+<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="6.53" y="25.5" smashed="yes" rot="R90"/>
+<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="10.1" y="12" smashed="yes" rot="R90">
+<attribute name="NAME" x="10.665" y="13.765" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="58.36" y="67.88" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/2" value="ELAB_PUSHBUTTON_1" x="21" y="6" smashed="yes"/>
-<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/2" value="ELAB_PUSHBUTTON_1" x="21" y="31" smashed="yes" rot="R180"/>
-<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/2" value="MAKK2016T1R5M" x="-25.4" y="64.77" smashed="yes"/>
-<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="-55.88" y="48.26" smashed="yes">
-<attribute name="NAME" x="-56.515" y="48.895" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-56.515" y="46.355" size="1.27" layer="27"/>
+<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="43.4" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="43.965" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-12.48" y="18.99" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="55.88" smashed="yes">
-<attribute name="NAME" x="-42.545" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="53.975" size="1.27" layer="27"/>
+<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="41.765" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="102.06" y="91.03" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-36.83" y="60.96" smashed="yes">
-<attribute name="NAME" x="-37.465" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="59.055" size="1.27" layer="27"/>
+<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="39.465" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="94.68" y="101.19" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="55.88" smashed="yes">
-<attribute name="NAME" x="-47.625" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="53.975" size="1.27" layer="27"/>
+<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="37.165" y="55.965" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="92.38" y="106.27" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-52.07" y="55.88" smashed="yes">
-<attribute name="NAME" x="-52.705" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-52.705" y="53.975" size="1.27" layer="27"/>
+<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="39.365" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-17.08" y="3.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-57.15" y="55.88" smashed="yes">
-<attribute name="NAME" x="-57.785" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.785" y="53.975" size="1.27" layer="27"/>
+<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="37.065" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-24.46" y="44.39" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-16.51" y="60.96" smashed="yes">
-<attribute name="NAME" x="-17.145" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-17.145" y="59.055" size="1.27" layer="27"/>
+<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7" x="7.29" y="15.16" smashed="yes">
+<attribute name="NAME" x="6.655" y="15.795" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="49.2" y="-45.8" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="60.96" smashed="yes">
-<attribute name="NAME" x="-42.545" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="59.055" size="1.27" layer="27"/>
+<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="16.2" y="16.86" smashed="yes">
+<attribute name="NAME" x="15.065" y="18.195" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="67" y="-44.1" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="-50.8" y="60.96" smashed="yes">
-<attribute name="NAME" x="-51.435" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-51.435" y="59.055" size="1.27" layer="27"/>
+<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="3.4" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="3.965" y="45.565" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="59.28" y="67.28" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="-17.78" y="55.88" smashed="yes">
-<attribute name="NAME" x="-18.415" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-18.415" y="53.975" size="1.27" layer="27"/>
+<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="1.3" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="1.865" y="45.365" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="57.18" y="73.63" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="-24.13" y="55.88" smashed="yes">
-<attribute name="NAME" x="-24.765" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-24.765" y="53.975" size="1.27" layer="27"/>
+<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="10.8" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="10.3" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-50.16" y="27.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-21.59" y="60.96" smashed="yes">
-<attribute name="NAME" x="-22.225" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-22.225" y="59.055" size="1.27" layer="27"/>
+<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="15.04" y="49.53" smashed="yes" rot="R90">
+<attribute name="NAME" x="14.5" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="76" y="76.2" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-26.67" y="60.96" smashed="yes">
-<attribute name="NAME" x="-27.305" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-27.305" y="59.055" size="1.27" layer="27"/>
+<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="8.7" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="8.2" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-52.26" y="17.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-31.75" y="60.96" smashed="yes">
-<attribute name="NAME" x="-32.385" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-32.385" y="59.055" size="1.27" layer="27"/>
+<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="41.665" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-19.86" y="13.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="60.96" smashed="yes">
-<attribute name="NAME" x="-47.625" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="59.055" size="1.27" layer="27"/>
+<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="11.79" y="61.15" smashed="yes">
+<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PINS" value="16" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PITCH" value="0.078&quot; / 2 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="6.69" y="60.25" size="1.27" layer="27"/>
 </element>
-<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="-22.86" y="10.7" smashed="yes">
-<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="0" y="-2" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="-30.86" y="23.7" size="1.27" layer="25"/>
-<attribute name="PINS" value="16" x="0" y="-2" size="1.778" layer="27" display="off"/>
-<attribute name="PITCH" value="0.078&quot; / 2 mm" x="0" y="-2" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-30.86" y="-0.4" size="1.27" layer="27"/>
+<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="58" smashed="yes"/>
+<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="7.5" y="11.8" smashed="yes"/>
+<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="15.63" y="13.91" smashed="yes" rot="R270">
+<attribute name="NAME" x="18.035" y="15.015" size="1.27" layer="25" rot="R270"/>
 </element>
-<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/2" value="NKR161" x="21" y="47" smashed="yes"/>
-<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="-54.61" y="60.96" smashed="yes"/>
-<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="-29.21" y="49.53" smashed="yes">
-<attribute name="NAME" x="-31.115" y="51.435" size="1.27" layer="25"/>
-<attribute name="VALUE" x="-31.115" y="46.101" size="1.27" layer="27"/>
+<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="10.04" y="25.49" smashed="yes" rot="R270"/>
+<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="2.7" y="36.8" smashed="yes" rot="R90"/>
+<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="12.9" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="12.4" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="12.9" y="49.5" size="1.778" layer="27" rot="R90" display="off"/>
+</element>
+<element name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="13.6" y="42.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.87" y="40.803" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="14.87" y="44.232" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
-<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="-21.59" y="66.04" smashed="yes"/>
 </elements>
 <signals>
 <signal name="+3V3">
 <contactref element="U$1" pad="VCC"/>
 <contactref element="R6" pad="2"/>
 <contactref element="R8" pad="2"/>
-<contactref element="J4" pad="P$2"/>
-<contactref element="J4" pad="P$3"/>
 <contactref element="J3" pad="P$2"/>
 <contactref element="J3" pad="P$3"/>
 <contactref element="U4" pad="P$1"/>
 <contactref element="U4" pad="P$10"/>
 <contactref element="C5" pad="1"/>
 <contactref element="C4" pad="1"/>
-<wire x1="23.5" y1="9.8" x2="23.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.06" y1="2.595" x2="23.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.5" y1="34.8" x2="-31.06" y2="2.595" width="0" layer="19" extent="1-1"/>
-<wire x1="18.5" y1="27.2" x2="18.5" y2="34.8" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.24" y1="49.53" x2="18.5" y2="27.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-40.32" y1="49.53" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.9" y1="60.96" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="64.765" x2="-30.9" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="67.315" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.74" y1="60.96" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
+<contactref element="R16" pad="1"/>
+<wire x1="3.59" y1="53.045" x2="4.455" y2="53.045" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.8" x2="8.7" y2="48.65" width="0.3" layer="1"/>
+<wire x1="4.455" y1="53.045" x2="8.7" y2="48.8" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.65" x2="12.9" y2="48.65" width="0.3" layer="1"/>
+<wire x1="12.9" y1="48.65" x2="10.8" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="13.05" y1="28.7" x2="12.9" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="26.49" x2="13.05" y2="28.7" width="0" layer="19" extent="1-1"/>
+<wire x1="8.765" y1="26.49" x2="11.315" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="7.15" y1="28.7" x2="8.765" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="15.8" x2="13.05" y2="28.7" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="8.2" x2="30.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="GND">
 <contactref element="J1" pad="SH1"/>
@@ -2010,176 +2026,273 @@ design rules under a new name.</description>
 <contactref element="U3" pad="2"/>
 <contactref element="C3" pad="2"/>
 <contactref element="R5" pad="1"/>
-<wire x1="-21.59" y1="64.765" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.09" y1="67.315" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-27.52" y1="60.96" x2="-21.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-24.98" y1="55.88" x2="-27.52" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.21" y1="48.23" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.34" y1="49.53" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-38.42" y1="49.53" x2="-33.34" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-43.5" y1="49.53" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-48.58" y1="49.53" x2="-43.5" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.68" y1="55.88" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-42.76" y1="60.96" x2="-37.68" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-51.65" y1="60.96" x2="-42.76" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.61" y1="60.96" x2="-51.65" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="62.31" x2="-54.61" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.79" y1="35.37" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-32.99" y1="35.37" x2="-31.79" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.29" y1="32.67" x2="-32.99" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.39" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.79" y1="32.67" x2="-31.39" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.29" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.19" y1="32.67" x2="-35.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.79" y1="32.67" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-36.79" y1="35.37" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="21" y1="54.62" x2="-37.79" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="21" y1="39.38" x2="21" y2="54.62" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="2.595" x2="21" y2="39.38" width="0" layer="19" extent="1-1"/>
+<contactref element="J5" pad="P$1"/>
+<contactref element="J6" pad="1"/>
+<contactref element="J4" pad="P$1"/>
+<contactref element="J4" pad="P$4"/>
+<wire x1="28" y1="50.38" x2="28" y2="65.62" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="43.8" x2="28" y2="50.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="36.2" x2="30.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="53.045" x2="28" y2="50.38" width="0" layer="19" extent="1-1"/>
+<wire x1="15.04" y1="48.68" x2="19.99" y2="53.045" width="0" layer="19" extent="1-1"/>
+<wire x1="1.3" y1="48.65" x2="15.04" y2="48.68" width="0" layer="19" extent="1-1"/>
+<wire x1="13.6" y1="42.2" x2="1.3" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="2.7" y1="35.425" x2="13.6" y2="42.2" width="0" layer="19" extent="1-1"/>
+<wire x1="6.44" y1="15.16" x2="2.7" y2="35.425" width="0" layer="19" extent="1-1"/>
+<wire x1="6.9" y1="13.15" x2="6.44" y2="15.16" width="0" layer="19" extent="1-1"/>
+<wire x1="7.5" y1="11.8" x2="6.9" y2="13.15" width="0" layer="19" extent="1-1"/>
+<wire x1="12.33" y1="10.58" x2="7.5" y2="11.8" width="0" layer="19" extent="1-1"/>
+<wire x1="15.1" y1="10.87" x2="12.33" y2="10.58" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="13.91" x2="15.1" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="15.35" y1="16.86" x2="14.33" y2="13.91" width="0" layer="19" extent="1-1"/>
+<wire x1="25.41" y1="4.17" x2="15.1" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="25.01" y1="1.47" x2="25.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="24.41" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="26.91" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="28.91" y1="1.47" x2="26.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.81" y1="1.47" x2="28.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="31.41" y1="1.47" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.41" y1="4.17" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="29.21" y1="4.17" x2="30.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="8.765" y1="25.49" x2="13.6" y2="42.2" width="0" layer="19" extent="1-1"/>
+<wire x1="10.04" y1="25.49" x2="8.765" y2="25.49" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="25.99" x2="10.04" y2="25.49" width="0" layer="19" extent="1-1"/>
+<wire x1="8.92" y1="22.18" x2="8.765" y2="25.49" width="0" layer="19" extent="1-1"/>
+<wire x1="9.05" y1="28.7" x2="8.92" y2="22.18" width="0" layer="19" extent="1-1"/>
+<wire x1="11.15" y1="28.7" x2="9.05" y2="28.7" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="+5V">
 <contactref element="J1" pad="1"/>
 <contactref element="C2" pad="1"/>
 <contactref element="U3" pad="1"/>
 <contactref element="U3" pad="4"/>
-<wire x1="-30.16" y1="48.23" x2="-28.26" y2="50.83" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.59" y1="35.37" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-45.4" y1="49.53" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="14.86" x2="16.93" y2="12.96" width="0" layer="19" extent="1-1"/>
+<wire x1="26.61" y1="4.17" x2="14.33" y2="14.86" width="0" layer="19" extent="1-1"/>
+<wire x1="17" y1="10.87" x2="14.33" y2="14.86" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_RX">
 <contactref element="J1" pad="2"/>
 <contactref element="U$1" pad="RX"/>
 <contactref element="R9" pad="2"/>
-<wire x1="-34.94" y1="35.37" x2="-46.14" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="14.5" x2="-34.94" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="64.95" x2="20.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="20.75" y1="64.95" x2="21.7" y2="64" width="0.3" layer="1"/>
+<wire x1="21.7" y1="64" x2="22.9" y2="64" width="0.3" layer="1"/>
+<via x="22.9" y="64" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="22.9" y1="64" x2="41.5" y2="64" width="0.3" layer="16"/>
+<wire x1="41.5" y1="64" x2="44.8" y2="60.7" width="0.3" layer="16"/>
+<wire x1="44.8" y1="60.7" x2="44.8" y2="58.4" width="0.3" layer="16"/>
+<wire x1="44.8" y1="58.4" x2="44.7" y2="58.3" width="0.3" layer="16"/>
+<via x="44.7" y="58.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="44.7" y1="58.3" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="60.05" width="0.3" layer="1"/>
+<wire x1="43.9" y1="57.5" x2="42.2" y2="57.5" width="0.3" layer="1"/>
+<wire x1="42.2" y1="57.5" x2="41.1" y2="58.6" width="0.3" layer="1"/>
+<wire x1="27.26" y1="4.17" x2="42.2" y2="57.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_TX">
 <contactref element="J1" pad="3"/>
 <contactref element="U$1" pad="TX"/>
 <contactref element="R12" pad="2"/>
-<wire x1="-34.29" y1="35.37" x2="-46.14" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="16.5" x2="-34.29" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="66.95" x2="18.25" y2="66.95" width="0.3" layer="1"/>
+<wire x1="18.25" y1="66.95" x2="17.7" y2="66.4" width="0.3" layer="1"/>
+<wire x1="17.7" y1="66.4" x2="17.7" y2="61" width="0.3" layer="1"/>
+<via x="17.7" y="61" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.7" y1="61" x2="32.9" y2="61" width="0.3" layer="16"/>
+<wire x1="32.9" y1="61" x2="35" y2="58.9" width="0.3" layer="16"/>
+<via x="35" y="58.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="35" y1="58.9" x2="36.5" y2="57.4" width="0.3" layer="1"/>
+<wire x1="36.5" y1="57.4" x2="38" y2="57.4" width="0.3" layer="1"/>
+<wire x1="38" y1="57.4" x2="38.7" y2="56.7" width="0.3" layer="1"/>
+<wire x1="38.7" y1="55.15" x2="38.8" y2="55.05" width="0.3" layer="1"/>
+<wire x1="38.7" y1="56.7" x2="38.7" y2="55.15" width="0.3" layer="1"/>
+<wire x1="27.91" y1="4.17" x2="38.8" y2="55.05" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VBAT_D">
 <contactref element="U$1" pad="ADC"/>
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
-<wire x1="-23.28" y1="55.88" x2="-16.93" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.06" y1="14.5" x2="-23.28" y2="55.88" width="0" layer="19" extent="1-1"/>
+<contactref element="J4" pad="P$2"/>
+<contactref element="J4" pad="P$3"/>
+<wire x1="3.4" y1="50.35" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="1.6" y1="50.35" x2="1.3" y2="50.35" width="0.3" layer="1"/>
+<wire x1="3.59" y1="64.95" x2="2.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="1.2" y1="50.75" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="2.75" y1="64.95" x2="1.2" y2="63.4" width="0.3" layer="1"/>
+<wire x1="1.2" y1="63.4" x2="1.2" y2="50.75" width="0.3" layer="1"/>
+<wire x1="25.5" y1="36.2" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.4" y1="50.35" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RST">
 <contactref element="U$1" pad="REST"/>
 <contactref element="U$1" pad="GPIO16"/>
 <contactref element="R6" pad="1"/>
-<wire x1="-31.06" y1="16.5" x2="-22.44" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.06" y1="10.5" x2="-31.06" y2="16.5" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$1">
-<contactref element="U$1" pad="GPIO15"/>
-<contactref element="R7" pad="2"/>
-<contactref element="J4" pad="P$1"/>
-<contactref element="J4" pad="P$4"/>
-<wire x1="23.5" y1="27.2" x2="-25.82" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="23.5" y1="34.8" x2="23.5" y2="27.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="4.5" x2="23.5" y2="34.8" width="0" layer="19" extent="1-1"/>
+<contactref element="J5" pad="P$2"/>
+<wire x1="3.59" y1="66.95" x2="6.55" y2="66.95" width="0.3" layer="1"/>
+<wire x1="6.55" y1="66.95" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<via x="6.7" y="66.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="6.7" y1="66.8" x2="6.7" y2="55.9" width="0.3" layer="16"/>
+<wire x1="10.7" y1="51.9" x2="10.8" y2="51.9" width="0.3" layer="16"/>
+<via x="10.8" y="51.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="50.35" width="0.3" layer="1"/>
+<wire x1="6.7" y1="55.9" x2="10.7" y2="51.9" width="0.3" layer="16"/>
+<wire x1="3.59" y1="60.95" x2="5.25" y2="60.95" width="0.3" layer="1"/>
+<wire x1="5.25" y1="60.95" x2="6.7" y2="62.4" width="0.3" layer="1"/>
+<wire x1="6.7" y1="62.4" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="47.7" width="0.3" layer="16"/>
+<wire x1="10.8" y1="47.7" x2="2.7" y2="39.6" width="0.3" layer="16"/>
+<via x="2.7" y="39.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="2.7" y1="39.6" x2="2.7" y2="38.175" width="0.3" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="R8" pad="1"/>
 <contactref element="U$1" pad="CH_PD"/>
-<wire x1="-31.06" y1="12.5" x2="-32.6" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="62.95" x2="5.55" y2="62.95" width="0.3" layer="1"/>
+<wire x1="5.55" y1="62.95" x2="5.6" y2="62.9" width="0.3" layer="1"/>
+<via x="5.6" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="5.6" y1="62.9" x2="5.6" y2="54.7" width="0.3" layer="16"/>
+<wire x1="5.6" y1="54.7" x2="8.7" y2="51.6" width="0.3" layer="16"/>
+<via x="8.7" y="51.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="8.7" y1="51.6" x2="8.7" y2="50.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="GPIO2"/>
 <contactref element="J3" pad="P$1"/>
 <contactref element="J3" pad="P$4"/>
-<wire x1="18.5" y1="9.8" x2="18.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="6.5" x2="18.5" y2="9.8" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="15.8" x2="25.5" y2="8.2" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="56.95" x2="25.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="U$1" pad="GPIO4"/>
 <contactref element="R10" pad="2"/>
-<wire x1="-14.66" y1="12.5" x2="-41.06" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="62.95" x2="24.25" y2="62.95" width="0.3" layer="1"/>
+<wire x1="24.25" y1="62.95" x2="24.3" y2="62.9" width="0.3" layer="1"/>
+<via x="24.3" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="24.3" y1="62.9" x2="40.8" y2="62.9" width="0.3" layer="16"/>
+<wire x1="40.8" y1="62.9" x2="43.4" y2="60.3" width="0.3" layer="16"/>
+<wire x1="43.4" y1="60.3" x2="43.4" y2="58.8" width="0.3" layer="16"/>
+<via x="43.4" y="58.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="43.4" y1="58.8" x2="43.4" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="U$1" pad="GPIO5"/>
 <contactref element="R11" pad="2"/>
-<wire x1="-14.66" y1="10.5" x2="-35.98" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="60.95" x2="34.65" y2="60.95" width="0.3" layer="1"/>
+<wire x1="34.65" y1="60.95" x2="34.7" y2="60.9" width="0.3" layer="1"/>
+<via x="34.7" y="60.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="34.7" y1="60.9" x2="38.8" y2="60.9" width="0.3" layer="16"/>
+<wire x1="38.8" y1="60.9" x2="41.1" y2="58.6" width="0.3" layer="16"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="56.3" width="0.3" layer="16"/>
+<via x="41.1" y="56.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="41.1" y1="56.3" x2="41.1" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_E">
 <contactref element="U$1" pad="GPIO14"/>
 <contactref element="R13" pad="2"/>
-<wire x1="-51.22" y1="55.88" x2="-31.06" y2="8.5" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="58.95" x2="6.85" y2="58.95" width="0.3" layer="1"/>
+<wire x1="6.85" y1="58.95" x2="7.4" y2="58.4" width="0.3" layer="1"/>
+<via x="7.4" y="58.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="7.4" y1="58.4" x2="9.4" y2="56.4" width="0.3" layer="16"/>
+<wire x1="9.4" y1="56.4" x2="36.4" y2="56.4" width="0.3" layer="16"/>
+<via x="36.4" y="56.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="36.4" y1="56.4" x2="36.5" y2="56.3" width="0.3" layer="1"/>
+<wire x1="36.5" y1="56.3" x2="36.5" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_F">
 <contactref element="U$1" pad="GPIO12"/>
 <contactref element="R14" pad="2"/>
-<wire x1="-56.3" y1="55.88" x2="-31.06" y2="6.5" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="56.95" x2="7.45" y2="56.95" width="0.3" layer="1"/>
+<wire x1="7.45" y1="56.95" x2="9.2" y2="58.7" width="0.3" layer="1"/>
+<via x="9.2" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38" y1="57.9" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="9.2" y1="58.7" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="38" y1="57.9" x2="38.8" y2="58.7" width="0.3" layer="16"/>
+<via x="38.8" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38.8" y1="58.7" x2="38.8" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_G">
 <contactref element="U$1" pad="GPIO13"/>
 <contactref element="R15" pad="2"/>
-<wire x1="-31.06" y1="4.5" x2="-15.66" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="54.95" x2="7.05" y2="54.95" width="0.3" layer="1"/>
+<wire x1="36.4" y1="59.95" x2="36.5" y2="60.05" width="0.3" layer="1"/>
+<wire x1="7.05" y1="54.95" x2="12.05" y2="59.95" width="0.3" layer="1"/>
+<wire x1="12.05" y1="59.95" x2="36.4" y2="59.95" width="0.3" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="U$2" pad="P$10"/>
 <contactref element="R15" pad="1"/>
-<wire x1="15.92" y1="54.62" x2="-17.36" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="65.62" x2="26.79" y2="61.75" width="0.3" layer="1"/>
+<wire x1="26.79" y1="61.75" x2="36.5" y2="61.75" width="0.3" layer="1"/>
 </signal>
 <signal name="N$14">
 <contactref element="R14" pad="1"/>
 <contactref element="U$2" pad="P$9"/>
-<wire x1="-58" y1="55.88" x2="18.46" y2="54.62" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="65.62" x2="27.68" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38.8" y1="62.6" x2="38.8" y2="61.75" width="0.3" layer="1"/>
+<wire x1="27.68" y1="63.4" x2="38" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38" y1="63.4" x2="38.8" y2="62.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$15">
 <contactref element="R13" pad="1"/>
 <contactref element="U$2" pad="P$1"/>
-<wire x1="-52.92" y1="55.88" x2="15.92" y2="39.38" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="50.38" x2="25.89" y2="53.35" width="0.3" layer="1"/>
+<wire x1="25.89" y1="53.35" x2="36.5" y2="53.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="R11" pad="1"/>
 <contactref element="U$2" pad="P$4"/>
-<wire x1="-37.68" y1="60.96" x2="23.54" y2="39.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="50.38" x2="31.76" y2="51.6" width="0.3" layer="1"/>
+<wire x1="41.1" y1="52.4" x2="41.1" y2="53.35" width="0.3" layer="1"/>
+<wire x1="31.76" y1="51.6" x2="40.3" y2="51.6" width="0.3" layer="1"/>
+<wire x1="40.3" y1="51.6" x2="41.1" y2="52.4" width="0.3" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="R9" pad="1"/>
 <contactref element="U$2" pad="P$7"/>
-<wire x1="-47.84" y1="60.96" x2="23.54" y2="54.62" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="65.62" x2="31.76" y2="64.4" width="0.3" layer="1"/>
+<wire x1="41.1" y1="62.9" x2="41.1" y2="61.75" width="0.3" layer="1"/>
+<wire x1="31.76" y1="64.4" x2="39.6" y2="64.4" width="0.3" layer="1"/>
+<wire x1="39.6" y1="64.4" x2="41.1" y2="62.9" width="0.3" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="R10" pad="1"/>
 <contactref element="U$2" pad="P$6"/>
-<wire x1="26.08" y1="54.62" x2="-42.76" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="33.08" y1="65.62" x2="41.38" y2="65.62" width="0.3" layer="1"/>
+<wire x1="43.4" y1="63.6" x2="43.4" y2="61.75" width="0.3" layer="1"/>
+<wire x1="41.38" y1="65.62" x2="43.4" y2="63.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$19">
 <contactref element="U$2" pad="P$2"/>
 <contactref element="R12" pad="1"/>
-<wire x1="-47.84" y1="55.88" x2="18.46" y2="39.38" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="50.38" x2="27.38" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.8" y1="52.6" x2="38.8" y2="53.35" width="0.3" layer="1"/>
+<wire x1="27.38" y1="52.3" x2="38.5" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.5" y1="52.3" x2="38.8" y2="52.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="L1" pad="P$2"/>
 <contactref element="U4" pad="P$2"/>
-<wire x1="-24.65" y1="64.77" x2="-22.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.53" y1="26.25" x2="8.765" y2="25.99" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$4">
 <contactref element="L1" pad="P$1"/>
 <contactref element="U4" pad="P$4"/>
-<wire x1="-26.15" y1="64.77" x2="-21.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.53" y1="24.75" x2="8.765" y2="24.99" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$6">
 <contactref element="J2" pad="1"/>
 <contactref element="U2" pad="P$1"/>
 <contactref element="U2" pad="P$2"/>
 <contactref element="C1" pad="1"/>
-<wire x1="-31.33" y1="55.88" x2="-17.78" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.435" y1="59.61" x2="-31.33" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="59.61" x2="-54.435" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="7.15" y1="8.5" x2="8.42" y2="4.44" width="0" layer="19" extent="1-1"/>
+<wire x1="7.675" y1="10.45" x2="7.15" y2="8.5" width="0" layer="19" extent="1-1"/>
+<wire x1="6.9" y1="10.45" x2="7.675" y2="10.45" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$7">
 <contactref element="C1" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="U2" pad="P$3"/>
-<wire x1="-53.835" y1="59.61" x2="-29.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.73" y1="48.26" x2="-53.835" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="8.275" y1="10.45" x2="8.85" y2="8.5" width="0" layer="19" extent="1-1"/>
+<wire x1="10.1" y1="11.15" x2="8.275" y2="10.45" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$9">
 <contactref element="J2" pad="2"/>
@@ -2191,27 +2304,51 @@ design rules under a new name.</description>
 <contactref element="U4" pad="P$6"/>
 <contactref element="C6" pad="2"/>
 <contactref element="R4" pad="1"/>
-<wire x1="-20.59" y1="67.315" x2="-15.24" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="67.315" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.59" y1="64.765" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-18.63" y1="55.88" x2="-20.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-28.26" y1="48.23" x2="-18.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.98" y1="55.88" x2="-28.26" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-50.48" y1="49.53" x2="-35.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.03" y1="48.26" x2="-50.48" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="24.49" x2="10.96" y2="4.44" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="25.49" x2="11.315" y2="24.49" width="0" layer="19" extent="1-1"/>
+<wire x1="8.765" y1="24.49" x2="11.315" y2="24.49" width="0" layer="19" extent="1-1"/>
+<wire x1="3.4" y1="48.65" x2="8.765" y2="24.49" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="12.96" x2="3.4" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="10.62" y1="22.18" x2="14.33" y2="12.96" width="0" layer="19" extent="1-1"/>
+<wire x1="12.33" y1="12.48" x2="10.62" y2="22.18" width="0" layer="19" extent="1-1"/>
+<wire x1="10.1" y1="12.85" x2="12.33" y2="12.48" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$11">
 <contactref element="U2" pad="P$5"/>
 <contactref element="R2" pad="2"/>
-<wire x1="-54.435" y1="62.31" x2="-41.06" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="7.675" y1="13.15" x2="8.14" y2="15.16" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$12">
 <contactref element="R3" pad="2"/>
 <contactref element="U3" pad="5"/>
-<wire x1="-49.95" y1="60.96" x2="-30.16" y2="50.83" width="0" layer="19" extent="1-1"/>
+<wire x1="17.05" y1="16.86" x2="16.93" y2="14.86" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PS">
 <contactref element="U4" pad="P$7"/>
+<contactref element="U$1" pad="GPIO15"/>
+<contactref element="R7" pad="2"/>
+<wire x1="19.99" y1="54.95" x2="17.85" y2="54.95" width="0.3" layer="1"/>
+<wire x1="15.04" y1="52.14" x2="15.04" y2="50.38" width="0.3" layer="1"/>
+<wire x1="17.85" y1="54.95" x2="15.04" y2="52.14" width="0.3" layer="1"/>
+<wire x1="11.315" y1="24.99" x2="12.10538125" y2="24.99" width="0.2" layer="1"/>
+<via x="12.10538125" y="24.99" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="12.10538125" y1="24.99" x2="17.3" y2="30.18461875" width="0.2" layer="16"/>
+<wire x1="17.3" y1="30.18461875" x2="17.3" y2="49.9" width="0.2" layer="16"/>
+<wire x1="17.3" y1="49.9" x2="15.06" y2="52.14" width="0.2" layer="16"/>
+<wire x1="15.06" y1="52.14" x2="15.04" y2="52.14" width="0.2" layer="16"/>
+<via x="15.04" y="52.14" extent="1-16" drill="0.35" diameter="0.6"/>
+</signal>
+<signal name="N$20">
+<contactref element="U$1" pad="GPIO0"/>
+<contactref element="R16" pad="2"/>
+<contactref element="J6" pad="2"/>
+<wire x1="19.99" y1="58.95" x2="16.35" y2="58.95" width="0.3" layer="1"/>
+<wire x1="12.9" y1="55.5" x2="12.9" y2="51.8" width="0.3" layer="1"/>
+<wire x1="12.9" y1="51.8" x2="12.9" y2="50.35" width="0.3" layer="1"/>
+<wire x1="16.35" y1="58.95" x2="12.9" y2="55.5" width="0.3" layer="1"/>
+<wire x1="11.06" y1="42.2" x2="12.9" y2="44.04" width="0.3" layer="16"/>
+<wire x1="12.9" y1="44.04" x2="12.9" y2="51.8" width="0.3" layer="16"/>
+<via x="12.9" y="51.8" extent="1-16" drill="0.35" diameter="0.6"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
diff --git a/esp8266-wifi-remote.b#8 b/esp8266-wifi-remote.b#8
index 9d7cc10..ca61345 100644
--- a/esp8266-wifi-remote.b#8
+++ b/esp8266-wifi-remote.b#8
@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.5" altunitdist="mm" altunit="mm"/>
+<grid distance="0.1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.05" altunitdist="mm" altunit="mm"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="16" fill="1" visible="no" active="no"/>
@@ -52,7 +52,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
@@ -157,11 +157,20 @@
 <layer number="255" name="routoute" color="7" fill="1" visible="no" active="yes"/>
 </layers>
 <board>
+<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="c7a73c68-2407-04ba-dc3a-388155fd8543"/>
 <plain>
-<wire x1="0" y1="0" x2="160" y2="0" width="0" layer="20"/>
-<wire x1="160" y1="0" x2="160" y2="100" width="0" layer="20"/>
-<wire x1="160" y1="100" x2="0" y2="100" width="0" layer="20"/>
-<wire x1="0" y1="100" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="0" x2="56" y2="0" width="0" layer="20"/>
+<wire x1="56" y1="0" x2="56" y2="68" width="0" layer="20"/>
+<wire x1="56" y1="68" x2="0" y2="68" width="0" layer="20"/>
+<wire x1="0" y1="68" x2="0" y2="0" width="0" layer="20"/>
+<hole x="3" y="3" drill="3.2"/>
+<hole x="53" y="3" drill="3.2"/>
+<hole x="53" y="65" drill="3.2"/>
+<text x="12.8" y="3.6" size="1.778" layer="21">BAT</text>
+<text x="10.3" y="0.9" size="1.778" layer="21">+</text>
+<text x="8" y="1" size="1.778" layer="21">-</text>
+<text x="9" y="38.4" size="1.778" layer="21">BOOT</text>
+<text x="3.3" y="34" size="1.778" layer="21" rot="R90" align="bottom-right">RST</text>
 </plain>
 <libraries>
 <library name="rcl" urn="urn:adsk.eagle:library:334">
@@ -1410,7 +1419,7 @@ CONN_02
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" library_version="2" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -1419,8 +1428,21 @@ CONN_02
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
+<packages3d>
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="ELAB_PUSHBUTTON_1"/>
+</packageinstances>
+</package3d>
+</packages3d>
 </library>
 <library name="fixed-inductors" urn="urn:adsk.eagle:library:10480998">
 <description>&lt;b&gt;Fixed inductors&lt;/b&gt;</description>
@@ -1508,7 +1530,7 @@ CONN_02
 </package>
 </packages>
 <packages3d>
-<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/2" type="model" library_version="4" library_locally_modified="yes">
+<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/1" type="box" library_version="4">
 <packageinstances>
 <packageinstance name="DIP-10-WIDE"/>
 </packageinstances>
@@ -1618,6 +1640,24 @@ package type OT</description>
 </package3d>
 </packages3d>
 </library>
+<library name="tactile-switches" urn="urn:adsk.eagle:library:10516572">
+<description>&lt;b&gt;Tactile Switches&lt;/b&gt;</description>
+<packages>
+<package name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:footprint:10516573/1" library_version="1">
+<smd name="P$1" x="-1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<smd name="P$2" x="1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<wire x1="-1.45" y1="1.45" x2="1.45" y2="1.45" width="0.127" layer="21"/>
+<wire x1="-1.45" y1="-1.45" x2="1.45" y2="-1.45" width="0.127" layer="21"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:package:10516575/2" type="model" library_version="1" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="3X4X2_MOMENTARY_SWITCH"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -1627,7 +1667,7 @@ package type OT</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="default">
+<designrules name="default *">
 <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 
@@ -1656,7 +1696,7 @@ design rules under a new name.</description>
 <param name="mdSmdSmd" value="6mil"/>
 <param name="mdViaViaSameLayer" value="6mil"/>
 <param name="mnLayersViaInSmd" value="2"/>
-<param name="mdCopperDimension" value="40mil"/>
+<param name="mdCopperDimension" value="20mil"/>
 <param name="mdDrill" value="6mil"/>
 <param name="mdSmdStop" value="0mil"/>
 <param name="msWidth" value="6mil"/>
@@ -1811,166 +1851,152 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-30.48" y="55.88" smashed="yes">
-<attribute name="NAME" x="-31.115" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-31.115" y="53.975" size="1.27" layer="27"/>
+<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="8" y="8.5" smashed="yes">
+<attribute name="NAME" x="3.965" y="7.935" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="38.48" y="-47.38" size="1.778" layer="27" display="off"/>
+</element>
+<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="16.05" y="10.87" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.98" y="8.2" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="-28.4" y="60.4" size="1.778" layer="27" rot="R180" display="off"/>
+</element>
+<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="12.33" y="11.53" smashed="yes" rot="R270">
+<attribute name="NAME" x="13.1" y="13.8" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="C" x="-37.2" y="-38" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-44.45" y="49.53" smashed="yes">
-<attribute name="NAME" x="-45.72" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-45.72" y="46.99" size="1.27" layer="27"/>
+<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="12.1" y="28.7" smashed="yes" rot="R180">
+<attribute name="NAME" x="10.73" y="29.97" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="-22.19" y="78.23" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-49.53" y="49.53" smashed="yes">
-<attribute name="NAME" x="-50.8" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-50.8" y="46.99" size="1.27" layer="27"/>
+<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="8.1" y="28.7" smashed="yes">
+<attribute name="NAME" x="6.83" y="29.97" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="47.47" y="-20.83" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-34.29" y="49.53" smashed="yes">
-<attribute name="NAME" x="-35.56" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-35.56" y="46.99" size="1.27" layer="27"/>
+<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="9.77" y="22.18" smashed="yes">
+<attribute name="NAME" x="11.535" y="21.615" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="46.6" y="-33.7" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-39.37" y="49.53" smashed="yes">
-<attribute name="NAME" x="-40.64" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-40.64" y="46.99" size="1.27" layer="27"/>
+<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="27.91" y="1.82" smashed="yes">
+<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="Molex" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MP" value="1050170001" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="NAME" x="23.59973125" y="5.46023125" size="1.27008125" layer="25"/>
+<attribute name="PACKAGE" value="None" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="23.5973" y="-2.43266875" size="1.2708" layer="27"/>
 </element>
-<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-36.83" y="55.88" smashed="yes">
-<attribute name="NAME" x="-37.465" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="53.975" size="1.27" layer="27"/>
+<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="8.42" y="4.44" smashed="yes">
+<attribute name="NAME" x="5.75" y="4.237" size="0.6096" layer="25" font="vector" ratio="20"/>
+<attribute name="VALUE" x="7.15" y="2.408" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="-34.29" y="33.02" smashed="yes">
-<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="Molex" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MP" value="1050170001" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="-38.60026875" y="36.66023125" size="1.27008125" layer="25"/>
-<attribute name="PACKAGE" value="None" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-38.6027" y="28.76733125" size="1.2708" layer="27"/>
+<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="12" smashed="yes"/>
+<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="40" smashed="yes" rot="R180"/>
+<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="6.53" y="25.5" smashed="yes" rot="R90"/>
+<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="10.1" y="12" smashed="yes" rot="R90">
+<attribute name="NAME" x="10.665" y="13.765" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="58.36" y="67.88" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="-17.78" y="66.04" smashed="yes">
-<attribute name="NAME" x="-19.05" y="67.437" size="0.6096" layer="25" font="vector" ratio="20"/>
-<attribute name="VALUE" x="-19.05" y="64.008" size="0.6096" layer="27" font="vector" ratio="20"/>
+<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="43.4" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="43.965" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-12.48" y="18.99" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" value="ELAB_PUSHBUTTON_1" x="21" y="6" smashed="yes"/>
-<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" value="ELAB_PUSHBUTTON_1" x="21" y="31" smashed="yes" rot="R180"/>
-<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="-25.4" y="64.77" smashed="yes"/>
-<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="-55.88" y="48.26" smashed="yes">
-<attribute name="NAME" x="-56.515" y="48.895" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-56.515" y="46.355" size="1.27" layer="27"/>
+<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="41.765" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="102.06" y="91.03" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="55.88" smashed="yes">
-<attribute name="NAME" x="-42.545" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="53.975" size="1.27" layer="27"/>
+<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="39.465" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="94.68" y="101.19" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-36.83" y="60.96" smashed="yes">
-<attribute name="NAME" x="-37.465" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="59.055" size="1.27" layer="27"/>
+<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="37.165" y="55.965" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="92.38" y="106.27" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="55.88" smashed="yes">
-<attribute name="NAME" x="-47.625" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="53.975" size="1.27" layer="27"/>
+<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="39.365" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-17.08" y="3.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-52.07" y="55.88" smashed="yes">
-<attribute name="NAME" x="-52.705" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-52.705" y="53.975" size="1.27" layer="27"/>
+<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="37.065" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-24.46" y="44.39" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-57.15" y="55.88" smashed="yes">
-<attribute name="NAME" x="-57.785" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.785" y="53.975" size="1.27" layer="27"/>
+<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7" x="7.29" y="15.16" smashed="yes">
+<attribute name="NAME" x="6.655" y="15.795" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="49.2" y="-45.8" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-16.51" y="60.96" smashed="yes">
-<attribute name="NAME" x="-17.145" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-17.145" y="59.055" size="1.27" layer="27"/>
+<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="16.2" y="16.86" smashed="yes">
+<attribute name="NAME" x="15.065" y="18.195" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="67" y="-44.1" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="60.96" smashed="yes">
-<attribute name="NAME" x="-42.545" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="59.055" size="1.27" layer="27"/>
+<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="3.4" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="3.965" y="45.565" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="59.28" y="67.28" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="-50.8" y="60.96" smashed="yes">
-<attribute name="NAME" x="-51.435" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-51.435" y="59.055" size="1.27" layer="27"/>
+<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="1.3" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="1.865" y="45.365" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="57.18" y="73.63" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="-17.78" y="55.88" smashed="yes">
-<attribute name="NAME" x="-18.415" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-18.415" y="53.975" size="1.27" layer="27"/>
+<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="10.8" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="10.3" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-50.16" y="27.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="-24.13" y="55.88" smashed="yes">
-<attribute name="NAME" x="-24.765" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-24.765" y="53.975" size="1.27" layer="27"/>
+<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="15.04" y="49.53" smashed="yes" rot="R90">
+<attribute name="NAME" x="14.5" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="76" y="76.2" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-21.59" y="60.96" smashed="yes">
-<attribute name="NAME" x="-22.225" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-22.225" y="59.055" size="1.27" layer="27"/>
+<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="8.7" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="8.2" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-52.26" y="17.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-26.67" y="60.96" smashed="yes">
-<attribute name="NAME" x="-27.305" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-27.305" y="59.055" size="1.27" layer="27"/>
+<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="41.665" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-19.86" y="13.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-31.75" y="60.96" smashed="yes">
-<attribute name="NAME" x="-32.385" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-32.385" y="59.055" size="1.27" layer="27"/>
+<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="11.79" y="61.15" smashed="yes">
+<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PINS" value="16" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PITCH" value="0.078&quot; / 2 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="6.69" y="60.25" size="1.27" layer="27"/>
 </element>
-<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="60.96" smashed="yes">
-<attribute name="NAME" x="-47.625" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="59.055" size="1.27" layer="27"/>
+<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="58" smashed="yes"/>
+<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="7.5" y="11.8" smashed="yes"/>
+<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="15.63" y="13.91" smashed="yes" rot="R270">
+<attribute name="NAME" x="18.035" y="15.015" size="1.27" layer="25" rot="R270"/>
 </element>
-<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="-22.86" y="10.7" smashed="yes">
-<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="0" y="-2" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="-30.86" y="23.7" size="1.27" layer="25"/>
-<attribute name="PINS" value="16" x="0" y="-2" size="1.778" layer="27" display="off"/>
-<attribute name="PITCH" value="0.078&quot; / 2 mm" x="0" y="-2" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-30.86" y="-0.4" size="1.27" layer="27"/>
+<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="10.04" y="25.49" smashed="yes" rot="R270"/>
+<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="2.7" y="36.8" smashed="yes" rot="R90"/>
+<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="12.9" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="12.4" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="12.9" y="49.5" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/2" value="NKR161" x="21" y="47" smashed="yes"/>
-<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="-54.61" y="60.96" smashed="yes"/>
-<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="-29.21" y="49.53" smashed="yes">
-<attribute name="NAME" x="-31.115" y="51.435" size="1.27" layer="25"/>
-<attribute name="VALUE" x="-31.115" y="46.101" size="1.27" layer="27"/>
+<element name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="13.6" y="42.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.87" y="40.803" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="14.87" y="44.232" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
-<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="-21.59" y="66.04" smashed="yes"/>
 </elements>
 <signals>
 <signal name="+3V3">
 <contactref element="U$1" pad="VCC"/>
 <contactref element="R6" pad="2"/>
 <contactref element="R8" pad="2"/>
-<contactref element="J4" pad="P$2"/>
-<contactref element="J4" pad="P$3"/>
 <contactref element="J3" pad="P$2"/>
 <contactref element="J3" pad="P$3"/>
 <contactref element="U4" pad="P$1"/>
 <contactref element="U4" pad="P$10"/>
 <contactref element="C5" pad="1"/>
 <contactref element="C4" pad="1"/>
-<wire x1="23.5" y1="9.8" x2="23.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.06" y1="2.595" x2="23.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.5" y1="34.8" x2="-31.06" y2="2.595" width="0" layer="19" extent="1-1"/>
-<wire x1="18.5" y1="27.2" x2="18.5" y2="34.8" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.24" y1="49.53" x2="18.5" y2="27.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-40.32" y1="49.53" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.9" y1="60.96" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="64.765" x2="-30.9" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="67.315" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.74" y1="60.96" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
+<contactref element="R16" pad="1"/>
+<wire x1="3.59" y1="53.045" x2="4.455" y2="53.045" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.8" x2="8.7" y2="48.65" width="0.3" layer="1"/>
+<wire x1="4.455" y1="53.045" x2="8.7" y2="48.8" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.65" x2="12.9" y2="48.65" width="0.3" layer="1"/>
+<wire x1="12.9" y1="48.65" x2="10.8" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="13.05" y1="28.7" x2="12.9" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="26.49" x2="13.05" y2="28.7" width="0" layer="19" extent="1-1"/>
+<wire x1="8.765" y1="26.49" x2="11.315" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="7.15" y1="28.7" x2="8.765" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="15.8" x2="13.05" y2="28.7" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="8.2" x2="30.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="GND">
 <contactref element="J1" pad="SH1"/>
@@ -2000,176 +2026,273 @@ design rules under a new name.</description>
 <contactref element="U3" pad="2"/>
 <contactref element="C3" pad="2"/>
 <contactref element="R5" pad="1"/>
-<wire x1="-21.59" y1="64.765" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.09" y1="67.315" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-27.52" y1="60.96" x2="-21.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-24.98" y1="55.88" x2="-27.52" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.21" y1="48.23" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.34" y1="49.53" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-38.42" y1="49.53" x2="-33.34" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-43.5" y1="49.53" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-48.58" y1="49.53" x2="-43.5" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.68" y1="55.88" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-42.76" y1="60.96" x2="-37.68" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-51.65" y1="60.96" x2="-42.76" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.61" y1="60.96" x2="-51.65" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="62.31" x2="-54.61" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.79" y1="35.37" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-32.99" y1="35.37" x2="-31.79" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.29" y1="32.67" x2="-32.99" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.39" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.79" y1="32.67" x2="-31.39" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.29" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.19" y1="32.67" x2="-35.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.79" y1="32.67" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-36.79" y1="35.37" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="21" y1="54.62" x2="-37.79" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="21" y1="39.38" x2="21" y2="54.62" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="2.595" x2="21" y2="39.38" width="0" layer="19" extent="1-1"/>
+<contactref element="J5" pad="P$1"/>
+<contactref element="J6" pad="1"/>
+<contactref element="J4" pad="P$1"/>
+<contactref element="J4" pad="P$4"/>
+<wire x1="28" y1="50.38" x2="28" y2="65.62" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="43.8" x2="28" y2="50.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="36.2" x2="30.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="53.045" x2="28" y2="50.38" width="0" layer="19" extent="1-1"/>
+<wire x1="15.04" y1="48.68" x2="19.99" y2="53.045" width="0" layer="19" extent="1-1"/>
+<wire x1="1.3" y1="48.65" x2="15.04" y2="48.68" width="0" layer="19" extent="1-1"/>
+<wire x1="13.6" y1="42.2" x2="1.3" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="2.7" y1="35.425" x2="13.6" y2="42.2" width="0" layer="19" extent="1-1"/>
+<wire x1="6.44" y1="15.16" x2="2.7" y2="35.425" width="0" layer="19" extent="1-1"/>
+<wire x1="6.9" y1="13.15" x2="6.44" y2="15.16" width="0" layer="19" extent="1-1"/>
+<wire x1="7.5" y1="11.8" x2="6.9" y2="13.15" width="0" layer="19" extent="1-1"/>
+<wire x1="12.33" y1="10.58" x2="7.5" y2="11.8" width="0" layer="19" extent="1-1"/>
+<wire x1="15.1" y1="10.87" x2="12.33" y2="10.58" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="13.91" x2="15.1" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="15.35" y1="16.86" x2="14.33" y2="13.91" width="0" layer="19" extent="1-1"/>
+<wire x1="25.41" y1="4.17" x2="15.1" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="25.01" y1="1.47" x2="25.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="24.41" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="26.91" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="28.91" y1="1.47" x2="26.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.81" y1="1.47" x2="28.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="31.41" y1="1.47" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.41" y1="4.17" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="29.21" y1="4.17" x2="30.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="8.765" y1="25.49" x2="13.6" y2="42.2" width="0" layer="19" extent="1-1"/>
+<wire x1="10.04" y1="25.49" x2="8.765" y2="25.49" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="25.99" x2="10.04" y2="25.49" width="0" layer="19" extent="1-1"/>
+<wire x1="8.92" y1="22.18" x2="8.765" y2="25.49" width="0" layer="19" extent="1-1"/>
+<wire x1="9.05" y1="28.7" x2="8.92" y2="22.18" width="0" layer="19" extent="1-1"/>
+<wire x1="11.15" y1="28.7" x2="9.05" y2="28.7" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="+5V">
 <contactref element="J1" pad="1"/>
 <contactref element="C2" pad="1"/>
 <contactref element="U3" pad="1"/>
 <contactref element="U3" pad="4"/>
-<wire x1="-30.16" y1="48.23" x2="-28.26" y2="50.83" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.59" y1="35.37" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-45.4" y1="49.53" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="14.86" x2="16.93" y2="12.96" width="0" layer="19" extent="1-1"/>
+<wire x1="26.61" y1="4.17" x2="14.33" y2="14.86" width="0" layer="19" extent="1-1"/>
+<wire x1="17" y1="10.87" x2="14.33" y2="14.86" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_RX">
 <contactref element="J1" pad="2"/>
 <contactref element="U$1" pad="RX"/>
 <contactref element="R9" pad="2"/>
-<wire x1="-34.94" y1="35.37" x2="-46.14" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="14.5" x2="-34.94" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="64.95" x2="20.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="20.75" y1="64.95" x2="21.7" y2="64" width="0.3" layer="1"/>
+<wire x1="21.7" y1="64" x2="22.9" y2="64" width="0.3" layer="1"/>
+<via x="22.9" y="64" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="22.9" y1="64" x2="41.5" y2="64" width="0.3" layer="16"/>
+<wire x1="41.5" y1="64" x2="44.8" y2="60.7" width="0.3" layer="16"/>
+<wire x1="44.8" y1="60.7" x2="44.8" y2="58.4" width="0.3" layer="16"/>
+<wire x1="44.8" y1="58.4" x2="44.7" y2="58.3" width="0.3" layer="16"/>
+<via x="44.7" y="58.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="44.7" y1="58.3" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="60.05" width="0.3" layer="1"/>
+<wire x1="43.9" y1="57.5" x2="42.2" y2="57.5" width="0.3" layer="1"/>
+<wire x1="42.2" y1="57.5" x2="41.1" y2="58.6" width="0.3" layer="1"/>
+<wire x1="27.26" y1="4.17" x2="42.2" y2="57.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_TX">
 <contactref element="J1" pad="3"/>
 <contactref element="U$1" pad="TX"/>
 <contactref element="R12" pad="2"/>
-<wire x1="-34.29" y1="35.37" x2="-46.14" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="16.5" x2="-34.29" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="66.95" x2="18.25" y2="66.95" width="0.3" layer="1"/>
+<wire x1="18.25" y1="66.95" x2="17.7" y2="66.4" width="0.3" layer="1"/>
+<wire x1="17.7" y1="66.4" x2="17.7" y2="61" width="0.3" layer="1"/>
+<via x="17.7" y="61" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.7" y1="61" x2="32.9" y2="61" width="0.3" layer="16"/>
+<wire x1="32.9" y1="61" x2="35" y2="58.9" width="0.3" layer="16"/>
+<via x="35" y="58.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="35" y1="58.9" x2="36.5" y2="57.4" width="0.3" layer="1"/>
+<wire x1="36.5" y1="57.4" x2="38" y2="57.4" width="0.3" layer="1"/>
+<wire x1="38" y1="57.4" x2="38.7" y2="56.7" width="0.3" layer="1"/>
+<wire x1="38.7" y1="55.15" x2="38.8" y2="55.05" width="0.3" layer="1"/>
+<wire x1="38.7" y1="56.7" x2="38.7" y2="55.15" width="0.3" layer="1"/>
+<wire x1="27.91" y1="4.17" x2="38.8" y2="55.05" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VBAT_D">
 <contactref element="U$1" pad="ADC"/>
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
-<wire x1="-23.28" y1="55.88" x2="-16.93" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.06" y1="14.5" x2="-23.28" y2="55.88" width="0" layer="19" extent="1-1"/>
+<contactref element="J4" pad="P$2"/>
+<contactref element="J4" pad="P$3"/>
+<wire x1="3.4" y1="50.35" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="1.6" y1="50.35" x2="1.3" y2="50.35" width="0.3" layer="1"/>
+<wire x1="3.59" y1="64.95" x2="2.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="1.2" y1="50.75" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="2.75" y1="64.95" x2="1.2" y2="63.4" width="0.3" layer="1"/>
+<wire x1="1.2" y1="63.4" x2="1.2" y2="50.75" width="0.3" layer="1"/>
+<wire x1="25.5" y1="36.2" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.4" y1="50.35" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RST">
 <contactref element="U$1" pad="REST"/>
 <contactref element="U$1" pad="GPIO16"/>
 <contactref element="R6" pad="1"/>
-<wire x1="-31.06" y1="16.5" x2="-22.44" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.06" y1="10.5" x2="-31.06" y2="16.5" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$1">
-<contactref element="U$1" pad="GPIO15"/>
-<contactref element="R7" pad="2"/>
-<contactref element="J4" pad="P$1"/>
-<contactref element="J4" pad="P$4"/>
-<wire x1="23.5" y1="27.2" x2="-25.82" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="23.5" y1="34.8" x2="23.5" y2="27.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="4.5" x2="23.5" y2="34.8" width="0" layer="19" extent="1-1"/>
+<contactref element="J5" pad="P$2"/>
+<wire x1="3.59" y1="66.95" x2="6.55" y2="66.95" width="0.3" layer="1"/>
+<wire x1="6.55" y1="66.95" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<via x="6.7" y="66.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="6.7" y1="66.8" x2="6.7" y2="55.9" width="0.3" layer="16"/>
+<wire x1="10.7" y1="51.9" x2="10.8" y2="51.9" width="0.3" layer="16"/>
+<via x="10.8" y="51.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="50.35" width="0.3" layer="1"/>
+<wire x1="6.7" y1="55.9" x2="10.7" y2="51.9" width="0.3" layer="16"/>
+<wire x1="3.59" y1="60.95" x2="5.25" y2="60.95" width="0.3" layer="1"/>
+<wire x1="5.25" y1="60.95" x2="6.7" y2="62.4" width="0.3" layer="1"/>
+<wire x1="6.7" y1="62.4" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="47.7" width="0.3" layer="16"/>
+<wire x1="10.8" y1="47.7" x2="2.7" y2="39.6" width="0.3" layer="16"/>
+<via x="2.7" y="39.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="2.7" y1="39.6" x2="2.7" y2="38.175" width="0.3" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="R8" pad="1"/>
 <contactref element="U$1" pad="CH_PD"/>
-<wire x1="-31.06" y1="12.5" x2="-32.6" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="62.95" x2="5.55" y2="62.95" width="0.3" layer="1"/>
+<wire x1="5.55" y1="62.95" x2="5.6" y2="62.9" width="0.3" layer="1"/>
+<via x="5.6" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="5.6" y1="62.9" x2="5.6" y2="54.7" width="0.3" layer="16"/>
+<wire x1="5.6" y1="54.7" x2="8.7" y2="51.6" width="0.3" layer="16"/>
+<via x="8.7" y="51.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="8.7" y1="51.6" x2="8.7" y2="50.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="GPIO2"/>
 <contactref element="J3" pad="P$1"/>
 <contactref element="J3" pad="P$4"/>
-<wire x1="18.5" y1="9.8" x2="18.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="6.5" x2="18.5" y2="9.8" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="15.8" x2="25.5" y2="8.2" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="56.95" x2="25.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="U$1" pad="GPIO4"/>
 <contactref element="R10" pad="2"/>
-<wire x1="-14.66" y1="12.5" x2="-41.06" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="62.95" x2="24.25" y2="62.95" width="0.3" layer="1"/>
+<wire x1="24.25" y1="62.95" x2="24.3" y2="62.9" width="0.3" layer="1"/>
+<via x="24.3" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="24.3" y1="62.9" x2="40.8" y2="62.9" width="0.3" layer="16"/>
+<wire x1="40.8" y1="62.9" x2="43.4" y2="60.3" width="0.3" layer="16"/>
+<wire x1="43.4" y1="60.3" x2="43.4" y2="58.8" width="0.3" layer="16"/>
+<via x="43.4" y="58.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="43.4" y1="58.8" x2="43.4" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="U$1" pad="GPIO5"/>
 <contactref element="R11" pad="2"/>
-<wire x1="-14.66" y1="10.5" x2="-35.98" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="60.95" x2="34.65" y2="60.95" width="0.3" layer="1"/>
+<wire x1="34.65" y1="60.95" x2="34.7" y2="60.9" width="0.3" layer="1"/>
+<via x="34.7" y="60.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="34.7" y1="60.9" x2="38.8" y2="60.9" width="0.3" layer="16"/>
+<wire x1="38.8" y1="60.9" x2="41.1" y2="58.6" width="0.3" layer="16"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="56.3" width="0.3" layer="16"/>
+<via x="41.1" y="56.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="41.1" y1="56.3" x2="41.1" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_E">
 <contactref element="U$1" pad="GPIO14"/>
 <contactref element="R13" pad="2"/>
-<wire x1="-51.22" y1="55.88" x2="-31.06" y2="8.5" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="58.95" x2="6.85" y2="58.95" width="0.3" layer="1"/>
+<wire x1="6.85" y1="58.95" x2="7.4" y2="58.4" width="0.3" layer="1"/>
+<via x="7.4" y="58.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="7.4" y1="58.4" x2="9.4" y2="56.4" width="0.3" layer="16"/>
+<wire x1="9.4" y1="56.4" x2="36.4" y2="56.4" width="0.3" layer="16"/>
+<via x="36.4" y="56.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="36.4" y1="56.4" x2="36.5" y2="56.3" width="0.3" layer="1"/>
+<wire x1="36.5" y1="56.3" x2="36.5" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_F">
 <contactref element="U$1" pad="GPIO12"/>
 <contactref element="R14" pad="2"/>
-<wire x1="-56.3" y1="55.88" x2="-31.06" y2="6.5" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="56.95" x2="7.45" y2="56.95" width="0.3" layer="1"/>
+<wire x1="7.45" y1="56.95" x2="9.2" y2="58.7" width="0.3" layer="1"/>
+<via x="9.2" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38" y1="57.9" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="9.2" y1="58.7" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="38" y1="57.9" x2="38.8" y2="58.7" width="0.3" layer="16"/>
+<via x="38.8" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38.8" y1="58.7" x2="38.8" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_G">
 <contactref element="U$1" pad="GPIO13"/>
 <contactref element="R15" pad="2"/>
-<wire x1="-31.06" y1="4.5" x2="-15.66" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="54.95" x2="7.05" y2="54.95" width="0.3" layer="1"/>
+<wire x1="36.4" y1="59.95" x2="36.5" y2="60.05" width="0.3" layer="1"/>
+<wire x1="7.05" y1="54.95" x2="12.05" y2="59.95" width="0.3" layer="1"/>
+<wire x1="12.05" y1="59.95" x2="36.4" y2="59.95" width="0.3" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="U$2" pad="P$10"/>
 <contactref element="R15" pad="1"/>
-<wire x1="15.92" y1="54.62" x2="-17.36" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="65.62" x2="26.79" y2="61.75" width="0.3" layer="1"/>
+<wire x1="26.79" y1="61.75" x2="36.5" y2="61.75" width="0.3" layer="1"/>
 </signal>
 <signal name="N$14">
 <contactref element="R14" pad="1"/>
 <contactref element="U$2" pad="P$9"/>
-<wire x1="-58" y1="55.88" x2="18.46" y2="54.62" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="65.62" x2="27.68" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38.8" y1="62.6" x2="38.8" y2="61.75" width="0.3" layer="1"/>
+<wire x1="27.68" y1="63.4" x2="38" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38" y1="63.4" x2="38.8" y2="62.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$15">
 <contactref element="R13" pad="1"/>
 <contactref element="U$2" pad="P$1"/>
-<wire x1="-52.92" y1="55.88" x2="15.92" y2="39.38" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="50.38" x2="25.89" y2="53.35" width="0.3" layer="1"/>
+<wire x1="25.89" y1="53.35" x2="36.5" y2="53.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="R11" pad="1"/>
 <contactref element="U$2" pad="P$4"/>
-<wire x1="-37.68" y1="60.96" x2="23.54" y2="39.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="50.38" x2="31.76" y2="51.6" width="0.3" layer="1"/>
+<wire x1="41.1" y1="52.4" x2="41.1" y2="53.35" width="0.3" layer="1"/>
+<wire x1="31.76" y1="51.6" x2="40.3" y2="51.6" width="0.3" layer="1"/>
+<wire x1="40.3" y1="51.6" x2="41.1" y2="52.4" width="0.3" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="R9" pad="1"/>
 <contactref element="U$2" pad="P$7"/>
-<wire x1="-47.84" y1="60.96" x2="23.54" y2="54.62" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="65.62" x2="31.76" y2="64.4" width="0.3" layer="1"/>
+<wire x1="41.1" y1="62.9" x2="41.1" y2="61.75" width="0.3" layer="1"/>
+<wire x1="31.76" y1="64.4" x2="39.6" y2="64.4" width="0.3" layer="1"/>
+<wire x1="39.6" y1="64.4" x2="41.1" y2="62.9" width="0.3" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="R10" pad="1"/>
 <contactref element="U$2" pad="P$6"/>
-<wire x1="26.08" y1="54.62" x2="-42.76" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="33.08" y1="65.62" x2="41.38" y2="65.62" width="0.3" layer="1"/>
+<wire x1="43.4" y1="63.6" x2="43.4" y2="61.75" width="0.3" layer="1"/>
+<wire x1="41.38" y1="65.62" x2="43.4" y2="63.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$19">
 <contactref element="U$2" pad="P$2"/>
 <contactref element="R12" pad="1"/>
-<wire x1="-47.84" y1="55.88" x2="18.46" y2="39.38" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="50.38" x2="27.38" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.8" y1="52.6" x2="38.8" y2="53.35" width="0.3" layer="1"/>
+<wire x1="27.38" y1="52.3" x2="38.5" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.5" y1="52.3" x2="38.8" y2="52.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="L1" pad="P$2"/>
 <contactref element="U4" pad="P$2"/>
-<wire x1="-24.65" y1="64.77" x2="-22.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.53" y1="26.25" x2="8.765" y2="25.99" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$4">
 <contactref element="L1" pad="P$1"/>
 <contactref element="U4" pad="P$4"/>
-<wire x1="-26.15" y1="64.77" x2="-21.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.53" y1="24.75" x2="8.765" y2="24.99" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$6">
 <contactref element="J2" pad="1"/>
 <contactref element="U2" pad="P$1"/>
 <contactref element="U2" pad="P$2"/>
 <contactref element="C1" pad="1"/>
-<wire x1="-31.33" y1="55.88" x2="-17.78" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.435" y1="59.61" x2="-31.33" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="59.61" x2="-54.435" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="7.15" y1="8.5" x2="8.42" y2="4.44" width="0" layer="19" extent="1-1"/>
+<wire x1="7.675" y1="10.45" x2="7.15" y2="8.5" width="0" layer="19" extent="1-1"/>
+<wire x1="6.9" y1="10.45" x2="7.675" y2="10.45" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$7">
 <contactref element="C1" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="U2" pad="P$3"/>
-<wire x1="-53.835" y1="59.61" x2="-29.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.73" y1="48.26" x2="-53.835" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="8.275" y1="10.45" x2="8.85" y2="8.5" width="0" layer="19" extent="1-1"/>
+<wire x1="10.1" y1="11.15" x2="8.275" y2="10.45" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$9">
 <contactref element="J2" pad="2"/>
@@ -2181,27 +2304,45 @@ design rules under a new name.</description>
 <contactref element="U4" pad="P$6"/>
 <contactref element="C6" pad="2"/>
 <contactref element="R4" pad="1"/>
-<wire x1="-20.59" y1="67.315" x2="-15.24" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="67.315" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.59" y1="64.765" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-18.63" y1="55.88" x2="-20.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-28.26" y1="48.23" x2="-18.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.98" y1="55.88" x2="-28.26" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-50.48" y1="49.53" x2="-35.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.03" y1="48.26" x2="-50.48" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="24.49" x2="10.96" y2="4.44" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="25.49" x2="11.315" y2="24.49" width="0" layer="19" extent="1-1"/>
+<wire x1="8.765" y1="24.49" x2="11.315" y2="24.49" width="0" layer="19" extent="1-1"/>
+<wire x1="3.4" y1="48.65" x2="8.765" y2="24.49" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="12.96" x2="3.4" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="10.62" y1="22.18" x2="14.33" y2="12.96" width="0" layer="19" extent="1-1"/>
+<wire x1="12.33" y1="12.48" x2="10.62" y2="22.18" width="0" layer="19" extent="1-1"/>
+<wire x1="10.1" y1="12.85" x2="12.33" y2="12.48" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$11">
 <contactref element="U2" pad="P$5"/>
 <contactref element="R2" pad="2"/>
-<wire x1="-54.435" y1="62.31" x2="-41.06" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="7.675" y1="13.15" x2="8.14" y2="15.16" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$12">
 <contactref element="R3" pad="2"/>
 <contactref element="U3" pad="5"/>
-<wire x1="-49.95" y1="60.96" x2="-30.16" y2="50.83" width="0" layer="19" extent="1-1"/>
+<wire x1="17.05" y1="16.86" x2="16.93" y2="14.86" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PS">
 <contactref element="U4" pad="P$7"/>
+<contactref element="U$1" pad="GPIO15"/>
+<contactref element="R7" pad="2"/>
+<wire x1="19.99" y1="54.95" x2="17.85" y2="54.95" width="0.3" layer="1"/>
+<wire x1="15.04" y1="52.14" x2="15.04" y2="50.38" width="0.3" layer="1"/>
+<wire x1="17.85" y1="54.95" x2="15.04" y2="52.14" width="0.3" layer="1"/>
+<wire x1="11.315" y1="24.99" x2="15.04" y2="50.38" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$20">
+<contactref element="U$1" pad="GPIO0"/>
+<contactref element="R16" pad="2"/>
+<contactref element="J6" pad="2"/>
+<wire x1="19.99" y1="58.95" x2="16.35" y2="58.95" width="0.3" layer="1"/>
+<wire x1="12.9" y1="55.5" x2="12.9" y2="51.8" width="0.3" layer="1"/>
+<wire x1="12.9" y1="51.8" x2="12.9" y2="50.35" width="0.3" layer="1"/>
+<wire x1="16.35" y1="58.95" x2="12.9" y2="55.5" width="0.3" layer="1"/>
+<wire x1="11.06" y1="42.2" x2="12.9" y2="44.04" width="0.3" layer="16"/>
+<wire x1="12.9" y1="44.04" x2="12.9" y2="51.8" width="0.3" layer="16"/>
+<via x="12.9" y="51.8" extent="1-16" drill="0.35" diameter="0.6"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
@@ -2220,6 +2361,11 @@ of those online libraries will not be understood (or retained)
 with this version.
 </note>
 <note version="8.3" severity="warning">
+Since Version 8.3, EAGLE supports Fusion synchronisation.
+This feature will not be available in this version and saving
+the document will break the link to the Fusion PCB feature.
+</note>
+<note version="8.3" severity="warning">
 Since Version 8.3, EAGLE supports URNs for individual library
 assets (packages, symbols, and devices). The URNs of those assets
 will not be understood (or retained) with this version.
diff --git a/esp8266-wifi-remote.b#9 b/esp8266-wifi-remote.b#9
index ff5c9bd..da84524 100644
--- a/esp8266-wifi-remote.b#9
+++ b/esp8266-wifi-remote.b#9
@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.01" altunitdist="mm" altunit="mm"/>
+<grid distance="0.1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.05" altunitdist="mm" altunit="mm"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="16" fill="1" visible="no" active="no"/>
@@ -52,7 +52,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
@@ -157,11 +157,18 @@
 <layer number="255" name="routoute" color="7" fill="1" visible="no" active="yes"/>
 </layers>
 <board>
+<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="c7a73c68-2407-04ba-dc3a-388155fd8543"/>
 <plain>
-<wire x1="0" y1="0" x2="160" y2="0" width="0" layer="20"/>
-<wire x1="160" y1="0" x2="160" y2="100" width="0" layer="20"/>
-<wire x1="160" y1="100" x2="0" y2="100" width="0" layer="20"/>
-<wire x1="0" y1="100" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="0" x2="56" y2="0" width="0" layer="20"/>
+<wire x1="56" y1="0" x2="56" y2="68" width="0" layer="20"/>
+<wire x1="56" y1="68" x2="0" y2="68" width="0" layer="20"/>
+<wire x1="0" y1="68" x2="0" y2="0" width="0" layer="20"/>
+<hole x="3" y="3" drill="3.2"/>
+<hole x="53" y="3" drill="3.2"/>
+<hole x="53" y="65" drill="3.2"/>
+<text x="12.8" y="3.6" size="1.778" layer="21">BAT</text>
+<text x="10.3" y="0.9" size="1.778" layer="21">+</text>
+<text x="8" y="1" size="1.778" layer="21">-</text>
 </plain>
 <libraries>
 <library name="rcl" urn="urn:adsk.eagle:library:334">
@@ -1410,7 +1417,7 @@ CONN_02
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" library_version="2" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -1419,8 +1426,21 @@ CONN_02
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
+<packages3d>
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="ELAB_PUSHBUTTON_1"/>
+</packageinstances>
+</package3d>
+</packages3d>
 </library>
 <library name="fixed-inductors" urn="urn:adsk.eagle:library:10480998">
 <description>&lt;b&gt;Fixed inductors&lt;/b&gt;</description>
@@ -1508,7 +1528,7 @@ CONN_02
 </package>
 </packages>
 <packages3d>
-<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/2" type="model" library_version="4" library_locally_modified="yes">
+<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/1" type="box" library_version="4">
 <packageinstances>
 <packageinstance name="DIP-10-WIDE"/>
 </packageinstances>
@@ -1618,6 +1638,24 @@ package type OT</description>
 </package3d>
 </packages3d>
 </library>
+<library name="tactile-switches" urn="urn:adsk.eagle:library:10516572">
+<description>&lt;b&gt;Tactile Switches&lt;/b&gt;</description>
+<packages>
+<package name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:footprint:10516573/1" library_version="1">
+<smd name="P$1" x="-1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<smd name="P$2" x="1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<wire x1="-1.45" y1="1.45" x2="1.45" y2="1.45" width="0.127" layer="21"/>
+<wire x1="-1.45" y1="-1.45" x2="1.45" y2="-1.45" width="0.127" layer="21"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:package:10516575/2" type="model" library_version="1" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="3X4X2_MOMENTARY_SWITCH"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -1627,7 +1665,7 @@ package type OT</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="default">
+<designrules name="default *">
 <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 
@@ -1656,7 +1694,7 @@ design rules under a new name.</description>
 <param name="mdSmdSmd" value="6mil"/>
 <param name="mdViaViaSameLayer" value="6mil"/>
 <param name="mnLayersViaInSmd" value="2"/>
-<param name="mdCopperDimension" value="40mil"/>
+<param name="mdCopperDimension" value="20mil"/>
 <param name="mdDrill" value="6mil"/>
 <param name="mdSmdStop" value="0mil"/>
 <param name="msWidth" value="6mil"/>
@@ -1811,166 +1849,152 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-30.48" y="55.88" smashed="yes">
-<attribute name="NAME" x="-31.115" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-31.115" y="53.975" size="1.27" layer="27"/>
+<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="8" y="8.5" smashed="yes">
+<attribute name="NAME" x="3.965" y="7.935" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="38.48" y="-47.38" size="1.778" layer="27" display="off"/>
+</element>
+<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="16.05" y="10.87" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.98" y="8.2" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="-28.4" y="60.4" size="1.778" layer="27" rot="R180" display="off"/>
+</element>
+<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="12.33" y="11.53" smashed="yes" rot="R270">
+<attribute name="NAME" x="13.1" y="13.8" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="C" x="-37.2" y="-38" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-44.45" y="49.53" smashed="yes">
-<attribute name="NAME" x="-45.72" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-45.72" y="46.99" size="1.27" layer="27"/>
+<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="12.1" y="28.7" smashed="yes" rot="R180">
+<attribute name="NAME" x="10.73" y="29.97" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="-22.19" y="78.23" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-49.53" y="49.53" smashed="yes">
-<attribute name="NAME" x="-50.8" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-50.8" y="46.99" size="1.27" layer="27"/>
+<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="8.1" y="28.7" smashed="yes">
+<attribute name="NAME" x="6.83" y="29.97" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="47.47" y="-20.83" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-34.29" y="49.53" smashed="yes">
-<attribute name="NAME" x="-35.56" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-35.56" y="46.99" size="1.27" layer="27"/>
+<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="9.77" y="22.18" smashed="yes">
+<attribute name="NAME" x="11.535" y="21.615" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="46.6" y="-33.7" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-39.37" y="49.53" smashed="yes">
-<attribute name="NAME" x="-40.64" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-40.64" y="46.99" size="1.27" layer="27"/>
+<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="27.91" y="1.82" smashed="yes">
+<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="Molex" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MP" value="1050170001" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="NAME" x="23.59973125" y="5.46023125" size="1.27008125" layer="25"/>
+<attribute name="PACKAGE" value="None" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="23.5973" y="-2.43266875" size="1.2708" layer="27"/>
 </element>
-<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-36.83" y="55.88" smashed="yes">
-<attribute name="NAME" x="-37.465" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="53.975" size="1.27" layer="27"/>
+<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="8.42" y="4.44" smashed="yes">
+<attribute name="NAME" x="5.75" y="4.237" size="0.6096" layer="25" font="vector" ratio="20"/>
+<attribute name="VALUE" x="7.15" y="2.408" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="-34.29" y="33.02" smashed="yes">
-<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="Molex" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="MP" value="1050170001" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="-38.60026875" y="36.66023125" size="1.27008125" layer="25"/>
-<attribute name="PACKAGE" value="None" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-38.6027" y="28.76733125" size="1.2708" layer="27"/>
+<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="12" smashed="yes"/>
+<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="40" smashed="yes" rot="R180"/>
+<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="6.53" y="25.5" smashed="yes" rot="R90"/>
+<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="10.1" y="12" smashed="yes" rot="R90">
+<attribute name="NAME" x="10.665" y="13.765" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="58.36" y="67.88" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="-17.78" y="66.04" smashed="yes">
-<attribute name="NAME" x="-19.05" y="67.437" size="0.6096" layer="25" font="vector" ratio="20"/>
-<attribute name="VALUE" x="-19.05" y="64.008" size="0.6096" layer="27" font="vector" ratio="20"/>
+<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="43.4" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="43.965" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-12.48" y="18.99" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" value="ELAB_PUSHBUTTON_1" x="-52.07" y="5.08" smashed="yes"/>
-<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" value="ELAB_PUSHBUTTON_1" x="-19.05" y="33.02" smashed="yes"/>
-<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="-25.4" y="64.77" smashed="yes"/>
-<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="-55.88" y="48.26" smashed="yes">
-<attribute name="NAME" x="-56.515" y="48.895" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-56.515" y="46.355" size="1.27" layer="27"/>
+<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="41.765" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="102.06" y="91.03" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="55.88" smashed="yes">
-<attribute name="NAME" x="-42.545" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="53.975" size="1.27" layer="27"/>
+<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="39.465" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="94.68" y="101.19" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-36.83" y="60.96" smashed="yes">
-<attribute name="NAME" x="-37.465" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="59.055" size="1.27" layer="27"/>
+<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="37.165" y="55.965" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="92.38" y="106.27" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="55.88" smashed="yes">
-<attribute name="NAME" x="-47.625" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="53.975" size="1.27" layer="27"/>
+<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="39.365" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-17.08" y="3.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-52.07" y="55.88" smashed="yes">
-<attribute name="NAME" x="-52.705" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-52.705" y="53.975" size="1.27" layer="27"/>
+<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="37.065" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-24.46" y="44.39" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-57.15" y="55.88" smashed="yes">
-<attribute name="NAME" x="-57.785" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.785" y="53.975" size="1.27" layer="27"/>
+<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7" x="7.29" y="15.16" smashed="yes">
+<attribute name="NAME" x="6.655" y="15.795" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="49.2" y="-45.8" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-16.51" y="60.96" smashed="yes">
-<attribute name="NAME" x="-17.145" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-17.145" y="59.055" size="1.27" layer="27"/>
+<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="16.2" y="16.86" smashed="yes">
+<attribute name="NAME" x="15.065" y="18.195" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="67" y="-44.1" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="60.96" smashed="yes">
-<attribute name="NAME" x="-42.545" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="59.055" size="1.27" layer="27"/>
+<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="3.4" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="3.965" y="45.565" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="59.28" y="67.28" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="-50.8" y="60.96" smashed="yes">
-<attribute name="NAME" x="-51.435" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-51.435" y="59.055" size="1.27" layer="27"/>
+<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="1.3" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="1.865" y="45.365" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="57.18" y="73.63" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="-17.78" y="55.88" smashed="yes">
-<attribute name="NAME" x="-18.415" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-18.415" y="53.975" size="1.27" layer="27"/>
+<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="10.8" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="10.3" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-50.16" y="27.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="-24.13" y="55.88" smashed="yes">
-<attribute name="NAME" x="-24.765" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-24.765" y="53.975" size="1.27" layer="27"/>
+<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="15.04" y="49.53" smashed="yes" rot="R90">
+<attribute name="NAME" x="14.5" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="76" y="76.2" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-21.59" y="60.96" smashed="yes">
-<attribute name="NAME" x="-22.225" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-22.225" y="59.055" size="1.27" layer="27"/>
+<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="8.7" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="8.2" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-52.26" y="17.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-26.67" y="60.96" smashed="yes">
-<attribute name="NAME" x="-27.305" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-27.305" y="59.055" size="1.27" layer="27"/>
+<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="41.665" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-19.86" y="13.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-31.75" y="60.96" smashed="yes">
-<attribute name="NAME" x="-32.385" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-32.385" y="59.055" size="1.27" layer="27"/>
+<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="11.79" y="61.15" smashed="yes">
+<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PINS" value="16" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PITCH" value="0.078&quot; / 2 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="6.69" y="60.25" size="1.27" layer="27"/>
 </element>
-<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="60.96" smashed="yes">
-<attribute name="NAME" x="-47.625" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="59.055" size="1.27" layer="27"/>
+<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="58" smashed="yes"/>
+<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="7.5" y="11.8" smashed="yes"/>
+<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="15.63" y="13.91" smashed="yes" rot="R270">
+<attribute name="NAME" x="18.035" y="15.015" size="1.27" layer="25" rot="R270"/>
 </element>
-<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="-22.86" y="12.7" smashed="yes">
-<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="-30.86" y="25.7" size="1.27" layer="25"/>
-<attribute name="PINS" value="16" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="PITCH" value="0.078&quot; / 2 mm" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-30.86" y="1.6" size="1.27" layer="27"/>
+<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="10.04" y="25.49" smashed="yes" rot="R270"/>
+<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="2.7" y="36.8" smashed="yes" rot="R90"/>
+<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="12.9" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="12.4" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="12.9" y="49.5" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/2" value="NKR161" x="-39.37" y="10.16" smashed="yes"/>
-<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="-54.61" y="60.96" smashed="yes"/>
-<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="-29.21" y="49.53" smashed="yes">
-<attribute name="NAME" x="-31.115" y="51.435" size="1.27" layer="25"/>
-<attribute name="VALUE" x="-31.115" y="46.101" size="1.27" layer="27"/>
+<element name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="13.6" y="42.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.87" y="40.803" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="14.87" y="44.232" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
-<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="-21.59" y="66.04" smashed="yes"/>
 </elements>
 <signals>
 <signal name="+3V3">
 <contactref element="U$1" pad="VCC"/>
 <contactref element="R6" pad="2"/>
 <contactref element="R8" pad="2"/>
-<contactref element="J4" pad="P$2"/>
-<contactref element="J4" pad="P$3"/>
 <contactref element="J3" pad="P$2"/>
 <contactref element="J3" pad="P$3"/>
 <contactref element="U4" pad="P$1"/>
 <contactref element="U4" pad="P$10"/>
 <contactref element="C5" pad="1"/>
 <contactref element="C4" pad="1"/>
-<wire x1="-49.57" y1="8.88" x2="-49.57" y2="1.28" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.06" y1="4.595" x2="-49.57" y2="1.28" width="0" layer="19" extent="1-1"/>
-<wire x1="-16.55" y1="29.22" x2="-31.06" y2="4.595" width="0" layer="19" extent="1-1"/>
-<wire x1="-16.55" y1="36.82" x2="-16.55" y2="29.22" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.24" y1="49.53" x2="-16.55" y2="36.82" width="0" layer="19" extent="1-1"/>
-<wire x1="-40.32" y1="49.53" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.9" y1="60.96" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="64.765" x2="-30.9" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="67.315" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.74" y1="60.96" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
+<contactref element="R16" pad="1"/>
+<wire x1="3.59" y1="53.045" x2="4.455" y2="53.045" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.8" x2="8.7" y2="48.65" width="0.3" layer="1"/>
+<wire x1="4.455" y1="53.045" x2="8.7" y2="48.8" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.65" x2="12.9" y2="48.65" width="0.3" layer="1"/>
+<wire x1="12.9" y1="48.65" x2="10.8" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="13.05" y1="28.7" x2="12.9" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="26.49" x2="13.05" y2="28.7" width="0" layer="19" extent="1-1"/>
+<wire x1="8.765" y1="26.49" x2="11.315" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="7.15" y1="28.7" x2="8.765" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="15.8" x2="13.05" y2="28.7" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="8.2" x2="30.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="GND">
 <contactref element="J1" pad="SH1"/>
@@ -2000,176 +2024,270 @@ design rules under a new name.</description>
 <contactref element="U3" pad="2"/>
 <contactref element="C3" pad="2"/>
 <contactref element="R5" pad="1"/>
-<wire x1="-21.59" y1="64.765" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.09" y1="67.315" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-27.52" y1="60.96" x2="-21.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-24.98" y1="55.88" x2="-27.52" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.21" y1="48.23" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.34" y1="49.53" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-38.42" y1="49.53" x2="-33.34" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-43.5" y1="49.53" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-48.58" y1="49.53" x2="-43.5" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.68" y1="55.88" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-42.76" y1="60.96" x2="-37.68" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-51.65" y1="60.96" x2="-42.76" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.61" y1="60.96" x2="-51.65" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="62.31" x2="-54.61" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.79" y1="35.37" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-32.99" y1="35.37" x2="-31.79" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.29" y1="32.67" x2="-32.99" y2="35.37" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.39" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.79" y1="32.67" x2="-31.39" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.29" y1="32.67" x2="-33.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.19" y1="32.67" x2="-35.29" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.79" y1="32.67" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-36.79" y1="35.37" x2="-37.19" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-39.37" y1="17.78" x2="-37.79" y2="32.67" width="0" layer="19" extent="1-1"/>
-<wire x1="-39.37" y1="2.54" x2="-39.37" y2="17.78" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="4.595" x2="-39.37" y2="2.54" width="0" layer="19" extent="1-1"/>
+<contactref element="J5" pad="P$1"/>
+<contactref element="J6" pad="1"/>
+<contactref element="J4" pad="P$1"/>
+<contactref element="J4" pad="P$4"/>
+<wire x1="28" y1="50.38" x2="28" y2="65.62" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="43.8" x2="28" y2="50.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="36.2" x2="30.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="53.045" x2="28" y2="50.38" width="0" layer="19" extent="1-1"/>
+<wire x1="15.04" y1="48.68" x2="19.99" y2="53.045" width="0" layer="19" extent="1-1"/>
+<wire x1="1.3" y1="48.65" x2="15.04" y2="48.68" width="0" layer="19" extent="1-1"/>
+<wire x1="13.6" y1="42.2" x2="1.3" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="2.7" y1="35.425" x2="13.6" y2="42.2" width="0" layer="19" extent="1-1"/>
+<wire x1="6.44" y1="15.16" x2="2.7" y2="35.425" width="0" layer="19" extent="1-1"/>
+<wire x1="6.9" y1="13.15" x2="6.44" y2="15.16" width="0" layer="19" extent="1-1"/>
+<wire x1="7.5" y1="11.8" x2="6.9" y2="13.15" width="0" layer="19" extent="1-1"/>
+<wire x1="12.33" y1="10.58" x2="7.5" y2="11.8" width="0" layer="19" extent="1-1"/>
+<wire x1="15.1" y1="10.87" x2="12.33" y2="10.58" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="13.91" x2="15.1" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="15.35" y1="16.86" x2="14.33" y2="13.91" width="0" layer="19" extent="1-1"/>
+<wire x1="25.41" y1="4.17" x2="15.1" y2="10.87" width="0" layer="19" extent="1-1"/>
+<wire x1="25.01" y1="1.47" x2="25.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="24.41" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="26.91" y1="1.47" x2="25.01" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="28.91" y1="1.47" x2="26.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.81" y1="1.47" x2="28.91" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="31.41" y1="1.47" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="30.41" y1="4.17" x2="30.81" y2="1.47" width="0" layer="19" extent="1-1"/>
+<wire x1="29.21" y1="4.17" x2="30.41" y2="4.17" width="0" layer="19" extent="1-1"/>
+<wire x1="8.765" y1="25.49" x2="13.6" y2="42.2" width="0" layer="19" extent="1-1"/>
+<wire x1="10.04" y1="25.49" x2="8.765" y2="25.49" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="25.99" x2="10.04" y2="25.49" width="0" layer="19" extent="1-1"/>
+<wire x1="8.92" y1="22.18" x2="8.765" y2="25.49" width="0" layer="19" extent="1-1"/>
+<wire x1="9.05" y1="28.7" x2="8.92" y2="22.18" width="0" layer="19" extent="1-1"/>
+<wire x1="11.15" y1="28.7" x2="9.05" y2="28.7" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="+5V">
 <contactref element="J1" pad="1"/>
 <contactref element="C2" pad="1"/>
 <contactref element="U3" pad="1"/>
 <contactref element="U3" pad="4"/>
-<wire x1="-30.16" y1="48.23" x2="-28.26" y2="50.83" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.59" y1="35.37" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-45.4" y1="49.53" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="14.86" x2="16.93" y2="12.96" width="0" layer="19" extent="1-1"/>
+<wire x1="26.61" y1="4.17" x2="14.33" y2="14.86" width="0" layer="19" extent="1-1"/>
+<wire x1="17" y1="10.87" x2="14.33" y2="14.86" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_RX">
 <contactref element="J1" pad="2"/>
 <contactref element="U$1" pad="RX"/>
 <contactref element="R9" pad="2"/>
-<wire x1="-34.94" y1="35.37" x2="-46.14" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="16.5" x2="-34.94" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="64.95" x2="20.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="20.75" y1="64.95" x2="21.7" y2="64" width="0.3" layer="1"/>
+<wire x1="21.7" y1="64" x2="22.9" y2="64" width="0.3" layer="1"/>
+<via x="22.9" y="64" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="22.9" y1="64" x2="41.5" y2="64" width="0.3" layer="16"/>
+<wire x1="41.5" y1="64" x2="44.8" y2="60.7" width="0.3" layer="16"/>
+<wire x1="44.8" y1="60.7" x2="44.8" y2="58.4" width="0.3" layer="16"/>
+<wire x1="44.8" y1="58.4" x2="44.7" y2="58.3" width="0.3" layer="16"/>
+<via x="44.7" y="58.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="44.7" y1="58.3" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="60.05" width="0.3" layer="1"/>
+<wire x1="43.9" y1="57.5" x2="42.2" y2="57.5" width="0.3" layer="1"/>
+<wire x1="42.2" y1="57.5" x2="41.1" y2="58.6" width="0.3" layer="1"/>
+<wire x1="27.26" y1="4.17" x2="42.2" y2="57.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_TX">
 <contactref element="J1" pad="3"/>
 <contactref element="U$1" pad="TX"/>
 <contactref element="R12" pad="2"/>
-<wire x1="-34.29" y1="35.37" x2="-46.14" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="18.5" x2="-34.29" y2="35.37" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="66.95" x2="18.25" y2="66.95" width="0.3" layer="1"/>
+<wire x1="18.25" y1="66.95" x2="17.7" y2="66.4" width="0.3" layer="1"/>
+<wire x1="17.7" y1="66.4" x2="17.7" y2="61" width="0.3" layer="1"/>
+<via x="17.7" y="61" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.7" y1="61" x2="32.9" y2="61" width="0.3" layer="16"/>
+<wire x1="32.9" y1="61" x2="35" y2="58.9" width="0.3" layer="16"/>
+<via x="35" y="58.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="35" y1="58.9" x2="36.5" y2="57.4" width="0.3" layer="1"/>
+<wire x1="36.5" y1="57.4" x2="38" y2="57.4" width="0.3" layer="1"/>
+<wire x1="38" y1="57.4" x2="38.7" y2="56.7" width="0.3" layer="1"/>
+<wire x1="38.7" y1="55.15" x2="38.8" y2="55.05" width="0.3" layer="1"/>
+<wire x1="38.7" y1="56.7" x2="38.7" y2="55.15" width="0.3" layer="1"/>
+<wire x1="27.91" y1="4.17" x2="38.8" y2="55.05" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VBAT_D">
 <contactref element="U$1" pad="ADC"/>
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
-<wire x1="-23.28" y1="55.88" x2="-16.93" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.06" y1="16.5" x2="-23.28" y2="55.88" width="0" layer="19" extent="1-1"/>
+<contactref element="J4" pad="P$2"/>
+<contactref element="J4" pad="P$3"/>
+<wire x1="3.4" y1="50.35" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="1.6" y1="50.35" x2="1.3" y2="50.35" width="0.3" layer="1"/>
+<wire x1="3.59" y1="64.95" x2="2.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="1.2" y1="50.75" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="2.75" y1="64.95" x2="1.2" y2="63.4" width="0.3" layer="1"/>
+<wire x1="1.2" y1="63.4" x2="1.2" y2="50.75" width="0.3" layer="1"/>
+<wire x1="25.5" y1="36.2" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.4" y1="50.35" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RST">
 <contactref element="U$1" pad="REST"/>
 <contactref element="U$1" pad="GPIO16"/>
 <contactref element="R6" pad="1"/>
-<wire x1="-31.06" y1="18.5" x2="-22.44" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-31.06" y1="12.5" x2="-31.06" y2="18.5" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$1">
-<contactref element="U$1" pad="GPIO15"/>
-<contactref element="R7" pad="2"/>
-<contactref element="J4" pad="P$1"/>
-<contactref element="J4" pad="P$4"/>
-<wire x1="-21.55" y1="36.82" x2="-25.82" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.55" y1="29.22" x2="-21.55" y2="36.82" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="6.5" x2="-21.55" y2="29.22" width="0" layer="19" extent="1-1"/>
+<contactref element="J5" pad="P$2"/>
+<wire x1="3.59" y1="66.95" x2="6.55" y2="66.95" width="0.3" layer="1"/>
+<wire x1="6.55" y1="66.95" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<via x="6.7" y="66.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="6.7" y1="66.8" x2="6.7" y2="55.9" width="0.3" layer="16"/>
+<wire x1="10.7" y1="51.9" x2="10.8" y2="51.9" width="0.3" layer="16"/>
+<via x="10.8" y="51.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="50.35" width="0.3" layer="1"/>
+<wire x1="6.7" y1="55.9" x2="10.7" y2="51.9" width="0.3" layer="16"/>
+<wire x1="3.59" y1="60.95" x2="5.25" y2="60.95" width="0.3" layer="1"/>
+<wire x1="5.25" y1="60.95" x2="6.7" y2="62.4" width="0.3" layer="1"/>
+<wire x1="6.7" y1="62.4" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<wire x1="2.7" y1="38.175" x2="10.8" y2="50.35" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$2">
 <contactref element="R8" pad="1"/>
 <contactref element="U$1" pad="CH_PD"/>
-<wire x1="-31.06" y1="14.5" x2="-32.6" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="62.95" x2="5.55" y2="62.95" width="0.3" layer="1"/>
+<wire x1="5.55" y1="62.95" x2="5.6" y2="62.9" width="0.3" layer="1"/>
+<via x="5.6" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="5.6" y1="62.9" x2="5.6" y2="54.7" width="0.3" layer="16"/>
+<wire x1="5.6" y1="54.7" x2="8.7" y2="51.6" width="0.3" layer="16"/>
+<via x="8.7" y="51.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="8.7" y1="51.6" x2="8.7" y2="50.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="GPIO2"/>
 <contactref element="J3" pad="P$1"/>
 <contactref element="J3" pad="P$4"/>
-<wire x1="-54.57" y1="8.88" x2="-54.57" y2="1.28" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.66" y1="8.5" x2="-54.57" y2="8.88" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="15.8" x2="25.5" y2="8.2" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="56.95" x2="25.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="U$1" pad="GPIO4"/>
 <contactref element="R10" pad="2"/>
-<wire x1="-14.66" y1="14.5" x2="-41.06" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="62.95" x2="24.25" y2="62.95" width="0.3" layer="1"/>
+<wire x1="24.25" y1="62.95" x2="24.3" y2="62.9" width="0.3" layer="1"/>
+<via x="24.3" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="24.3" y1="62.9" x2="40.8" y2="62.9" width="0.3" layer="16"/>
+<wire x1="40.8" y1="62.9" x2="43.4" y2="60.3" width="0.3" layer="16"/>
+<wire x1="43.4" y1="60.3" x2="43.4" y2="58.8" width="0.3" layer="16"/>
+<via x="43.4" y="58.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="43.4" y1="58.8" x2="43.4" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="U$1" pad="GPIO5"/>
 <contactref element="R11" pad="2"/>
-<wire x1="-14.66" y1="12.5" x2="-35.98" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="60.95" x2="34.65" y2="60.95" width="0.3" layer="1"/>
+<wire x1="34.65" y1="60.95" x2="34.7" y2="60.9" width="0.3" layer="1"/>
+<via x="34.7" y="60.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="34.7" y1="60.9" x2="38.8" y2="60.9" width="0.3" layer="16"/>
+<wire x1="38.8" y1="60.9" x2="41.1" y2="58.6" width="0.3" layer="16"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="56.3" width="0.3" layer="16"/>
+<via x="41.1" y="56.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="41.1" y1="56.3" x2="41.1" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_E">
 <contactref element="U$1" pad="GPIO14"/>
 <contactref element="R13" pad="2"/>
-<wire x1="-51.22" y1="55.88" x2="-31.06" y2="10.5" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="58.95" x2="6.85" y2="58.95" width="0.3" layer="1"/>
+<wire x1="6.85" y1="58.95" x2="7.4" y2="58.4" width="0.3" layer="1"/>
+<via x="7.4" y="58.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="7.4" y1="58.4" x2="9.4" y2="56.4" width="0.3" layer="16"/>
+<wire x1="9.4" y1="56.4" x2="36.4" y2="56.4" width="0.3" layer="16"/>
+<via x="36.4" y="56.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="36.4" y1="56.4" x2="36.5" y2="56.3" width="0.3" layer="1"/>
+<wire x1="36.5" y1="56.3" x2="36.5" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_F">
 <contactref element="U$1" pad="GPIO12"/>
 <contactref element="R14" pad="2"/>
-<wire x1="-56.3" y1="55.88" x2="-31.06" y2="8.5" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="56.95" x2="7.45" y2="56.95" width="0.3" layer="1"/>
+<wire x1="7.45" y1="56.95" x2="9.2" y2="58.7" width="0.3" layer="1"/>
+<via x="9.2" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38" y1="57.9" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="9.2" y1="58.7" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="38" y1="57.9" x2="38.8" y2="58.7" width="0.3" layer="16"/>
+<via x="38.8" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38.8" y1="58.7" x2="38.8" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_G">
 <contactref element="U$1" pad="GPIO13"/>
 <contactref element="R15" pad="2"/>
-<wire x1="-31.06" y1="6.5" x2="-15.66" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="54.95" x2="7.05" y2="54.95" width="0.3" layer="1"/>
+<wire x1="36.4" y1="59.95" x2="36.5" y2="60.05" width="0.3" layer="1"/>
+<wire x1="7.05" y1="54.95" x2="12.05" y2="59.95" width="0.3" layer="1"/>
+<wire x1="12.05" y1="59.95" x2="36.4" y2="59.95" width="0.3" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="U$2" pad="P$10"/>
 <contactref element="R15" pad="1"/>
-<wire x1="-44.45" y1="17.78" x2="-17.36" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="65.62" x2="26.79" y2="61.75" width="0.3" layer="1"/>
+<wire x1="26.79" y1="61.75" x2="36.5" y2="61.75" width="0.3" layer="1"/>
 </signal>
 <signal name="N$14">
 <contactref element="R14" pad="1"/>
 <contactref element="U$2" pad="P$9"/>
-<wire x1="-58" y1="55.88" x2="-41.91" y2="17.78" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="65.62" x2="27.68" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38.8" y1="62.6" x2="38.8" y2="61.75" width="0.3" layer="1"/>
+<wire x1="27.68" y1="63.4" x2="38" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38" y1="63.4" x2="38.8" y2="62.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$15">
 <contactref element="R13" pad="1"/>
 <contactref element="U$2" pad="P$1"/>
-<wire x1="-52.92" y1="55.88" x2="-44.45" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="50.38" x2="25.89" y2="53.35" width="0.3" layer="1"/>
+<wire x1="25.89" y1="53.35" x2="36.5" y2="53.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="R11" pad="1"/>
 <contactref element="U$2" pad="P$4"/>
-<wire x1="-37.68" y1="60.96" x2="-36.83" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="50.38" x2="31.76" y2="51.6" width="0.3" layer="1"/>
+<wire x1="41.1" y1="52.4" x2="41.1" y2="53.35" width="0.3" layer="1"/>
+<wire x1="31.76" y1="51.6" x2="40.3" y2="51.6" width="0.3" layer="1"/>
+<wire x1="40.3" y1="51.6" x2="41.1" y2="52.4" width="0.3" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="R9" pad="1"/>
 <contactref element="U$2" pad="P$7"/>
-<wire x1="-47.84" y1="60.96" x2="-36.83" y2="17.78" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="65.62" x2="31.76" y2="64.4" width="0.3" layer="1"/>
+<wire x1="41.1" y1="62.9" x2="41.1" y2="61.75" width="0.3" layer="1"/>
+<wire x1="31.76" y1="64.4" x2="39.6" y2="64.4" width="0.3" layer="1"/>
+<wire x1="39.6" y1="64.4" x2="41.1" y2="62.9" width="0.3" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="R10" pad="1"/>
 <contactref element="U$2" pad="P$6"/>
-<wire x1="-34.29" y1="17.78" x2="-42.76" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="33.08" y1="65.62" x2="41.38" y2="65.62" width="0.3" layer="1"/>
+<wire x1="43.4" y1="63.6" x2="43.4" y2="61.75" width="0.3" layer="1"/>
+<wire x1="41.38" y1="65.62" x2="43.4" y2="63.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$19">
 <contactref element="U$2" pad="P$2"/>
 <contactref element="R12" pad="1"/>
-<wire x1="-47.84" y1="55.88" x2="-41.91" y2="2.54" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="50.38" x2="27.38" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.8" y1="52.6" x2="38.8" y2="53.35" width="0.3" layer="1"/>
+<wire x1="27.38" y1="52.3" x2="38.5" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.5" y1="52.3" x2="38.8" y2="52.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="L1" pad="P$2"/>
 <contactref element="U4" pad="P$2"/>
-<wire x1="-24.65" y1="64.77" x2="-22.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.53" y1="26.25" x2="8.765" y2="25.99" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$4">
 <contactref element="L1" pad="P$1"/>
 <contactref element="U4" pad="P$4"/>
-<wire x1="-26.15" y1="64.77" x2="-21.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.53" y1="24.75" x2="8.765" y2="24.99" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$6">
 <contactref element="J2" pad="1"/>
 <contactref element="U2" pad="P$1"/>
 <contactref element="U2" pad="P$2"/>
 <contactref element="C1" pad="1"/>
-<wire x1="-31.33" y1="55.88" x2="-17.78" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.435" y1="59.61" x2="-31.33" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="59.61" x2="-54.435" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="7.15" y1="8.5" x2="8.42" y2="4.44" width="0" layer="19" extent="1-1"/>
+<wire x1="7.675" y1="10.45" x2="7.15" y2="8.5" width="0" layer="19" extent="1-1"/>
+<wire x1="6.9" y1="10.45" x2="7.675" y2="10.45" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$7">
 <contactref element="C1" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="U2" pad="P$3"/>
-<wire x1="-53.835" y1="59.61" x2="-29.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.73" y1="48.26" x2="-53.835" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="8.275" y1="10.45" x2="8.85" y2="8.5" width="0" layer="19" extent="1-1"/>
+<wire x1="10.1" y1="11.15" x2="8.275" y2="10.45" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$9">
 <contactref element="J2" pad="2"/>
@@ -2181,27 +2299,45 @@ design rules under a new name.</description>
 <contactref element="U4" pad="P$6"/>
 <contactref element="C6" pad="2"/>
 <contactref element="R4" pad="1"/>
-<wire x1="-20.59" y1="67.315" x2="-15.24" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="67.315" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.59" y1="64.765" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-18.63" y1="55.88" x2="-20.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-28.26" y1="48.23" x2="-18.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.98" y1="55.88" x2="-28.26" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-50.48" y1="49.53" x2="-35.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.03" y1="48.26" x2="-50.48" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="24.49" x2="10.96" y2="4.44" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="25.49" x2="11.315" y2="24.49" width="0" layer="19" extent="1-1"/>
+<wire x1="8.765" y1="24.49" x2="11.315" y2="24.49" width="0" layer="19" extent="1-1"/>
+<wire x1="3.4" y1="48.65" x2="8.765" y2="24.49" width="0" layer="19" extent="1-1"/>
+<wire x1="14.33" y1="12.96" x2="3.4" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="10.62" y1="22.18" x2="14.33" y2="12.96" width="0" layer="19" extent="1-1"/>
+<wire x1="12.33" y1="12.48" x2="10.62" y2="22.18" width="0" layer="19" extent="1-1"/>
+<wire x1="10.1" y1="12.85" x2="12.33" y2="12.48" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$11">
 <contactref element="U2" pad="P$5"/>
 <contactref element="R2" pad="2"/>
-<wire x1="-54.435" y1="62.31" x2="-41.06" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="7.675" y1="13.15" x2="8.14" y2="15.16" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$12">
 <contactref element="R3" pad="2"/>
 <contactref element="U3" pad="5"/>
-<wire x1="-49.95" y1="60.96" x2="-30.16" y2="50.83" width="0" layer="19" extent="1-1"/>
+<wire x1="17.05" y1="16.86" x2="16.93" y2="14.86" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PS">
 <contactref element="U4" pad="P$7"/>
+<contactref element="U$1" pad="GPIO15"/>
+<contactref element="R7" pad="2"/>
+<wire x1="19.99" y1="54.95" x2="17.85" y2="54.95" width="0.3" layer="1"/>
+<wire x1="15.04" y1="52.14" x2="15.04" y2="50.38" width="0.3" layer="1"/>
+<wire x1="17.85" y1="54.95" x2="15.04" y2="52.14" width="0.3" layer="1"/>
+<wire x1="11.315" y1="24.99" x2="15.04" y2="50.38" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$20">
+<contactref element="U$1" pad="GPIO0"/>
+<contactref element="R16" pad="2"/>
+<contactref element="J6" pad="2"/>
+<wire x1="19.99" y1="58.95" x2="16.35" y2="58.95" width="0.3" layer="1"/>
+<wire x1="12.9" y1="55.5" x2="12.9" y2="51.8" width="0.3" layer="1"/>
+<wire x1="12.9" y1="51.8" x2="12.9" y2="50.35" width="0.3" layer="1"/>
+<wire x1="16.35" y1="58.95" x2="12.9" y2="55.5" width="0.3" layer="1"/>
+<wire x1="11.06" y1="42.2" x2="12.9" y2="44.04" width="0.3" layer="16"/>
+<wire x1="12.9" y1="44.04" x2="12.9" y2="51.8" width="0.3" layer="16"/>
+<via x="12.9" y="51.8" extent="1-16" drill="0.35" diameter="0.6"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
@@ -2220,6 +2356,11 @@ of those online libraries will not be understood (or retained)
 with this version.
 </note>
 <note version="8.3" severity="warning">
+Since Version 8.3, EAGLE supports Fusion synchronisation.
+This feature will not be available in this version and saving
+the document will break the link to the Fusion PCB feature.
+</note>
+<note version="8.3" severity="warning">
 Since Version 8.3, EAGLE supports URNs for individual library
 assets (packages, symbols, and devices). The URNs of those assets
 will not be understood (or retained) with this version.
diff --git a/esp8266-wifi-remote.brd b/esp8266-wifi-remote.brd
index fd88b7d..ba7d45b 100644
--- a/esp8266-wifi-remote.brd
+++ b/esp8266-wifi-remote.brd
@@ -3,10 +3,10 @@
 <eagle version="9.3.2">
 <drawing>
 <settings>
-<setting alwaysvectorfont="no"/>
+<setting alwaysvectorfont="yes"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.05" altunitdist="mm" altunit="mm"/>
+<grid distance="0.1" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.05" altunitdist="mm" altunit="mm"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="16" fill="1" visible="no" active="no"/>
@@ -157,14 +157,20 @@
 <layer number="255" name="routoute" color="7" fill="1" visible="no" active="yes"/>
 </layers>
 <board>
-<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="1b573db7-ea5e-6f0b-fd8c-026be2f409d2"/>
+<fusionsync huburn="a.cGVyc29uYWw6dWUyOTE1ZmZl" projecturn="a.cGVyc29uYWw6dWUyOTE1ZmZlIzIwMTkwNDE4MTg5MjM2ODUx" f3durn="urn:adsk.wipprod:dm.lineage:mkQEpJi1Qm29qzs5mGLnmw" pcbguid="46b71d2e-9862-4f54-9165-cbcdfc420ec5" lastpulledtime="" lastsyncedchangeguid="7a3fd8f2-94b2-1e35-e256-3e50afa3472c"/>
 <plain>
-<wire x1="0" y1="0" x2="41" y2="0" width="0" layer="20"/>
-<wire x1="41" y1="0" x2="41" y2="60" width="0" layer="20"/>
-<wire x1="41" y1="60" x2="0" y2="60" width="0" layer="20"/>
-<wire x1="0" y1="60" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="0" x2="56" y2="0" width="0" layer="20"/>
+<wire x1="56" y1="0" x2="56" y2="68" width="0" layer="20"/>
+<wire x1="56" y1="68" x2="0" y2="68" width="0" layer="20"/>
+<wire x1="0" y1="68" x2="0" y2="0" width="0" layer="20"/>
 <hole x="3" y="3" drill="3.2"/>
-<hole x="38" y="57" drill="3.2"/>
+<hole x="53" y="3" drill="3.2"/>
+<hole x="53" y="65" drill="3.2"/>
+<text x="12.8" y="3.6" size="1.778" layer="21">BAT</text>
+<text x="10.3" y="0.9" size="1.778" layer="21">+</text>
+<text x="8" y="1" size="1.778" layer="21">-</text>
+<text x="9" y="38.4" size="1.778" layer="21">BOOT</text>
+<text x="3.3" y="34" size="1.778" layer="21" rot="R90" align="bottom-right">RST</text>
 </plain>
 <libraries>
 <library name="rcl" urn="urn:adsk.eagle:library:334">
@@ -1560,7 +1566,7 @@ CONN_02
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -1589,7 +1595,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -1845,152 +1851,127 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-30.48" y="55.88" smashed="yes">
-<attribute name="NAME" x="-31.115" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-31.115" y="53.975" size="1.27" layer="27"/>
+<element name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="8" y="8.5" smashed="yes">
+<attribute name="NAME" x="3.965" y="7.935" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="38.48" y="-47.38" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-44.45" y="49.53" smashed="yes">
-<attribute name="NAME" x="-45.72" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-45.72" y="46.99" size="1.27" layer="27"/>
+<element name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="17.25" y="10.15" smashed="yes" rot="R270">
+<attribute name="NAME" x="16.1" y="6.4" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="-32.28" y="-34.3" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="-49.53" y="49.53" smashed="yes">
-<attribute name="NAME" x="-50.8" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-50.8" y="46.99" size="1.27" layer="27"/>
+<element name="C3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u" x="13.39" y="10.65" smashed="yes">
+<attribute name="NAME" x="14.32" y="9.32" size="1.27" layer="25" rot="R180"/>
+<attribute name="SPICEPREFIX" value="C" x="62.92" y="-38.88" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-34.29" y="49.53" smashed="yes">
-<attribute name="NAME" x="-35.56" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-35.56" y="46.99" size="1.27" layer="27"/>
+<element name="C4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.11" y="30.44" smashed="yes">
+<attribute name="NAME" x="11.62" y="26.5" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="43.4" y="-19.09" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="-39.37" y="49.53" smashed="yes">
-<attribute name="NAME" x="-40.64" y="50.8" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-40.64" y="46.99" size="1.27" layer="27"/>
+<element name="C5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="10u" x="9.12" y="28.38" smashed="yes">
+<attribute name="NAME" x="11.43" y="31.41" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="C" x="48.49" y="-21.15" size="1.778" layer="27" display="off"/>
 </element>
-<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="-36.83" y="55.88" smashed="yes">
-<attribute name="NAME" x="-37.465" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="C" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="53.975" size="1.27" layer="27"/>
+<element name="C6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n" x="9.33" y="22.82" smashed="yes" rot="R180">
+<attribute name="NAME" x="7.565" y="23.385" size="1.27" layer="25" rot="R180"/>
+<attribute name="SPICEPREFIX" value="C" x="-27.5" y="78.7" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="17.26" y="1.97" smashed="yes">
-<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="51.55" y="-31.05" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="51.55" y="-31.05" size="1.778" layer="27" display="off"/>
-<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="51.55" y="-31.05" size="1.778" layer="27" display="off"/>
-<attribute name="MF" value="Molex" x="51.55" y="-31.05" size="1.778" layer="27" display="off"/>
-<attribute name="MP" value="1050170001" x="51.55" y="-31.05" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="12.94973125" y="5.61023125" size="1.27008125" layer="25"/>
-<attribute name="PACKAGE" value="None" x="51.55" y="-31.05" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="12.9473" y="-2.28266875" size="1.2708" layer="27"/>
+<element name="J1" library="usb-dvi-hdmi-connectors" library_urn="urn:adsk.eagle:library:10491909" package="MOLEX_1050170001" package3d_urn="urn:adsk.eagle:package:10491912/2" value="1050170001" x="27.91" y="1.82" smashed="yes">
+<attribute name="DESCRIPTION" value=" Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free " x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PART_NUMBER" value="WM1399CT-ND" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="DIGI-KEY_PURCHASE_URL" value="https://www.digikey.se/product-detail/en/molex/1050170001/WM1399CT-ND/2350885?utm_source=snapeda&amp;utm_medium=aggregator&amp;utm_campaign=symbol" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="Molex" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="MP" value="1050170001" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="NAME" x="23.59973125" y="5.46023125" size="1.27008125" layer="25"/>
+<attribute name="PACKAGE" value="None" x="62.2" y="-31.2" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="23.5973" y="-2.43266875" size="1.2708" layer="27"/>
 </element>
-<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="-17.78" y="66.04" smashed="yes">
-<attribute name="NAME" x="-19.05" y="67.437" size="0.6096" layer="25" font="vector" ratio="20"/>
-<attribute name="VALUE" x="-19.05" y="64.008" size="0.6096" layer="27" font="vector" ratio="20"/>
+<element name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="8.42" y="4.44" smashed="yes">
+<attribute name="NAME" x="5.75" y="4.237" size="0.6096" layer="25" font="vector" ratio="20"/>
+<attribute name="VALUE" x="7.15" y="2.408" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="6" smashed="yes"/>
-<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="32" smashed="yes" rot="R180"/>
-<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="-25.6" y="65.23" smashed="yes" rot="R180"/>
-<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="-55.88" y="48.26" smashed="yes">
-<attribute name="NAME" x="-56.515" y="48.895" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-56.515" y="46.355" size="1.27" layer="27"/>
+<element name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="12" smashed="yes"/>
+<element name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" package="ELAB_PUSHBUTTON_1" package3d_urn="urn:adsk.eagle:package:10495489/3" value="ELAB_PUSHBUTTON_1" x="28" y="40" smashed="yes" rot="R180"/>
+<element name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" package="0806(2016-METRIC)" package3d_urn="urn:adsk.eagle:package:10481001/1" value="MAKK2016T1R5M" x="6.53" y="25.5" smashed="yes" rot="R90"/>
+<element name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R" x="10.1" y="12" smashed="yes" rot="R90">
+<attribute name="NAME" x="10.665" y="13.765" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="58.36" y="67.88" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="55.88" smashed="yes">
-<attribute name="NAME" x="-42.545" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="53.975" size="1.27" layer="27"/>
+<element name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="43.4" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="43.965" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-12.48" y="18.99" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-36.83" y="60.96" smashed="yes">
-<attribute name="NAME" x="-37.465" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-37.465" y="59.055" size="1.27" layer="27"/>
+<element name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="41.765" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="102.06" y="91.03" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="55.88" smashed="yes">
-<attribute name="NAME" x="-47.625" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="53.975" size="1.27" layer="27"/>
+<element name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="39.465" y="55.865" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="94.68" y="101.19" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-52.07" y="55.88" smashed="yes">
-<attribute name="NAME" x="-52.705" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-52.705" y="53.975" size="1.27" layer="27"/>
+<element name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="54.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="37.165" y="55.965" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="92.38" y="106.27" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-57.15" y="55.88" smashed="yes">
-<attribute name="NAME" x="-57.785" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.785" y="53.975" size="1.27" layer="27"/>
+<element name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="38.8" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="39.365" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-17.08" y="3.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-16.51" y="60.96" smashed="yes">
-<attribute name="NAME" x="-17.145" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-17.145" y="59.055" size="1.27" layer="27"/>
+<element name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="36.5" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="37.065" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-24.46" y="44.39" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-41.91" y="60.96" smashed="yes">
-<attribute name="NAME" x="-42.545" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-42.545" y="59.055" size="1.27" layer="27"/>
+<element name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7" x="7.29" y="15.16" smashed="yes">
+<attribute name="NAME" x="6.655" y="15.795" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="49.2" y="-45.8" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="-50.8" y="60.96" smashed="yes">
-<attribute name="NAME" x="-51.435" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-51.435" y="59.055" size="1.27" layer="27"/>
+<element name="R3" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K" x="16.2" y="16.86" smashed="yes">
+<attribute name="NAME" x="15.065" y="18.195" size="1.27" layer="25"/>
+<attribute name="SPICEPREFIX" value="R" x="67" y="-44.1" size="1.778" layer="27" display="off"/>
 </element>
-<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="-17.78" y="55.88" smashed="yes">
-<attribute name="NAME" x="-18.415" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-18.415" y="53.975" size="1.27" layer="27"/>
+<element name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K" x="3.4" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="3.965" y="45.565" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="59.28" y="67.28" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="-24.13" y="55.88" smashed="yes">
-<attribute name="NAME" x="-24.765" y="56.515" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-24.765" y="53.975" size="1.27" layer="27"/>
+<element name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K" x="1.3" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="1.865" y="45.365" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="57.18" y="73.63" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-21.59" y="60.96" smashed="yes">
-<attribute name="NAME" x="-22.225" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-22.225" y="59.055" size="1.27" layer="27"/>
+<element name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="10.8" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="10.3" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-50.16" y="27.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-26.67" y="60.96" smashed="yes">
-<attribute name="NAME" x="-27.305" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-27.305" y="59.055" size="1.27" layer="27"/>
+<element name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="15.04" y="49.53" smashed="yes" rot="R90">
+<attribute name="NAME" x="14.5" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="76" y="76.2" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-31.75" y="60.96" smashed="yes">
-<attribute name="NAME" x="-32.385" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-32.385" y="59.055" size="1.27" layer="27"/>
+<element name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="8.7" y="49.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="8.2" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="-52.26" y="17.75" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="-46.99" y="60.96" smashed="yes">
-<attribute name="NAME" x="-47.625" y="61.595" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="0" y="0" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-47.625" y="59.055" size="1.27" layer="27"/>
+<element name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330" x="41.1" y="60.9" smashed="yes" rot="R270">
+<attribute name="NAME" x="41.665" y="62.465" size="1.27" layer="25" rot="R90"/>
+<attribute name="SPICEPREFIX" value="R" x="-19.86" y="13.91" size="1.778" layer="27" rot="R270" display="off"/>
 </element>
-<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="10.64" y="50.2" smashed="yes">
-<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="2.64" y="63.2" size="1.27" layer="25"/>
-<attribute name="PINS" value="16" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="PITCH" value="0.078&quot; / 2 mm" x="33.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="2.64" y="39.1" size="1.27" layer="27"/>
+<element name="U$1" library="esp8266modules" library_urn="urn:adsk.eagle:library:10278406" package="ESP07-16PIN" package3d_urn="urn:adsk.eagle:package:10278493/2" value="ESP07-16PIN" x="11.79" y="61.15" smashed="yes">
+<attribute name="DIMENSIONS" value="22.0 x 16.0 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PINS" value="16" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="PITCH" value="0.078&quot; / 2 mm" x="34.65" y="48.45" size="1.778" layer="27" display="off"/>
+<attribute name="VALUE" x="6.69" y="60.25" size="1.27" layer="27"/>
 </element>
-<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="48" smashed="yes"/>
-<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="-54.61" y="60.96" smashed="yes"/>
-<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="-29.21" y="49.53" smashed="yes">
-<attribute name="NAME" x="-31.115" y="51.435" size="1.27" layer="25"/>
-<attribute name="VALUE" x="-31.115" y="46.101" size="1.27" layer="27"/>
+<element name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" package="DIP-10-WIDE" package3d_urn="urn:adsk.eagle:package:10512212/1" value="NKR161" x="28" y="58" smashed="yes"/>
+<element name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" package="U-DFN2030-6(TYPE-C)" package3d_urn="urn:adsk.eagle:package:10291255/2" value="AP9211SA-AD-HAC-7" x="7.5" y="11.8" smashed="yes"/>
+<element name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" package="SOT23-5L" package3d_urn="urn:adsk.eagle:package:10292859/2" value="MCP73812T-420I/OT" x="15.63" y="13.91" smashed="yes" rot="R270">
+<attribute name="NAME" x="18.035" y="15.015" size="1.27" layer="25" rot="R270"/>
 </element>
-<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="-21.59" y="66.04" smashed="yes"/>
-<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="-56" y="-2" smashed="yes"/>
-<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="-57" y="-6" smashed="yes">
-<attribute name="NAME" x="-57.635" y="-5.365" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="-57" y="-6" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.635" y="-7.905" size="1.27" layer="27"/>
+<element name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" package="10-WFDFN-EP" package3d_urn="urn:adsk.eagle:package:10476608/3" value="TPS63031DSKR" x="10.04" y="25.49" smashed="yes" rot="R270"/>
+<element name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" package="3X4X2_MOMENTARY_SWITCH" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN" x="2.7" y="36.8" smashed="yes" rot="R90"/>
+<element name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K" x="12.9" y="49.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="12.4" y="47.8" size="1.27" layer="25" rot="R270"/>
+<attribute name="SPICEPREFIX" value="R" x="12.9" y="49.5" size="1.778" layer="27" rot="R90" display="off"/>
 </element>
-<element name="R17" library="rcl" library_urn="urn:adsk.eagle:library:334" package="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="0" x="-57" y="-11" smashed="yes">
-<attribute name="NAME" x="-57.635" y="-10.365" size="1.27" layer="25"/>
-<attribute name="SPICEPREFIX" value="R" x="-57" y="-11" size="1.778" layer="27" display="off"/>
-<attribute name="VALUE" x="-57.635" y="-12.905" size="1.27" layer="27"/>
+<element name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" package="1X02" package3d_urn="urn:adsk.eagle:package:38039/1" value="" x="13.6" y="42.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="14.87" y="40.803" size="0.6096" layer="25" font="vector" ratio="20" rot="R180"/>
+<attribute name="VALUE" x="14.87" y="44.232" size="0.6096" layer="27" font="vector" ratio="20" rot="R180"/>
 </element>
 </elements>
 <signals>
@@ -1998,8 +1979,6 @@ design rules under a new name.</description>
 <contactref element="U$1" pad="VCC"/>
 <contactref element="R6" pad="2"/>
 <contactref element="R8" pad="2"/>
-<contactref element="J4" pad="P$2"/>
-<contactref element="J4" pad="P$3"/>
 <contactref element="J3" pad="P$2"/>
 <contactref element="J3" pad="P$3"/>
 <contactref element="U4" pad="P$1"/>
@@ -2007,17 +1986,29 @@ design rules under a new name.</description>
 <contactref element="C5" pad="1"/>
 <contactref element="C4" pad="1"/>
 <contactref element="R16" pad="1"/>
-<wire x1="25.5" y1="28.2" x2="25.5" y2="35.8" width="0" layer="19" extent="1-1"/>
-<wire x1="30.5" y1="9.8" x2="25.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="30.5" y1="2.2" x2="30.5" y2="9.8" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="42.095" x2="25.5" y2="35.8" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.74" y1="60.96" x2="2.44" y2="42.095" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="64.765" x2="-20.74" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.59" y1="67.315" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-30.9" y1="60.96" x2="-22.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.24" y1="49.53" x2="-30.9" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-40.32" y1="49.53" x2="-35.24" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-57.85" y1="-6" x2="-40.32" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="53.045" x2="4.455" y2="53.045" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.8" x2="8.7" y2="48.65" width="0.3" layer="1"/>
+<wire x1="4.455" y1="53.045" x2="8.7" y2="48.8" width="0.3" layer="1"/>
+<wire x1="8.7" y1="48.65" x2="12.9" y2="48.65" width="0.3" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.1" y="26.4"/>
+<vertex x="8.38" y="26.4"/>
+<vertex x="7.52" y="27.26"/>
+<vertex x="7.52" y="31.2"/>
+<vertex x="8.8" y="31.2"/>
+<vertex x="8.82" y="31.18"/>
+<vertex x="8.82" y="26.98"/>
+<vertex x="9.1" y="26.7"/>
+</polygon>
+<wire x1="8.7" y1="48.65" x2="8.7" y2="32.04" width="0.3" layer="1"/>
+<wire x1="8.7" y1="32.04" x2="8.7" y2="30.98" width="0.3" layer="1"/>
+<wire x1="8.7" y1="30.98" x2="8.16" y2="30.44" width="0.3" layer="1"/>
+<wire x1="11.315" y1="26.49" x2="11.315" y2="31.525" width="0.3" layer="1"/>
+<wire x1="10.8" y1="32.04" x2="8.7" y2="32.04" width="0.3" layer="1"/>
+<wire x1="11.315" y1="31.525" x2="10.8" y2="32.04" width="0.3" layer="1"/>
+<wire x1="12.9" y1="48.65" x2="10.8" y2="48.65" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="15.8" x2="11.315" y2="26.49" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="8.2" x2="30.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="GND">
 <contactref element="J1" pad="SH1"/>
@@ -2048,181 +2039,317 @@ design rules under a new name.</description>
 <contactref element="C3" pad="2"/>
 <contactref element="R5" pad="1"/>
 <contactref element="J5" pad="P$1"/>
-<contactref element="R17" pad="2"/>
-<wire x1="28" y1="40.38" x2="28" y2="55.62" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="42.095" x2="28" y2="40.38" width="0" layer="19" extent="1-1"/>
-<wire x1="-24.98" y1="55.88" x2="18.84" y2="42.095" width="0" layer="19" extent="1-1"/>
-<wire x1="-27.52" y1="60.96" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="64.765" x2="-27.52" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="66.04" x2="-21.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.09" y1="67.315" x2="-21.59" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.21" y1="48.23" x2="-24.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.34" y1="49.53" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-38.42" y1="49.53" x2="-33.34" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-43.5" y1="49.53" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-48.58" y1="49.53" x2="-43.5" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-37.68" y1="55.88" x2="-38.42" y2="49.53" width="0" layer="19" extent="1-1"/>
-<wire x1="-42.76" y1="60.96" x2="-37.68" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-51.65" y1="60.96" x2="-42.76" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.61" y1="60.96" x2="-51.65" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="62.31" x2="-54.61" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="19.76" y1="4.32" x2="-29.21" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="18.56" y1="4.32" x2="19.76" y2="4.32" width="0" layer="19" extent="1-1"/>
-<wire x1="18.26" y1="1.62" x2="18.56" y2="4.32" width="0" layer="19" extent="1-1"/>
-<wire x1="20.16" y1="1.62" x2="18.26" y2="1.62" width="0" layer="19" extent="1-1"/>
-<wire x1="20.76" y1="1.62" x2="20.16" y2="1.62" width="0" layer="19" extent="1-1"/>
-<wire x1="18.26" y1="1.62" x2="16.26" y2="1.62" width="0" layer="19" extent="1-1"/>
-<wire x1="14.36" y1="1.62" x2="16.26" y2="1.62" width="0" layer="19" extent="1-1"/>
-<wire x1="13.76" y1="1.62" x2="14.36" y2="1.62" width="0" layer="19" extent="1-1"/>
-<wire x1="14.76" y1="4.32" x2="14.36" y2="1.62" width="0" layer="19" extent="1-1"/>
-<wire x1="-57.375" y1="-2" x2="13.76" y2="1.62" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.15" y1="-11" x2="-57.375" y2="-2" width="0" layer="19" extent="1-1"/>
+<contactref element="J6" pad="1"/>
+<contactref element="J4" pad="P$1"/>
+<contactref element="J4" pad="P$4"/>
+<wire x1="8.765" y1="25.49" x2="10" y2="25.49" width="0.2" layer="1"/>
+<wire x1="10" y1="25.49" x2="10.04" y2="25.49" width="0.2" layer="1"/>
+<wire x1="11.315" y1="25.99" x2="10.5" y2="25.99" width="0.2" layer="1"/>
+<wire x1="10.5" y1="25.99" x2="10" y2="25.49" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.5" y="31.14"/>
+<vertex x="9.5" y="21.98"/>
+<vertex x="10.58" y="21.98"/>
+<vertex x="10.58" y="31.14"/>
+</polygon>
+<polygon width="0.3" layer="1" rank="2">
+<vertex x="0" y="0"/>
+<vertex x="0" y="68"/>
+<vertex x="56" y="68"/>
+<vertex x="56" y="0"/>
+</polygon>
+<polygon width="0.3" layer="16" rank="2">
+<vertex x="0" y="0"/>
+<vertex x="0" y="68"/>
+<vertex x="56" y="68"/>
+<vertex x="56" y="0"/>
+</polygon>
 </signal>
 <signal name="+5V">
 <contactref element="J1" pad="1"/>
 <contactref element="C2" pad="1"/>
 <contactref element="U3" pad="1"/>
 <contactref element="U3" pad="4"/>
-<wire x1="-30.16" y1="48.23" x2="-28.26" y2="50.83" width="0" layer="19" extent="1-1"/>
-<wire x1="15.96" y1="4.32" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-45.4" y1="49.53" x2="-30.16" y2="48.23" width="0" layer="19" extent="1-1"/>
+<wire x1="16.93" y1="12.96" x2="16.72" y2="12.96" width="0.3" layer="1"/>
+<wire x1="16.93" y1="12.96" x2="17" y2="12.89" width="0.3" layer="1"/>
+<wire x1="26.61" y1="4.17" x2="26.61" y2="5.45" width="0.4" layer="1"/>
+<wire x1="17" y1="10.82" x2="17.25" y2="11.1" width="0.4" layer="1"/>
+<wire x1="26.61" y1="5.45" x2="25.76" y2="6.3" width="0.4" layer="1"/>
+<wire x1="25.76" y1="6.3" x2="22.42" y2="6.3" width="0.4" layer="1"/>
+<wire x1="22.42" y1="6.3" x2="17.62" y2="11.1" width="0.4" layer="1"/>
+<wire x1="17.62" y1="11.1" x2="17.25" y2="11.1" width="0.4" layer="1"/>
+<wire x1="16.93" y1="12.96" x2="16.93" y2="11.42" width="0.4" layer="1"/>
+<wire x1="16.93" y1="11.42" x2="17.25" y2="11.1" width="0.4" layer="1"/>
+<wire x1="14.33" y1="14.86" x2="15.64" y2="14.86" width="0.2" layer="1"/>
+<wire x1="16.93" y1="13.57" x2="16.93" y2="12.96" width="0.2" layer="1"/>
+<wire x1="15.64" y1="14.86" x2="16.93" y2="13.57" width="0.2" layer="1"/>
 </signal>
 <signal name="UART_RX">
 <contactref element="J1" pad="2"/>
 <contactref element="U$1" pad="RX"/>
 <contactref element="R9" pad="2"/>
-<wire x1="16.61" y1="4.32" x2="-46.14" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="54" x2="16.61" y2="4.32" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="64.95" x2="20.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="20.75" y1="64.95" x2="21.7" y2="64" width="0.3" layer="1"/>
+<wire x1="21.7" y1="64" x2="22.9" y2="64" width="0.3" layer="1"/>
+<via x="22.9" y="64" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="22.9" y1="64" x2="41.5" y2="64" width="0.3" layer="16"/>
+<wire x1="41.5" y1="64" x2="44.8" y2="60.7" width="0.3" layer="16"/>
+<wire x1="44.8" y1="60.7" x2="44.8" y2="58.4" width="0.3" layer="16"/>
+<wire x1="44.8" y1="58.4" x2="44.7" y2="58.3" width="0.3" layer="16"/>
+<via x="44.7" y="58.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="44.7" y1="58.3" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="60.05" width="0.3" layer="1"/>
+<wire x1="43.9" y1="57.5" x2="42.2" y2="57.5" width="0.3" layer="1"/>
+<wire x1="42.2" y1="57.5" x2="41.1" y2="58.6" width="0.3" layer="1"/>
+<wire x1="27.26" y1="4.17" x2="27.26" y2="5.3" width="0.3" layer="1"/>
+<wire x1="27.26" y1="5.3" x2="28.3" y2="6.34" width="0.3" layer="1"/>
+<wire x1="28.3" y1="6.34" x2="33.26" y2="6.34" width="0.3" layer="1"/>
+<wire x1="33.26" y1="6.34" x2="38.28" y2="11.36" width="0.3" layer="1"/>
+<wire x1="38.28" y1="11.36" x2="38.28" y2="49.34" width="0.3" layer="1"/>
+<wire x1="38.28" y1="49.34" x2="38.28" y2="50.22" width="0.3" layer="1"/>
+<wire x1="38.28" y1="50.22" x2="38.82" y2="50.76" width="0.3" layer="1"/>
+<wire x1="38.82" y1="50.76" x2="41.76" y2="50.76" width="0.3" layer="1"/>
+<wire x1="43.9" y1="52.9" x2="43.9" y2="57.5" width="0.3" layer="1"/>
+<wire x1="41.76" y1="50.76" x2="43.9" y2="52.9" width="0.3" layer="1"/>
 </signal>
 <signal name="UART_TX">
 <contactref element="J1" pad="3"/>
 <contactref element="U$1" pad="TX"/>
 <contactref element="R12" pad="2"/>
-<wire x1="17.26" y1="4.32" x2="-46.14" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="56" x2="17.26" y2="4.32" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="66.95" x2="18.25" y2="66.95" width="0.3" layer="1"/>
+<wire x1="18.25" y1="66.95" x2="17.7" y2="66.4" width="0.3" layer="1"/>
+<wire x1="17.7" y1="66.4" x2="17.7" y2="61" width="0.3" layer="1"/>
+<via x="17.7" y="61" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.7" y1="61" x2="32.9" y2="61" width="0.3" layer="16"/>
+<wire x1="32.9" y1="61" x2="35" y2="58.9" width="0.3" layer="16"/>
+<via x="35" y="58.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="35" y1="58.9" x2="36.5" y2="57.4" width="0.3" layer="1"/>
+<wire x1="36.5" y1="57.4" x2="38" y2="57.4" width="0.3" layer="1"/>
+<wire x1="38" y1="57.4" x2="38.7" y2="56.7" width="0.3" layer="1"/>
+<wire x1="38.7" y1="55.15" x2="38.8" y2="55.05" width="0.3" layer="1"/>
+<wire x1="38.7" y1="56.7" x2="38.7" y2="55.15" width="0.3" layer="1"/>
+<wire x1="27.91" y1="4.17" x2="27.91" y2="5.11" width="0.3" layer="1"/>
+<wire x1="27.91" y1="5.11" x2="28.56" y2="5.76" width="0.3" layer="1"/>
+<wire x1="28.56" y1="5.76" x2="33.44" y2="5.76" width="0.3" layer="1"/>
+<wire x1="39.22" y1="49.82" x2="39.14" y2="49.9" width="0.3" layer="1"/>
+<wire x1="39.22" y1="49.82" x2="39.22" y2="11.54" width="0.3" layer="1"/>
+<via x="39.14" y="49.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="39.1" y1="56.3" x2="39.1" y2="49.94" width="0.3" layer="16"/>
+<wire x1="39.14" y1="49.9" x2="39.1" y2="49.94" width="0.3" layer="16"/>
+<wire x1="39.1" y1="56.3" x2="38.7" y2="56.7" width="0.3" layer="16"/>
+<via x="38.7" y="56.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="33.44" y1="5.76" x2="39.22" y2="11.54" width="0.3" layer="1"/>
 </signal>
 <signal name="VBAT_D">
 <contactref element="U$1" pad="ADC"/>
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
-<wire x1="-23.28" y1="55.88" x2="-16.93" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="2.44" y1="54" x2="-23.28" y2="55.88" width="0" layer="19" extent="1-1"/>
+<contactref element="J4" pad="P$2"/>
+<contactref element="J4" pad="P$3"/>
+<wire x1="3.4" y1="50.35" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="1.6" y1="50.35" x2="1.3" y2="50.35" width="0.3" layer="1"/>
+<wire x1="3.59" y1="64.95" x2="2.75" y2="64.95" width="0.3" layer="1"/>
+<wire x1="1.2" y1="50.75" x2="1.6" y2="50.35" width="0.3" layer="1"/>
+<wire x1="2.75" y1="64.95" x2="1.2" y2="63.4" width="0.3" layer="1"/>
+<wire x1="1.2" y1="63.4" x2="1.2" y2="50.75" width="0.3" layer="1"/>
+<wire x1="25.5" y1="36.2" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.4" y1="50.35" x2="25.5" y2="43.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RST">
 <contactref element="U$1" pad="REST"/>
 <contactref element="U$1" pad="GPIO16"/>
 <contactref element="R6" pad="1"/>
 <contactref element="J5" pad="P$2"/>
-<wire x1="2.44" y1="50" x2="2.44" y2="56" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.44" y1="60.96" x2="2.44" y2="56" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.625" y1="-2" x2="-22.44" y2="60.96" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$1">
-<contactref element="U$1" pad="GPIO15"/>
-<contactref element="R7" pad="2"/>
-<contactref element="J4" pad="P$1"/>
-<contactref element="J4" pad="P$4"/>
-<wire x1="30.5" y1="28.2" x2="-25.82" y2="60.96" width="0" layer="19" extent="1-1"/>
-<wire x1="30.5" y1="35.8" x2="30.5" y2="28.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="44" x2="30.5" y2="35.8" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="66.95" x2="6.55" y2="66.95" width="0.3" layer="1"/>
+<wire x1="6.55" y1="66.95" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<via x="6.7" y="66.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="6.7" y1="66.8" x2="6.7" y2="55.9" width="0.3" layer="16"/>
+<wire x1="10.7" y1="51.9" x2="10.8" y2="51.9" width="0.3" layer="16"/>
+<via x="10.8" y="51.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="50.35" width="0.3" layer="1"/>
+<wire x1="6.7" y1="55.9" x2="10.7" y2="51.9" width="0.3" layer="16"/>
+<wire x1="3.59" y1="60.95" x2="5.25" y2="60.95" width="0.3" layer="1"/>
+<wire x1="5.25" y1="60.95" x2="6.7" y2="62.4" width="0.3" layer="1"/>
+<wire x1="6.7" y1="62.4" x2="6.7" y2="66.8" width="0.3" layer="1"/>
+<wire x1="10.8" y1="51.9" x2="10.8" y2="47.7" width="0.3" layer="16"/>
+<wire x1="10.8" y1="47.7" x2="2.7" y2="39.6" width="0.3" layer="16"/>
+<via x="2.7" y="39.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="2.7" y1="39.6" x2="2.7" y2="38.175" width="0.3" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="R8" pad="1"/>
 <contactref element="U$1" pad="CH_PD"/>
-<wire x1="2.44" y1="52" x2="-32.6" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="62.95" x2="5.55" y2="62.95" width="0.3" layer="1"/>
+<wire x1="5.55" y1="62.95" x2="5.6" y2="62.9" width="0.3" layer="1"/>
+<via x="5.6" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="5.6" y1="62.9" x2="5.6" y2="54.7" width="0.3" layer="16"/>
+<wire x1="5.6" y1="54.7" x2="8.7" y2="51.6" width="0.3" layer="16"/>
+<via x="8.7" y="51.6" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="8.7" y1="51.6" x2="8.7" y2="50.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$5">
 <contactref element="U$1" pad="GPIO2"/>
 <contactref element="J3" pad="P$1"/>
 <contactref element="J3" pad="P$4"/>
-<wire x1="25.5" y1="9.8" x2="25.5" y2="2.2" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="46" x2="25.5" y2="9.8" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="15.8" x2="19.99" y2="56.95" width="0" layer="19" extent="1-1"/>
+<wire x1="25.5" y1="8.2" x2="25.5" y2="15.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="U$1" pad="GPIO4"/>
 <contactref element="R10" pad="2"/>
-<wire x1="18.84" y1="52" x2="-41.06" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="62.95" x2="24.25" y2="62.95" width="0.3" layer="1"/>
+<wire x1="24.25" y1="62.95" x2="24.3" y2="62.9" width="0.3" layer="1"/>
+<via x="24.3" y="62.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="24.3" y1="62.9" x2="40.8" y2="62.9" width="0.3" layer="16"/>
+<wire x1="40.8" y1="62.9" x2="43.4" y2="60.3" width="0.3" layer="16"/>
+<wire x1="43.4" y1="60.3" x2="43.4" y2="58.8" width="0.3" layer="16"/>
+<via x="43.4" y="58.8" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="43.4" y1="58.8" x2="43.4" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="U$1" pad="GPIO5"/>
 <contactref element="R11" pad="2"/>
-<wire x1="18.84" y1="50" x2="-35.98" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="19.99" y1="60.95" x2="34.65" y2="60.95" width="0.3" layer="1"/>
+<wire x1="34.65" y1="60.95" x2="34.7" y2="60.9" width="0.3" layer="1"/>
+<via x="34.7" y="60.9" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="34.7" y1="60.9" x2="38.8" y2="60.9" width="0.3" layer="16"/>
+<wire x1="38.8" y1="60.9" x2="41.1" y2="58.6" width="0.3" layer="16"/>
+<wire x1="41.1" y1="58.6" x2="41.1" y2="56.3" width="0.3" layer="16"/>
+<via x="41.1" y="56.3" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="41.1" y1="56.3" x2="41.1" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_E">
 <contactref element="U$1" pad="GPIO14"/>
 <contactref element="R13" pad="2"/>
-<wire x1="-51.22" y1="55.88" x2="2.44" y2="48" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="58.95" x2="6.85" y2="58.95" width="0.3" layer="1"/>
+<wire x1="6.85" y1="58.95" x2="7.4" y2="58.4" width="0.3" layer="1"/>
+<via x="7.4" y="58.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="7.4" y1="58.4" x2="9.4" y2="56.4" width="0.3" layer="16"/>
+<wire x1="9.4" y1="56.4" x2="36.4" y2="56.4" width="0.3" layer="16"/>
+<via x="36.4" y="56.4" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="36.4" y1="56.4" x2="36.5" y2="56.3" width="0.3" layer="1"/>
+<wire x1="36.5" y1="56.3" x2="36.5" y2="55.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_F">
 <contactref element="U$1" pad="GPIO12"/>
 <contactref element="R14" pad="2"/>
-<wire x1="-56.3" y1="55.88" x2="2.44" y2="46" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="56.95" x2="7.45" y2="56.95" width="0.3" layer="1"/>
+<wire x1="7.45" y1="56.95" x2="9.2" y2="58.7" width="0.3" layer="1"/>
+<via x="9.2" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38" y1="57.9" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="9.2" y1="58.7" x2="10" y2="57.9" width="0.3" layer="16"/>
+<wire x1="38" y1="57.9" x2="38.8" y2="58.7" width="0.3" layer="16"/>
+<via x="38.8" y="58.7" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="38.8" y1="58.7" x2="38.8" y2="60.05" width="0.3" layer="1"/>
 </signal>
 <signal name="SEG_G">
 <contactref element="U$1" pad="GPIO13"/>
 <contactref element="R15" pad="2"/>
-<wire x1="2.44" y1="44" x2="-15.66" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="3.59" y1="54.95" x2="7.05" y2="54.95" width="0.3" layer="1"/>
+<wire x1="36.4" y1="59.95" x2="36.5" y2="60.05" width="0.3" layer="1"/>
+<wire x1="7.05" y1="54.95" x2="12.05" y2="59.95" width="0.3" layer="1"/>
+<wire x1="12.05" y1="59.95" x2="36.4" y2="59.95" width="0.3" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="U$2" pad="P$10"/>
 <contactref element="R15" pad="1"/>
-<wire x1="22.92" y1="55.62" x2="-17.36" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="65.62" x2="26.79" y2="61.75" width="0.3" layer="1"/>
+<wire x1="26.79" y1="61.75" x2="36.5" y2="61.75" width="0.3" layer="1"/>
 </signal>
 <signal name="N$14">
 <contactref element="R14" pad="1"/>
 <contactref element="U$2" pad="P$9"/>
-<wire x1="-58" y1="55.88" x2="25.46" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="65.62" x2="27.68" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38.8" y1="62.6" x2="38.8" y2="61.75" width="0.3" layer="1"/>
+<wire x1="27.68" y1="63.4" x2="38" y2="63.4" width="0.3" layer="1"/>
+<wire x1="38" y1="63.4" x2="38.8" y2="62.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$15">
 <contactref element="R13" pad="1"/>
 <contactref element="U$2" pad="P$1"/>
-<wire x1="-52.92" y1="55.88" x2="22.92" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="22.92" y1="50.38" x2="25.89" y2="53.35" width="0.3" layer="1"/>
+<wire x1="25.89" y1="53.35" x2="36.5" y2="53.35" width="0.3" layer="1"/>
 </signal>
 <signal name="N$16">
 <contactref element="R11" pad="1"/>
 <contactref element="U$2" pad="P$4"/>
-<wire x1="-37.68" y1="60.96" x2="30.54" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="50.38" x2="31.76" y2="51.6" width="0.3" layer="1"/>
+<wire x1="41.1" y1="52.4" x2="41.1" y2="53.35" width="0.3" layer="1"/>
+<wire x1="31.76" y1="51.6" x2="40.3" y2="51.6" width="0.3" layer="1"/>
+<wire x1="40.3" y1="51.6" x2="41.1" y2="52.4" width="0.3" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="R9" pad="1"/>
 <contactref element="U$2" pad="P$7"/>
-<wire x1="-47.84" y1="60.96" x2="30.54" y2="55.62" width="0" layer="19" extent="1-1"/>
+<wire x1="30.54" y1="65.62" x2="31.76" y2="64.4" width="0.3" layer="1"/>
+<wire x1="41.1" y1="62.9" x2="41.1" y2="61.75" width="0.3" layer="1"/>
+<wire x1="31.76" y1="64.4" x2="39.6" y2="64.4" width="0.3" layer="1"/>
+<wire x1="39.6" y1="64.4" x2="41.1" y2="62.9" width="0.3" layer="1"/>
 </signal>
 <signal name="N$18">
 <contactref element="R10" pad="1"/>
 <contactref element="U$2" pad="P$6"/>
-<wire x1="33.08" y1="55.62" x2="-42.76" y2="55.88" width="0" layer="19" extent="1-1"/>
+<wire x1="33.08" y1="65.62" x2="41.38" y2="65.62" width="0.3" layer="1"/>
+<wire x1="43.4" y1="63.6" x2="43.4" y2="61.75" width="0.3" layer="1"/>
+<wire x1="41.38" y1="65.62" x2="43.4" y2="63.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$19">
 <contactref element="U$2" pad="P$2"/>
 <contactref element="R12" pad="1"/>
-<wire x1="-47.84" y1="55.88" x2="25.46" y2="40.38" width="0" layer="19" extent="1-1"/>
+<wire x1="25.46" y1="50.38" x2="27.38" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.8" y1="52.6" x2="38.8" y2="53.35" width="0.3" layer="1"/>
+<wire x1="27.38" y1="52.3" x2="38.5" y2="52.3" width="0.3" layer="1"/>
+<wire x1="38.5" y1="52.3" x2="38.8" y2="52.6" width="0.3" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="L1" pad="P$2"/>
 <contactref element="U4" pad="P$2"/>
-<wire x1="-26.35" y1="65.23" x2="-22.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.79" y1="25.99" x2="6.53" y2="26.25" width="0.2" layer="1"/>
+<polygon width="0.1" layer="1" thermals="no">
+<vertex x="9.12" y="25.9"/>
+<vertex x="5.64" y="25.9"/>
+<vertex x="5.64" y="26.6"/>
+<vertex x="7.66" y="26.6"/>
+<vertex x="8.18" y="26.08"/>
+<vertex x="9.1" y="26.08"/>
+<vertex x="9.12" y="26.06"/>
+</polygon>
 </signal>
 <signal name="N$4">
 <contactref element="L1" pad="P$1"/>
 <contactref element="U4" pad="P$4"/>
-<wire x1="-24.85" y1="65.23" x2="-21.09" y2="64.765" width="0" layer="19" extent="1-1"/>
+<wire x1="6.77" y1="24.99" x2="6.53" y2="24.75" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="9.07" y="25.03"/>
+<vertex x="9.07" y="24.96"/>
+<vertex x="8.01" y="24.96"/>
+<vertex x="7.44" y="24.39"/>
+<vertex x="5.64" y="24.39"/>
+<vertex x="5.64" y="25.03"/>
+</polygon>
 </signal>
 <signal name="N$6">
 <contactref element="J2" pad="1"/>
 <contactref element="U2" pad="P$1"/>
 <contactref element="U2" pad="P$2"/>
 <contactref element="C1" pad="1"/>
-<wire x1="-31.33" y1="55.88" x2="-17.78" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-54.435" y1="59.61" x2="-31.33" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.21" y1="59.61" x2="-54.435" y2="59.61" width="0" layer="19" extent="1-1"/>
+<polygon width="0.3" layer="1" thermals="no">
+<vertex x="6.68" y="10.54"/>
+<vertex x="7.72" y="10.54"/>
+<vertex x="7.72" y="7.1"/>
+<vertex x="9.48" y="5.34"/>
+<vertex x="9.48" y="2.9"/>
+<vertex x="6.68" y="2.9"/>
+</polygon>
 </signal>
 <signal name="N$7">
 <contactref element="C1" pad="2"/>
 <contactref element="R1" pad="1"/>
 <contactref element="U2" pad="P$3"/>
-<wire x1="-53.835" y1="59.61" x2="-29.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.73" y1="48.26" x2="-53.835" y2="59.61" width="0" layer="19" extent="1-1"/>
+<wire x1="8.275" y1="10.45" x2="8.275" y2="9.075" width="0.3" layer="1"/>
+<wire x1="8.275" y1="9.075" x2="8.85" y2="8.5" width="0.3" layer="1"/>
+<wire x1="8.275" y1="10.45" x2="9.4" y2="10.45" width="0.3" layer="1"/>
+<wire x1="9.4" y1="10.45" x2="10.1" y2="11.15" width="0.3" layer="1"/>
 </signal>
 <signal name="N$9">
 <contactref element="J2" pad="2"/>
@@ -2234,34 +2361,87 @@ design rules under a new name.</description>
 <contactref element="U4" pad="P$6"/>
 <contactref element="C6" pad="2"/>
 <contactref element="R4" pad="1"/>
-<wire x1="-20.59" y1="67.315" x2="-15.24" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.59" y1="67.315" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.59" y1="64.765" x2="-20.59" y2="67.315" width="0" layer="19" extent="1-1"/>
-<wire x1="-18.63" y1="55.88" x2="-20.59" y2="64.765" width="0" layer="19" extent="1-1"/>
-<wire x1="-28.26" y1="48.23" x2="-18.63" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.98" y1="55.88" x2="-28.26" y2="48.23" width="0" layer="19" extent="1-1"/>
-<wire x1="-50.48" y1="49.53" x2="-35.98" y2="55.88" width="0" layer="19" extent="1-1"/>
-<wire x1="-55.03" y1="48.26" x2="-50.48" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="11.315" y1="25.49" x2="11.84" y2="25.49" width="0.2" layer="1"/>
+<wire x1="12.05" y1="25.7" x2="12.7" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.84" y1="25.49" x2="12.05" y2="25.7" width="0.2" layer="1"/>
+<wire x1="11.315" y1="24.49" x2="11.61" y2="24.49" width="0.2" layer="1"/>
+<wire x1="12.7" y1="24.3" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="11.61" y1="24.49" x2="11.8" y2="24.3" width="0.2" layer="1"/>
+<wire x1="12.7" y1="25.7" x2="13.1" y2="25.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="24.7" x2="12.7" y2="24.3" width="0.2" layer="1"/>
+<wire x1="13.1" y1="25.3" x2="13.1" y2="24.7" width="0.2" layer="1"/>
+<polygon width="0.2" layer="1" thermals="no">
+<vertex x="8.26" y="24.54"/>
+<vertex x="9.06" y="24.54"/>
+<vertex x="9.06" y="21.12"/>
+<vertex x="12.1" y="18.08"/>
+<vertex x="12.1" y="13.94"/>
+<vertex x="12.9" y="13.14"/>
+<vertex x="14.84" y="13.14"/>
+<vertex x="14.84" y="12.78"/>
+<vertex x="14.3" y="12.78"/>
+<vertex x="13" y="11.48"/>
+<vertex x="13" y="2.95263125"/>
+<vertex x="11.9" y="2.923684375"/>
+<vertex x="11.896315625" y="2.92"/>
+<vertex x="10.04" y="2.92"/>
+<vertex x="10.04" y="7.8"/>
+<vertex x="10.94" y="8.7"/>
+<vertex x="10.94" y="12.22"/>
+<vertex x="10.72" y="12.44"/>
+<vertex x="9.36" y="12.44"/>
+<vertex x="9.36" y="16.26"/>
+<vertex x="7.9" y="17.72"/>
+<vertex x="7.9" y="24.18"/>
+</polygon>
+<wire x1="12.7" y1="24.3" x2="12.7" y2="18.62" width="0.3" layer="1"/>
+<wire x1="12.7" y1="18.62" x2="11.76" y2="17.68" width="0.3" layer="1"/>
+<wire x1="3.4" y1="48.65" x2="4.82" y2="47.23" width="0.3" layer="1"/>
+<wire x1="4.82" y1="23.5" x2="5.82" y2="22.5" width="0.3" layer="1"/>
+<wire x1="5.82" y1="22.5" x2="8.16" y2="22.5" width="0.3" layer="1"/>
+<wire x1="8.16" y1="22.5" x2="8.48" y2="22.82" width="0.3" layer="1"/>
+<wire x1="4.82" y1="47.23" x2="4.82" y2="23.5" width="0.3" layer="1"/>
 </signal>
 <signal name="N$11">
 <contactref element="U2" pad="P$5"/>
 <contactref element="R2" pad="2"/>
-<wire x1="-54.435" y1="62.31" x2="-41.06" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="7.675" y1="13.15" x2="7.675" y2="14.695" width="0.3" layer="1"/>
+<wire x1="7.675" y1="14.695" x2="8.14" y2="15.16" width="0.3" layer="1"/>
 </signal>
 <signal name="N$12">
 <contactref element="R3" pad="2"/>
 <contactref element="U3" pad="5"/>
-<wire x1="-49.95" y1="60.96" x2="-30.16" y2="50.83" width="0" layer="19" extent="1-1"/>
+<wire x1="17.05" y1="16.86" x2="17.05" y2="14.98" width="0.3" layer="1"/>
+<wire x1="17.05" y1="14.98" x2="16.93" y2="14.86" width="0.3" layer="1"/>
 </signal>
 <signal name="PS">
 <contactref element="U4" pad="P$7"/>
+<contactref element="U$1" pad="GPIO15"/>
+<contactref element="R7" pad="2"/>
+<wire x1="19.99" y1="54.95" x2="17.85" y2="54.95" width="0.3" layer="1"/>
+<wire x1="15.04" y1="52.14" x2="15.04" y2="50.38" width="0.3" layer="1"/>
+<wire x1="17.85" y1="54.95" x2="15.04" y2="52.14" width="0.3" layer="1"/>
+<wire x1="15.06" y1="52.14" x2="17.3" y2="49.9" width="0.2" layer="16"/>
+<wire x1="15.06" y1="52.14" x2="15.04" y2="52.14" width="0.2" layer="16"/>
+<via x="15.04" y="52.14" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="17.3" y1="28.6" x2="13.7" y2="25" width="0.2" layer="16"/>
+<wire x1="13.7" y1="25" x2="12.3" y2="25" width="0.2" layer="16"/>
+<via x="12.3" y="25" extent="1-16" drill="0.35" diameter="0.6"/>
+<wire x1="12.3" y1="25" x2="11.325" y2="25" width="0.2" layer="1"/>
+<wire x1="11.325" y1="25" x2="11.315" y2="24.99" width="0.2" layer="1"/>
+<wire x1="17.3" y1="49.9" x2="17.3" y2="28.6" width="0.2" layer="16"/>
 </signal>
 <signal name="N$20">
 <contactref element="U$1" pad="GPIO0"/>
 <contactref element="R16" pad="2"/>
-<contactref element="R17" pad="1"/>
-<wire x1="-56.15" y1="-6" x2="-57.85" y2="-11" width="0" layer="19" extent="1-1"/>
-<wire x1="18.84" y1="48" x2="-56.15" y2="-6" width="0" layer="19" extent="1-1"/>
+<contactref element="J6" pad="2"/>
+<wire x1="19.99" y1="58.95" x2="16.35" y2="58.95" width="0.3" layer="1"/>
+<wire x1="12.9" y1="55.5" x2="12.9" y2="51.8" width="0.3" layer="1"/>
+<wire x1="12.9" y1="51.8" x2="12.9" y2="50.35" width="0.3" layer="1"/>
+<wire x1="16.35" y1="58.95" x2="12.9" y2="55.5" width="0.3" layer="1"/>
+<wire x1="11.06" y1="42.2" x2="12.9" y2="44.04" width="0.3" layer="16"/>
+<wire x1="12.9" y1="44.04" x2="12.9" y2="51.8" width="0.3" layer="16"/>
+<via x="12.9" y="51.8" extent="1-16" drill="0.35" diameter="0.6"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
diff --git a/esp8266-wifi-remote.s#1 b/esp8266-wifi-remote.s#1
index c287f0b..f070b8e 100644
--- a/esp8266-wifi-remote.s#1
+++ b/esp8266-wifi-remote.s#1
@@ -528,7 +528,7 @@
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -557,7 +557,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -9689,7 +9689,7 @@ Source: AVX .. aphvc.pdf</description>
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -9698,10 +9698,16 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/1" type="box" library_version="3">
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
 <packageinstances>
 <packageinstance name="ELAB_PUSHBUTTON_1"/>
 </packageinstances>
@@ -9722,7 +9728,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/1" library_version="3">
+<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/2" library_version="4" library_locally_modified="yes">
 <gates>
 <gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
 </gates>
@@ -9733,7 +9739,7 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="2" pad="P$2 P$3"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/3"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -9948,7 +9954,7 @@ Source: AVX .. aphvc.pdf</description>
 <part name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1"/>
 <part name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R"/>
 <part name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="C-EU" device="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n"/>
-<part name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7"/>
 <part name="GND4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="P+2" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
 <part name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="C-EU" device="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u"/>
@@ -9966,8 +9972,8 @@ Source: AVX .. aphvc.pdf</description>
 <part name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
-<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
-<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/3"/>
+<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/3"/>
 <part name="+3V3" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
 <part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/1"/>
 <part name="GND8" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
@@ -9981,9 +9987,10 @@ Source: AVX .. aphvc.pdf</description>
 <part name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" deviceset="3X4X2MM_SWITCH" device="" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN"/>
 <part name="GND9" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
-<part name="R17" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="0"/>
 <part name="GND10" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="+3V4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1"/>
+<part name="GND11" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -9994,8 +10001,8 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="45.72" y="53.34" size="1.778" layer="95"/>
 <attribute name="VALUE" x="45.72" y="27.94" size="1.778" layer="96"/>
 </instance>
-<instance part="+3V1" gate="G$1" x="7.62" y="68.58" smashed="yes">
-<attribute name="VALUE" x="5.08" y="63.5" size="1.778" layer="96" rot="R90"/>
+<instance part="+3V1" gate="G$1" x="0" y="68.58" smashed="yes">
+<attribute name="VALUE" x="-2.54" y="63.5" size="1.778" layer="96" rot="R90"/>
 </instance>
 <instance part="GND1" gate="1" x="96.52" y="17.78" smashed="yes">
 <attribute name="VALUE" x="93.98" y="15.24" size="1.778" layer="96"/>
@@ -10018,13 +10025,13 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="77.2414" y="24.13" size="1.778" layer="95" rot="R90"/>
 <attribute name="VALUE" x="82.042" y="24.13" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="R8" gate="G$1" x="15.24" y="45.72" smashed="yes" rot="R180">
-<attribute name="NAME" x="19.05" y="44.4754" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="14.986" y="44.45" size="1.778" layer="96" rot="R180"/>
+<instance part="R8" gate="G$1" x="7.62" y="45.72" smashed="yes" rot="R180">
+<attribute name="NAME" x="11.43" y="44.4754" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="7.366" y="44.45" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="J4" gate="G$1" x="109.22" y="35.56" smashed="yes">
-<attribute name="NAME" x="109.22" y="37.084" size="1.778" layer="95" font="vector" align="bottom-center"/>
-<attribute name="VALUE" x="109.22" y="35.052" size="1.778" layer="96" font="vector" align="top-center"/>
+<instance part="J4" gate="G$1" x="15.24" y="25.4" smashed="yes">
+<attribute name="NAME" x="15.24" y="26.924" size="1.778" layer="95" font="vector" align="bottom-center"/>
+<attribute name="VALUE" x="15.24" y="24.892" size="1.778" layer="96" font="vector" align="top-center"/>
 </instance>
 <instance part="J3" gate="G$1" x="108.966" y="43.18" smashed="yes">
 <attribute name="NAME" x="108.966" y="44.704" size="1.778" layer="95" font="vector" align="bottom-center"/>
@@ -10068,27 +10075,30 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="108.204" y="72.39" size="1.778" layer="95" rot="R180"/>
 <attribute name="VALUE" x="113.538" y="72.39" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="J5" gate="G$1" x="25.4" y="55.88" smashed="yes">
-<attribute name="NAME" x="25.4" y="57.404" size="1.778" layer="95" font="vector" align="bottom-center"/>
-<attribute name="VALUE" x="25.4" y="55.372" size="1.778" layer="96" font="vector" align="top-center"/>
+<instance part="J5" gate="G$1" x="12.7" y="55.88" smashed="yes">
+<attribute name="NAME" x="12.7" y="57.404" size="1.778" layer="95" font="vector" align="bottom-center"/>
+<attribute name="VALUE" x="12.7" y="55.372" size="1.778" layer="96" font="vector" align="top-center"/>
 </instance>
-<instance part="GND9" gate="1" x="15.24" y="50.8" smashed="yes">
-<attribute name="VALUE" x="12.7" y="48.26" size="1.778" layer="96"/>
+<instance part="GND9" gate="1" x="5.08" y="50.8" smashed="yes">
+<attribute name="VALUE" x="2.54" y="48.26" size="1.778" layer="96"/>
 </instance>
 <instance part="R16" gate="G$1" x="91.44" y="60.96" smashed="yes" rot="R270">
 <attribute name="NAME" x="93.218" y="61.6966" size="1.778" layer="95"/>
 <attribute name="VALUE" x="93.472" y="59.182" size="1.778" layer="96"/>
 </instance>
-<instance part="R17" gate="G$1" x="99.06" y="53.34" smashed="yes">
-<attribute name="NAME" x="95.504" y="55.0926" size="1.778" layer="95"/>
-<attribute name="VALUE" x="100.838" y="55.118" size="1.778" layer="96"/>
-</instance>
-<instance part="GND10" gate="1" x="106.68" y="50.8" smashed="yes">
-<attribute name="VALUE" x="104.14" y="48.26" size="1.778" layer="96"/>
+<instance part="GND10" gate="1" x="96.52" y="48.26" smashed="yes">
+<attribute name="VALUE" x="93.98" y="45.72" size="1.778" layer="96"/>
 </instance>
 <instance part="+3V4" gate="G$1" x="91.44" y="68.58" smashed="yes">
 <attribute name="VALUE" x="88.9" y="63.5" size="1.778" layer="96" rot="R90"/>
 </instance>
+<instance part="J6" gate="G$1" x="106.68" y="53.34" smashed="yes" rot="MR0">
+<attribute name="VALUE" x="109.22" y="48.514" size="1.778" layer="96" font="vector" rot="MR0"/>
+<attribute name="NAME" x="109.22" y="58.928" size="1.778" layer="95" font="vector" rot="MR0"/>
+</instance>
+<instance part="GND11" gate="1" x="0" y="17.78" smashed="yes">
+<attribute name="VALUE" x="-2.54" y="15.24" size="1.778" layer="96"/>
+</instance>
 </instances>
 <busses>
 </busses>
@@ -10097,26 +10107,22 @@ Source: AVX .. aphvc.pdf</description>
 <segment>
 <pinref part="+3V1" gate="G$1" pin="+3V3"/>
 <pinref part="U$1" gate="G$1" pin="VCC"/>
-<wire x1="40.64" y1="33.02" x2="7.62" y2="33.02" width="0.1524" layer="91"/>
-<wire x1="7.62" y1="33.02" x2="7.62" y2="45.72" width="0.1524" layer="91"/>
-<wire x1="7.62" y1="45.72" x2="7.62" y2="63.5" width="0.1524" layer="91"/>
-<wire x1="7.62" y1="63.5" x2="7.62" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="40.64" y1="33.02" x2="0" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="0" y1="33.02" x2="0" y2="45.72" width="0.1524" layer="91"/>
+<wire x1="0" y1="45.72" x2="0" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="0" y1="63.5" x2="0" y2="66.04" width="0.1524" layer="91"/>
 <pinref part="R6" gate="G$1" pin="2"/>
-<wire x1="38.1" y1="63.5" x2="7.62" y2="63.5" width="0.1524" layer="91"/>
-<junction x="7.62" y="63.5"/>
+<wire x1="38.1" y1="63.5" x2="0" y2="63.5" width="0.1524" layer="91"/>
+<junction x="0" y="63.5"/>
 <pinref part="R8" gate="G$1" pin="2"/>
-<wire x1="10.16" y1="45.72" x2="7.62" y2="45.72" width="0.1524" layer="91"/>
-<junction x="7.62" y="45.72"/>
+<wire x1="2.54" y1="45.72" x2="0" y2="45.72" width="0.1524" layer="91"/>
+<junction x="0" y="45.72"/>
 </segment>
 <segment>
-<pinref part="J4" gate="G$1" pin="2"/>
-<wire x1="114.3" y1="35.56" x2="127" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="+3V3" gate="G$1" pin="+3V3"/>
-<wire x1="127" y1="35.56" x2="127" y2="43.18" width="0.1524" layer="91"/>
 <pinref part="J3" gate="G$1" pin="2"/>
 <wire x1="127" y1="43.18" x2="127" y2="48.26" width="0.1524" layer="91"/>
 <wire x1="114.046" y1="43.18" x2="127" y2="43.18" width="0.1524" layer="91"/>
-<junction x="127" y="43.18"/>
 </segment>
 <segment>
 <pinref part="R16" gate="G$1" pin="1"/>
@@ -10155,14 +10161,21 @@ Source: AVX .. aphvc.pdf</description>
 </segment>
 <segment>
 <pinref part="J5" gate="G$1" pin="1"/>
-<wire x1="20.32" y1="55.88" x2="15.24" y2="55.88" width="0.1524" layer="91"/>
-<wire x1="15.24" y1="55.88" x2="15.24" y2="53.34" width="0.1524" layer="91"/>
+<wire x1="7.62" y1="55.88" x2="5.08" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="5.08" y1="55.88" x2="5.08" y2="53.34" width="0.1524" layer="91"/>
 <pinref part="GND9" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="R17" gate="G$1" pin="2"/>
-<wire x1="104.14" y1="53.34" x2="106.68" y2="53.34" width="0.1524" layer="91"/>
 <pinref part="GND10" gate="1" pin="GND"/>
+<wire x1="96.52" y1="50.8" x2="96.52" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="J6" gate="G$1" pin="1"/>
+<wire x1="96.52" y1="53.34" x2="99.06" y2="53.34" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="J4" gate="G$1" pin="1"/>
+<wire x1="10.16" y1="25.4" x2="0" y2="25.4" width="0.1524" layer="91"/>
+<wire x1="0" y1="25.4" x2="0" y2="20.32" width="0.1524" layer="91"/>
+<pinref part="GND11" gate="1" pin="GND"/>
 </segment>
 </net>
 <net name="+5V" class="0">
@@ -10201,8 +10214,13 @@ Source: AVX .. aphvc.pdf</description>
 <net name="VBAT_D" class="0">
 <segment>
 <pinref part="U$1" gate="G$1" pin="ADC"/>
-<wire x1="35.56" y1="48.26" x2="40.64" y2="48.26" width="0.1524" layer="91"/>
-<label x="35.56" y="48.26" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="25.4" y1="48.26" x2="27.94" y2="48.26" width="0.1524" layer="91"/>
+<label x="25.4" y="48.26" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J4" gate="G$1" pin="2"/>
+<wire x1="27.94" y1="48.26" x2="40.64" y2="48.26" width="0.1524" layer="91"/>
+<wire x1="20.32" y1="25.4" x2="27.94" y2="25.4" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="25.4" x2="27.94" y2="48.26" width="0.1524" layer="91"/>
+<junction x="27.94" y="48.26"/>
 </segment>
 </net>
 <net name="RST" class="0">
@@ -10216,27 +10234,27 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="38.1" y1="53.34" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 <junction x="38.1" y="50.8"/>
 <pinref part="J5" gate="G$1" pin="2"/>
-<wire x1="30.48" y1="55.88" x2="33.02" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="17.78" y1="55.88" x2="33.02" y2="55.88" width="0.1524" layer="91"/>
 <wire x1="33.02" y1="55.88" x2="33.02" y2="50.8" width="0.1524" layer="91"/>
 <wire x1="33.02" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$1" class="0">
+<net name="PS" class="0">
 <segment>
 <pinref part="U$1" gate="G$1" pin="GPIO15"/>
 <wire x1="73.66" y1="35.56" x2="78.74" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="R7" gate="G$1" pin="2"/>
 <wire x1="78.74" y1="35.56" x2="78.74" y2="33.02" width="0.1524" layer="91"/>
-<pinref part="J4" gate="G$1" pin="1"/>
-<wire x1="104.14" y1="35.56" x2="78.74" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="86.36" y1="35.56" x2="78.74" y2="35.56" width="0.1524" layer="91"/>
 <junction x="78.74" y="35.56"/>
+<label x="86.36" y="35.56" size="1.778" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="N$2" class="0">
 <segment>
 <pinref part="R8" gate="G$1" pin="1"/>
 <pinref part="U$1" gate="G$1" pin="CH_PD"/>
-<wire x1="20.32" y1="45.72" x2="40.64" y2="45.72" width="0.1524" layer="91"/>
+<wire x1="12.7" y1="45.72" x2="40.64" y2="45.72" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$5" class="0">
@@ -10356,11 +10374,10 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="U$1" gate="G$1" pin="GPIO0"/>
 <wire x1="73.66" y1="40.64" x2="91.44" y2="40.64" width="0.1524" layer="91"/>
 <pinref part="R16" gate="G$1" pin="2"/>
-<wire x1="91.44" y1="40.64" x2="91.44" y2="53.34" width="0.1524" layer="91"/>
-<pinref part="R17" gate="G$1" pin="1"/>
-<wire x1="91.44" y1="53.34" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
-<wire x1="93.98" y1="53.34" x2="91.44" y2="53.34" width="0.1524" layer="91"/>
-<junction x="91.44" y="53.34"/>
+<wire x1="91.44" y1="40.64" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<pinref part="J6" gate="G$1" pin="2"/>
+<wire x1="99.06" y1="55.88" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<junction x="91.44" y="55.88"/>
 </segment>
 </net>
 </nets>
diff --git a/esp8266-wifi-remote.s#2 b/esp8266-wifi-remote.s#2
index 7cd4403..cd49f28 100644
--- a/esp8266-wifi-remote.s#2
+++ b/esp8266-wifi-remote.s#2
@@ -528,7 +528,7 @@
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -557,7 +557,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -9689,7 +9689,7 @@ Source: AVX .. aphvc.pdf</description>
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -9698,10 +9698,16 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/1" type="box" library_version="3">
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
 <packageinstances>
 <packageinstance name="ELAB_PUSHBUTTON_1"/>
 </packageinstances>
@@ -9722,7 +9728,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/1" library_version="3">
+<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/2" library_version="4" library_locally_modified="yes">
 <gates>
 <gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
 </gates>
@@ -9733,7 +9739,7 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="2" pad="P$2 P$3"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/3"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -9948,7 +9954,7 @@ Source: AVX .. aphvc.pdf</description>
 <part name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1"/>
 <part name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R"/>
 <part name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="C-EU" device="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n"/>
-<part name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7"/>
 <part name="GND4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="P+2" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
 <part name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="C-EU" device="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u"/>
@@ -9966,8 +9972,8 @@ Source: AVX .. aphvc.pdf</description>
 <part name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
-<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
-<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/3"/>
+<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/3"/>
 <part name="+3V3" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
 <part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/1"/>
 <part name="GND8" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
@@ -9981,7 +9987,10 @@ Source: AVX .. aphvc.pdf</description>
 <part name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" deviceset="3X4X2MM_SWITCH" device="" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN"/>
 <part name="GND9" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
-<part name="R17" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="0"/>
+<part name="GND10" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
+<part name="+3V4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1"/>
+<part name="GND11" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -9992,8 +10001,8 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="45.72" y="53.34" size="1.778" layer="95"/>
 <attribute name="VALUE" x="45.72" y="27.94" size="1.778" layer="96"/>
 </instance>
-<instance part="+3V1" gate="G$1" x="7.62" y="68.58" smashed="yes">
-<attribute name="VALUE" x="5.08" y="63.5" size="1.778" layer="96" rot="R90"/>
+<instance part="+3V1" gate="G$1" x="0" y="68.58" smashed="yes">
+<attribute name="VALUE" x="-2.54" y="63.5" size="1.778" layer="96" rot="R90"/>
 </instance>
 <instance part="GND1" gate="1" x="96.52" y="17.78" smashed="yes">
 <attribute name="VALUE" x="93.98" y="15.24" size="1.778" layer="96"/>
@@ -10016,13 +10025,13 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="77.2414" y="24.13" size="1.778" layer="95" rot="R90"/>
 <attribute name="VALUE" x="82.042" y="24.13" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="R8" gate="G$1" x="15.24" y="45.72" smashed="yes" rot="R180">
-<attribute name="NAME" x="19.05" y="44.4754" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="14.986" y="44.45" size="1.778" layer="96" rot="R180"/>
+<instance part="R8" gate="G$1" x="7.62" y="45.72" smashed="yes" rot="R180">
+<attribute name="NAME" x="11.43" y="44.4754" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="7.366" y="44.45" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="J4" gate="G$1" x="109.22" y="35.56" smashed="yes">
-<attribute name="NAME" x="109.22" y="37.084" size="1.778" layer="95" font="vector" align="bottom-center"/>
-<attribute name="VALUE" x="109.22" y="35.052" size="1.778" layer="96" font="vector" align="top-center"/>
+<instance part="J4" gate="G$1" x="15.24" y="25.4" smashed="yes">
+<attribute name="NAME" x="15.24" y="26.924" size="1.778" layer="95" font="vector" align="bottom-center"/>
+<attribute name="VALUE" x="15.24" y="24.892" size="1.778" layer="96" font="vector" align="top-center"/>
 </instance>
 <instance part="J3" gate="G$1" x="108.966" y="43.18" smashed="yes">
 <attribute name="NAME" x="108.966" y="44.704" size="1.778" layer="95" font="vector" align="bottom-center"/>
@@ -10066,20 +10075,29 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="108.204" y="72.39" size="1.778" layer="95" rot="R180"/>
 <attribute name="VALUE" x="113.538" y="72.39" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="J5" gate="G$1" x="25.4" y="55.88" smashed="yes">
-<attribute name="NAME" x="25.4" y="57.404" size="1.778" layer="95" font="vector" align="bottom-center"/>
-<attribute name="VALUE" x="25.4" y="55.372" size="1.778" layer="96" font="vector" align="top-center"/>
+<instance part="J5" gate="G$1" x="12.7" y="55.88" smashed="yes">
+<attribute name="NAME" x="12.7" y="57.404" size="1.778" layer="95" font="vector" align="bottom-center"/>
+<attribute name="VALUE" x="12.7" y="55.372" size="1.778" layer="96" font="vector" align="top-center"/>
 </instance>
-<instance part="GND9" gate="1" x="15.24" y="50.8" smashed="yes">
-<attribute name="VALUE" x="12.7" y="48.26" size="1.778" layer="96"/>
+<instance part="GND9" gate="1" x="5.08" y="50.8" smashed="yes">
+<attribute name="VALUE" x="2.54" y="48.26" size="1.778" layer="96"/>
 </instance>
 <instance part="R16" gate="G$1" x="91.44" y="60.96" smashed="yes" rot="R270">
 <attribute name="NAME" x="93.218" y="61.6966" size="1.778" layer="95"/>
 <attribute name="VALUE" x="93.472" y="59.182" size="1.778" layer="96"/>
 </instance>
-<instance part="R17" gate="G$1" x="99.06" y="53.34" smashed="yes">
-<attribute name="NAME" x="95.504" y="55.0926" size="1.778" layer="95"/>
-<attribute name="VALUE" x="100.838" y="55.118" size="1.778" layer="96"/>
+<instance part="GND10" gate="1" x="96.52" y="48.26" smashed="yes">
+<attribute name="VALUE" x="93.98" y="45.72" size="1.778" layer="96"/>
+</instance>
+<instance part="+3V4" gate="G$1" x="91.44" y="68.58" smashed="yes">
+<attribute name="VALUE" x="88.9" y="63.5" size="1.778" layer="96" rot="R90"/>
+</instance>
+<instance part="J6" gate="G$1" x="106.68" y="53.34" smashed="yes" rot="MR0">
+<attribute name="VALUE" x="109.22" y="48.514" size="1.778" layer="96" font="vector" rot="MR0"/>
+<attribute name="NAME" x="109.22" y="58.928" size="1.778" layer="95" font="vector" rot="MR0"/>
+</instance>
+<instance part="GND11" gate="1" x="0" y="17.78" smashed="yes">
+<attribute name="VALUE" x="-2.54" y="15.24" size="1.778" layer="96"/>
 </instance>
 </instances>
 <busses>
@@ -10089,20 +10107,18 @@ Source: AVX .. aphvc.pdf</description>
 <segment>
 <pinref part="+3V1" gate="G$1" pin="+3V3"/>
 <pinref part="U$1" gate="G$1" pin="VCC"/>
-<wire x1="40.64" y1="33.02" x2="7.62" y2="33.02" width="0.1524" layer="91"/>
-<wire x1="7.62" y1="33.02" x2="7.62" y2="45.72" width="0.1524" layer="91"/>
-<wire x1="7.62" y1="45.72" x2="7.62" y2="63.5" width="0.1524" layer="91"/>
-<wire x1="7.62" y1="63.5" x2="7.62" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="40.64" y1="33.02" x2="0" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="0" y1="33.02" x2="0" y2="45.72" width="0.1524" layer="91"/>
+<wire x1="0" y1="45.72" x2="0" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="0" y1="63.5" x2="0" y2="66.04" width="0.1524" layer="91"/>
 <pinref part="R6" gate="G$1" pin="2"/>
-<wire x1="38.1" y1="63.5" x2="7.62" y2="63.5" width="0.1524" layer="91"/>
-<junction x="7.62" y="63.5"/>
+<wire x1="38.1" y1="63.5" x2="0" y2="63.5" width="0.1524" layer="91"/>
+<junction x="0" y="63.5"/>
 <pinref part="R8" gate="G$1" pin="2"/>
-<wire x1="10.16" y1="45.72" x2="7.62" y2="45.72" width="0.1524" layer="91"/>
-<junction x="7.62" y="45.72"/>
+<wire x1="2.54" y1="45.72" x2="0" y2="45.72" width="0.1524" layer="91"/>
+<junction x="0" y="45.72"/>
 </segment>
 <segment>
-<pinref part="J4" gate="G$1" pin="2"/>
-<wire x1="114.3" y1="35.56" x2="127" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="+3V3" gate="G$1" pin="+3V3"/>
 <wire x1="127" y1="35.56" x2="127" y2="43.18" width="0.1524" layer="91"/>
 <pinref part="J3" gate="G$1" pin="2"/>
@@ -10110,6 +10126,10 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="114.046" y1="43.18" x2="127" y2="43.18" width="0.1524" layer="91"/>
 <junction x="127" y="43.18"/>
 </segment>
+<segment>
+<pinref part="R16" gate="G$1" pin="1"/>
+<pinref part="+3V4" gate="G$1" pin="+3V3"/>
+</segment>
 </net>
 <net name="GND" class="0">
 <segment>
@@ -10143,10 +10163,22 @@ Source: AVX .. aphvc.pdf</description>
 </segment>
 <segment>
 <pinref part="J5" gate="G$1" pin="1"/>
-<wire x1="20.32" y1="55.88" x2="15.24" y2="55.88" width="0.1524" layer="91"/>
-<wire x1="15.24" y1="55.88" x2="15.24" y2="53.34" width="0.1524" layer="91"/>
+<wire x1="7.62" y1="55.88" x2="5.08" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="5.08" y1="55.88" x2="5.08" y2="53.34" width="0.1524" layer="91"/>
 <pinref part="GND9" gate="1" pin="GND"/>
 </segment>
+<segment>
+<pinref part="GND10" gate="1" pin="GND"/>
+<wire x1="96.52" y1="50.8" x2="96.52" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="J6" gate="G$1" pin="1"/>
+<wire x1="96.52" y1="53.34" x2="99.06" y2="53.34" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="J4" gate="G$1" pin="1"/>
+<wire x1="10.16" y1="25.4" x2="0" y2="25.4" width="0.1524" layer="91"/>
+<wire x1="0" y1="25.4" x2="0" y2="20.32" width="0.1524" layer="91"/>
+<pinref part="GND11" gate="1" pin="GND"/>
+</segment>
 </net>
 <net name="+5V" class="0">
 <segment>
@@ -10184,8 +10216,13 @@ Source: AVX .. aphvc.pdf</description>
 <net name="VBAT_D" class="0">
 <segment>
 <pinref part="U$1" gate="G$1" pin="ADC"/>
-<wire x1="35.56" y1="48.26" x2="40.64" y2="48.26" width="0.1524" layer="91"/>
-<label x="35.56" y="48.26" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="25.4" y1="48.26" x2="27.94" y2="48.26" width="0.1524" layer="91"/>
+<label x="25.4" y="48.26" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J4" gate="G$1" pin="2"/>
+<wire x1="27.94" y1="48.26" x2="40.64" y2="48.26" width="0.1524" layer="91"/>
+<wire x1="20.32" y1="25.4" x2="27.94" y2="25.4" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="25.4" x2="27.94" y2="48.26" width="0.1524" layer="91"/>
+<junction x="27.94" y="48.26"/>
 </segment>
 </net>
 <net name="RST" class="0">
@@ -10199,27 +10236,27 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="38.1" y1="53.34" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 <junction x="38.1" y="50.8"/>
 <pinref part="J5" gate="G$1" pin="2"/>
-<wire x1="30.48" y1="55.88" x2="33.02" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="17.78" y1="55.88" x2="33.02" y2="55.88" width="0.1524" layer="91"/>
 <wire x1="33.02" y1="55.88" x2="33.02" y2="50.8" width="0.1524" layer="91"/>
 <wire x1="33.02" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$1" class="0">
+<net name="PS" class="0">
 <segment>
 <pinref part="U$1" gate="G$1" pin="GPIO15"/>
 <wire x1="73.66" y1="35.56" x2="78.74" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="R7" gate="G$1" pin="2"/>
 <wire x1="78.74" y1="35.56" x2="78.74" y2="33.02" width="0.1524" layer="91"/>
-<pinref part="J4" gate="G$1" pin="1"/>
-<wire x1="104.14" y1="35.56" x2="78.74" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="86.36" y1="35.56" x2="78.74" y2="35.56" width="0.1524" layer="91"/>
 <junction x="78.74" y="35.56"/>
+<label x="86.36" y="35.56" size="1.778" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="N$2" class="0">
 <segment>
 <pinref part="R8" gate="G$1" pin="1"/>
 <pinref part="U$1" gate="G$1" pin="CH_PD"/>
-<wire x1="20.32" y1="45.72" x2="40.64" y2="45.72" width="0.1524" layer="91"/>
+<wire x1="12.7" y1="45.72" x2="40.64" y2="45.72" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$5" class="0">
@@ -10334,6 +10371,17 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="116.84" y1="81.28" x2="104.14" y2="81.28" width="0.1524" layer="91"/>
 </segment>
 </net>
+<net name="N$20" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="GPIO0"/>
+<wire x1="73.66" y1="40.64" x2="91.44" y2="40.64" width="0.1524" layer="91"/>
+<pinref part="R16" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="40.64" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<pinref part="J6" gate="G$1" pin="2"/>
+<wire x1="99.06" y1="55.88" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<junction x="91.44" y="55.88"/>
+</segment>
+</net>
 </nets>
 </sheet>
 <sheet>
diff --git a/esp8266-wifi-remote.s#3 b/esp8266-wifi-remote.s#3
index a73462d..d652e5f 100644
--- a/esp8266-wifi-remote.s#3
+++ b/esp8266-wifi-remote.s#3
@@ -528,7 +528,7 @@
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -557,7 +557,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -9689,7 +9689,7 @@ Source: AVX .. aphvc.pdf</description>
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -9698,10 +9698,16 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/1" type="box" library_version="3">
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
 <packageinstances>
 <packageinstance name="ELAB_PUSHBUTTON_1"/>
 </packageinstances>
@@ -9722,7 +9728,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/1" library_version="3">
+<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/2" library_version="4" library_locally_modified="yes">
 <gates>
 <gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
 </gates>
@@ -9733,7 +9739,7 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="2" pad="P$2 P$3"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/3"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -9948,7 +9954,7 @@ Source: AVX .. aphvc.pdf</description>
 <part name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1"/>
 <part name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R"/>
 <part name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="C-EU" device="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n"/>
-<part name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7"/>
 <part name="GND4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="P+2" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
 <part name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="C-EU" device="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u"/>
@@ -9966,8 +9972,8 @@ Source: AVX .. aphvc.pdf</description>
 <part name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
-<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
-<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/3"/>
+<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/3"/>
 <part name="+3V3" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
 <part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/1"/>
 <part name="GND8" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
@@ -9981,6 +9987,9 @@ Source: AVX .. aphvc.pdf</description>
 <part name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" deviceset="3X4X2MM_SWITCH" device="" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN"/>
 <part name="GND9" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
+<part name="GND10" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
+<part name="+3V4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1"/>
 </parts>
 <sheets>
 <sheet>
@@ -10019,9 +10028,9 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="19.05" y="44.4754" size="1.778" layer="95" rot="R180"/>
 <attribute name="VALUE" x="14.986" y="44.45" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="J4" gate="G$1" x="109.22" y="35.56" smashed="yes">
-<attribute name="NAME" x="109.22" y="37.084" size="1.778" layer="95" font="vector" align="bottom-center"/>
-<attribute name="VALUE" x="109.22" y="35.052" size="1.778" layer="96" font="vector" align="top-center"/>
+<instance part="J4" gate="G$1" x="15.24" y="20.32" smashed="yes">
+<attribute name="NAME" x="15.24" y="21.844" size="1.778" layer="95" font="vector" align="bottom-center"/>
+<attribute name="VALUE" x="15.24" y="19.812" size="1.778" layer="96" font="vector" align="top-center"/>
 </instance>
 <instance part="J3" gate="G$1" x="108.966" y="43.18" smashed="yes">
 <attribute name="NAME" x="108.966" y="44.704" size="1.778" layer="95" font="vector" align="bottom-center"/>
@@ -10076,6 +10085,16 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="93.218" y="61.6966" size="1.778" layer="95"/>
 <attribute name="VALUE" x="93.472" y="59.182" size="1.778" layer="96"/>
 </instance>
+<instance part="GND10" gate="1" x="96.52" y="48.26" smashed="yes">
+<attribute name="VALUE" x="93.98" y="45.72" size="1.778" layer="96"/>
+</instance>
+<instance part="+3V4" gate="G$1" x="91.44" y="68.58" smashed="yes">
+<attribute name="VALUE" x="88.9" y="63.5" size="1.778" layer="96" rot="R90"/>
+</instance>
+<instance part="J6" gate="G$1" x="106.68" y="53.34" smashed="yes" rot="MR0">
+<attribute name="VALUE" x="109.22" y="48.514" size="1.778" layer="96" font="vector" rot="MR0"/>
+<attribute name="NAME" x="109.22" y="58.928" size="1.778" layer="95" font="vector" rot="MR0"/>
+</instance>
 </instances>
 <busses>
 </busses>
@@ -10096,8 +10115,6 @@ Source: AVX .. aphvc.pdf</description>
 <junction x="7.62" y="45.72"/>
 </segment>
 <segment>
-<pinref part="J4" gate="G$1" pin="2"/>
-<wire x1="114.3" y1="35.56" x2="127" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="+3V3" gate="G$1" pin="+3V3"/>
 <wire x1="127" y1="35.56" x2="127" y2="43.18" width="0.1524" layer="91"/>
 <pinref part="J3" gate="G$1" pin="2"/>
@@ -10105,6 +10122,10 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="114.046" y1="43.18" x2="127" y2="43.18" width="0.1524" layer="91"/>
 <junction x="127" y="43.18"/>
 </segment>
+<segment>
+<pinref part="R16" gate="G$1" pin="1"/>
+<pinref part="+3V4" gate="G$1" pin="+3V3"/>
+</segment>
 </net>
 <net name="GND" class="0">
 <segment>
@@ -10142,6 +10163,12 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="15.24" y1="55.88" x2="15.24" y2="53.34" width="0.1524" layer="91"/>
 <pinref part="GND9" gate="1" pin="GND"/>
 </segment>
+<segment>
+<pinref part="GND10" gate="1" pin="GND"/>
+<wire x1="96.52" y1="50.8" x2="96.52" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="J6" gate="G$1" pin="1"/>
+<wire x1="96.52" y1="53.34" x2="99.06" y2="53.34" width="0.1524" layer="91"/>
+</segment>
 </net>
 <net name="+5V" class="0">
 <segment>
@@ -10199,15 +10226,15 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="33.02" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$1" class="0">
+<net name="PS" class="0">
 <segment>
 <pinref part="U$1" gate="G$1" pin="GPIO15"/>
 <wire x1="73.66" y1="35.56" x2="78.74" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="R7" gate="G$1" pin="2"/>
 <wire x1="78.74" y1="35.56" x2="78.74" y2="33.02" width="0.1524" layer="91"/>
-<pinref part="J4" gate="G$1" pin="1"/>
-<wire x1="104.14" y1="35.56" x2="78.74" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="86.36" y1="35.56" x2="78.74" y2="35.56" width="0.1524" layer="91"/>
 <junction x="78.74" y="35.56"/>
+<label x="86.36" y="35.56" size="1.778" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="N$2" class="0">
@@ -10329,6 +10356,17 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="116.84" y1="81.28" x2="104.14" y2="81.28" width="0.1524" layer="91"/>
 </segment>
 </net>
+<net name="N$20" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="GPIO0"/>
+<wire x1="73.66" y1="40.64" x2="91.44" y2="40.64" width="0.1524" layer="91"/>
+<pinref part="R16" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="40.64" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<pinref part="J6" gate="G$1" pin="2"/>
+<wire x1="99.06" y1="55.88" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<junction x="91.44" y="55.88"/>
+</segment>
+</net>
 </nets>
 </sheet>
 <sheet>
diff --git a/esp8266-wifi-remote.s#4 b/esp8266-wifi-remote.s#4
index 434faf6..5a44337 100644
--- a/esp8266-wifi-remote.s#4
+++ b/esp8266-wifi-remote.s#4
@@ -528,7 +528,7 @@
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -557,7 +557,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -9689,7 +9689,7 @@ Source: AVX .. aphvc.pdf</description>
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -9698,10 +9698,16 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/1" type="box" library_version="3">
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
 <packageinstances>
 <packageinstance name="ELAB_PUSHBUTTON_1"/>
 </packageinstances>
@@ -9722,7 +9728,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/1" library_version="3">
+<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/2" library_version="4" library_locally_modified="yes">
 <gates>
 <gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
 </gates>
@@ -9733,7 +9739,7 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="2" pad="P$2 P$3"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/3"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -9948,7 +9954,7 @@ Source: AVX .. aphvc.pdf</description>
 <part name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1"/>
 <part name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R"/>
 <part name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="C-EU" device="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n"/>
-<part name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7"/>
 <part name="GND4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="P+2" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
 <part name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="C-EU" device="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u"/>
@@ -9966,8 +9972,8 @@ Source: AVX .. aphvc.pdf</description>
 <part name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
-<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
-<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/3"/>
+<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/3"/>
 <part name="+3V3" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
 <part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/1"/>
 <part name="GND8" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
@@ -9980,6 +9986,10 @@ Source: AVX .. aphvc.pdf</description>
 <part name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
 <part name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" deviceset="3X4X2MM_SWITCH" device="" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN"/>
 <part name="GND9" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
+<part name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
+<part name="GND10" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
+<part name="+3V4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1"/>
 </parts>
 <sheets>
 <sheet>
@@ -10071,6 +10081,20 @@ Source: AVX .. aphvc.pdf</description>
 <instance part="GND9" gate="1" x="15.24" y="50.8" smashed="yes">
 <attribute name="VALUE" x="12.7" y="48.26" size="1.778" layer="96"/>
 </instance>
+<instance part="R16" gate="G$1" x="91.44" y="60.96" smashed="yes" rot="R270">
+<attribute name="NAME" x="93.218" y="61.6966" size="1.778" layer="95"/>
+<attribute name="VALUE" x="93.472" y="59.182" size="1.778" layer="96"/>
+</instance>
+<instance part="GND10" gate="1" x="96.52" y="48.26" smashed="yes">
+<attribute name="VALUE" x="93.98" y="45.72" size="1.778" layer="96"/>
+</instance>
+<instance part="+3V4" gate="G$1" x="91.44" y="68.58" smashed="yes">
+<attribute name="VALUE" x="88.9" y="63.5" size="1.778" layer="96" rot="R90"/>
+</instance>
+<instance part="J6" gate="G$1" x="106.68" y="53.34" smashed="yes" rot="MR0">
+<attribute name="VALUE" x="109.22" y="48.514" size="1.778" layer="96" font="vector" rot="MR0"/>
+<attribute name="NAME" x="109.22" y="58.928" size="1.778" layer="95" font="vector" rot="MR0"/>
+</instance>
 </instances>
 <busses>
 </busses>
@@ -10100,6 +10124,10 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="114.046" y1="43.18" x2="127" y2="43.18" width="0.1524" layer="91"/>
 <junction x="127" y="43.18"/>
 </segment>
+<segment>
+<pinref part="R16" gate="G$1" pin="1"/>
+<pinref part="+3V4" gate="G$1" pin="+3V3"/>
+</segment>
 </net>
 <net name="GND" class="0">
 <segment>
@@ -10137,6 +10165,12 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="15.24" y1="55.88" x2="15.24" y2="53.34" width="0.1524" layer="91"/>
 <pinref part="GND9" gate="1" pin="GND"/>
 </segment>
+<segment>
+<pinref part="GND10" gate="1" pin="GND"/>
+<wire x1="96.52" y1="50.8" x2="96.52" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="J6" gate="G$1" pin="1"/>
+<wire x1="96.52" y1="53.34" x2="99.06" y2="53.34" width="0.1524" layer="91"/>
+</segment>
 </net>
 <net name="+5V" class="0">
 <segment>
@@ -10324,6 +10358,17 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="116.84" y1="81.28" x2="104.14" y2="81.28" width="0.1524" layer="91"/>
 </segment>
 </net>
+<net name="N$20" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="GPIO0"/>
+<wire x1="73.66" y1="40.64" x2="91.44" y2="40.64" width="0.1524" layer="91"/>
+<pinref part="R16" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="40.64" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<pinref part="J6" gate="G$1" pin="2"/>
+<wire x1="99.06" y1="55.88" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<junction x="91.44" y="55.88"/>
+</segment>
+</net>
 </nets>
 </sheet>
 <sheet>
diff --git a/esp8266-wifi-remote.s#5 b/esp8266-wifi-remote.s#5
index 4db7ef2..5b2807d 100644
--- a/esp8266-wifi-remote.s#5
+++ b/esp8266-wifi-remote.s#5
@@ -3,7 +3,7 @@
 <eagle version="9.3.2">
 <drawing>
 <settings>
-<setting alwaysvectorfont="yes"/>
+<setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
 <grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
@@ -701,9 +701,7 @@ Digi-Key: 296-39461-1-ND</description>
 </package>
 </packages>
 <packages3d>
-<package3d name="RESC2016X100" urn="urn:adsk.eagle:package:10481001/2" type="model" library_version="2" library_locally_modified="yes">
-<description>Chip, 2.00 X 1.60 X 1.00 mm body
-&lt;p&gt;Chip package with body size 2.00 X 1.60 X 1.00 mm&lt;/p&gt;</description>
+<package3d name="0806(2016-METRIC)" urn="urn:adsk.eagle:package:10481001/1" type="box" library_version="2">
 <packageinstances>
 <packageinstance name="0806(2016-METRIC)"/>
 </packageinstances>
@@ -726,7 +724,7 @@ Digi-Key: 296-39461-1-ND</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="MAKK2016T1R5M" urn="urn:adsk.eagle:component:10481002/1" locally_modified="yes" library_version="2" library_locally_modified="yes">
+<deviceset name="MAKK2016T1R5M" urn="urn:adsk.eagle:component:10481002/1" library_version="2">
 <description>1.5µH Shielded Wirewound Inductor 1.65A 130mOhm Max 0806 (2016 Metric)&lt;br&gt;
 Digi-Key: 587-4138-1-ND</description>
 <gates>
@@ -739,7 +737,7 @@ Digi-Key: 587-4138-1-ND</description>
 <connect gate="G$1" pin="2" pad="P$2"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:10481001/2"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10481001/1"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -9691,7 +9689,7 @@ Source: AVX .. aphvc.pdf</description>
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -9700,10 +9698,16 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
 <packages3d>
-<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/2" type="model" library_version="3" library_locally_modified="yes">
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
 <packageinstances>
 <packageinstance name="ELAB_PUSHBUTTON_1"/>
 </packageinstances>
@@ -9724,7 +9728,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/1" locally_modified="yes" library_version="3" library_locally_modified="yes">
+<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/2" library_version="4" library_locally_modified="yes">
 <gates>
 <gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
 </gates>
@@ -9735,7 +9739,7 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="2" pad="P$2 P$3"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/2"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/3"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -9766,7 +9770,7 @@ Source: AVX .. aphvc.pdf</description>
 </package>
 </packages>
 <packages3d>
-<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/2" type="model" library_version="4" library_locally_modified="yes">
+<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/1" type="box" library_version="4">
 <packageinstances>
 <packageinstance name="DIP-10-WIDE"/>
 </packageinstances>
@@ -9844,7 +9848,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="NKR161" urn="urn:adsk.eagle:component:10512213/1" locally_modified="yes" library_version="4" library_locally_modified="yes">
+<deviceset name="NKR161" urn="urn:adsk.eagle:component:10512213/1" library_version="4">
 <gates>
 <gate name="G$1" symbol="HDSM-433C" x="0" y="0"/>
 </gates>
@@ -9863,7 +9867,60 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="G" pad="P$10"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:10512212/2"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10512212/1"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+</devicesets>
+</library>
+<library name="tactile-switches" urn="urn:adsk.eagle:library:10516572">
+<description>&lt;b&gt;Tactile Switches&lt;/b&gt;</description>
+<packages>
+<package name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:footprint:10516573/1" library_version="1">
+<smd name="P$1" x="-1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<smd name="P$2" x="1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<wire x1="-1.45" y1="1.45" x2="1.45" y2="1.45" width="0.127" layer="21"/>
+<wire x1="-1.45" y1="-1.45" x2="1.45" y2="-1.45" width="0.127" layer="21"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:package:10516575/2" type="model" library_version="1" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="3X4X2_MOMENTARY_SWITCH"/>
+</packageinstances>
+</package3d>
+</packages3d>
+<symbols>
+<symbol name="SWITCH-MOMENTARY-2" urn="urn:adsk.eagle:symbol:10516574/1" library_version="1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;</description>
+<wire x1="1.905" y1="0" x2="2.54" y2="0" width="0.254" layer="94"/>
+<wire x1="-2.54" y1="0" x2="1.905" y2="1.27" width="0.254" layer="94"/>
+<circle x="-2.54" y="0" radius="0.127" width="0.4064" layer="94"/>
+<circle x="2.54" y="0" radius="0.127" width="0.4064" layer="94"/>
+<text x="0" y="1.524" size="1.778" layer="95" font="vector" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-0.508" size="1.778" layer="96" font="vector" align="top-center">&gt;VALUE</text>
+<pin name="1" x="-5.08" y="0" visible="off" length="short" direction="pas" swaplevel="2"/>
+<pin name="2" x="5.08" y="0" visible="off" length="short" direction="pas" swaplevel="1" rot="R180"/>
+</symbol>
+</symbols>
+<devicesets>
+<deviceset name="3X4X2MM_SWITCH" urn="urn:adsk.eagle:component:10516576/1" locally_modified="yes" library_version="1" library_locally_modified="yes">
+<gates>
+<gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="3X4X2_MOMENTARY_SWITCH">
+<connects>
+<connect gate="G$1" pin="1" pad="P$1"/>
+<connect gate="G$1" pin="2" pad="P$2"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10516575/2"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -9892,7 +9949,7 @@ Source: AVX .. aphvc.pdf</description>
 <part name="U2" library="pmic-battery-management" library_urn="urn:adsk.eagle:library:10291251" deviceset="AP9211SA-AD-HAC-7" device="" package3d_urn="urn:adsk.eagle:package:10291255/2"/>
 <part name="U3" library="pmic-battery-chargers" library_urn="urn:adsk.eagle:library:10292857" deviceset="MCP73812T-420I/OT" device="" package3d_urn="urn:adsk.eagle:package:10292859/2"/>
 <part name="U4" library="pmic-voltage-regulators-dc-dc-switching-regulators" library_urn="urn:adsk.eagle:library:10476605" deviceset="TPS63031DSKR" device="" package3d_urn="urn:adsk.eagle:package:10476608/3"/>
-<part name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" deviceset="MAKK2016T1R5M" device="" package3d_urn="urn:adsk.eagle:package:10481001/2"/>
+<part name="L1" library="fixed-inductors" library_urn="urn:adsk.eagle:library:10480998" deviceset="MAKK2016T1R5M" device="" package3d_urn="urn:adsk.eagle:package:10481001/1"/>
 <part name="GND3" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1"/>
 <part name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R"/>
@@ -9915,10 +9972,10 @@ Source: AVX .. aphvc.pdf</description>
 <part name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
-<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/2"/>
-<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/2"/>
+<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/3"/>
+<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/3"/>
 <part name="+3V3" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
-<part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/2"/>
+<part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/1"/>
 <part name="GND8" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
 <part name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
@@ -9927,6 +9984,12 @@ Source: AVX .. aphvc.pdf</description>
 <part name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
 <part name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
 <part name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" deviceset="3X4X2MM_SWITCH" device="" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN"/>
+<part name="GND9" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
+<part name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
+<part name="GND10" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
+<part name="+3V4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1"/>
 </parts>
 <sheets>
 <sheet>
@@ -9962,8 +10025,8 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="VALUE" x="82.042" y="24.13" size="1.778" layer="96" rot="R90"/>
 </instance>
 <instance part="R8" gate="G$1" x="15.24" y="45.72" smashed="yes" rot="R180">
-<attribute name="NAME" x="19.05" y="44.2214" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="19.05" y="49.022" size="1.778" layer="96" rot="R180"/>
+<attribute name="NAME" x="19.05" y="44.4754" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="14.986" y="44.45" size="1.778" layer="96" rot="R180"/>
 </instance>
 <instance part="J4" gate="G$1" x="109.22" y="35.56" smashed="yes">
 <attribute name="NAME" x="109.22" y="37.084" size="1.778" layer="95" font="vector" align="bottom-center"/>
@@ -10011,6 +10074,27 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="108.204" y="72.39" size="1.778" layer="95" rot="R180"/>
 <attribute name="VALUE" x="113.538" y="72.39" size="1.778" layer="96" rot="R180"/>
 </instance>
+<instance part="J5" gate="G$1" x="25.4" y="55.88" smashed="yes">
+<attribute name="NAME" x="25.4" y="57.404" size="1.778" layer="95" font="vector" align="bottom-center"/>
+<attribute name="VALUE" x="25.4" y="55.372" size="1.778" layer="96" font="vector" align="top-center"/>
+</instance>
+<instance part="GND9" gate="1" x="15.24" y="50.8" smashed="yes">
+<attribute name="VALUE" x="12.7" y="48.26" size="1.778" layer="96"/>
+</instance>
+<instance part="R16" gate="G$1" x="91.44" y="60.96" smashed="yes" rot="R270">
+<attribute name="NAME" x="93.218" y="61.6966" size="1.778" layer="95"/>
+<attribute name="VALUE" x="93.472" y="59.182" size="1.778" layer="96"/>
+</instance>
+<instance part="GND10" gate="1" x="96.52" y="48.26" smashed="yes">
+<attribute name="VALUE" x="93.98" y="45.72" size="1.778" layer="96"/>
+</instance>
+<instance part="+3V4" gate="G$1" x="91.44" y="68.58" smashed="yes">
+<attribute name="VALUE" x="88.9" y="63.5" size="1.778" layer="96" rot="R90"/>
+</instance>
+<instance part="J6" gate="G$1" x="106.68" y="53.34" smashed="yes" rot="MR0">
+<attribute name="VALUE" x="109.22" y="48.514" size="1.778" layer="96" font="vector" rot="MR0"/>
+<attribute name="NAME" x="109.22" y="58.928" size="1.778" layer="95" font="vector" rot="MR0"/>
+</instance>
 </instances>
 <busses>
 </busses>
@@ -10040,6 +10124,10 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="114.046" y1="43.18" x2="127" y2="43.18" width="0.1524" layer="91"/>
 <junction x="127" y="43.18"/>
 </segment>
+<segment>
+<pinref part="R16" gate="G$1" pin="1"/>
+<pinref part="+3V4" gate="G$1" pin="+3V3"/>
+</segment>
 </net>
 <net name="GND" class="0">
 <segment>
@@ -10071,6 +10159,18 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="134.62" y1="58.42" x2="134.62" y2="55.88" width="0.1524" layer="91"/>
 <junction x="134.62" y="55.88"/>
 </segment>
+<segment>
+<pinref part="J5" gate="G$1" pin="1"/>
+<wire x1="20.32" y1="55.88" x2="15.24" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="15.24" y1="55.88" x2="15.24" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="GND9" gate="1" pin="GND"/>
+</segment>
+<segment>
+<pinref part="GND10" gate="1" pin="GND"/>
+<wire x1="96.52" y1="50.8" x2="96.52" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="J6" gate="G$1" pin="1"/>
+<wire x1="96.52" y1="53.34" x2="99.06" y2="53.34" width="0.1524" layer="91"/>
+</segment>
 </net>
 <net name="+5V" class="0">
 <segment>
@@ -10122,8 +10222,10 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="R6" gate="G$1" pin="1"/>
 <wire x1="38.1" y1="53.34" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 <junction x="38.1" y="50.8"/>
-<label x="35.56" y="50.8" size="1.27" layer="95" rot="R180" xref="yes"/>
-<wire x1="35.56" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
+<pinref part="J5" gate="G$1" pin="2"/>
+<wire x1="30.48" y1="55.88" x2="33.02" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="55.88" x2="33.02" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$1" class="0">
@@ -10256,6 +10358,17 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="116.84" y1="81.28" x2="104.14" y2="81.28" width="0.1524" layer="91"/>
 </segment>
 </net>
+<net name="N$20" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="GPIO0"/>
+<wire x1="73.66" y1="40.64" x2="91.44" y2="40.64" width="0.1524" layer="91"/>
+<pinref part="R16" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="40.64" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<pinref part="J6" gate="G$1" pin="2"/>
+<wire x1="99.06" y1="55.88" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<junction x="91.44" y="55.88"/>
+</segment>
+</net>
 </nets>
 </sheet>
 <sheet>
diff --git a/esp8266-wifi-remote.s#6 b/esp8266-wifi-remote.s#6
index 1386de9..a419c8a 100644
--- a/esp8266-wifi-remote.s#6
+++ b/esp8266-wifi-remote.s#6
@@ -3,7 +3,7 @@
 <eagle version="9.3.2">
 <drawing>
 <settings>
-<setting alwaysvectorfont="yes"/>
+<setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
 <grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
@@ -423,7 +423,7 @@
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="1050170001" urn="urn:adsk.eagle:component:10491913/1" locally_modified="yes" prefix="J" library_version="1" library_locally_modified="yes">
+<deviceset name="1050170001" urn="urn:adsk.eagle:component:10491913/2" prefix="J" library_version="2" library_locally_modified="yes">
 <description>Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free</description>
 <gates>
 <gate name="G$1" symbol="1050170001" x="0" y="0"/>
@@ -528,7 +528,7 @@
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -557,7 +557,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -9689,7 +9689,7 @@ Source: AVX .. aphvc.pdf</description>
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" library_version="2" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/2" library_version="4" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -9698,8 +9698,21 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="6.175" y1="-5" x2="6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="6.175" y1="12.25" x2="-6.175" y2="12.25" width="0.127" layer="51"/>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-8.625" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="-5" x2="-6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="8.625" y1="-5" x2="6.175" y2="-5" width="0.05" layer="51"/>
+<wire x1="-8.625" y1="12.25" x2="-6.175" y2="12.25" width="0.05" layer="51"/>
+<wire x1="8.625" y1="12.25" x2="6.175" y2="12.25" width="0.05" layer="51"/>
 </package>
 </packages>
+<packages3d>
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/3" type="model" library_version="4" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="ELAB_PUSHBUTTON_1"/>
+</packageinstances>
+</package3d>
+</packages3d>
 <symbols>
 <symbol name="SWITCH-MOMENTARY-2" urn="urn:adsk.eagle:symbol:10244046/1" library_version="2" library_locally_modified="yes">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST&lt;/h3&gt;
@@ -9715,7 +9728,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="ELAB_PUSHBUTTON_1" library_version="2" library_locally_modified="yes">
+<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/2" library_version="4" library_locally_modified="yes">
 <gates>
 <gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
 </gates>
@@ -9725,6 +9738,9 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="1" pad="P$1 P$4"/>
 <connect gate="G$1" pin="2" pad="P$2 P$3"/>
 </connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/3"/>
+</package3dinstances>
 <technologies>
 <technology name=""/>
 </technologies>
@@ -9754,7 +9770,7 @@ Source: AVX .. aphvc.pdf</description>
 </package>
 </packages>
 <packages3d>
-<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/2" type="model" library_version="4" library_locally_modified="yes">
+<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/1" type="box" library_version="4">
 <packageinstances>
 <packageinstance name="DIP-10-WIDE"/>
 </packageinstances>
@@ -9832,7 +9848,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="NKR161" urn="urn:adsk.eagle:component:10512213/1" locally_modified="yes" library_version="4" library_locally_modified="yes">
+<deviceset name="NKR161" urn="urn:adsk.eagle:component:10512213/1" library_version="4">
 <gates>
 <gate name="G$1" symbol="HDSM-433C" x="0" y="0"/>
 </gates>
@@ -9851,7 +9867,60 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="G" pad="P$10"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:10512212/2"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10512212/1"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+</devicesets>
+</library>
+<library name="tactile-switches" urn="urn:adsk.eagle:library:10516572">
+<description>&lt;b&gt;Tactile Switches&lt;/b&gt;</description>
+<packages>
+<package name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:footprint:10516573/1" library_version="1">
+<smd name="P$1" x="-1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<smd name="P$2" x="1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<wire x1="-1.45" y1="1.45" x2="1.45" y2="1.45" width="0.127" layer="21"/>
+<wire x1="-1.45" y1="-1.45" x2="1.45" y2="-1.45" width="0.127" layer="21"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:package:10516575/2" type="model" library_version="1" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="3X4X2_MOMENTARY_SWITCH"/>
+</packageinstances>
+</package3d>
+</packages3d>
+<symbols>
+<symbol name="SWITCH-MOMENTARY-2" urn="urn:adsk.eagle:symbol:10516574/1" library_version="1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;</description>
+<wire x1="1.905" y1="0" x2="2.54" y2="0" width="0.254" layer="94"/>
+<wire x1="-2.54" y1="0" x2="1.905" y2="1.27" width="0.254" layer="94"/>
+<circle x="-2.54" y="0" radius="0.127" width="0.4064" layer="94"/>
+<circle x="2.54" y="0" radius="0.127" width="0.4064" layer="94"/>
+<text x="0" y="1.524" size="1.778" layer="95" font="vector" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-0.508" size="1.778" layer="96" font="vector" align="top-center">&gt;VALUE</text>
+<pin name="1" x="-5.08" y="0" visible="off" length="short" direction="pas" swaplevel="2"/>
+<pin name="2" x="5.08" y="0" visible="off" length="short" direction="pas" swaplevel="1" rot="R180"/>
+</symbol>
+</symbols>
+<devicesets>
+<deviceset name="3X4X2MM_SWITCH" urn="urn:adsk.eagle:component:10516576/1" locally_modified="yes" library_version="1" library_locally_modified="yes">
+<gates>
+<gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="3X4X2_MOMENTARY_SWITCH">
+<connects>
+<connect gate="G$1" pin="1" pad="P$1"/>
+<connect gate="G$1" pin="2" pad="P$2"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10516575/2"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -9903,10 +9972,10 @@ Source: AVX .. aphvc.pdf</description>
 <part name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
-<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device=""/>
-<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device=""/>
+<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/3"/>
+<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/3"/>
 <part name="+3V3" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
-<part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/2"/>
+<part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/1"/>
 <part name="GND8" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
 <part name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
@@ -9915,6 +9984,12 @@ Source: AVX .. aphvc.pdf</description>
 <part name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
 <part name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
 <part name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" deviceset="3X4X2MM_SWITCH" device="" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN"/>
+<part name="GND9" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
+<part name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
+<part name="R17" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="0"/>
+<part name="GND10" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
+<part name="+3V4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -9950,8 +10025,8 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="VALUE" x="82.042" y="24.13" size="1.778" layer="96" rot="R90"/>
 </instance>
 <instance part="R8" gate="G$1" x="15.24" y="45.72" smashed="yes" rot="R180">
-<attribute name="NAME" x="19.05" y="44.2214" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="19.05" y="49.022" size="1.778" layer="96" rot="R180"/>
+<attribute name="NAME" x="19.05" y="44.4754" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="14.986" y="44.45" size="1.778" layer="96" rot="R180"/>
 </instance>
 <instance part="J4" gate="G$1" x="109.22" y="35.56" smashed="yes">
 <attribute name="NAME" x="109.22" y="37.084" size="1.778" layer="95" font="vector" align="bottom-center"/>
@@ -9999,6 +10074,27 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="108.204" y="72.39" size="1.778" layer="95" rot="R180"/>
 <attribute name="VALUE" x="113.538" y="72.39" size="1.778" layer="96" rot="R180"/>
 </instance>
+<instance part="J5" gate="G$1" x="25.4" y="55.88" smashed="yes">
+<attribute name="NAME" x="25.4" y="57.404" size="1.778" layer="95" font="vector" align="bottom-center"/>
+<attribute name="VALUE" x="25.4" y="55.372" size="1.778" layer="96" font="vector" align="top-center"/>
+</instance>
+<instance part="GND9" gate="1" x="15.24" y="50.8" smashed="yes">
+<attribute name="VALUE" x="12.7" y="48.26" size="1.778" layer="96"/>
+</instance>
+<instance part="R16" gate="G$1" x="91.44" y="60.96" smashed="yes" rot="R270">
+<attribute name="NAME" x="93.218" y="61.6966" size="1.778" layer="95"/>
+<attribute name="VALUE" x="93.472" y="59.182" size="1.778" layer="96"/>
+</instance>
+<instance part="R17" gate="G$1" x="99.06" y="53.34" smashed="yes">
+<attribute name="NAME" x="95.504" y="55.0926" size="1.778" layer="95"/>
+<attribute name="VALUE" x="100.838" y="55.118" size="1.778" layer="96"/>
+</instance>
+<instance part="GND10" gate="1" x="106.68" y="50.8" smashed="yes">
+<attribute name="VALUE" x="104.14" y="48.26" size="1.778" layer="96"/>
+</instance>
+<instance part="+3V4" gate="G$1" x="91.44" y="68.58" smashed="yes">
+<attribute name="VALUE" x="88.9" y="63.5" size="1.778" layer="96" rot="R90"/>
+</instance>
 </instances>
 <busses>
 </busses>
@@ -10028,6 +10124,10 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="114.046" y1="43.18" x2="127" y2="43.18" width="0.1524" layer="91"/>
 <junction x="127" y="43.18"/>
 </segment>
+<segment>
+<pinref part="R16" gate="G$1" pin="1"/>
+<pinref part="+3V4" gate="G$1" pin="+3V3"/>
+</segment>
 </net>
 <net name="GND" class="0">
 <segment>
@@ -10059,6 +10159,17 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="134.62" y1="58.42" x2="134.62" y2="55.88" width="0.1524" layer="91"/>
 <junction x="134.62" y="55.88"/>
 </segment>
+<segment>
+<pinref part="J5" gate="G$1" pin="1"/>
+<wire x1="20.32" y1="55.88" x2="15.24" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="15.24" y1="55.88" x2="15.24" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="GND9" gate="1" pin="GND"/>
+</segment>
+<segment>
+<pinref part="R17" gate="G$1" pin="2"/>
+<wire x1="104.14" y1="53.34" x2="106.68" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="GND10" gate="1" pin="GND"/>
+</segment>
 </net>
 <net name="+5V" class="0">
 <segment>
@@ -10110,8 +10221,10 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="R6" gate="G$1" pin="1"/>
 <wire x1="38.1" y1="53.34" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 <junction x="38.1" y="50.8"/>
-<label x="35.56" y="50.8" size="1.27" layer="95" rot="R180" xref="yes"/>
-<wire x1="35.56" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
+<pinref part="J5" gate="G$1" pin="2"/>
+<wire x1="30.48" y1="55.88" x2="33.02" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="55.88" x2="33.02" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$1" class="0">
@@ -10244,6 +10357,18 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="116.84" y1="81.28" x2="104.14" y2="81.28" width="0.1524" layer="91"/>
 </segment>
 </net>
+<net name="N$20" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="GPIO0"/>
+<wire x1="73.66" y1="40.64" x2="91.44" y2="40.64" width="0.1524" layer="91"/>
+<pinref part="R16" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="40.64" x2="91.44" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="R17" gate="G$1" pin="1"/>
+<wire x1="91.44" y1="53.34" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="93.98" y1="53.34" x2="91.44" y2="53.34" width="0.1524" layer="91"/>
+<junction x="91.44" y="53.34"/>
+</segment>
+</net>
 </nets>
 </sheet>
 <sheet>
diff --git a/esp8266-wifi-remote.s#7 b/esp8266-wifi-remote.s#7
index 4ade8d8..c287f0b 100644
--- a/esp8266-wifi-remote.s#7
+++ b/esp8266-wifi-remote.s#7
@@ -3,7 +3,7 @@
 <eagle version="9.3.2">
 <drawing>
 <settings>
-<setting alwaysvectorfont="yes"/>
+<setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
 <grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
@@ -423,7 +423,7 @@
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="1050170001" urn="urn:adsk.eagle:component:10491913/1" locally_modified="yes" prefix="J" library_version="1" library_locally_modified="yes">
+<deviceset name="1050170001" urn="urn:adsk.eagle:component:10491913/2" prefix="J" library_version="2" library_locally_modified="yes">
 <description>Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free</description>
 <gates>
 <gate name="G$1" symbol="1050170001" x="0" y="0"/>
@@ -528,7 +528,7 @@
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -557,7 +557,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -9689,7 +9689,7 @@ Source: AVX .. aphvc.pdf</description>
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" library_version="2" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -9700,6 +9700,13 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
 </package>
 </packages>
+<packages3d>
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/1" type="box" library_version="3">
+<packageinstances>
+<packageinstance name="ELAB_PUSHBUTTON_1"/>
+</packageinstances>
+</package3d>
+</packages3d>
 <symbols>
 <symbol name="SWITCH-MOMENTARY-2" urn="urn:adsk.eagle:symbol:10244046/1" library_version="2" library_locally_modified="yes">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST&lt;/h3&gt;
@@ -9715,7 +9722,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="ELAB_PUSHBUTTON_1" library_version="2" library_locally_modified="yes">
+<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/1" library_version="3">
 <gates>
 <gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
 </gates>
@@ -9725,6 +9732,9 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="1" pad="P$1 P$4"/>
 <connect gate="G$1" pin="2" pad="P$2 P$3"/>
 </connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+</package3dinstances>
 <technologies>
 <technology name=""/>
 </technologies>
@@ -9754,7 +9764,7 @@ Source: AVX .. aphvc.pdf</description>
 </package>
 </packages>
 <packages3d>
-<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/2" type="model" library_version="4" library_locally_modified="yes">
+<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/1" type="box" library_version="4">
 <packageinstances>
 <packageinstance name="DIP-10-WIDE"/>
 </packageinstances>
@@ -9832,7 +9842,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="NKR161" urn="urn:adsk.eagle:component:10512213/1" locally_modified="yes" library_version="4" library_locally_modified="yes">
+<deviceset name="NKR161" urn="urn:adsk.eagle:component:10512213/1" library_version="4">
 <gates>
 <gate name="G$1" symbol="HDSM-433C" x="0" y="0"/>
 </gates>
@@ -9851,7 +9861,60 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="G" pad="P$10"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:10512212/2"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10512212/1"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+</devicesets>
+</library>
+<library name="tactile-switches" urn="urn:adsk.eagle:library:10516572">
+<description>&lt;b&gt;Tactile Switches&lt;/b&gt;</description>
+<packages>
+<package name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:footprint:10516573/1" library_version="1">
+<smd name="P$1" x="-1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<smd name="P$2" x="1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<wire x1="-1.45" y1="1.45" x2="1.45" y2="1.45" width="0.127" layer="21"/>
+<wire x1="-1.45" y1="-1.45" x2="1.45" y2="-1.45" width="0.127" layer="21"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:package:10516575/2" type="model" library_version="1" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="3X4X2_MOMENTARY_SWITCH"/>
+</packageinstances>
+</package3d>
+</packages3d>
+<symbols>
+<symbol name="SWITCH-MOMENTARY-2" urn="urn:adsk.eagle:symbol:10516574/1" library_version="1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;</description>
+<wire x1="1.905" y1="0" x2="2.54" y2="0" width="0.254" layer="94"/>
+<wire x1="-2.54" y1="0" x2="1.905" y2="1.27" width="0.254" layer="94"/>
+<circle x="-2.54" y="0" radius="0.127" width="0.4064" layer="94"/>
+<circle x="2.54" y="0" radius="0.127" width="0.4064" layer="94"/>
+<text x="0" y="1.524" size="1.778" layer="95" font="vector" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-0.508" size="1.778" layer="96" font="vector" align="top-center">&gt;VALUE</text>
+<pin name="1" x="-5.08" y="0" visible="off" length="short" direction="pas" swaplevel="2"/>
+<pin name="2" x="5.08" y="0" visible="off" length="short" direction="pas" swaplevel="1" rot="R180"/>
+</symbol>
+</symbols>
+<devicesets>
+<deviceset name="3X4X2MM_SWITCH" urn="urn:adsk.eagle:component:10516576/1" locally_modified="yes" library_version="1" library_locally_modified="yes">
+<gates>
+<gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="3X4X2_MOMENTARY_SWITCH">
+<connects>
+<connect gate="G$1" pin="1" pad="P$1"/>
+<connect gate="G$1" pin="2" pad="P$2"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10516575/2"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -9903,12 +9966,24 @@ Source: AVX .. aphvc.pdf</description>
 <part name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
-<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device=""/>
-<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device=""/>
+<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
 <part name="+3V3" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
-<part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/2"/>
+<part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/1"/>
 <part name="GND8" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" deviceset="3X4X2MM_SWITCH" device="" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN"/>
+<part name="GND9" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
+<part name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
+<part name="R17" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="0"/>
+<part name="GND10" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
+<part name="+3V4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -9944,8 +10019,8 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="VALUE" x="82.042" y="24.13" size="1.778" layer="96" rot="R90"/>
 </instance>
 <instance part="R8" gate="G$1" x="15.24" y="45.72" smashed="yes" rot="R180">
-<attribute name="NAME" x="19.05" y="44.2214" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="19.05" y="49.022" size="1.778" layer="96" rot="R180"/>
+<attribute name="NAME" x="19.05" y="44.4754" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="14.986" y="44.45" size="1.778" layer="96" rot="R180"/>
 </instance>
 <instance part="J4" gate="G$1" x="109.22" y="35.56" smashed="yes">
 <attribute name="NAME" x="109.22" y="37.084" size="1.778" layer="95" font="vector" align="bottom-center"/>
@@ -9966,8 +10041,53 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="VALUE" x="132.08" y="50.8" size="1.778" layer="96"/>
 </instance>
 <instance part="R9" gate="G$1" x="109.22" y="88.9" smashed="yes" rot="R180">
-<attribute name="NAME" x="113.03" y="87.4014" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="113.03" y="92.202" size="1.778" layer="96" rot="R180"/>
+<attribute name="NAME" x="108.204" y="87.6554" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="114.046" y="87.63" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R10" gate="G$1" x="99.06" y="86.36" smashed="yes" rot="R180">
+<attribute name="NAME" x="97.028" y="85.09" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="102.87" y="85.344" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R11" gate="G$1" x="109.22" y="83.82" smashed="yes" rot="R180">
+<attribute name="NAME" x="108.204" y="82.55" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="113.538" y="82.55" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R12" gate="G$1" x="99.06" y="81.28" smashed="yes" rot="R180">
+<attribute name="NAME" x="98.044" y="80.01" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="103.378" y="80.01" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R13" gate="G$1" x="109.22" y="78.74" smashed="yes" rot="R180">
+<attribute name="NAME" x="108.204" y="77.47" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="113.538" y="77.47" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R14" gate="G$1" x="99.06" y="76.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="98.044" y="74.93" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="103.378" y="74.93" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R15" gate="G$1" x="109.22" y="73.66" smashed="yes" rot="R180">
+<attribute name="NAME" x="108.204" y="72.39" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="113.538" y="72.39" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="J5" gate="G$1" x="25.4" y="55.88" smashed="yes">
+<attribute name="NAME" x="25.4" y="57.404" size="1.778" layer="95" font="vector" align="bottom-center"/>
+<attribute name="VALUE" x="25.4" y="55.372" size="1.778" layer="96" font="vector" align="top-center"/>
+</instance>
+<instance part="GND9" gate="1" x="15.24" y="50.8" smashed="yes">
+<attribute name="VALUE" x="12.7" y="48.26" size="1.778" layer="96"/>
+</instance>
+<instance part="R16" gate="G$1" x="91.44" y="60.96" smashed="yes" rot="R270">
+<attribute name="NAME" x="93.218" y="61.6966" size="1.778" layer="95"/>
+<attribute name="VALUE" x="93.472" y="59.182" size="1.778" layer="96"/>
+</instance>
+<instance part="R17" gate="G$1" x="99.06" y="53.34" smashed="yes">
+<attribute name="NAME" x="95.504" y="55.0926" size="1.778" layer="95"/>
+<attribute name="VALUE" x="100.838" y="55.118" size="1.778" layer="96"/>
+</instance>
+<instance part="GND10" gate="1" x="106.68" y="50.8" smashed="yes">
+<attribute name="VALUE" x="104.14" y="48.26" size="1.778" layer="96"/>
+</instance>
+<instance part="+3V4" gate="G$1" x="91.44" y="68.58" smashed="yes">
+<attribute name="VALUE" x="88.9" y="63.5" size="1.778" layer="96" rot="R90"/>
 </instance>
 </instances>
 <busses>
@@ -9998,6 +10118,10 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="114.046" y1="43.18" x2="127" y2="43.18" width="0.1524" layer="91"/>
 <junction x="127" y="43.18"/>
 </segment>
+<segment>
+<pinref part="R16" gate="G$1" pin="1"/>
+<pinref part="+3V4" gate="G$1" pin="+3V3"/>
+</segment>
 </net>
 <net name="GND" class="0">
 <segment>
@@ -10029,6 +10153,17 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="134.62" y1="58.42" x2="134.62" y2="55.88" width="0.1524" layer="91"/>
 <junction x="134.62" y="55.88"/>
 </segment>
+<segment>
+<pinref part="J5" gate="G$1" pin="1"/>
+<wire x1="20.32" y1="55.88" x2="15.24" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="15.24" y1="55.88" x2="15.24" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="GND9" gate="1" pin="GND"/>
+</segment>
+<segment>
+<pinref part="R17" gate="G$1" pin="2"/>
+<wire x1="104.14" y1="53.34" x2="106.68" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="GND10" gate="1" pin="GND"/>
+</segment>
 </net>
 <net name="+5V" class="0">
 <segment>
@@ -10045,6 +10180,9 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="U$1" gate="G$1" pin="RX"/>
 <wire x1="78.74" y1="88.9" x2="78.74" y2="48.26" width="0.1524" layer="91"/>
 <wire x1="78.74" y1="48.26" x2="73.66" y2="48.26" width="0.1524" layer="91"/>
+<pinref part="R9" gate="G$1" pin="2"/>
+<wire x1="104.14" y1="88.9" x2="78.74" y2="88.9" width="0.1524" layer="91"/>
+<junction x="78.74" y="88.9"/>
 </segment>
 </net>
 <net name="UART_TX" class="0">
@@ -10053,7 +10191,11 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="U$1" gate="G$1" pin="TX"/>
 <wire x1="76.2" y1="50.8" x2="73.66" y2="50.8" width="0.1524" layer="91"/>
 <wire x1="60.96" y1="86.36" x2="76.2" y2="86.36" width="0.1524" layer="91"/>
-<wire x1="76.2" y1="86.36" x2="76.2" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="76.2" y1="86.36" x2="76.2" y2="81.28" width="0.1524" layer="91"/>
+<pinref part="R12" gate="G$1" pin="2"/>
+<wire x1="76.2" y1="81.28" x2="76.2" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="93.98" y1="81.28" x2="76.2" y2="81.28" width="0.1524" layer="91"/>
+<junction x="76.2" y="81.28"/>
 </segment>
 </net>
 <net name="VBAT_D" class="0">
@@ -10073,8 +10215,10 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="R6" gate="G$1" pin="1"/>
 <wire x1="38.1" y1="53.34" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 <junction x="38.1" y="50.8"/>
-<label x="35.56" y="50.8" size="1.27" layer="95" rot="R180" xref="yes"/>
-<wire x1="35.56" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
+<pinref part="J5" gate="G$1" pin="2"/>
+<wire x1="30.48" y1="55.88" x2="33.02" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="55.88" x2="33.02" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$1" class="0">
@@ -10109,6 +10253,8 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="U$1" gate="G$1" pin="GPIO4"/>
 <wire x1="73.66" y1="45.72" x2="81.28" y2="45.72" width="0.1524" layer="91"/>
 <wire x1="81.28" y1="45.72" x2="81.28" y2="86.36" width="0.1524" layer="91"/>
+<pinref part="R10" gate="G$1" pin="2"/>
+<wire x1="81.28" y1="86.36" x2="93.98" y2="86.36" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$10" class="0">
@@ -10116,6 +10262,8 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="U$1" gate="G$1" pin="GPIO5"/>
 <wire x1="73.66" y1="43.18" x2="83.82" y2="43.18" width="0.1524" layer="91"/>
 <wire x1="83.82" y1="43.18" x2="83.82" y2="83.82" width="0.1524" layer="91"/>
+<pinref part="R11" gate="G$1" pin="2"/>
+<wire x1="83.82" y1="83.82" x2="104.14" y2="83.82" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="SEG_E" class="0">
@@ -10124,6 +10272,11 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="38.1" y1="40.64" x2="40.64" y2="40.64" width="0.1524" layer="91"/>
 <label x="38.1" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
+<segment>
+<pinref part="R13" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="78.74" x2="104.14" y2="78.74" width="0.1524" layer="91"/>
+<label x="91.44" y="78.74" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
 </net>
 <net name="SEG_F" class="0">
 <segment>
@@ -10131,6 +10284,11 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="38.1" y1="38.1" x2="40.64" y2="38.1" width="0.1524" layer="91"/>
 <label x="38.1" y="38.1" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
+<segment>
+<pinref part="R14" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="76.2" x2="93.98" y2="76.2" width="0.1524" layer="91"/>
+<label x="91.44" y="76.2" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
 </net>
 <net name="SEG_G" class="0">
 <segment>
@@ -10138,6 +10296,72 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="38.1" y1="35.56" x2="40.64" y2="35.56" width="0.1524" layer="91"/>
 <label x="38.1" y="35.56" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
+<segment>
+<pinref part="R15" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="73.66" x2="104.14" y2="73.66" width="0.1524" layer="91"/>
+<label x="91.44" y="73.66" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+</net>
+<net name="N$13" class="0">
+<segment>
+<pinref part="U$2" gate="G$1" pin="G"/>
+<pinref part="R15" gate="G$1" pin="1"/>
+<wire x1="114.3" y1="73.66" x2="116.84" y2="73.66" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$14" class="0">
+<segment>
+<pinref part="R14" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="F"/>
+<wire x1="104.14" y1="76.2" x2="116.84" y2="76.2" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$15" class="0">
+<segment>
+<pinref part="R13" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="E"/>
+<wire x1="114.3" y1="78.74" x2="116.84" y2="78.74" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$16" class="0">
+<segment>
+<pinref part="R11" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="C"/>
+<wire x1="114.3" y1="83.82" x2="116.84" y2="83.82" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$17" class="0">
+<segment>
+<pinref part="R9" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="A"/>
+<wire x1="114.3" y1="88.9" x2="116.84" y2="88.9" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$18" class="0">
+<segment>
+<pinref part="R10" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="B"/>
+<wire x1="104.14" y1="86.36" x2="116.84" y2="86.36" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$19" class="0">
+<segment>
+<pinref part="U$2" gate="G$1" pin="D"/>
+<pinref part="R12" gate="G$1" pin="1"/>
+<wire x1="116.84" y1="81.28" x2="104.14" y2="81.28" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$20" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="GPIO0"/>
+<wire x1="73.66" y1="40.64" x2="91.44" y2="40.64" width="0.1524" layer="91"/>
+<pinref part="R16" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="40.64" x2="91.44" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="R17" gate="G$1" pin="1"/>
+<wire x1="91.44" y1="53.34" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="93.98" y1="53.34" x2="91.44" y2="53.34" width="0.1524" layer="91"/>
+<junction x="91.44" y="53.34"/>
+</segment>
 </net>
 </nets>
 </sheet>
diff --git a/esp8266-wifi-remote.s#8 b/esp8266-wifi-remote.s#8
index 3116f61..7cd4403 100644
--- a/esp8266-wifi-remote.s#8
+++ b/esp8266-wifi-remote.s#8
@@ -3,7 +3,7 @@
 <eagle version="9.3.2">
 <drawing>
 <settings>
-<setting alwaysvectorfont="yes"/>
+<setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
 <grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
@@ -423,7 +423,7 @@
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="1050170001" urn="urn:adsk.eagle:component:10491913/1" locally_modified="yes" prefix="J" library_version="1" library_locally_modified="yes">
+<deviceset name="1050170001" urn="urn:adsk.eagle:component:10491913/2" prefix="J" library_version="2" library_locally_modified="yes">
 <description>Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free</description>
 <gates>
 <gate name="G$1" symbol="1050170001" x="0" y="0"/>
@@ -528,7 +528,7 @@
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -557,7 +557,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -9689,7 +9689,7 @@ Source: AVX .. aphvc.pdf</description>
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" library_version="2" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -9700,6 +9700,13 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
 </package>
 </packages>
+<packages3d>
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/1" type="box" library_version="3">
+<packageinstances>
+<packageinstance name="ELAB_PUSHBUTTON_1"/>
+</packageinstances>
+</package3d>
+</packages3d>
 <symbols>
 <symbol name="SWITCH-MOMENTARY-2" urn="urn:adsk.eagle:symbol:10244046/1" library_version="2" library_locally_modified="yes">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST&lt;/h3&gt;
@@ -9715,7 +9722,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="ELAB_PUSHBUTTON_1" library_version="2" library_locally_modified="yes">
+<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/1" library_version="3">
 <gates>
 <gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
 </gates>
@@ -9725,6 +9732,9 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="1" pad="P$1 P$4"/>
 <connect gate="G$1" pin="2" pad="P$2 P$3"/>
 </connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+</package3dinstances>
 <technologies>
 <technology name=""/>
 </technologies>
@@ -9754,7 +9764,7 @@ Source: AVX .. aphvc.pdf</description>
 </package>
 </packages>
 <packages3d>
-<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/2" type="model" library_version="4" library_locally_modified="yes">
+<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/1" type="box" library_version="4">
 <packageinstances>
 <packageinstance name="DIP-10-WIDE"/>
 </packageinstances>
@@ -9832,7 +9842,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="NKR161" urn="urn:adsk.eagle:component:10512213/1" locally_modified="yes" library_version="4" library_locally_modified="yes">
+<deviceset name="NKR161" urn="urn:adsk.eagle:component:10512213/1" library_version="4">
 <gates>
 <gate name="G$1" symbol="HDSM-433C" x="0" y="0"/>
 </gates>
@@ -9851,7 +9861,60 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="G" pad="P$10"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:10512212/2"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10512212/1"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+</devicesets>
+</library>
+<library name="tactile-switches" urn="urn:adsk.eagle:library:10516572">
+<description>&lt;b&gt;Tactile Switches&lt;/b&gt;</description>
+<packages>
+<package name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:footprint:10516573/1" library_version="1">
+<smd name="P$1" x="-1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<smd name="P$2" x="1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<wire x1="-1.45" y1="1.45" x2="1.45" y2="1.45" width="0.127" layer="21"/>
+<wire x1="-1.45" y1="-1.45" x2="1.45" y2="-1.45" width="0.127" layer="21"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:package:10516575/2" type="model" library_version="1" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="3X4X2_MOMENTARY_SWITCH"/>
+</packageinstances>
+</package3d>
+</packages3d>
+<symbols>
+<symbol name="SWITCH-MOMENTARY-2" urn="urn:adsk.eagle:symbol:10516574/1" library_version="1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;</description>
+<wire x1="1.905" y1="0" x2="2.54" y2="0" width="0.254" layer="94"/>
+<wire x1="-2.54" y1="0" x2="1.905" y2="1.27" width="0.254" layer="94"/>
+<circle x="-2.54" y="0" radius="0.127" width="0.4064" layer="94"/>
+<circle x="2.54" y="0" radius="0.127" width="0.4064" layer="94"/>
+<text x="0" y="1.524" size="1.778" layer="95" font="vector" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-0.508" size="1.778" layer="96" font="vector" align="top-center">&gt;VALUE</text>
+<pin name="1" x="-5.08" y="0" visible="off" length="short" direction="pas" swaplevel="2"/>
+<pin name="2" x="5.08" y="0" visible="off" length="short" direction="pas" swaplevel="1" rot="R180"/>
+</symbol>
+</symbols>
+<devicesets>
+<deviceset name="3X4X2MM_SWITCH" urn="urn:adsk.eagle:component:10516576/1" locally_modified="yes" library_version="1" library_locally_modified="yes">
+<gates>
+<gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="3X4X2_MOMENTARY_SWITCH">
+<connects>
+<connect gate="G$1" pin="1" pad="P$1"/>
+<connect gate="G$1" pin="2" pad="P$2"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10516575/2"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -9897,18 +9960,28 @@ Source: AVX .. aphvc.pdf</description>
 <part name="GND5" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="GND6" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="+3V2" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
-<part name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3"/>
-<part name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3"/>
+<part name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K"/>
+<part name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K"/>
 <part name="GND7" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
-<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device=""/>
-<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device=""/>
+<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
 <part name="+3V3" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
-<part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/2"/>
+<part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/1"/>
 <part name="GND8" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" deviceset="3X4X2MM_SWITCH" device="" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN"/>
+<part name="GND9" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
+<part name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
+<part name="R17" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="0"/>
 </parts>
 <sheets>
 <sheet>
@@ -9944,8 +10017,8 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="VALUE" x="82.042" y="24.13" size="1.778" layer="96" rot="R90"/>
 </instance>
 <instance part="R8" gate="G$1" x="15.24" y="45.72" smashed="yes" rot="R180">
-<attribute name="NAME" x="19.05" y="44.2214" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="19.05" y="49.022" size="1.778" layer="96" rot="R180"/>
+<attribute name="NAME" x="19.05" y="44.4754" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="14.986" y="44.45" size="1.778" layer="96" rot="R180"/>
 </instance>
 <instance part="J4" gate="G$1" x="109.22" y="35.56" smashed="yes">
 <attribute name="NAME" x="109.22" y="37.084" size="1.778" layer="95" font="vector" align="bottom-center"/>
@@ -9966,8 +10039,47 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="VALUE" x="132.08" y="50.8" size="1.778" layer="96"/>
 </instance>
 <instance part="R9" gate="G$1" x="109.22" y="88.9" smashed="yes" rot="R180">
-<attribute name="NAME" x="113.03" y="87.4014" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="113.03" y="92.202" size="1.778" layer="96" rot="R180"/>
+<attribute name="NAME" x="108.204" y="87.6554" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="114.046" y="87.63" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R10" gate="G$1" x="99.06" y="86.36" smashed="yes" rot="R180">
+<attribute name="NAME" x="97.028" y="85.09" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="102.87" y="85.344" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R11" gate="G$1" x="109.22" y="83.82" smashed="yes" rot="R180">
+<attribute name="NAME" x="108.204" y="82.55" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="113.538" y="82.55" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R12" gate="G$1" x="99.06" y="81.28" smashed="yes" rot="R180">
+<attribute name="NAME" x="98.044" y="80.01" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="103.378" y="80.01" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R13" gate="G$1" x="109.22" y="78.74" smashed="yes" rot="R180">
+<attribute name="NAME" x="108.204" y="77.47" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="113.538" y="77.47" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R14" gate="G$1" x="99.06" y="76.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="98.044" y="74.93" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="103.378" y="74.93" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R15" gate="G$1" x="109.22" y="73.66" smashed="yes" rot="R180">
+<attribute name="NAME" x="108.204" y="72.39" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="113.538" y="72.39" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="J5" gate="G$1" x="25.4" y="55.88" smashed="yes">
+<attribute name="NAME" x="25.4" y="57.404" size="1.778" layer="95" font="vector" align="bottom-center"/>
+<attribute name="VALUE" x="25.4" y="55.372" size="1.778" layer="96" font="vector" align="top-center"/>
+</instance>
+<instance part="GND9" gate="1" x="15.24" y="50.8" smashed="yes">
+<attribute name="VALUE" x="12.7" y="48.26" size="1.778" layer="96"/>
+</instance>
+<instance part="R16" gate="G$1" x="91.44" y="60.96" smashed="yes" rot="R270">
+<attribute name="NAME" x="93.218" y="61.6966" size="1.778" layer="95"/>
+<attribute name="VALUE" x="93.472" y="59.182" size="1.778" layer="96"/>
+</instance>
+<instance part="R17" gate="G$1" x="99.06" y="53.34" smashed="yes">
+<attribute name="NAME" x="95.504" y="55.0926" size="1.778" layer="95"/>
+<attribute name="VALUE" x="100.838" y="55.118" size="1.778" layer="96"/>
 </instance>
 </instances>
 <busses>
@@ -10029,6 +10141,12 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="134.62" y1="58.42" x2="134.62" y2="55.88" width="0.1524" layer="91"/>
 <junction x="134.62" y="55.88"/>
 </segment>
+<segment>
+<pinref part="J5" gate="G$1" pin="1"/>
+<wire x1="20.32" y1="55.88" x2="15.24" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="15.24" y1="55.88" x2="15.24" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="GND9" gate="1" pin="GND"/>
+</segment>
 </net>
 <net name="+5V" class="0">
 <segment>
@@ -10045,6 +10163,9 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="U$1" gate="G$1" pin="RX"/>
 <wire x1="78.74" y1="88.9" x2="78.74" y2="48.26" width="0.1524" layer="91"/>
 <wire x1="78.74" y1="48.26" x2="73.66" y2="48.26" width="0.1524" layer="91"/>
+<pinref part="R9" gate="G$1" pin="2"/>
+<wire x1="104.14" y1="88.9" x2="78.74" y2="88.9" width="0.1524" layer="91"/>
+<junction x="78.74" y="88.9"/>
 </segment>
 </net>
 <net name="UART_TX" class="0">
@@ -10053,7 +10174,11 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="U$1" gate="G$1" pin="TX"/>
 <wire x1="76.2" y1="50.8" x2="73.66" y2="50.8" width="0.1524" layer="91"/>
 <wire x1="60.96" y1="86.36" x2="76.2" y2="86.36" width="0.1524" layer="91"/>
-<wire x1="76.2" y1="86.36" x2="76.2" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="76.2" y1="86.36" x2="76.2" y2="81.28" width="0.1524" layer="91"/>
+<pinref part="R12" gate="G$1" pin="2"/>
+<wire x1="76.2" y1="81.28" x2="76.2" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="93.98" y1="81.28" x2="76.2" y2="81.28" width="0.1524" layer="91"/>
+<junction x="76.2" y="81.28"/>
 </segment>
 </net>
 <net name="VBAT_D" class="0">
@@ -10073,8 +10198,10 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="R6" gate="G$1" pin="1"/>
 <wire x1="38.1" y1="53.34" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 <junction x="38.1" y="50.8"/>
-<label x="35.56" y="50.8" size="1.27" layer="95" rot="R180" xref="yes"/>
-<wire x1="35.56" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
+<pinref part="J5" gate="G$1" pin="2"/>
+<wire x1="30.48" y1="55.88" x2="33.02" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="55.88" x2="33.02" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$1" class="0">
@@ -10109,6 +10236,8 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="U$1" gate="G$1" pin="GPIO4"/>
 <wire x1="73.66" y1="45.72" x2="81.28" y2="45.72" width="0.1524" layer="91"/>
 <wire x1="81.28" y1="45.72" x2="81.28" y2="86.36" width="0.1524" layer="91"/>
+<pinref part="R10" gate="G$1" pin="2"/>
+<wire x1="81.28" y1="86.36" x2="93.98" y2="86.36" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$10" class="0">
@@ -10116,6 +10245,8 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="U$1" gate="G$1" pin="GPIO5"/>
 <wire x1="73.66" y1="43.18" x2="83.82" y2="43.18" width="0.1524" layer="91"/>
 <wire x1="83.82" y1="43.18" x2="83.82" y2="83.82" width="0.1524" layer="91"/>
+<pinref part="R11" gate="G$1" pin="2"/>
+<wire x1="83.82" y1="83.82" x2="104.14" y2="83.82" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="SEG_E" class="0">
@@ -10124,6 +10255,11 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="38.1" y1="40.64" x2="40.64" y2="40.64" width="0.1524" layer="91"/>
 <label x="38.1" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
+<segment>
+<pinref part="R13" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="78.74" x2="104.14" y2="78.74" width="0.1524" layer="91"/>
+<label x="91.44" y="78.74" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
 </net>
 <net name="SEG_F" class="0">
 <segment>
@@ -10131,6 +10267,11 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="38.1" y1="38.1" x2="40.64" y2="38.1" width="0.1524" layer="91"/>
 <label x="38.1" y="38.1" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
+<segment>
+<pinref part="R14" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="76.2" x2="93.98" y2="76.2" width="0.1524" layer="91"/>
+<label x="91.44" y="76.2" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
 </net>
 <net name="SEG_G" class="0">
 <segment>
@@ -10138,6 +10279,60 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="38.1" y1="35.56" x2="40.64" y2="35.56" width="0.1524" layer="91"/>
 <label x="38.1" y="35.56" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
+<segment>
+<pinref part="R15" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="73.66" x2="104.14" y2="73.66" width="0.1524" layer="91"/>
+<label x="91.44" y="73.66" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+</net>
+<net name="N$13" class="0">
+<segment>
+<pinref part="U$2" gate="G$1" pin="G"/>
+<pinref part="R15" gate="G$1" pin="1"/>
+<wire x1="114.3" y1="73.66" x2="116.84" y2="73.66" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$14" class="0">
+<segment>
+<pinref part="R14" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="F"/>
+<wire x1="104.14" y1="76.2" x2="116.84" y2="76.2" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$15" class="0">
+<segment>
+<pinref part="R13" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="E"/>
+<wire x1="114.3" y1="78.74" x2="116.84" y2="78.74" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$16" class="0">
+<segment>
+<pinref part="R11" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="C"/>
+<wire x1="114.3" y1="83.82" x2="116.84" y2="83.82" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$17" class="0">
+<segment>
+<pinref part="R9" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="A"/>
+<wire x1="114.3" y1="88.9" x2="116.84" y2="88.9" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$18" class="0">
+<segment>
+<pinref part="R10" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="B"/>
+<wire x1="104.14" y1="86.36" x2="116.84" y2="86.36" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$19" class="0">
+<segment>
+<pinref part="U$2" gate="G$1" pin="D"/>
+<pinref part="R12" gate="G$1" pin="1"/>
+<wire x1="116.84" y1="81.28" x2="104.14" y2="81.28" width="0.1524" layer="91"/>
+</segment>
 </net>
 </nets>
 </sheet>
diff --git a/esp8266-wifi-remote.s#9 b/esp8266-wifi-remote.s#9
index a7a6a96..a73462d 100644
--- a/esp8266-wifi-remote.s#9
+++ b/esp8266-wifi-remote.s#9
@@ -3,7 +3,7 @@
 <eagle version="9.3.2">
 <drawing>
 <settings>
-<setting alwaysvectorfont="yes"/>
+<setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
 <grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
@@ -423,7 +423,7 @@
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="1050170001" urn="urn:adsk.eagle:component:10491913/1" locally_modified="yes" prefix="J" library_version="1" library_locally_modified="yes">
+<deviceset name="1050170001" urn="urn:adsk.eagle:component:10491913/2" prefix="J" library_version="2" library_locally_modified="yes">
 <description>Conn.; Data; USB; Recept.; Micro; B Type; Bottom Mount, SMT, with Solder Tabs, Lead-Free</description>
 <gates>
 <gate name="G$1" symbol="1050170001" x="0" y="0"/>
@@ -528,7 +528,7 @@
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -557,7 +557,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -9689,7 +9689,7 @@ Source: AVX .. aphvc.pdf</description>
 <library name="pushbuttons" urn="urn:adsk.eagle:library:10244044">
 <description>&lt;b&gt;Pushbutton Switches&lt;/b&gt;</description>
 <packages>
-<package name="ELAB_PUSHBUTTON_1" library_version="2" library_locally_modified="yes">
+<package name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:footprint:10495488/1" library_version="3" library_locally_modified="yes">
 <pad name="P$1" x="-2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$2" x="2.5" y="-3.8" drill="0.8" diameter="1.8"/>
 <pad name="P$3" x="2.5" y="3.8" drill="0.8" diameter="1.8"/>
@@ -9700,6 +9700,13 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="-6.175" y1="12.25" x2="-6.175" y2="-5" width="0.127" layer="51"/>
 </package>
 </packages>
+<packages3d>
+<package3d name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:package:10495489/1" type="box" library_version="3">
+<packageinstances>
+<packageinstance name="ELAB_PUSHBUTTON_1"/>
+</packageinstances>
+</package3d>
+</packages3d>
 <symbols>
 <symbol name="SWITCH-MOMENTARY-2" urn="urn:adsk.eagle:symbol:10244046/1" library_version="2" library_locally_modified="yes">
 <description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST&lt;/h3&gt;
@@ -9715,7 +9722,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="ELAB_PUSHBUTTON_1" library_version="2" library_locally_modified="yes">
+<deviceset name="ELAB_PUSHBUTTON_1" urn="urn:adsk.eagle:component:10495490/1" library_version="3">
 <gates>
 <gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
 </gates>
@@ -9725,6 +9732,9 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="1" pad="P$1 P$4"/>
 <connect gate="G$1" pin="2" pad="P$2 P$3"/>
 </connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+</package3dinstances>
 <technologies>
 <technology name=""/>
 </technologies>
@@ -9754,7 +9764,7 @@ Source: AVX .. aphvc.pdf</description>
 </package>
 </packages>
 <packages3d>
-<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/2" type="model" library_version="4" library_locally_modified="yes">
+<package3d name="DIP-10-WIDE" urn="urn:adsk.eagle:package:10512212/1" type="box" library_version="4">
 <packageinstances>
 <packageinstance name="DIP-10-WIDE"/>
 </packageinstances>
@@ -9832,7 +9842,7 @@ Source: AVX .. aphvc.pdf</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="NKR161" urn="urn:adsk.eagle:component:10512213/1" locally_modified="yes" library_version="4" library_locally_modified="yes">
+<deviceset name="NKR161" urn="urn:adsk.eagle:component:10512213/1" library_version="4">
 <gates>
 <gate name="G$1" symbol="HDSM-433C" x="0" y="0"/>
 </gates>
@@ -9851,7 +9861,60 @@ Source: AVX .. aphvc.pdf</description>
 <connect gate="G$1" pin="G" pad="P$10"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:10512212/2"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10512212/1"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+</devicesets>
+</library>
+<library name="tactile-switches" urn="urn:adsk.eagle:library:10516572">
+<description>&lt;b&gt;Tactile Switches&lt;/b&gt;</description>
+<packages>
+<package name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:footprint:10516573/1" library_version="1">
+<smd name="P$1" x="-1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<smd name="P$2" x="1.375" y="0" dx="2" dy="1.05" layer="1" rot="R90"/>
+<wire x1="-1.45" y1="1.45" x2="1.45" y2="1.45" width="0.127" layer="21"/>
+<wire x1="-1.45" y1="-1.45" x2="1.45" y2="-1.45" width="0.127" layer="21"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="3X4X2_MOMENTARY_SWITCH" urn="urn:adsk.eagle:package:10516575/2" type="model" library_version="1" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="3X4X2_MOMENTARY_SWITCH"/>
+</packageinstances>
+</package3d>
+</packages3d>
+<symbols>
+<symbol name="SWITCH-MOMENTARY-2" urn="urn:adsk.eagle:symbol:10516574/1" library_version="1">
+<description>&lt;h3&gt;Momentary Switch (Pushbutton) - SPST&lt;/h3&gt;
+&lt;p&gt;Normally-open (NO) SPST momentary switches (buttons, pushbuttons).&lt;/p&gt;</description>
+<wire x1="1.905" y1="0" x2="2.54" y2="0" width="0.254" layer="94"/>
+<wire x1="-2.54" y1="0" x2="1.905" y2="1.27" width="0.254" layer="94"/>
+<circle x="-2.54" y="0" radius="0.127" width="0.4064" layer="94"/>
+<circle x="2.54" y="0" radius="0.127" width="0.4064" layer="94"/>
+<text x="0" y="1.524" size="1.778" layer="95" font="vector" align="bottom-center">&gt;NAME</text>
+<text x="0" y="-0.508" size="1.778" layer="96" font="vector" align="top-center">&gt;VALUE</text>
+<pin name="1" x="-5.08" y="0" visible="off" length="short" direction="pas" swaplevel="2"/>
+<pin name="2" x="5.08" y="0" visible="off" length="short" direction="pas" swaplevel="1" rot="R180"/>
+</symbol>
+</symbols>
+<devicesets>
+<deviceset name="3X4X2MM_SWITCH" urn="urn:adsk.eagle:component:10516576/1" locally_modified="yes" library_version="1" library_locally_modified="yes">
+<gates>
+<gate name="G$1" symbol="SWITCH-MOMENTARY-2" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="3X4X2_MOMENTARY_SWITCH">
+<connects>
+<connect gate="G$1" pin="1" pad="P$1"/>
+<connect gate="G$1" pin="2" pad="P$2"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:10516575/2"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -9885,7 +9948,7 @@ Source: AVX .. aphvc.pdf</description>
 <part name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1"/>
 <part name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R"/>
 <part name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="C-EU" device="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n"/>
-<part name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R"/>
+<part name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
 <part name="GND4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="P+2" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
 <part name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="C-EU" device="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u"/>
@@ -9897,17 +9960,27 @@ Source: AVX .. aphvc.pdf</description>
 <part name="GND5" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="GND6" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="+3V2" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
-<part name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3"/>
-<part name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3"/>
+<part name="R4" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330K"/>
+<part name="R5" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="100K"/>
 <part name="GND7" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="R6" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R7" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 <part name="R8" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
-<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device=""/>
-<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device=""/>
+<part name="J4" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
+<part name="J3" library="pushbuttons" library_urn="urn:adsk.eagle:library:10244044" deviceset="ELAB_PUSHBUTTON_1" device="" package3d_urn="urn:adsk.eagle:package:10495489/1"/>
 <part name="+3V3" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
-<part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/2"/>
+<part name="U$2" library="display-modules-led-charachter-and-numeric" library_urn="urn:adsk.eagle:library:10292913" deviceset="NKR161" device="" package3d_urn="urn:adsk.eagle:package:10512212/1"/>
 <part name="GND8" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
+<part name="R9" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R10" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R11" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R12" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R13" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R14" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R15" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" deviceset="3X4X2MM_SWITCH" device="" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN"/>
+<part name="GND9" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
+<part name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
 </parts>
 <sheets>
 <sheet>
@@ -9943,8 +10016,8 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="VALUE" x="82.042" y="24.13" size="1.778" layer="96" rot="R90"/>
 </instance>
 <instance part="R8" gate="G$1" x="15.24" y="45.72" smashed="yes" rot="R180">
-<attribute name="NAME" x="19.05" y="44.2214" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="19.05" y="49.022" size="1.778" layer="96" rot="R180"/>
+<attribute name="NAME" x="19.05" y="44.4754" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="14.986" y="44.45" size="1.778" layer="96" rot="R180"/>
 </instance>
 <instance part="J4" gate="G$1" x="109.22" y="35.56" smashed="yes">
 <attribute name="NAME" x="109.22" y="37.084" size="1.778" layer="95" font="vector" align="bottom-center"/>
@@ -9957,12 +10030,51 @@ Source: AVX .. aphvc.pdf</description>
 <instance part="+3V3" gate="G$1" x="127" y="50.8" smashed="yes">
 <attribute name="VALUE" x="124.46" y="45.72" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="U$2" gate="G$1" x="114.3" y="81.28" smashed="yes">
-<attribute name="NAME" x="104.14" y="91.44" size="1.778" layer="95"/>
-<attribute name="VALUE" x="104.14" y="60.96" size="1.778" layer="96"/>
+<instance part="U$2" gate="G$1" x="132.08" y="81.28" smashed="yes">
+<attribute name="NAME" x="121.92" y="91.44" size="1.778" layer="95"/>
+<attribute name="VALUE" x="121.92" y="60.96" size="1.778" layer="96"/>
 </instance>
-<instance part="GND8" gate="1" x="116.84" y="53.34" smashed="yes">
-<attribute name="VALUE" x="114.3" y="50.8" size="1.778" layer="96"/>
+<instance part="GND8" gate="1" x="134.62" y="53.34" smashed="yes">
+<attribute name="VALUE" x="132.08" y="50.8" size="1.778" layer="96"/>
+</instance>
+<instance part="R9" gate="G$1" x="109.22" y="88.9" smashed="yes" rot="R180">
+<attribute name="NAME" x="108.204" y="87.6554" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="114.046" y="87.63" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R10" gate="G$1" x="99.06" y="86.36" smashed="yes" rot="R180">
+<attribute name="NAME" x="97.028" y="85.09" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="102.87" y="85.344" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R11" gate="G$1" x="109.22" y="83.82" smashed="yes" rot="R180">
+<attribute name="NAME" x="108.204" y="82.55" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="113.538" y="82.55" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R12" gate="G$1" x="99.06" y="81.28" smashed="yes" rot="R180">
+<attribute name="NAME" x="98.044" y="80.01" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="103.378" y="80.01" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R13" gate="G$1" x="109.22" y="78.74" smashed="yes" rot="R180">
+<attribute name="NAME" x="108.204" y="77.47" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="113.538" y="77.47" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R14" gate="G$1" x="99.06" y="76.2" smashed="yes" rot="R180">
+<attribute name="NAME" x="98.044" y="74.93" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="103.378" y="74.93" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="R15" gate="G$1" x="109.22" y="73.66" smashed="yes" rot="R180">
+<attribute name="NAME" x="108.204" y="72.39" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="113.538" y="72.39" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="J5" gate="G$1" x="25.4" y="55.88" smashed="yes">
+<attribute name="NAME" x="25.4" y="57.404" size="1.778" layer="95" font="vector" align="bottom-center"/>
+<attribute name="VALUE" x="25.4" y="55.372" size="1.778" layer="96" font="vector" align="top-center"/>
+</instance>
+<instance part="GND9" gate="1" x="15.24" y="50.8" smashed="yes">
+<attribute name="VALUE" x="12.7" y="48.26" size="1.778" layer="96"/>
+</instance>
+<instance part="R16" gate="G$1" x="91.44" y="60.96" smashed="yes" rot="R270">
+<attribute name="NAME" x="93.218" y="61.6966" size="1.778" layer="95"/>
+<attribute name="VALUE" x="93.472" y="59.182" size="1.778" layer="96"/>
 </instance>
 </instances>
 <busses>
@@ -10016,12 +10128,19 @@ Source: AVX .. aphvc.pdf</description>
 <junction x="78.74" y="20.32"/>
 </segment>
 <segment>
-<pinref part="U$2" gate="G$1" pin="CC$1"/>
 <pinref part="GND8" gate="1" pin="GND"/>
-<wire x1="116.84" y1="58.42" x2="116.84" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="134.62" y1="55.88" x2="137.16" y2="55.88" width="0.1524" layer="91"/>
 <pinref part="U$2" gate="G$1" pin="CC$2"/>
-<wire x1="116.84" y1="58.42" x2="119.38" y2="58.42" width="0.1524" layer="91"/>
-<junction x="116.84" y="58.42"/>
+<wire x1="137.16" y1="55.88" x2="137.16" y2="58.42" width="0.1524" layer="91"/>
+<pinref part="U$2" gate="G$1" pin="CC$1"/>
+<wire x1="134.62" y1="58.42" x2="134.62" y2="55.88" width="0.1524" layer="91"/>
+<junction x="134.62" y="55.88"/>
+</segment>
+<segment>
+<pinref part="J5" gate="G$1" pin="1"/>
+<wire x1="20.32" y1="55.88" x2="15.24" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="15.24" y1="55.88" x2="15.24" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="GND9" gate="1" pin="GND"/>
 </segment>
 </net>
 <net name="+5V" class="0">
@@ -10039,8 +10158,8 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="U$1" gate="G$1" pin="RX"/>
 <wire x1="78.74" y1="88.9" x2="78.74" y2="48.26" width="0.1524" layer="91"/>
 <wire x1="78.74" y1="48.26" x2="73.66" y2="48.26" width="0.1524" layer="91"/>
-<pinref part="U$2" gate="G$1" pin="A"/>
-<wire x1="99.06" y1="88.9" x2="78.74" y2="88.9" width="0.1524" layer="91"/>
+<pinref part="R9" gate="G$1" pin="2"/>
+<wire x1="104.14" y1="88.9" x2="78.74" y2="88.9" width="0.1524" layer="91"/>
 <junction x="78.74" y="88.9"/>
 </segment>
 </net>
@@ -10051,9 +10170,9 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="76.2" y1="50.8" x2="73.66" y2="50.8" width="0.1524" layer="91"/>
 <wire x1="60.96" y1="86.36" x2="76.2" y2="86.36" width="0.1524" layer="91"/>
 <wire x1="76.2" y1="86.36" x2="76.2" y2="81.28" width="0.1524" layer="91"/>
-<pinref part="U$2" gate="G$1" pin="D"/>
+<pinref part="R12" gate="G$1" pin="2"/>
 <wire x1="76.2" y1="81.28" x2="76.2" y2="50.8" width="0.1524" layer="91"/>
-<wire x1="99.06" y1="81.28" x2="76.2" y2="81.28" width="0.1524" layer="91"/>
+<wire x1="93.98" y1="81.28" x2="76.2" y2="81.28" width="0.1524" layer="91"/>
 <junction x="76.2" y="81.28"/>
 </segment>
 </net>
@@ -10074,8 +10193,10 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="R6" gate="G$1" pin="1"/>
 <wire x1="38.1" y1="53.34" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 <junction x="38.1" y="50.8"/>
-<label x="35.56" y="50.8" size="1.27" layer="95" rot="R180" xref="yes"/>
-<wire x1="35.56" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
+<pinref part="J5" gate="G$1" pin="2"/>
+<wire x1="30.48" y1="55.88" x2="33.02" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="55.88" x2="33.02" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$1" class="0">
@@ -10110,8 +10231,8 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="U$1" gate="G$1" pin="GPIO4"/>
 <wire x1="73.66" y1="45.72" x2="81.28" y2="45.72" width="0.1524" layer="91"/>
 <wire x1="81.28" y1="45.72" x2="81.28" y2="86.36" width="0.1524" layer="91"/>
-<pinref part="U$2" gate="G$1" pin="B"/>
-<wire x1="81.28" y1="86.36" x2="99.06" y2="86.36" width="0.1524" layer="91"/>
+<pinref part="R10" gate="G$1" pin="2"/>
+<wire x1="81.28" y1="86.36" x2="93.98" y2="86.36" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$10" class="0">
@@ -10119,8 +10240,8 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="U$1" gate="G$1" pin="GPIO5"/>
 <wire x1="73.66" y1="43.18" x2="83.82" y2="43.18" width="0.1524" layer="91"/>
 <wire x1="83.82" y1="43.18" x2="83.82" y2="83.82" width="0.1524" layer="91"/>
-<pinref part="U$2" gate="G$1" pin="C"/>
-<wire x1="83.82" y1="83.82" x2="99.06" y2="83.82" width="0.1524" layer="91"/>
+<pinref part="R11" gate="G$1" pin="2"/>
+<wire x1="83.82" y1="83.82" x2="104.14" y2="83.82" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="SEG_E" class="0">
@@ -10130,9 +10251,9 @@ Source: AVX .. aphvc.pdf</description>
 <label x="38.1" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$2" gate="G$1" pin="E"/>
-<wire x1="96.52" y1="78.74" x2="99.06" y2="78.74" width="0.1524" layer="91"/>
-<label x="96.52" y="78.74" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="R13" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="78.74" x2="104.14" y2="78.74" width="0.1524" layer="91"/>
+<label x="91.44" y="78.74" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SEG_F" class="0">
@@ -10142,9 +10263,9 @@ Source: AVX .. aphvc.pdf</description>
 <label x="38.1" y="38.1" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<pinref part="U$2" gate="G$1" pin="F"/>
-<wire x1="96.52" y1="76.2" x2="99.06" y2="76.2" width="0.1524" layer="91"/>
-<label x="96.52" y="76.2" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="R14" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="76.2" x2="93.98" y2="76.2" width="0.1524" layer="91"/>
+<label x="91.44" y="76.2" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SEG_G" class="0">
@@ -10154,9 +10275,58 @@ Source: AVX .. aphvc.pdf</description>
 <label x="38.1" y="35.56" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
+<pinref part="R15" gate="G$1" pin="2"/>
+<wire x1="91.44" y1="73.66" x2="104.14" y2="73.66" width="0.1524" layer="91"/>
+<label x="91.44" y="73.66" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+</net>
+<net name="N$13" class="0">
+<segment>
 <pinref part="U$2" gate="G$1" pin="G"/>
-<wire x1="96.52" y1="73.66" x2="99.06" y2="73.66" width="0.1524" layer="91"/>
-<label x="96.52" y="73.66" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="R15" gate="G$1" pin="1"/>
+<wire x1="114.3" y1="73.66" x2="116.84" y2="73.66" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$14" class="0">
+<segment>
+<pinref part="R14" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="F"/>
+<wire x1="104.14" y1="76.2" x2="116.84" y2="76.2" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$15" class="0">
+<segment>
+<pinref part="R13" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="E"/>
+<wire x1="114.3" y1="78.74" x2="116.84" y2="78.74" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$16" class="0">
+<segment>
+<pinref part="R11" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="C"/>
+<wire x1="114.3" y1="83.82" x2="116.84" y2="83.82" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$17" class="0">
+<segment>
+<pinref part="R9" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="A"/>
+<wire x1="114.3" y1="88.9" x2="116.84" y2="88.9" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$18" class="0">
+<segment>
+<pinref part="R10" gate="G$1" pin="1"/>
+<pinref part="U$2" gate="G$1" pin="B"/>
+<wire x1="104.14" y1="86.36" x2="116.84" y2="86.36" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$19" class="0">
+<segment>
+<pinref part="U$2" gate="G$1" pin="D"/>
+<pinref part="R12" gate="G$1" pin="1"/>
+<wire x1="116.84" y1="81.28" x2="104.14" y2="81.28" width="0.1524" layer="91"/>
 </segment>
 </net>
 </nets>
diff --git a/esp8266-wifi-remote.sch b/esp8266-wifi-remote.sch
index a419c8a..f72b6b3 100644
--- a/esp8266-wifi-remote.sch
+++ b/esp8266-wifi-remote.sch
@@ -528,7 +528,7 @@
 <description>PMIC - Battery Chargers</description>
 <packages>
 <package name="SOT23-5L" urn="urn:adsk.eagle:footprint:8084629/1" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <wire x1="1.422" y1="0.81" x2="1.422" y2="-0.81" width="0.1524" layer="21"/>
 <wire x1="1.422" y1="-0.81" x2="-1.422" y2="-0.81" width="0.1524" layer="51"/>
@@ -557,7 +557,7 @@ package type OT</description>
 </packages>
 <packages3d>
 <package3d name="SOT23-5L" urn="urn:adsk.eagle:package:10292859/2" type="model" library_version="2">
-<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
+<description>&lt;b&gt;Small Outline Transistor&lt;/b&gt;&lt;p&gt;
 package type OT</description>
 <packageinstances>
 <packageinstance name="SOT23-5L"/>
@@ -9954,7 +9954,7 @@ Source: AVX .. aphvc.pdf</description>
 <part name="J2" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1"/>
 <part name="R1" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330R"/>
 <part name="C1" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="C-EU" device="C0603" package3d_urn="urn:adsk.eagle:package:23616/2" value="100n"/>
-<part name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="330"/>
+<part name="R2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="2K7"/>
 <part name="GND4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="P+2" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
 <part name="C2" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="C-EU" device="C0805" package3d_urn="urn:adsk.eagle:package:23617/2" value="1u"/>
@@ -9987,9 +9987,10 @@ Source: AVX .. aphvc.pdf</description>
 <part name="J5" library="tactile-switches" library_urn="urn:adsk.eagle:library:10516572" deviceset="3X4X2MM_SWITCH" device="" package3d_urn="urn:adsk.eagle:package:10516575/2" value="China_BTN"/>
 <part name="GND9" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="R16" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="10K"/>
-<part name="R17" library="rcl" library_urn="urn:adsk.eagle:library:334" deviceset="R-EU_" device="R0603" package3d_urn="urn:adsk.eagle:package:23555/3" value="0"/>
 <part name="GND10" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 <part name="+3V4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="J6" library="SparkFun-Connectors" library_urn="urn:adsk.eagle:library:513" deviceset="CONN_02" device="" package3d_urn="urn:adsk.eagle:package:38039/1"/>
+<part name="GND11" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="GND" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -10000,8 +10001,8 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="45.72" y="53.34" size="1.778" layer="95"/>
 <attribute name="VALUE" x="45.72" y="27.94" size="1.778" layer="96"/>
 </instance>
-<instance part="+3V1" gate="G$1" x="7.62" y="68.58" smashed="yes">
-<attribute name="VALUE" x="5.08" y="63.5" size="1.778" layer="96" rot="R90"/>
+<instance part="+3V1" gate="G$1" x="0" y="68.58" smashed="yes">
+<attribute name="VALUE" x="-2.54" y="63.5" size="1.778" layer="96" rot="R90"/>
 </instance>
 <instance part="GND1" gate="1" x="96.52" y="17.78" smashed="yes">
 <attribute name="VALUE" x="93.98" y="15.24" size="1.778" layer="96"/>
@@ -10024,13 +10025,13 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="77.2414" y="24.13" size="1.778" layer="95" rot="R90"/>
 <attribute name="VALUE" x="82.042" y="24.13" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="R8" gate="G$1" x="15.24" y="45.72" smashed="yes" rot="R180">
-<attribute name="NAME" x="19.05" y="44.4754" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="14.986" y="44.45" size="1.778" layer="96" rot="R180"/>
+<instance part="R8" gate="G$1" x="7.62" y="45.72" smashed="yes" rot="R180">
+<attribute name="NAME" x="11.43" y="44.4754" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="7.366" y="44.45" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="J4" gate="G$1" x="109.22" y="35.56" smashed="yes">
-<attribute name="NAME" x="109.22" y="37.084" size="1.778" layer="95" font="vector" align="bottom-center"/>
-<attribute name="VALUE" x="109.22" y="35.052" size="1.778" layer="96" font="vector" align="top-center"/>
+<instance part="J4" gate="G$1" x="15.24" y="25.4" smashed="yes">
+<attribute name="NAME" x="15.24" y="26.924" size="1.778" layer="95" font="vector" align="bottom-center"/>
+<attribute name="VALUE" x="15.24" y="24.892" size="1.778" layer="96" font="vector" align="top-center"/>
 </instance>
 <instance part="J3" gate="G$1" x="108.966" y="43.18" smashed="yes">
 <attribute name="NAME" x="108.966" y="44.704" size="1.778" layer="95" font="vector" align="bottom-center"/>
@@ -10074,27 +10075,30 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="108.204" y="72.39" size="1.778" layer="95" rot="R180"/>
 <attribute name="VALUE" x="113.538" y="72.39" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="J5" gate="G$1" x="25.4" y="55.88" smashed="yes">
-<attribute name="NAME" x="25.4" y="57.404" size="1.778" layer="95" font="vector" align="bottom-center"/>
-<attribute name="VALUE" x="25.4" y="55.372" size="1.778" layer="96" font="vector" align="top-center"/>
+<instance part="J5" gate="G$1" x="12.7" y="55.88" smashed="yes">
+<attribute name="NAME" x="12.7" y="57.404" size="1.778" layer="95" font="vector" align="bottom-center"/>
+<attribute name="VALUE" x="12.7" y="55.372" size="1.778" layer="96" font="vector" align="top-center"/>
 </instance>
-<instance part="GND9" gate="1" x="15.24" y="50.8" smashed="yes">
-<attribute name="VALUE" x="12.7" y="48.26" size="1.778" layer="96"/>
+<instance part="GND9" gate="1" x="5.08" y="50.8" smashed="yes">
+<attribute name="VALUE" x="2.54" y="48.26" size="1.778" layer="96"/>
 </instance>
 <instance part="R16" gate="G$1" x="91.44" y="60.96" smashed="yes" rot="R270">
 <attribute name="NAME" x="93.218" y="61.6966" size="1.778" layer="95"/>
 <attribute name="VALUE" x="93.472" y="59.182" size="1.778" layer="96"/>
 </instance>
-<instance part="R17" gate="G$1" x="99.06" y="53.34" smashed="yes">
-<attribute name="NAME" x="95.504" y="55.0926" size="1.778" layer="95"/>
-<attribute name="VALUE" x="100.838" y="55.118" size="1.778" layer="96"/>
-</instance>
-<instance part="GND10" gate="1" x="106.68" y="50.8" smashed="yes">
-<attribute name="VALUE" x="104.14" y="48.26" size="1.778" layer="96"/>
+<instance part="GND10" gate="1" x="96.52" y="48.26" smashed="yes">
+<attribute name="VALUE" x="93.98" y="45.72" size="1.778" layer="96"/>
 </instance>
 <instance part="+3V4" gate="G$1" x="91.44" y="68.58" smashed="yes">
 <attribute name="VALUE" x="88.9" y="63.5" size="1.778" layer="96" rot="R90"/>
 </instance>
+<instance part="J6" gate="G$1" x="106.68" y="53.34" smashed="yes" rot="MR0">
+<attribute name="VALUE" x="109.22" y="48.514" size="1.778" layer="96" font="vector" rot="MR0"/>
+<attribute name="NAME" x="109.22" y="58.928" size="1.778" layer="95" font="vector" rot="MR0"/>
+</instance>
+<instance part="GND11" gate="1" x="0" y="17.78" smashed="yes">
+<attribute name="VALUE" x="-2.54" y="15.24" size="1.778" layer="96"/>
+</instance>
 </instances>
 <busses>
 </busses>
@@ -10103,26 +10107,22 @@ Source: AVX .. aphvc.pdf</description>
 <segment>
 <pinref part="+3V1" gate="G$1" pin="+3V3"/>
 <pinref part="U$1" gate="G$1" pin="VCC"/>
-<wire x1="40.64" y1="33.02" x2="7.62" y2="33.02" width="0.1524" layer="91"/>
-<wire x1="7.62" y1="33.02" x2="7.62" y2="45.72" width="0.1524" layer="91"/>
-<wire x1="7.62" y1="45.72" x2="7.62" y2="63.5" width="0.1524" layer="91"/>
-<wire x1="7.62" y1="63.5" x2="7.62" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="40.64" y1="33.02" x2="0" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="0" y1="33.02" x2="0" y2="45.72" width="0.1524" layer="91"/>
+<wire x1="0" y1="45.72" x2="0" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="0" y1="63.5" x2="0" y2="66.04" width="0.1524" layer="91"/>
 <pinref part="R6" gate="G$1" pin="2"/>
-<wire x1="38.1" y1="63.5" x2="7.62" y2="63.5" width="0.1524" layer="91"/>
-<junction x="7.62" y="63.5"/>
+<wire x1="38.1" y1="63.5" x2="0" y2="63.5" width="0.1524" layer="91"/>
+<junction x="0" y="63.5"/>
 <pinref part="R8" gate="G$1" pin="2"/>
-<wire x1="10.16" y1="45.72" x2="7.62" y2="45.72" width="0.1524" layer="91"/>
-<junction x="7.62" y="45.72"/>
+<wire x1="2.54" y1="45.72" x2="0" y2="45.72" width="0.1524" layer="91"/>
+<junction x="0" y="45.72"/>
 </segment>
 <segment>
-<pinref part="J4" gate="G$1" pin="2"/>
-<wire x1="114.3" y1="35.56" x2="127" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="+3V3" gate="G$1" pin="+3V3"/>
-<wire x1="127" y1="35.56" x2="127" y2="43.18" width="0.1524" layer="91"/>
 <pinref part="J3" gate="G$1" pin="2"/>
 <wire x1="127" y1="43.18" x2="127" y2="48.26" width="0.1524" layer="91"/>
 <wire x1="114.046" y1="43.18" x2="127" y2="43.18" width="0.1524" layer="91"/>
-<junction x="127" y="43.18"/>
 </segment>
 <segment>
 <pinref part="R16" gate="G$1" pin="1"/>
@@ -10161,14 +10161,21 @@ Source: AVX .. aphvc.pdf</description>
 </segment>
 <segment>
 <pinref part="J5" gate="G$1" pin="1"/>
-<wire x1="20.32" y1="55.88" x2="15.24" y2="55.88" width="0.1524" layer="91"/>
-<wire x1="15.24" y1="55.88" x2="15.24" y2="53.34" width="0.1524" layer="91"/>
+<wire x1="7.62" y1="55.88" x2="5.08" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="5.08" y1="55.88" x2="5.08" y2="53.34" width="0.1524" layer="91"/>
 <pinref part="GND9" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="R17" gate="G$1" pin="2"/>
-<wire x1="104.14" y1="53.34" x2="106.68" y2="53.34" width="0.1524" layer="91"/>
 <pinref part="GND10" gate="1" pin="GND"/>
+<wire x1="96.52" y1="50.8" x2="96.52" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="J6" gate="G$1" pin="1"/>
+<wire x1="96.52" y1="53.34" x2="99.06" y2="53.34" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="J4" gate="G$1" pin="1"/>
+<wire x1="10.16" y1="25.4" x2="0" y2="25.4" width="0.1524" layer="91"/>
+<wire x1="0" y1="25.4" x2="0" y2="20.32" width="0.1524" layer="91"/>
+<pinref part="GND11" gate="1" pin="GND"/>
 </segment>
 </net>
 <net name="+5V" class="0">
@@ -10207,8 +10214,13 @@ Source: AVX .. aphvc.pdf</description>
 <net name="VBAT_D" class="0">
 <segment>
 <pinref part="U$1" gate="G$1" pin="ADC"/>
-<wire x1="35.56" y1="48.26" x2="40.64" y2="48.26" width="0.1524" layer="91"/>
-<label x="35.56" y="48.26" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="25.4" y1="48.26" x2="27.94" y2="48.26" width="0.1524" layer="91"/>
+<label x="25.4" y="48.26" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J4" gate="G$1" pin="2"/>
+<wire x1="27.94" y1="48.26" x2="40.64" y2="48.26" width="0.1524" layer="91"/>
+<wire x1="20.32" y1="25.4" x2="27.94" y2="25.4" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="25.4" x2="27.94" y2="48.26" width="0.1524" layer="91"/>
+<junction x="27.94" y="48.26"/>
 </segment>
 </net>
 <net name="RST" class="0">
@@ -10222,27 +10234,27 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="38.1" y1="53.34" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 <junction x="38.1" y="50.8"/>
 <pinref part="J5" gate="G$1" pin="2"/>
-<wire x1="30.48" y1="55.88" x2="33.02" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="17.78" y1="55.88" x2="33.02" y2="55.88" width="0.1524" layer="91"/>
 <wire x1="33.02" y1="55.88" x2="33.02" y2="50.8" width="0.1524" layer="91"/>
 <wire x1="33.02" y1="50.8" x2="38.1" y2="50.8" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$1" class="0">
+<net name="PS" class="0">
 <segment>
 <pinref part="U$1" gate="G$1" pin="GPIO15"/>
 <wire x1="73.66" y1="35.56" x2="78.74" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="R7" gate="G$1" pin="2"/>
 <wire x1="78.74" y1="35.56" x2="78.74" y2="33.02" width="0.1524" layer="91"/>
-<pinref part="J4" gate="G$1" pin="1"/>
-<wire x1="104.14" y1="35.56" x2="78.74" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="86.36" y1="35.56" x2="78.74" y2="35.56" width="0.1524" layer="91"/>
 <junction x="78.74" y="35.56"/>
+<label x="86.36" y="35.56" size="1.778" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="N$2" class="0">
 <segment>
 <pinref part="R8" gate="G$1" pin="1"/>
 <pinref part="U$1" gate="G$1" pin="CH_PD"/>
-<wire x1="20.32" y1="45.72" x2="40.64" y2="45.72" width="0.1524" layer="91"/>
+<wire x1="12.7" y1="45.72" x2="40.64" y2="45.72" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$5" class="0">
@@ -10362,11 +10374,10 @@ Source: AVX .. aphvc.pdf</description>
 <pinref part="U$1" gate="G$1" pin="GPIO0"/>
 <wire x1="73.66" y1="40.64" x2="91.44" y2="40.64" width="0.1524" layer="91"/>
 <pinref part="R16" gate="G$1" pin="2"/>
-<wire x1="91.44" y1="40.64" x2="91.44" y2="53.34" width="0.1524" layer="91"/>
-<pinref part="R17" gate="G$1" pin="1"/>
-<wire x1="91.44" y1="53.34" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
-<wire x1="93.98" y1="53.34" x2="91.44" y2="53.34" width="0.1524" layer="91"/>
-<junction x="91.44" y="53.34"/>
+<wire x1="91.44" y1="40.64" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<pinref part="J6" gate="G$1" pin="2"/>
+<wire x1="99.06" y1="55.88" x2="91.44" y2="55.88" width="0.1524" layer="91"/>
+<junction x="91.44" y="55.88"/>
 </segment>
 </net>
 </nets>
@@ -10433,12 +10444,12 @@ Source: AVX .. aphvc.pdf</description>
 <attribute name="NAME" x="194.564" y="76.581" size="1.778" layer="95"/>
 <attribute name="VALUE" x="194.564" y="71.501" size="1.778" layer="96"/>
 </instance>
-<instance part="C6" gate="G$1" x="114.3" y="73.66" smashed="yes" rot="R180">
-<attribute name="NAME" x="112.776" y="73.279" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="112.776" y="78.359" size="1.778" layer="96" rot="R180"/>
+<instance part="C6" gate="G$1" x="109.22" y="73.66" smashed="yes" rot="R180">
+<attribute name="NAME" x="107.696" y="73.279" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="107.696" y="78.359" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="GND5" gate="1" x="114.3" y="60.96" smashed="yes">
-<attribute name="VALUE" x="111.76" y="58.42" size="1.778" layer="96"/>
+<instance part="GND5" gate="1" x="109.22" y="60.96" smashed="yes">
+<attribute name="VALUE" x="106.68" y="58.42" size="1.778" layer="96"/>
 </instance>
 <instance part="GND6" gate="1" x="91.44" y="60.96" smashed="yes">
 <attribute name="VALUE" x="88.9" y="58.42" size="1.778" layer="96"/>
@@ -10513,7 +10524,7 @@ Source: AVX .. aphvc.pdf</description>
 </segment>
 <segment>
 <pinref part="C6" gate="G$1" pin="1"/>
-<wire x1="114.3" y1="71.12" x2="114.3" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="109.22" y1="71.12" x2="109.22" y2="63.5" width="0.1524" layer="91"/>
 <pinref part="GND5" gate="1" pin="GND"/>
 </segment>
 <segment>
@@ -10589,11 +10600,11 @@ Source: AVX .. aphvc.pdf</description>
 <wire x1="127" y1="71.12" x2="127" y2="76.2" width="0.1524" layer="91"/>
 <junction x="127" y="76.2"/>
 <pinref part="C6" gate="G$1" pin="2"/>
-<wire x1="127" y1="78.74" x2="114.3" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="127" y1="78.74" x2="109.22" y2="78.74" width="0.1524" layer="91"/>
 <junction x="127" y="78.74"/>
-<wire x1="101.6" y1="78.74" x2="114.3" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="101.6" y1="78.74" x2="109.22" y2="78.74" width="0.1524" layer="91"/>
 <junction x="101.6" y="78.74"/>
-<junction x="114.3" y="78.74"/>
+<junction x="109.22" y="78.74"/>
 <pinref part="R4" gate="G$1" pin="1"/>
 <wire x1="116.84" y1="48.26" x2="101.6" y2="48.26" width="0.1524" layer="91"/>
 <wire x1="101.6" y1="48.26" x2="101.6" y2="55.88" width="0.1524" layer="91"/>