diff --git a/archive/eagle.epf b/archive/eagle.epf
--- a/archive/eagle.epf
+++ b/archive/eagle.epf
@@ -439,10 +439,10 @@ Device="POGOPIN-CONN"
 [Win_2]
 Type="Schematic Editor"
 Loc="640 0 1265 724"
-State=0
+State=1
 Number=3
 File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.sch"
-View="137.963 -36.0327 379.921 49.9197"
+View="-4.83332 -2.7758 296.939 192.006"
 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"
@@ -481,7 +481,7 @@ ArcDirection=0
 AddLevel=2
 PadsSameType=0
 Layer=91
-Views=" 1: 137.963 -36.0327 379.921 49.9197"
+Views=" 1: -4.83332 -2.7758 296.939 192.006"
 Sheet=1
 
 [Win_3]
@@ -490,14 +490,14 @@ Loc="0 0 625 724"
 State=1
 Number=2
 File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
-View="6.11985 -5.04798 51.6105 17.0676"
+View="-12.2014 -10.2683 48.6686 22.6612"
 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.2032"
 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.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 0.3048"
 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.3048"
 HoleDrills=" 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.3048"
-TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.27 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778 1.016"
+TextSizes=" 0.254 0.3048 0.4064 0.6096 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778 1.016 0.8128 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"
@@ -516,8 +516,8 @@ PolygonPour=0
 PolygonRank=1
 PolygonThermals=1
 PolygonOrphans=0
-TextRatio=16
-DimensionUnit=1
+TextRatio=8
+DimensionUnit=3
 DimensionPrecision=2
 DimensionShowUnit=0
 PinDirection=3
@@ -528,7 +528,7 @@ SwapLevel=0
 ArcDirection=0
 AddLevel=2
 PadsSameType=0
-Layer=1
+Layer=209
 
 [Win_4]
 Type="Control Panel"
diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -28,38 +28,38 @@
 <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="21" name="tPlace" color="7" fill="1" visible="no" 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="no" 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"/>
-<layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
-<layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
-<layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
-<layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
-<layer number="32" name="bCream" color="7" fill="5" visible="no" active="yes"/>
-<layer number="33" name="tFinish" color="6" fill="3" visible="no" active="yes"/>
-<layer number="34" name="bFinish" color="6" fill="6" visible="no" active="yes"/>
-<layer number="35" name="tGlue" color="7" fill="4" visible="no" active="yes"/>
-<layer number="36" name="bGlue" color="7" fill="5" visible="no" active="yes"/>
-<layer number="37" name="tTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="38" name="bTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="yes"/>
-<layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="yes"/>
-<layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="yes"/>
-<layer number="42" name="bRestrict" color="1" fill="10" visible="no" active="yes"/>
-<layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
-<layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
-<layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
-<layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
-<layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
-<layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="yes" 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="yes" active="yes"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="27" name="tValues" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="29" name="tStop" color="7" fill="3" visible="yes" active="yes"/>
+<layer number="30" name="bStop" color="7" fill="6" visible="yes" active="yes"/>
+<layer number="31" name="tCream" color="7" fill="4" visible="yes" active="yes"/>
+<layer number="32" name="bCream" color="7" fill="5" visible="yes" active="yes"/>
+<layer number="33" name="tFinish" color="6" fill="3" visible="yes" active="yes"/>
+<layer number="34" name="bFinish" color="6" fill="6" visible="yes" active="yes"/>
+<layer number="35" name="tGlue" color="7" fill="4" visible="yes" active="yes"/>
+<layer number="36" name="bGlue" color="7" fill="5" visible="yes" active="yes"/>
+<layer number="37" name="tTest" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="38" name="bTest" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="39" name="tKeepout" color="4" fill="11" visible="yes" active="yes"/>
+<layer number="40" name="bKeepout" color="1" fill="11" visible="yes" active="yes"/>
+<layer number="41" name="tRestrict" color="4" fill="10" visible="yes" active="yes"/>
+<layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
+<layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
+<layer number="44" name="Drills" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="46" name="Milling" color="3" fill="1" visible="yes" active="yes"/>
+<layer number="47" name="Measures" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="49" name="Reference" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
@@ -74,83 +74,83 @@
 <layer number="98" name="Guide" color="6" fill="1" visible="no" active="no"/>
 <layer number="99" name="SpiceOrder" color="7" fill="1" visible="no" active="no"/>
 <layer number="100" name="Muster" color="7" fill="1" visible="no" active="no"/>
-<layer number="101" name="Patch_Top" color="12" fill="4" visible="no" active="yes"/>
-<layer number="102" name="Vscore" color="7" fill="1" visible="no" active="yes"/>
-<layer number="103" name="tMap" color="7" fill="1" visible="no" active="yes"/>
-<layer number="104" name="Name" color="16" fill="1" visible="no" active="yes"/>
-<layer number="105" name="tPlate" color="7" fill="1" visible="no" active="yes"/>
-<layer number="106" name="bPlate" color="7" fill="1" visible="no" active="yes"/>
-<layer number="107" name="Crop" color="7" fill="1" visible="no" active="yes"/>
-<layer number="108" name="centerline" color="7" fill="1" visible="no" active="yes"/>
-<layer number="109" name="ref-old" color="11" fill="1" visible="no" active="yes"/>
-<layer number="110" name="fp0" color="7" fill="1" visible="no" active="yes"/>
-<layer number="111" name="tGTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="112" name="bGTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="113" name="IDFDebug" color="4" fill="1" visible="no" active="yes"/>
-<layer number="116" name="Patch_BOT" color="9" fill="4" visible="no" active="yes"/>
-<layer number="117" name="mPads" color="7" fill="1" visible="no" active="yes"/>
-<layer number="118" name="mVias" color="7" fill="1" visible="no" active="yes"/>
-<layer number="119" name="mUnrouted" color="7" fill="1" visible="no" active="yes"/>
-<layer number="120" name="mDimension" color="7" fill="1" visible="no" active="yes"/>
-<layer number="121" name="_tsilk" color="7" fill="1" visible="no" active="yes"/>
-<layer number="122" name="_bsilk" color="7" fill="1" visible="no" active="yes"/>
-<layer number="123" name="mtOrigins" color="7" fill="1" visible="no" active="yes"/>
-<layer number="124" name="mbOrigins" color="7" fill="1" visible="no" active="yes"/>
-<layer number="125" name="_tNames" color="7" fill="1" visible="no" active="yes"/>
-<layer number="126" name="_bNames" color="7" fill="1" visible="no" active="yes"/>
-<layer number="127" name="mtValues" color="7" fill="1" visible="no" active="yes"/>
-<layer number="128" name="mbValues" color="7" fill="1" visible="no" active="yes"/>
-<layer number="129" name="mtStop" color="7" fill="1" visible="no" active="yes"/>
-<layer number="130" name="mbStop" color="7" fill="1" visible="no" active="yes"/>
-<layer number="131" name="prix" color="7" fill="1" visible="no" active="yes"/>
-<layer number="132" name="test" color="7" fill="1" visible="no" active="yes"/>
-<layer number="133" name="mtFinish" color="7" fill="1" visible="no" active="yes"/>
-<layer number="134" name="mbFinish" color="7" fill="1" visible="no" active="yes"/>
-<layer number="135" name="mtGlue" color="7" fill="1" visible="no" active="yes"/>
-<layer number="136" name="mbGlue" color="7" fill="1" visible="no" active="yes"/>
-<layer number="137" name="mtTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="138" name="mbTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="139" name="mtKeepout" color="7" fill="1" visible="no" active="yes"/>
-<layer number="140" name="mbKeepout" color="7" fill="1" visible="no" active="yes"/>
-<layer number="141" name="mtRestrict" color="7" fill="1" visible="no" active="yes"/>
-<layer number="142" name="mbRestrict" color="7" fill="1" visible="no" active="yes"/>
-<layer number="143" name="mvRestrict" color="7" fill="1" visible="no" active="yes"/>
-<layer number="144" name="Drill_legend" color="7" fill="1" visible="no" active="yes"/>
-<layer number="145" name="mHoles" color="7" fill="1" visible="no" active="yes"/>
-<layer number="146" name="mMilling" color="7" fill="1" visible="no" active="yes"/>
-<layer number="147" name="mMeasures" color="7" fill="1" visible="no" active="yes"/>
-<layer number="148" name="mDocument" color="7" fill="1" visible="no" active="yes"/>
-<layer number="149" name="mReference" color="7" fill="1" visible="no" active="yes"/>
-<layer number="150" name="Notes" color="7" fill="1" visible="no" active="yes"/>
-<layer number="151" name="HeatSink" color="7" fill="1" visible="no" active="yes"/>
-<layer number="152" name="mbDocu" color="7" fill="1" visible="no" active="yes"/>
-<layer number="153" name="FabDoc1" color="7" fill="1" visible="no" active="yes"/>
-<layer number="154" name="FabDoc2" color="7" fill="1" visible="no" active="yes"/>
-<layer number="155" name="FabDoc3" color="7" fill="1" visible="no" active="yes"/>
-<layer number="191" name="mNets" color="7" fill="1" visible="no" active="yes"/>
-<layer number="192" name="mBusses" color="7" fill="1" visible="no" active="yes"/>
-<layer number="193" name="mPins" color="7" fill="1" visible="no" active="yes"/>
-<layer number="194" name="mSymbols" color="7" fill="1" visible="no" active="yes"/>
-<layer number="195" name="mNames" color="7" fill="1" visible="no" active="yes"/>
-<layer number="196" name="mValues" color="7" fill="1" visible="no" active="yes"/>
-<layer number="199" name="Contour" color="7" fill="1" visible="no" active="yes"/>
-<layer number="200" name="200bmp" color="1" fill="10" visible="no" active="yes"/>
-<layer number="201" name="201bmp" color="2" fill="10" visible="no" active="yes"/>
-<layer number="202" name="202bmp" color="3" fill="10" visible="no" active="yes"/>
-<layer number="203" name="203bmp" color="4" fill="10" visible="no" active="yes"/>
-<layer number="204" name="204bmp" color="5" fill="10" visible="no" active="yes"/>
-<layer number="205" name="205bmp" color="6" fill="10" visible="no" active="yes"/>
-<layer number="206" name="206bmp" color="7" fill="10" visible="no" active="yes"/>
-<layer number="207" name="207bmp" color="8" fill="10" visible="no" active="yes"/>
-<layer number="208" name="208bmp" color="9" fill="10" visible="no" active="yes"/>
-<layer number="209" name="209bmp" color="14" fill="1" visible="no" active="yes"/>
-<layer number="210" name="210bmp" color="7" fill="1" visible="no" active="yes"/>
-<layer number="211" name="211bmp" color="7" fill="1" visible="no" active="yes"/>
-<layer number="212" name="212bmp" color="7" fill="1" visible="no" active="yes"/>
-<layer number="213" name="213bmp" color="1" fill="10" visible="no" active="yes"/>
-<layer number="214" name="214bmp" color="7" fill="1" visible="no" active="yes"/>
-<layer number="215" name="215bmp" color="7" fill="1" visible="no" active="yes"/>
-<layer number="216" name="216bmp" color="7" fill="1" visible="no" active="yes"/>
+<layer number="101" name="Patch_Top" color="12" fill="4" visible="yes" active="yes"/>
+<layer number="102" name="Vscore" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="103" name="tMap" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="104" name="Name" color="16" fill="1" visible="yes" active="yes"/>
+<layer number="105" name="tPlate" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="106" name="bPlate" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="107" name="Crop" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="108" name="centerline" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="109" name="ref-old" color="11" fill="1" visible="yes" active="yes"/>
+<layer number="110" name="fp0" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="111" name="tGTest" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="112" name="bGTest" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="113" name="IDFDebug" color="4" fill="1" visible="yes" active="yes"/>
+<layer number="116" name="Patch_BOT" color="9" fill="4" visible="yes" active="yes"/>
+<layer number="117" name="mPads" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="118" name="mVias" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="119" name="mUnrouted" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="120" name="mDimension" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="121" name="_tsilk" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="122" name="_bsilk" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="123" name="mtOrigins" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="124" name="mbOrigins" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="125" name="_tNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="126" name="_bNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="127" name="mtValues" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="128" name="mbValues" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="129" name="mtStop" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="130" name="mbStop" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="131" name="prix" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="132" name="test" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="133" name="mtFinish" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="134" name="mbFinish" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="135" name="mtGlue" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="136" name="mbGlue" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="137" name="mtTest" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="138" name="mbTest" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="139" name="mtKeepout" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="140" name="mbKeepout" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="141" name="mtRestrict" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="142" name="mbRestrict" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="143" name="mvRestrict" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="144" name="Drill_legend" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="145" name="mHoles" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="146" name="mMilling" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="147" name="mMeasures" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="148" name="mDocument" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="149" name="mReference" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="150" name="Notes" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="151" name="HeatSink" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="152" name="mbDocu" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="153" name="FabDoc1" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="154" name="FabDoc2" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="155" name="FabDoc3" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="191" name="mNets" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="192" name="mBusses" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="193" name="mPins" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="194" name="mSymbols" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="195" name="mNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="196" name="mValues" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="199" name="Contour" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="200" name="200bmp" color="1" fill="10" visible="yes" active="yes"/>
+<layer number="201" name="201bmp" color="2" fill="10" visible="yes" active="yes"/>
+<layer number="202" name="202bmp" color="3" fill="10" visible="yes" active="yes"/>
+<layer number="203" name="203bmp" color="4" fill="10" visible="yes" active="yes"/>
+<layer number="204" name="204bmp" color="5" fill="10" visible="yes" active="yes"/>
+<layer number="205" name="205bmp" color="6" fill="10" visible="yes" active="yes"/>
+<layer number="206" name="206bmp" color="7" fill="10" visible="yes" active="yes"/>
+<layer number="207" name="207bmp" color="8" fill="10" visible="yes" active="yes"/>
+<layer number="208" name="208bmp" color="9" fill="10" visible="yes" active="yes"/>
+<layer number="209" name="209bmp" color="14" fill="1" visible="yes" active="yes"/>
+<layer number="210" name="210bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="211" name="211bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="212" name="212bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="213" name="213bmp" color="1" fill="10" visible="yes" active="yes"/>
+<layer number="214" name="214bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="215" name="215bmp" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="216" name="216bmp" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="217" name="217bmp" color="18" fill="1" visible="no" active="no"/>
 <layer number="218" name="218bmp" color="19" fill="1" visible="no" active="no"/>
 <layer number="219" name="219bmp" color="20" fill="1" visible="no" active="no"/>
