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>