diff --git a/archive/eagle.epf b/archive/eagle.epf
--- a/archive/eagle.epf
+++ b/archive/eagle.epf
@@ -390,12 +390,66 @@ UsedLibrary="/home/ethanzonca/Projects/S
 UsedLibrary="/home/ethanzonca/Projects/ZonCoffeeOLED/lbr/microbuilder.lbr"
 
 [Win_1]
+Type="Board Editor"
+Loc="0 0 625 724"
+State=1
+Number=2
+File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
+View="6.38367 0.806928 35.7386 16.6512"
+WireWidths=" 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 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 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"
+DimensionWidths=" 0 0.127 0.254 0.1 0.26 0.13"
+DimensionExtWidths=" 0.127 0.254 0.1 0.13 0.26 0"
+DimensionExtLengths=" 1.27 2.54 1 2 3 0"
+DimensionExtOffsets=" 1.27 2.54 1 2 3 0"
+SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
+WireBend=2
+WireBendSet=0
+WireCap=1
+MiterStyle=1
+PadShape=0
+ViaShape=1
+PolygonPour=0
+PolygonRank=1
+PolygonThermals=1
+PolygonOrphans=0
+TextRatio=8
+DimensionUnit=1
+DimensionPrecision=2
+DimensionShowUnit=0
+PinDirection=3
+PinFunction=0
+PinLength=2
+PinVisible=3
+SwapLevel=0
+ArcDirection=0
+AddLevel=2
+PadsSameType=0
+Layer=1
+
+[Win_2]
+Type="CAM Processor"
+Loc="59 25 1265 473"
+State=2
+Number=1
+File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
+Job="/home/ethanzonca/Projects/protofusion-hardware/cam/Elecrow_Gerber_Generater_DrillAlign.cam"
+
+[Win_3]
 Type="Schematic Editor"
 Loc="640 0 1265 724"
-State=2
+State=1
 Number=3
 File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.sch"
-View="-4.83332 -2.7758 296.939 192.006"
+View="3.0389 41.5682 295.56 236.35"
 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"
@@ -434,111 +488,10 @@ ArcDirection=0
 AddLevel=2
 PadsSameType=0
 Layer=91
-Views=" 1: -4.83332 -2.7758 296.939 192.006"
+Views=" 1: 3.0389 41.5682 295.56 236.35"
 Sheet=1
 
-[Win_2]
-Type="Library Editor"
-Loc="0 0 599 399"
-State=3
-Number=4
-File="/home/ethanzonca/Projects/protofusion-hardware/lbr/Protofusion.lbr"
-View="-2.86221 -0.2661 6.26716 2.01625"
-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.127"
-PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-PadDrills=" 0.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
-ViaDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-ViaDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
-HoleDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
-TextSizes=" 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778 1.27 0.1016"
-PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27"
-PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0"
-DimensionWidths=" 0 0.127 0.254 0.1 0.26 0.13"
-DimensionExtWidths=" 0.127 0.254 0.1 0.13 0.26 0"
-DimensionExtLengths=" 1.27 2.54 1 2 3 0"
-DimensionExtOffsets=" 1.27 2.54 1 2 3 0"
-SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
-WireBend=0
-WireBendSet=0
-WireCap=1
-MiterStyle=0
-PadShape=0
-ViaShape=0
-PolygonPour=0
-PolygonRank=0
-PolygonThermals=1
-PolygonOrphans=0
-TextRatio=8
-DimensionUnit=1
-DimensionPrecision=2
-DimensionShowUnit=0
-PinDirection=3
-PinFunction=0
-PinLength=2
-PinVisible=3
-SwapLevel=0
-ArcDirection=0
-AddLevel=2
-PadsSameType=0
-Layer=21
-Package="THERM_LOGO_SMALL_0.2"
-
-[Win_3]
-Type="Board Editor"
-Loc="0 0 625 724"
-State=1
-Number=2
-File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
-View="-12.2014 -7.72682 48.6686 25.1277"
-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 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"
-DimensionWidths=" 0 0.127 0.254 0.1 0.26 0.13"
-DimensionExtWidths=" 0.127 0.254 0.1 0.13 0.26 0"
-DimensionExtLengths=" 1.27 2.54 1 2 3 0"
-DimensionExtOffsets=" 1.27 2.54 1 2 3 0"
-SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
-WireBend=2
-WireBendSet=0
-WireCap=1
-MiterStyle=1
-PadShape=0
-ViaShape=1
-PolygonPour=0
-PolygonRank=1
-PolygonThermals=1
-PolygonOrphans=0
-TextRatio=8
-DimensionUnit=3
-DimensionPrecision=2
-DimensionShowUnit=0
-PinDirection=3
-PinFunction=0
-PinLength=2
-PinVisible=3
-SwapLevel=0
-ArcDirection=0
-AddLevel=2
-PadsSameType=0
-Layer=209
-
 [Win_4]
-Type="CAM Processor"
-Loc="0 0 599 448"
-State=2
-Number=5
-File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
-Job="/home/ethanzonca/Projects/protofusion-hardware/cam/Elecrow_Gerber_Generater_DrillAlign.cam"
-
-[Win_5]
 Type="Control Panel"
 Loc="585 230 1184 629"
 State=2
@@ -550,4 +503,3 @@ Window="Win_1"
 Window="Win_2"
 Window="Win_3"
 Window="Win_4"
-Window="Win_5"
diff --git a/therm-logo.svg b/therm-logo.svg
--- a/therm-logo.svg
+++ b/therm-logo.svg
@@ -27,9 +27,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7415097"
-     inkscape:cx="38.192349"
-     inkscape:cy="18.672223"
+     inkscape:zoom="5.474074"
+     inkscape:cx="61.46279"
+     inkscape:cy="47.034892"
      inkscape:document-units="in"
      inkscape:current-layer="g3035"
      showgrid="false"
@@ -109,6 +109,35 @@
                id="tspan3009-7"
                sodipodi:role="line">0.2</tspan></text>
         </g>
+        <g
+           id="g3027"
+           transform="matrix(0.3948502,0,0,0.3948502,56.653369,611.95843)"
+           inkscape:export-filename="/home/ethanzonca/Projects/ZonCoffeeOLED/therm-0.2-small.png.png"
+           inkscape:export-xdpi="500"
+           inkscape:export-ydpi="500">
+          <text
+             xml:space="preserve"
+             style="font-size:15.75990486px;font-style:oblique;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Delicious Heavy;-inkscape-font-specification:'Delicious Heavy, Oblique'"
+             x="96.163521"
+             y="995.5246"
+             id="text3003-96"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan3005-9"
+               x="96.163521"
+               y="995.5246">therm</tspan></text>
+          <text
+             xml:space="preserve"
+             style="font-size:6.30396223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Delicious SmallCaps;-inkscape-font-specification:'Delicious SmallCaps,'"
+             x="135.46036"
+             y="988.49286"
+             id="text3007-1-8"
+             sodipodi:linespacing="125%"><tspan
+               sodipodi:role="line"
+               id="tspan3009-7-64"
+               x="135.46036"
+               y="988.49286">0.2</tspan></text>
+        </g>
       </g>
       <g
          id="g3026"
diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="7.1.0">
+<eagle version="6.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
@@ -23,7 +23,7 @@
 <layer number="13" name="Route13" color="4" fill="5" visible="no" active="no"/>
 <layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
 <layer number="15" name="Route15" color="4" fill="6" visible="no" active="no"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