@@ -159,19 +159,17 @@
 <layer number="222" name="222bmp" color="23" fill="1" visible="no" active="no"/>
 <layer number="223" name="223bmp" color="24" fill="1" visible="no" active="no"/>
 <layer number="224" name="224bmp" color="25" fill="1" visible="no" active="no"/>
-<layer number="248" name="Housing" color="7" fill="1" visible="no" active="yes"/>
-<layer number="249" name="Edge" color="7" fill="1" visible="no" active="yes"/>
+<layer number="248" name="Housing" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="249" name="Edge" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="250" name="Descript" color="3" fill="1" visible="no" active="no"/>
 <layer number="251" name="SMDround" color="12" fill="11" visible="no" active="no"/>
-<layer number="254" name="cooling" color="7" fill="1" visible="no" active="yes"/>
-<layer number="255" name="PART_" color="7" fill="1" visible="no" active="yes"/>
+<layer number="254" name="cooling" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="255" name="PART_" color="7" fill="1" visible="yes" active="yes"/>
 </layers>
 <board>
 <plain>
 <wire x1="45.085" y1="-1.27" x2="45.085" y2="15.24" width="0" layer="20"/>
 <wire x1="0" y1="15.24" x2="0" y2="-1.27" width="0" layer="20"/>
-<dimension x1="0" y1="0" x2="45.4025" y2="-0.9525" x3="22.70125" y3="19.05" textsize="1.778" layer="209" dtype="horizontal" unit="inch" precision="6" visible="yes"/>
-<dimension x1="46.6598" y1="0" x2="45.3898" y2="12.6746" x3="-8.255" y3="6.3373" textsize="1.778" layer="209" dtype="vertical" unit="inch" precision="6" visible="yes"/>
 <text x="44.60875" y="1.905" size="0.8128" layer="22" ratio="16" rot="SMR0">protofusion.org/therm</text>
 <text x="22.06625" y="12.3825" size="0.8128" layer="21" ratio="16" rot="R270">pwr</text>
 <text x="17.4625" y="10.31875" size="0.8128" layer="21" ratio="16" rot="R90">ssr</text>
@@ -186,7 +184,7 @@
 <text x="29.606875" y="7.77875" size="0.8128" layer="22" ratio="16" rot="SMR180">-</text>
 <text x="26.51125" y="7.77875" size="0.8128" layer="22" ratio="16" rot="SMR180">+</text>
 <text x="43.576875" y="11.509375" size="0.8128" layer="22" ratio="16" rot="SMR0">Ethan Zonca 2014</text>
-<text x="4.445" y="19.685" size="0.8128" layer="21" ratio="16">LED placement?
+<text x="5.08" y="13.97" size="0.8128" layer="21" ratio="16">LED placement?
 uUSB FP?</text>
 <wire x1="0" y1="15.24" x2="1.27" y2="16.51" width="0" layer="20" curve="-90"/>
 <wire x1="1.27" y1="16.51" x2="2.54" y2="16.51" width="0" layer="20"/>
@@ -234,6 +232,9 @@ uUSB FP?</text>
 <hole x="42.8625" y="1.27" drill="0.3048"/>
 <hole x="42.2275" y="1.27" drill="0.3048"/>
 <hole x="41.513125" y="1.27" drill="0.3048"/>
+<dimension x1="1.27" y1="-2.54" x2="45.72" y2="16.51" x3="-8.89" y3="6.985" textsize="1.27" layer="209" dtype="vertical" unit="inch"/>
+<dimension x1="45.72" y1="1.27" x2="45.72" y2="12.7" x3="-5.715" y3="6.985" textsize="1.27" layer="209" dtype="vertical" unit="inch"/>
+<dimension x1="0" y1="17.145" x2="45.085" y2="17.145" x3="22.5425" y3="-7.62" textsize="1.27" layer="209" dtype="horizontal" unit="inch"/>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -2559,9 +2560,9 @@ design rules under a new name.</descript
 <attribute name="NAME" x="37.766625" y="12.446" size="0.8128" layer="25" ratio="16"/>
 <attribute name="VALUE" x="38.0365" y="10.668" size="0.4064" layer="27"/>
 </element>
-<element name="JP2" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="23.8125" y="11.43" rot="MR0"/>
-<element name="JP3" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="18.415" y="11.43" rot="MR0"/>
-<element name="JP4" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="29.21" y="11.43" rot="MR0"/>
+<element name="JP2" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="23.8125" y="11.43" rot="MR0"/>
+<element name="JP3" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="18.415" y="11.43" rot="MR0"/>
+<element name="JP4" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="29.21" y="11.43" rot="MR0"/>
 <element name="D1" library="SparkFun-DiscreteSemi" package="SOD523" value="" x="33.02" y="12.065" smashed="yes">
 <attribute name="NAME" x="35.537775" y="11.750675" size="0.8128" layer="25" ratio="16"/>
 <attribute name="VALUE" x="32.3342" y="11.0744" size="0.4064" layer="27"/>
