diff --git a/archive/eagle.epf b/archive/eagle.epf
--- a/archive/eagle.epf
+++ b/archive/eagle.epf
@@ -390,66 +390,19 @@ UsedLibrary="/home/ethanzonca/Projects/S
 UsedLibrary="/home/ethanzonca/Projects/ZonCoffeeOLED/lbr/microbuilder.lbr"
 
 [Win_1]
-Type="Library Editor"
-Loc="0 0 625 720"
-State=2
-Number=3
-File="/home/ethanzonca/Projects/protofusion-hardware/lbr/Protofusion.lbr"
-View="-17.843 -9.76376 19.775 9.25576"
-WireWidths=" 0 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.4064 0.127 0.254"
+Type="Board Editor"
+Loc="0 0 599 399"
+State=3
+Number=2
+File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
+View="33.4219 0.361366 50.7353 13.2192"
+WireWidths=" 0 0.254 0.3048 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.4064"
 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.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
 ViaDiameters=" 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"
 ViaDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
 HoleDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
-TextSizes=" 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 0.0254 1.778 1.27"
-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.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 1.27 2.54"
-WireBend=2
-WireBendSet=0
-WireCap=1
-MiterStyle=0
-PadShape=0
-ViaShape=0
-PolygonPour=0
-PolygonRank=0
-PolygonThermals=1
-PolygonOrphans=0
-TextRatio=8
-DimensionUnit=1
-DimensionPrecision=2
-DimensionShowUnit=0
-PinDirection=6
-PinFunction=0
-PinLength=1
-PinVisible=0
-SwapLevel=0
-ArcDirection=0
-AddLevel=2
-PadsSameType=0
-Layer=94
-Device="CAP-ARRAY"
-
-[Win_2]
-Type="Board Editor"
-Loc="7 10 632 730"
-State=3
-Number=2
-File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
-View="-2.52153 -9.35182 40.1009 17.4957"
-WireWidths=" 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.4064 0.3048 0 0.254"
-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.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
-ViaDiameters=" 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"
-ViaDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.381"
-HoleDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
-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"
+TextSizes=" 0.254 0.3048 0.4064 0.6096 1.016 1.27 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778 0.8128"
 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"
@@ -461,17 +414,17 @@ SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0
 WireBend=0
 WireBendSet=0
 WireCap=1
-MiterStyle=1
+MiterStyle=0
 PadShape=0
-ViaShape=1
+ViaShape=0
 PolygonPour=0
 PolygonRank=1
 PolygonThermals=1
 PolygonOrphans=0
-TextRatio=8
-DimensionUnit=2
-DimensionPrecision=6
-DimensionShowUnit=1
+TextRatio=16
+DimensionUnit=1
+DimensionPrecision=2
+DimensionShowUnit=0
 PinDirection=3
 PinFunction=0
 PinLength=2
@@ -482,20 +435,20 @@ AddLevel=2
 PadsSameType=0
 Layer=16
 
-[Win_3]
+[Win_2]
 Type="Schematic Editor"
-Loc="640 0 1265 720"
-State=0
+Loc="0 0 599 399"
+State=3
 Number=1
 File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.sch"
-View="191.228 31.7454 313.784 91.1856"
+View="120.991 -12.2067 238.547 120.456"
 WireWidths=" 0 0.3048 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.4064 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.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
 ViaDiameters=" 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"
 ViaDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
 HoleDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
-TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 6.4516 5.08 3.81 2.1844 2.54"
+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"
@@ -526,13 +479,13 @@ SwapLevel=0
 ArcDirection=0
 AddLevel=2
 PadsSameType=0
-Layer=113
-Views=" 1: 191.228 31.7454 313.784 91.1856"
+Layer=91
+Views=" 1: 120.991 -12.2067 238.547 120.456"
 Sheet=1
 
-[Win_4]
+[Win_3]
 Type="Control Panel"
-Loc="438 163 1037 562"
+Loc="585 230 1184 629"
 State=2
 Number=0
 
@@ -541,4 +494,3 @@ Screen="1280 800"
 Window="Win_1"
 Window="Win_2"
 Window="Win_3"
-Window="Win_4"
diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="6.4">
+<eagle version="6.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
@@ -8,7 +8,7 @@
 </settings>
 <grid distance="25" unitdist="mil" unit="mil" style="lines" multiple="1" display="no" altdistance="6.25" altunitdist="mil" altunit="mil"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="no" active="yes"/>
+<layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
 <layer number="3" name="Route3" color="4" fill="3" visible="no" active="no"/>
 <layer number="4" name="Route4" color="1" fill="4" visible="no" active="no"/>
@@ -27,11 +27,11 @@
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
-<layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="20" name="Dimension" color="15" fill="1" visible="no" active="yes"/>
 <layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
@@ -204,10 +204,10 @@ chip</description>
 <wire x1="1.346" y1="0.483" x2="1.346" y2="-0.483" width="0.0508" layer="39"/>
 <wire x1="1.346" y1="-0.483" x2="-1.346" y2="-0.483" width="0.0508" layer="39"/>
 <wire x1="-1.346" y1="-0.483" x2="-1.346" y2="0.483" width="0.0508" layer="39"/>
-<wire x1="-1.27" y1="-0.635" x2="-1.27" y2="0.635" width="0.2032" layer="51"/>
-<wire x1="-1.27" y1="0.635" x2="1.27" y2="0.635" width="0.2032" layer="51"/>
-<wire x1="1.27" y1="0.635" x2="1.27" y2="-0.635" width="0.2032" layer="51"/>
-<wire x1="1.27" y1="-0.635" x2="-1.27" y2="-0.635" width="0.2032" layer="51"/>
+<wire x1="-1.27" y1="-0.635" x2="-1.27" y2="0.635" width="0.2032" layer="21"/>
+<wire x1="-1.27" y1="0.635" x2="1.27" y2="0.635" width="0.2032" layer="21"/>
+<wire x1="1.27" y1="0.635" x2="1.27" y2="-0.635" width="0.2032" layer="21"/>
+<wire x1="1.27" y1="-0.635" x2="-1.27" y2="-0.635" width="0.2032" layer="21"/>
 <smd name="1" x="-0.65" y="0" dx="0.7" dy="0.9" layer="1"/>
 <smd name="2" x="0.65" y="0" dx="0.7" dy="0.9" layer="1"/>
 <text x="1.397" y="-0.1905" size="0.8128" layer="25" ratio="18">&gt;NAME</text>
@@ -260,25 +260,8 @@ chip</description>
 <smd name="3" x="-7.7" y="-3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="2" x="-7.7" y="-3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="1" x="-7.7" y="-4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<text x="-23" y="1" size="1.016" layer="51">Active Area 0.91"</text>
-<text x="-22" y="-1" size="1.016" layer="51">128x32 Pixels</text>
 <text x="-30" y="6.5" size="0.8128" layer="25" ratio="18">&gt;NAME</text>
 <text x="-30" y="-7.5" size="0.4064" layer="27" ratio="10">&gt;VALUE</text>
-<rectangle x1="-8.2" y1="4.375" x2="-6.4" y2="4.725" layer="51"/>
-<rectangle x1="-8.2" y1="3.725" x2="-6.4" y2="4.075" layer="51"/>
-<rectangle x1="-8.2" y1="3.075" x2="-6.4" y2="3.425" layer="51"/>
-<rectangle x1="-8.2" y1="2.425" x2="-6.4" y2="2.775" layer="51"/>
-<rectangle x1="-8.2" y1="1.775" x2="-6.4" y2="2.125" layer="51"/>
-<rectangle x1="-8.2" y1="1.125" x2="-6.4" y2="1.475" layer="51"/>
-<rectangle x1="-8.2" y1="0.475" x2="-6.4" y2="0.825" layer="51"/>
-<rectangle x1="-8.2" y1="-0.175" x2="-6.4" y2="0.175" layer="51"/>
-<rectangle x1="-8.2" y1="-0.825" x2="-6.4" y2="-0.475" layer="51"/>
-<rectangle x1="-8.2" y1="-1.475" x2="-6.4" y2="-1.125" layer="51"/>
-<rectangle x1="-8.2" y1="-2.125" x2="-6.4" y2="-1.775" layer="51"/>
-<rectangle x1="-8.2" y1="-2.775" x2="-6.4" y2="-2.425" layer="51"/>
-<rectangle x1="-8.2" y1="-3.425" x2="-6.4" y2="-3.075" layer="51"/>
-<rectangle x1="-8.2" y1="-4.075" x2="-6.4" y2="-3.725" layer="51"/>
-<rectangle x1="-8.2" y1="-4.725" x2="-6.4" y2="-4.375" layer="51"/>
 </package>
 </packages>
 </library>
@@ -597,60 +580,6 @@ You are welcome to use this library for 
 <pad name="1" x="0" y="2.54" drill="0.381"/>
 <pad name="6" x="0" y="-3.81" drill="0.381"/>
 </package>
-<package name="0603-ARV-4">
-<text x="-1.905" y="-2.794" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="-1.905" y="1.524" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
-<smd name="1" x="-1.1811" y="0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="2" x="-0.3937" y="0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="3" x="0.3937" y="0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="4" x="1.1811" y="0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="5" x="1.1811" y="-0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="6" x="0.3937" y="-0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="7" x="-0.3937" y="-0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="8" x="-1.1811" y="-0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<wire x1="-1.6002" y1="-0.4953" x2="1.6002" y2="-0.4953" width="0.127" layer="21"/>
-<wire x1="1.6002" y1="-0.4953" x2="1.6002" y2="0.4953" width="0.127" layer="21"/>
-<wire x1="1.6002" y1="0.4953" x2="-1.6002" y2="0.4953" width="0.127" layer="21"/>
-<wire x1="-1.6002" y1="0.4953" x2="-1.6002" y2="-0.4953" width="0.127" layer="21"/>
-<wire x1="-1.6002" y1="0.4953" x2="-1.6002" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="-1.6002" y1="0.8128" x2="-1.4478" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="-1.4478" y1="0.8128" x2="-1.3462" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="-1.3462" y1="0.6858" x2="-1.016" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="-1.016" y1="0.6858" x2="-0.9144" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="-0.9144" y1="0.8128" x2="-0.6604" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="-0.6604" y1="0.8128" x2="-0.5588" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="-0.5588" y1="0.6858" x2="-0.2286" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="-0.2286" y1="0.6858" x2="-0.1524" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="-0.1524" y1="0.8128" x2="0.127" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="0.127" y1="0.8128" x2="0.2286" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="0.2286" y1="0.6858" x2="0.5588" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="0.5588" y1="0.6858" x2="0.6604" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="0.6604" y1="0.8128" x2="0.9144" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="0.9144" y1="0.8128" x2="1.016" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="1.016" y1="0.6858" x2="1.3462" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="1.3462" y1="0.6858" x2="1.4478" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="1.4478" y1="0.8128" x2="1.6002" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="1.6002" y1="0.8128" x2="1.6002" y2="0.4953" width="0.127" layer="21"/>
-<wire x1="1.6002" y1="-0.4953" x2="1.6002" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="1.6002" y1="-0.8128" x2="1.4478" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="1.4478" y1="-0.8128" x2="1.3462" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="1.3462" y1="-0.6858" x2="1.016" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="1.016" y1="-0.6858" x2="0.9144" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="0.9144" y1="-0.8128" x2="0.635" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="0.635" y1="-0.8128" x2="0.5588" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="0.5588" y1="-0.6858" x2="0.2286" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="0.2286" y1="-0.6858" x2="0.1524" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="0.1524" y1="-0.8128" x2="-0.127" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="-0.127" y1="-0.8128" x2="-0.2286" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="-0.2286" y1="-0.6858" x2="-0.5842" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="-0.5842" y1="-0.6858" x2="-0.6604" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="-0.6604" y1="-0.8128" x2="-0.9144" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="-0.9144" y1="-0.8128" x2="-1.016" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="-1.016" y1="-0.6858" x2="-1.3462" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="-1.3462" y1="-0.6858" x2="-1.4478" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="-1.4478" y1="-0.8128" x2="-1.6002" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="-1.6002" y1="-0.8128" x2="-1.6002" y2="-0.4953" width="0.127" layer="21"/>
-</package>
 <package name="THERM_LOGO_0.1">
 <rectangle x1="8.001" y1="-0.50165" x2="8.255" y2="-0.45085" layer="21"/>
 <rectangle x1="8.001" y1="-0.45085" x2="8.255" y2="-0.40005" layer="21"/>