@@ -2308,7 +2308,7 @@ chip</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="Elecrow_2-layer_eagle_rule *">
+<designrules name="Elecrow_2-layer_eagle_rule">
 <description language="de">&lt;b&gt;EAGLE Design Rules&lt;/b&gt;
 &lt;p&gt;
 Die Standard-Design-Rules sind so gewählt, dass sie für 
@@ -2387,7 +2387,7 @@ design rules under a new name.</descript
 <param name="dpMaxLengthDifference" value="10mm"/>
 <param name="dpGapFactor" value="2.5"/>
 <param name="checkGrid" value="0"/>
-<param name="checkAngle" value="1"/>
+<param name="checkAngle" value="0"/>
 <param name="checkFont" value="1"/>
 <param name="checkRestrict" value="0"/>
 <param name="useDiameter" value="13"/>
@@ -2396,9 +2396,6 @@ design rules under a new name.</descript
 <autorouter>
 <pass name="Default">
 <param name="RoutingGrid" value="12.5mil"/>
-<param name="AutoGrid" value="1"/>
-<param name="Efforts" value="0"/>
-<param name="TopRouterVariant" value="1"/>
 <param name="tpViaShape" value="round"/>
 <param name="PrefDir.1" value="|"/>
 <param name="PrefDir.2" value="0"/>
@@ -2604,7 +2601,7 @@ design rules under a new name.</descript
 <wire x1="37.276128125" y1="11.876128125" x2="37.276128125" y2="11.717378125" width="0.2032" layer="1"/>
 <wire x1="37.276128125" y1="11.717378125" x2="36.35375" y2="10.795" width="0.2032" layer="1"/>
 <via x="41.43375" y="13.890625" extent="1-16" drill="0.3048"/>
-<via x="6.6675" y="15.636875" extent="1-16" drill="0.3048"/>
+<via x="5.476875" y="14.605" extent="1-16" drill="0.3048"/>
 <wire x1="40.247" y1="14.2875" x2="41.036875" y2="14.2875" width="0.2032" layer="1"/>
 <wire x1="41.036875" y1="14.2875" x2="41.43375" y2="13.890625" width="0.2032" layer="1"/>
 <contactref element="J1" pad="2"/>
@@ -2644,46 +2641,52 @@ design rules under a new name.</descript
 <wire x1="43.704375" y1="5.635625" x2="43.815" y2="5.525" width="0.2032" layer="1"/>
 <contactref element="U$8" pad="16"/>
 <contactref element="U$8" pad="32"/>
-<wire x1="6.6675" y1="15.636875" x2="6.49375" y2="14.366875" width="0" layer="19" extent="1-1"/>
-<wire x1="15.53" y1="12.325" x2="6.49375" y2="14.366875" width="0" layer="19" extent="1-1"/>
-<wire x1="18.415" y1="13.97" x2="15.53" y2="12.325" width="0" layer="19" extent="1-1"/>
-<wire x1="7.33" y1="6.725" x2="8.335" y2="10.66625" width="0" layer="19" extent="1-16"/>
-<wire x1="5.85875" y1="5.08" x2="7.33" y2="6.725" width="0" layer="19" extent="1-1"/>
+<wire x1="15.53" y1="12.325" x2="14.23" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="14.23" y1="12.325" x2="13.97" y2="12.065" width="0.2032" layer="1"/>
+<via x="13.97" y="12.065" extent="1-16" drill="0.3048"/>
+<wire x1="13.97" y1="12.065" x2="13.335" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="5.85875" y1="5.08" x2="5.85875" y2="5.25375" width="0.2032" layer="1"/>
+<wire x1="5.85875" y1="5.25375" x2="7.33" y2="6.725" width="0.2032" layer="1"/>
+<via x="3.175" y="4.683125" extent="1-16" drill="0.3048"/>
+<wire x1="5.85875" y1="5.08" x2="3.571875" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="3.571875" y1="5.08" x2="3.175" y2="4.683125" width="0.2032" layer="1"/>
+<wire x1="5.476875" y1="14.605" x2="6.255625" y2="14.605" width="0.2032" layer="1"/>
+<wire x1="6.255625" y1="14.605" x2="6.49375" y2="14.366875" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
-<via x="4.445" y="13.6525" extent="1-16" drill="0.3048"/>
-<wire x1="4.445" y1="13.6525" x2="4.83125" y2="13.26625" width="0.2032" layer="16"/>
+<via x="3.175" y="13.6525" extent="1-16" drill="0.3048"/>
+<wire x1="3.175" y1="13.6525" x2="3.56125" y2="13.26625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="2"/>
-<wire x1="4.83125" y1="13.26625" x2="8.335" y2="13.26625" width="0.2032" layer="16"/>
+<wire x1="3.56125" y1="13.26625" x2="8.335" y2="13.26625" width="0.2032" layer="16"/>
 <contactref element="C9" pad="1"/>
-<wire x1="2.2375" y1="13.6525" x2="4.445" y2="13.6525" width="0.2032" layer="1"/>
+<wire x1="2.2375" y1="13.6525" x2="3.175" y2="13.6525" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$2">
-<via x="5.3975" y="13.890625" extent="1-16" drill="0.3048"/>
+<via x="4.1275" y="13.890625" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="1"/>
 <wire x1="1.11125" y1="14.44625" x2="0.9525" y2="14.2875" width="0.2032" layer="1"/>
 <wire x1="0.9525" y1="14.2875" x2="0.9525" y2="13.6675" width="0.2032" layer="1"/>
 <contactref element="C9" pad="2"/>
 <wire x1="0.9375" y1="13.6525" x2="0.9525" y2="13.6675" width="0.2032" layer="1"/>
-<wire x1="1.11125" y1="14.44625" x2="4.841875" y2="14.44625" width="0.2032" layer="1"/>
-<wire x1="4.841875" y1="14.44625" x2="5.3975" y2="13.890625" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="13.91625" x2="5.423125" y2="13.91625" width="0.2032" layer="16"/>
-<wire x1="5.423125" y1="13.91625" x2="5.3975" y2="13.890625" width="0.2032" layer="16"/>
+<wire x1="1.11125" y1="14.44625" x2="3.571875" y2="14.44625" width="0.2032" layer="1"/>
+<wire x1="3.571875" y1="14.44625" x2="4.1275" y2="13.890625" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="13.91625" x2="4.153125" y2="13.91625" width="0.2032" layer="16"/>
+<wire x1="4.153125" y1="13.91625" x2="4.1275" y2="13.890625" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$3">
-<via x="4.445" y="12.065" extent="1-16" drill="0.3048"/>
-<wire x1="4.54375" y1="11.96625" x2="4.445" y2="12.065" width="0.2032" layer="16"/>
+<via x="3.175" y="12.065" extent="1-16" drill="0.3048"/>
+<wire x1="3.27375" y1="11.96625" x2="3.175" y2="12.065" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="4"/>
-<wire x1="4.54375" y1="11.96625" x2="8.335" y2="11.96625" width="0.2032" layer="16"/>
+<wire x1="3.27375" y1="11.96625" x2="8.335" y2="11.96625" width="0.2032" layer="16"/>
 <contactref element="C3" pad="2"/>