@@ -2583,8 +2584,7 @@ design rules under a new name.</descript
 <attribute name="VALUE" x="28.702" y="10.287" size="0.4064" layer="27" rot="R270"/>
 </element>
 <element name="U$1" library="Protofusion" package="THERM_LOGO_SMALL_0.1" value="" x="37.62375" y="1.5875" smashed="yes"/>
-<element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="" x="0.635" y="6.82625" smashed="yes" rot="R180">
-<attribute name="NAME" x="9.68" y="42.23625" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="SSD1306-SPI" x="0.635" y="6.82625" smashed="yes" rot="R180">
 <attribute name="VALUE" x="30.635" y="14.32625" size="0.4064" layer="27" ratio="10" rot="R180"/>
 </element>
 <element name="U$3" library="Protofusion" package="THERM_LOGO_0.2" value="" x="44.529375" y="3.175" rot="MR0"/>
@@ -2605,7 +2605,7 @@ design rules under a new name.</descript
 <attribute name="NAME" x="3.571875" y="8.09625" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="-0.9525" y="8.5725" size="1.27" layer="27" rot="R270"/>
 </element>
-<element name="JP1" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="13.97" y="2.38125" rot="MR0"/>
+<element name="JP1" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="13.97" y="2.38125" rot="MR0"/>
 <element name="J1" library="Protofusion" package="POGOPROG-CONN-ALLSMT" value="POGOPIN-CONNALLSMT" x="20.240625" y="2.143125" rot="MR90"/>
 </elements>
 <signals>
diff --git a/zoncoffee.sch b/zoncoffee.sch
--- a/zoncoffee.sch
+++ b/zoncoffee.sch
@@ -167,6 +167,7 @@
 <layer number="255" name="PART_" color="7" fill="1" visible="yes" active="yes"/>
 </layers>
 <schematic xreflabel="%F%N/%S.%C%R" xrefpart="/%S.%C%R">
+<description>Therm</description>
 <libraries>
 <library name="microbuilder">
 <packages>
@@ -4667,6 +4668,9 @@ Standard 0603 ceramic capacitor, and 0.1
 </library>
 </libraries>
 <attributes>
+<attribute name="CNAME" value="Therm Micro PID Controller"/>
+<attribute name="CREVISION" value="0.2"/>
+<attribute name="DESIGNER" value="Ethan Zonca"/>
 </attributes>
 <variantdefs>
 </variantdefs>
@@ -4685,9 +4689,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="U3" library="dp_devices" deviceset="IC_MAX31855" device="-SO-8"/>
 <part name="U2" library="SparkFun-PowerIC" deviceset="MIC5205" device="3.3V" value="AP2202K-3.3TRG1"/>
 <part name="LED1" library="SparkFun-LED" deviceset="LED" device="0603"/>
-<part name="JP2" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM"/>
-<part name="JP3" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM"/>
-<part name="JP4" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM"/>
+<part name="JP2" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
+<part name="JP3" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
+<part name="JP4" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
 <part name="SUPPLY1" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
 <part name="GND1" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="SUPPLY3" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
@@ -4708,7 +4712,7 @@ 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="FRAME1" library="SparkFun-Aesthetics" deviceset="FRAME-A4L" device=""/>
-<part name="LCD1" library="microbuilder" deviceset="DISP_OLED_UG-2832HSWEG04" device="WRAPAROUND"/>
+<part name="LCD1" library="microbuilder" deviceset="DISP_OLED_UG-2832HSWEG04" device="WRAPAROUND" value="SSD1306-SPI"/>
 <part name="U1" library="Protofusion" deviceset="STM32F042K" device=""/>
 <part name="C2" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
 <part name="C1" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
@@ -4721,129 +4725,130 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="SUPPLY12" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <part name="SUPPLY13" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <part name="RA1" library="Protofusion" deviceset="CAP-ARRAY" device="" value="1uF"/>
-<part name="JP1" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM"/>
+<part name="JP1" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM" value="1546215-2"/>
 <part name="J1" library="Protofusion" deviceset="POGOPIN-CONN" device="ALLSMT"/>
 <part name="U$7" library="microbuilder" deviceset="GND" device=""/>
 </parts>
 <sheets>
 <sheet>
 <plain>
-<text x="170.18" y="5.08" size="1.778" layer="91">Replace with ceramicone</text>
-<text x="266.7" y="81.28" size="2.54" layer="113">Connectors</text>
-<text x="187.96" y="15.24" size="2.54" layer="113">Power Supply</text>
-<text x="109.22" y="12.7" size="2.54" layer="113">OLED Display</text>
-<text x="66.04" y="12.7" size="2.54" layer="113">Indication</text>
-<text x="200.66" y="-25.4" size="2.54" layer="113">Buttons</text>
-<text x="266.7" y="111.76" size="2.54" layer="113">TC Amp</text>
+<text x="127" y="81.28" size="1.778" layer="91">Replace with ceramicone/REVV</text>
+<text x="233.68" y="142.24" size="2.54" layer="113">Connectors</text>
+<text x="127" y="83.82" size="2.54" layer="113">Power Supply</text>
+<text x="58.42" y="83.82" size="2.54" layer="113">OLED Display</text>
+<text x="15.24" y="83.82" size="2.54" layer="113">Indication</text>
+<text x="139.7" y="43.18" size="2.54" layer="113">Buttons</text>
+<text x="228.6" y="175.26" size="2.54" layer="113">TC Amp</text>
+<text x="101.6" y="172.72" size="2.54" layer="113">Micro</text>
 </plain>
 <instances>