@@ -2659,50 +2588,124 @@ design rules under a new name.</descript
 </pass>
 </autorouter>
 <elements>
-<element name="C106" library="microbuilder" package="0402" value="1.0uF" x="1.905" y="11.43"/>
-<element name="C105" library="microbuilder" package="0402" value="1.0uF" x="1.905" y="9.8425"/>
-<element name="R103" library="microbuilder" package="0402" value="390K" x="1.5875" y="4.1275"/>
-<element name="SW101" library="dp_devices" package="JOYSTICK_SF303GJ26-3" value="JOYSTICK_SF303GJ26-3" x="34.925" y="6.35" smashed="yes" rot="R90">
-<attribute name="NAME" x="29.425" y="2.85" size="1.27" layer="25" ratio="10" rot="R90"/>
+<element name="C106" library="microbuilder" package="0402" value="1.0uF" x="1.905" y="11.43" smashed="yes">
+<attribute name="NAME" x="-3.048" y="9.9695" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="3.302" y="10.795" size="0.4064" layer="27" ratio="10"/>
+</element>
+<element name="C105" library="microbuilder" package="0402" value="1.0uF" x="1.905" y="9.8425" smashed="yes">
+<attribute name="NAME" x="-3.048" y="10.922" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="3.302" y="9.2075" size="0.4064" layer="27" ratio="10"/>
 </element>
-<element name="J101" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="44.7675" y="6.35" rot="R90">
+<element name="R103" library="microbuilder" package="0402" value="390K" x="1.5875" y="3.81" smashed="yes">
+<attribute name="NAME" x="-3.3655" y="3.6195" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="2.9845" y="3.175" size="0.4064" layer="27" ratio="10"/>
+</element>
+<element name="SW101" library="dp_devices" package="JOYSTICK_SF303GJ26-3" value="JOYSTICK_SF303GJ26-3" x="34.925" y="6.35" smashed="yes" rot="R45">
+<attribute name="NAME" x="35.44119375" y="9.12185625" size="0.8128" layer="25" ratio="16" rot="R315"/>
+</element>
+<element name="J101" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="44.7675" y="6.35" smashed="yes" rot="R90">
 <attribute name="PROD_ID" value="CONN-09505" x="79.0575" y="34.29" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="NAME" x="45.1175" y="4.75" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="47.9425" y="4.445" size="0.762" layer="27" rot="R90"/>
 </element>
 <element name="U104" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="26.3525" y="6.35" smashed="yes" rot="R180">
-<attribute name="NAME" x="29.5275" y="8.89" size="1.27" layer="25" font="vector" ratio="10" rot="R270"/>
-<attribute name="VALUE" x="21.9075" y="8.89" size="1.27" layer="25" ratio="10" rot="R270"/>
+<attribute name="NAME" x="24.765" y="6.0325" size="0.8128" layer="21" font="vector" ratio="16"/>
 </element>
-<element name="U102" library="SparkFun-PowerIC" package="SOT23-5" value="AP2202K-3.3TRG1" x="21.59" y="6.6675" rot="R180">
+<element name="U102" library="SparkFun-PowerIC" package="SOT23-5" value="AP2202K-3.3TRG1" x="21.59" y="6.6675" smashed="yes" rot="R180">
 <attribute name="PROD_ID" value="VREG-00822" x="-13.97" y="39.6875" size="1.778" layer="27" rot="R180" display="off"/>
+<attribute name="NAME" x="20.066" y="6.2865" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="22.5425" y="6.858" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="U101" library="Protofusion" package="UFQFPN48" value="STM32L100C6U6" x="11.43" y="5.55625" rot="R270"/>
-<element name="LED102" library="SparkFun-LED" package="LED-0603" value="" x="39.37" y="10.16" rot="R180"/>
-<element name="LED101" library="SparkFun-LED" package="LED-0603" value="" x="39.37" y="2.54"/>
+<element name="U101" library="Protofusion" package="UFQFPN48" value="STM32L100C6U6" x="11.43" y="5.55625" smashed="yes" rot="R270">
+<attribute name="NAME" x="10.12875" y="6.54" size="0.8128" layer="25" font="vector"/>
+<attribute name="VALUE" x="6.43" y="9.55625" size="0.8128" layer="27" font="vector" rot="R270"/>
+</element>
+<element name="LED102" library="SparkFun-LED" package="LED-0603" value="" x="39.37" y="10.16" smashed="yes" rot="R180">
+<attribute name="NAME" x="39.116" y="10.8585" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="38.2905" y="11.176" size="0.4064" layer="27" rot="R270"/>
+</element>
+<element name="LED101" library="SparkFun-LED" package="LED-0603" value="" x="38.25875" y="0.79375" smashed="yes" rot="R90">
+<attribute name="NAME" x="37.24275" y="1.36525" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="39.27475" y="1.87325" size="0.4064" layer="27" rot="R180"/>
+</element>
 <element name="JP101" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="23.8125" y="11.43" rot="MR0"/>
 <element name="JP102" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="18.415" y="11.43" rot="MR0"/>
 <element name="JP103" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="29.21" y="11.43" rot="MR0"/>
-<element name="D101" library="SparkFun-DiscreteSemi" package="SOD523" value="" x="43.4975" y="0.79375" rot="R180"/>
-<element name="R104" library="SparkFun-Passives" package="0402-RES" value="22" x="30.63875" y="1.905"/>
-<element name="R105" library="SparkFun-Passives" package="0402-RES" value="22" x="30.63875" y="0.79375"/>
-<element name="C108" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="16.8275" y="8.73125"/>
-<element name="C109" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="21.9075" y="3.01625"/>
-<element name="C104" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="1.5875" y="2.69875"/>
-<element name="C103" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="8.255" y="10.4775" rot="R180"/>
-<element name="C107" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.43125" y="9.525" rot="R180"/>
-<element name="C110" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="20.955" y="4.1275" rot="R180"/>
-<element name="R102" library="SparkFun-Passives" package="0402-RES" value="" x="36.83" y="11.43"/>
-<element name="R101" library="SparkFun-Passives" package="0402-RES" value="" x="41.11625" y="0.79375" rot="R180"/>
-<element name="C102" library="SparkFun-Passives" package="0402-CAP" value="22pf" x="8.89" y="11.90625"/>
-<element name="C101" library="SparkFun-Passives" package="0402-CAP" value="22pf" x="14.2875" y="11.27125" rot="R90"/>
-<element name="X101" library="microbuilder" package="CRYSTAL_2.5X2" value="" x="12.065" y="11.27125"/>
-<element name="C111" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="29.845" y="9.2075" rot="R270"/>
+<element name="D101" library="SparkFun-DiscreteSemi" package="SOD523" value="" x="43.4975" y="0.79375" smashed="yes" rot="R180">
+<attribute name="NAME" x="45.5041" y="0.23495" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="44.1833" y="1.78435" size="0.4064" layer="27" rot="R180"/>
+</element>
+<element name="R104" library="SparkFun-Passives" package="0402-RES" value="22" x="30.32125" y="1.905" smashed="yes">
+<attribute name="NAME" x="26.89225" y="1.3335" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="29.24175" y="0.762" size="0.4064" layer="27"/>
+</element>
+<element name="R105" library="SparkFun-Passives" package="0402-RES" value="22" x="30.32125" y="0.79375" smashed="yes">
+<attribute name="NAME" x="26.89225" y="0.22225" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="29.24175" y="-0.34925" size="0.4064" layer="27"/>
+</element>
+<element name="C108" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="16.8275" y="8.73125" smashed="yes">
+<attribute name="NAME" x="16.73225" y="7.71525" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="15.748" y="7.58825" size="0.4064" layer="27"/>
+</element>
+<element name="C109" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="21.9075" y="3.01625" smashed="yes">
+<attribute name="NAME" x="22.9235" y="3.07975" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="20.828" y="1.87325" size="0.4064" layer="27"/>
+</element>
+<element name="C104" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="1.5875" y="2.69875" smashed="yes">
+<attribute name="NAME" x="-3.1115" y="2.12725" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="0.508" y="1.55575" size="0.4064" layer="27"/>
+</element>
+<element name="C103" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="8.255" y="10.4775" smashed="yes" rot="R180">
+<attribute name="NAME" x="7.71525" y="10.89025" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="9.3345" y="11.6205" size="0.4064" layer="27" rot="R180"/>
+</element>
+<element name="C107" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.43125" y="9.525" smashed="yes" rot="R180">
+<attribute name="NAME" x="21.68525" y="11.20775" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="22.51075" y="10.668" size="0.4064" layer="27" rot="R180"/>
+</element>
+<element name="C110" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="20.955" y="4.1275" smashed="yes" rot="R180">
+<attribute name="NAME" x="19.304" y="4.064" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="22.0345" y="5.2705" size="0.4064" layer="27" rot="R180"/>
+</element>
+<element name="R102" library="SparkFun-Passives" package="0402-RES" value="" x="36.83" y="11.43" smashed="yes">
+<attribute name="NAME" x="35.306" y="12.1285" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="35.7505" y="10.287" size="0.4064" layer="27"/>
+</element>
+<element name="R101" library="SparkFun-Passives" package="0402-RES" value="" x="41.11625" y="0.79375" smashed="yes" rot="R180">
+<attribute name="NAME" x="42.00525" y="0.09525" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="42.19575" y="1.93675" size="0.4064" layer="27" rot="R180"/>
+</element>
+<element name="C102" library="SparkFun-Passives" package="0402-CAP" value="22pf" x="8.89" y="11.90625" smashed="yes">
+<attribute name="NAME" x="5.1435" y="11.4935" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="7.8105" y="10.76325" size="0.4064" layer="27"/>
+</element>
+<element name="C101" library="SparkFun-Passives" package="0402-CAP" value="22pf" x="14.2875" y="11.27125" smashed="yes" rot="R90">
+<attribute name="NAME" x="14.70025" y="12.28725" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="15.4305" y="10.19175" size="0.4064" layer="27" rot="R90"/>
+</element>
+<element name="X101" library="microbuilder" package="CRYSTAL_2.5X2" value="" x="12.065" y="11.27125" smashed="yes">
+<attribute name="NAME" x="10.69175" y="12.958" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="10.66" y="9.36225" size="0.4064" layer="27" ratio="10"/>
+</element>
+<element name="C111" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="29.845" y="9.2075" smashed="yes" rot="R270">
+<attribute name="NAME" x="28.6385" y="9.5885" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="28.702" y="10.287" size="0.4064" layer="27" rot="R270"/>
+</element>
 <element name="U103" library="Protofusion" package="POGOPROG-CONN-OH-SMALLERVIAS" value="POGOPIN-CONNWITHVIAS-SMV" x="41.5925" y="6.985" rot="MR0"/>