-<wire x1="2.2375" y1="12.065" x2="4.445" y2="12.065" width="0.2032" layer="1"/>
+<wire x1="2.2375" y1="12.065" x2="3.175" y2="12.065" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$4">
-<via x="4.445" y="12.85875" extent="1-16" drill="0.3048"/>
-<wire x1="4.6875" y1="12.61625" x2="4.445" y2="12.85875" width="0.2032" layer="16"/>
+<via x="3.175" y="12.85875" extent="1-16" drill="0.3048"/>
+<wire x1="3.4175" y1="12.61625" x2="3.175" y2="12.85875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="3"/>
-<wire x1="4.6875" y1="12.61625" x2="8.335" y2="12.61625" width="0.2032" layer="16"/>
-<wire x1="4.445" y1="12.85875" x2="1.11125" y2="12.85875" width="0.2032" layer="1"/>
+<wire x1="3.4175" y1="12.61625" x2="8.335" y2="12.61625" width="0.2032" layer="16"/>
+<wire x1="3.175" y1="12.85875" x2="1.11125" y2="12.85875" width="0.2032" layer="1"/>
 <wire x1="1.11125" y1="12.85875" x2="0.9525" y2="12.7" width="0.2032" layer="1"/>
 <wire x1="0.9525" y1="12.7" x2="0.9525" y2="12.08" width="0.2032" layer="1"/>
 <contactref element="C3" pad="1"/>
@@ -2728,7 +2731,7 @@ design rules under a new name.</descript
 <contactref element="C8" pad="2"/>
 <contactref element="C7" pad="1"/>
 <wire x1="22.5425" y1="7.9099" x2="22.54" y2="7.9074" width="0.2032" layer="1"/>
-<via x="3.81" y="11.27125" extent="1-16" drill="0.3048"/>
+<via x="3.175" y="11.27125" extent="1-16" drill="0.3048"/>
 <wire x1="22.5425" y1="7.9099" x2="22.5425" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="22.5425" y1="8.969375" x2="20.558125" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="20.558125" y1="8.969375" x2="19.84375" y2="9.68375" width="0.2032" layer="1"/>
@@ -2739,30 +2742,28 @@ design rules under a new name.</descript
 <contactref element="LCD1" pad="5"/>
 <contactref element="LCD1" pad="7"/>
 <wire x1="8.335" y1="10.01625" x2="8.35" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="3.855" y1="11.31625" x2="8.335" y2="11.31625" width="0.2032" layer="16"/>
+<wire x1="3.22" y1="11.31625" x2="8.335" y2="11.31625" width="0.2032" layer="16"/>
 <contactref element="C1" pad="1"/>
 <contactref element="C2" pad="1"/>
 <contactref element="C6" pad="1"/>
 <contactref element="RA1" pad="C1B"/>
 <contactref element="RA1" pad="C2B"/>
-<via x="4.60375" y="10.00125" extent="1-16" drill="0.3048"/>
-<wire x1="10.16" y1="8.09625" x2="10.16" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="8.35" y1="10.00125" x2="10.16" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="2.3625" y1="10.725" x2="3.26375" y2="10.725" width="0.2032" layer="1"/>
-<wire x1="3.26375" y1="10.725" x2="3.81" y2="11.27125" width="0.2032" layer="1"/>
-<wire x1="10.16" y1="10.00125" x2="10.16" y2="11.31625" width="0.2032" layer="16"/>
+<via x="3.33375" y="10.00125" extent="1-16" drill="0.3048"/>
+<wire x1="10.795" y1="8.016875" x2="10.795" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="8.35" y1="10.00125" x2="10.795" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="2.3625" y1="10.725" x2="2.62875" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="2.62875" y1="10.725" x2="3.175" y2="11.27125" width="0.2032" layer="1"/>
+<wire x1="10.795" y1="10.00125" x2="10.16" y2="11.31625" width="0.2032" layer="16"/>
 <wire x1="8.335" y1="11.31625" x2="10.16" y2="11.31625" width="0.2032" layer="16"/>
 <wire x1="18.494375" y1="11.58875" x2="18.494375" y2="12.3675" width="0.2032" layer="1"/>
 <wire x1="18.494375" y1="12.3675" x2="18.479375" y2="12.3825" width="0.2032" layer="1"/>
 <wire x1="18.479375" y1="12.3825" x2="17.859375" y2="12.3825" width="0.2032" layer="1"/>
 <wire x1="17.859375" y1="12.3825" x2="17.383125" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="10.16" y1="11.31625" x2="10.16" y2="11.826875" width="0.2032" layer="16"/>
-<wire x1="10.16" y1="11.826875" x2="11.350625" y2="14.9225" width="0.2032" layer="16"/>
 <wire x1="8.335" y1="10.01625" x2="4.61875" y2="10.01625" width="0.2032" layer="16"/>
-<wire x1="4.61875" y1="10.01625" x2="4.60375" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="2.3625" y1="9.925" x2="4.5275" y2="9.925" width="0.2032" layer="1"/>
-<wire x1="4.5275" y1="9.925" x2="4.60375" y2="10.00125" width="0.2032" layer="1"/>
-<wire x1="3.855" y1="11.31625" x2="3.81" y2="11.27125" width="0.2032" layer="16"/>
+<wire x1="4.61875" y1="10.01625" x2="3.33375" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="2.3625" y1="9.925" x2="3.2575" y2="9.925" width="0.2032" layer="1"/>
+<wire x1="3.2575" y1="9.925" x2="3.33375" y2="10.00125" width="0.2032" layer="1"/>
+<wire x1="3.22" y1="11.31625" x2="3.175" y2="11.27125" width="0.2032" layer="16"/>
 <contactref element="U3" pad="4"/>
 <wire x1="22.24" y1="6.588125" x2="22.24" y2="6.6825" width="0.2032" layer="1"/>
 <wire x1="22.24" y1="6.6825" x2="22.463125" y2="6.905625" width="0.2032" layer="1"/>
@@ -2777,12 +2778,26 @@ design rules under a new name.</descript
 <contactref element="U$8" pad="1"/>
 <contactref element="U$8" pad="5"/>
 <contactref element="U$8" pad="17"/>
