diff --git a/therm.sch b/therm.sch
--- a/therm.sch
+++ b/therm.sch
@@ -189,103 +189,6 @@
 <libraries>
 <library name="microbuilder">
 <packages>
-<package name="UG-2832HSWEG04">
-<description>128x32 OLED Display - 0.91" (30x11.5mm)</description>
-<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.127" layer="51"/>
-<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.127" layer="51"/>
-<wire x1="-30" y1="5.575" x2="-30" y2="-5.575" width="0.127" layer="51"/>
-<wire x1="0" y1="5.575" x2="0" y2="-5.575" width="0.127" layer="51"/>
-<wire x1="-5.516" y1="3.475" x2="-27.9" y2="3.475" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="-5.516" y1="-2.109" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="-5.516" y1="3.475" x2="-5.516" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="-27.9" y1="3.475" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="21"/>
-<wire x1="0" y1="5.575" x2="0" y2="-5.575" width="0.2032" layer="21"/>
-<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
-<wire x1="-30" y1="5.575" x2="-30" y2="-5.575" width="0.2032" layer="21"/>
-<smd name="15" x="15.8" y="4.55" dx="2.6" dy="0.35" layer="1"/>
-<smd name="14" x="15.8" y="3.9" dx="2.6" dy="0.35" layer="1"/>
-<smd name="13" x="15.8" y="3.25" dx="2.6" dy="0.35" layer="1"/>
-<smd name="12" x="15.8" y="2.6" dx="2.6" dy="0.35" layer="1"/>
-<smd name="11" x="15.8" y="1.95" dx="2.6" dy="0.35" layer="1"/>
-<smd name="10" x="15.8" y="1.3" dx="2.6" dy="0.35" layer="1"/>
-<smd name="9" x="15.8" y="0.65" dx="2.6" dy="0.35" layer="1"/>
-<smd name="8" x="15.8" y="0" dx="2.6" dy="0.35" layer="1"/>
-<smd name="7" x="15.8" y="-0.65" dx="2.6" dy="0.35" layer="1"/>
-<smd name="6" x="15.8" y="-1.3" dx="2.6" dy="0.35" layer="1"/>
-<smd name="5" x="15.8" y="-1.95" dx="2.6" dy="0.35" layer="1"/>
-<smd name="4" x="15.8" y="-2.6" dx="2.6" dy="0.35" layer="1"/>
-<smd name="3" x="15.8" y="-3.25" dx="2.6" dy="0.35" layer="1"/>
-<smd name="2" x="15.8" y="-3.9" dx="2.6" dy="0.35" layer="1"/>
-<smd name="1" x="15.8" y="-4.55" dx="2.6" dy="0.35" layer="1"/>
-<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="14.5" y1="-0.175" x2="16.3" y2="0.175" layer="51"/>
-<rectangle x1="14.5" y1="4.375" x2="16.3" y2="4.725" layer="51"/>
-<rectangle x1="14.5" y1="3.725" x2="16.3" y2="4.075" layer="51"/>
-<rectangle x1="14.5" y1="3.075" x2="16.3" y2="3.425" layer="51"/>
-<rectangle x1="14.5" y1="2.425" x2="16.3" y2="2.775" layer="51"/>
-<rectangle x1="14.5" y1="1.775" x2="16.3" y2="2.125" layer="51"/>
-<rectangle x1="14.5" y1="1.125" x2="16.3" y2="1.475" layer="51"/>
-<rectangle x1="14.5" y1="0.475" x2="16.3" y2="0.825" layer="51"/>
-<rectangle x1="14.5" y1="-0.825" x2="16.3" y2="-0.475" layer="51"/>
-<rectangle x1="14.5" y1="-1.475" x2="16.3" y2="-1.125" layer="51"/>
-<rectangle x1="14.5" y1="-2.125" x2="16.3" y2="-1.775" layer="51"/>
-<rectangle x1="14.5" y1="-2.775" x2="16.3" y2="-2.425" layer="51"/>
-<rectangle x1="14.5" y1="-3.425" x2="16.3" y2="-3.075" layer="51"/>
-<rectangle x1="14.5" y1="-4.075" x2="16.3" y2="-3.725" layer="51"/>
-<rectangle x1="14.5" y1="-4.725" x2="16.3" y2="-4.375" layer="51"/>
-</package>
-<package name="UG-2832HSWEG04_WRAPAROUND">
-<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.127" layer="51"/>
-<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.127" layer="51"/>
-<wire x1="-30" y1="5.575" x2="-30" y2="-5.575" width="0.127" layer="51"/>
-<wire x1="0" y1="5.575" x2="0" y2="-5.575" width="0.127" layer="51"/>
-<wire x1="-5.516" y1="3.475" x2="-27.9" y2="3.475" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="-5.516" y1="-2.109" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="-5.516" y1="3.475" x2="-5.516" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="-27.9" y1="3.475" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
-<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="21"/>
-<wire x1="0" y1="5.575" x2="0" y2="-5.75" width="0.2032" layer="21"/>
-<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
-<wire x1="-30" y1="5.575" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
-<smd name="15" x="-7.7" y="4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="14" x="-7.7" y="3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="13" x="-7.7" y="3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="12" x="-7.7" y="2.6" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="11" x="-7.7" y="1.95" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="10" x="-7.7" y="1.3" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="9" x="-7.7" y="0.65" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="8" x="-7.7" y="0" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="7" x="-7.7" y="-0.65" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="6" x="-7.7" y="-1.3" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="5" x="-7.7" y="-1.95" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<smd name="4" x="-7.7" y="-2.6" dx="2.6" dy="0.35" layer="16" rot="R180"/>
-<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>
 <package name="TSSOP14">
 <description>&lt;b&gt;Thin Shrink Small Outline Plastic 14&lt;/b&gt;&lt;p&gt;</description>
 <wire x1="-2.5146" y1="-2.2828" x2="2.5146" y2="-2.2828" width="0.2032" layer="51"/>