-<element name="RA101" library="Protofusion" package="0603-ARV-4" value="2.2uF" x="1.74625" y="6.6675" rot="R270"/>
-<element name="R1" library="SparkFun-Passives" package="0402-RES" value="1.5k" x="21.9075" y="1.905" rot="R180"/>
-<element name="C1" library="SparkFun-Passives" package="0402-CAP" value="100pF" x="19.05" y="6.35" rot="R270"/>
+<element name="R1" library="SparkFun-Passives" package="0402-RES" value="1.5k" x="21.9075" y="1.905" smashed="yes" rot="R180">
+<attribute name="NAME" x="22.7965" y="1.2065" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="22.987" y="3.048" size="0.4064" layer="27" rot="R180"/>
+</element>
 <element name="U$14" library="Protofusion" package="THERM_LOGO_0.1" value="" x="10.795" y="6.985" rot="MR180"/>
-<element name="U$1" library="Protofusion" package="THERM_LOGO_SMALL_0.1" value="" x="32.7025" y="0.47625"/>
-<element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="" x="0.635" y="6.35" rot="R180"/>
+<element name="U$1" library="Protofusion" package="THERM_LOGO_SMALL_0.1" value="" x="32.7025" y="0.47625" smashed="yes"/>
+<element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="" x="0.635" y="6.35" smashed="yes" rot="R180">
+<attribute name="NAME" x="9.68" y="41.76" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="30.635" y="13.85" size="0.4064" layer="27" ratio="10" rot="R180"/>
+</element>
+<element name="C1" library="microbuilder" package="0402" value="2.2uF" x="1.5875" y="8.255" rot="R180"/>
+<element name="C2" library="microbuilder" package="0402" value="2.2uF" x="1.5875" y="7.14375" rot="R180"/>
+<element name="C3" library="microbuilder" package="0402" value="2.2uF" x="1.5875" y="4.92125" rot="R180"/>
+<element name="C4" library="microbuilder" package="0402" value="2.2uF" x="1.5875" y="6.0325" rot="R180"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -2732,10 +2735,6 @@ design rules under a new name.</descript
 <contactref element="C110" pad="2"/>
 <contactref element="U103" pad="1"/>
 <contactref element="U103" pad="2"/>
-<contactref element="RA101" pad="5"/>
-<contactref element="RA101" pad="6"/>
-<contactref element="RA101" pad="7"/>
-<contactref element="RA101" pad="8"/>
 <polygon width="0.254" layer="16">
 <vertex x="-1.27" y="-1.905"/>
 <vertex x="46.99" y="-1.905"/>
@@ -2745,7 +2744,6 @@ design rules under a new name.</descript
 <contactref element="U101" pad="8"/>
 <contactref element="C103" pad="2"/>
 <contactref element="U103" pad="5"/>
-<contactref element="C1" pad="2"/>
 <wire x1="8.24" y1="11.90625" x2="7.62" y2="11.90625" width="0.2032" layer="1"/>
 <wire x1="10.43" y1="9.25625" x2="10.43" y2="7.89" width="0.2032" layer="1"/>
 <wire x1="10.43" y1="7.89" x2="10.31875" y2="7.77875" width="0.2032" layer="1"/>
@@ -2763,45 +2761,30 @@ design rules under a new name.</descript
 <wire x1="28.2575" y1="9.525" x2="28.575" y2="9.8425" width="0.2032" layer="1"/>
 <wire x1="28.575" y1="9.8425" x2="29.83" y2="9.8425" width="0.2032" layer="1"/>
 <wire x1="29.83" y1="9.8425" x2="29.845" y2="9.8575" width="0.2032" layer="1"/>
-<wire x1="19.3675" y1="4.445" x2="19.3675" y2="5.3825" width="0.2032" layer="1"/>
-<wire x1="19.3675" y1="5.3825" x2="19.05" y2="5.7" width="0.2032" layer="1"/>
-<wire x1="19.3675" y1="4.445" x2="20.305" y2="4.445" width="0.2032" layer="1"/>
-<wire x1="20.305" y1="4.445" x2="20.305" y2="4.1275" width="0.2032" layer="1"/>
 <via x="10.63625" y="3.33375" extent="1-16" drill="0.3048"/>
 <wire x1="13.49375" y1="7.77875" x2="13.49375" y2="6.6675" width="0.2032" layer="1"/>
 <wire x1="13.49375" y1="6.6675" x2="13.17625" y2="6.35" width="0.2032" layer="1"/>
 <wire x1="11.43" y1="5.23875" x2="13.49375" y2="3.175" width="0.2032" layer="1"/>
 <wire x1="11.43" y1="5.23875" x2="11.14375" y2="5.23875" width="0.2032" layer="1"/>
 <via x="6.6675" y="12.065" extent="1-16" drill="0.3048"/>
-<wire x1="0.9017" y1="7.8486" x2="0.9017" y2="7.0612" width="0.2032" layer="1"/>
-<wire x1="0.9017" y1="7.0612" x2="0.9017" y2="6.2738" width="0.2032" layer="1"/>
-<wire x1="0.9017" y1="6.2738" x2="0.9017" y2="5.4864" width="0.2032" layer="1"/>
 <wire x1="7.605" y1="10.4775" x2="7.605" y2="11.28625" width="0.2032" layer="1"/>
-<wire x1="0.9375" y1="2.69875" x2="0.9375" y2="4.1275" width="0.2032" layer="1"/>
-<wire x1="0.9375" y1="4.1275" x2="0.9017" y2="4.1633" width="0.2032" layer="1"/>
-<wire x1="0.9017" y1="4.1633" x2="0.9017" y2="5.4864" width="0.2032" layer="1"/>
-<wire x1="0.9017" y1="7.8486" x2="1.1811" y2="7.8486" width="0.2032" layer="1"/>
-<wire x1="1.1811" y1="7.8486" x2="1.74625" y2="8.41375" width="0.2032" layer="1"/>
-<via x="1.74625" y="8.41375" extent="1-16" drill="0.3048"/>
+<wire x1="0.9375" y1="2.69875" x2="0.9375" y2="3.81" width="0.2032" layer="1"/>
+<wire x1="0.9375" y1="3.81" x2="0.9017" y2="4.1633" width="0.2032" layer="1"/>
 <wire x1="7.62" y1="11.90625" x2="7.62" y2="11.30125" width="0.2032" layer="1"/>
 <wire x1="7.62" y1="11.30125" x2="7.605" y2="11.28625" width="0.2032" layer="1"/>
 <wire x1="6.6675" y1="12.065" x2="7.46125" y2="12.065" width="0.2032" layer="1"/>
 <wire x1="7.46125" y1="12.065" x2="7.62" y2="11.90625" width="0.2032" layer="1"/>
 <via x="15.24" y="10.16" extent="1-16" drill="0.3048"/>
-<wire x1="29.845" y1="9.8575" x2="30.8125" y2="9.8575" width="0.2032" layer="1"/>
-<wire x1="30.8125" y1="9.8575" x2="31.115" y2="10.16" width="0.2032" layer="1"/>
-<via x="31.115" y="10.16" extent="1-16" drill="0.3048"/>
+<wire x1="29.845" y1="9.8575" x2="30.01875" y2="9.8575" width="0.2032" layer="1"/>
+<wire x1="30.01875" y1="9.8575" x2="31.115" y2="10.95375" width="0.2032" layer="1"/>
+<via x="31.115" y="10.95375" extent="1-16" drill="0.3048"/>
 <via x="41.275" y="11.43" extent="1-16" drill="0.3048"/>
-<via x="38.1" y="9.525" extent="1-16" drill="0.3048"/>
+<via x="38.1" y="10.00125" extent="1-16" drill="0.3048"/>
 <via x="42.38625" y="11.27125" extent="1-16" drill="0.3048"/>
 <via x="43.18" y="2.06375" extent="1-16" drill="0.3048"/>
-<wire x1="39.37" y1="9.283" x2="38.342" y2="9.283" width="0.2032" layer="1"/>
-<wire x1="38.342" y1="9.283" x2="38.1" y2="9.525" width="0.2032" layer="1"/>
-<via x="34.925" y="11.1125" extent="1-16" drill="0.3048"/>
-<wire x1="34.925" y1="9.675" x2="34.925" y2="11.1125" width="0.2032" layer="1"/>
-<wire x1="39.37" y1="3.417" x2="40.23925" y2="3.417" width="0.2032" layer="1"/>
-<wire x1="40.23925" y1="3.417" x2="40.3225" y2="3.33375" width="0.2032" layer="1"/>
-<via x="40.3225" y="3.33375" extent="1-16" drill="0.3048"/>
+<wire x1="39.37" y1="9.283" x2="38.81825" y2="9.283" width="0.2032" layer="1"/>
+<wire x1="38.81825" y1="9.283" x2="38.1" y2="10.00125" width="0.2032" layer="1"/>
+<via x="36.35375" y="0.635" extent="1-16" drill="0.3048"/>
 <wire x1="44.7675" y1="10.35" x2="42.6725" y2="10.35" width="0.2032" layer="1"/>
 <wire x1="42.6725" y1="10.35" x2="42.38625" y2="10.63625" width="0.2032" layer="1"/>
 <wire x1="42.38625" y1="10.63625" x2="42.38625" y2="11.27125" width="0.2032" layer="1"/>
@@ -2809,8 +2792,6 @@ design rules under a new name.</descript
 <wire x1="43.97375" y1="2.06375" x2="44.45" y2="2.54" width="0.2032" layer="1"/>
 <wire x1="44.45" y1="2.54" x2="44.3225" y2="2.54" width="0.2032" layer="1"/>
 <via x="23.65375" y="2.54" extent="1-16" drill="0.3048"/>
-<wire x1="19.05" y1="5.7" x2="18.27125" y2="5.7" width="0.2032" layer="1"/>
-<wire x1="18.27125" y1="5.7" x2="17.78" y2="6.19125" width="0.2032" layer="1"/>
 <wire x1="17.78" y1="6.19125" x2="17.78" y2="7.77875" width="0.2032" layer="1"/>
 <via x="18.7325" y="8.5725" extent="1-16" drill="0.3048"/>
 <wire x1="18.7325" y1="8.5725" x2="17.4775" y2="8.5725" width="0.2032" layer="1"/>
@@ -2843,6 +2824,21 @@ design rules under a new name.</descript
 <wire x1="40.79875" y1="8.09625" x2="41.245" y2="7.65" width="0.2032" layer="1"/>
 <wire x1="42.1175" y1="7.65" x2="41.245" y2="7.65" width="0.2032" layer="1"/>
 <contactref element="LCD1" pad="6"/>
+<wire x1="37.276128125" y1="8.701128125" x2="37.276128125" y2="9.177378125" width="0.2032" layer="1"/>
+<wire x1="37.276128125" y1="9.177378125" x2="38.1" y2="10.00125" width="0.2032" layer="1"/>
+<wire x1="37.38175" y1="0.79375" x2="36.5125" y2="0.79375" width="0.2032" layer="1"/>
+<wire x1="36.5125" y1="0.79375" x2="36.35375" y2="0.635" width="0.2032" layer="1"/>
+<wire x1="20.305" y1="4.1275" x2="19.84375" y2="4.1275" width="0.2032" layer="1"/>
+<wire x1="19.84375" y1="4.1275" x2="17.78" y2="6.19125" width="0.2032" layer="1"/>
+<contactref element="C1" pad="2"/>
+<contactref element="C3" pad="2"/>
+<contactref element="C2" pad="2"/>
+<contactref element="C4" pad="2"/>
+<wire x1="0.9375" y1="8.255" x2="0.9375" y2="7.14375" width="0.2032" layer="1"/>
+<wire x1="0.9375" y1="7.14375" x2="0.9375" y2="6.0325" width="0.2032" layer="1"/>
+<wire x1="0.9375" y1="6.0325" x2="0.9375" y2="4.92125" width="0.2032" layer="1"/>
+<wire x1="0.9375" y1="4.92125" x2="0.9375" y2="3.81" width="0.2032" layer="1"/>
+<wire x1="7.73" y1="3.55625" x2="0.9375" y2="3.81" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$1">
 <contactref element="C106" pad="1"/>