-<instance part="C4" gate="G$1" x="121.92" y="0" rot="R90"/>
-<instance part="C3" gate="G$1" x="114.3" y="-5.08" rot="R90"/>
-<instance part="U$2" gate="G$1" x="99.06" y="-40.64"/>
-<instance part="R2" gate="G$1" x="106.68" y="-30.48"/>
-<instance part="U$17" gate="G$1" x="149.86" y="-5.08"/>
-<instance part="SW1" gate="SW" x="208.28" y="-38.1"/>
-<instance part="J2" gate="G$1" x="299.72" y="-25.4"/>
-<instance part="U3" gate="G$1" x="269.24" y="96.52" rot="R180"/>
-<instance part="U2" gate="G$1" x="210.82" y="-2.54"/>
-<instance part="LED1" gate="G$1" x="78.74" y="-22.86"/>
-<instance part="JP2" gate="G$1" x="314.96" y="66.04" rot="R180"/>
-<instance part="JP3" gate="G$1" x="314.96" y="50.8" rot="R180"/>
-<instance part="JP4" gate="G$1" x="314.96" y="35.56" rot="R180"/>
-<instance part="SUPPLY1" gate="G$1" x="281.94" y="68.58"/>
-<instance part="GND1" gate="1" x="281.94" y="58.42"/>
-<instance part="SUPPLY3" gate="G$1" x="195.58" y="5.08"/>
-<instance part="GND2" gate="1" x="195.58" y="-12.7"/>
-<instance part="SUPPLY4" gate="G$1" x="238.76" y="5.08"/>
-<instance part="U$4" gate="G$1" x="231.14" y="-43.18"/>
-<instance part="U$5" gate="G$1" x="294.64" y="-27.94"/>
-<instance part="D1" gate="G$1" x="274.32" y="-22.86" rot="R180"/>
-<instance part="SUPPLY5" gate="G$1" x="261.62" y="-20.32"/>
-<instance part="C5" gate="G$1" x="182.88" y="0" rot="R180"/>
-<instance part="C7" gate="G$1" x="243.84" y="-5.08"/>
-<instance part="R1" gate="G$1" x="78.74" y="-12.7" rot="R270"/>
-<instance part="GND3" gate="1" x="281.94" y="43.18"/>
-<instance part="GND4" gate="1" x="78.74" y="-33.02"/>
-<instance part="U$10" gate="G$1" x="302.26" y="86.36"/>
-<instance part="SUPPLY9" gate="G$1" x="302.26" y="106.68"/>
-<instance part="C8" gate="G$1" x="302.26" y="99.06" rot="R180"/>
-<instance part="GND7" gate="1" x="182.88" y="-10.16"/>
-<instance part="GND8" gate="1" x="243.84" y="-12.7"/>
-<instance part="FRAME1" gate="G$1" x="58.42" y="-58.42"/>
-<instance part="LCD1" gate="G$1" x="137.16" y="-17.78"/>
-<instance part="U1" gate="G$1" x="160.02" y="63.5"/>
-<instance part="C2" gate="G$1" x="86.36" y="83.82"/>
-<instance part="C1" gate="G$1" x="73.66" y="91.44"/>
-<instance part="C6" gate="G$1" x="213.36" y="55.88"/>
-<instance part="U$14" gate="G$1" x="73.66" y="76.2"/>
-<instance part="U$15" gate="G$1" x="86.36" y="76.2"/>
-<instance part="U$16" gate="G$1" x="213.36" y="48.26"/>
-<instance part="U$18" gate="G$1" x="160.02" y="48.26"/>
-<instance part="SUPPLY11" gate="G$1" x="73.66" y="104.14"/>
-<instance part="SUPPLY12" gate="G$1" x="86.36" y="93.98"/>
-<instance part="SUPPLY13" gate="G$1" x="213.36" y="63.5"/>
-<instance part="RA1" gate="1" x="119.38" y="-10.16" rot="R90"/>
-<instance part="RA1" gate="2" x="114.3" y="-15.24" rot="R90"/>
-<instance part="RA1" gate="3" x="119.38" y="-33.02" rot="R90"/>
-<instance part="RA1" gate="4" x="114.3" y="-35.56" rot="R90"/>
-<instance part="JP1" gate="G$1" x="198.12" y="33.02" rot="R180"/>
-<instance part="J1" gate="J" x="246.38" y="40.64"/>
-<instance part="U$7" gate="G$1" x="228.6" y="93.98"/>
+<instance part="C4" gate="G$1" x="71.12" y="71.12" rot="R90"/>
+<instance part="C3" gate="G$1" x="63.5" y="66.04" rot="R90"/>
+<instance part="U$2" gate="G$1" x="48.26" y="30.48"/>
+<instance part="R2" gate="G$1" x="55.88" y="40.64"/>
+<instance part="U$17" gate="G$1" x="99.06" y="66.04"/>
+<instance part="SW1" gate="SW" x="147.32" y="30.48"/>
+<instance part="J2" gate="G$1" x="256.54" y="35.56"/>
+<instance part="U3" gate="G$1" x="231.14" y="160.02" rot="R180"/>
+<instance part="U2" gate="G$1" x="149.86" y="66.04"/>
+<instance part="LED1" gate="G$1" x="27.94" y="48.26"/>
+<instance part="JP2" gate="G$1" x="261.62" y="129.54" rot="R180"/>
+<instance part="JP3" gate="G$1" x="261.62" y="114.3" rot="R180"/>
+<instance part="JP4" gate="G$1" x="261.62" y="99.06" rot="R180"/>
+<instance part="SUPPLY1" gate="G$1" x="228.6" y="132.08"/>
+<instance part="GND1" gate="1" x="228.6" y="121.92"/>
+<instance part="SUPPLY3" gate="G$1" x="134.62" y="73.66"/>
+<instance part="GND2" gate="1" x="134.62" y="55.88"/>
+<instance part="SUPPLY4" gate="G$1" x="177.8" y="73.66"/>
+<instance part="U$4" gate="G$1" x="170.18" y="25.4"/>
+<instance part="U$5" gate="G$1" x="251.46" y="33.02"/>
+<instance part="D1" gate="G$1" x="231.14" y="38.1" rot="R180"/>
+<instance part="SUPPLY5" gate="G$1" x="218.44" y="40.64"/>
+<instance part="C5" gate="G$1" x="121.92" y="68.58" rot="R180"/>
+<instance part="C7" gate="G$1" x="182.88" y="63.5"/>
+<instance part="R1" gate="G$1" x="27.94" y="58.42" rot="R270"/>
+<instance part="GND3" gate="1" x="228.6" y="106.68"/>
+<instance part="GND4" gate="1" x="27.94" y="38.1"/>
+<instance part="U$10" gate="G$1" x="264.16" y="149.86"/>
+<instance part="SUPPLY9" gate="G$1" x="264.16" y="170.18"/>
+<instance part="C8" gate="G$1" x="264.16" y="162.56" rot="R180"/>
+<instance part="GND7" gate="1" x="121.92" y="58.42"/>
+<instance part="GND8" gate="1" x="182.88" y="55.88"/>
+<instance part="FRAME1" gate="G$1" x="5.08" y="5.08"/>
+<instance part="LCD1" gate="G$1" x="86.36" y="53.34"/>
+<instance part="U1" gate="G$1" x="106.68" y="124.46"/>
+<instance part="C2" gate="G$1" x="33.02" y="144.78"/>
+<instance part="C1" gate="G$1" x="20.32" y="152.4"/>
+<instance part="C6" gate="G$1" x="160.02" y="116.84"/>
+<instance part="U$14" gate="G$1" x="20.32" y="137.16"/>
+<instance part="U$15" gate="G$1" x="33.02" y="137.16"/>
+<instance part="U$16" gate="G$1" x="160.02" y="109.22"/>
+<instance part="U$18" gate="G$1" x="106.68" y="109.22"/>
+<instance part="SUPPLY11" gate="G$1" x="20.32" y="165.1"/>
+<instance part="SUPPLY12" gate="G$1" x="33.02" y="154.94"/>
+<instance part="SUPPLY13" gate="G$1" x="160.02" y="124.46"/>
+<instance part="RA1" gate="1" x="68.58" y="60.96" rot="R90"/>
+<instance part="RA1" gate="2" x="63.5" y="55.88" rot="R90"/>
+<instance part="RA1" gate="3" x="68.58" y="38.1" rot="R90"/>
+<instance part="RA1" gate="4" x="63.5" y="35.56" rot="R90"/>
+<instance part="JP1" gate="G$1" x="261.62" y="83.82" rot="R180"/>
+<instance part="J1" gate="J" x="261.62" y="63.5"/>
+<instance part="U$7" gate="G$1" x="175.26" y="154.94"/>
 </instances>
 <busses>
 </busses>
 <nets>
 <net name="N$1" class="0">
 <segment>
-<wire x1="127" y1="-2.54" x2="106.68" y2="-2.54" width="0.1524" layer="91"/>
-<wire x1="106.68" y1="-2.54" x2="106.68" y2="0" width="0.1524" layer="91"/>
-<wire x1="106.68" y1="0" x2="116.84" y2="0" width="0.1524" layer="91"/>
+<wire x1="76.2" y1="68.58" x2="55.88" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="55.88" y1="68.58" x2="55.88" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="55.88" y1="71.12" x2="66.04" y2="71.12" width="0.1524" layer="91"/>
 <pinref part="C4" gate="G$1" pin="P$1"/>
 <pinref part="LCD1" gate="G$1" pin="C2-"/>
 </segment>
 </net>
 <net name="N$2" class="0">
 <segment>
-<wire x1="124.46" y1="0" x2="127" y2="0" width="0.1524" layer="91"/>
+<wire x1="73.66" y1="71.12" x2="76.2" y2="71.12" width="0.1524" layer="91"/>
 <pinref part="C4" gate="G$1" pin="P$2"/>
 <pinref part="LCD1" gate="G$1" pin="C2+"/>
 </segment>
 </net>
 <net name="N$3" class="0">
 <segment>
-<wire x1="127" y1="-7.62" x2="106.68" y2="-7.62" width="0.1524" layer="91"/>
-<wire x1="106.68" y1="-7.62" x2="106.68" y2="-5.08" width="0.1524" layer="91"/>
-<wire x1="106.68" y1="-5.08" x2="109.22" y2="-5.08" width="0.1524" layer="91"/>
+<wire x1="76.2" y1="63.5" x2="55.88" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="55.88" y1="63.5" x2="55.88" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="55.88" y1="66.04" x2="58.42" y2="66.04" width="0.1524" layer="91"/>
 <pinref part="C3" gate="G$1" pin="P$1"/>
 <pinref part="LCD1" gate="G$1" pin="C1-"/>
 </segment>
 </net>
 <net name="N$4" class="0">
 <segment>
-<wire x1="116.84" y1="-5.08" x2="127" y2="-5.08" width="0.1524" layer="91"/>
+<wire x1="66.04" y1="66.04" x2="76.2" y2="66.04" width="0.1524" layer="91"/>
 <pinref part="C3" gate="G$1" pin="P$2"/>
 <pinref part="LCD1" gate="G$1" pin="C1+"/>
 </segment>
 </net>
 <net name="GND" class="0">
 <segment>
-<wire x1="127" y1="-12.7" x2="106.68" y2="-12.7" width="0.1524" layer="91"/>
-<wire x1="106.68" y1="-12.7" x2="106.68" y2="-10.16" width="0.1524" layer="91"/>
-<wire x1="106.68" y1="-10.16" x2="114.3" y2="-10.16" width="0.1524" layer="91"/>
-<wire x1="106.68" y1="-12.7" x2="99.06" y2="-12.7" width="0.1524" layer="91"/>
-<wire x1="99.06" y1="-12.7" x2="99.06" y2="-30.48" width="0.1524" layer="91"/>
-<wire x1="99.06" y1="-30.48" x2="99.06" y2="-33.02" width="0.1524" layer="91"/>
-<wire x1="99.06" y1="-33.02" x2="99.06" y2="-35.56" width="0.1524" layer="91"/>
-<wire x1="99.06" y1="-35.56" x2="99.06" y2="-38.1" width="0.1524" layer="91"/>
-<wire x1="109.22" y1="-15.24" x2="106.68" y2="-15.24" width="0.1524" layer="91"/>
-<wire x1="106.68" y1="-15.24" x2="106.68" y2="-12.7" width="0.1524" layer="91"/>
-<wire x1="101.6" y1="-30.48" x2="99.06" y2="-30.48" width="0.1524" layer="91"/>
-<wire x1="109.22" y1="-35.56" x2="99.06" y2="-35.56" width="0.1524" layer="91"/>
-<wire x1="114.3" y1="-33.02" x2="99.06" y2="-33.02" width="0.1524" layer="91"/>
-<junction x="106.68" y="-12.7"/>
-<junction x="99.06" y="-30.48"/>
-<junction x="99.06" y="-35.56"/>
-<junction x="99.06" y="-33.02"/>
+<wire x1="76.2" y1="58.42" x2="55.88" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="55.88" y1="58.42" x2="55.88" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="55.88" y1="60.96" x2="63.5" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="55.88" y1="58.42" x2="48.26" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="48.26" y1="58.42" x2="48.26" y2="40.64" width="0.1524" layer="91"/>
+<wire x1="48.26" y1="40.64" x2="48.26" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="48.26" y1="38.1" x2="48.26" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="48.26" y1="35.56" x2="48.26" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="58.42" y1="55.88" x2="55.88" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="55.88" y1="55.88" x2="55.88" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="50.8" y1="40.64" x2="48.26" y2="40.64" width="0.1524" layer="91"/>
+<wire x1="58.42" y1="35.56" x2="48.26" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="63.5" y1="38.1" x2="48.26" y2="38.1" width="0.1524" layer="91"/>
+<junction x="55.88" y="58.42"/>
+<junction x="48.26" y="40.64"/>
+<junction x="48.26" y="35.56"/>
+<junction x="48.26" y="38.1"/>
 <pinref part="U$2" gate="G$1" pin="GND"/>
 <pinref part="R2" gate="G$1" pin="1"/>
 <pinref part="LCD1" gate="G$1" pin="VSS"/>