@@ -505,30 +408,6 @@ Epson Toyocom FCC-255</description>
 <text x="-1.524" y="1.016" size="1.27" layer="96">&gt;VALUE</text>
 <pin name="3.3V" x="0" y="-2.54" visible="off" length="short" direction="sup" rot="R90"/>
 </symbol>
-<symbol name="UG-2832HSWEG04">
-<wire x1="-7.62" y1="20.32" x2="-7.62" y2="-20.32" width="0.254" layer="94"/>
-<wire x1="-7.62" y1="-20.32" x2="7.62" y2="-20.32" width="0.254" layer="94"/>
-<wire x1="7.62" y1="-20.32" x2="7.62" y2="20.32" width="0.254" layer="94"/>
-<wire x1="7.62" y1="20.32" x2="-7.62" y2="20.32" width="0.254" layer="94"/>
-<text x="-7.62" y="22.86" size="1.27" layer="95">&gt;NAME</text>
-<text x="-7.62" y="-22.86" size="1.27" layer="96">&gt;VALUE</text>
-<text x="5.08" y="-10.16" size="1.27" layer="97" rot="R90">128x32 OLED Display</text>
-<pin name="C2+" x="-10.16" y="17.78" length="short"/>
-<pin name="C2-" x="-10.16" y="15.24" length="short"/>
-<pin name="C1+" x="-10.16" y="12.7" length="short"/>
-<pin name="C1-" x="-10.16" y="10.16" length="short"/>
-<pin name="VBAT" x="-10.16" y="7.62" length="short"/>
-<pin name="VSS" x="-10.16" y="5.08" length="short"/>
-<pin name="VDD" x="-10.16" y="2.54" length="short"/>
-<pin name="CS#" x="-10.16" y="0" length="short"/>
-<pin name="RES#" x="-10.16" y="-2.54" length="short"/>
-<pin name="D/C#" x="-10.16" y="-5.08" length="short"/>
-<pin name="SCLK" x="-10.16" y="-7.62" length="short"/>
-<pin name="SDIN" x="-10.16" y="-10.16" length="short"/>
-<pin name="IREF" x="-10.16" y="-12.7" length="short"/>
-<pin name="VCOMH" x="-10.16" y="-15.24" length="short"/>
-<pin name="VCC" x="-10.16" y="-17.78" length="short"/>
-</symbol>
 <symbol name="MAX31856">
 <pin name="AGND" x="-12.7" y="7.62" length="short" direction="pwr"/>
 <pin name="BIAS" x="-12.7" y="5.08" length="short" direction="pwr"/>