@@ -2882,7 +2878,7 @@ design rules under a new name.</descript
 </signal>
 <signal name="N$8">
 <contactref element="R103" pad="2"/>
-<wire x1="2.2375" y1="4.1275" x2="3.33375" y2="4.1275" width="0.2032" layer="1"/>
+<wire x1="2.2375" y1="3.81" x2="3.33375" y2="4.1275" width="0.2032" layer="1"/>
 <wire x1="3.33375" y1="4.1275" x2="3.96875" y2="3.4925" width="0.2032" layer="1"/>
 <via x="3.96875" y="3.4925" extent="1-16" drill="0.3048"/>
 <wire x1="3.96875" y1="3.4925" x2="4.36125" y2="3.1" width="0.2032" layer="16"/>
@@ -2890,8 +2886,6 @@ design rules under a new name.</descript
 <wire x1="4.36125" y1="3.1" x2="8.335" y2="3.1" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$9">
-<contactref element="RA101" pad="3"/>
-<wire x1="2.5908" y1="6.2738" x2="3.2512" y2="6.2738" width="0.2032" layer="1"/>
 <wire x1="3.2512" y1="6.2738" x2="3.4925" y2="6.0325" width="0.2032" layer="1"/>
 <via x="3.4925" y="6.0325" extent="1-16" drill="0.3048"/>
 <wire x1="3.74125" y1="2.45" x2="3.33375" y2="2.8575" width="0.2032" layer="16"/>
@@ -2901,19 +2895,20 @@ design rules under a new name.</descript
 <wire x1="3.81" y1="5.715" x2="3.4925" y2="6.0325" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="14"/>
 <wire x1="3.74125" y1="2.45" x2="8.335" y2="2.45" width="0.2032" layer="16"/>
+<contactref element="C2" pad="1"/>
+<wire x1="3.2512" y1="6.2738" x2="3.10745" y2="6.2738" width="0.2032" layer="1"/>
+<wire x1="3.10745" y1="6.2738" x2="2.2375" y2="7.14375" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$15">
-<contactref element="RA101" pad="4"/>
 <via x="3.175" y="4.7625" extent="1-16" drill="0.3048"/>
 <wire x1="3.5975" y1="1.8" x2="2.54" y2="2.8575" width="0.2032" layer="16"/>
-<wire x1="2.5908" y1="5.4864" x2="2.5908" y2="5.0292" width="0.2032" layer="1"/>
-<wire x1="2.5908" y1="5.0292" x2="2.69875" y2="4.92125" width="0.2032" layer="1"/>
-<wire x1="2.69875" y1="4.92125" x2="3.01625" y2="4.92125" width="0.2032" layer="1"/>
-<wire x1="3.01625" y1="4.92125" x2="3.175" y2="4.7625" width="0.2032" layer="1"/>
 <wire x1="2.54" y1="2.8575" x2="2.54" y2="4.1275" width="0.2032" layer="16"/>
 <wire x1="2.54" y1="4.1275" x2="3.175" y2="4.7625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="15"/>
 <wire x1="3.5975" y1="1.8" x2="8.335" y2="1.8" width="0.2032" layer="16"/>
+<contactref element="C4" pad="1"/>
+<wire x1="3.175" y1="4.7625" x2="3.175" y2="5.095" width="0.2032" layer="1"/>
+<wire x1="3.175" y1="5.095" x2="2.2375" y2="6.0325" width="0.2032" layer="1"/>
 </signal>
 <signal name="3.3V">
 <contactref element="U102" pad="5"/>
@@ -2927,8 +2922,6 @@ design rules under a new name.</descript
 <contactref element="C104" pad="2"/>
 <contactref element="C110" pad="1"/>
 <contactref element="U103" pad="6"/>
-<contactref element="RA101" pad="2"/>
-<contactref element="RA101" pad="1"/>
 <contactref element="U101" pad="9"/>
 <contactref element="C103" pad="1"/>
 <contactref element="R1" pad="2"/>
@@ -2953,18 +2946,13 @@ design rules under a new name.</descript
 <wire x1="9.68375" y1="10.4775" x2="10.16" y2="10.00125" width="0.2032" layer="1"/>
 <wire x1="2.06375" y1="2.69875" x2="2.1825" y2="2.58" width="0.2032" layer="1"/>
 <via x="3.4925" y="7.14375" extent="1-16" drill="0.3048"/>
-<wire x1="2.5908" y1="7.8486" x2="2.7686" y2="7.8486" width="0.2032" layer="1"/>
-<via x="2.8575" y="8.41375" extent="1-16" drill="0.3048"/>
+<via x="3.175" y="8.41375" extent="1-16" drill="0.3048"/>
 <wire x1="6.35" y1="7.3025" x2="6.6525" y2="7" width="0.2032" layer="16"/>
-<wire x1="2.5908" y1="7.0612" x2="1.9812" y2="7.0612" width="0.2032" layer="1"/>
-<wire x1="1.9812" y1="7.0612" x2="1.74625" y2="6.82625" width="0.2032" layer="1"/>
-<wire x1="1.74625" y1="6.82625" x2="1.74625" y2="5.08" width="0.2032" layer="1"/>
 <wire x1="1.74625" y1="5.08" x2="1.5875" y2="4.92125" width="0.2032" layer="1"/>
 <wire x1="1.5875" y1="4.92125" x2="1.5875" y2="2.8575" width="0.2032" layer="1"/>
 <wire x1="1.5875" y1="2.8575" x2="1.74625" y2="2.69875" width="0.2032" layer="1"/>
 <wire x1="1.74625" y1="2.69875" x2="2.06375" y2="2.69875" width="0.2032" layer="1"/>
 <wire x1="2.06375" y1="2.69875" x2="2.2375" y2="2.69875" width="0.2032" layer="1"/>
-<wire x1="2.5908" y1="7.0612" x2="3.40995" y2="7.0612" width="0.2032" layer="1"/>
 <wire x1="3.40995" y1="7.0612" x2="3.4925" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="2.43625" y1="2.8975" x2="2.2375" y2="2.69875" width="0.2032" layer="1"/>
 <wire x1="16.8275" y1="9.525" x2="14.12875" y2="9.525" width="0.2032" layer="16"/>
@@ -2981,15 +2969,6 @@ design rules under a new name.</descript
 <wire x1="18.7325" y1="9.8425" x2="17.145" y2="9.8425" width="0.2032" layer="1"/>
 <wire x1="21.605" y1="4.1275" x2="21.9075" y2="4.1275" width="0.2032" layer="1"/>
 <wire x1="18.0725" y1="2.03875" x2="18.57375" y2="2.54" width="0.2032" layer="1"/>
-<wire x1="41.5925" y1="3.175" x2="40.79875" y2="2.38125" width="0.2032" layer="16"/>
-<wire x1="40.79875" y1="2.38125" x2="38.735" y2="2.38125" width="0.2032" layer="16"/>
-<wire x1="38.735" y1="2.38125" x2="34.13125" y2="6.985" width="0.2032" layer="16"/>
-<wire x1="34.13125" y1="6.985" x2="34.13125" y2="7.77875" width="0.2032" layer="16"/>
-<via x="34.13125" y="7.77875" extent="1-16" drill="0.3048"/>
-<wire x1="34.13125" y1="7.77875" x2="33.9725" y2="7.62" width="0.2032" layer="1"/>
-<wire x1="33.9725" y1="7.62" x2="32.54375" y2="7.62" width="0.2032" layer="1"/>
-<wire x1="32.54375" y1="7.62" x2="31.59125" y2="8.5725" width="0.2032" layer="1"/>
-<wire x1="31.59125" y1="8.5725" x2="29.86" y2="8.5725" width="0.2032" layer="1"/>
 <wire x1="29.86" y1="8.5725" x2="29.845" y2="8.5575" width="0.2032" layer="1"/>
 <wire x1="18.57375" y1="2.54" x2="18.57375" y2="3.175" width="0.2032" layer="1"/>
 <wire x1="18.57375" y1="3.175" x2="18.7325" y2="3.33375" width="0.2032" layer="1"/>
@@ -3007,8 +2986,7 @@ design rules under a new name.</descript
 <wire x1="16.8275" y1="9.525" x2="17.145" y2="9.8425" width="0.2032" layer="16"/>
 <wire x1="16.1775" y1="8.73125" x2="16.1775" y2="8.875" width="0.2032" layer="1"/>
 <wire x1="16.1775" y1="8.73125" x2="16.0025" y2="8.55625" width="0.2032" layer="1"/>
-<wire x1="2.8575" y1="8.41375" x2="2.8575" y2="8.1153" width="0.2032" layer="1"/>
-<wire x1="2.8575" y1="8.1153" x2="2.5908" y2="7.8486" width="0.2032" layer="1"/>
+<wire x1="3.175" y1="8.41375" x2="3.33375" y2="8.1153" width="0" layer="19" extent="1-16"/>
 <wire x1="21.605" y1="4.1275" x2="21.605" y2="3.825" width="0.2032" layer="1"/>
 <wire x1="21.605" y1="3.825" x2="21.59" y2="3.81" width="0.2032" layer="1"/>
 <wire x1="21.9075" y1="4.1125" x2="21.8925" y2="4.1125" width="0.2032" layer="1"/>
@@ -3021,8 +2999,8 @@ design rules under a new name.</descript
 <wire x1="6.6525" y1="7" x2="8.335" y2="7" width="0.2032" layer="16"/>
 <wire x1="8.335" y1="8.3" x2="10.115" y2="8.3" width="0.2032" layer="16"/>
 <wire x1="8.335" y1="7" x2="8.35" y2="6.985" width="0.2032" layer="16"/>
-<wire x1="2.8575" y1="8.41375" x2="2.97125" y2="8.3" width="0.2032" layer="16"/>
-<wire x1="2.97125" y1="8.3" x2="8.335" y2="8.3" width="0.2032" layer="16"/>
+<wire x1="3.175" y1="8.41375" x2="3.4475" y2="8.3" width="0.2032" layer="16"/>
+<wire x1="3.4475" y1="8.3" x2="8.335" y2="8.3" width="0.2032" layer="16"/>
 <wire x1="2.2375" y1="2.69875" x2="4.60375" y2="2.69875" width="0.2032" layer="1"/>
 <wire x1="4.60375" y1="2.69875" x2="4.96125" y2="3.05625" width="0.2032" layer="1"/>
 <wire x1="7.73" y1="3.05625" x2="4.96125" y2="3.05625" width="0.2032" layer="1"/>
@@ -3030,6 +3008,24 @@ design rules under a new name.</descript
 <wire x1="16.51" y1="9.8425" x2="16.1925" y2="9.525" width="0.2032" layer="1"/>
 <wire x1="16.1925" y1="9.525" x2="16.1925" y2="8.74625" width="0.2032" layer="1"/>
 <wire x1="16.1925" y1="8.74625" x2="16.1775" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="29.845" y1="8.5575" x2="30.94125" y2="7.46125" width="0.2032" layer="1"/>