-<wire x1="11.350625" y1="14.9225" x2="7.79375" y2="14.366875" width="0" layer="19" extent="1-16"/>
-<wire x1="11.03" y1="13.625" x2="11.350625" y2="14.9225" width="0" layer="19" extent="1-16"/>
-<wire x1="14.23" y1="13.625" x2="7.79375" y2="14.366875" width="0" layer="19" extent="1-1"/>
-<wire x1="8.63" y1="5.425" x2="10.16" y2="8.09625" width="0" layer="19" extent="1-16"/>
-<wire x1="17.383125" y1="12.85875" x2="14.23" y2="13.625" width="0" layer="19" extent="1-1"/>
-<wire x1="7.15875" y1="5.08" x2="8.63" y2="5.425" width="0" layer="19" extent="1-1"/>
+<wire x1="17.383125" y1="12.85875" x2="14.525625" y2="12.85875" width="0.2032" layer="1"/>
+<wire x1="8.63" y1="5.425" x2="8.63" y2="6.169375" width="0.2032" layer="1"/>
+<wire x1="8.63" y1="6.169375" x2="10.795" y2="8.016875" width="0.2032" layer="1"/>
+<via x="10.795" y="8.016875" extent="1-16" drill="0.3048"/>
+<wire x1="7.15875" y1="5.08" x2="8.285" y2="5.08" width="0.2032" layer="1"/>
+<wire x1="8.285" y1="5.08" x2="8.63" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="14.23" y1="13.625" x2="14.23" y2="14.6625" width="0.2032" layer="1"/>
+<wire x1="14.23" y1="14.6625" x2="14.049375" y2="14.843125" width="0.2032" layer="1"/>
+<wire x1="14.049375" y1="14.843125" x2="11.03" y2="14.843125" width="0.2032" layer="1"/>
+<wire x1="11.03" y1="14.843125" x2="8.27" y2="14.843125" width="0.2032" layer="1"/>
+<wire x1="8.27" y1="14.843125" x2="7.79375" y2="14.366875" width="0.2032" layer="1"/>
+<wire x1="11.03" y1="13.625" x2="11.03" y2="14.843125" width="0.2032" layer="1"/>
+<wire x1="10.16" y1="11.31625" x2="10.16" y2="11.58875" width="0.2032" layer="16"/>
+<wire x1="10.16" y1="11.58875" x2="11.033125" y2="12.461875" width="0.2032" layer="16"/>
+<via x="11.033125" y="12.461875" extent="1-16" drill="0.3048"/>
+<wire x1="11.033125" y1="12.461875" x2="11.033125" y2="13.621875" width="0.2032" layer="1"/>
+<wire x1="11.033125" y1="13.621875" x2="11.03" y2="13.625" width="0.2032" layer="1"/>
+<wire x1="14.525625" y1="12.85875" x2="14.366875" y2="13.0175" width="0.2032" layer="1"/>
+<wire x1="14.366875" y1="13.0175" x2="14.366875" y2="13.488125" width="0.2032" layer="1"/>
+<wire x1="14.366875" y1="13.488125" x2="14.23" y2="13.625" width="0.2032" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="JP2" pad="P1"/>
@@ -2815,33 +2830,32 @@ design rules under a new name.</descript
 <via x="32.54375" y="9.128125" extent="1-16" drill="0.3048"/>
 <wire x1="20.16125" y1="10.080625" x2="31.59125" y2="10.080625" width="0.2032" layer="16"/>
 <wire x1="20.16125" y1="10.080625" x2="19.84375" y2="9.763125" width="0.2032" layer="16"/>
-<wire x1="19.84375" y1="9.763125" x2="18.335625" y2="9.763125" width="0.2032" layer="16"/>
-<via x="18.335625" y="9.763125" extent="1-16" drill="0.3048"/>
-<wire x1="18.00625" y1="9.43375" x2="18.335625" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="19.84375" y1="9.763125" x2="18.0975" y2="9.763125" width="0.2032" layer="16"/>
+<via x="18.0975" y="9.763125" extent="1-16" drill="0.3048"/>
 <wire x1="31.58391875" y1="8.16381875" x2="32.54375" y2="9.12365" width="0.2032" layer="1"/>
 <wire x1="32.54375" y1="9.12365" x2="32.54375" y2="9.128125" width="0.2032" layer="1"/>
 <wire x1="31.59125" y1="10.080625" x2="32.54375" y2="9.128125" width="0.2032" layer="16"/>
 <contactref element="U$8" pad="28"/>
-<wire x1="15.53" y1="9.125" x2="18.00625" y2="9.43375" width="0" layer="19" extent="1-1"/>
+<wire x1="15.53" y1="9.125" x2="16.4275" y2="9.125" width="0.2032" layer="1"/>
+<wire x1="16.4275" y1="9.125" x2="17.065625" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="17.065625" y1="9.763125" x2="18.0975" y2="9.763125" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-C">
 <contactref element="SW1" pad="3"/>
 <wire x1="33.56381875" y1="6.18391875" x2="33.48891875" y2="6.18391875" width="0.2032" layer="1"/>
 <via x="34.6075" y="7.14375" extent="1-16" drill="0.3048"/>
-<wire x1="19.605625" y1="8.41375" x2="20.47875" y2="9.286875" width="0.2032" layer="16"/>
+<wire x1="19.685" y1="8.493125" x2="20.47875" y2="9.286875" width="0.2032" layer="16"/>
 <wire x1="20.47875" y1="9.286875" x2="30.63875" y2="9.286875" width="0.2032" layer="16"/>
-<wire x1="19.605625" y1="8.41375" x2="18.89125" y2="8.41375" width="0.2032" layer="16"/>
-<via x="18.89125" y="8.41375" extent="1-16" drill="0.3048"/>
-<wire x1="18.768125" y1="8.536875" x2="18.89125" y2="8.41375" width="0.2032" layer="1"/>
-<wire x1="17.4825" y1="8.43375" x2="17.541875" y2="8.493125" width="0.2032" layer="1"/>
-<wire x1="17.541875" y1="8.493125" x2="18.811875" y2="8.493125" width="0.2032" layer="1"/>
-<wire x1="18.811875" y1="8.493125" x2="18.89125" y2="8.41375" width="0.2032" layer="1"/>
+<wire x1="19.685" y1="8.493125" x2="18.0975" y2="8.493125" width="0.2032" layer="16"/>
+<via x="18.0975" y="8.493125" extent="1-16" drill="0.3048"/>
 <wire x1="33.56381875" y1="6.18391875" x2="33.64766875" y2="6.18391875" width="0.2032" layer="1"/>
 <wire x1="33.64766875" y1="6.18391875" x2="34.6075" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="30.63875" y1="9.286875" x2="32.781875" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="32.781875" y1="7.14375" x2="34.6075" y2="7.14375" width="0.2032" layer="16"/>
 <contactref element="U$8" pad="26"/>
-<wire x1="15.53" y1="7.525" x2="17.4825" y2="8.43375" width="0" layer="19" extent="1-1"/>
+<wire x1="15.53" y1="7.525" x2="16.415" y2="7.525" width="0.2032" layer="1"/>
+<wire x1="16.415" y1="7.525" x2="17.383125" y2="8.493125" width="0.2032" layer="1"/>
+<wire x1="17.383125" y1="8.493125" x2="18.0975" y2="8.493125" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-B">
 <contactref element="SW1" pad="4"/>
@@ -2854,39 +2868,37 @@ design rules under a new name.</descript
 <wire x1="33.49625" y1="11.826875" x2="35.2425" y2="11.826875" width="0.2032" layer="16"/>
 <wire x1="20.0025" y1="10.874375" x2="19.84375" y2="11.033125" width="0.2032" layer="16"/>
 <wire x1="19.84375" y1="11.033125" x2="18.0975" y2="11.033125" width="0.2032" layer="16"/>
-<wire x1="17.498125" y1="10.43375" x2="18.0975" y2="11.033125" width="0.2032" layer="1"/>
 <contactref element="U$8" pad="30"/>
-<wire x1="15.53" y1="10.725" x2="17.498125" y2="10.43375" width="0" layer="19" extent="1-1"/>
+<wire x1="18.0975" y1="11.033125" x2="16.748125" y2="11.033125" width="0.2032" layer="1"/>
+<wire x1="16.748125" y1="11.033125" x2="16.44" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="15.53" y1="10.725" x2="16.44" y2="10.725" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-D">
 <contactref element="SW1" pad="6"/>
 <via x="37.30625" y="9.921875" extent="1-16" drill="0.3048"/>
 <wire x1="20.0025" y1="10.4775" x2="32.623125" y2="10.4775" width="0.2032" layer="16"/>
 <wire x1="19.764375" y1="10.239375" x2="20.0025" y2="10.4775" width="0.2032" layer="16"/>