@@ -4855,312 +4860,312 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="JP2" gate="G$1" pin="2"/>
 <pinref part="GND1" gate="1" pin="GND"/>
-<wire x1="307.34" y1="63.5" x2="281.94" y2="63.5" width="0.1524" layer="91"/>
-<wire x1="281.94" y1="63.5" x2="281.94" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="254" y1="127" x2="228.6" y2="127" width="0.1524" layer="91"/>
+<wire x1="228.6" y1="127" x2="228.6" y2="124.46" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U2" gate="G$1" pin="GND"/>
-<wire x1="200.66" y1="-2.54" x2="195.58" y2="-2.54" width="0.1524" layer="91"/>
-<wire x1="195.58" y1="-2.54" x2="195.58" y2="-10.16" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="66.04" x2="134.62" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="134.62" y1="66.04" x2="134.62" y2="58.42" width="0.1524" layer="91"/>
 <pinref part="GND2" gate="1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="SW1" gate="SW" pin="COMMON"/>
 <pinref part="U$4" gate="G$1" pin="GND"/>
-<wire x1="215.9" y1="-38.1" x2="231.14" y2="-38.1" width="0.1524" layer="91"/>
-<wire x1="231.14" y1="-38.1" x2="231.14" y2="-40.64" width="0.1524" layer="91"/>
+<wire x1="154.94" y1="30.48" x2="170.18" y2="30.48" width="0.1524" layer="91"/>
+<wire x1="170.18" y1="30.48" x2="170.18" y2="27.94" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="J2" gate="G$1" pin="GND"/>
 <pinref part="U$5" gate="G$1" pin="GND"/>
-<wire x1="294.64" y1="-25.4" x2="297.18" y2="-25.4" width="0.1524" layer="91"/>
+<wire x1="251.46" y1="35.56" x2="254" y2="35.56" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="JP3" gate="G$1" pin="2"/>
-<wire x1="307.34" y1="48.26" x2="281.94" y2="48.26" width="0.1524" layer="91"/>
-<wire x1="281.94" y1="48.26" x2="281.94" y2="45.72" width="0.1524" layer="91"/>
+<wire x1="254" y1="111.76" x2="228.6" y2="111.76" width="0.1524" layer="91"/>
+<wire x1="228.6" y1="111.76" x2="228.6" y2="109.22" width="0.1524" layer="91"/>
 <pinref part="GND3" gate="1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="LED1" gate="G$1" pin="C"/>
 <pinref part="GND4" gate="1" pin="GND"/>
-<wire x1="78.74" y1="-27.94" x2="78.74" y2="-30.48" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="43.18" x2="27.94" y2="40.64" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U3" gate="G$1" pin="GND"/>
-<wire x1="287.02" y1="93.98" x2="284.48" y2="93.98" width="0.1524" layer="91"/>
-<wire x1="287.02" y1="93.98" x2="287.02" y2="91.44" width="0.1524" layer="91"/>
+<wire x1="248.92" y1="157.48" x2="246.38" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="248.92" y1="157.48" x2="248.92" y2="154.94" width="0.1524" layer="91"/>
 <pinref part="C8" gate="G$1" pin="1"/>
-<wire x1="287.02" y1="91.44" x2="302.26" y2="91.44" width="0.1524" layer="91"/>
-<wire x1="302.26" y1="91.44" x2="302.26" y2="93.98" width="0.1524" layer="91"/>
+<wire x1="248.92" y1="154.94" x2="264.16" y2="154.94" width="0.1524" layer="91"/>
+<wire x1="264.16" y1="154.94" x2="264.16" y2="157.48" width="0.1524" layer="91"/>
 <pinref part="U$10" gate="G$1" pin="GND"/>
-<wire x1="302.26" y1="91.44" x2="302.26" y2="88.9" width="0.1524" layer="91"/>
-<junction x="302.26" y="91.44"/>
+<wire x1="264.16" y1="154.94" x2="264.16" y2="152.4" width="0.1524" layer="91"/>
+<junction x="264.16" y="154.94"/>
 </segment>
 <segment>
 <pinref part="C5" gate="G$1" pin="1"/>
 <pinref part="GND7" gate="1" pin="GND"/>
-<wire x1="182.88" y1="-7.62" x2="182.88" y2="-5.08" width="0.1524" layer="91"/>
+<wire x1="121.92" y1="60.96" x2="121.92" y2="63.5" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C7" gate="G$1" pin="2"/>
 <pinref part="GND8" gate="1" pin="GND"/>
-<wire x1="243.84" y1="-10.16" x2="243.84" y2="-7.62" width="0.1524" layer="91"/>
+<wire x1="182.88" y1="58.42" x2="182.88" y2="60.96" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C1" gate="G$1" pin="2"/>
-<wire x1="73.66" y1="88.9" x2="73.66" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="20.32" y1="149.86" x2="20.32" y2="139.7" width="0.1524" layer="91"/>
 <pinref part="U$14" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="C2" gate="G$1" pin="2"/>
-<wire x1="86.36" y1="81.28" x2="86.36" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="142.24" x2="33.02" y2="139.7" width="0.1524" layer="91"/>
 <pinref part="U$15" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="C6" gate="G$1" pin="2"/>
-<wire x1="213.36" y1="53.34" x2="213.36" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="160.02" y1="114.3" x2="160.02" y2="111.76" width="0.1524" layer="91"/>
 <pinref part="U$16" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="GND"/>
 <pinref part="U$18" gate="G$1" pin="GND"/>
-<wire x1="160.02" y1="50.8" x2="160.02" y2="53.34" width="0.1524" layer="91"/>
+<wire x1="106.68" y1="111.76" x2="106.68" y2="114.3" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="J1" gate="J" pin="GND"/>
-<wire x1="238.76" y1="43.18" x2="243.84" y2="43.18" width="0.1524" layer="91"/>
-<label x="238.76" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="66.04" x2="259.08" y2="66.04" width="0.1524" layer="91"/>
+<label x="254" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="BOOT0-PF11"/>
-<wire x1="205.74" y1="99.06" x2="228.6" y2="99.06" width="0.1524" layer="91"/>
-<wire x1="228.6" y1="99.06" x2="228.6" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="152.4" y1="160.02" x2="175.26" y2="160.02" width="0.1524" layer="91"/>
+<wire x1="175.26" y1="160.02" x2="175.26" y2="157.48" width="0.1524" layer="91"/>
 <pinref part="U$7" gate="G$1" pin="GND"/>
 </segment>
 </net>
 <net name="N$8" class="0">
 <segment>
-<wire x1="127" y1="-30.48" x2="111.76" y2="-30.48" width="0.1524" layer="91"/>
+<wire x1="76.2" y1="40.64" x2="60.96" y2="40.64" width="0.1524" layer="91"/>
 <pinref part="R2" gate="G$1" pin="2"/>
 <pinref part="LCD1" gate="G$1" pin="IREF"/>
 </segment>
 </net>
 <net name="N$9" class="0">
 <segment>
-<wire x1="127" y1="-33.02" x2="121.92" y2="-33.02" width="0.1524" layer="91"/>
+<wire x1="76.2" y1="38.1" x2="71.12" y2="38.1" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="VCOMH"/>
 <pinref part="RA1" gate="3" pin="2"/>
 </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"/>
+<wire x1="76.2" y1="35.56" x2="66.04" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="LCD1" gate="G$1" pin="VCC"/>
 <pinref part="RA1" gate="4" pin="2"/>
 </segment>
 </net>
 <net name="3.3V" class="0">
 <segment>
-<wire x1="149.86" y1="-7.62" x2="149.86" y2="-10.16" width="0.1524" layer="91"/>
-<wire x1="149.86" y1="-10.16" x2="127" y2="-10.16" width="0.1524" layer="91"/>
-<wire x1="127" y1="-10.16" x2="121.92" y2="-10.16" width="0.1524" layer="91"/>
-<wire x1="116.84" y1="-15.24" x2="127" y2="-15.24" width="0.1524" layer="91"/>
-<wire x1="127" y1="-15.24" x2="149.86" y2="-15.24" width="0.1524" layer="91"/>
-<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"/>
+<wire x1="99.06" y1="63.5" x2="99.06" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="99.06" y1="60.96" x2="76.2" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="76.2" y1="60.96" x2="71.12" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="66.04" y1="55.88" x2="76.2" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="76.2" y1="55.88" x2="99.06" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="99.06" y1="55.88" x2="99.06" y2="60.96" width="0.1524" layer="91"/>
+<junction x="99.06" y="60.96"/>
 <pinref part="U$17" gate="G$1" pin="3.3V"/>
 <pinref part="LCD1" gate="G$1" pin="VBAT"/>
-<junction x="127" y="-10.16"/>
+<junction x="76.2" y="60.96"/>
 <pinref part="LCD1" gate="G$1" pin="VDD"/>