+<wire x1="30.94125" y1="7.46125" x2="32.22625" y2="7.46125" width="0.2032" layer="1"/>
+<wire x1="32.22625" y1="7.46125" x2="33.655" y2="8.89" width="0.2032" layer="1"/>
+<wire x1="35.08375" y1="8.89" x2="37.94125" y2="6.0325" width="0.2032" layer="1"/>
+<wire x1="37.94125" y1="6.0325" x2="38.4175" y2="6.0325" width="0.2032" layer="1"/>
+<wire x1="38.4175" y1="6.0325" x2="38.89375" y2="5.55625" width="0.2032" layer="1"/>
+<via x="38.89375" y="5.55625" extent="1-16" drill="0.381"/>
+<wire x1="41.5925" y1="3.175" x2="40.48125" y2="3.175" width="0.2032" layer="16"/>
+<wire x1="40.48125" y1="3.175" x2="38.89375" y2="4.7625" width="0.2032" layer="16"/>
+<wire x1="38.89375" y1="4.7625" x2="38.89375" y2="5.55625" width="0.2032" layer="16"/>
+<wire x1="33.655" y1="8.89" x2="35.08375" y2="8.89" width="0.2032" layer="1"/>
+<contactref element="C1" pad="1"/>
+<contactref element="C3" pad="1"/>
+<wire x1="2.2375" y1="4.92125" x2="3.40995" y2="7.0612" width="0" layer="19" extent="1-1"/>
+<wire x1="2.2375" y1="8.255" x2="3.01625" y2="8.255" width="0.2032" layer="1"/>
+<wire x1="3.01625" y1="8.255" x2="3.175" y2="8.41375" width="0.2032" layer="1"/>
+<wire x1="1.74625" y1="5.08" x2="2.07875" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="2.07875" y1="5.08" x2="2.2375" y2="4.92125" width="0.2032" layer="1"/>
 </signal>
 <signal name="VLCD">
 <contactref element="U101" pad="1"/>
@@ -3073,91 +3069,91 @@ design rules under a new name.</descript
 <contactref element="U101" pad="40"/>
 <wire x1="14.63" y1="4.55625" x2="16.39875" y2="4.55625" width="0.2032" layer="1"/>
 <via x="16.66875" y="4.28625" extent="1-16" drill="0.3048"/>
-<wire x1="18.0975" y1="5.23875" x2="30.32125" y2="5.23875" width="0.2032" layer="16"/>
-<wire x1="30.32125" y1="5.23875" x2="31.75" y2="3.81" width="0.2032" layer="16"/>
-<wire x1="31.75" y1="3.81" x2="32.7025" y2="3.81" width="0.2032" layer="16"/>
-<wire x1="32.7025" y1="3.81" x2="33.17875" y2="4.28625" width="0.2032" layer="16"/>
-<via x="33.17875" y="4.28625" extent="1-16" drill="0.3048"/>
-<wire x1="33.17875" y1="4.28625" x2="33.17875" y2="3.37125" width="0.2032" layer="1"/>
-<wire x1="33.17875" y1="3.37125" x2="33.525" y2="3.025" width="0.2032" layer="1"/>
+<wire x1="18.0975" y1="5.23875" x2="30.7975" y2="5.23875" width="0.2032" layer="16"/>
+<wire x1="30.7975" y1="5.23875" x2="31.27375" y2="5.715" width="0.2032" layer="16"/>
+<wire x1="31.27375" y1="5.715" x2="33.17875" y2="5.715" width="0.2032" layer="16"/>
 <wire x1="18.0975" y1="5.23875" x2="17.145" y2="4.28625" width="0.2032" layer="16"/>
 <wire x1="17.145" y1="4.28625" x2="16.66875" y2="4.28625" width="0.2032" layer="16"/>
 <wire x1="16.39875" y1="4.55625" x2="16.66875" y2="4.28625" width="0.2032" layer="1"/>
+<via x="33.17875" y="5.715" extent="1-16" drill="0.381"/>
+<wire x1="31.58391875" y1="4.98881875" x2="32.3101" y2="5.715" width="0.2032" layer="1"/>
+<wire x1="32.3101" y1="5.715" x2="33.17875" y2="5.715" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-C">
 <contactref element="SW101" pad="3"/>
 <contactref element="U101" pad="41"/>
-<wire x1="36.325" y1="3.025" x2="36.325" y2="4.6325" width="0.2032" layer="1"/>
-<wire x1="36.325" y1="4.6325" x2="36.03625" y2="4.92125" width="0.2032" layer="1"/>
-<wire x1="36.03625" y1="4.92125" x2="32.7025" y2="4.92125" width="0.2032" layer="1"/>
 <wire x1="14.63" y1="5.05625" x2="17.12125" y2="5.05625" width="0.2032" layer="1"/>
 <wire x1="17.12125" y1="5.05625" x2="17.145" y2="5.08" width="0.2032" layer="1"/>
 <via x="17.145" y="5.08" extent="1-16" drill="0.3048"/>
 <wire x1="17.145" y1="5.08" x2="17.78" y2="5.715" width="0.2032" layer="16"/>
-<wire x1="17.78" y1="5.715" x2="30.95625" y2="5.715" width="0.2032" layer="16"/>
-<wire x1="30.95625" y1="5.715" x2="32.22625" y2="4.445" width="0.2032" layer="16"/>
-<via x="32.22625" y="4.445" extent="1-16" drill="0.3048"/>
-<wire x1="32.22625" y1="4.445" x2="32.7025" y2="4.92125" width="0.2032" layer="1"/>
+<wire x1="17.78" y1="5.715" x2="30.48" y2="5.715" width="0.2032" layer="16"/>
+<wire x1="30.48" y1="5.715" x2="31.27375" y2="6.50875" width="0.2032" layer="16"/>
+<wire x1="31.27375" y1="6.50875" x2="34.44875" y2="6.50875" width="0.2032" layer="16"/>
+<wire x1="34.44875" y1="6.50875" x2="34.76625" y2="6.19125" width="0.2032" layer="16"/>
+<wire x1="33.56381875" y1="3.00891875" x2="33.64766875" y2="3.00891875" width="0.2032" layer="1"/>
+<wire x1="33.64766875" y1="3.00891875" x2="34.76625" y2="4.1275" width="0.2032" layer="1"/>
+<wire x1="34.76625" y1="4.1275" x2="34.76625" y2="6.19125" width="0.2032" layer="1"/>
+<via x="34.76625" y="6.19125" extent="1-16" drill="0.381"/>
 </signal>
 <signal name="SW-B">
 <contactref element="SW101" pad="4"/>
 <contactref element="U101" pad="43"/>
-<wire x1="33.525" y1="9.675" x2="33.525" y2="9.55375" width="0.2032" layer="1"/>
-<wire x1="33.525" y1="9.55375" x2="33.49625" y2="9.525" width="0.2032" layer="1"/>
 <wire x1="14.63" y1="6.05625" x2="15.58125" y2="6.05625" width="0.2032" layer="1"/>
 <wire x1="15.58125" y1="6.05625" x2="16.03375" y2="6.50875" width="0.2032" layer="1"/>
 <via x="16.03375" y="6.50875" extent="1-16" drill="0.3048"/>
-<wire x1="16.1925" y1="6.6675" x2="29.5275" y2="6.6675" width="0.2032" layer="16"/>
-<wire x1="29.5275" y1="6.6675" x2="32.385" y2="9.525" width="0.2032" layer="16"/>
-<via x="32.385" y="9.525" extent="1-16" drill="0.3048"/>
-<wire x1="32.385" y1="9.525" x2="33.49625" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="16.1925" y1="6.6675" x2="29.36875" y2="6.6675" width="0.2032" layer="16"/>
+<wire x1="29.36875" y1="6.6675" x2="32.22625" y2="9.525" width="0.2032" layer="16"/>
 <wire x1="16.1925" y1="6.6675" x2="16.03375" y2="6.50875" width="0.2032" layer="16"/>
+<wire x1="32.22625" y1="9.525" x2="34.13125" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="34.13125" y1="9.525" x2="35.2425" y2="10.63625" width="0.2032" layer="16"/>
+<via x="35.2425" y="10.63625" extent="1-16" drill="0.381"/>
+<wire x1="35.2425" y1="10.63625" x2="35.34100625" y2="10.63625" width="0.2032" layer="1"/>
+<wire x1="35.34100625" y1="10.63625" x2="36.286178125" y2="9.691078125" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-D">
 <contactref element="SW101" pad="6"/>
 <contactref element="U101" pad="42"/>
-<wire x1="36.325" y1="9.675" x2="36.325" y2="8.86125" width="0.2032" layer="1"/>
 <wire x1="14.63" y1="5.55625" x2="16.1925" y2="5.55625" width="0.2032" layer="1"/>
 <wire x1="16.1925" y1="5.55625" x2="16.35125" y2="5.715" width="0.2032" layer="1"/>
 <via x="16.35125" y="5.715" extent="1-16" drill="0.3048"/>
 <wire x1="16.35125" y1="5.715" x2="16.8275" y2="6.19125" width="0.2032" layer="16"/>
-<wire x1="16.8275" y1="6.19125" x2="30.48" y2="6.19125" width="0.2032" layer="16"/>
-<wire x1="30.48" y1="6.19125" x2="32.54375" y2="8.255" width="0.2032" layer="16"/>
-<wire x1="32.54375" y1="8.255" x2="33.17875" y2="8.255" width="0.2032" layer="16"/>
-<via x="33.17875" y="8.255" extent="1-16" drill="0.3048"/>
-<wire x1="33.17875" y1="8.255" x2="33.3375" y2="8.41375" width="0.2032" layer="1"/>
-<wire x1="33.3375" y1="8.41375" x2="35.56" y2="8.41375" width="0.2032" layer="1"/>
-<wire x1="35.56" y1="8.41375" x2="35.8775" y2="8.73125" width="0.2032" layer="1"/>
-<wire x1="35.8775" y1="8.73125" x2="35.8775" y2="9.2275" width="0.2032" layer="1"/>
-<wire x1="35.8775" y1="9.2275" x2="36.325" y2="9.675" width="0.2032" layer="1"/>
+<wire x1="16.8275" y1="6.19125" x2="29.845" y2="6.19125" width="0.2032" layer="16"/>
+<wire x1="29.845" y1="6.19125" x2="32.385" y2="8.73125" width="0.2032" layer="16"/>
+<wire x1="32.385" y1="8.73125" x2="35.08375" y2="8.73125" width="0.2032" layer="16"/>
+<wire x1="35.08375" y1="8.73125" x2="35.8775" y2="7.9375" width="0.2032" layer="16"/>
+<wire x1="35.8775" y1="7.9375" x2="40.005" y2="7.9375" width="0.2032" layer="16"/>
+<via x="40.005" y="7.9375" extent="1-16" drill="0.381"/>
+<wire x1="40.005" y1="7.9375" x2="39.52875" y2="8.41375" width="0.2032" layer="1"/>
+<wire x1="39.52875" y1="8.41375" x2="38.96865" y2="8.41375" width="0.2032" layer="1"/>
+<wire x1="38.96865" y1="8.41375" x2="38.266078125" y2="7.711178125" width="0.2032" layer="1"/>
 </signal>
 <signal name="D+">
 <contactref element="J101" pad="D+"/>
 <contactref element="R104" pad="2"/>
-<wire x1="40.3225" y1="5.23875" x2="39.84625" y2="4.7625" width="0.2032" layer="1"/>
-<wire x1="39.84625" y1="4.7625" x2="38.25875" y2="4.7625" width="0.2032" layer="1"/>
-<wire x1="38.25875" y1="4.7625" x2="37.62375" y2="4.1275" width="0.2032" layer="1"/>
-<wire x1="37.62375" y1="4.1275" x2="37.62375" y2="2.06375" width="0.2032" layer="1"/>
-<wire x1="40.3225" y1="5.23875" x2="40.3225" y2="5.87375" width="0.2032" layer="1"/>
-<wire x1="40.3225" y1="5.87375" x2="40.79875" y2="6.35" width="0.2032" layer="1"/>
 <wire x1="40.79875" y1="6.35" x2="42.1175" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="31.28875" y1="1.905" x2="31.75" y2="1.905" width="0.2032" layer="1"/>