-<wire x1="19.764375" y1="10.239375" x2="18.970625" y2="10.239375" width="0.2032" layer="16"/>
-<wire x1="18.970625" y1="10.239375" x2="18.811875" y2="10.398125" width="0.2032" layer="16"/>
-<via x="18.811875" y="10.398125" extent="1-16" drill="0.3048"/>
-<wire x1="18.811875" y1="10.398125" x2="18.176875" y2="10.398125" width="0.2032" layer="1"/>
-<wire x1="18.176875" y1="10.398125" x2="17.7125" y2="9.93375" width="0.2032" layer="1"/>
+<wire x1="19.764375" y1="10.239375" x2="18.89125" y2="10.239375" width="0.2032" layer="16"/>
+<wire x1="18.89125" y1="10.239375" x2="18.7325" y2="10.398125" width="0.2032" layer="16"/>
+<via x="18.7325" y="10.398125" extent="1-16" drill="0.3048"/>
 <wire x1="38.266078125" y1="10.886178125" x2="38.266078125" y2="10.881703125" width="0.2032" layer="1"/>
 <wire x1="38.266078125" y1="10.881703125" x2="37.30625" y2="9.921875" width="0.2032" layer="1"/>
 <wire x1="32.623125" y1="10.4775" x2="33.17875" y2="9.921875" width="0.2032" layer="16"/>
 <wire x1="33.17875" y1="9.921875" x2="37.30625" y2="9.921875" width="0.2032" layer="16"/>
 <contactref element="U$8" pad="29"/>
-<wire x1="15.53" y1="9.925" x2="17.7125" y2="9.93375" width="0" layer="19" extent="1-1"/>
+<wire x1="15.53" y1="9.925" x2="16.43375" y2="9.925" width="0.2032" layer="1"/>
+<wire x1="18.7325" y1="10.398125" x2="16.906875" y2="10.398125" width="0.2032" layer="1"/>
+<wire x1="16.906875" y1="10.398125" x2="16.43375" y2="9.925" width="0.2032" layer="1"/>
 </signal>
 <signal name="D+">
 <contactref element="J2" pad="D+"/>
 <wire x1="24.13" y1="6.429375" x2="24.13" y2="5.731878125" width="0.2032" layer="1"/>
 <wire x1="24.13" y1="5.731878125" x2="23.319371875" y2="4.92125" width="0.2032" layer="1"/>
-<wire x1="23.319371875" y1="4.92125" x2="18.418125" y2="4.92125" width="0.2032" layer="1"/>
+<wire x1="23.319371875" y1="4.92125" x2="18.18" y2="4.92125" width="0.2032" layer="1"/>
 <contactref element="J1" pad="5"/>
-<wire x1="17.700625" y1="4.683125" x2="17.700625" y2="5.63875" width="0.2032" layer="16"/>
-<via x="17.700625" y="5.63875" extent="1-16" drill="0.3048"/>
-<wire x1="18.418125" y1="4.92125" x2="17.700625" y2="5.63875" width="0.2032" layer="1"/>
-<wire x1="17.700625" y1="5.63875" x2="17.38625" y2="5.953125" width="0.2032" layer="1"/>
-<wire x1="17.38625" y1="5.953125" x2="15.636875" y2="5.953125" width="0.2032" layer="1"/>
-<wire x1="15.636875" y1="5.953125" x2="15.275625" y2="6.314375" width="0.2032" layer="1"/>
+<wire x1="17.700625" y1="4.683125" x2="17.700625" y2="5.400625" width="0.2032" layer="16"/>
+<via x="17.700625" y="5.400625" extent="1-16" drill="0.3048"/>
+<wire x1="18.18" y1="4.92125" x2="17.700625" y2="5.400625" width="0.2032" layer="1"/>
 <via x="39.0525" y="9.50824375" extent="1-16" drill="0.3048"/>
 <via x="24.13" y="6.429375" extent="1-16" drill="0.3048"/>
 <wire x1="39.0525" y1="9.50824375" x2="41.14824375" y2="9.50824375" width="0.2032" layer="1"/>
@@ -2895,28 +2907,34 @@ design rules under a new name.</descript
 <wire x1="36.67125" y1="6.429375" x2="39.0525" y2="8.810625" width="0.2032" layer="16"/>
 <wire x1="39.0525" y1="8.810625" x2="39.0525" y2="9.50824375" width="0.2032" layer="16"/>
 <contactref element="U$8" pad="22"/>
-<wire x1="12.63" y1="5.425" x2="15.275625" y2="6.314375" width="0" layer="19" extent="1-1"/>
+<wire x1="17.700625" y1="5.400625" x2="17.70375" y2="5.400625" width="0.2032" layer="16"/>
+<wire x1="17.70375" y1="5.400625" x2="17.62125" y2="5.476875" width="0.2032" layer="16"/>
+<wire x1="17.62125" y1="5.476875" x2="13.97" y2="5.476875" width="0.2032" layer="16"/>
+<via x="12.620625" y="6.82625" extent="1-16" drill="0.3048"/>
+<wire x1="12.620625" y1="6.82625" x2="12.620625" y2="5.434375" width="0.2032" layer="1"/>
+<wire x1="12.620625" y1="5.434375" x2="12.63" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="13.97" y1="5.476875" x2="12.620625" y2="6.82625" width="0.2032" layer="16"/>
 </signal>
 <signal name="D-">
 <contactref element="J2" pad="D-"/>
 <contactref element="J1" pad="6"/>
 <via x="15.39875" y="4.683125" extent="1-16" drill="0.3048"/>
-<wire x1="14.775625" y1="6.179375" x2="15.39875" y2="5.55625" width="0.2032" layer="1"/>
 <wire x1="16.430625" y1="4.683125" x2="15.39875" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="17.93875" y1="4.524375" x2="16.906875" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="16.906875" y1="5.55625" x2="15.39875" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="15.39875" y1="5.55625" x2="15.39875" y2="4.683125" width="0.2032" layer="1"/>
 <via x="39.6875" y="8.89" extent="1-16" drill="0.3048"/>
 <wire x1="36.83" y1="6.0325" x2="25.0825" y2="6.0325" width="0.2032" layer="16"/>
 <wire x1="25.0825" y1="6.0325" x2="24.765" y2="5.715" width="0.2032" layer="16"/>
 <via x="24.765" y="5.715" extent="1-16" drill="0.3048"/>
-<wire x1="17.93875" y1="4.524375" x2="23.574375" y2="4.524375" width="0.2032" layer="1"/>
+<wire x1="15.5575" y1="4.524375" x2="23.574375" y2="4.524375" width="0.2032" layer="1"/>
 <wire x1="23.574375" y1="4.524375" x2="24.765" y2="5.715" width="0.2032" layer="1"/>
 <wire x1="39.6875" y1="8.89" x2="41.15" y2="8.89" width="0.2032" layer="1"/>
 <wire x1="41.15" y1="8.89" x2="41.165" y2="8.875" width="0.2032" layer="1"/>
 <wire x1="36.83" y1="6.0325" x2="39.6875" y2="8.89" width="0.2032" layer="16"/>
 <contactref element="U$8" pad="21"/>