@@ -581,7 +460,7 @@ Temp:</text>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="GND">
+<deviceset name="GND" prefix="GND">
 <description>&lt;b&gt;GND&lt;/b&gt;</description>
 <gates>
 <gate name="G$1" symbol="GND" x="0" y="0"/>
@@ -594,7 +473,7 @@ Temp:</text>
 </device>
 </devices>
 </deviceset>
-<deviceset name="3.3V">
+<deviceset name="3.3V" prefix="SUP">
 <description>&lt;b&gt;3.3V Supply&lt;/b&gt;</description>
 <gates>
 <gate name="G$1" symbol="3.3V" x="0" y="0"/>
@@ -607,58 +486,6 @@ Temp:</text>
 </device>
 </devices>
 </deviceset>
-<deviceset name="DISP_OLED_UG-2832HSWEG04" prefix="LCD" uservalue="yes">
-<description>128x32 SPI 0.91" Monochrome OLED Display</description>
-<gates>
-<gate name="G$1" symbol="UG-2832HSWEG04" x="0" y="0"/>
-</gates>
-<devices>
-<device name="" package="UG-2832HSWEG04">
-<connects>
-<connect gate="G$1" pin="C1+" pad="3"/>
-<connect gate="G$1" pin="C1-" pad="4"/>
-<connect gate="G$1" pin="C2+" pad="1"/>
-<connect gate="G$1" pin="C2-" pad="2"/>
-<connect gate="G$1" pin="CS#" pad="8"/>
-<connect gate="G$1" pin="D/C#" pad="10"/>
-<connect gate="G$1" pin="IREF" pad="13"/>
-<connect gate="G$1" pin="RES#" pad="9"/>
-<connect gate="G$1" pin="SCLK" pad="11"/>
-<connect gate="G$1" pin="SDIN" pad="12"/>
-<connect gate="G$1" pin="VBAT" pad="5"/>
-<connect gate="G$1" pin="VCC" pad="15"/>
-<connect gate="G$1" pin="VCOMH" pad="14"/>
-<connect gate="G$1" pin="VDD" pad="7"/>
-<connect gate="G$1" pin="VSS" pad="6"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="WRAPAROUND" package="UG-2832HSWEG04_WRAPAROUND">
-<connects>
-<connect gate="G$1" pin="C1+" pad="3"/>
-<connect gate="G$1" pin="C1-" pad="4"/>
-<connect gate="G$1" pin="C2+" pad="1"/>
-<connect gate="G$1" pin="C2-" pad="2"/>
-<connect gate="G$1" pin="CS#" pad="8"/>
-<connect gate="G$1" pin="D/C#" pad="10"/>
-<connect gate="G$1" pin="IREF" pad="13"/>
-<connect gate="G$1" pin="RES#" pad="9"/>
-<connect gate="G$1" pin="SCLK" pad="11"/>
-<connect gate="G$1" pin="SDIN" pad="12"/>
-<connect gate="G$1" pin="VBAT" pad="5"/>
-<connect gate="G$1" pin="VCC" pad="15"/>
-<connect gate="G$1" pin="VCOMH" pad="14"/>
-<connect gate="G$1" pin="VDD" pad="7"/>
-<connect gate="G$1" pin="VSS" pad="6"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
 <deviceset name="MAX31856" uservalue="yes">
 <description>&lt;p&gt;&lt;b&gt;MAX31856&lt;/b&gt; - Thermocouple Sensor ADC&lt;/p&gt;</description>
 <gates>