-<wire x1="31.75" y1="1.905" x2="32.0675" y2="1.5875" width="0.2032" layer="1"/>
-<wire x1="32.0675" y1="1.5875" x2="37.1475" y2="1.5875" width="0.2032" layer="1"/>
-<wire x1="37.1475" y1="1.5875" x2="37.62375" y2="2.06375" width="0.2032" layer="1"/>
+<wire x1="40.79875" y1="6.35" x2="39.006003125" y2="4.557253125" width="0.2032" layer="1"/>
+<wire x1="39.006003125" y1="4.557253125" x2="38.781496875" y2="4.557253125" width="0.2032" layer="1"/>
+<wire x1="38.781496875" y1="4.557253125" x2="38.053503125" y2="5.285246875" width="0.2032" layer="1"/>
+<wire x1="38.053503125" y1="5.285246875" x2="37.828996875" y2="5.285246875" width="0.2032" layer="1"/>
+<wire x1="37.828996875" y1="5.285246875" x2="35.8775" y2="3.33375" width="0.2032" layer="1"/>
+<wire x1="35.8775" y1="3.33375" x2="35.8775" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="35.8775" y1="1.905" x2="34.925" y2="0.9525" width="0.2032" layer="1"/>
+<wire x1="34.925" y1="0.9525" x2="32.385" y2="0.9525" width="0.2032" layer="1"/>
+<wire x1="32.385" y1="0.9525" x2="31.4325" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="31.4325" y1="1.905" x2="30.97125" y2="1.905" width="0.2032" layer="1"/>
 </signal>
 <signal name="D-">
 <contactref element="J101" pad="D-"/>
 <contactref element="R105" pad="2"/>
-<wire x1="40.79875" y1="5.55625" x2="40.79875" y2="4.95976875" width="0.2032" layer="1"/>
-<wire x1="40.79875" y1="4.95976875" x2="40.12523125" y2="4.28625" width="0.2032" layer="1"/>
-<wire x1="40.12523125" y1="4.28625" x2="38.4175" y2="4.28625" width="0.2032" layer="1"/>
-<wire x1="38.1" y1="1.74625" x2="38.1" y2="3.96875" width="0.2032" layer="1"/>
-<wire x1="38.1" y1="3.96875" x2="38.4175" y2="4.28625" width="0.2032" layer="1"/>
 <wire x1="42.1175" y1="5.7" x2="40.9425" y2="5.7" width="0.2032" layer="1"/>
-<wire x1="40.9425" y1="5.7" x2="40.79875" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="31.28875" y1="0.79375" x2="37.1475" y2="0.79375" width="0.2032" layer="1"/>
-<wire x1="37.1475" y1="0.79375" x2="38.1" y2="1.74625" width="0.2032" layer="1"/>
+<wire x1="30.97125" y1="0.79375" x2="30.97125" y2="0.77875" width="0.2032" layer="1"/>
+<wire x1="30.97125" y1="0.77875" x2="31.27375" y2="0.47625" width="0.2032" layer="1"/>
+<wire x1="31.27375" y1="0.47625" x2="35.2425" y2="0.47625" width="0.2032" layer="1"/>
+<wire x1="35.2425" y1="0.47625" x2="36.35375" y2="1.5875" width="0.2032" layer="1"/>
+<wire x1="36.35375" y1="1.5875" x2="40.3225" y2="1.5875" width="0.2032" layer="1"/>
+<wire x1="40.3225" y1="1.5875" x2="40.64" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="40.64" y1="1.905" x2="40.64" y2="5.3975" width="0.2032" layer="1"/>
+<wire x1="40.64" y1="5.3975" x2="40.9425" y2="5.7" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="J101" pad="VBUS"/>
@@ -3176,10 +3172,10 @@ design rules under a new name.</descript
 <wire x1="12.43" y1="2.35625" x2="12.43" y2="1.56844375" width="0.2032" layer="1"/>
 <wire x1="12.43" y1="1.56844375" x2="12.88719375" y2="1.11125" width="0.2032" layer="1"/>
 <wire x1="12.88719375" y1="1.11125" x2="22.86" y2="1.11125" width="0.2032" layer="1"/>
-<wire x1="22.86" y1="1.11125" x2="28.575" y2="1.11125" width="0.2032" layer="1"/>
+<wire x1="22.86" y1="1.11125" x2="27.94" y2="1.11125" width="0.2032" layer="1"/>
 <wire x1="22.5575" y1="1.905" x2="22.5575" y2="1.12625" width="0.2032" layer="1"/>
-<wire x1="28.575" y1="1.11125" x2="29.36875" y2="1.905" width="0.2032" layer="1"/>
-<wire x1="29.36875" y1="1.905" x2="29.98875" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="27.94" y1="1.11125" x2="28.73375" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="28.73375" y1="1.905" x2="29.67125" y2="1.905" width="0.2032" layer="1"/>
 <wire x1="22.5575" y1="1.12625" x2="22.845" y2="1.12625" width="0.2032" layer="1"/>
 <wire x1="22.845" y1="1.12625" x2="22.86" y2="1.11125" width="0.2032" layer="1"/>
 </signal>
@@ -3189,7 +3185,7 @@ design rules under a new name.</descript
 <wire x1="11.93" y1="2.35625" x2="11.93" y2="1.323790625" width="0.2032" layer="1"/>
 <wire x1="11.93" y1="1.323790625" x2="12.618790625" y2="0.635" width="0.2032" layer="1"/>
 <wire x1="12.618790625" y1="0.635" x2="29.83" y2="0.635" width="0.2032" layer="1"/>
-<wire x1="29.83" y1="0.635" x2="29.98875" y2="0.79375" width="0.2032" layer="1"/>
+<wire x1="29.83" y1="0.635" x2="29.67125" y2="0.79375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI1_MISO">
 <contactref element="U101" pad="16"/>
@@ -3274,25 +3270,15 @@ design rules under a new name.</descript
 <contactref element="U103" pad="3"/>
 <via x="17.93875" y="2.8575" extent="1-16" drill="0.3048"/>
 <wire x1="17.93875" y1="2.8575" x2="18.89125" y2="3.81" width="0.2032" layer="16"/>
-<wire x1="18.89125" y1="3.81" x2="29.21" y2="3.81" width="0.2032" layer="16"/>
-<wire x1="29.21" y1="3.81" x2="29.68625" y2="3.33375" width="0.2032" layer="16"/>
-<wire x1="29.68625" y1="3.33375" x2="29.68625" y2="3.175" width="0.2032" layer="16"/>
-<wire x1="29.68625" y1="3.175" x2="29.845" y2="3.01625" width="0.2032" layer="16"/>
-<via x="29.845" y="3.01625" extent="1-16" drill="0.3048"/>
-<wire x1="30.32125" y1="3.65125" x2="31.115" y2="4.445" width="0.2032" layer="1"/>
-<wire x1="31.115" y1="4.445" x2="31.4325" y2="4.445" width="0.2032" layer="1"/>
-<wire x1="31.4325" y1="4.445" x2="32.385" y2="5.3975" width="0.2032" layer="1"/>
-<wire x1="32.385" y1="5.3975" x2="34.29" y2="5.3975" width="0.2032" layer="1"/>
-<wire x1="34.29" y1="5.3975" x2="36.98875" y2="8.09625" width="0.2032" layer="1"/>
-<via x="36.98875" y="8.09625" extent="1-16" drill="0.3048"/>
-<wire x1="36.98875" y1="8.09625" x2="38.1" y2="6.985" width="0.2032" layer="16"/>
-<wire x1="38.1" y1="6.985" x2="41.5925" y2="6.985" width="0.2032" layer="16"/>
-<wire x1="30.32125" y1="3.65125" x2="30.32125" y2="3.4925" width="0.2032" layer="1"/>
-<wire x1="30.32125" y1="3.4925" x2="29.845" y2="3.01625" width="0.2032" layer="1"/>
+<wire x1="18.89125" y1="3.81" x2="28.73375" y2="3.81" width="0.2032" layer="16"/>
 <wire x1="14.63" y1="3.05625" x2="14.8825" y2="3.05625" width="0.2032" layer="1"/>
 <wire x1="14.8825" y1="3.05625" x2="15.39875" y2="2.54" width="0.2032" layer="1"/>
 <wire x1="15.39875" y1="2.54" x2="17.62125" y2="2.54" width="0.2032" layer="1"/>
 <wire x1="17.62125" y1="2.54" x2="17.93875" y2="2.8575" width="0.2032" layer="1"/>
+<wire x1="41.5925" y1="6.985" x2="36.83" y2="6.985" width="0.2032" layer="16"/>
+<wire x1="36.83" y1="6.985" x2="32.0675" y2="2.2225" width="0.2032" layer="16"/>
+<wire x1="32.0675" y1="2.2225" x2="30.32125" y2="2.2225" width="0.2032" layer="16"/>
+<wire x1="30.32125" y1="2.2225" x2="28.73375" y2="3.81" width="0.2032" layer="16"/>
 </signal>
 <signal name="SWDIO">
 <contactref element="U101" pad="34"/>
@@ -3306,16 +3292,15 @@ design rules under a new name.</descript
 <wire x1="20.16125" y1="3.33375" x2="28.09875" y2="3.33375" width="0.2032" layer="16"/>
 <wire x1="28.09875" y1="3.33375" x2="28.8925" y2="2.54" width="0.2032" layer="16"/>
 <via x="28.8925" y="2.54" extent="1-16" drill="0.3048"/>
-<wire x1="28.8925" y1="2.54" x2="28.8925" y2="6.82625" width="0.2032" layer="1"/>
-<wire x1="28.8925" y1="6.82625" x2="29.845" y2="7.77875" width="0.2032" layer="1"/>
-<wire x1="29.845" y1="7.77875" x2="31.75" y2="7.77875" width="0.2032" layer="1"/>
-<wire x1="31.75" y1="7.77875" x2="32.385" y2="7.14375" width="0.2032" layer="1"/>
-<wire x1="32.385" y1="7.14375" x2="34.76625" y2="7.14375" width="0.2032" layer="1"/>
-<wire x1="34.76625" y1="7.14375" x2="35.08375" y2="7.46125" width="0.2032" layer="1"/>
-<via x="35.08375" y="7.46125" extent="1-16" drill="0.3048"/>
-<wire x1="35.08375" y1="7.46125" x2="36.98875" y2="7.46125" width="0.2032" layer="16"/>
-<wire x1="36.98875" y1="7.46125" x2="38.735" y2="5.715" width="0.2032" layer="16"/>
-<wire x1="38.735" y1="5.715" x2="41.5925" y2="5.715" width="0.2032" layer="16"/>
+<wire x1="28.8925" y1="2.54" x2="28.8925" y2="4.7625" width="0.2032" layer="1"/>
+<wire x1="28.8925" y1="4.7625" x2="30.95625" y2="6.82625" width="0.2032" layer="1"/>
+<wire x1="36.98875" y1="6.0325" x2="37.30625" y2="6.35" width="0.2032" layer="16"/>
+<wire x1="37.30625" y1="6.35" x2="40.005" y2="6.35" width="0.2032" layer="16"/>
+<wire x1="40.005" y1="6.35" x2="40.64" y2="5.715" width="0.2032" layer="16"/>
+<wire x1="40.64" y1="5.715" x2="41.5925" y2="5.715" width="0.2032" layer="16"/>
+<via x="36.98875" y="6.0325" extent="1-16" drill="0.381"/>
+<wire x1="36.98875" y1="6.0325" x2="36.195" y2="6.82625" width="0.2032" layer="1"/>
+<wire x1="36.195" y1="6.82625" x2="30.95625" y2="6.82625" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$23">
 <contactref element="LED102" pad="A"/>