-<wire x1="11.83" y1="5.425" x2="14.775625" y2="6.179375" width="0" layer="19" extent="1-1"/>
+<wire x1="15.5575" y1="4.524375" x2="15.39875" y2="4.683125" width="0.2032" layer="1"/>
+<wire x1="11.83" y1="5.425" x2="11.83" y2="4.52125" width="0.2032" layer="1"/>
+<wire x1="11.83" y1="4.52125" x2="12.065" y2="4.28625" width="0.2032" layer="1"/>
+<wire x1="12.065" y1="4.28625" x2="15.001875" y2="4.28625" width="0.2032" layer="1"/>
+<wire x1="15.001875" y1="4.28625" x2="15.39875" y2="4.683125" width="0.2032" layer="1"/>
 </signal>
 <signal name="VUSB">
 <contactref element="J2" pad="VBUS"/>
@@ -2940,10 +2958,13 @@ design rules under a new name.</descript
 </signal>
 <signal name="SSR+">
 <contactref element="JP3" pad="P1"/>
-<wire x1="15.875" y1="13.97" x2="14.44625" y2="13.97" width="0.2032" layer="16"/>
-<wire x1="14.44625" y1="13.97" x2="13.335" y2="12.85875" width="0.2032" layer="16"/>
 <contactref element="U$8" pad="7"/>
-<wire x1="9.43" y1="13.625" x2="13.335" y2="12.85875" width="0" layer="19" extent="1-16"/>
+<wire x1="9.43" y1="13.625" x2="9.43" y2="12.16" width="0.2032" layer="1"/>
+<wire x1="9.43" y1="12.16" x2="9.763125" y2="11.826875" width="0.2032" layer="1"/>
+<wire x1="9.763125" y1="11.826875" x2="12.779375" y2="11.826875" width="0.2032" layer="1"/>
+<via x="12.779375" y="11.826875" extent="1-16" drill="0.3048"/>
+<wire x1="15.875" y1="13.97" x2="14.9225" y2="13.97" width="0.2032" layer="16"/>
+<wire x1="14.9225" y1="13.97" x2="12.779375" y2="11.826875" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$23">
 <contactref element="LED1" pad="A"/>
@@ -2958,36 +2979,41 @@ design rules under a new name.</descript
 <via x="41.195625" y="12.85875" extent="1-16" drill="0.3048"/>
 <wire x1="19.764375" y1="11.668125" x2="17.62125" y2="11.668125" width="0.2032" layer="16"/>
 <via x="17.62125" y="11.668125" extent="1-16" drill="0.3048"/>
-<wire x1="17.62125" y1="11.668125" x2="17.145" y2="11.668125" width="0.2032" layer="1"/>
-<wire x1="17.145" y1="11.668125" x2="16.875625" y2="11.39875" width="0.2032" layer="1"/>
 <wire x1="40.005" y1="13.0025" x2="40.02" y2="13.0175" width="0.2032" layer="1"/>
 <wire x1="41.195625" y1="12.85875" x2="33.9725" y2="12.85875" width="0.2032" layer="16"/>
 <wire x1="33.9725" y1="12.85875" x2="32.385" y2="11.27125" width="0.2032" layer="16"/>
 <wire x1="41.195625" y1="12.85875" x2="40.17875" y2="12.85875" width="0.2032" layer="1"/>
 <wire x1="40.17875" y1="12.85875" x2="40.02" y2="13.0175" width="0.2032" layer="1"/>
 <contactref element="U$8" pad="31"/>
-<wire x1="15.53" y1="11.525" x2="16.875625" y2="11.39875" width="0" layer="19" extent="1-1"/>
+<wire x1="15.53" y1="11.525" x2="17.478125" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="17.478125" y1="11.525" x2="17.62125" y2="11.668125" width="0.2032" layer="1"/>
 </signal>
 <signal name="!RES">
-<via x="5.715" y="8.41375" extent="1-16" drill="0.3048"/>
+<via x="4.445" y="8.41375" extent="1-16" drill="0.3048"/>
 <wire x1="8.32" y1="8.73125" x2="8.255" y2="8.73125" width="0.2032" layer="16"/>
-<wire x1="8.255" y1="8.73125" x2="5.87375" y2="8.73125" width="0.2032" layer="16"/>
-<wire x1="5.87375" y1="8.73125" x2="5.715" y2="8.5725" width="0.2032" layer="16"/>
-<wire x1="5.715" y1="8.5725" x2="5.715" y2="8.41375" width="0.2032" layer="16"/>
+<wire x1="8.255" y1="8.73125" x2="4.60375" y2="8.73125" width="0.2032" layer="16"/>
+<wire x1="4.60375" y1="8.73125" x2="4.445" y2="8.5725" width="0.2032" layer="16"/>
+<wire x1="4.445" y1="8.5725" x2="4.445" y2="8.41375" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="9"/>
 <wire x1="8.335" y1="8.71625" x2="8.27" y2="8.71625" width="0.2032" layer="16"/>
 <wire x1="8.27" y1="8.71625" x2="8.255" y2="8.73125" width="0.2032" layer="16"/>
-<wire x1="5.794375" y1="8.493125" x2="5.715" y2="8.41375" width="0.2032" layer="1"/>
 <contactref element="U$8" pad="9"/>
-<wire x1="8.255" y1="8.73125" x2="7.33" y2="12.325" width="0" layer="19" extent="1-16"/>
+<wire x1="7.33" y1="12.325" x2="5.975" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="5.975" y1="12.325" x2="5.08" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="5.08" y1="11.43" x2="5.08" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="5.08" y1="8.73125" x2="4.7625" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="4.7625" y1="8.73125" x2="4.445" y2="8.41375" width="0.2032" layer="1"/>
 </signal>
 <signal name="D/!C">
-<via x="6.50875" y="8.09625" extent="1-16" drill="0.3048"/>
-<wire x1="6.53875" y1="8.06625" x2="6.50875" y2="8.09625" width="0.2032" layer="16"/>
+<via x="5.23875" y="8.09625" extent="1-16" drill="0.3048"/>
+<wire x1="5.26875" y1="8.06625" x2="5.23875" y2="8.09625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="10"/>
-<wire x1="8.335" y1="8.06625" x2="6.53875" y2="8.06625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="8.06625" x2="5.26875" y2="8.06625" width="0.2032" layer="16"/>
 <contactref element="U$8" pad="10"/>
-<wire x1="6.50875" y1="8.09625" x2="7.33" y2="11.525" width="0" layer="19" extent="1-1"/>
+<wire x1="7.33" y1="11.525" x2="5.81" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="5.81" y1="11.525" x2="5.476875" y2="11.191875" width="0.2032" layer="1"/>
+<wire x1="5.476875" y1="11.191875" x2="5.476875" y2="8.334375" width="0.2032" layer="1"/>
+<wire x1="5.476875" y1="8.334375" x2="5.23875" y2="8.09625" width="0.2032" layer="1"/>
 </signal>
 <signal name="T-">
 <contactref element="JP4" pad="P2"/>
@@ -3015,78 +3041,91 @@ design rules under a new name.</descript
 <wire x1="30.7975" y1="9.68375" x2="32.305625" y2="8.175625" width="0.2032" layer="16"/>
 <wire x1="33.575625" y1="8.175625" x2="32.57386875" y2="7.17386875" width="0.2032" layer="1"/>
 <wire x1="20.32" y1="9.68375" x2="19.764375" y2="9.128125" width="0.2032" layer="16"/>