@@ -2692,10 +2519,10 @@ 5V - VREG-00823</description>
 <text x="-1.5875" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
 </package>
 <package name="POGOPROG-CONN-4-ALLSMT">
-<smd name="3" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="2" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="4" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
-<smd name="1" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="3" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1" cream="no"/>
+<smd name="2" x="0" y="0" dx="0.889" dy="0.8128" layer="1" cream="no"/>
+<smd name="4" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1" cream="no"/>
+<smd name="1" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1" cream="no"/>
 <wire x1="-0.635" y1="1.905" x2="0.635" y2="1.905" width="0.127" layer="21"/>
 <wire x1="0.635" y1="1.905" x2="0.635" y2="-3.175" width="0.127" layer="21"/>
 <wire x1="0.635" y1="-3.175" x2="-0.635" y2="-3.175" width="0.127" layer="21"/>
@@ -2831,6 +2658,103 @@ 5V - VREG-00823</description>
 <vertex x="-1.75" y="-1.5"/>
 </polygon>
 </package>
+<package name="UG-2832HSWEG04_WRAPAROUND">
+<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.127" layer="51"/>
+<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.127" layer="51"/>
+<wire x1="-30" y1="5.575" x2="-30" y2="-5.575" width="0.127" layer="51"/>
+<wire x1="0" y1="5.575" x2="0" y2="-5.575" width="0.127" layer="51"/>
+<wire x1="-5.516" y1="3.475" x2="-27.9" y2="3.475" width="0.2032" layer="51" style="shortdash"/>
+<wire x1="-5.516" y1="-2.109" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
+<wire x1="-5.516" y1="3.475" x2="-5.516" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
+<wire x1="-27.9" y1="3.475" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
+<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="51"/>
+<wire x1="0" y1="5.575" x2="0" y2="-5.75" width="0.2032" layer="51"/>
+<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="51"/>
+<wire x1="-30" y1="5.575" x2="-30" y2="-5.75" width="0.2032" layer="51"/>
+<smd name="15" x="-7.7" y="4.55" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="14" x="-7.7" y="3.9" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="13" x="-7.7" y="3.25" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="12" x="-7.7" y="2.6" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="11" x="-7.7" y="1.95" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="10" x="-7.7" y="1.3" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="9" x="-7.7" y="0.65" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="8" x="-7.7" y="0" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="7" x="-7.7" y="-0.65" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="6" x="-7.7" y="-1.3" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="5" x="-7.7" y="-1.95" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<smd name="4" x="-7.7" y="-2.6" dx="2.6" dy="0.35" layer="16" rot="R180"/>
+<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>
+<package name="UG-2832HSWEG04">
+<description>128x32 OLED Display - 0.91" (30x11.5mm)</description>
+<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.127" layer="51"/>
+<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.127" layer="51"/>
+<wire x1="-30" y1="5.575" x2="-30" y2="-5.575" width="0.127" layer="51"/>
+<wire x1="0" y1="5.575" x2="0" y2="-5.575" width="0.127" layer="51"/>
+<wire x1="-5.516" y1="3.475" x2="-27.9" y2="3.475" width="0.2032" layer="51" style="shortdash"/>
+<wire x1="-5.516" y1="-2.109" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
+<wire x1="-5.516" y1="3.475" x2="-5.516" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
+<wire x1="-27.9" y1="3.475" x2="-27.9" y2="-2.109" width="0.2032" layer="51" style="shortdash"/>
+<wire x1="0" y1="5.575" x2="-30" y2="5.575" width="0.2032" layer="21"/>
+<wire x1="0" y1="5.575" x2="0" y2="-5.575" width="0.2032" layer="21"/>
+<wire x1="0" y1="-5.75" x2="-30" y2="-5.75" width="0.2032" layer="21"/>
+<wire x1="-30" y1="5.575" x2="-30" y2="-5.575" width="0.2032" layer="21"/>
+<smd name="15" x="15.8" y="4.55" dx="2.6" dy="0.35" layer="1"/>
+<smd name="14" x="15.8" y="3.9" dx="2.6" dy="0.35" layer="1"/>
+<smd name="13" x="15.8" y="3.25" dx="2.6" dy="0.35" layer="1"/>
+<smd name="12" x="15.8" y="2.6" dx="2.6" dy="0.35" layer="1"/>
+<smd name="11" x="15.8" y="1.95" dx="2.6" dy="0.35" layer="1"/>
+<smd name="10" x="15.8" y="1.3" dx="2.6" dy="0.35" layer="1"/>
+<smd name="9" x="15.8" y="0.65" dx="2.6" dy="0.35" layer="1"/>
+<smd name="8" x="15.8" y="0" dx="2.6" dy="0.35" layer="1"/>
+<smd name="7" x="15.8" y="-0.65" dx="2.6" dy="0.35" layer="1"/>
+<smd name="6" x="15.8" y="-1.3" dx="2.6" dy="0.35" layer="1"/>
+<smd name="5" x="15.8" y="-1.95" dx="2.6" dy="0.35" layer="1"/>
+<smd name="4" x="15.8" y="-2.6" dx="2.6" dy="0.35" layer="1"/>
+<smd name="3" x="15.8" y="-3.25" dx="2.6" dy="0.35" layer="1"/>
+<smd name="2" x="15.8" y="-3.9" dx="2.6" dy="0.35" layer="1"/>
+<smd name="1" x="15.8" y="-4.55" dx="2.6" dy="0.35" layer="1"/>
+<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="14.5" y1="-0.175" x2="16.3" y2="0.175" layer="51"/>
+<rectangle x1="14.5" y1="4.375" x2="16.3" y2="4.725" layer="51"/>
+<rectangle x1="14.5" y1="3.725" x2="16.3" y2="4.075" layer="51"/>
+<rectangle x1="14.5" y1="3.075" x2="16.3" y2="3.425" layer="51"/>
+<rectangle x1="14.5" y1="2.425" x2="16.3" y2="2.775" layer="51"/>
+<rectangle x1="14.5" y1="1.775" x2="16.3" y2="2.125" layer="51"/>
+<rectangle x1="14.5" y1="1.125" x2="16.3" y2="1.475" layer="51"/>
+<rectangle x1="14.5" y1="0.475" x2="16.3" y2="0.825" layer="51"/>
+<rectangle x1="14.5" y1="-0.825" x2="16.3" y2="-0.475" layer="51"/>
+<rectangle x1="14.5" y1="-1.475" x2="16.3" y2="-1.125" layer="51"/>
+<rectangle x1="14.5" y1="-2.125" x2="16.3" y2="-1.775" layer="51"/>
+<rectangle x1="14.5" y1="-2.775" x2="16.3" y2="-2.425" layer="51"/>
+<rectangle x1="14.5" y1="-3.425" x2="16.3" y2="-3.075" layer="51"/>
+<rectangle x1="14.5" y1="-4.075" x2="16.3" y2="-3.725" layer="51"/>
+<rectangle x1="14.5" y1="-4.725" x2="16.3" y2="-4.375" layer="51"/>
+</package>
 </packages>
 <symbols>
 <symbol name="C">