-<junction x="127" y="-15.24"/>
+<junction x="76.2" y="55.88"/>
 <pinref part="RA1" gate="1" pin="2"/>
 <pinref part="RA1" gate="2" pin="2"/>
 </segment>
 <segment>
 <pinref part="U2" gate="G$1" pin="OUT"/>
-<wire x1="218.44" y1="2.54" x2="238.76" y2="2.54" width="0.1524" layer="91"/>
-<wire x1="238.76" y1="2.54" x2="238.76" y2="5.08" width="0.1524" layer="91"/>
+<wire x1="157.48" y1="71.12" x2="177.8" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="177.8" y1="71.12" x2="177.8" y2="73.66" width="0.1524" layer="91"/>
 <pinref part="SUPPLY4" gate="G$1" pin="3.3V"/>
 <pinref part="C7" gate="G$1" pin="1"/>
-<wire x1="238.76" y1="2.54" x2="243.84" y2="2.54" width="0.1524" layer="91"/>
-<wire x1="243.84" y1="2.54" x2="243.84" y2="0" width="0.1524" layer="91"/>
-<junction x="238.76" y="2.54"/>
+<wire x1="177.8" y1="71.12" x2="182.88" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="182.88" y1="71.12" x2="182.88" y2="68.58" width="0.1524" layer="91"/>
+<junction x="177.8" y="71.12"/>
 </segment>
 <segment>
 <pinref part="U3" gate="G$1" pin="VCC"/>
-<wire x1="287.02" y1="101.6" x2="284.48" y2="101.6" width="0.1524" layer="91"/>
-<wire x1="287.02" y1="101.6" x2="287.02" y2="104.14" width="0.1524" layer="91"/>
+<wire x1="248.92" y1="165.1" x2="246.38" y2="165.1" width="0.1524" layer="91"/>
+<wire x1="248.92" y1="165.1" x2="248.92" y2="167.64" width="0.1524" layer="91"/>
 <pinref part="C8" gate="G$1" pin="2"/>
-<wire x1="287.02" y1="104.14" x2="302.26" y2="104.14" width="0.1524" layer="91"/>
-<wire x1="302.26" y1="104.14" x2="302.26" y2="101.6" width="0.1524" layer="91"/>
+<wire x1="248.92" y1="167.64" x2="264.16" y2="167.64" width="0.1524" layer="91"/>
+<wire x1="264.16" y1="167.64" x2="264.16" y2="165.1" width="0.1524" layer="91"/>
 <pinref part="SUPPLY9" gate="G$1" pin="3.3V"/>
-<wire x1="302.26" y1="104.14" x2="302.26" y2="106.68" width="0.1524" layer="91"/>
-<junction x="302.26" y="104.14"/>
+<wire x1="264.16" y1="167.64" x2="264.16" y2="170.18" width="0.1524" layer="91"/>
+<junction x="264.16" y="167.64"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="VDD"/>
 <pinref part="C1" gate="G$1" pin="1"/>
-<wire x1="119.38" y1="101.6" x2="73.66" y2="101.6" width="0.1524" layer="91"/>
-<wire x1="73.66" y1="101.6" x2="73.66" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="66.04" y1="162.56" x2="20.32" y2="162.56" width="0.1524" layer="91"/>
+<wire x1="20.32" y1="162.56" x2="20.32" y2="157.48" width="0.1524" layer="91"/>
 <pinref part="SUPPLY11" gate="G$1" pin="3.3V"/>
-<wire x1="73.66" y1="104.14" x2="73.66" y2="101.6" width="0.1524" layer="91"/>
-<junction x="73.66" y="101.6"/>
+<wire x1="20.32" y1="165.1" x2="20.32" y2="162.56" width="0.1524" layer="91"/>
+<junction x="20.32" y="162.56"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="VDDA"/>
 <pinref part="C2" gate="G$1" pin="1"/>
-<wire x1="119.38" y1="91.44" x2="86.36" y2="91.44" width="0.1524" layer="91"/>
-<wire x1="86.36" y1="91.44" x2="86.36" y2="88.9" width="0.1524" layer="91"/>
+<wire x1="66.04" y1="152.4" x2="33.02" y2="152.4" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="152.4" x2="33.02" y2="149.86" width="0.1524" layer="91"/>
 <pinref part="SUPPLY12" gate="G$1" pin="3.3V"/>
-<wire x1="86.36" y1="93.98" x2="86.36" y2="91.44" width="0.1524" layer="91"/>
-<junction x="86.36" y="91.44"/>
+<wire x1="33.02" y1="154.94" x2="33.02" y2="152.4" width="0.1524" layer="91"/>
+<junction x="33.02" y="152.4"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="VDDIO2"/>
 <pinref part="C6" gate="G$1" pin="1"/>
-<wire x1="205.74" y1="63.5" x2="213.36" y2="63.5" width="0.1524" layer="91"/>
-<wire x1="213.36" y1="63.5" x2="213.36" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="152.4" y1="124.46" x2="160.02" y2="124.46" width="0.1524" layer="91"/>
+<wire x1="160.02" y1="124.46" x2="160.02" y2="121.92" width="0.1524" layer="91"/>
 <pinref part="SUPPLY13" gate="G$1" pin="3.3V"/>
-<junction x="213.36" y="63.5"/>
+<junction x="160.02" y="124.46"/>
 </segment>
 </net>
 <net name="V_BATT" class="0">
 <segment>
 <pinref part="JP2" gate="G$1" pin="1"/>
 <pinref part="SUPPLY1" gate="G$1" pin="V_BATT"/>
-<wire x1="307.34" y1="66.04" x2="281.94" y2="66.04" width="0.1524" layer="91"/>
-<wire x1="281.94" y1="66.04" x2="281.94" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="254" y1="129.54" x2="228.6" y2="129.54" width="0.1524" layer="91"/>
+<wire x1="228.6" y1="129.54" x2="228.6" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U2" gate="G$1" pin="EN"/>
-<wire x1="200.66" y1="-7.62" x2="198.12" y2="-7.62" width="0.1524" layer="91"/>
-<wire x1="198.12" y1="-7.62" x2="198.12" y2="2.54" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="60.96" x2="137.16" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="137.16" y1="60.96" x2="137.16" y2="71.12" width="0.1524" layer="91"/>
 <pinref part="U2" gate="G$1" pin="IN"/>
-<wire x1="198.12" y1="2.54" x2="200.66" y2="2.54" width="0.1524" layer="91"/>
-<wire x1="198.12" y1="2.54" x2="195.58" y2="2.54" width="0.1524" layer="91"/>
-<wire x1="195.58" y1="2.54" x2="195.58" y2="5.08" width="0.1524" layer="91"/>
-<junction x="198.12" y="2.54"/>
+<wire x1="137.16" y1="71.12" x2="139.7" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="137.16" y1="71.12" x2="134.62" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="134.62" y1="71.12" x2="134.62" y2="73.66" width="0.1524" layer="91"/>
+<junction x="137.16" y="71.12"/>
 <pinref part="SUPPLY3" gate="G$1" pin="V_BATT"/>
 <pinref part="C5" gate="G$1" pin="2"/>
-<wire x1="182.88" y1="2.54" x2="195.58" y2="2.54" width="0.1524" layer="91"/>
-<junction x="195.58" y="2.54"/>
+<wire x1="121.92" y1="71.12" x2="134.62" y2="71.12" width="0.1524" layer="91"/>
+<junction x="134.62" y="71.12"/>
 </segment>
 <segment>
 <pinref part="D1" gate="G$1" pin="C"/>
-<wire x1="271.78" y1="-22.86" x2="261.62" y2="-22.86" width="0.1524" layer="91"/>
-<wire x1="261.62" y1="-22.86" x2="261.62" y2="-20.32" width="0.1524" layer="91"/>
+<wire x1="228.6" y1="38.1" x2="218.44" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="218.44" y1="38.1" x2="218.44" y2="40.64" width="0.1524" layer="91"/>
 <pinref part="SUPPLY5" gate="G$1" pin="V_BATT"/>
 </segment>
 </net>
 <net name="SW-A" class="0">
 <segment>
 <pinref part="SW1" gate="SW" pin="A"/>
-<wire x1="190.5" y1="-35.56" x2="200.66" y2="-35.56" width="0.1524" layer="91"/>
-<label x="190.5" y="-35.56" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="129.54" y1="33.02" x2="139.7" y2="33.02" width="0.1524" layer="91"/>
+<label x="129.54" y="33.02" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="208.28" y1="91.44" x2="205.74" y2="91.44" width="0.1524" layer="91"/>
-<label x="208.28" y="91.44" size="1.016" layer="95" xref="yes"/>
+<wire x1="154.94" y1="152.4" x2="152.4" y2="152.4" width="0.1524" layer="91"/>
+<label x="154.94" y="152.4" size="1.016" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="SPI1_MOSI/PB5"/>
 </segment>
 </net>
 <net name="SW-C" class="0">
 <segment>
 <pinref part="SW1" gate="SW" pin="C"/>
-<wire x1="190.5" y1="-40.64" x2="200.66" y2="-40.64" width="0.1524" layer="91"/>
-<label x="190.5" y="-40.64" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="129.54" y1="27.94" x2="139.7" y2="27.94" width="0.1524" layer="91"/>
+<label x="129.54" y="27.94" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="208.28" y1="86.36" x2="205.74" y2="86.36" width="0.1524" layer="91"/>
-<label x="208.28" y="86.36" size="1.016" layer="95" xref="yes"/>
+<wire x1="154.94" y1="147.32" x2="152.4" y2="147.32" width="0.1524" layer="91"/>
+<label x="154.94" y="147.32" size="1.016" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="SPI1_SCK/PB3"/>
 </segment>
 </net>
 <net name="SW-B" class="0">
 <segment>
 <pinref part="SW1" gate="SW" pin="B"/>