-<wire x1="19.764375" y1="9.128125" x2="19.288125" y2="9.128125" width="0.2032" layer="16"/>
-<via x="19.288125" y="9.128125" extent="1-16" drill="0.3048"/>
-<wire x1="18.3" y1="8.93375" x2="18.494375" y2="9.128125" width="0.2032" layer="1"/>
-<wire x1="18.494375" y1="9.128125" x2="19.288125" y2="9.128125" width="0.2032" layer="1"/>
+<wire x1="19.764375" y1="9.128125" x2="18.653125" y2="9.128125" width="0.2032" layer="16"/>
+<via x="18.653125" y="9.128125" extent="1-16" drill="0.3048"/>
 <contactref element="U$8" pad="27"/>
-<wire x1="15.53" y1="8.325" x2="18.3" y2="8.93375" width="0" layer="19" extent="1-1"/>
+<wire x1="15.53" y1="8.325" x2="16.42125" y2="8.325" width="0.2032" layer="1"/>
+<wire x1="16.42125" y1="8.325" x2="17.224375" y2="9.128125" width="0.2032" layer="1"/>
+<wire x1="17.224375" y1="9.128125" x2="18.653125" y2="9.128125" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MOSI">
-<via x="6.50875" y="6.746875" extent="1-16" drill="0.3048"/>
+<via x="5.953125" y="6.746875" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="12"/>
-<wire x1="8.335" y1="6.76625" x2="6.528125" y2="6.76625" width="0.2032" layer="16"/>
-<wire x1="6.528125" y1="6.76625" x2="6.50875" y2="6.746875" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="6.76625" x2="5.9725" y2="6.76625" width="0.2032" layer="16"/>
+<wire x1="5.9725" y1="6.76625" x2="5.953125" y2="6.746875" width="0.2032" layer="16"/>
 <contactref element="U$8" pad="13"/>
-<wire x1="6.528125" y1="6.76625" x2="7.33" y2="9.125" width="0" layer="19" extent="1-16"/>
+<wire x1="7.33" y1="9.125" x2="6.2675" y2="9.125" width="0.2032" layer="1"/>
+<wire x1="6.2675" y1="9.125" x2="5.953125" y2="8.810625" width="0.2032" layer="1"/>
+<wire x1="5.953125" y1="8.810625" x2="5.953125" y2="6.746875" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MISO">
 <contactref element="U3" pad="7"/>
 <wire x1="28.09875" y1="5.306875" x2="28.09875" y2="8.651875" width="0.2032" layer="1"/>
 <via x="28.09875" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="26.114375" y1="8.493125" x2="20.79625" y2="8.493125" width="0.2032" layer="16"/>
-<wire x1="20.79625" y1="8.493125" x2="19.52625" y2="7.223125" width="0.2032" layer="16"/>
-<wire x1="19.52625" y1="7.223125" x2="13.05498125" y2="7.223125" width="0.2032" layer="16"/>
-<wire x1="13.05498125" y1="7.223125" x2="11.191875" y2="9.08623125" width="0.2032" layer="16"/>
 <wire x1="26.114375" y1="8.493125" x2="26.590625" y2="8.016875" width="0.2032" layer="16"/>
 <wire x1="26.590625" y1="8.016875" x2="27.46375" y2="8.016875" width="0.2032" layer="16"/>
 <wire x1="27.46375" y1="8.016875" x2="28.09875" y2="8.651875" width="0.2032" layer="16"/>
-<wire x1="11.52125" y1="9.93375" x2="11.191875" y2="9.604375" width="0.2032" layer="1"/>
-<wire x1="11.191875" y1="9.08623125" x2="11.191875" y2="9.604375" width="0.2032" layer="16"/>
 <contactref element="U$8" pad="12"/>
-<wire x1="11.191875" y1="9.604375" x2="11.191875" y2="9.604375" width="0" layer="19" extent="1-16"/>
-<wire x1="7.33" y1="9.925" x2="11.191875" y2="9.604375" width="0" layer="19" extent="1-1"/>
+<via x="11.90625" y="9.921875" extent="1-16" drill="0.3048"/>
+<wire x1="7.33" y1="9.925" x2="11.268125" y2="9.925" width="0.2032" layer="1"/>
+<wire x1="11.268125" y1="9.925" x2="11.90625" y2="9.921875" width="0.2032" layer="1"/>
+<wire x1="17.224375" y1="7.223125" x2="14.525625" y2="9.921875" width="0.2032" layer="16"/>
+<wire x1="14.525625" y1="9.921875" x2="11.90625" y2="9.921875" width="0.2032" layer="16"/>
+<wire x1="17.224375" y1="7.223125" x2="19.52625" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="19.52625" y1="7.223125" x2="20.79625" y2="8.493125" width="0.2032" layer="16"/>
 </signal>
 <signal name="SPI_SCK">
-<via x="6.0325" y="7.46125" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="11"/>
 <contactref element="U3" pad="5"/>
 <via x="25.55875" y="7.77875" extent="1-16" drill="0.3048"/>
-<wire x1="12.852859375" y1="6.82625" x2="19.685" y2="6.82625" width="0.2032" layer="16"/>
-<wire x1="19.685" y1="6.82625" x2="20.955" y2="8.09625" width="0.2032" layer="16"/>
 <wire x1="20.955" y1="8.09625" x2="25.24125" y2="8.09625" width="0.2032" layer="16"/>
 <wire x1="25.24125" y1="8.09625" x2="25.55875" y2="7.77875" width="0.2032" layer="16"/>
 <wire x1="25.55875" y1="5.306875" x2="25.55875" y2="7.77875" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="7.41625" x2="6.0775" y2="7.41625" width="0.2032" layer="16"/>
-<wire x1="6.0775" y1="7.41625" x2="6.0325" y2="7.46125" width="0.2032" layer="16"/>
-<wire x1="6.0775" y1="7.41625" x2="6.0325" y2="7.46125" width="0.2032" layer="1"/>
-<wire x1="10.556875" y1="10.080625" x2="10.795" y2="10.31875" width="0.2032" layer="16"/>
-<wire x1="12.852859375" y1="6.82625" x2="10.556875" y2="9.122234375" width="0.2032" layer="16"/>
-<wire x1="10.556875" y1="9.122234375" x2="10.556875" y2="10.080625" width="0.2032" layer="16"/>
+<wire x1="11.191875" y1="8.566609375" x2="11.191875" y2="9.2075" width="0.2032" layer="16"/>
 <contactref element="U$8" pad="11"/>
-<wire x1="8.335" y1="7.41625" x2="10.556875" y2="9.122234375" width="0" layer="19" extent="16-16"/>
-<wire x1="7.33" y1="10.725" x2="10.556875" y2="10.080625" width="0" layer="19" extent="1-16"/>
+<via x="11.90625" y="10.795" extent="1-16" drill="0.3048"/>
+<wire x1="11.191875" y1="9.2075" x2="11.191875" y2="10.080625" width="0.2032" layer="16"/>
+<wire x1="7.33" y1="10.725" x2="11.83625" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="11.191875" y1="10.080625" x2="11.90625" y2="10.795" width="0.2032" layer="16"/>
+<wire x1="11.83625" y1="10.725" x2="11.90625" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="17.065625" y1="6.82625" x2="14.366875" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="7.41625" x2="11.22625" y2="7.41625" width="0.2032" layer="16"/>
+<wire x1="11.22625" y1="7.41625" x2="11.509375" y2="7.699375" width="0.2032" layer="16"/>
+<wire x1="11.509375" y1="7.699375" x2="11.509375" y2="8.249109375" width="0.2032" layer="16"/>
+<wire x1="11.509375" y1="8.249109375" x2="11.191875" y2="8.566609375" width="0.2032" layer="16"/>
+<wire x1="17.065625" y1="6.82625" x2="19.685" y2="6.82625" width="0.2032" layer="16"/>
+<wire x1="19.685" y1="6.82625" x2="20.955" y2="8.09625" width="0.2032" layer="16"/>
+<wire x1="14.366875" y1="9.525" x2="12.620625" y2="9.525" width="0.2032" layer="16"/>
+<wire x1="12.620625" y1="9.525" x2="12.303125" y2="9.2075" width="0.2032" layer="16"/>
+<wire x1="12.303125" y1="9.2075" x2="11.191875" y2="9.2075" width="0.2032" layer="16"/>
 </signal>
 <signal name="!CS_OLED">
 <contactref element="LCD1" pad="8"/>