@@ -2895,6 +2819,30 @@ 5V - VREG-00823</description>
 <text x="-17.526" y="-32.766" size="1.27" layer="96">&gt;VALUE</text>
 <pin name="PAD" x="-22.86" y="-27.94" length="middle" direction="sup"/>
 </symbol>
+<symbol name="UG-2832HSWEG04">
+<wire x1="-7.62" y1="20.32" x2="-7.62" y2="-20.32" width="0.254" layer="94"/>
+<wire x1="-7.62" y1="-20.32" x2="7.62" y2="-20.32" width="0.254" layer="94"/>
+<wire x1="7.62" y1="-20.32" x2="7.62" y2="20.32" width="0.254" layer="94"/>
+<wire x1="7.62" y1="20.32" x2="-7.62" y2="20.32" width="0.254" layer="94"/>
+<text x="-7.62" y="22.86" size="1.27" layer="95">&gt;NAME</text>
+<text x="-7.62" y="-22.86" size="1.27" layer="96">&gt;VALUE</text>
+<text x="5.08" y="-10.16" size="1.27" layer="97" rot="R90">128x32 OLED Display</text>
+<pin name="C2+" x="-10.16" y="17.78" length="short"/>
+<pin name="C2-" x="-10.16" y="15.24" length="short"/>
+<pin name="C1+" x="-10.16" y="12.7" length="short"/>
+<pin name="C1-" x="-10.16" y="10.16" length="short"/>
+<pin name="VBAT" x="-10.16" y="7.62" length="short"/>
+<pin name="VSS" x="-10.16" y="5.08" length="short"/>
+<pin name="VDD" x="-10.16" y="2.54" length="short"/>
+<pin name="CS#" x="-10.16" y="0" length="short"/>
+<pin name="RES#" x="-10.16" y="-2.54" length="short"/>
+<pin name="D/C#" x="-10.16" y="-5.08" length="short"/>
+<pin name="SCLK" x="-10.16" y="-7.62" length="short"/>
+<pin name="SDIN" x="-10.16" y="-10.16" length="short"/>
+<pin name="IREF" x="-10.16" y="-12.7" length="short"/>
+<pin name="VCOMH" x="-10.16" y="-15.24" length="short"/>
+<pin name="VCC" x="-10.16" y="-17.78" length="short"/>
+</symbol>
 </symbols>
 <devicesets>
 <deviceset name="CAP-ARRAY" prefix="CA">