@@ -3328,7 +3313,7 @@ design rules under a new name.</descript
 <contactref element="R101" pad="2"/>
 <wire x1="40.46625" y1="0.79375" x2="39.52875" y2="0.79375" width="0.2032" layer="1"/>
 <wire x1="39.52875" y1="0.79375" x2="39.37" y2="0.9525" width="0.2032" layer="1"/>
-<wire x1="39.37" y1="0.9525" x2="39.37" y2="1.663" width="0.2032" layer="1"/>
+<wire x1="39.13575" y1="0.79375" x2="39.52875" y2="0.79375" width="0.2032" layer="1"/>
 </signal>
 <signal name="LED_PWR">
 <contactref element="R102" pad="1"/>
@@ -3447,19 +3432,21 @@ design rules under a new name.</descript
 <contactref element="R101" pad="1"/>
 <via x="15.875" y="3.33375" extent="1-16" drill="0.3048"/>
 <wire x1="17.145" y1="3.01625" x2="18.415" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="18.415" y1="4.28625" x2="29.845" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="29.845" y1="4.28625" x2="31.4325" y2="2.69875" width="0.2032" layer="16"/>
-<wire x1="31.4325" y1="2.69875" x2="33.9725" y2="2.69875" width="0.2032" layer="16"/>
-<via x="41.43375" y="1.74625" extent="1-16" drill="0.3048"/>
+<wire x1="18.415" y1="4.28625" x2="30.00375" y2="4.28625" width="0.2032" layer="16"/>
+<via x="41.5925" y="1.5875" extent="1-16" drill="0.3048"/>
 <wire x1="15.875" y1="3.33375" x2="15.24" y2="3.33375" width="0.2032" layer="1"/>
 <wire x1="15.24" y1="3.33375" x2="15.0175" y2="3.55625" width="0.2032" layer="1"/>
 <wire x1="15.0175" y1="3.55625" x2="14.63" y2="3.55625" width="0.2032" layer="1"/>
-<wire x1="41.43375" y1="1.74625" x2="34.925" y2="1.74625" width="0.2032" layer="16"/>
-<wire x1="34.925" y1="1.74625" x2="33.9725" y2="2.69875" width="0.2032" layer="16"/>
+<wire x1="41.5925" y1="1.5875" x2="34.44875" y2="1.5875" width="0.2032" layer="16"/>
 <wire x1="17.145" y1="3.01625" x2="16.1925" y2="3.01625" width="0.2032" layer="16"/>
 <wire x1="16.1925" y1="3.01625" x2="15.875" y2="3.33375" width="0.2032" layer="16"/>
 <wire x1="41.76625" y1="0.79375" x2="41.76625" y2="1.41375" width="0.2032" layer="1"/>
-<wire x1="41.76625" y1="1.41375" x2="41.43375" y2="1.74625" width="0.2032" layer="1"/>
+<wire x1="41.76625" y1="1.41375" x2="41.5925" y2="1.5875" width="0.2032" layer="1"/>
+<wire x1="30.00375" y1="4.28625" x2="30.95625" y2="3.33375" width="0.2032" layer="16"/>
+<via x="34.44875" y="1.5875" extent="1-16" drill="0.381"/>
+<wire x1="34.44875" y1="1.5875" x2="32.7025" y2="1.5875" width="0.2032" layer="1"/>
+<wire x1="32.7025" y1="1.5875" x2="30.95625" y2="3.33375" width="0.2032" layer="1"/>
+<via x="30.95625" y="3.33375" extent="1-16" drill="0.381"/>
 </signal>
 <signal name="SW-BTN">
 <contactref element="SW101" pad="2"/>
@@ -3471,20 +3458,11 @@ design rules under a new name.</descript
 <wire x1="16.1925" y1="3.96875" x2="16.66875" y2="3.4925" width="0.2032" layer="16"/>
 <wire x1="16.66875" y1="3.4925" x2="16.98625" y2="3.4925" width="0.2032" layer="16"/>
 <wire x1="16.98625" y1="3.4925" x2="18.25625" y2="4.7625" width="0.2032" layer="16"/>
-<wire x1="18.25625" y1="4.7625" x2="30.1625" y2="4.7625" width="0.2032" layer="16"/>
-<wire x1="30.1625" y1="4.7625" x2="31.59125" y2="3.33375" width="0.2032" layer="16"/>
-<wire x1="31.59125" y1="3.33375" x2="33.9725" y2="3.33375" width="0.2032" layer="16"/>
-<wire x1="33.9725" y1="3.33375" x2="34.925" y2="4.28625" width="0.2032" layer="16"/>
-<via x="34.925" y="4.28625" extent="1-16" drill="0.3048"/>
-<wire x1="34.925" y1="4.28625" x2="34.925" y2="3.025" width="0.2032" layer="1"/>
-</signal>
-<signal name="N$11">
-<contactref element="U102" pad="4"/>
-<contactref element="C1" pad="1"/>
-<wire x1="19.05" y1="7" x2="19.279815625" y2="7" width="0.2032" layer="1"/>
-<wire x1="19.279815625" y1="7" x2="20.6375" y2="5.642315625" width="0.2032" layer="1"/>
-<wire x1="20.6375" y1="5.642315625" x2="20.6375" y2="5.3699" width="0.2032" layer="1"/>
-<wire x1="20.6375" y1="5.3699" x2="20.64" y2="5.3674" width="0.2032" layer="1"/>
+<wire x1="18.25625" y1="4.7625" x2="33.49625" y2="4.7625" width="0.2032" layer="16"/>
+<wire x1="33.49625" y1="4.7625" x2="33.655" y2="4.92125" width="0.2032" layer="16"/>
+<via x="33.655" y="4.92125" extent="1-16" drill="0.381"/>
+<wire x1="32.57386875" y1="3.99886875" x2="32.73261875" y2="3.99886875" width="0.2032" layer="1"/>
+<wire x1="32.73261875" y1="3.99886875" x2="33.655" y2="4.92125" width="0.2032" layer="1"/>
 </signal>
 </signals>
 </board>
diff --git a/zoncoffee.sch b/zoncoffee.sch
--- a/zoncoffee.sch
+++ b/zoncoffee.sch
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="6.4">
+<eagle version="6.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
@@ -179,10 +179,10 @@ chip</description>
 <wire x1="1.346" y1="0.483" x2="1.346" y2="-0.483" width="0.0508" layer="39"/>
 <wire x1="1.346" y1="-0.483" x2="-1.346" y2="-0.483" width="0.0508" layer="39"/>
 <wire x1="-1.346" y1="-0.483" x2="-1.346" y2="0.483" width="0.0508" layer="39"/>
-<wire x1="-1.27" y1="-0.635" x2="-1.27" y2="0.635" width="0.2032" layer="51"/>
-<wire x1="-1.27" y1="0.635" x2="1.27" y2="0.635" width="0.2032" layer="51"/>
-<wire x1="1.27" y1="0.635" x2="1.27" y2="-0.635" width="0.2032" layer="51"/>
-<wire x1="1.27" y1="-0.635" x2="-1.27" y2="-0.635" width="0.2032" layer="51"/>
+<wire x1="-1.27" y1="-0.635" x2="-1.27" y2="0.635" width="0.2032" layer="21"/>
+<wire x1="-1.27" y1="0.635" x2="1.27" y2="0.635" width="0.2032" layer="21"/>
+<wire x1="1.27" y1="0.635" x2="1.27" y2="-0.635" width="0.2032" layer="21"/>
+<wire x1="1.27" y1="-0.635" x2="-1.27" y2="-0.635" width="0.2032" layer="21"/>
 <smd name="1" x="-0.65" y="0" dx="0.7" dy="0.9" layer="1"/>
 <smd name="2" x="0.65" y="0" dx="0.7" dy="0.9" layer="1"/>
 <text x="1.397" y="-0.1905" size="0.8128" layer="25" ratio="18">&gt;NAME</text>
@@ -655,25 +655,8 @@ Epson Toyocom FCC-255</description>
 <smd name="3" x="-7.7" y="-3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="2" x="-7.7" y="-3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
 <smd name="1" x="-7.7" y="-4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<text x="-23" y="1" size="1.016" layer="51">Active Area 0.91"</text>
-<text x="-22" y="-1" size="1.016" layer="51">128x32 Pixels</text>
 <text x="-30" y="6.5" size="0.8128" layer="25" ratio="18">&gt;NAME</text>
 <text x="-30" y="-7.5" size="0.4064" layer="27" ratio="10">&gt;VALUE</text>
-<rectangle x1="-8.2" y1="4.375" x2="-6.4" y2="4.725" layer="51"/>
-<rectangle x1="-8.2" y1="3.725" x2="-6.4" y2="4.075" layer="51"/>
-<rectangle x1="-8.2" y1="3.075" x2="-6.4" y2="3.425" layer="51"/>
-<rectangle x1="-8.2" y1="2.425" x2="-6.4" y2="2.775" layer="51"/>
-<rectangle x1="-8.2" y1="1.775" x2="-6.4" y2="2.125" layer="51"/>
-<rectangle x1="-8.2" y1="1.125" x2="-6.4" y2="1.475" layer="51"/>
-<rectangle x1="-8.2" y1="0.475" x2="-6.4" y2="0.825" layer="51"/>
-<rectangle x1="-8.2" y1="-0.175" x2="-6.4" y2="0.175" layer="51"/>
-<rectangle x1="-8.2" y1="-0.825" x2="-6.4" y2="-0.475" layer="51"/>
-<rectangle x1="-8.2" y1="-1.475" x2="-6.4" y2="-1.125" layer="51"/>
-<rectangle x1="-8.2" y1="-2.125" x2="-6.4" y2="-1.775" layer="51"/>
-<rectangle x1="-8.2" y1="-2.775" x2="-6.4" y2="-2.425" layer="51"/>
-<rectangle x1="-8.2" y1="-3.425" x2="-6.4" y2="-3.075" layer="51"/>
-<rectangle x1="-8.2" y1="-4.075" x2="-6.4" y2="-3.725" layer="51"/>
-<rectangle x1="-8.2" y1="-4.725" x2="-6.4" y2="-4.375" layer="51"/>
 </package>
 </packages>
 <symbols>
@@ -3396,60 +3379,6 @@ 5V - VREG-00823</description>
 <pad name="1" x="0" y="2.54" drill="0.4572"/>
 <smd name="6" x="0" y="-3.81" dx="0.889" dy="0.8128" layer="1"/>
 </package>