-<via x="5.159375" y="9.36625" extent="1-16" drill="0.3048"/>
-<wire x1="8.335" y1="9.36625" x2="5.159375" y2="9.36625" width="0.2032" layer="16"/>
 <contactref element="U$8" pad="8"/>
-<wire x1="8.335" y1="9.36625" x2="8.63" y2="13.625" width="0" layer="19" extent="1-16"/>
+<wire x1="8.63" y1="13.625" x2="8.63" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="8.63" y1="12.325" x2="9.525" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="9.525" y1="11.43" x2="12.065" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="12.065" y1="11.43" x2="12.7" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="12.7" y1="10.795" x2="12.7" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="12.7" y1="9.763125" x2="12.22375" y2="9.286875" width="0.2032" layer="1"/>
+<wire x1="12.22375" y1="9.286875" x2="10.16" y2="9.286875" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="9.36625" x2="10.080625" y2="9.36625" width="0.2032" layer="16"/>
+<wire x1="10.080625" y1="9.36625" x2="10.16" y2="9.286875" width="0.2032" layer="16"/>
+<via x="10.16" y="9.286875" extent="1-16" drill="0.3048"/>
 </signal>
 <signal name="!CS_MAX">
 <contactref element="U3" pad="6"/>
-<wire x1="19.52625" y1="7.77875" x2="20.6375" y2="8.89" width="0.2032" layer="16"/>
+<wire x1="19.605625" y1="7.858125" x2="20.6375" y2="8.89" width="0.2032" layer="16"/>
 <via x="26.82875" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="26.82875" y1="8.651875" x2="26.82875" y2="5.306875" width="0.2032" layer="1"/>
-<wire x1="19.52625" y1="7.77875" x2="18.0975" y2="7.77875" width="0.2032" layer="16"/>
-<wire x1="18.0975" y1="7.77875" x2="18.018125" y2="7.858125" width="0.2032" layer="16"/>
-<via x="18.018125" y="7.858125" extent="1-16" drill="0.3048"/>
-<wire x1="17.9425" y1="7.93375" x2="18.018125" y2="7.858125" width="0.2032" layer="1"/>
+<wire x1="19.605625" y1="7.858125" x2="17.62125" y2="7.858125" width="0.2032" layer="16"/>
+<via x="17.62125" y="7.858125" extent="1-16" drill="0.3048"/>
 <wire x1="20.6375" y1="8.89" x2="26.590625" y2="8.89" width="0.2032" layer="16"/>
 <wire x1="26.590625" y1="8.89" x2="26.82875" y2="8.651875" width="0.2032" layer="16"/>
 <contactref element="U$8" pad="25"/>
-<wire x1="15.53" y1="6.725" x2="17.9425" y2="7.93375" width="0" layer="19" extent="1-1"/>
+<wire x1="15.53" y1="6.725" x2="16.488125" y2="6.725" width="0.2032" layer="1"/>
+<wire x1="16.488125" y1="6.725" x2="17.62125" y2="7.858125" width="0.2032" layer="1"/>
 </signal>
 <signal name="AUX-TX">
 <contactref element="JP1" pad="P2"/>
@@ -3100,27 +3139,27 @@ design rules under a new name.</descript
 </signal>
 <signal name="SWCLK">
 <contactref element="J1" pad="3"/>
-<via x="20.240625" y="5.635625" extent="1-16" drill="0.3048"/>
 <wire x1="20.32" y1="4.7625" x2="20.240625" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="20.240625" y1="5.635625" x2="20.240625" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="20.240625" y1="5.635625" x2="20.240625" y2="6.111875" width="0.2032" layer="1"/>
-<wire x1="20.240625" y1="6.111875" x2="19.605625" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="19.605625" y1="6.746875" x2="16.430625" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="16.430625" y1="6.746875" x2="16.275625" y2="6.901875" width="0.2032" layer="1"/>
 <contactref element="U$8" pad="24"/>
-<wire x1="14.23" y1="5.425" x2="16.275625" y2="6.901875" width="0" layer="19" extent="1-1"/>
+<wire x1="20.240625" y1="4.683125" x2="20.240625" y2="5.794375" width="0.2032" layer="16"/>
+<wire x1="20.240625" y1="5.794375" x2="19.605625" y2="6.429375" width="0.2032" layer="16"/>
+<wire x1="19.605625" y1="6.429375" x2="14.605" y2="6.429375" width="0.2032" layer="16"/>
+<via x="14.208125" y="6.82625" extent="1-16" drill="0.3048"/>
+<wire x1="14.208125" y1="6.82625" x2="14.208125" y2="5.446875" width="0.2032" layer="1"/>
+<wire x1="14.208125" y1="5.446875" x2="14.23" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="14.605" y1="6.429375" x2="14.208125" y2="6.82625" width="0.2032" layer="16"/>
 </signal>
 <signal name="SWDIO">
 <contactref element="J1" pad="4"/>
-<via x="18.970625" y="5.635625" extent="1-16" drill="0.3048"/>
 <wire x1="19.05" y1="4.7625" x2="18.970625" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="15.775625" y1="6.449375" x2="15.875" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="15.875" y1="6.35" x2="18.811875" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="18.811875" y1="6.35" x2="18.970625" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="18.970625" y1="6.19125" x2="18.970625" y2="5.635625" width="0.2032" layer="1"/>
-<wire x1="18.970625" y1="5.635625" x2="18.970625" y2="4.683125" width="0.2032" layer="16"/>
 <contactref element="U$8" pad="23"/>
-<wire x1="13.43" y1="5.425" x2="15.775625" y2="6.449375" width="0" layer="19" extent="1-1"/>
+<wire x1="18.970625" y1="4.683125" x2="18.970625" y2="5.715" width="0.2032" layer="16"/>
+<wire x1="18.970625" y1="5.715" x2="18.653125" y2="6.0325" width="0.2032" layer="16"/>
+<wire x1="18.653125" y1="6.0325" x2="14.208125" y2="6.0325" width="0.2032" layer="16"/>
+<via x="13.414375" y="6.82625" extent="1-16" drill="0.3048"/>
+<wire x1="13.414375" y1="6.82625" x2="13.414375" y2="5.440625" width="0.2032" layer="1"/>
+<wire x1="13.414375" y1="5.440625" x2="13.43" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="14.208125" y1="6.0325" x2="13.414375" y2="6.82625" width="0.2032" layer="16"/>
 </signal>
 </signals>
 </board>