@@ -2987,6 +2935,58 @@ 5V - VREG-00823</description>
 </device>
 </devices>
 </deviceset>
+<deviceset name="DISP_OLED_UG-2832HSWEG04" prefix="LCD" uservalue="yes">
+<description>128x32 SPI 0.91" Monochrome OLED Display</description>
+<gates>
+<gate name="G$1" symbol="UG-2832HSWEG04" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="UG-2832HSWEG04">
+<connects>
+<connect gate="G$1" pin="C1+" pad="3"/>
+<connect gate="G$1" pin="C1-" pad="4"/>
+<connect gate="G$1" pin="C2+" pad="1"/>
+<connect gate="G$1" pin="C2-" pad="2"/>
+<connect gate="G$1" pin="CS#" pad="8"/>
+<connect gate="G$1" pin="D/C#" pad="10"/>
+<connect gate="G$1" pin="IREF" pad="13"/>
+<connect gate="G$1" pin="RES#" pad="9"/>
+<connect gate="G$1" pin="SCLK" pad="11"/>
+<connect gate="G$1" pin="SDIN" pad="12"/>
+<connect gate="G$1" pin="VBAT" pad="5"/>
+<connect gate="G$1" pin="VCC" pad="15"/>
+<connect gate="G$1" pin="VCOMH" pad="14"/>
+<connect gate="G$1" pin="VDD" pad="7"/>
+<connect gate="G$1" pin="VSS" pad="6"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+<device name="WRAPAROUND" package="UG-2832HSWEG04_WRAPAROUND">
+<connects>
+<connect gate="G$1" pin="C1+" pad="3"/>
+<connect gate="G$1" pin="C1-" pad="4"/>
+<connect gate="G$1" pin="C2+" pad="1"/>
+<connect gate="G$1" pin="C2-" pad="2"/>
+<connect gate="G$1" pin="CS#" pad="8"/>
+<connect gate="G$1" pin="D/C#" pad="10"/>
+<connect gate="G$1" pin="IREF" pad="13"/>
+<connect gate="G$1" pin="RES#" pad="9"/>
+<connect gate="G$1" pin="SCLK" pad="11"/>
+<connect gate="G$1" pin="SDIN" pad="12"/>
+<connect gate="G$1" pin="VBAT" pad="5"/>
+<connect gate="G$1" pin="VCC" pad="15"/>
+<connect gate="G$1" pin="VCOMH" pad="14"/>
+<connect gate="G$1" pin="VDD" pad="7"/>
+<connect gate="G$1" pin="VSS" pad="6"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
 </devicesets>
 </library>
 <library name="SparkFun-Aesthetics">