-<package name="0603-ARV-4">
-<text x="-1.905" y="-2.794" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="-1.905" y="1.524" size="1.27" layer="27" ratio="10">&gt;VALUE</text>
-<smd name="1" x="-1.1811" y="0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="2" x="-0.3937" y="0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="3" x="0.3937" y="0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="4" x="1.1811" y="0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="5" x="1.1811" y="-0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="6" x="0.3937" y="-0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="7" x="-0.3937" y="-0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<smd name="8" x="-1.1811" y="-0.84455" dx="0.9017" dy="0.4572" layer="1" rot="R90"/>
-<wire x1="-1.6002" y1="-0.4953" x2="1.6002" y2="-0.4953" width="0.127" layer="21"/>
-<wire x1="1.6002" y1="-0.4953" x2="1.6002" y2="0.4953" width="0.127" layer="21"/>
-<wire x1="1.6002" y1="0.4953" x2="-1.6002" y2="0.4953" width="0.127" layer="21"/>
-<wire x1="-1.6002" y1="0.4953" x2="-1.6002" y2="-0.4953" width="0.127" layer="21"/>
-<wire x1="-1.6002" y1="0.4953" x2="-1.6002" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="-1.6002" y1="0.8128" x2="-1.4478" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="-1.4478" y1="0.8128" x2="-1.3462" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="-1.3462" y1="0.6858" x2="-1.016" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="-1.016" y1="0.6858" x2="-0.9144" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="-0.9144" y1="0.8128" x2="-0.6604" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="-0.6604" y1="0.8128" x2="-0.5588" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="-0.5588" y1="0.6858" x2="-0.2286" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="-0.2286" y1="0.6858" x2="-0.1524" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="-0.1524" y1="0.8128" x2="0.127" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="0.127" y1="0.8128" x2="0.2286" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="0.2286" y1="0.6858" x2="0.5588" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="0.5588" y1="0.6858" x2="0.6604" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="0.6604" y1="0.8128" x2="0.9144" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="0.9144" y1="0.8128" x2="1.016" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="1.016" y1="0.6858" x2="1.3462" y2="0.6858" width="0.127" layer="21"/>
-<wire x1="1.3462" y1="0.6858" x2="1.4478" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="1.4478" y1="0.8128" x2="1.6002" y2="0.8128" width="0.127" layer="21"/>
-<wire x1="1.6002" y1="0.8128" x2="1.6002" y2="0.4953" width="0.127" layer="21"/>
-<wire x1="1.6002" y1="-0.4953" x2="1.6002" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="1.6002" y1="-0.8128" x2="1.4478" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="1.4478" y1="-0.8128" x2="1.3462" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="1.3462" y1="-0.6858" x2="1.016" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="1.016" y1="-0.6858" x2="0.9144" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="0.9144" y1="-0.8128" x2="0.635" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="0.635" y1="-0.8128" x2="0.5588" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="0.5588" y1="-0.6858" x2="0.2286" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="0.2286" y1="-0.6858" x2="0.1524" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="0.1524" y1="-0.8128" x2="-0.127" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="-0.127" y1="-0.8128" x2="-0.2286" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="-0.2286" y1="-0.6858" x2="-0.5842" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="-0.5842" y1="-0.6858" x2="-0.6604" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="-0.6604" y1="-0.8128" x2="-0.9144" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="-0.9144" y1="-0.8128" x2="-1.016" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="-1.016" y1="-0.6858" x2="-1.3462" y2="-0.6858" width="0.127" layer="21"/>
-<wire x1="-1.3462" y1="-0.6858" x2="-1.4478" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="-1.4478" y1="-0.8128" x2="-1.6002" y2="-0.8128" width="0.127" layer="21"/>
-<wire x1="-1.6002" y1="-0.8128" x2="-1.6002" y2="-0.4953" width="0.127" layer="21"/>
-</package>
 </packages>
 <symbols>
 <symbol name="STM32L100C6U6">
@@ -3520,17 +3449,6 @@ 5V - VREG-00823</description>
 <text x="0" y="-10.16" size="1.778" layer="95" rot="MR180">&gt;VALUE</text>
 <rectangle x1="0" y1="-8.89" x2="1.27" y2="6.35" layer="94"/>
 </symbol>
-<symbol name="C-US">
-<wire x1="-0.762" y1="0" x2="0.762" y2="0" width="0.254" layer="94"/>
-<wire x1="0" y1="-1.016" x2="0" y2="-1.0161" width="0.1524" layer="94"/>
-<wire x1="0" y1="-1.0161" x2="0" y2="-2.54" width="0.1524" layer="94"/>
-<wire x1="0" y1="-1" x2="0.9652" y2="-1.3462" width="0.254" layer="94" curve="-37.878202" cap="flat"/>
-<wire x1="-0.9428" y1="-1.3424" x2="0" y2="-1.0161" width="0.254" layer="94" curve="-37.373024" cap="flat"/>
-<text x="1.016" y="0.635" size="1.778" layer="95">&gt;NAME</text>
-<text x="1.016" y="-4.191" size="1.778" layer="96">&gt;VALUE</text>
-<pin name="1" x="0" y="2.54" visible="off" length="short" direction="pas" swaplevel="1" rot="R270"/>
-<pin name="2" x="0" y="-5.08" visible="off" length="short" direction="pas" swaplevel="1" rot="R90"/>
-</symbol>
 </symbols>
 <devicesets>
 <deviceset name="STM32L100C6U6">
@@ -3682,31 +3600,6 @@ 5V - VREG-00823</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="CAP-ARRAY">
-<gates>
-<gate name="1" symbol="C-US" x="-15.24" y="0"/>
-<gate name="2" symbol="C-US" x="-7.62" y="0"/>
-<gate name="3" symbol="C-US" x="0" y="0"/>
-<gate name="4" symbol="C-US" x="7.62" y="0"/>
-</gates>
-<devices>
-<device name="" package="0603-ARV-4">
-<connects>
-<connect gate="1" pin="1" pad="1"/>
-<connect gate="1" pin="2" pad="8"/>
-<connect gate="2" pin="1" pad="2"/>
-<connect gate="2" pin="2" pad="7"/>
-<connect gate="3" pin="1" pad="3"/>
-<connect gate="3" pin="2" pad="6"/>
-<connect gate="4" pin="1" pad="4"/>
-<connect gate="4" pin="2" pad="5"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
 </devicesets>
 </library>
 <library name="SparkFun-Aesthetics">
@@ -4986,13 +4879,14 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="GND7" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="GND8" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="U103" library="Protofusion" deviceset="POGOPIN-CONN" device="WITHVIAS-SMV"/>
-<part name="RA101" library="Protofusion" deviceset="CAP-ARRAY" device="" value="2.2uF"/>
 <part name="FRAME1" library="SparkFun-Aesthetics" deviceset="FRAME-A4L" device=""/>
 <part name="R1" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES" value="1.5k"/>
 <part name="SUPPLY11" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="C1" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="100pF"/>
-<part name="GND9" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="LCD1" library="microbuilder" deviceset="DISP_OLED_UG-2832HSWEG04" device="WRAPAROUND"/>
+<part name="C1" library="microbuilder" deviceset="CAP_CERAMIC" device="0402" value="2.2uF"/>
+<part name="C2" library="microbuilder" deviceset="CAP_CERAMIC" device="0402" value="2.2uF"/>
+<part name="C3" library="microbuilder" deviceset="CAP_CERAMIC" device="0402" value="2.2uF"/>
+<part name="C4" library="microbuilder" deviceset="CAP_CERAMIC" device="0402" value="2.2uF"/>
 </parts>
 <sheets>
 <sheet>
@@ -5068,16 +4962,14 @@ Standard 0603 ceramic capacitor, and 0.1
 <instance part="GND7" gate="1" x="182.88" y="-10.16"/>
 <instance part="GND8" gate="1" x="243.84" y="-12.7"/>
 <instance part="U103" gate="J" x="279.4" y="7.62"/>
-<instance part="RA101" gate="1" x="119.38" y="-10.16" rot="R270"/>
-<instance part="RA101" gate="2" x="114.3" y="-15.24" rot="R270"/>
-<instance part="RA101" gate="3" x="119.38" y="-33.02" rot="R270"/>
-<instance part="RA101" gate="4" x="114.3" y="-35.56" rot="R270"/>
 <instance part="FRAME1" gate="G$1" x="58.42" y="-58.42"/>
 <instance part="R1" gate="G$1" x="228.6" y="73.66" rot="R90"/>
 <instance part="SUPPLY11" gate="G$1" x="228.6" y="81.28"/>
-<instance part="C1" gate="G$1" x="226.06" y="-12.7"/>
-<instance part="GND9" gate="1" x="226.06" y="-20.32"/>
 <instance part="LCD1" gate="G$1" x="137.16" y="-17.78"/>
+<instance part="C1" gate="G$1" x="116.84" y="-10.16" rot="R270"/>
+<instance part="C2" gate="G$1" x="116.84" y="-33.02" rot="R270"/>
+<instance part="C3" gate="G$1" x="111.76" y="-15.24" rot="R270"/>
+<instance part="C4" gate="G$1" x="111.76" y="-35.56" rot="R270"/>
 </instances>
 <busses>
 </busses>
@@ -5135,11 +5027,11 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="99.06" y="-33.02"/>
 <pinref part="U$2" gate="G$1" pin="GND"/>
 <pinref part="R103" gate="G$1" pin="1"/>
-<pinref part="RA101" gate="4" pin="2"/>
-<pinref part="RA101" gate="3" pin="2"/>
-<pinref part="RA101" gate="2" pin="2"/>
-<pinref part="RA101" gate="1" pin="2"/>
 <pinref part="LCD1" gate="G$1" pin="VSS"/>
+<pinref part="C1" gate="G$1" pin="P$2"/>
+<pinref part="C3" gate="G$1" pin="P$2"/>
+<pinref part="C2" gate="G$1" pin="P$2"/>
+<pinref part="C4" gate="G$1" pin="P$2"/>
 </segment>
 <segment>
 <pinref part="JP101" gate="G$1" pin="2"/>
@@ -5271,11 +5163,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="81.28" y1="71.12" x2="88.9" y2="71.12" width="0.1524" layer="91"/>
 <junction x="88.9" y="71.12"/>
 </segment>
-<segment>
-<pinref part="C1" gate="G$1" pin="2"/>
-<pinref part="GND9" gate="1" pin="GND"/>
-<wire x1="226.06" y1="-17.78" x2="226.06" y2="-15.24" width="0.1524" layer="91"/>
-</segment>
 </net>
 <net name="N$8" class="0">
 <segment>
@@ -5287,15 +5174,15 @@ Standard 0603 ceramic capacitor, and 0.1
 <net name="N$9" class="0">
 <segment>
 <wire x1="127" y1="-33.02" x2="121.92" y2="-33.02" width="0.1524" layer="91"/>
-<pinref part="RA101" gate="3" pin="1"/>
 <pinref part="LCD1" gate="G$1" pin="VCOMH"/>
+<pinref part="C2" gate="G$1" pin="P$1"/>
 </segment>
 </net>
 <net name="N$15" class="0">
 <segment>
 <wire x1="127" y1="-35.56" x2="116.84" y2="-35.56" width="0.1524" layer="91"/>
-<pinref part="RA101" gate="4" pin="1"/>
 <pinref part="LCD1" gate="G$1" pin="VCC"/>
+<pinref part="C4" gate="G$1" pin="P$1"/>
 </segment>
 </net>
 <net name="3.3V" class="0">
@@ -5308,12 +5195,12 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="149.86" y1="-15.24" x2="149.86" y2="-10.16" width="0.1524" layer="91"/>
 <junction x="149.86" y="-10.16"/>
 <pinref part="U$17" gate="G$1" pin="3.3V"/>
-<pinref part="RA101" gate="2" pin="1"/>
-<pinref part="RA101" gate="1" pin="1"/>
 <pinref part="LCD1" gate="G$1" pin="VBAT"/>
 <junction x="127" y="-10.16"/>
 <pinref part="LCD1" gate="G$1" pin="VDD"/>
 <junction x="127" y="-15.24"/>
+<pinref part="C1" gate="G$1" pin="P$1"/>
+<pinref part="C3" gate="G$1" pin="P$1"/>
 </segment>
 <segment>
 <pinref part="U102" gate="G$1" pin="OUT"/>
@@ -5762,13 +5649,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="195.58" y="81.28" size="1.016" layer="95" xref="yes"/>
 </segment>
 </net>
-<net name="N$11" class="0">
-<segment>
-<pinref part="U102" gate="G$1" pin="BP"/>
-<pinref part="C1" gate="G$1" pin="1"/>
-<wire x1="218.44" y1="-7.62" x2="226.06" y2="-7.62" width="0.1524" layer="91"/>
-</segment>
-</net>
 </nets>
 </sheet>
 </sheets>