-<wire x1="223.52" y1="-35.56" x2="215.9" y2="-35.56" width="0.1524" layer="91"/>
-<label x="223.52" y="-35.56" size="1.016" layer="95" xref="yes"/>
+<wire x1="162.56" y1="33.02" x2="154.94" y2="33.02" width="0.1524" layer="91"/>
+<label x="162.56" y="33.02" size="1.016" layer="95" xref="yes"/>
 </segment>
 <segment>
-<wire x1="208.28" y1="96.52" x2="205.74" y2="96.52" width="0.1524" layer="91"/>
-<label x="208.28" y="96.52" size="1.016" layer="95" xref="yes"/>
+<wire x1="154.94" y1="157.48" x2="152.4" y2="157.48" width="0.1524" layer="91"/>
+<label x="154.94" y="157.48" size="1.016" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
 </segment>
 </net>
 <net name="SW-D" class="0">
 <segment>
 <pinref part="SW1" gate="SW" pin="D"/>
-<wire x1="223.52" y1="-40.64" x2="215.9" y2="-40.64" width="0.1524" layer="91"/>
-<label x="223.52" y="-40.64" size="1.016" layer="95" xref="yes"/>
+<wire x1="162.56" y1="27.94" x2="154.94" y2="27.94" width="0.1524" layer="91"/>
+<label x="162.56" y="27.94" size="1.016" layer="95" xref="yes"/>
 </segment>
 <segment>
-<wire x1="208.28" y1="93.98" x2="205.74" y2="93.98" width="0.1524" layer="91"/>
-<label x="208.28" y="93.98" size="1.016" layer="95" xref="yes"/>
+<wire x1="154.94" y1="154.94" x2="152.4" y2="154.94" width="0.1524" layer="91"/>
+<label x="154.94" y="154.94" size="1.016" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
 </segment>
 </net>
 <net name="D+" class="0">
 <segment>
 <pinref part="J2" gate="G$1" pin="D+"/>
-<wire x1="292.1" y1="-17.78" x2="297.18" y2="-17.78" width="0.1524" layer="91"/>
-<label x="292.1" y="-17.78" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="248.92" y1="43.18" x2="254" y2="43.18" width="0.1524" layer="91"/>
+<label x="248.92" y="43.18" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="236.22" y="76.2" size="1.016" layer="95" xref="yes"/>
+<label x="182.88" y="137.16" size="1.016" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12"/>
-<wire x1="205.74" y1="76.2" x2="236.22" y2="76.2" width="0.1524" layer="91"/>
+<wire x1="152.4" y1="137.16" x2="182.88" y2="137.16" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="J1" gate="J" pin="MOSI"/>
-<wire x1="238.76" y1="35.56" x2="243.84" y2="35.56" width="0.1524" layer="91"/>
-<label x="238.76" y="35.56" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="58.42" x2="259.08" y2="58.42" width="0.1524" layer="91"/>
+<label x="254" y="58.42" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="D-" class="0">
 <segment>
 <pinref part="J2" gate="G$1" pin="D-"/>
-<wire x1="292.1" y1="-20.32" x2="297.18" y2="-20.32" width="0.1524" layer="91"/>
-<label x="292.1" y="-20.32" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="248.92" y1="40.64" x2="254" y2="40.64" width="0.1524" layer="91"/>
+<label x="248.92" y="40.64" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="236.22" y="73.66" size="1.016" layer="95" xref="yes"/>
+<label x="182.88" y="134.62" size="1.016" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11"/>
-<wire x1="205.74" y1="73.66" x2="236.22" y2="73.66" width="0.1524" layer="91"/>
+<wire x1="152.4" y1="134.62" x2="182.88" y2="134.62" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="J1" gate="J" pin="\RST"/>
-<wire x1="238.76" y1="33.02" x2="243.84" y2="33.02" width="0.1524" layer="91"/>
-<label x="238.76" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="55.88" x2="259.08" y2="55.88" width="0.1524" layer="91"/>
+<label x="254" y="55.88" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="VUSB" class="0">
 <segment>
 <pinref part="J2" gate="G$1" pin="VBUS"/>
 <pinref part="D1" gate="G$1" pin="A"/>
-<wire x1="276.86" y1="-22.86" x2="281.94" y2="-22.86" width="0.1524" layer="91"/>
-<wire x1="281.94" y1="-22.86" x2="297.18" y2="-22.86" width="0.1524" layer="91"/>
-<wire x1="281.94" y1="-22.86" x2="281.94" y2="-7.62" width="0.1524" layer="91"/>
-<junction x="281.94" y="-22.86"/>
-<wire x1="281.94" y1="-7.62" x2="276.86" y2="-7.62" width="0.1524" layer="91"/>
-<label x="276.86" y="-7.62" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="233.68" y1="38.1" x2="238.76" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="238.76" y1="38.1" x2="254" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="238.76" y1="38.1" x2="238.76" y2="43.18" width="0.1524" layer="91"/>
+<junction x="238.76" y="38.1"/>
+<wire x1="238.76" y1="43.18" x2="236.22" y2="43.18" width="0.1524" layer="91"/>
+<label x="236.22" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <pinref part="J1" gate="J" pin="VCC"/>
-<wire x1="243.84" y1="45.72" x2="238.76" y2="45.72" width="0.1524" layer="91"/>
-<label x="238.76" y="45.72" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="259.08" y1="68.58" x2="254" y2="68.58" width="0.1524" layer="91"/>
+<label x="254" y="68.58" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SSR+" class="0">
 <segment>
 <pinref part="JP3" gate="G$1" pin="1"/>
-<wire x1="307.34" y1="50.8" x2="281.94" y2="50.8" width="0.1524" layer="91"/>
-<label x="281.94" y="50.8" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="114.3" x2="228.6" y2="114.3" width="0.1524" layer="91"/>
+<label x="228.6" y="114.3" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="114.3" y="86.36" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="114.3" y1="86.36" x2="119.38" y2="86.36" width="0.1524" layer="91"/>
+<label x="60.96" y="147.32" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="60.96" y1="147.32" x2="66.04" y2="147.32" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="PA1/ADC1"/>
 </segment>
 </net>
@@ -5168,192 +5173,192 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="LED1" gate="G$1" pin="A"/>
 <pinref part="R1" gate="G$1" pin="2"/>
-<wire x1="78.74" y1="-20.32" x2="78.74" y2="-17.78" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="50.8" x2="27.94" y2="53.34" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="LED_PWR" class="0">
 <segment>
 <pinref part="R1" gate="G$1" pin="1"/>
-<wire x1="78.74" y1="-5.08" x2="78.74" y2="-7.62" width="0.1524" layer="91"/>
-<label x="78.74" y="-5.08" size="1.27" layer="95" rot="R90" xref="yes"/>
+<wire x1="27.94" y1="66.04" x2="27.94" y2="63.5" width="0.1524" layer="91"/>
+<label x="27.94" y="66.04" size="1.27" layer="95" rot="R90" xref="yes"/>
 </segment>
 <segment>
-<wire x1="208.28" y1="101.6" x2="205.74" y2="101.6" width="0.1524" layer="91"/>
-<label x="208.28" y="101.6" size="1.016" layer="95" xref="yes"/>
+<wire x1="154.94" y1="162.56" x2="152.4" y2="162.56" width="0.1524" layer="91"/>
+<label x="154.94" y="162.56" size="1.016" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="I2C1_SCL/CAN_RX/PB8"/>
 </segment>
 </net>
 <net name="!RES" class="0">
 <segment>
-<wire x1="124.46" y1="-20.32" x2="127" y2="-20.32" width="0.1524" layer="91"/>
-<label x="124.46" y="-20.32" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="73.66" y1="50.8" x2="76.2" y2="50.8" width="0.1524" layer="91"/>
+<label x="73.66" y="50.8" size="1.016" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="RES#"/>
 </segment>
 <segment>
-<label x="111.76" y="81.28" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="111.76" y1="81.28" x2="119.38" y2="81.28" width="0.1524" layer="91"/>
+<label x="58.42" y="142.24" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="58.42" y1="142.24" x2="66.04" y2="142.24" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="PA3/ADC3/USART2_RX"/>
 </segment>
 </net>
 <net name="D/!C" class="0">
 <segment>
-<wire x1="124.46" y1="-22.86" x2="127" y2="-22.86" width="0.1524" layer="91"/>
-<label x="124.46" y="-22.86" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="73.66" y1="48.26" x2="76.2" y2="48.26" width="0.1524" layer="91"/>
+<label x="73.66" y="48.26" size="1.016" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="D/C#"/>
 </segment>
 <segment>
-<label x="111.76" y="78.74" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="111.76" y1="78.74" x2="119.38" y2="78.74" width="0.1524" layer="91"/>
+<label x="58.42" y="139.7" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="58.42" y1="139.7" x2="66.04" y2="139.7" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="PA4/ADC4"/>
 </segment>
 </net>
 <net name="T-" class="0">
 <segment>
 <pinref part="U3" gate="G$1" pin="T-"/>
-<wire x1="287.02" y1="96.52" x2="284.48" y2="96.52" width="0.1524" layer="91"/>
-<label x="287.02" y="96.52" size="1.016" layer="95" xref="yes"/>
+<wire x1="248.92" y1="160.02" x2="246.38" y2="160.02" width="0.1524" layer="91"/>
+<label x="248.92" y="160.02" size="1.016" layer="95" xref="yes"/>
 </segment>
 <segment>
 <pinref part="JP4" gate="G$1" pin="2"/>