@@ -4069,7 +4069,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="GND2" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="GND4" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="FRAME1" library="SparkFun-Aesthetics" deviceset="FRAME-A4L" device=""/>
-<part name="LCD1" library="microbuilder" deviceset="DISP_OLED_UG-2832HSWEG04" device="WRAPAROUND" value="SSD1306-SPI"/>
+<part name="LCD1" library="Protofusion" deviceset="DISP_OLED_UG-2832HSWEG04" device="WRAPAROUND" value="SSD1306-SPI"/>
 <part name="CA1" library="Protofusion" deviceset="CAP-ARRAY" device="" value="1uF"/>
 <part name="C4" library="Protofusion-passives" deviceset="CAPACITOR" device="0402" value="2.2uF"/>
 <part name="R2" library="Protofusion-passives" deviceset="RESISTOR" device="0402" value="390k"/>
@@ -4219,7 +4219,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <attribute name="VALUE" x="180.34" y="127.508" size="1.27" layer="96"/>
 </instance>
 <instance part="U$2" gate="G$1" x="147.32" y="160.02"/>
-<instance part="U$1" gate="G$1" x="152.4" y="119.38"/>
+<instance part="U$1" gate="G$1" x="154.94" y="119.38"/>
 <instance part="U$4" gate="G$1" x="165.1" y="139.7"/>
 <instance part="U$5" gate="G$1" x="165.1" y="119.38"/>
 <instance part="U$7" gate="G$1" x="220.98" y="121.92"/>
@@ -4251,13 +4251,13 @@ Standard 0603 ceramic capacitor, and 0.1
 <attribute name="NAME" x="153.416" y="147.701" size="1.778" layer="95"/>
 <attribute name="VALUE" x="153.416" y="142.621" size="1.778" layer="96"/>
 </instance>
-<instance part="C17" gate="G$1" x="152.4" y="160.02" smashed="yes" rot="R180">
-<attribute name="NAME" x="153.416" y="160.655" size="1.778" layer="95"/>
-<attribute name="VALUE" x="153.162" y="155.321" size="1.778" layer="96"/>
+<instance part="C17" gate="G$1" x="154.94" y="160.02" smashed="yes" rot="R180">
+<attribute name="NAME" x="155.956" y="160.655" size="1.778" layer="95"/>
+<attribute name="VALUE" x="155.702" y="155.321" size="1.778" layer="96"/>
 </instance>
-<instance part="C18" gate="G$1" x="152.4" y="129.54" smashed="yes" rot="R180">
-<attribute name="NAME" x="151.638" y="131.699" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="151.384" y="126.619" size="1.778" layer="96" rot="R180"/>
+<instance part="C18" gate="G$1" x="154.94" y="129.54" smashed="yes" rot="R180">
+<attribute name="NAME" x="154.178" y="131.699" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="153.924" y="126.619" size="1.778" layer="96" rot="R180"/>
 </instance>
 <instance part="C19" gate="G$1" x="165.1" y="129.54" smashed="yes" rot="R180">
 <attribute name="NAME" x="164.084" y="131.699" size="1.778" layer="95" rot="R180"/>
@@ -4392,13 +4392,13 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="U$2" gate="G$1" pin="GND"/>
 <wire x1="147.32" y1="162.56" x2="147.32" y2="165.1" width="0.1524" layer="91"/>
-<wire x1="147.32" y1="165.1" x2="152.4" y2="165.1" width="0.1524" layer="91"/>
-<wire x1="152.4" y1="165.1" x2="152.4" y2="162.56" width="0.1524" layer="91"/>
+<wire x1="147.32" y1="165.1" x2="154.94" y2="165.1" width="0.1524" layer="91"/>
+<wire x1="154.94" y1="165.1" x2="154.94" y2="162.56" width="0.1524" layer="91"/>
 <pinref part="C17" gate="G$1" pin="2"/>
 </segment>
 <segment>
 <pinref part="U$1" gate="G$1" pin="GND"/>
-<wire x1="152.4" y1="124.46" x2="152.4" y2="121.92" width="0.1524" layer="91"/>
+<wire x1="154.94" y1="124.46" x2="154.94" y2="121.92" width="0.1524" layer="91"/>
 <pinref part="C18" gate="G$1" pin="1"/>
 </segment>
 <segment>
@@ -4952,29 +4952,33 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="U3" gate="G$1" pin="T-"/>
 <wire x1="177.8" y1="147.32" x2="162.56" y2="147.32" width="0.1524" layer="91"/>
 <wire x1="162.56" y1="147.32" x2="162.56" y2="152.4" width="0.1524" layer="91"/>
-<wire x1="162.56" y1="152.4" x2="152.4" y2="152.4" width="0.1524" layer="91"/>
+<wire x1="162.56" y1="152.4" x2="154.94" y2="152.4" width="0.1524" layer="91"/>
 <junction x="152.4" y="152.4"/>
-<wire x1="152.4" y1="152.4" x2="152.4" y2="154.94" width="0.1524" layer="91"/>
+<wire x1="154.94" y1="152.4" x2="152.4" y2="152.4" width="0.1524" layer="91"/>
 <label x="165.1" y="147.32" size="1.778" layer="95"/>
 <pinref part="R6" gate="G$1" pin="1"/>
 <pinref part="C17" gate="G$1" pin="1"/>
 <pinref part="C6" gate="G$1" pin="2"/>
+<wire x1="154.94" y1="154.94" x2="154.94" y2="152.4" width="0.1524" layer="91"/>
+<junction x="154.94" y="152.4"/>
 </segment>
 </net>
 <net name="T+_FILT" class="0">
 <segment>
 <wire x1="149.86" y1="139.7" x2="152.4" y2="139.7" width="0.1524" layer="91"/>
 <wire x1="152.4" y1="139.7" x2="152.4" y2="142.24" width="0.1524" layer="91"/>
-<wire x1="152.4" y1="139.7" x2="162.56" y2="139.7" width="0.1524" layer="91"/>
+<wire x1="152.4" y1="139.7" x2="154.94" y2="139.7" width="0.1524" layer="91"/>
+<wire x1="154.94" y1="139.7" x2="162.56" y2="139.7" width="0.1524" layer="91"/>
 <wire x1="162.56" y1="139.7" x2="162.56" y2="144.78" width="0.1524" layer="91"/>
 <junction x="152.4" y="139.7"/>
 <pinref part="U3" gate="G$1" pin="T+"/>
 <wire x1="162.56" y1="144.78" x2="177.8" y2="144.78" width="0.1524" layer="91"/>
-<wire x1="152.4" y1="139.7" x2="152.4" y2="132.08" width="0.1524" layer="91"/>
 <label x="165.1" y="144.78" size="1.778" layer="95"/>
 <pinref part="R7" gate="G$1" pin="1"/>
 <pinref part="C6" gate="G$1" pin="1"/>
 <pinref part="C18" gate="G$1" pin="2"/>
+<wire x1="154.94" y1="132.08" x2="154.94" y2="139.7" width="0.1524" layer="91"/>
+<junction x="154.94" y="139.7"/>
 </segment>
 </net>
 </nets>