-<wire x1="307.34" y1="33.02" x2="281.94" y2="33.02" width="0.1524" layer="91"/>
-<label x="281.94" y="33.02" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="96.52" x2="228.6" y2="96.52" width="0.1524" layer="91"/>
+<label x="228.6" y="96.52" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="T+" class="0">
 <segment>
 <pinref part="U3" gate="G$1" pin="T+"/>
-<wire x1="287.02" y1="99.06" x2="284.48" y2="99.06" width="0.1524" layer="91"/>
-<label x="287.02" y="99.06" size="1.016" layer="95" xref="yes"/>
+<wire x1="248.92" y1="162.56" x2="246.38" y2="162.56" width="0.1524" layer="91"/>
+<label x="248.92" y="162.56" size="1.016" layer="95" xref="yes"/>
 </segment>
 <segment>
 <pinref part="JP4" gate="G$1" pin="1"/>
-<wire x1="307.34" y1="35.56" x2="281.94" y2="35.56" width="0.1524" layer="91"/>
-<label x="281.94" y="35.56" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="99.06" x2="228.6" y2="99.06" width="0.1524" layer="91"/>
+<label x="228.6" y="99.06" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SW-BTN" class="0">
 <segment>
 <pinref part="SW1" gate="SW" pin="CENTER"/>
-<wire x1="200.66" y1="-38.1" x2="190.5" y2="-38.1" width="0.1524" layer="91"/>
-<label x="190.5" y="-38.1" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="139.7" y1="30.48" x2="129.54" y2="30.48" width="0.1524" layer="91"/>
+<label x="129.54" y="30.48" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="205.74" y1="88.9" x2="208.28" y2="88.9" width="0.1524" layer="91"/>
-<label x="208.28" y="88.9" size="1.016" layer="95" xref="yes"/>
+<wire x1="152.4" y1="149.86" x2="154.94" y2="149.86" width="0.1524" layer="91"/>
+<label x="154.94" y="149.86" size="1.016" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="SPI1_MISO/PB4"/>
 </segment>
 </net>
 <net name="SPI_MOSI" class="0">
 <segment>
-<wire x1="124.46" y1="-27.94" x2="127" y2="-27.94" width="0.1524" layer="91"/>
-<label x="124.46" y="-27.94" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="73.66" y1="43.18" x2="76.2" y2="43.18" width="0.1524" layer="91"/>
+<label x="73.66" y="43.18" size="1.016" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="SDIN"/>
 </segment>
 <segment>
-<wire x1="119.38" y1="71.12" x2="109.22" y2="71.12" width="0.1524" layer="91"/>
-<label x="109.22" y="71.12" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="66.04" y1="132.08" x2="55.88" y2="132.08" width="0.1524" layer="91"/>
+<label x="55.88" y="132.08" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="PA7/ADC7/SPI1_MOSI"/>
 </segment>
 </net>
 <net name="SPI_MISO" class="0">
 <segment>
 <pinref part="U3" gate="G$1" pin="SO"/>
-<wire x1="251.46" y1="96.52" x2="254" y2="96.52" width="0.1524" layer="91"/>
-<label x="251.46" y="96.52" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="213.36" y1="160.02" x2="215.9" y2="160.02" width="0.1524" layer="91"/>
+<label x="213.36" y="160.02" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="119.38" y1="73.66" x2="109.22" y2="73.66" width="0.1524" layer="91"/>
-<label x="109.22" y="73.66" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="66.04" y1="134.62" x2="55.88" y2="134.62" width="0.1524" layer="91"/>
+<label x="55.88" y="134.62" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="PA6/ADC6/SPI1_MISO"/>
 </segment>
 </net>
 <net name="SPI_SCK" class="0">
 <segment>
-<wire x1="124.46" y1="-25.4" x2="127" y2="-25.4" width="0.1524" layer="91"/>
-<label x="124.46" y="-25.4" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="73.66" y1="45.72" x2="76.2" y2="45.72" width="0.1524" layer="91"/>
+<label x="73.66" y="45.72" size="1.016" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="SCLK"/>
 </segment>
 <segment>
 <pinref part="U3" gate="G$1" pin="SCK"/>
-<wire x1="251.46" y1="101.6" x2="254" y2="101.6" width="0.1524" layer="91"/>
-<label x="251.46" y="101.6" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="213.36" y1="165.1" x2="215.9" y2="165.1" width="0.1524" layer="91"/>
+<label x="213.36" y="165.1" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="119.38" y1="76.2" x2="109.22" y2="76.2" width="0.1524" layer="91"/>
-<label x="109.22" y="76.2" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="66.04" y1="137.16" x2="55.88" y2="137.16" width="0.1524" layer="91"/>
+<label x="55.88" y="137.16" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="PA5/ADC5/SPI1_SCK"/>
 </segment>
 </net>
 <net name="!CS_OLED" class="0">
 <segment>
-<wire x1="124.46" y1="-17.78" x2="127" y2="-17.78" width="0.1524" layer="91"/>
-<label x="124.46" y="-17.78" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="73.66" y1="53.34" x2="76.2" y2="53.34" width="0.1524" layer="91"/>
+<label x="73.66" y="53.34" size="1.016" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="CS#"/>
 </segment>
 <segment>
-<wire x1="119.38" y1="83.82" x2="109.22" y2="83.82" width="0.1524" layer="91"/>
-<label x="109.22" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="66.04" y1="144.78" x2="55.88" y2="144.78" width="0.1524" layer="91"/>
+<label x="55.88" y="144.78" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="PA2/ADC2/USART2_TX"/>
 </segment>
 </net>
 <net name="!CS_MAX" class="0">
 <segment>
 <pinref part="U3" gate="G$1" pin="!CS"/>
-<wire x1="251.46" y1="99.06" x2="254" y2="99.06" width="0.1524" layer="91"/>
-<label x="251.46" y="99.06" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="213.36" y1="162.56" x2="215.9" y2="162.56" width="0.1524" layer="91"/>
+<label x="213.36" y="162.56" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="205.74" y1="83.82" x2="215.9" y2="83.82" width="0.1524" layer="91"/>
-<label x="215.9" y="83.82" size="1.27" layer="95" xref="yes"/>
+<wire x1="152.4" y1="144.78" x2="162.56" y2="144.78" width="0.1524" layer="91"/>
+<label x="162.56" y="144.78" size="1.27" layer="95" xref="yes"/>
 <pinref part="U1" gate="G$1" pin="USART2_RX/PA15"/>
 </segment>
 </net>
 <net name="AUX-TX" class="0">
 <segment>
 <pinref part="JP1" gate="G$1" pin="1"/>
-<wire x1="185.42" y1="33.02" x2="190.5" y2="33.02" width="0.1524" layer="91"/>
-<label x="185.42" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="248.92" y1="83.82" x2="254" y2="83.82" width="0.1524" layer="91"/>
+<label x="248.92" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="USART1_TX/I2C1_SCL/PA9"/>
-<wire x1="205.74" y1="68.58" x2="243.84" y2="68.58" width="0.1524" layer="91"/>
-<label x="243.84" y="68.58" size="1.27" layer="95" xref="yes"/>
+<wire x1="152.4" y1="129.54" x2="190.5" y2="129.54" width="0.1524" layer="91"/>
+<label x="190.5" y="129.54" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="AUX-RX" class="0">
 <segment>
 <pinref part="JP1" gate="G$1" pin="2"/>
-<wire x1="185.42" y1="30.48" x2="190.5" y2="30.48" width="0.1524" layer="91"/>
-<label x="185.42" y="30.48" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="248.92" y1="81.28" x2="254" y2="81.28" width="0.1524" layer="91"/>
+<label x="248.92" y="81.28" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="USART1_RX/I2C1_SDA/PA10"/>
-<wire x1="205.74" y1="71.12" x2="243.84" y2="71.12" width="0.1524" layer="91"/>
-<label x="243.84" y="71.12" size="1.27" layer="95" xref="yes"/>
+<wire x1="152.4" y1="132.08" x2="190.5" y2="132.08" width="0.1524" layer="91"/>
+<label x="190.5" y="132.08" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="SWCLK" class="0">
 <segment>
 <pinref part="J1" gate="J" pin="SCK"/>
-<wire x1="238.76" y1="40.64" x2="243.84" y2="40.64" width="0.1524" layer="91"/>
-<label x="238.76" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="63.5" x2="259.08" y2="63.5" width="0.1524" layer="91"/>
+<label x="254" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
-<wire x1="226.06" y1="81.28" x2="205.74" y2="81.28" width="0.1524" layer="91"/>
-<label x="226.06" y="81.28" size="1.27" layer="95" xref="yes"/>
+<wire x1="172.72" y1="142.24" x2="152.4" y2="142.24" width="0.1524" layer="91"/>
+<label x="172.72" y="142.24" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="SWDIO" class="0">
 <segment>
 <pinref part="J1" gate="J" pin="MISO"/>
-<wire x1="238.76" y1="38.1" x2="243.84" y2="38.1" width="0.1524" layer="91"/>
-<label x="238.76" y="38.1" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="254" y1="60.96" x2="259.08" y2="60.96" width="0.1524" layer="91"/>
+<label x="254" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="SWDIO/PA13"/>
-<wire x1="226.06" y1="78.74" x2="205.74" y2="78.74" width="0.1524" layer="91"/>
-<label x="226.06" y="78.74" size="1.27" layer="95" xref="yes"/>
+<wire x1="172.72" y1="139.7" x2="152.4" y2="139.7" width="0.1524" layer="91"/>
+<label x="172.72" y="139.7" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 </nets>