diff --git a/CAM/zoncoffee.GBL b/CAM/zoncoffee.GBL
--- a/CAM/zoncoffee.GBL
+++ b/CAM/zoncoffee.GBL
@@ -1369,21 +1369,21 @@ X010693Y008393D03*
 X010349Y004800D03*
 X011349Y004800D03*
 D12*
-X007724Y004789D03*
-X007724Y005045D03*
-X007724Y005301D03*
-X007724Y005557D03*
-X007724Y005813D03*
-X007724Y006069D03*
-X007724Y006325D03*
-X007724Y006581D03*
-X007724Y006837D03*
-X007724Y007093D03*
-X007724Y007349D03*
-X007724Y007604D03*
-X007724Y007860D03*
-X007724Y008116D03*
-X007724Y008372D03*
+X007724Y004852D03*
+X007724Y005108D03*
+X007724Y005364D03*
+X007724Y005620D03*
+X007724Y005876D03*
+X007724Y006131D03*
+X007724Y006387D03*
+X007724Y006643D03*
+X007724Y006899D03*
+X007724Y007155D03*
+X007724Y007411D03*
+X007724Y007667D03*
+X007724Y007923D03*
+X007724Y008179D03*
+X007724Y008435D03*
 D13*
 X012162Y004737D03*
 X012662Y004737D03*
@@ -1411,8 +1411,6 @@ X013897Y005020D01*
 X013875Y005042D01*
 X013832Y005042D01*
 X013832Y005089D01*
-X013732Y005188D01*
-X013238Y005682D01*
 X013238Y005682D01*
 X013138Y005782D01*
 X012603Y005782D01*
@@ -1425,6 +1423,7 @@ X014524Y005862D01*
 X014616Y005900D01*
 X014686Y005970D01*
 X014705Y006016D01*
+X014742Y005979D01*
 X014841Y005880D01*
 X015326Y005880D01*
 X015496Y006050D01*
@@ -1461,28 +1460,27 @@ X014015Y005112D01*
 X014029Y005098D01*
 X019013Y005098D01*
 X019113Y005198D01*
-X020058Y006143D01*
-X020118Y006143D01*
-X020209Y006181D01*
-X020280Y006252D01*
-X020318Y006344D01*
-X020318Y006443D01*
-X020280Y006535D01*
-X020209Y006605D01*
-X020118Y006643D01*
-X020068Y006643D01*
-X020068Y006686D01*
-X020030Y006778D01*
-X019959Y006849D01*
-X019868Y006887D01*
-X019768Y006887D01*
-X019676Y006849D01*
-X019606Y006778D01*
-X019568Y006686D01*
-X019568Y006587D01*
-X019606Y006495D01*
-X019648Y006453D01*
-X019648Y006432D01*
+X019708Y005793D01*
+X019768Y005768D01*
+X019868Y005768D01*
+X019959Y005806D01*
+X020030Y005877D01*
+X020068Y005969D01*
+X020068Y006068D01*
+X020030Y006160D01*
+X019959Y006230D01*
+X019868Y006268D01*
+X019818Y006268D01*
+X019818Y006311D01*
+X019780Y006403D01*
+X019709Y006474D01*
+X019618Y006512D01*
+X019518Y006512D01*
+X019426Y006474D01*
+X019356Y006403D01*
+X019318Y006311D01*
+X019318Y006212D01*
+X019350Y006135D01*
 X018810Y005595D01*
 X018292Y005595D01*
 X018318Y005656D01*
@@ -1555,27 +1553,31 @@ X020711Y008206D01*
 X020612Y008206D01*
 X020520Y008168D01*
 X020478Y008126D01*
-X017827Y008126D01*
-X017767Y008133D01*
-X017758Y008126D01*
-X017747Y008126D01*
-X017704Y008083D01*
-X017133Y007626D01*
+X017622Y008126D01*
+X017122Y007626D01*
 X012263Y007626D01*
 X012113Y007776D01*
 X012013Y007876D01*
-X011033Y007876D01*
-X010991Y007918D01*
-X010899Y007956D01*
-X010799Y007956D01*
-X010707Y007918D01*
-X010637Y007847D01*
-X010599Y007756D01*
-X010599Y007656D01*
-X010637Y007564D01*
-X010707Y007494D01*
-X010799Y007456D01*
-X010849Y007456D01*
+X010185Y007876D01*
+X009874Y007565D01*
+X009834Y007605D01*
+X009743Y007643D01*
+X009643Y007643D01*
+X009551Y007605D01*
+X009481Y007535D01*
+X009443Y007443D01*
+X009443Y007344D01*
+X009481Y007252D01*
+X009551Y007181D01*
+X009643Y007143D01*
+X009743Y007143D01*
+X009834Y007181D01*
+X009876Y007223D01*
+X010013Y007223D01*
+X010113Y007323D01*
+X010326Y007536D01*
+X010862Y007536D01*
+X010849Y007506D01*
 X010849Y007406D01*
 X010887Y007314D01*
 X010957Y007244D01*
@@ -1583,42 +1585,47 @@ X011049Y007206D01*
 X011068Y007206D01*
 X011068Y007156D01*
 X011106Y007064D01*
-X011138Y007032D01*
-X009470Y007032D01*
-X009428Y007074D01*
-X009336Y007112D01*
-X009287Y007112D01*
-X009287Y007193D01*
-X009249Y007285D01*
-X009178Y007355D01*
-X009086Y007393D01*
-X008987Y007393D01*
-X008895Y007355D01*
-X008825Y007285D01*
-X008800Y007226D01*
-X008800Y007714D01*
-X008724Y007790D01*
+X011107Y007063D01*
+X009345Y007063D01*
+X009303Y007105D01*
+X009211Y007143D01*
+X009112Y007143D01*
+X009030Y007109D01*
+X009005Y007134D01*
+X009005Y007193D01*
+X008967Y007285D01*
+X008897Y007355D01*
+X008805Y007393D01*
+X008706Y007393D01*
+X008644Y007368D01*
+X008644Y007616D01*
+X008686Y007658D01*
+X008724Y007750D01*
 X008724Y007849D01*
 X008686Y007941D01*
 X008616Y008011D01*
 X008524Y008050D01*
 X008424Y008050D01*
 X008366Y008025D01*
-X008366Y008239D01*
-X008361Y008244D01*
-X008366Y008249D01*
-X008366Y008495D01*
-X008290Y008571D01*
-X007159Y008571D01*
-X007130Y008542D01*
-X006241Y008542D01*
-X006209Y008574D01*
-X006118Y008612D01*
-X006018Y008612D01*
-X005926Y008574D01*
-X005856Y008504D01*
-X005843Y008472D01*
-X005834Y008480D01*
+X008366Y008046D01*
+X008361Y008051D01*
+X008366Y008056D01*
+X008366Y008301D01*
+X008361Y008307D01*
+X008366Y008312D01*
+X008366Y008557D01*
+X008290Y008634D01*
+X007159Y008634D01*
+X007130Y008605D01*
+X006539Y008605D01*
+X006497Y008563D01*
+X006189Y008563D01*
+X006147Y008605D01*
+X006055Y008643D01*
+X005956Y008643D01*
+X005864Y008605D01*
+X005793Y008535D01*
+X005780Y008503D01*
 X005743Y008518D01*
 X005643Y008518D01*
 X005551Y008480D01*
@@ -1645,15 +1652,13 @@ X005551Y007119D01*
 X005643Y007081D01*
 X005743Y007081D01*
 X005834Y007119D01*
-X005894Y007179D01*
-X007063Y007179D01*
-X007063Y007093D01*
-X007724Y007093D01*
-X007724Y007093D01*
-X007063Y007093D01*
-X007063Y007007D01*
-X005933Y007007D01*
-X005897Y007043D01*
+X005905Y007189D01*
+X005926Y007241D01*
+X007063Y007241D01*
+X007063Y007155D01*
+X007063Y007066D01*
+X007063Y007063D01*
+X005847Y007063D01*
 X005805Y007081D01*
 X005706Y007081D01*
 X005614Y007043D01*
@@ -1679,18 +1684,17 @@ X005443Y006006D01*
 X005443Y005946D01*
 X005398Y005901D01*
 X005398Y005194D01*
-X005873Y004719D01*
-X005972Y004619D01*
-X007130Y004619D01*
-X007159Y004591D01*
-X008290Y004591D01*
-X008366Y004667D01*
-X008366Y004912D01*
-X008361Y004917D01*
-X008366Y004923D01*
-X008366Y005168D01*
-X008361Y005173D01*
-X008366Y005179D01*
+X005910Y004682D01*
+X007130Y004682D01*
+X007159Y004653D01*
+X008290Y004653D01*
+X008366Y004729D01*
+X008366Y004975D01*
+X008361Y004980D01*
+X008366Y004985D01*
+X008366Y005231D01*
+X008361Y005236D01*
+X008366Y005241D01*
 X008366Y005292D01*
 X008424Y005268D01*
 X008524Y005268D01*
@@ -1744,26 +1748,23 @@ X006161Y008668D01*
 X006236Y008743D01*
 X010263Y008743D01*
 X010263Y008563D01*
-X010012Y008563D01*
-X009948Y008568D01*
-X009942Y008563D01*
-X009935Y008563D01*
-X009890Y008518D01*
-X009161Y007893D01*
-X009081Y007893D01*
-X008989Y007855D01*
-X008918Y007785D01*
-X008880Y007693D01*
-X008880Y007594D01*
-X008918Y007502D01*
-X008989Y007431D01*
-X009081Y007393D01*
-X009180Y007393D01*
-X009272Y007431D01*
-X009342Y007502D01*
-X009380Y007594D01*
-X009380Y007634D01*
-X010068Y008223D01*
+X009810Y008563D01*
+X009710Y008464D01*
+X009171Y007925D01*
+X009112Y007925D01*
+X009020Y007886D01*
+X008950Y007816D01*
+X008912Y007724D01*
+X008912Y007625D01*
+X008950Y007533D01*
+X009020Y007463D01*
+X009112Y007425D01*
+X009211Y007425D01*
+X009303Y007463D01*
+X009374Y007533D01*
+X009412Y007625D01*
+X009412Y007684D01*
+X009951Y008223D01*
 X010263Y008223D01*
 X010263Y008039D01*
 X010339Y007963D01*
@@ -1915,8 +1916,6 @@ X013975Y005060D02*
 X013832Y005060D01*
 X013855Y005159D02*
 X013762Y005159D01*
-X013732Y005188D02*
-X013732Y005188D01*
 X013778Y005257D02*
 X013663Y005257D01*
 X013755Y005356D02*
@@ -1992,49 +1991,27 @@ X019038Y005947D02*
 X019162Y005947D01*
 X019078Y006045D02*
 X019261Y006045D01*
-X019359Y006144D02*
+X019346Y006144D02*
 X019078Y006144D01*
 X019055Y006242D02*
-X019458Y006242D01*
-X019556Y006341D02*
+X019318Y006242D01*
+X019330Y006341D02*
 X019000Y006341D01*
 X018869Y006439D02*
-X019648Y006439D01*
-X019588Y006538D02*
-X017505Y006538D01*
-X017927Y007030D02*
-X019034Y007030D01*
-X019227Y007030D02*
-X022043Y007030D01*
-X022043Y006932D02*
-X019346Y006932D01*
-X019380Y006833D02*
-X019661Y006833D01*
-X019588Y006735D02*
-X019374Y006735D01*
-X019321Y006636D02*
-X019568Y006636D01*
-X019975Y006833D02*
-X022043Y006833D01*
-X022043Y006735D02*
-X020048Y006735D01*
-X020134Y006636D02*
-X022043Y006636D01*
-X022043Y006538D02*
-X020277Y006538D01*
-X020318Y006439D02*
+X019392Y006439D01*
+X019744Y006439D02*
 X022043Y006439D01*
 X022043Y006341D02*
-X020317Y006341D01*
-X020270Y006242D02*
+X019806Y006341D01*
+X019930Y006242D02*
 X022043Y006242D01*
 X022043Y006144D02*
-X020119Y006144D01*
-X019960Y006045D02*
+X020036Y006144D01*
+X020068Y006045D02*
 X022043Y006045D01*
 X022043Y005947D02*
-X019862Y005947D01*
-X019763Y005848D02*
+X020059Y005947D01*
+X020001Y005848D02*
 X022043Y005848D01*
 X022043Y005750D02*
 X019665Y005750D01*
@@ -2052,67 +2029,135 @@ X020392Y005159D02*
 X019074Y005159D01*
 X018867Y005651D02*
 X018316Y005651D01*
-X020358Y004568D02*
-X020424Y004568D01*
-X020456Y004666D02*
-X022043Y004666D01*
-X022043Y004765D02*
-X020555Y004765D01*
-X020759Y004863D02*
-X022043Y004863D01*
-X022043Y004962D02*
-X020852Y004962D01*
-X020880Y005060D02*
-X022043Y005060D01*
-X022043Y005159D02*
-X020869Y005159D01*
-X020807Y005257D02*
-X022043Y005257D01*
-X022043Y007129D02*
-X017962Y007129D01*
-X017962Y007227D02*
-X022043Y007227D01*
-X022043Y007326D02*
-X018431Y007326D01*
-X018537Y007424D02*
-X022043Y007424D01*
-X022043Y007523D02*
-X018568Y007523D01*
-X018559Y007621D02*
-X022043Y007621D01*
-X022043Y007720D02*
-X020745Y007720D01*
-X020875Y007818D02*
-X022043Y007818D01*
-X022043Y007917D02*
-X020912Y007917D01*
-X020908Y008015D02*
-X022043Y008015D01*
-X022043Y008114D02*
-X020857Y008114D01*
+X017505Y006538D02*
+X022043Y006538D01*
+X022043Y006636D02*
+X019321Y006636D01*
+X019374Y006735D02*
+X022043Y006735D01*
+X022043Y006833D02*
+X019380Y006833D01*
+X019346Y006932D02*
+X022043Y006932D01*
+X022043Y007030D02*
+X019227Y007030D01*
+X019034Y007030D02*
+X017927Y007030D01*
+X017962Y007129D02*
+X022043Y007129D01*
+X022043Y007227D02*
+X017962Y007227D01*
+X017922Y007326D02*
+X018205Y007326D01*
+X018431Y007326D02*
+X022043Y007326D01*
+X022043Y007424D02*
+X018537Y007424D01*
+X018568Y007523D02*
+X022043Y007523D01*
+X022043Y007621D02*
+X018559Y007621D01*
+X018501Y007720D02*
+X020578Y007720D01*
+X020745Y007720D02*
+X022043Y007720D01*
+X022043Y007818D02*
+X020875Y007818D01*
+X020912Y007917D02*
+X022043Y007917D01*
+X022043Y008015D02*
+X020908Y008015D01*
+X020857Y008114D02*
+X022043Y008114D01*
+X022043Y008212D02*
+X021277Y008212D01*
+X021356Y008311D02*
+X022043Y008311D01*
+X022043Y008409D02*
+X021380Y008409D01*
+X021364Y008508D02*
+X022043Y008508D01*
+X022043Y008606D02*
+X021296Y008606D01*
+X020880Y008409D02*
+X018281Y008409D01*
+X018104Y008409D02*
+X016863Y008409D01*
+X016863Y008311D02*
+X020905Y008311D01*
 X020983Y008212D02*
 X016863Y008212D01*
 X016863Y008114D02*
-X017735Y008114D01*
-X017620Y008015D02*
+X017610Y008114D01*
+X017512Y008015D02*
 X016764Y008015D01*
 X016666Y007917D02*
-X017497Y007917D01*
-X017374Y007818D02*
+X017413Y007917D01*
+X017315Y007818D02*
 X016567Y007818D01*
-X017251Y007720D02*
+X017216Y007720D02*
 X014623Y007720D01*
 X014325Y007720D02*
 X012169Y007720D01*
 X012071Y007818D02*
 X014248Y007818D01*
 X014224Y007917D02*
-X010992Y007917D01*
-X011099Y008015D02*
-X011265Y008015D01*
-X011273Y008001D02*
-X011301Y007973D01*
-X011335Y007954D01*
+X009644Y007917D01*
+X009546Y007818D02*
+X010127Y007818D01*
+X010029Y007720D02*
+X009447Y007720D01*
+X009410Y007621D02*
+X009590Y007621D01*
+X009476Y007523D02*
+X009363Y007523D01*
+X009443Y007424D02*
+X008644Y007424D01*
+X008644Y007523D02*
+X008960Y007523D01*
+X008913Y007621D02*
+X008649Y007621D01*
+X008712Y007720D02*
+X008912Y007720D01*
+X008952Y007818D02*
+X008724Y007818D01*
+X008696Y007917D02*
+X009093Y007917D01*
+X009262Y008015D02*
+X008606Y008015D01*
+X008366Y008114D02*
+X009360Y008114D01*
+X009459Y008212D02*
+X008366Y008212D01*
+X008365Y008311D02*
+X009557Y008311D01*
+X009656Y008409D02*
+X008366Y008409D01*
+X008366Y008508D02*
+X009754Y008508D01*
+X009940Y008212D02*
+X010263Y008212D01*
+X010263Y008114D02*
+X009841Y008114D01*
+X009743Y008015D02*
+X010287Y008015D01*
+X009930Y007621D02*
+X009796Y007621D01*
+X010214Y007424D02*
+X010849Y007424D01*
+X010856Y007523D02*
+X010313Y007523D01*
+X010116Y007326D02*
+X010882Y007326D01*
+X010997Y007227D02*
+X010017Y007227D01*
+X009505Y007227D02*
+X008991Y007227D01*
+X009010Y007129D02*
+X009077Y007129D01*
+X009246Y007129D02*
+X011079Y007129D01*
+X011335Y007954D02*
 X011373Y007943D01*
 X011643Y007943D01*
 X011643Y008343D01*
@@ -2120,12 +2165,16 @@ X011243Y008343D01*
 X011243Y008074D01*
 X011253Y008035D01*
 X011273Y008001D01*
-X011243Y008114D02*
-X011123Y008114D01*
-X011123Y008212D02*
-X011243Y008212D01*
-X011243Y008311D02*
-X011123Y008311D01*
+X011301Y007973D01*
+X011335Y007954D01*
+X011265Y008015D02*
+X011099Y008015D01*
+X011123Y008114D02*
+X011243Y008114D01*
+X011243Y008212D02*
+X011123Y008212D01*
+X011123Y008311D02*
+X011243Y008311D01*
 X011123Y008409D02*
 X011643Y008409D01*
 X011643Y008311D02*
@@ -2154,183 +2203,14 @@ X011243Y008705D02*
 X011123Y008705D01*
 X010263Y008705D02*
 X006198Y008705D01*
-X006131Y008606D02*
+X006144Y008606D02*
+X007131Y008606D01*
+X008317Y008606D02*
 X010263Y008606D01*
-X009878Y008508D02*
-X008353Y008508D01*
-X008366Y008409D02*
-X009763Y008409D01*
-X009648Y008311D02*
-X008366Y008311D01*
-X008366Y008212D02*
-X009533Y008212D01*
-X009418Y008114D02*
-X008366Y008114D01*
-X008606Y008015D02*
-X009303Y008015D01*
-X009188Y007917D02*
-X008696Y007917D01*
-X008724Y007818D02*
-X008952Y007818D01*
-X008891Y007720D02*
-X008794Y007720D01*
-X008800Y007621D02*
-X008880Y007621D01*
-X008910Y007523D02*
-X008800Y007523D01*
-X008800Y007424D02*
-X009006Y007424D01*
-X008866Y007326D02*
-X008800Y007326D01*
-X008800Y007227D02*
-X008801Y007227D01*
-X008460Y007179D02*
-X008460Y007001D01*
-X008385Y007001D01*
-X008386Y007004D01*
-X008386Y007093D01*
-X008386Y007179D01*
-X008460Y007179D01*
-X008460Y007129D02*
-X008386Y007129D01*
-X008386Y007093D02*
-X007724Y007093D01*
-X007724Y007093D01*
-X008386Y007093D01*
-X008386Y007030D02*
-X008460Y007030D01*
-X009208Y007326D02*
-X010882Y007326D01*
-X010849Y007424D02*
-X009255Y007424D01*
-X009351Y007523D02*
-X010679Y007523D01*
-X010613Y007621D02*
-X009380Y007621D01*
-X009481Y007720D02*
-X010599Y007720D01*
-X010625Y007818D02*
-X009596Y007818D01*
-X009711Y007917D02*
-X010707Y007917D01*
-X010287Y008015D02*
-X009826Y008015D01*
-X009940Y008114D02*
-X010263Y008114D01*
-X010263Y008212D02*
-X010055Y008212D01*
-X009272Y007227D02*
-X010997Y007227D01*
-X011079Y007129D02*
-X009287Y007129D01*
-X007063Y007129D02*
-X005844Y007129D01*
-X005909Y007030D02*
-X007063Y007030D01*
-X005601Y007030D02*
-X004593Y007030D01*
-X004593Y006932D02*
-X005527Y006932D01*
-X005505Y006833D02*
-X004593Y006833D01*
-X004593Y006735D02*
-X005525Y006735D01*
-X005596Y006636D02*
-X004593Y006636D01*
-X004593Y006538D02*
-X005581Y006538D01*
-X005568Y006439D02*
-X004593Y006439D01*
-X004593Y006341D02*
-X005595Y006341D01*
-X005680Y006242D02*
-X004593Y006242D01*
-X004593Y006144D02*
-X005527Y006144D01*
-X005459Y006045D02*
-X004593Y006045D01*
-X004593Y005947D02*
-X005443Y005947D01*
-X005398Y005848D02*
-X004593Y005848D01*
-X004593Y005750D02*
-X005398Y005750D01*
-X005398Y005651D02*
-X004593Y005651D01*
-X004593Y005553D02*
-X005398Y005553D01*
-X005398Y005454D02*
-X004593Y005454D01*
-X004593Y005356D02*
-X005398Y005356D01*
-X005398Y005257D02*
-X004593Y005257D01*
-X004593Y005159D02*
-X005433Y005159D01*
-X005531Y005060D02*
-X004593Y005060D01*
-X004593Y004962D02*
-X005630Y004962D01*
-X005728Y004863D02*
-X004593Y004863D01*
-X004593Y004765D02*
-X005827Y004765D01*
-X005925Y004666D02*
-X004593Y004666D01*
-X006212Y004568D02*
-X009919Y004568D01*
-X009919Y004666D02*
-X008366Y004666D01*
-X008366Y004765D02*
-X009919Y004765D01*
-X009919Y004863D02*
-X008366Y004863D01*
-X008366Y004962D02*
-X009919Y004962D01*
-X009919Y005060D02*
-X008366Y005060D01*
-X008366Y005159D02*
-X009925Y005159D01*
-X010679Y005257D02*
-X008366Y005257D01*
-X005541Y007129D02*
-X004593Y007129D01*
-X004593Y007227D02*
-X005465Y007227D01*
-X005443Y007326D02*
-X004593Y007326D01*
-X004593Y007424D02*
-X005461Y007424D01*
-X005472Y007523D02*
-X004593Y007523D01*
-X004593Y007621D02*
-X005443Y007621D01*
-X005454Y007720D02*
-X004593Y007720D01*
-X004593Y007818D02*
-X005479Y007818D01*
-X005443Y007917D02*
-X004593Y007917D01*
-X004593Y008015D02*
-X005447Y008015D01*
-X005494Y008114D02*
-X004593Y008114D01*
-X004593Y008212D02*
-X005445Y008212D01*
-X005443Y008311D02*
-X004593Y008311D01*
-X004593Y008409D02*
-X005481Y008409D01*
-X005618Y008508D02*
-X004593Y008508D01*
-X004593Y008606D02*
-X006004Y008606D01*
-X005860Y008508D02*
-X005768Y008508D01*
-X012143Y008508D02*
-X012388Y008508D01*
-X012388Y008606D02*
-X012143Y008606D01*
+X012143Y008606D02*
+X012388Y008606D01*
+X012388Y008508D02*
+X012143Y008508D01*
 X012143Y008705D02*
 X012388Y008705D01*
 X013248Y008705D02*
@@ -2394,50 +2274,175 @@ X014513Y008606D02*
 X014268Y008606D01*
 X014268Y008705D02*
 X014513Y008705D01*
-X016863Y008409D02*
-X018104Y008409D01*
-X017978Y008508D02*
-X016907Y008508D01*
-X016943Y008606D02*
-X017943Y008606D01*
-X017948Y008705D02*
-X016938Y008705D01*
-X016863Y008311D02*
-X020905Y008311D01*
-X020880Y008409D02*
-X018281Y008409D01*
-X018501Y007720D02*
-X020578Y007720D01*
-X021277Y008212D02*
-X022043Y008212D01*
-X022043Y008311D02*
-X021356Y008311D01*
-X021380Y008409D02*
-X022043Y008409D01*
-X022043Y008508D02*
-X021364Y008508D01*
-X021296Y008606D02*
-X022043Y008606D01*
-X018205Y007326D02*
-X017922Y007326D01*
+X016907Y008508D02*
+X017978Y008508D01*
+X017943Y008606D02*
+X016943Y008606D01*
+X016938Y008705D02*
+X017948Y008705D01*
 X014774Y005947D02*
 X014662Y005947D01*
 X014013Y005848D02*
 X012670Y005848D01*
+X010679Y005257D02*
+X008366Y005257D01*
+X008366Y005159D02*
+X009925Y005159D01*
+X009919Y005060D02*
+X008366Y005060D01*
+X008366Y004962D02*
+X009919Y004962D01*
+X009919Y004863D02*
+X008366Y004863D01*
+X008366Y004765D02*
+X009919Y004765D01*
+X009919Y004666D02*
+X008303Y004666D01*
+X007145Y004666D02*
+X004593Y004666D01*
+X004593Y004765D02*
+X005827Y004765D01*
+X005728Y004863D02*
+X004593Y004863D01*
+X004593Y004962D02*
+X005630Y004962D01*
+X005531Y005060D02*
+X004593Y005060D01*
+X004593Y005159D02*
+X005433Y005159D01*
+X005398Y005257D02*
+X004593Y005257D01*
+X004593Y005356D02*
+X005398Y005356D01*
+X005398Y005454D02*
+X004593Y005454D01*
+X004593Y005553D02*
+X005398Y005553D01*
+X005398Y005651D02*
+X004593Y005651D01*
+X004593Y005750D02*
+X005398Y005750D01*
+X005398Y005848D02*
+X004593Y005848D01*
+X004593Y005947D02*
+X005443Y005947D01*
+X005459Y006045D02*
+X004593Y006045D01*
+X004593Y006144D02*
+X005527Y006144D01*
+X005680Y006242D02*
+X004593Y006242D01*
+X004593Y006341D02*
+X005595Y006341D01*
+X005568Y006439D02*
+X004593Y006439D01*
+X004593Y006538D02*
+X005581Y006538D01*
+X005596Y006636D02*
+X004593Y006636D01*
+X004593Y006735D02*
+X005525Y006735D01*
+X005505Y006833D02*
+X004593Y006833D01*
+X004593Y006932D02*
+X005527Y006932D01*
+X005601Y007030D02*
+X004593Y007030D01*
+X004593Y007129D02*
+X005541Y007129D01*
+X005465Y007227D02*
+X004593Y007227D01*
+X004593Y007326D02*
+X005443Y007326D01*
+X005461Y007424D02*
+X004593Y007424D01*
+X004593Y007523D02*
+X005472Y007523D01*
+X005443Y007621D02*
+X004593Y007621D01*
+X004593Y007720D02*
+X005454Y007720D01*
+X005479Y007818D02*
+X004593Y007818D01*
+X004593Y007917D02*
+X005443Y007917D01*
+X005447Y008015D02*
+X004593Y008015D01*
+X004593Y008114D02*
+X005494Y008114D01*
+X005445Y008212D02*
+X004593Y008212D01*
+X004593Y008311D02*
+X005443Y008311D01*
+X005481Y008409D02*
+X004593Y008409D01*
+X004593Y008508D02*
+X005618Y008508D01*
+X005768Y008508D02*
+X005782Y008508D01*
+X005866Y008606D02*
+X004593Y008606D01*
+X005921Y007227D02*
+X007063Y007227D01*
+X007063Y007155D02*
+X007724Y007155D01*
+X007063Y007155D01*
+X007063Y007129D02*
+X005844Y007129D01*
+X007724Y007155D02*
+X007724Y007155D01*
+X008926Y007326D02*
+X009450Y007326D01*
+X009919Y004568D02*
+X006212Y004568D01*
+X020358Y004568D02*
+X020424Y004568D01*
+X020456Y004666D02*
+X022043Y004666D01*
+X022043Y004765D02*
+X020555Y004765D01*
+X020759Y004863D02*
+X022043Y004863D01*
+X022043Y004962D02*
+X020852Y004962D01*
+X020880Y005060D02*
+X022043Y005060D01*
+X022043Y005159D02*
+X020869Y005159D01*
+X020807Y005257D02*
+X022043Y005257D01*
 D15*
+X021130Y005112D03*
+X020630Y005081D03*
+X019818Y006018D03*
+X019568Y006262D03*
+X019130Y006800D03*
+X018693Y007081D03*
+X018318Y007550D03*
+X017255Y006487D03*
+X017662Y006112D03*
+X018068Y005706D03*
+X016005Y006300D03*
+X015505Y006300D03*
+X015005Y006300D03*
+X014474Y006112D03*
+X013724Y005768D03*
+X014193Y005675D03*
+X014005Y005362D03*
+X012662Y005020D03*
+X011130Y005393D03*
 X012224Y006175D03*
 X011974Y006425D03*
 X011755Y006675D03*
 X011505Y006925D03*
 X011318Y007206D03*
 X011099Y007456D03*
-X010849Y007706D03*
-X009630Y007643D03*
-X009130Y007643D03*
-X008474Y007800D03*
-X009037Y007143D03*
-X009287Y006862D03*
-X008380Y006550D03*
+X009724Y007737D03*
+X009162Y007675D03*
+X009693Y007393D03*
+X009162Y006893D03*
+X008755Y007143D03*
+X008380Y006643D03*
 X008630Y006300D03*
 X009099Y006018D03*
 X009412Y006143D03*
@@ -2447,7 +2452,7 @@ X008474Y005518D03*
 X006162Y005737D03*
 X006005Y005456D03*
 X005693Y005956D03*
-X006193Y006081D03*
+X006193Y006143D03*
 X005818Y006456D03*
 X006099Y006612D03*
 X005755Y006831D03*
@@ -2455,234 +2460,223 @@ X005693Y007331D03*
 X005693Y007643D03*
 X005693Y007956D03*
 X005693Y008268D03*
-X006068Y008362D03*
-X006349Y008643D03*
-X011130Y005393D03*
-X012662Y005020D03*
-X013724Y005768D03*
-X014193Y005675D03*
-X014005Y005362D03*
-X014474Y006112D03*
-X015005Y006300D03*
-X015505Y006300D03*
-X016005Y006300D03*
-X017255Y006487D03*
-X017662Y006112D03*
-X018068Y005706D03*
-X019130Y006800D03*
-X018755Y007143D03*
-X018318Y007550D03*
-X019818Y006637D03*
-X020068Y006393D03*
-X020130Y007143D03*
+X006005Y008393D03*
+X006443Y008643D03*
+X008474Y007800D03*
+X004787Y005268D03*
+X005380Y004893D03*
+X013943Y007768D03*
+X014474Y007925D03*
+X016693Y008643D03*
+X018193Y008643D03*
+X020130Y007518D03*
 X020662Y007956D03*
 X020755Y008362D03*
 X021130Y008419D03*
 X021912Y008393D03*
-X018193Y008643D03*
-X016693Y008643D03*
-X014474Y007925D03*
-X013443Y007768D03*
-X020630Y005081D03*
-X021130Y005112D03*
-X005380Y004893D03*
-X004787Y005268D03*
 D16*
-X005568Y005264D02*
-X006043Y004789D01*
-X007724Y004789D01*
-X007724Y005045D02*
-X006052Y005045D01*
-X005755Y005342D01*
-X005755Y005643D01*
-X005943Y005831D01*
-X005943Y006331D01*
-X005818Y006456D01*
-X006099Y006612D02*
-X006380Y006331D01*
-X007380Y006331D01*
-X007386Y006325D01*
-X007724Y006325D01*
-X007724Y006581D02*
-X008099Y006581D01*
-X008380Y006550D01*
-X008630Y006300D02*
-X008630Y006831D01*
-X008630Y007349D01*
-X008630Y007643D01*
-X008474Y007800D01*
-X008630Y007349D02*
-X007724Y007349D01*
-X005711Y007349D01*
-X005693Y007331D01*
-X005732Y007604D02*
-X007724Y007604D01*
-X007724Y007860D02*
-X005788Y007860D01*
-X005693Y007956D01*
-X005845Y008116D02*
-X007724Y008116D01*
-X007724Y008372D02*
-X006078Y008372D01*
-X006068Y008362D01*
-X005845Y008116D02*
-X005693Y008268D01*
-X005693Y007643D02*
-X005732Y007604D01*
-X006443Y007093D02*
-X007724Y007093D01*
-X007724Y006837D02*
-X007418Y006831D01*
-X008630Y006831D01*
-X009037Y006581D02*
+X021130Y008419D02*
+X020906Y008643D01*
+X018193Y008643D01*
+X017693Y007956D02*
+X017193Y007456D01*
+X012193Y007456D01*
+X011943Y007706D01*
+X010255Y007706D01*
+X009943Y007393D01*
+X009693Y007393D01*
+X009162Y007675D02*
+X009880Y008393D01*
+X010693Y008393D01*
+X011099Y007456D02*
+X011974Y007456D01*
+X012130Y007300D01*
+X017255Y007300D01*
+X017505Y007550D01*
+X018318Y007550D01*
+X017693Y007956D02*
+X020662Y007956D01*
+X019130Y006800D02*
+X017162Y006800D01*
+X016818Y007143D01*
+X012068Y007143D01*
+X012005Y007206D01*
+X011318Y007206D01*
+X011505Y006925D02*
+X012005Y006925D01*
+X012068Y006987D01*
+X016755Y006987D01*
+X017255Y006487D01*
+X017162Y006112D02*
+X016443Y006831D01*
+X012162Y006831D01*
+X012005Y006675D01*
+X011755Y006675D01*
+X011974Y006425D02*
+X012224Y006675D01*
+X016380Y006675D01*
+X017349Y005706D01*
+X018068Y005706D01*
+X017662Y006112D02*
+X017162Y006112D01*
+X015505Y006300D02*
+X015255Y006050D01*
+X014912Y006050D01*
+X014599Y006362D01*
+X012724Y006362D01*
+X012287Y005925D01*
+X012130Y005925D01*
+X011162Y006893D01*
+X009162Y006893D01*
+X008912Y006987D02*
+X008755Y007143D01*
+X008912Y006987D02*
+X008912Y006581D01*
 X011255Y006581D01*
 X012068Y005768D01*
 X012349Y005768D01*
 X012787Y006206D01*
 X014380Y006206D01*
 X014474Y006112D01*
-X014599Y006362D02*
-X014912Y006050D01*
-X015255Y006050D01*
-X015505Y006300D01*
-X015005Y006300D02*
-X014787Y006518D01*
+X014787Y006518D02*
+X015005Y006300D01*
+X014787Y006518D02*
 X012568Y006518D01*
 X012224Y006175D01*
-X012287Y005925D02*
-X012724Y006362D01*
-X014599Y006362D01*
-X014193Y005675D02*
-X014443Y005425D01*
-X018880Y005425D01*
-X019818Y006362D01*
-X019818Y006637D01*
-X020068Y006393D02*
-X018943Y005268D01*
-X014099Y005268D01*
-X014005Y005362D01*
-X013662Y005018D02*
-X013068Y005612D01*
+X011943Y005456D02*
+X011412Y005987D01*
+X009568Y005987D01*
+X009412Y006143D01*
+X009724Y006268D02*
+X011349Y006268D01*
 X012005Y005612D01*
-X011349Y006268D01*
-X009724Y006268D01*
-X009568Y005987D02*
-X009412Y006143D01*
-X009568Y005987D02*
-X011412Y005987D01*
+X013068Y005612D01*
+X013662Y005018D01*
+X013662Y004737D01*
+X014162Y004737D02*
+X014162Y004831D01*
+X014099Y005268D02*
+X014005Y005362D01*
+X014099Y005268D02*
+X018943Y005268D01*
+X019693Y006018D01*
+X019818Y006018D01*
+X019568Y006112D02*
+X019568Y006262D01*
+X019568Y006112D02*
+X018880Y005425D01*
+X014443Y005425D01*
+X014193Y005675D01*
+X013162Y005268D02*
+X012974Y005456D01*
 X011943Y005456D01*
-X012974Y005456D01*
-X013162Y005268D01*
+X011880Y005300D02*
+X011349Y005831D01*
+X009287Y005831D01*
+X009099Y006018D01*
+X008912Y006237D02*
+X008550Y005876D01*
+X007724Y005876D01*
+X007724Y006131D02*
+X006205Y006131D01*
+X006193Y006143D01*
+X006324Y006387D02*
+X006099Y006612D01*
+X005943Y006331D02*
+X005818Y006456D01*
+X005943Y006331D02*
+X005943Y005831D01*
+X005755Y005643D01*
+X005755Y005342D01*
+X005990Y005108D01*
+X007724Y005108D01*
+X007724Y005364D02*
+X006097Y005364D01*
+X006005Y005456D01*
+X006279Y005620D02*
+X006162Y005737D01*
+X006279Y005620D02*
+X007724Y005620D01*
+X008474Y005518D02*
+X008537Y005456D01*
+X010755Y005456D01*
+X010849Y005362D01*
+X010849Y004862D01*
+X010912Y004800D01*
+X011349Y004800D01*
+X011818Y005143D02*
+X012068Y005143D01*
+X012162Y005050D01*
+X012162Y004737D01*
+X012662Y004737D02*
+X012662Y005020D01*
+X012662Y005175D01*
+X012537Y005300D01*
+X011880Y005300D01*
+X011818Y005143D02*
+X011287Y005675D01*
+X011130Y005675D01*
+X010943Y005675D01*
+X008849Y005675D01*
+X008787Y005737D01*
+X008912Y006237D02*
+X008912Y006581D01*
+X008630Y006761D02*
+X008498Y006893D01*
+X008474Y006893D01*
+X008474Y007393D01*
+X007742Y007393D01*
+X007724Y007411D01*
+X005773Y007411D01*
+X005693Y007331D01*
+X005693Y007643D02*
+X005716Y007667D01*
+X007724Y007667D01*
+X007724Y007923D02*
+X005726Y007923D01*
+X005693Y007956D01*
+X005814Y008147D02*
+X006189Y008147D01*
+X006220Y008179D01*
+X007724Y008179D01*
+X007724Y008435D02*
+X006609Y008435D01*
+X006568Y008393D01*
+X006005Y008393D01*
+X005814Y008147D02*
+X005693Y008268D01*
+X006474Y007155D02*
+X007724Y007155D01*
+X007724Y006899D02*
+X007730Y006893D01*
+X008474Y006893D01*
+X008630Y006761D02*
+X008630Y006300D01*
+X008380Y006643D02*
+X007724Y006643D01*
+X007730Y006893D02*
+X005818Y006893D01*
+X005755Y006831D01*
+X006324Y006387D02*
+X007724Y006387D01*
+X008474Y007393D02*
+X008474Y007800D01*
+X005693Y005956D02*
+X005568Y005831D01*
+X005568Y005264D01*
+X005980Y004852D01*
+X007724Y004852D01*
+X011130Y005393D02*
+X011130Y005675D01*
+X013162Y005268D02*
 X013162Y004737D01*
-X013662Y004737D02*
-X013662Y005018D01*
-X014099Y004862D02*
-X014162Y004737D01*
 X014662Y004737D02*
 X014818Y004581D01*
 X020130Y004581D01*
 X020630Y005081D01*
-X018068Y005706D02*
-X017349Y005706D01*
-X016380Y006675D01*
-X012224Y006675D01*
-X011974Y006425D01*
-X012005Y006675D02*
-X011755Y006675D01*
-X012005Y006675D02*
-X012162Y006831D01*
-X016443Y006831D01*
-X017162Y006112D01*
-X017662Y006112D01*
-X017255Y006487D02*
-X016755Y006987D01*
-X012068Y006987D01*
-X012005Y006925D01*
-X011505Y006925D01*
-X011193Y006862D02*
-X009287Y006862D01*
-X009037Y006581D02*
-X009037Y007143D01*
-X009380Y007393D02*
-X009630Y007643D01*
-X009130Y007643D02*
-X010005Y008393D01*
-X010693Y008393D01*
-X010849Y007706D02*
-X011943Y007706D01*
-X012193Y007456D01*
-X017193Y007456D01*
-X017818Y007956D01*
-X020662Y007956D01*
-X021130Y008419D02*
-X020906Y008643D01*
-X018193Y008643D01*
-X016693Y008643D02*
-X016693Y008184D01*
+X016693Y008184D02*
 X016433Y007925D01*
 X014474Y007925D01*
-X012130Y007300D02*
-X011974Y007456D01*
-X011099Y007456D01*
-X011318Y007206D02*
-X012005Y007206D01*
-X012068Y007143D01*
-X016818Y007143D01*
-X017162Y006800D01*
-X019130Y006800D01*
-X018318Y007550D02*
-X017599Y007550D01*
-X017287Y007300D01*
-X012130Y007300D01*
-X011193Y006862D02*
-X012130Y005925D01*
-X012287Y005925D01*
-X011880Y005300D02*
-X011349Y005831D01*
-X009287Y005831D01*
-X009099Y006018D01*
-X008787Y005737D02*
-X008849Y005675D01*
-X011068Y005675D01*
-X011130Y005612D01*
-X011130Y005393D01*
-X010849Y005362D02*
-X010755Y005456D01*
-X008537Y005456D01*
-X008474Y005518D01*
-X008488Y005813D02*
-X009037Y006362D01*
-X009037Y006581D01*
-X007724Y006837D02*
-X005761Y006837D01*
-X005755Y006831D01*
-X006193Y006081D02*
-X006517Y006069D01*
-X007724Y006069D01*
-X007406Y006331D02*
-X007380Y006331D01*
-X007724Y005813D02*
-X008488Y005813D01*
-X007724Y005557D02*
-X006341Y005557D01*
-X006162Y005737D01*
-X006005Y005456D02*
-X006160Y005301D01*
-X007724Y005301D01*
-X005693Y005956D02*
-X005568Y005831D01*
-X005568Y005264D01*
-X010849Y005362D02*
-X010849Y004862D01*
-X010912Y004800D01*
-X011349Y004800D01*
-X011880Y005300D02*
-X012537Y005300D01*
-X012662Y005175D01*
-X012662Y005020D01*
-X012662Y004737D01*
-X012162Y004737D02*
-X012099Y004862D01*
-X011287Y005675D01*
-X011068Y005675D01*
+X016693Y008184D02*
+X016693Y008643D01*
 M02*
diff --git a/CAM/zoncoffee.GBO b/CAM/zoncoffee.GBO
--- a/CAM/zoncoffee.GBO
+++ b/CAM/zoncoffee.GBO
@@ -1628,10 +1628,11 @@ X021980Y004578D02*
 X021980Y004848D01*
 X021845Y004848D01*
 X021800Y004803D01*
-X014912Y004785D02*
-X014412Y004785D01*
-X014412Y004833D02*
-X014912Y004833D01*
+X015662Y004737D02*
+X015162Y004737D01*
+X015287Y004612D01*
+X015162Y004737D02*
+X015287Y004862D01*
 X014912Y004882D02*
 X014412Y004882D01*
 X014412Y004930D02*
@@ -1643,6 +1644,10 @@ X014912Y004987D01*
 X014912Y004487D01*
 X014412Y004487D01*
 X014412Y004987D01*
+X014412Y004833D02*
+X014912Y004833D01*
+X014912Y004785D02*
+X014412Y004785D01*
 X014412Y004736D02*
 X014912Y004736D01*
 X014912Y004688D02*
@@ -1668,36 +1673,30 @@ X011924Y003815D01*
 X011924Y003520D01*
 X009759Y003520D01*
 X009759Y003815D01*
-X009689Y006286D02*
-X009869Y006466D01*
-X009979Y006466D02*
-X010024Y006466D01*
-X010114Y006376D01*
-X010114Y006286D02*
-X010114Y006466D01*
-X009869Y006286D02*
-X009689Y006466D01*
-X009221Y006466D02*
-X009131Y006466D01*
-X009176Y006511D02*
-X009176Y006331D01*
-X009131Y006286D01*
-X009025Y006286D02*
-X008845Y006466D01*
-X009025Y006466D02*
-X008845Y006286D01*
+X010189Y006223D02*
+X010369Y006403D01*
+X010475Y006403D02*
+X010565Y006403D01*
+X010520Y006448D02*
+X010520Y006268D01*
+X010475Y006223D01*
+X010369Y006223D02*
+X010189Y006403D01*
+X010433Y006706D02*
+X010433Y006886D01*
 X010343Y006796D02*
 X010523Y006796D01*
-X010433Y006706D02*
-X010433Y006886D01*
-X010780Y006900D02*
-X010915Y006900D01*
-X010961Y006855D01*
-X010915Y006809D01*
-X010825Y006809D01*
-X010780Y006764D01*
+X010780Y006764D02*
 X010825Y006719D01*
 X010961Y006719D01*
+X010915Y006809D02*
+X010961Y006855D01*
+X010915Y006900D01*
+X010780Y006900D01*
+X010825Y006809D02*
+X010780Y006764D01*
+X010825Y006809D02*
+X010915Y006809D01*
 X011075Y006764D02*
 X011120Y006719D01*
 X011255Y006719D01*
@@ -1715,6 +1714,15 @@ X011370Y006719D02*
 X011370Y006900D01*
 X011687Y006827D02*
 X011867Y006827D01*
+X011521Y006403D02*
+X011521Y006223D01*
+X011521Y006313D02*
+X011430Y006403D01*
+X011385Y006403D01*
+X011275Y006403D02*
+X011095Y006223D01*
+X011275Y006223D02*
+X011095Y006403D01*
 X004894Y007200D02*
 X004849Y007155D01*
 X004894Y007200D02*
diff --git a/CAM/zoncoffee.GBP b/CAM/zoncoffee.GBP
--- a/CAM/zoncoffee.GBP
+++ b/CAM/zoncoffee.GBP
@@ -1356,21 +1356,21 @@ X020826Y009587D01*
 X020820Y009631D01*
 X020818Y009675D01*
 D11*
-X007724Y008372D03*
-X007724Y008116D03*
-X007724Y007860D03*
-X007724Y007604D03*
-X007724Y007349D03*
-X007724Y007093D03*
-X007724Y006837D03*
-X007724Y006581D03*
-X007724Y006325D03*
-X007724Y006069D03*
-X007724Y005813D03*
-X007724Y005557D03*
-X007724Y005301D03*
-X007724Y005045D03*
-X007724Y004789D03*
+X007724Y008435D03*
+X007724Y008179D03*
+X007724Y007923D03*
+X007724Y007667D03*
+X007724Y007411D03*
+X007724Y007155D03*
+X007724Y006899D03*
+X007724Y006643D03*
+X007724Y006387D03*
+X007724Y006131D03*
+X007724Y005876D03*
+X007724Y005620D03*
+X007724Y005364D03*
+X007724Y005108D03*
+X007724Y004852D03*
 D12*
 X012162Y004737D03*
 X012662Y004737D03*
diff --git a/CAM/zoncoffee.GBS b/CAM/zoncoffee.GBS
--- a/CAM/zoncoffee.GBS
+++ b/CAM/zoncoffee.GBS
@@ -1408,21 +1408,21 @@ X010693Y008393D03*
 X010349Y004800D03*
 X011349Y004800D03*
 D16*
-X007724Y004789D03*
-X007724Y005045D03*
-X007724Y005301D03*
-X007724Y005557D03*
-X007724Y005813D03*
-X007724Y006069D03*
-X007724Y006325D03*
-X007724Y006581D03*
-X007724Y006837D03*
-X007724Y007093D03*
-X007724Y007349D03*
-X007724Y007604D03*
-X007724Y007860D03*
-X007724Y008116D03*
-X007724Y008372D03*
+X007724Y004852D03*
+X007724Y005108D03*
+X007724Y005364D03*
+X007724Y005620D03*
+X007724Y005876D03*
+X007724Y006131D03*
+X007724Y006387D03*
+X007724Y006643D03*
+X007724Y006899D03*
+X007724Y007155D03*
+X007724Y007411D03*
+X007724Y007667D03*
+X007724Y007923D03*
+X007724Y008179D03*
+X007724Y008435D03*
 D17*
 X012162Y004737D03*
 X012662Y004737D03*
diff --git a/CAM/zoncoffee.GTL b/CAM/zoncoffee.GTL
--- a/CAM/zoncoffee.GTL
+++ b/CAM/zoncoffee.GTL
@@ -18,13 +18,14 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD18C,0.0118*%
 %ADD19R,0.0600X0.0600*%
 %ADD20R,0.0276X0.0197*%
-%ADD21R,0.0276X0.0354*%
-%ADD22R,0.0354X0.0276*%
-%ADD23R,0.0276X0.0177*%
-%ADD24R,0.0197X0.0571*%
-%ADD25R,0.0571X0.0197*%
-%ADD26C,0.0240*%
-%ADD27C,0.0080*%
+%ADD21R,0.0433X0.0394*%
+%ADD22R,0.0276X0.0354*%
+%ADD23R,0.0354X0.0276*%
+%ADD24R,0.0276X0.0177*%
+%ADD25R,0.0197X0.0571*%
+%ADD26R,0.0571X0.0197*%
+%ADD27C,0.0240*%
+%ADD28C,0.0080*%
 D10*
 X004943Y002737D02*
 X005693Y002737D01*
@@ -1488,16 +1489,17 @@ D20*
 X017207Y008643D03*
 X017718Y008643D03*
 D21*
+X013309Y007675D03*
+X012639Y007675D03*
+D22*
+X012043Y007706D03*
+X011531Y007706D03*
+X014999Y007737D03*
+X015511Y007737D03*
 X019687Y008018D03*
 X020199Y008018D03*
-X015511Y007737D03*
-X014999Y007737D03*
-X013136Y007768D03*
-X012624Y007768D03*
-X012230Y007768D03*
-X011718Y007768D03*
+X013199Y005393D03*
 X012687Y005393D03*
-X013199Y005393D03*
 X006949Y008237D03*
 X006437Y008237D03*
 X005324Y008268D03*
@@ -1508,10 +1510,10 @@ X005324Y005643D03*
 X004812Y005643D03*
 X005999Y004893D03*
 X006511Y004893D03*
-D22*
+D23*
 X013880Y006356D03*
 X013880Y006868D03*
-D23*
+D24*
 X005373Y006801D03*
 X005373Y006486D03*
 X005373Y006171D03*
@@ -1520,7 +1522,7 @@ X004763Y006486D03*
 X004763Y006801D03*
 X004763Y007116D03*
 X005373Y007116D03*
-D24*
+D25*
 X007528Y008257D03*
 X007843Y008257D03*
 X008158Y008257D03*
@@ -1537,7 +1539,7 @@ X008473Y005029D03*
 X008158Y005029D03*
 X007843Y005029D03*
 X007528Y005029D03*
-D25*
+D26*
 X007016Y005541D03*
 X007016Y005856D03*
 X007016Y006171D03*
@@ -1554,7 +1556,7 @@ X010245Y006486D03*
 X010245Y006171D03*
 X010245Y005856D03*
 X010245Y005541D03*
-D26*
+D27*
 X011130Y005393D03*
 X012224Y006175D03*
 X011974Y006425D03*
@@ -1562,13 +1564,12 @@ X011755Y006675D03*
 X011505Y006925D03*
 X011318Y007206D03*
 X011099Y007456D03*
-X010849Y007706D03*
-X009630Y007643D03*
-X009130Y007643D03*
-X008474Y007800D03*
-X009037Y007143D03*
-X009287Y006862D03*
-X008380Y006550D03*
+X009724Y007737D03*
+X009162Y007675D03*
+X009693Y007393D03*
+X009162Y006893D03*
+X008755Y007143D03*
+X008380Y006643D03*
 X008630Y006300D03*
 X009099Y006018D03*
 X009412Y006143D03*
@@ -1578,7 +1579,7 @@ X008474Y005518D03*
 X006162Y005737D03*
 X006005Y005456D03*
 X005693Y005956D03*
-X006193Y006081D03*
+X006193Y006143D03*
 X005818Y006456D03*
 X006099Y006612D03*
 X005755Y006831D03*
@@ -1586,8 +1587,9 @@ X005693Y007331D03*
 X005693Y007643D03*
 X005693Y007956D03*
 X005693Y008268D03*
-X006068Y008362D03*
-X006349Y008643D03*
+X006005Y008393D03*
+X006443Y008643D03*
+X008474Y007800D03*
 X004787Y005268D03*
 X005380Y004893D03*
 X012662Y005020D03*
@@ -1601,12 +1603,12 @@ X016005Y006300D03*
 X017255Y006487D03*
 X017662Y006112D03*
 X018068Y005706D03*
+X019568Y006262D03*
+X019818Y006018D03*
 X019130Y006800D03*
-X018755Y007143D03*
+X018693Y007081D03*
 X018318Y007550D03*
-X019818Y006637D03*
-X020068Y006393D03*
-X020130Y007143D03*
+X020130Y007518D03*
 X020662Y007956D03*
 X020755Y008362D03*
 X021130Y008419D03*
@@ -1614,10 +1616,10 @@ X021912Y008393D03*
 X018193Y008643D03*
 X016693Y008643D03*
 X014474Y007925D03*
-X013443Y007768D03*
+X013943Y007768D03*
 X020630Y005081D03*
 X021130Y005112D03*
-D27*
+D28*
 X021649Y005112D01*
 X021693Y005069D01*
 X021705Y005069D01*
@@ -1629,23 +1631,16 @@ X021119Y006131D01*
 X020650Y006131D01*
 X020650Y006387D02*
 X020644Y006393D01*
-X020068Y006393D01*
-X019818Y006637D02*
+X020193Y006393D01*
+X019818Y006018D01*
+X019568Y006262D02*
+X019943Y006637D01*
 X020643Y006637D01*
 X020650Y006643D01*
 X020650Y007155D02*
-X020142Y007155D01*
-X020130Y007143D01*
-X019508Y007177D02*
-X019130Y006800D01*
-X018755Y007143D02*
-X019118Y007506D01*
-X019118Y007569D01*
-X018729Y007959D02*
-X018727Y007959D01*
-X018318Y007550D01*
-X019508Y007179D02*
-X019508Y007177D01*
+X020212Y007155D01*
+X020130Y007237D01*
+X020130Y007518D01*
 X020261Y007956D02*
 X020199Y008018D01*
 X020193Y008012D01*
@@ -1658,63 +1653,255 @@ X019687Y008429D02*
 X019598Y008518D01*
 X019687Y008429D02*
 X019687Y008018D01*
-X021130Y008419D02*
-X021130Y006143D01*
-X018068Y005706D02*
-X017690Y005328D01*
-X017657Y005328D01*
-X017627Y005328D01*
-X017267Y005718D02*
-X017662Y006112D01*
-X017255Y006485D02*
-X017255Y006487D01*
-X017255Y006485D02*
-X016877Y006107D01*
-X016005Y006300D02*
-X016005Y006581D01*
-X016005Y007109D01*
-X015505Y007109D02*
-X015505Y007731D01*
-X015511Y007737D01*
+X019118Y007569D02*
+X019118Y007506D01*
+X018693Y007081D01*
+X019130Y006800D02*
+X019508Y007177D01*
+X019508Y007179D01*
+X018727Y007959D02*
+X018318Y007550D01*
+X018727Y007959D02*
+X018729Y007959D01*
+X018193Y008643D02*
+X017718Y008643D01*
+X017207Y008643D02*
+X016693Y008643D01*
+X015943Y008393D02*
 X015511Y007962D01*
-X015943Y008393D01*
-X016693Y008643D02*
-X017207Y008643D01*
-X017718Y008643D02*
-X018193Y008643D01*
-X014999Y008337D02*
+X015511Y007737D01*
+X015505Y007731D01*
+X015505Y007109D01*
+X015005Y007109D02*
+X015005Y007731D01*
 X014999Y007737D01*
-X015005Y007731D01*
-X015005Y007109D01*
-X014505Y007109D02*
-X014471Y007143D01*
-X013943Y007143D01*
-X013880Y007081D01*
+X014999Y008337D01*
+X014943Y008393D01*
+X014474Y007925D02*
+X013943Y007393D01*
+X013818Y007393D01*
+X013568Y007143D01*
+X013318Y007143D01*
+X013317Y007142D01*
+X013317Y007030D01*
+X013317Y006705D01*
+X013255Y006643D01*
+X012630Y006643D01*
+X012568Y006706D01*
+X012568Y007031D01*
+X012569Y007030D01*
+X012569Y007604D01*
+X012639Y007675D01*
+X012639Y008215D01*
+X012818Y008393D01*
+X012043Y008044D02*
+X011693Y008393D01*
+X012043Y008044D02*
+X012043Y007706D01*
+X011531Y007706D02*
+X011531Y007430D01*
+X012537Y006425D01*
+X013318Y006425D01*
+X013437Y006425D01*
 X013880Y006868D01*
-X013437Y006425D01*
+X013880Y007081D01*
+X013943Y007143D01*
+X014471Y007143D01*
+X014505Y007109D01*
+X014380Y006581D02*
+X014156Y006356D01*
+X013880Y006356D01*
+X014380Y006581D02*
+X016005Y006581D01*
+X016005Y006300D01*
+X015505Y006300D02*
+X015505Y004983D01*
+X015005Y004983D02*
+X015005Y006300D01*
+X014474Y006112D02*
+X014474Y005014D01*
+X014505Y004983D01*
+X014005Y005362D02*
+X013318Y004675D01*
+X012474Y004675D01*
+X011755Y005393D01*
+X011130Y005393D01*
+X010590Y005541D02*
+X011224Y006175D01*
+X012224Y006175D01*
+X011974Y006425D02*
+X011130Y006425D01*
+X010562Y005856D01*
+X010245Y005856D01*
+X010245Y006171D02*
+X010595Y006171D01*
+X011099Y006675D01*
+X011755Y006675D01*
+X011505Y006925D02*
+X011037Y006925D01*
+X010598Y006486D01*
+X010245Y006486D01*
+X010245Y006801D02*
+X010600Y006801D01*
+X011005Y007206D01*
+X011318Y007206D01*
+X011099Y007456D02*
+X010943Y007456D01*
+X010603Y007116D01*
+X010245Y007116D01*
+X010245Y007431D02*
+X010668Y007431D01*
+X010755Y007518D01*
+X010755Y007643D01*
+X010662Y007737D01*
+X010253Y007737D01*
+X010245Y007746D01*
+X009733Y007746D01*
+X009724Y007737D01*
+X009418Y007668D02*
+X009693Y007393D01*
+X009418Y007668D02*
+X009418Y008257D01*
+X009733Y008257D02*
+X009744Y008268D01*
+X009974Y008268D01*
+X010287Y007956D01*
+X011037Y007956D01*
+X011287Y007706D01*
+X011531Y007706D01*
+X012943Y007309D02*
+X012943Y007030D01*
+X012943Y007309D02*
+X013309Y007675D01*
+X013849Y007675D01*
+X013943Y007768D01*
+X016005Y007109D02*
+X016005Y006581D01*
+X016877Y006107D02*
+X017255Y006485D01*
+X017255Y006487D01*
+X017662Y006112D02*
+X017267Y005718D01*
+X017627Y005328D02*
+X017657Y005328D01*
+X017690Y005328D01*
+X018068Y005706D01*
+X021130Y006143D02*
+X021130Y008419D01*
+X021693Y008218D02*
+X021705Y008206D01*
+X021755Y008206D01*
+X021755Y008237D01*
+X021912Y008393D01*
+X014193Y005675D02*
+X013974Y005675D01*
+X013319Y005020D01*
+X012662Y005020D01*
+X012687Y005393D02*
+X012687Y005450D01*
+X013130Y005893D01*
+X013318Y005893D01*
+X013297Y005914D01*
+X013297Y005987D01*
+X013317Y006006D01*
+X013318Y006007D01*
 X013318Y006425D01*
-X012537Y006425D01*
-X011724Y007237D01*
-X011724Y007762D01*
-X011718Y007768D01*
-X011224Y007768D01*
-X011037Y007956D01*
-X009849Y007956D01*
-X009787Y008018D01*
-X009787Y008204D01*
-X009733Y008257D01*
-X009733Y008666D01*
-X009662Y008737D01*
+X013297Y005987D02*
+X013287Y005976D01*
+X013724Y005768D02*
+X013349Y005393D01*
+X013199Y005393D01*
+X010590Y005541D02*
+X010245Y005541D01*
+X009724Y005038D02*
+X009733Y005029D01*
+X009724Y005038D02*
+X009724Y006268D01*
+X009412Y006143D02*
+X009412Y005035D01*
+X009418Y005029D01*
+X009103Y005029D02*
+X009099Y005033D01*
+X009099Y006018D01*
+X008788Y005736D02*
+X008788Y005029D01*
+X008473Y005029D02*
+X008473Y005517D01*
+X008474Y005518D01*
+X008787Y005737D02*
+X008788Y005736D01*
+X008630Y006300D02*
+X008381Y006300D01*
+X007537Y005455D01*
+X007537Y005038D01*
+X007528Y005029D01*
+X007528Y004902D01*
+X007537Y004893D01*
+X006511Y004893D01*
+X006037Y004930D02*
+X005999Y004893D01*
+X005380Y004893D01*
+X006037Y004930D02*
+X006037Y005175D01*
+X006403Y005541D01*
+X007016Y005541D01*
+X006568Y006143D02*
+X006162Y005737D01*
+X006005Y005456D02*
+X005818Y005643D01*
+X005324Y005643D01*
+X004812Y005643D02*
+X004787Y005669D01*
+X004787Y005700D01*
+X004763Y005693D02*
+X004812Y005643D01*
+X004787Y005669D02*
+X004787Y005268D01*
+X004763Y005693D02*
+X004763Y006171D01*
+X004763Y006801D01*
+X004763Y006486D01*
+X004763Y006171D01*
+X005373Y006171D02*
+X005665Y006171D01*
+X005693Y006143D01*
+X005693Y005956D01*
+X006193Y006143D02*
+X006380Y006331D01*
+X006380Y007183D01*
+X006628Y007431D01*
+X007016Y007431D01*
+X007016Y007116D02*
+X008728Y007116D01*
+X008755Y007143D01*
+X009020Y007393D02*
+X009412Y007002D01*
+X009412Y006737D01*
+X009318Y006643D01*
+X008380Y006643D01*
+X008193Y006893D02*
+X009162Y006893D01*
+X009020Y007393D02*
+X007880Y007393D01*
+X007528Y007746D01*
+X007528Y008257D01*
+X007843Y008257D02*
+X007843Y007780D01*
+X008073Y007550D01*
+X009037Y007550D01*
+X009162Y007675D01*
+X008474Y007800D02*
+X008474Y008256D01*
+X008473Y008257D01*
 X008473Y008737D01*
 X007099Y008737D01*
 X006974Y008612D01*
 X006974Y008262D01*
 X006949Y008237D01*
-X006437Y008237D02*
-X006437Y008555D01*
-X006349Y008643D01*
-X006068Y008362D02*
-X005849Y008581D01*
+X006443Y008243D02*
+X006443Y008643D01*
+X006005Y008393D02*
+X005818Y008581D01*
 X004880Y008581D01*
 X004818Y008518D01*
 X004818Y008274D01*
@@ -1739,207 +1926,29 @@ X005373Y006486D02*
 X005788Y006486D01*
 X005818Y006456D01*
 X006099Y006612D02*
-X006099Y007639D01*
-X006206Y007746D01*
+X006099Y007253D01*
+X006591Y007746D01*
 X007016Y007746D01*
-X007528Y007746D02*
-X007880Y007393D01*
-X009380Y007393D01*
-X009568Y007206D01*
-X009568Y006737D01*
-X009380Y006550D01*
-X008380Y006550D01*
-X008630Y006300D02*
-X008031Y006300D01*
-X007537Y005805D01*
-X007537Y005038D01*
-X007528Y005029D01*
-X007528Y004902D01*
-X007537Y004893D01*
-X006511Y004893D01*
-X006037Y004930D02*
-X005999Y004893D01*
-X005380Y004893D01*
-X006037Y004930D02*
-X006037Y005175D01*
-X006403Y005541D01*
-X007016Y005541D01*
-X006474Y006050D02*
-X006162Y005737D01*
-X006005Y005456D02*
-X005818Y005643D01*
-X005324Y005643D01*
-X004812Y005643D02*
-X004787Y005669D01*
-X004787Y005700D01*
-X004763Y005693D02*
-X004812Y005643D01*
-X004787Y005669D02*
-X004787Y005268D01*
-X004763Y005693D02*
-X004763Y006171D01*
+X006443Y008243D02*
+X006437Y008237D01*
+X004763Y007116D02*
 X004763Y006801D01*
-X004763Y006486D01*
-X004763Y006171D01*
-X005373Y006171D02*
-X005665Y006171D01*
-X005693Y006143D01*
-X005693Y005956D01*
-X006193Y006081D02*
-X006318Y006206D01*
-X006318Y006518D01*
-X006443Y006643D01*
-X006443Y007382D01*
-X006492Y007431D01*
-X007016Y007431D01*
-X007016Y007116D02*
-X008978Y007116D01*
-X009037Y007143D01*
-X009287Y006862D02*
-X007192Y006863D01*
-X007016Y006801D01*
-X007016Y006486D02*
-X006537Y006486D01*
-X006474Y006423D01*
-X006473Y006423D01*
-X006474Y006112D01*
-X006474Y006050D01*
-X004763Y006801D02*
-X004763Y007116D01*
-X007528Y007746D02*
-X007528Y008257D01*
-X007843Y008257D02*
-X007843Y007780D01*
-X008073Y007550D01*
-X009037Y007550D01*
-X009130Y007643D01*
-X009630Y007643D02*
-X009733Y007746D01*
-X010245Y007746D01*
-X010574Y007431D02*
-X010849Y007706D01*
-X010943Y007456D02*
-X010603Y007116D01*
-X010245Y007116D01*
-X010245Y007431D02*
-X010574Y007431D01*
-X010943Y007456D02*
-X011099Y007456D01*
-X011005Y007206D02*
-X010600Y006801D01*
-X010245Y006801D01*
-X010245Y006486D02*
-X010598Y006486D01*
-X011037Y006925D01*
-X011505Y006925D01*
-X011755Y006675D02*
-X011099Y006675D01*
-X010595Y006171D01*
-X010245Y006171D01*
-X010245Y005856D02*
-X010562Y005856D01*
-X011130Y006425D01*
-X011974Y006425D01*
-X012224Y006175D02*
-X011224Y006175D01*
-X010590Y005541D01*
-X010245Y005541D01*
-X011130Y005393D02*
-X011755Y005393D01*
-X012474Y004675D01*
-X013318Y004675D01*
-X014005Y005362D01*
-X013974Y005675D02*
-X014193Y005675D01*
-X013974Y005675D02*
-X013319Y005020D01*
-X012662Y005020D01*
-X012687Y005393D02*
-X012687Y005450D01*
-X013130Y005893D01*
-X013318Y005893D01*
-X013297Y005914D01*
-X013297Y005987D01*
-X013317Y006006D01*
-X013318Y006007D01*
-X013318Y006425D01*
-X013255Y006643D02*
-X012630Y006643D01*
-X012568Y006706D01*
-X012568Y007031D01*
-X012569Y007030D01*
-X012569Y007713D01*
-X012624Y007768D01*
-X012624Y008200D01*
-X012818Y008393D01*
-X012230Y008277D02*
-X012114Y008393D01*
-X011693Y008393D01*
-X012230Y008277D02*
-X012230Y007768D01*
-X012943Y007331D02*
-X013130Y007518D01*
-X013130Y007762D01*
-X013136Y007768D01*
-X013443Y007768D01*
-X013317Y007330D02*
-X013912Y007925D01*
-X014474Y007925D01*
-X014943Y008393D02*
-X014999Y008337D01*
-X013317Y007330D02*
-X013317Y007030D01*
-X013317Y006705D01*
-X013255Y006643D01*
-X013880Y006356D02*
-X014156Y006356D01*
-X014380Y006581D01*
-X016005Y006581D01*
-X015505Y006300D02*
-X015505Y004983D01*
-X015005Y004983D02*
-X015005Y006300D01*
-X014474Y006112D02*
-X014474Y005014D01*
-X014505Y004983D01*
-X013724Y005768D02*
-X013349Y005393D01*
-X013199Y005393D01*
-X013287Y005976D02*
-X013297Y005987D01*
-X012943Y007030D02*
-X012943Y007331D01*
-X011318Y007206D02*
-X011005Y007206D01*
-X009724Y006268D02*
-X009724Y005038D01*
-X009733Y005029D01*
-X009418Y005029D02*
-X009412Y005035D01*
-X009412Y006143D01*
-X009099Y006018D02*
-X009099Y005033D01*
-X009103Y005029D01*
-X008788Y005029D02*
-X008788Y005676D01*
-X008787Y005737D01*
-X008474Y005518D02*
-X008473Y005517D01*
-X008473Y005029D01*
-X008162Y005025D02*
-X008158Y005029D01*
-X008162Y005025D02*
+X006568Y006423D02*
+X006568Y006143D01*
+X006568Y006423D02*
+X006630Y006486D01*
+X007016Y006486D01*
+X007016Y006801D02*
+X008100Y006801D01*
+X008193Y006893D01*
+X009733Y008257D02*
+X009733Y008666D01*
+X009662Y008737D01*
+X008473Y008737D01*
+X008158Y005029D02*
+X008162Y005025D01*
 X008162Y004612D01*
 X008224Y004550D01*
 X010099Y004550D01*
 X010349Y004800D01*
-X008474Y007800D02*
-X008474Y008256D01*
-X008473Y008257D01*
-X008473Y008737D01*
-X021693Y008218D02*
-X021705Y008206D01*
-X021755Y008206D01*
-X021755Y008237D01*
-X021912Y008393D01*
 M02*
diff --git a/CAM/zoncoffee.GTO b/CAM/zoncoffee.GTO
--- a/CAM/zoncoffee.GTO
+++ b/CAM/zoncoffee.GTO
@@ -14,25 +14,26 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD14C,0.0020*%
 %ADD15C,0.0040*%
 %ADD16R,0.0050X0.0305*%
-%ADD17C,0.0160*%
-%ADD18R,0.0160X0.0280*%
-%ADD19R,0.0100X0.0020*%
-%ADD20R,0.0160X0.0020*%
-%ADD21R,0.0180X0.0020*%
-%ADD22R,0.0240X0.0020*%
-%ADD23R,0.0140X0.0020*%
-%ADD24R,0.0060X0.0020*%
-%ADD25R,0.0120X0.0020*%
-%ADD26R,0.0080X0.0020*%
-%ADD27R,0.0300X0.0020*%
-%ADD28R,0.0200X0.0020*%
-%ADD29R,0.0280X0.0020*%
-%ADD30R,0.0440X0.0020*%
-%ADD31R,0.0220X0.0020*%
-%ADD32R,0.0260X0.0020*%
-%ADD33R,0.0020X0.0020*%
-%ADD34R,0.0040X0.0020*%
-%ADD35C,0.0060*%
+%ADD17C,0.0220*%
+%ADD18C,0.0160*%
+%ADD19R,0.0160X0.0280*%
+%ADD20R,0.0100X0.0020*%
+%ADD21R,0.0160X0.0020*%
+%ADD22R,0.0180X0.0020*%
+%ADD23R,0.0240X0.0020*%
+%ADD24R,0.0140X0.0020*%
+%ADD25R,0.0060X0.0020*%
+%ADD26R,0.0120X0.0020*%
+%ADD27R,0.0080X0.0020*%
+%ADD28R,0.0300X0.0020*%
+%ADD29R,0.0200X0.0020*%
+%ADD30R,0.0280X0.0020*%
+%ADD31R,0.0440X0.0020*%
+%ADD32R,0.0220X0.0020*%
+%ADD33R,0.0260X0.0020*%
+%ADD34R,0.0020X0.0020*%
+%ADD35R,0.0040X0.0020*%
+%ADD36C,0.0060*%
 D10*
 X004943Y002737D02*
 X005693Y002737D01*
@@ -1432,82 +1433,42 @@ X011120Y008201D01*
 X011255Y008201D02*
 X011300Y008156D01*
 X011300Y008021D01*
-X010999Y007689D02*
-X010924Y007689D01*
-X010849Y007614D01*
-X010849Y007464D01*
-X010774Y007389D01*
-X010699Y007389D01*
-X010623Y007464D01*
-X010623Y007614D01*
-X010699Y007689D01*
-X010774Y007689D01*
-X010849Y007614D01*
-X010849Y007464D02*
-X010924Y007389D01*
-X010999Y007389D01*
-X011074Y007464D01*
-X011074Y007614D01*
-X010999Y007689D01*
-X010999Y007229D02*
-X010924Y007229D01*
-X010849Y007154D01*
-X010849Y007004D01*
-X010774Y006929D01*
-X010699Y006929D01*
-X010623Y007004D01*
-X010623Y007154D01*
-X010699Y007229D01*
-X010548Y007079D02*
-X011149Y007079D01*
-X011074Y007154D02*
-X010999Y007229D01*
-X011074Y007154D02*
-X011074Y007004D01*
-X010999Y006929D01*
-X010999Y006768D02*
-X010623Y006768D01*
-X010623Y006468D02*
-X010999Y006468D01*
-X011074Y006543D01*
-X011074Y006693D01*
-X010999Y006768D01*
-X009230Y005406D02*
-X009185Y005361D01*
-X009005Y005361D01*
-X009050Y005316D02*
-X009050Y005406D01*
-X009050Y005205D02*
-X009050Y005160D01*
-X009140Y005070D01*
-X009230Y005070D02*
-X009050Y005070D01*
-X009095Y004956D02*
-X009230Y004956D01*
-X009230Y004820D01*
-X009185Y004775D01*
-X009140Y004820D01*
-X009140Y004956D01*
-X009095Y004956D02*
-X009050Y004911D01*
-X009050Y004820D01*
-X009050Y004661D02*
-X009230Y004661D01*
-X009230Y004526D01*
-X009185Y004481D01*
-X009050Y004481D01*
-X014255Y005300D02*
-X014255Y006800D01*
+X014255Y006800D02*
 X016255Y006800D01*
 X016255Y005300D01*
 X014255Y005300D01*
+X014255Y006800D01*
+X010949Y005468D02*
+X010904Y005423D01*
+X010724Y005423D01*
+X010769Y005378D02*
+X010769Y005468D01*
+X010769Y005268D02*
+X010769Y005223D01*
+X010859Y005133D01*
+X010949Y005133D02*
+X010769Y005133D01*
+X010814Y005018D02*
+X010949Y005018D01*
+X010949Y004883D01*
+X010904Y004838D01*
+X010859Y004883D01*
+X010859Y005018D01*
+X010814Y005018D02*
+X010769Y004973D01*
+X010769Y004883D01*
+X010769Y004723D02*
+X010949Y004723D01*
+X010949Y004588D01*
+X010904Y004543D01*
+X010769Y004543D01*
 D12*
-X013049Y006199D02*
-X012837Y006199D01*
-X012383Y006349D02*
-X012383Y006687D01*
-X013503Y006687D02*
-X013503Y006349D01*
+X012837Y006199D02*
+X013049Y006199D01*
+X013503Y006349D02*
+X013503Y006687D01*
+X012383Y006687D02*
+X012383Y006349D01*
 X015955Y007581D02*
 X015957Y007594D01*
 X015962Y007607D01*
@@ -1598,44 +1559,93 @@ X020571Y005305D01*
 X021201Y005305D01*
 X022264Y005305D02*
 X022264Y007982D01*
+X009955Y008581D02*
+X009957Y008594D01*
+X009962Y008607D01*
+X009971Y008618D01*
+X009982Y008625D01*
+X009995Y008630D01*
+X010008Y008631D01*
+X010022Y008628D01*
+X010034Y008622D01*
+X010044Y008613D01*
+X010051Y008601D01*
+X010055Y008588D01*
+X010055Y008574D01*
+X010051Y008561D01*
+X010044Y008549D01*
+X010034Y008540D01*
+X010022Y008534D01*
+X010008Y008531D01*
+X009995Y008532D01*
+X009982Y008537D01*
+X009971Y008544D01*
+X009962Y008555D01*
+X009957Y008568D01*
+X009955Y008581D01*
 D13*
-X019886Y006880D02*
-X019886Y006296D01*
-X019792Y006202D01*
-X019808Y006187D01*
-X019595Y005974D01*
-X019603Y005965D02*
-X019529Y005892D01*
-X019603Y005965D02*
+X016500Y006991D02*
+X016500Y006407D01*
+X016638Y006269D01*
+X016587Y006217D01*
+X016620Y006184D01*
+X016954Y005850D02*
+X017009Y005795D01*
+X017344Y005460D02*
+X017399Y005405D01*
+X017734Y005070D02*
+X017767Y005037D01*
+X017818Y005089D01*
+X017956Y004950D01*
+X018541Y004950D01*
+X018634Y005044D01*
+X018649Y005029D01*
+X018862Y005242D01*
+X018871Y005233D01*
+X018944Y005307D01*
+X018862Y005242D02*
+X018790Y005314D01*
+X018863Y005387D01*
+X019529Y005892D02*
+X019603Y005965D01*
 X019522Y006046D01*
 X019449Y005973D01*
-X018577Y006457D02*
-X018577Y006830D01*
-X018575Y006856D01*
-X018570Y006881D01*
-X018562Y006905D01*
-X018551Y006929D01*
-X018536Y006950D01*
-X018519Y006969D01*
-X018500Y006986D01*
-X018479Y007001D01*
-X018455Y007012D01*
-X018431Y007020D01*
-X018406Y007025D01*
-X018380Y007027D01*
-X018006Y007027D01*
-X017980Y007025D01*
-X017955Y007020D01*
-X017931Y007012D01*
-X017908Y007001D01*
-X017886Y006986D01*
-X017867Y006969D01*
-X017850Y006950D01*
-X017835Y006929D01*
-X017824Y006905D01*
-X017816Y006881D01*
-X017811Y006856D01*
-X017809Y006830D01*
+X019595Y005974D02*
+X019808Y006187D01*
+X019792Y006202D01*
+X019886Y006296D01*
+X019886Y006880D01*
+X019748Y007018D01*
+X019799Y007069D01*
+X019766Y007102D01*
+X019431Y007437D02*
+X019362Y007506D01*
+X019056Y007813D02*
+X018987Y007882D01*
+X018619Y008250D02*
+X018567Y008198D01*
+X018429Y008336D01*
+X017845Y008336D01*
+X017752Y008243D01*
+X017736Y008258D01*
+X017523Y008045D01*
+X017596Y007973D01*
+X017522Y007899D01*
+X017441Y007980D02*
+X017515Y008053D01*
+X017523Y008045D01*
+X017410Y007586D02*
+X017388Y007448D01*
+X017251Y007426D01*
+X016937Y007314D02*
+X016864Y007240D01*
+X016783Y007321D01*
+X016856Y007395D01*
+X016791Y007313D02*
+X016578Y007100D01*
+X016594Y007085D01*
+X016500Y006991D01*
+X017809Y006830D02*
 X017809Y006457D01*
 X017811Y006431D01*
 X017816Y006406D01*
@@ -1664,6 +1674,32 @@ X018562Y006382D01*
 X018570Y006406D01*
 X018575Y006431D01*
 X018577Y006457D01*
+X018577Y006830D01*
+X018575Y006856D01*
+X018570Y006881D01*
+X018562Y006905D01*
+X018551Y006929D01*
+X018536Y006950D01*
+X018519Y006969D01*
+X018500Y006986D01*
+X018479Y007001D01*
+X018455Y007012D01*
+X018431Y007020D01*
+X018406Y007025D01*
+X018380Y007027D01*
+X018006Y007027D01*
+X017980Y007025D01*
+X017955Y007020D01*
+X017931Y007012D01*
+X017908Y007001D01*
+X017886Y006986D01*
+X017867Y006969D01*
+X017850Y006950D01*
+X017835Y006929D01*
+X017824Y006905D01*
+X017816Y006881D01*
+X017811Y006856D01*
+X017809Y006830D01*
 X017469Y006643D02*
 X017471Y006696D01*
 X017477Y006750D01*
@@ -1750,61 +1786,8 @@ X017487Y006484D01*
 X017477Y006536D01*
 X017471Y006590D01*
 X017469Y006643D01*
-X016638Y006269D02*
-X016500Y006407D01*
-X016500Y006991D01*
-X016594Y007085D01*
-X016578Y007100D01*
-X016791Y007313D01*
-X016783Y007321D02*
-X016864Y007240D01*
-X016937Y007314D01*
-X016856Y007395D02*
-X016783Y007321D01*
-X017251Y007426D02*
-X017388Y007448D01*
-X017410Y007586D01*
-X017522Y007899D02*
-X017596Y007973D01*
-X017523Y008045D01*
-X017736Y008258D01*
-X017752Y008243D01*
-X017845Y008336D01*
-X018429Y008336D01*
-X018567Y008198D01*
+X018652Y008216D02*
 X018619Y008250D01*
-X018652Y008216D01*
-X018987Y007882D02*
-X019056Y007813D01*
-X019362Y007506D02*
-X019431Y007437D01*
-X019766Y007102D02*
-X019799Y007069D01*
-X019748Y007018D01*
-X019886Y006880D01*
-X017523Y008045D02*
-X017515Y008053D01*
-X017441Y007980D01*
-X016638Y006269D02*
-X016587Y006217D01*
-X016620Y006184D01*
-X016954Y005850D02*
-X017009Y005795D01*
-X017344Y005460D02*
-X017399Y005405D01*
-X017734Y005070D02*
-X017767Y005037D01*
-X017818Y005089D01*
-X017956Y004950D01*
-X018541Y004950D01*
-X018634Y005044D01*
-X018649Y005029D01*
-X018862Y005242D01*
-X018871Y005233D01*
-X018944Y005307D01*
-X018862Y005242D02*
-X018790Y005314D01*
-X018863Y005387D01*
 D14*
 X017396Y006643D02*
 X017398Y006699D01*
@@ -2020,14 +2003,15 @@ X005363Y007254D01*
 D16*
 X017413Y008641D03*
 D17*
-X015255Y007749D02*
-X015255Y007725D01*
-X013892Y006612D02*
-X013868Y006612D01*
-X012880Y007756D02*
-X012880Y007780D01*
-X011974Y007780D02*
-X011974Y007756D01*
+X012974Y007687D02*
+X012974Y007663D01*
+D18*
+X011787Y007694D02*
+X011787Y007718D01*
+X013868Y006612D02*
+X013892Y006612D01*
+X015255Y007725D02*
+X015255Y007749D01*
 X012943Y005405D02*
 X012943Y005381D01*
 X006693Y008225D02*
@@ -2038,10 +2022,10 @@ X005068Y007655D02*
 X005068Y007631D01*
 X006255Y004905D02*
 X006255Y004881D01*
-D18*
+D19*
 X005068Y005643D03*
 X019943Y008018D03*
-D19*
+D20*
 X019033Y004936D03*
 X019033Y004916D03*
 X019033Y004896D03*
@@ -2146,12 +2130,12 @@ X018753Y004596D03*
 X018753Y004576D03*
 X018753Y004556D03*
 X018773Y004476D03*
-D20*
+D21*
 X018783Y004496D03*
 X018783Y004516D03*
 X019463Y004796D03*
 X020243Y004796D03*
-D21*
+D22*
 X019753Y004796D03*
 X019733Y004776D03*
 X019733Y004756D03*
@@ -2159,49 +2143,49 @@ X019733Y004736D03*
 X019393Y004496D03*
 X018813Y004776D03*
 X018813Y004796D03*
-D22*
+D23*
 X019403Y004536D03*
 X019403Y004516D03*
-D23*
+D24*
 X019013Y004736D03*
 X018773Y004536D03*
 X019933Y004736D03*
 X020113Y004736D03*
-D24*
+D25*
 X019813Y004816D03*
 X019493Y004556D03*
 X020453Y004796D03*
 X020653Y004956D03*
-D25*
+D26*
 X019523Y004756D03*
 X019383Y004756D03*
 X019323Y004576D03*
 X019183Y004736D03*
 X018803Y004816D03*
-D26*
+D27*
 X018823Y004876D03*
 X019043Y004956D03*
 X019323Y004616D03*
 X020083Y004816D03*
 X020243Y004816D03*
-D27*
+D28*
 X019433Y004696D03*
 X019433Y004676D03*
 X019433Y004656D03*
-D28*
+D29*
 X018803Y004756D03*
-D29*
+D30*
 X019103Y004756D03*
 X019103Y004776D03*
-D30*
+D31*
 X020103Y004776D03*
 X020103Y004756D03*
-D31*
+D32*
 X019453Y004776D03*
-D32*
+D33*
 X019093Y004796D03*
 X020013Y004796D03*
-D33*
+D34*
 X020413Y004836D03*
 X020413Y004856D03*
 X020413Y004876D03*
@@ -2222,11 +2206,11 @@ X020673Y004876D03*
 X020693Y004896D03*
 X020693Y004916D03*
 X020693Y004936D03*
-D34*
+D35*
 X020643Y004836D03*
 X020483Y004936D03*
 X020463Y004956D03*
-D35*
+D36*
 X009904Y005446D02*
 X009827Y005370D01*
 X007433Y005370D01*
diff --git a/CAM/zoncoffee.GTP b/CAM/zoncoffee.GTP
--- a/CAM/zoncoffee.GTP
+++ b/CAM/zoncoffee.GTP
@@ -17,11 +17,12 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD17R,0.0217X0.0472*%
 %ADD18C,0.0118*%
 %ADD19R,0.0276X0.0197*%
-%ADD20R,0.0276X0.0354*%
-%ADD21R,0.0354X0.0276*%
-%ADD22R,0.0276X0.0177*%
-%ADD23R,0.0197X0.0571*%
-%ADD24R,0.0571X0.0197*%
+%ADD20R,0.0433X0.0394*%
+%ADD21R,0.0276X0.0354*%
+%ADD22R,0.0354X0.0276*%
+%ADD23R,0.0276X0.0177*%
+%ADD24R,0.0197X0.0571*%
+%ADD25R,0.0571X0.0197*%
 D10*
 X004943Y002737D02*
 X005693Y002737D01*
@@ -1476,14 +1477,17 @@ D19*
 X017718Y008643D03*
 X017207Y008643D03*
 D20*
-X015511Y007737D03*
+X013309Y007675D03*
+X012639Y007675D03*
+D21*
+X012043Y007706D03*
+X011531Y007706D03*
 X014999Y007737D03*
-X013136Y007768D03*
-X012624Y007768D03*
-X012230Y007768D03*
-X011718Y007768D03*
+X015511Y007737D03*
+X019687Y008018D03*
+X020199Y008018D03*
+X013199Y005393D03*
 X012687Y005393D03*
-X013199Y005393D03*
 X006949Y008237D03*
 X006437Y008237D03*
 X005324Y008268D03*
@@ -1494,52 +1498,50 @@ X005324Y005643D03*
 X004812Y005643D03*
 X005999Y004893D03*
 X006511Y004893D03*
-X019687Y008018D03*
-X020199Y008018D03*
-D21*
-X013880Y006868D03*
+D22*
 X013880Y006356D03*
-D22*
-X005373Y006486D03*
+X013880Y006868D03*
+D23*
 X005373Y006801D03*
-X005373Y007116D03*
-X004763Y007116D03*
-X004763Y006801D03*
+X005373Y006486D03*
+X005373Y006171D03*
+X004763Y006171D03*
 X004763Y006486D03*
-X004763Y006171D03*
-X005373Y006171D03*
-D23*
-X007528Y005029D03*
-X007843Y005029D03*
-X008158Y005029D03*
-X008473Y005029D03*
-X008788Y005029D03*
-X009103Y005029D03*
-X009418Y005029D03*
-X009733Y005029D03*
-X009733Y008257D03*
+X004763Y006801D03*
+X004763Y007116D03*
+X005373Y007116D03*
+D24*
+X007528Y008257D03*
+X007843Y008257D03*
+X008158Y008257D03*
+X008473Y008257D03*
+X008788Y008257D03*
+X009103Y008257D03*
 X009418Y008257D03*
-X009103Y008257D03*
-X008788Y008257D03*
-X008473Y008257D03*
-X008158Y008257D03*
-X007843Y008257D03*
-X007528Y008257D03*
-D24*
-X007016Y007746D03*
-X007016Y007431D03*
-X007016Y007116D03*
-X007016Y006801D03*
+X009733Y008257D03*
+X009733Y005029D03*
+X009418Y005029D03*
+X009103Y005029D03*
+X008788Y005029D03*
+X008473Y005029D03*
+X008158Y005029D03*
+X007843Y005029D03*
+X007528Y005029D03*
+D25*
+X007016Y005541D03*
+X007016Y005856D03*
+X007016Y006171D03*
 X007016Y006486D03*
-X007016Y006171D03*
-X007016Y005856D03*
-X007016Y005541D03*
-X010245Y005541D03*
-X010245Y005856D03*
+X007016Y006801D03*
+X007016Y007116D03*
+X007016Y007431D03*
+X007016Y007746D03*
+X010245Y007746D03*
+X010245Y007431D03*
+X010245Y007116D03*
+X010245Y006801D03*
+X010245Y006486D03*
 X010245Y006171D03*
-X010245Y006486D03*
-X010245Y006801D03*
-X010245Y007116D03*
-X010245Y007431D03*
-X010245Y007746D03*
+X010245Y005856D03*
+X010245Y005541D03*
 M02*
diff --git a/CAM/zoncoffee.GTS b/CAM/zoncoffee.GTS
--- a/CAM/zoncoffee.GTS
+++ b/CAM/zoncoffee.GTS
@@ -22,11 +22,12 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD22C,0.0130*%
 %ADD23R,0.0640X0.0640*%
 %ADD24R,0.0316X0.0237*%
-%ADD25R,0.0316X0.0394*%
-%ADD26R,0.0394X0.0316*%
-%ADD27R,0.0316X0.0217*%
-%ADD28R,0.0237X0.0611*%
-%ADD29R,0.0611X0.0237*%
+%ADD25R,0.0473X0.0434*%
+%ADD26R,0.0316X0.0394*%
+%ADD27R,0.0394X0.0316*%
+%ADD28R,0.0316X0.0217*%
+%ADD29R,0.0237X0.0611*%
+%ADD30R,0.0611X0.0237*%
 D10*
 X004943Y002737D02*
 X005693Y002737D01*
@@ -1528,16 +1529,17 @@ D24*
 X017207Y008643D03*
 X017718Y008643D03*
 D25*
+X013309Y007675D03*
+X012639Y007675D03*
+D26*
+X012043Y007706D03*
+X011531Y007706D03*
+X014999Y007737D03*
+X015511Y007737D03*
 X019687Y008018D03*
 X020199Y008018D03*
-X015511Y007737D03*
-X014999Y007737D03*
-X013136Y007768D03*
-X012624Y007768D03*
-X012230Y007768D03*
-X011718Y007768D03*
+X013199Y005393D03*
 X012687Y005393D03*
-X013199Y005393D03*
 X006949Y008237D03*
 X006437Y008237D03*
 X005324Y008268D03*
@@ -1548,10 +1550,10 @@ X005324Y005643D03*
 X004812Y005643D03*
 X005999Y004893D03*
 X006511Y004893D03*
-D26*
+D27*
 X013880Y006356D03*
 X013880Y006868D03*
-D27*
+D28*
 X005373Y006801D03*
 X005373Y006486D03*
 X005373Y006171D03*
@@ -1560,7 +1562,7 @@ X004763Y006486D03*
 X004763Y006801D03*
 X004763Y007116D03*
 X005373Y007116D03*
-D28*
+D29*
 X007528Y008257D03*
 X007843Y008257D03*
 X008158Y008257D03*
@@ -1577,7 +1579,7 @@ X008473Y005029D03*
 X008158Y005029D03*
 X007843Y005029D03*
 X007528Y005029D03*
-D29*
+D30*
 X007016Y005541D03*
 X007016Y005856D03*
 X007016Y006171D03*
diff --git a/CAM/zoncoffee.TXT b/CAM/zoncoffee.TXT
--- a/CAM/zoncoffee.TXT
+++ b/CAM/zoncoffee.TXT
@@ -14,7 +14,7 @@ X4787Y5268
 X6005Y5456
 X6162Y5737
 X5693Y5956
-X6193Y6081
+X6193Y6143
 X5818Y6456
 X6099Y6612
 X5755Y6831
@@ -22,14 +22,15 @@ X5693Y7331
 X5693Y7643
 X5693Y7956
 X5693Y8268
-X6068Y8362
-X6349Y8643
+X6005Y8393
+X6443Y8643
 X8474Y7800
-X9130Y7643
-X9630Y7643
-X9037Y7143
-X9287Y6862
-X8380Y6550
+X9162Y7675
+X9724Y7737
+X9693Y7393
+X9162Y6893
+X8755Y7143
+X8380Y6643
 X8630Y6300
 X9099Y6018
 X9412Y6143
@@ -43,24 +44,20 @@ X11755Y6675
 X11505Y6925
 X11318Y7206
 X11099Y7456
-X10849Y7706
-X13443Y7768
+X13943Y7768
 X14474Y7925
 X16693Y8643
 X18193Y8643
 X18318Y7550
-X18755Y7143
+X18693Y7081
 X19130Y6800
-X19818Y6637
-X20068Y6393
-X20130Y7143
-X20662Y7956
-X20755Y8362
-X21130Y8419
-X21912Y8393
+X19568Y6262
+X19818Y6018
+X20630Y5081
+X21130Y5112
+X18068Y5706
 X17662Y6112
 X17255Y6487
-X18068Y5706
 X16005Y6300
 X15505Y6300
 X15005Y6300
@@ -69,37 +66,40 @@ X13724Y5768
 X14193Y5675
 X14005Y5362
 X12662Y5020
-X20630Y5081
-X21130Y5112
+X20130Y7518
+X20662Y7956
+X20755Y8362
+X21130Y8419
+X21912Y8393
 T02
+X21818Y8893
+X22068Y8893
+X21568Y8893
+X21318Y8893
+X21068Y8893
+X20818Y8893
+X20568Y8893
+X20568Y4393
+X20818Y4393
 X21068Y4393
 X21318Y4393
 X21568Y4393
 X21818Y4393
 X22068Y4393
-X20818Y4393
-X20568Y4393
-X20568Y8893
-X20818Y8893
-X21068Y8893
-X21318Y8893
-X21568Y8893
-X21818Y8893
-X22068Y8893
-X6068Y8893
-X5818Y8893
+X6068Y4393
+X5818Y4393
+X5568Y4393
+X5318Y4393
+X5068Y4393
+X4818Y4393
+X4568Y4393
+X4568Y8893
+X4818Y8893
+X5068Y8893
+X5318Y8893
 X5568Y8893
-X5318Y8893
-X5068Y8893
-X4818Y8893
-X4568Y8893
-X4568Y4393
-X4818Y4393
-X5068Y4393
-X5318Y4393
-X5568Y4393
-X5818Y4393
-X6068Y4393
+X5818Y8893
+X6068Y8893
 T03
 X17664Y7172
 T04
diff --git a/CAM/zoncoffee.dri b/CAM/zoncoffee.dri
--- a/CAM/zoncoffee.dri
+++ b/CAM/zoncoffee.dri
@@ -2,7 +2,7 @@ Generated by EAGLE CAM Processor 6.5.0
 
 Drill Station Info File: /home/ethanzonca/Projects/ZonCoffeeOLED/CAM/zoncoffee.dri
 
- Date              : 12 Dec 2014 23:11:25
+ Date              : 20 Dec 2014 20:17:39
  Drills            : generated
  Device            : Excellon drill station
 
diff --git a/CAM/zoncoffee.gpi b/CAM/zoncoffee.gpi
--- a/CAM/zoncoffee.gpi
+++ b/CAM/zoncoffee.gpi
@@ -2,7 +2,7 @@ Generated by EAGLE CAM Processor 6.5.0
 
 Photoplotter Info File: /home/ethanzonca/Projects/ZonCoffeeOLED/CAM/zoncoffee.gpi
 
- Date              : 12 Dec 2014 23:11:25
+ Date              : 20 Dec 2014 20:17:40
  Plotfile          : /home/ethanzonca/Projects/ZonCoffeeOLED/CAM/zoncoffee.GTL
  Apertures         : generated: 
  Device            : Gerber RS-274-X photoplotter, coordinate format 2.4 inch
@@ -44,11 +44,12 @@ Apertures used:
  D18      draw      0.0118inch               2
  D19      square    0.0600inch               8
  D20      rectangle 0.0276inch x 0.0197inch     2
- D21      rectangle 0.0276inch x 0.0354inch    20
- D22      rectangle 0.0354inch x 0.0276inch     2
- D23      rectangle 0.0276inch x 0.0177inch     8
- D24      rectangle 0.0197inch x 0.0571inch    16
- D25      rectangle 0.0571inch x 0.0197inch    16
- D26      round     0.0240inch              62
- D27      draw      0.0080inch             233
+ D21      rectangle 0.0433inch x 0.0394inch     2
+ D22      rectangle 0.0276inch x 0.0354inch    18
+ D23      rectangle 0.0354inch x 0.0276inch     2
+ D24      rectangle 0.0276inch x 0.0177inch     8
+ D25      rectangle 0.0197inch x 0.0571inch    16
+ D26      rectangle 0.0571inch x 0.0197inch    16
+ D27      round     0.0240inch              62
+ D28      draw      0.0080inch             239
 
diff --git a/archive/eagle.epf b/archive/eagle.epf
--- a/archive/eagle.epf
+++ b/archive/eagle.epf
@@ -448,10 +448,10 @@ Job="/home/ethanzonca/Projects/protofusi
 [Win_3]
 Type="Board Editor"
 Loc="0 0 625 724"
-State=1
+State=3
 Number=2
 File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
-View="7.90754 3.70798 46.2451 14.7109"
+View="-0.503897 2.30053 45.5012 15.5041"
 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"
diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -29,9 +29,9 @@
 <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="yes" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
@@ -199,9 +199,9 @@
 <dimension x1="1.27" y1="0" x2="45.72" y2="19.05" x3="-8.89" y3="9.525" textsize="1.27" layer="209" dtype="vertical" unit="inch"/>
 <dimension x1="45.72" y1="3.81" x2="45.72" y2="15.24" x3="-5.715" y3="9.525" textsize="1.27" layer="209" dtype="vertical" unit="inch"/>
 <dimension x1="0" y1="19.685" x2="45.085" y2="19.685" x3="22.5425" y3="-5.08" textsize="1.27" layer="209" dtype="horizontal" unit="inch"/>
-<text x="13.096875" y="9.36625" size="0.8128" layer="22" ratio="16" rot="MR180">rx</text>
-<text x="10.95375" y="9.36625" size="0.8128" layer="22" ratio="16" rot="MR180">tx</text>
-<text x="12.22375" y="3.96875" size="0.8128" layer="21" ratio="16" rot="R90">uart</text>
+<text x="16.66875" y="9.2075" size="0.8128" layer="22" ratio="16" rot="MR180">rx</text>
+<text x="14.366875" y="9.2075" size="0.8128" layer="22" ratio="16" rot="MR180">tx</text>
+<text x="16.589375" y="4.1275" size="0.8128" layer="21" ratio="16" rot="R90">uart</text>
 <text x="0.396875" y="6.270625" size="0.8128" layer="22" ratio="16" rot="SMR90">Zonca 2014</text>
 <circle x="29.36875" y="11.90625" radius="0.127" width="0.2032" layer="21"/>
 <circle x="31.75" y="14.605" radius="0.127" width="0.2032" layer="21"/>
@@ -243,6 +243,7 @@
 <hole x="0.9525" y="15.24" drill="0.381"/>
 <hole x="0.3175" y="15.24" drill="0.381"/>
 <hole x="2.2225" y="15.24" drill="0.381"/>
+<circle x="14.12875" y="14.44625" radius="0.127" width="0.2032" layer="21"/>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -2282,6 +2283,22 @@ chip</description>
 <rectangle x1="-0.1999" y1="-0.3" x2="0.1999" y2="0.3" layer="35"/>
 <rectangle x1="-0.2032" y1="-0.3556" x2="0.2032" y2="0.3556" layer="21"/>
 </package>
+<package name="0603-CAP">
+<wire x1="-1.473" y1="0.983" x2="1.473" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="1.473" y1="0.983" x2="1.473" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="1.473" y1="-0.983" x2="-1.473" y2="-0.983" width="0.0508" layer="39"/>
+<wire x1="-1.473" y1="-0.983" x2="-1.473" y2="0.983" width="0.0508" layer="39"/>
+<wire x1="-0.356" y1="0.432" x2="0.356" y2="0.432" width="0.1016" layer="51"/>
+<wire x1="-0.356" y1="-0.419" x2="0.356" y2="-0.419" width="0.1016" layer="51"/>
+<wire x1="0" y1="0.0305" x2="0" y2="-0.0305" width="0.5588" layer="21"/>
+<smd name="1" x="-0.85" y="0" dx="1.1" dy="1" layer="1"/>
+<smd name="2" x="0.85" y="0" dx="1.1" dy="1" layer="1"/>
+<text x="-0.889" y="0.762" size="0.4064" layer="25" font="vector">&gt;NAME</text>
+<text x="-1.016" y="-1.143" size="0.4064" layer="27" font="vector">&gt;VALUE</text>
+<rectangle x1="-0.8382" y1="-0.4699" x2="-0.3381" y2="0.4801" layer="51"/>
+<rectangle x1="0.3302" y1="-0.4699" x2="0.8303" y2="0.4801" layer="51"/>
+<rectangle x1="-0.1999" y1="-0.3" x2="0.1999" y2="0.3" layer="35"/>
+</package>
 <package name="0402-CAP">
 <description>&lt;b&gt;CAPACITOR&lt;/b&gt;&lt;p&gt;
 chip</description>
@@ -2311,7 +2328,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 
@@ -2390,7 +2407,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="0"/>
+<param name="checkAngle" value="1"/>
 <param name="checkFont" value="1"/>
 <param name="checkRestrict" value="0"/>
 <param name="useDiameter" value="13"/>
@@ -2501,7 +2518,7 @@ design rules under a new name.</descript
 <element name="U3" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="27.46375" y="8.016875" smashed="yes" rot="R180">
 <attribute name="NAME" x="31.035625" y="6.19125" size="0.8128" layer="25" font="vector" ratio="16" rot="R90"/>
 </element>
-<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2202K-3.3TRG1" x="21.59" y="9.2075" smashed="yes" rot="R180">
+<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2210K-3.3" x="21.59" y="9.2075" smashed="yes" rot="R180">
 <attribute name="PROD_ID" value="VREG-00822" x="-13.97" y="42.2275" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="NAME" x="20.066" y="7.20725" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="22.5425" y="9.398" size="0.4064" layer="27" rot="R180"/>
@@ -2517,9 +2534,9 @@ design rules under a new name.</descript
 <attribute name="NAME" x="35.537775" y="14.290675" size="0.8128" layer="25" ratio="16"/>
 <attribute name="VALUE" x="32.3342" y="13.6144" size="0.4064" layer="27"/>
 </element>
-<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.43125" y="12.3825" smashed="yes" rot="R180">
-<attribute name="NAME" x="23.08225" y="12.557125" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="22.51075" y="13.5255" size="0.4064" layer="27" rot="R180"/>
+<element name="C5" library="SparkFun-Passives" package="0603-CAP" value="4.7uF" x="21.669375" y="12.144375" smashed="yes" rot="R180">
+<attribute name="NAME" x="23.320375" y="12.319" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="22.748875" y="13.287375" size="0.4064" layer="27" rot="R180"/>
 </element>
 <element name="C7" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="6.35" smashed="yes">
 <attribute name="NAME" x="22.240875" y="4.270375" size="0.8128" layer="25" ratio="16" rot="R90"/>
@@ -2533,23 +2550,23 @@ design rules under a new name.</descript
 <attribute name="NAME" x="23.5585" y="12.080875" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="25.11425" y="8.366125" size="0.4064" layer="27" rot="R90"/>
 </element>
-<element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="SSD1306-SPI" x="0.635" y="9.36625" smashed="yes" rot="R180">
-<attribute name="VALUE" x="30.635" y="16.86625" size="0.4064" layer="27" ratio="10" rot="R180"/>
+<element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="SSD1306-SPI" x="0.635" y="9.525" smashed="yes" rot="R180">
+<attribute name="VALUE" x="30.635" y="17.025" 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="5.715" rot="MR0"/>
 <element name="C2" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="5.715" y="13.573125" smashed="yes" rot="R180">
 <attribute name="NAME" x="5.381625" y="12.874625" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="6.7945" y="14.716125" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C1" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="19.129375" y="12.3825" smashed="yes">
-<attribute name="NAME" x="18.669" y="10.541" size="0.8128" layer="25" ratio="16" rot="R90"/>
-<attribute name="VALUE" x="18.049875" y="11.2395" size="0.4064" layer="27"/>
+<element name="C1" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="18.653125" y="12.22375" smashed="yes">
+<attribute name="NAME" x="18.19275" y="10.38225" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="17.573625" y="11.08075" size="0.4064" layer="27"/>
 </element>
 <element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="4.60375" y="5.08" smashed="yes" rot="R180">
 <attribute name="NAME" x="2.524125" y="5.81025" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="5.68325" y="6.223" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="RA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="9.525" smashed="yes" rot="R270">
+<element name="CA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="9.525" smashed="yes" rot="R270">
 <attribute name="NAME" x="3.571875" y="10.63625" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="-0.9525" y="11.1125" size="1.27" layer="27" rot="R270"/>
 </element>
@@ -2560,7 +2577,7 @@ design rules under a new name.</descript
 <element name="C3" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="12.065"/>
 <element name="U$6" library="Protofusion" package="THERM_LOGO_SMALL_0.2" value="" x="36.195" y="3.96875"/>
 <element name="C4" library="SparkFun-Passives" package="0402-CAP" value="0.01uF" x="27.46375" y="12.303125" rot="R180"/>
-<element name="U$8" library="Protofusion" package="LQFP32" value="STM32F042K-T" x="10.63625" y="9.525" smashed="yes" rot="R270"/>
+<element name="U1" library="Protofusion" package="LQFP32" value="STM32F042K-T" x="10.63625" y="9.525" smashed="yes" rot="R270"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -2581,36 +2598,32 @@ design rules under a new name.</descript
 <vertex x="45.085" y="15.24"/>
 <vertex x="0" y="15.24"/>
 </polygon>
-<via x="22.86" y="12.3825" extent="1-16" drill="0.3048"/>
-<wire x1="22.08125" y1="12.3825" x2="22.86" y2="12.3825" width="0.2032" layer="1"/>
+<via x="24.13" y="12.3825" extent="1-16" drill="0.3048"/>
 <via x="23.574375" y="7.3025" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="6"/>
 <contactref element="C1" pad="2"/>
 <contactref element="C2" pad="2"/>
 <contactref element="C6" pad="2"/>
 <via x="39.84625" y="11.7475" extent="1-16" drill="0.3048"/>
-<contactref element="RA1" pad="C1A"/>
-<contactref element="RA1" pad="C2A"/>
-<contactref element="RA1" pad="C3A"/>
-<contactref element="RA1" pad="C4A"/>
+<contactref element="CA1" pad="C1A"/>
+<contactref element="CA1" pad="C2A"/>
+<contactref element="CA1" pad="C3A"/>
+<contactref element="CA1" pad="C4A"/>
 <wire x1="0.8125" y1="10.725" x2="0.8125" y2="9.925" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="9.925" x2="0.8125" y2="9.125" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="9.125" x2="0.8125" y2="8.325" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="9.925" x2="0.8125" y2="8.325" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="10.66625" x2="5.08" y2="10.66625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="10.825" x2="5.159375" y2="10.825" width="0.2032" layer="16"/>
 <via x="36.195" y="10.63625" extent="1-16" drill="0.3048"/>
 <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.195" y2="10.63625" width="0.2032" layer="1"/>
 <via x="41.43375" y="13.890625" extent="1-16" drill="0.3048"/>
-<via x="4.841875" y="14.605" extent="1-16" drill="0.3048"/>
+<via x="5.08" 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"/>
 <wire x1="43.97375" y1="13.49375" x2="43.84625" y2="13.49375" width="0.2032" layer="1"/>
 <wire x1="43.84625" y1="13.49375" x2="43.815" y2="13.525" width="0.2032" layer="1"/>
-<wire x1="19.779375" y1="12.3825" x2="19.779375" y2="13.675225" width="0.2032" layer="1"/>
-<wire x1="19.779375" y1="13.675225" x2="19.4846" y2="13.97" width="0.2032" layer="1"/>
-<wire x1="19.4846" y1="13.97" x2="18.415" y2="13.97" width="0.2032" layer="1"/>
 <via x="42.38625" y="5.635625" extent="1-16" drill="0.3048"/>
 <via x="44.370625" y="13.97" extent="1-16" drill="0.3048"/>
 <wire x1="43.97375" y1="13.49375" x2="43.97375" y2="13.573125" width="0.2032" layer="1"/>
@@ -2626,109 +2639,120 @@ design rules under a new name.</descript
 <via x="29.36875" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="29.36875" y1="10.706875" x2="29.36875" y2="9.36625" width="0.2032" layer="1"/>
 <wire x1="29.36875" y1="9.36625" x2="29.36875" y2="8.651875" width="0.2032" layer="1"/>
-<wire x1="21.59" y1="10.5076" x2="21.59" y2="11.27125" width="0.2032" layer="1"/>
-<wire x1="21.59" y1="11.27125" x2="22.06625" y2="11.7475" width="0.2032" layer="1"/>
-<wire x1="22.06625" y1="11.7475" x2="22.06625" y2="12.3675" width="0.2032" layer="1"/>
-<wire x1="22.06625" y1="12.3675" x2="22.08125" y2="12.3825" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="8.325" x2="0.8125" y2="7.11" width="0.2032" layer="1"/>
 <wire x1="0.8125" y1="7.11" x2="0.9375" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="7.12875" x2="0.873125" y2="7.049375" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="7.049375" x2="0.9375" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="42.38625" y1="5.635625" x2="43.704375" y2="5.635625" width="0.2032" layer="1"/>
 <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"/>
+<contactref element="U1" pad="16"/>
+<contactref element="U1" pad="32"/>
 <wire x1="14.73625" y1="12.325" x2="13.43625" y2="12.325" width="0.2032" layer="1"/>
-<wire x1="13.43625" y1="12.325" x2="13.17625" y2="12.065" width="0.2032" layer="1"/>
-<via x="13.17625" y="12.065" extent="1-16" drill="0.3048"/>
-<wire x1="13.17625" y1="12.065" x2="12.54125" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="13.43625" y1="12.325" x2="13.414375" y2="12.303125" width="0.2032" layer="1"/>
+<via x="13.414375" y="12.303125" extent="1-16" drill="0.3048"/>
 <via x="2.38125" y="5.08" extent="1-16" drill="0.3048"/>
 <wire x1="3.95375" y1="5.08" x2="2.38125" y2="5.08" width="0.2032" layer="1"/>
 <wire x1="6.53625" y1="6.725" x2="4.97875" y2="6.725" width="0.2032" layer="1"/>
 <wire x1="4.97875" y1="6.725" x2="4.048125" y2="5.794375" width="0.2032" layer="1"/>
 <wire x1="4.048125" y1="5.794375" x2="4.048125" y2="5.174375" width="0.2032" layer="1"/>
 <wire x1="4.048125" y1="5.174375" x2="3.95375" y2="5.08" width="0.2032" layer="1"/>
-<wire x1="5.065" y1="13.573125" x2="5.065" y2="14.381875" width="0.2032" layer="1"/>
-<wire x1="5.065" y1="14.381875" x2="4.841875" y2="14.605" width="0.2032" layer="1"/>
 <wire x1="22.24" y1="6.35" x2="22.621875" y2="6.35" width="0.2032" layer="1"/>
 <wire x1="22.621875" y1="6.35" x2="23.574375" y2="7.3025" width="0.2032" layer="1"/>
-<wire x1="24.685625" y1="4.683125" x2="24.526875" y2="5.000625" width="0.2032" layer="16"/>
+<wire x1="24.685625" y1="4.683125" x2="24.685625" y2="4.92125" width="0.2032" layer="16"/>
 <wire x1="41.165" y1="10.825" x2="40.054375" y2="10.825" width="0.2032" layer="1"/>
 <wire x1="40.054375" y1="10.825" x2="39.84625" y2="11.033125" width="0.2032" layer="1"/>
 <wire x1="39.84625" y1="11.033125" x2="39.84625" y2="11.7475" width="0.2032" layer="1"/>
+<wire x1="5.065" y1="13.573125" x2="5.08" y2="13.588125" width="0.2032" layer="1"/>
+<wire x1="5.08" y1="13.588125" x2="5.08" y2="14.605" width="0.2032" layer="1"/>
+<contactref element="U1" pad="31"/>
+<wire x1="14.73625" y1="11.525" x2="15.81125" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="15.81125" y1="11.525" x2="16.03375" y2="11.7475" width="0.2032" layer="1"/>
+<wire x1="16.03375" y1="11.7475" x2="16.03375" y2="12.065" width="0.2032" layer="1"/>
+<wire x1="16.03375" y1="12.065" x2="15.795625" y2="12.303125" width="0.2032" layer="1"/>
+<wire x1="15.795625" y1="12.303125" x2="14.758125" y2="12.303125" width="0.2032" layer="1"/>
+<wire x1="14.758125" y1="12.303125" x2="14.73625" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="19.303125" y1="12.22375" x2="19.303125" y2="13.081875" width="0.2032" layer="1"/>
+<wire x1="19.303125" y1="13.081875" x2="18.415" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="21.59" y1="10.5076" x2="21.59" y2="11.215" width="0.2032" layer="1"/>
+<wire x1="21.59" y1="11.215" x2="22.519375" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="22.519375" y1="12.144375" x2="23.891875" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="23.891875" y1="12.144375" x2="24.13" y2="12.3825" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
 <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="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="3.175" y2="13.6525" width="0.2032" layer="1"/>
+<wire x1="3.481875" y1="13.345625" x2="3.175" y2="13.6525" width="0.2032" layer="16"/>
+<wire x1="3.481875" y1="13.345625" x2="4.434375" y2="13.345625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="13.425" x2="4.51375" y2="13.425" width="0.2032" layer="16"/>
+<wire x1="4.51375" y1="13.425" x2="4.434375" y2="13.345625" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$2">
-<via x="4.1275" y="13.890625" extent="1-16" drill="0.3048"/>
+<via x="3.96875" y="13.97" 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="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"/>
+<wire x1="1.11125" y1="14.44625" x2="3.4925" y2="14.44625" width="0.2032" layer="1"/>
+<wire x1="3.4925" y1="14.44625" x2="3.96875" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="5.3975" y1="13.97" x2="5.5025" y2="14.075" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="14.075" x2="5.5025" y2="14.075" width="0.2032" layer="16"/>
+<wire x1="5.3975" y1="13.97" x2="3.96875" y2="13.97" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$3">
 <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="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="3.175" y2="12.065" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="12.125" x2="3.235" y2="12.125" width="0.2032" layer="16"/>
+<wire x1="3.235" y1="12.125" x2="3.175" y2="12.065" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$4">
 <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="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"/>
 <wire x1="0.9375" y1="12.065" x2="0.9525" y2="12.08" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="12.775" x2="3.25875" y2="12.775" width="0.2032" layer="16"/>
+<wire x1="3.25875" y1="12.775" x2="3.175" y2="12.85875" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$8">
 <via x="3.96875" y="6.50875" extent="1-16" drill="0.3048"/>
-<wire x1="3.96875" y1="6.50875" x2="4.36125" y2="6.11625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="13"/>
-<wire x1="4.36125" y1="6.11625" x2="8.335" y2="6.11625" width="0.2032" layer="16"/>
 <wire x1="3.4925" y1="6.985" x2="3.96875" y2="6.50875" width="0.2032" layer="1"/>
 <contactref element="R3" pad="2"/>
 <wire x1="2.2375" y1="6.985" x2="3.4925" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="6.275" x2="4.2025" y2="6.275" width="0.2032" layer="16"/>
+<wire x1="4.2025" y1="6.275" x2="3.96875" y2="6.50875" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$9">
 <via x="3.4925" y="9.04875" extent="1-16" drill="0.3048"/>
 <wire x1="3.33375" y1="6.985" x2="3.33375" y2="6.22075625" width="0.2032" layer="16"/>
-<wire x1="3.33375" y1="6.22075625" x2="4.08825625" y2="5.46625" width="0.2032" layer="16"/>
-<wire x1="4.08825625" y1="5.46625" x2="8.335" y2="5.46625" width="0.2032" layer="16"/>
 <wire x1="3.33375" y1="6.985" x2="3.81" y2="7.46125" width="0.2032" layer="16"/>
 <wire x1="3.81" y1="7.46125" x2="3.81" y2="8.73125" width="0.2032" layer="16"/>
 <wire x1="3.81" y1="8.73125" x2="3.4925" y2="9.04875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="14"/>
-<contactref element="RA1" pad="C3B"/>
+<contactref element="CA1" pad="C3B"/>
 <wire x1="2.3625" y1="9.125" x2="3.41625" y2="9.125" width="0.2032" layer="1"/>
 <wire x1="3.41625" y1="9.125" x2="3.4925" y2="9.04875" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="5.625" x2="3.92950625" y2="5.625" width="0.2032" layer="16"/>
+<wire x1="3.92950625" y1="5.625" x2="3.33375" y2="6.22075625" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$15">
 <via x="3.175" y="7.77875" extent="1-16" drill="0.3048"/>
 <wire x1="2.8575" y1="7.46125" x2="2.8575" y2="6.022421875" width="0.2032" layer="16"/>
-<wire x1="2.8575" y1="6.022421875" x2="4.063671875" y2="4.81625" width="0.2032" layer="16"/>
-<wire x1="4.063671875" y1="4.81625" x2="8.335" y2="4.81625" width="0.2032" layer="16"/>
 <wire x1="2.8575" y1="7.46125" x2="3.175" y2="7.77875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="15"/>
-<contactref element="RA1" pad="C4B"/>
+<contactref element="CA1" pad="C4B"/>
 <wire x1="2.3625" y1="8.325" x2="3.105" y2="8.325" width="0.2032" layer="1"/>
 <wire x1="3.105" y1="8.325" x2="3.175" y2="8.255" width="0.2032" layer="1"/>
 <wire x1="3.175" y1="8.255" x2="3.175" y2="7.77875" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="4.975" x2="3.904921875" y2="4.975" width="0.2032" layer="16"/>
+<wire x1="3.904921875" y1="4.975" x2="2.8575" y2="6.022421875" width="0.2032" layer="16"/>
 </signal>
 <signal name="3.3V">
 <contactref element="U2" pad="5"/>
@@ -2740,28 +2764,19 @@ design rules under a new name.</descript
 <wire x1="22.5425" y1="8.969375" x2="20.558125" y2="8.969375" width="0.2032" layer="1"/>
 <contactref element="LCD1" pad="5"/>
 <contactref element="LCD1" pad="7"/>
-<wire x1="8.335" y1="10.01625" x2="7.55625" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="3.22" y1="11.31625" x2="8.335" y2="11.31625" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="10.175" x2="8.35" y2="10.16" 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"/>
+<contactref element="CA1" pad="C1B"/>
+<contactref element="CA1" pad="C2B"/>
 <via x="3.33375" y="10.00125" extent="1-16" drill="0.3048"/>
-<wire x1="10.63625" y1="8.651875" x2="10.63625" y2="10.00125" width="0.2032" layer="16"/>
-<wire x1="7.55625" y1="10.00125" x2="10.63625" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="10.239375" y1="11.43" x2="10.239375" y2="12.461875" 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.63625" y1="10.00125" x2="10.63625" y2="11.31625" width="0.2032" layer="16"/>
-<wire x1="8.335" y1="11.31625" x2="10.63625" y2="11.31625" width="0.2032" layer="16"/>
-<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.224375" y2="12.3825" width="0.2032" layer="1"/>
-<wire x1="17.224375" y1="12.3825" x2="16.748125" y2="12.85875" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="10.01625" x2="3.34875" y2="10.01625" width="0.2032" layer="16"/>
-<wire x1="3.34875" y1="10.01625" x2="3.33375" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="17.383125" y1="12.22375" x2="16.748125" y2="12.85875" width="0.2032" layer="1"/>
 <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.463125" y1="7.830525" x2="22.490725" y2="7.858125" width="0.2032" layer="1"/>
 <wire x1="23.97125" y1="10.095625" x2="23.97125" y2="10.63625" width="0.2032" layer="1"/>
@@ -2770,10 +2785,9 @@ design rules under a new name.</descript
 <wire x1="25.470625" y1="10.795" x2="25.55875" y2="10.706875" width="0.2032" layer="1"/>
 <wire x1="22.5425" y1="8.969375" x2="22.845" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="22.845" y1="8.969375" x2="23.97125" y2="10.095625" width="0.2032" layer="1"/>
-<contactref element="U$8" pad="1"/>
-<contactref element="U$8" pad="5"/>
-<contactref element="U$8" pad="17"/>
-<wire x1="16.748125" y1="12.85875" x2="13.731875" y2="12.85875" width="0.2032" layer="1"/>
+<contactref element="U1" pad="1"/>
+<contactref element="U1" pad="5"/>
+<contactref element="U1" pad="17"/>
 <via x="10.63625" y="8.651875" extent="1-16" drill="0.3048"/>
 <wire x1="13.43625" y1="13.625" x2="13.43625" y2="14.6625" width="0.2032" layer="1"/>
 <wire x1="13.43625" y1="14.6625" x2="13.255625" y2="14.843125" width="0.2032" layer="1"/>
@@ -2782,21 +2796,15 @@ design rules under a new name.</descript
 <via x="10.239375" y="12.461875" extent="1-16" drill="0.3048"/>
 <wire x1="10.239375" y1="12.461875" x2="10.239375" y2="13.621875" width="0.2032" layer="1"/>
 <wire x1="10.239375" y1="13.621875" x2="10.23625" y2="13.625" width="0.2032" layer="1"/>
-<wire x1="13.731875" y1="12.85875" x2="13.573125" y2="13.0175" width="0.2032" layer="1"/>
-<wire x1="13.573125" y1="13.0175" x2="13.573125" y2="13.488125" width="0.2032" layer="1"/>
-<wire x1="13.573125" y1="13.488125" x2="13.43625" y2="13.625" width="0.2032" layer="1"/>
-<wire x1="10.63625" y1="8.651875" x2="9.113153125" y2="8.651875" width="0.2032" layer="1"/>
-<wire x1="9.113153125" y1="8.651875" x2="7.858125" y2="7.396846875" width="0.2032" layer="1"/>
-<wire x1="7.858125" y1="7.396846875" x2="7.858125" y2="5.446875" width="0.2032" layer="1"/>
+<wire x1="10.63625" y1="8.651875" x2="10.00271875" y2="8.651875" width="0.2032" layer="1"/>
+<wire x1="10.00271875" y1="8.651875" x2="7.858125" y2="6.50728125" width="0.2032" layer="1"/>
+<wire x1="7.858125" y1="6.50728125" x2="7.858125" y2="5.446875" width="0.2032" layer="1"/>
 <wire x1="7.858125" y1="5.446875" x2="7.83625" y2="5.425" width="0.2032" layer="1"/>
-<wire x1="10.63625" y1="11.31625" x2="10.63625" y2="12.065" width="0.2032" layer="16"/>
-<wire x1="10.63625" y1="12.065" x2="10.239375" y2="12.461875" width="0.2032" layer="16"/>
 <wire x1="10.23625" y1="14.843125" x2="6.746875" y2="14.843125" width="0.2032" layer="1"/>
 <wire x1="20.94" y1="6.35" x2="20.94" y2="6.49375" width="0.2032" layer="1"/>
 <wire x1="20.94" y1="6.49375" x2="22.06625" y2="7.62" width="0.2032" layer="1"/>
 <wire x1="22.490725" y1="7.858125" x2="22.54" y2="7.9074" width="0.2032" layer="1"/>
-<wire x1="20.558125" y1="8.969375" x2="18.494375" y2="11.033125" width="0.2032" layer="1"/>
-<wire x1="18.494375" y1="11.033125" x2="18.494375" y2="12.3675" width="0.2032" layer="1"/>
+<wire x1="20.558125" y1="8.969375" x2="18.003125" y2="11.524375" width="0.2032" layer="1"/>
 <wire x1="7.83625" y1="5.425" x2="7.83625" y2="5.101875" width="0.2032" layer="1"/>
 <wire x1="7.83625" y1="5.101875" x2="7.858125" y2="5.08" width="0.2032" layer="1"/>
 <wire x1="7.858125" y1="5.08" x2="5.25375" y2="5.08" width="0.2032" layer="1"/>
@@ -2806,6 +2814,23 @@ design rules under a new name.</descript
 <wire x1="6.746875" y1="14.843125" x2="6.429375" y2="14.525625" width="0.2032" layer="1"/>
 <wire x1="6.429375" y1="14.525625" x2="6.429375" y2="13.6375" width="0.2032" layer="1"/>
 <wire x1="6.429375" y1="13.6375" x2="6.365" y2="13.573125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="11.475" x2="3.37875" y2="11.475" width="0.2032" layer="16"/>
+<wire x1="3.37875" y1="11.475" x2="3.175" y2="11.27125" width="0.2032" layer="16"/>
+<wire x1="3.33375" y1="10.00125" x2="3.4925" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="3.4925" y1="10.16" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="10.63625" y1="8.651875" x2="10.63625" y2="9.823240625" width="0.2032" layer="16"/>
+<wire x1="10.63625" y1="9.823240625" x2="10.299490625" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="10.299490625" y1="10.16" x2="10.239375" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="10.239375" y1="10.16" x2="8.35" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="11.475" x2="8.38" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="8.38" y1="11.43" x2="10.239375" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="16.748125" y1="12.85875" x2="14.843125" y2="12.85875" width="0.2032" layer="1"/>
+<wire x1="14.843125" y1="12.85875" x2="14.049375" y2="13.6525" width="0.2032" layer="1"/>
+<wire x1="14.049375" y1="13.6525" x2="13.46375" y2="13.6525" width="0.2032" layer="1"/>
+<wire x1="13.46375" y1="13.6525" x2="13.43625" y2="13.625" width="0.2032" layer="1"/>
+<wire x1="10.239375" y1="11.43" x2="10.239375" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="18.003125" y1="12.22375" x2="17.383125" y2="12.22375" width="0.2032" layer="1"/>
+<wire x1="18.003125" y1="11.524375" x2="18.003125" y2="12.22375" width="0.2032" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="JP2" pad="P1"/>
@@ -2819,19 +2844,22 @@ design rules under a new name.</descript
 <wire x1="20.79625" y1="9.525" x2="20.6375" y2="9.68375" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="9.68375" x2="20.6375" y2="10.5101" width="0.2032" layer="1"/>
 <wire x1="20.6375" y1="10.5101" x2="20.64" y2="10.5076" width="0.2032" layer="1"/>
-<wire x1="20.78125" y1="12.3825" x2="20.78125" y2="13.47875" width="0.2032" layer="1"/>
-<wire x1="20.78125" y1="13.47875" x2="21.2725" y2="13.97" width="0.2032" layer="1"/>
 <via x="25.479375" y="12.779375" extent="1-16" drill="0.3048"/>
 <wire x1="32.42" y1="14.605" x2="31.115" y2="14.605" width="0.2032" layer="1"/>
 <via x="31.115" y="14.605" extent="1-16" drill="0.3048"/>
-<wire x1="20.64" y1="10.5076" x2="20.64" y2="12.24125" width="0.2032" layer="1"/>
-<wire x1="20.64" y1="12.24125" x2="20.78125" y2="12.3825" width="0.2032" layer="1"/>
 <wire x1="30.4551" y1="12.779375" x2="31.115" y2="13.439275" width="0.2032" layer="16"/>
 <wire x1="31.115" y1="13.439275" x2="31.115" y2="14.605" width="0.2032" layer="16"/>
 <wire x1="30.4551" y1="12.779375" x2="25.479375" y2="12.779375" width="0.2032" layer="16"/>
-<wire x1="22.54" y1="10.5076" x2="22.54" y2="11.26875" width="0.2032" layer="1"/>
-<wire x1="22.54" y1="11.26875" x2="24.050625" y2="12.779375" width="0.2032" layer="1"/>
-<wire x1="25.479375" y1="12.779375" x2="24.050625" y2="12.779375" width="0.2032" layer="1"/>
+<wire x1="20.64" y1="10.5076" x2="20.64" y2="11.965" width="0.2032" layer="1"/>
+<wire x1="20.64" y1="11.965" x2="20.819375" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="20.819375" y1="12.144375" x2="20.819375" y2="13.516875" width="0.2032" layer="1"/>
+<wire x1="20.819375" y1="13.516875" x2="21.2725" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="25.479375" y1="12.779375" x2="24.13" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="24.13" y1="11.43" x2="23.8125" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="23.8125" y1="11.43" x2="23.1775" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="10.5076" x2="22.54" y2="10.7925" width="0.2032" layer="1"/>
+<wire x1="22.54" y1="10.7925" x2="22.5425" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="22.5425" y1="10.795" x2="23.1775" y2="10.795" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-A">
 <contactref element="SW1" pad="1"/>
@@ -2841,7 +2869,7 @@ design rules under a new name.</descript
 <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.27375" y1="10.398125" x2="32.54375" y2="9.128125" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="28"/>
+<contactref element="U1" pad="28"/>
 <wire x1="14.73625" y1="9.125" x2="15.63375" y2="9.125" width="0.2032" layer="1"/>
 <wire x1="16.748125" y1="10.239375" x2="17.93875" y2="10.239375" width="0.2032" layer="1"/>
 <wire x1="19.3675" y1="10.398125" x2="19.20875" y2="10.239375" width="0.2032" layer="16"/>
@@ -2859,7 +2887,7 @@ design rules under a new name.</descript
 <wire x1="33.64766875" y1="6.18391875" x2="34.6075" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="30.32125" y1="9.604375" 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"/>
+<contactref element="U1" pad="26"/>
 <wire x1="14.73625" y1="7.525" x2="15.541875" y2="7.525" width="0.2032" layer="1"/>
 <wire x1="16.98625" y1="8.969375" x2="19.129375" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="15.541875" y1="7.525" x2="16.98625" y2="8.969375" width="0.2032" layer="1"/>
@@ -2868,17 +2896,17 @@ design rules under a new name.</descript
 <contactref element="SW1" pad="4"/>
 <via x="35.2425" y="11.826875" extent="1-16" drill="0.3048"/>
 <via x="16.906875" y="11.58875" extent="1-16" drill="0.3048"/>
-<wire x1="32.623125" y1="11.191875" x2="19.52625" y2="11.191875" width="0.2032" layer="16"/>
+<wire x1="32.54375" y1="11.191875" x2="19.52625" y2="11.191875" width="0.2032" layer="16"/>
 <wire x1="36.286178125" y1="12.866078125" x2="36.281703125" y2="12.866078125" width="0.2032" layer="1"/>
 <wire x1="36.281703125" y1="12.866078125" x2="35.2425" y2="11.826875" width="0.2032" layer="1"/>
-<wire x1="32.623125" y1="11.191875" x2="33.416875" y2="11.826875" width="0.2032" layer="16"/>
-<wire x1="33.416875" y1="11.826875" x2="35.2425" y2="11.826875" width="0.2032" layer="16"/>
+<wire x1="33.17875" y1="11.826875" x2="35.2425" y2="11.826875" width="0.2032" layer="16"/>
 <wire x1="19.52625" y1="11.191875" x2="19.129375" y2="11.58875" width="0.2032" layer="16"/>
 <wire x1="19.129375" y1="11.58875" x2="16.906875" y2="11.58875" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="30"/>
+<contactref element="U1" pad="30"/>
 <wire x1="16.906875" y1="11.58875" x2="16.51" y2="11.58875" width="0.2032" layer="1"/>
 <wire x1="16.51" y1="11.58875" x2="15.64625" y2="10.725" width="0.2032" layer="1"/>
 <wire x1="14.73625" y1="10.725" x2="15.64625" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="32.54375" y1="11.191875" x2="33.17875" y2="11.826875" width="0.2032" layer="16"/>
 </signal>
 <signal name="SW-D">
 <contactref element="SW1" pad="6"/>
@@ -2891,7 +2919,7 @@ design rules under a new name.</descript
 <wire x1="38.266078125" y1="10.881703125" x2="37.30625" y2="9.921875" width="0.2032" layer="1"/>
 <wire x1="31.4325" y1="10.795" x2="32.305625" y2="9.921875" width="0.2032" layer="16"/>
 <wire x1="32.305625" y1="9.921875" x2="37.30625" y2="9.921875" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="29"/>
+<contactref element="U1" pad="29"/>
 <wire x1="14.73625" y1="9.925" x2="15.64" y2="9.925" width="0.2032" layer="1"/>
 <wire x1="17.4625" y1="10.95375" x2="16.66875" y2="10.95375" width="0.2032" layer="1"/>
 <wire x1="16.66875" y1="10.95375" x2="15.64" y2="9.925" width="0.2032" layer="1"/>
@@ -2906,7 +2934,7 @@ design rules under a new name.</descript
 <wire x1="41.14824375" y1="9.50824375" x2="41.165" y2="9.525" width="0.2032" layer="1"/>
 <wire x1="36.67125" y1="6.429375" x2="38.4175" y2="8.175625" width="0.2032" layer="16"/>
 <wire x1="38.4175" y1="8.175625" x2="38.4175" y2="8.55574375" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="22"/>
+<contactref element="U1" pad="22"/>
 <via x="11.826875" y="7.9375" extent="1-16" drill="0.3048"/>
 <wire x1="11.826875" y1="5.434375" x2="11.83625" y2="5.425" width="0.2032" layer="1"/>
 <wire x1="20.875625" y1="5.400625" x2="20.875625" y2="5.794375" width="0.2032" layer="16"/>
@@ -2934,24 +2962,26 @@ design rules under a new name.</descript
 <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="38.735" y2="7.9375" width="0.2032" layer="16"/>
 <wire x1="38.735" y1="7.9375" x2="39.0525" y2="7.9375" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="21"/>
-<wire x1="19.446875" y1="5.000625" x2="17.383125" y2="7.064375" width="0.2032" layer="16"/>
+<contactref element="U1" pad="21"/>
 <wire x1="11.191875" y1="7.064375" x2="11.033125" y2="7.223125" width="0.2032" layer="16"/>
 <via x="11.033125" y="7.223125" extent="1-16" drill="0.3048"/>
-<wire x1="11.03625" y1="5.425" x2="11.03625" y2="7.0675" width="0.2032" layer="1"/>
-<wire x1="11.03625" y1="7.0675" x2="11.033125" y2="7.223125" width="0.2032" layer="1"/>
-<wire x1="11.191875" y1="7.064375" x2="16.8275" y2="7.064375" width="0.2032" layer="16"/>
-<wire x1="16.8275" y1="7.064375" x2="17.383125" y2="7.064375" width="0.2032" layer="16"/>
+<wire x1="11.191875" y1="7.064375" x2="16.51" y2="7.064375" width="0.2032" layer="16"/>
+<wire x1="16.98625" y1="7.064375" x2="17.383125" y2="7.064375" width="0.2032" layer="16"/>
 <wire x1="36.83" y1="6.0325" x2="24.526875" y2="6.0325" width="0.2032" layer="16"/>
 <wire x1="24.526875" y1="6.0325" x2="24.28875" y2="6.270625" width="0.2032" layer="16"/>
 <wire x1="16.98625" y1="6.35" x2="18.57375" y2="6.35" width="0.2032" layer="1"/>
 <wire x1="18.57375" y1="6.35" x2="20.399375" y2="4.524375" width="0.2032" layer="1"/>
 <wire x1="20.399375" y1="4.524375" x2="22.5425" y2="4.524375" width="0.2032" layer="1"/>
-<wire x1="16.98625" y1="6.35" x2="16.98625" y2="6.905625" width="0.2032" layer="16"/>
-<wire x1="16.98625" y1="6.905625" x2="16.8275" y2="7.064375" width="0.2032" layer="16"/>
-<wire x1="19.605625" y1="4.683125" x2="19.446875" y2="5.000625" width="0.2032" layer="16"/>
+<wire x1="16.98625" y1="6.35" x2="16.98625" y2="7.064375" width="0.2032" layer="16"/>
 <wire x1="41.15" y1="8.89" x2="40.005" y2="8.89" width="0.2032" layer="1"/>
 <wire x1="40.005" y1="8.89" x2="39.0525" y2="7.9375" width="0.2032" layer="1"/>
+<wire x1="11.033125" y1="7.223125" x2="11.03625" y2="7.22" width="0.2032" layer="1"/>
+<wire x1="11.03625" y1="7.22" x2="11.03625" y2="5.425" width="0.2032" layer="1"/>
+<wire x1="17.383125" y1="7.064375" x2="18.7325" y2="5.715" width="0.2032" layer="16"/>
+<wire x1="18.7325" y1="5.715" x2="19.3675" y2="5.715" width="0.2032" layer="16"/>
+<wire x1="19.3675" y1="5.715" x2="19.605625" y2="5.476875" width="0.2032" layer="16"/>
+<wire x1="19.605625" y1="5.476875" x2="19.605625" y2="4.683125" width="0.2032" layer="16"/>
+<wire x1="16.98625" y1="7.064375" x2="16.51" y2="7.064375" width="0.2032" layer="16"/>
 </signal>
 <signal name="VUSB">
 <contactref element="J2" pad="VBUS"/>
@@ -2974,14 +3004,14 @@ design rules under a new name.</descript
 </signal>
 <signal name="SSR+">
 <contactref element="JP3" pad="P1"/>
-<contactref element="U$8" pad="7"/>
+<contactref element="U1" pad="7"/>
 <wire x1="8.63625" y1="13.625" x2="8.63625" y2="12.41231875" width="0.2032" layer="1"/>
 <wire x1="8.63625" y1="12.41231875" x2="9.22169375" y2="11.826875" width="0.2032" layer="1"/>
 <wire x1="9.22169375" y1="11.826875" x2="11.668125" y2="11.826875" width="0.2032" layer="1"/>
-<via x="11.90625" y="12.065" extent="1-16" drill="0.3048"/>
-<wire x1="15.875" y1="13.97" x2="14.12875" y2="13.97" width="0.2032" layer="16"/>
-<wire x1="14.12875" y1="13.97" x2="11.90625" y2="12.065" width="0.2032" layer="16"/>
-<wire x1="11.668125" y1="11.826875" x2="11.90625" y2="12.065" width="0.2032" layer="1"/>
+<via x="11.985625" y="12.144375" extent="1-16" drill="0.3048"/>
+<wire x1="11.668125" y1="11.826875" x2="11.985625" y2="12.144375" width="0.2032" layer="1"/>
+<wire x1="11.985625" y1="12.144375" x2="13.81125" y2="13.97" width="0.2032" layer="16"/>
+<wire x1="13.81125" y1="13.97" x2="15.875" y2="13.97" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$23">
 <contactref element="LED1" pad="A"/>
@@ -2994,42 +3024,39 @@ design rules under a new name.</descript
 <wire x1="19.05" y1="12.22375" x2="19.685" y2="11.58875" width="0.2032" layer="16"/>
 <wire x1="19.685" y1="11.58875" x2="32.385" y2="11.58875" width="0.2032" layer="16"/>
 <via x="41.195625" y="12.85875" extent="1-16" drill="0.3048"/>
-<wire x1="19.05" y1="12.22375" x2="16.271875" y2="12.22375" width="0.2032" layer="16"/>
-<via x="16.271875" y="12.22375" extent="1-16" drill="0.3048"/>
+<wire x1="19.05" y1="12.22375" x2="14.76375" y2="12.22375" width="0.2032" layer="16"/>
 <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.58875" width="0.2032" layer="16"/>
+<wire x1="41.195625" y1="12.85875" x2="33.655" y2="12.85875" 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.573125" y1="11.525" x2="16.271875" y2="12.22375" width="0.2032" layer="1"/>
-<wire x1="14.73625" y1="11.525" x2="15.573125" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="32.385" y1="11.58875" x2="33.655" y2="12.85875" width="0.2032" layer="16"/>
+<contactref element="U1" pad="2"/>
+<wire x1="14.76375" y1="12.22375" x2="13.97" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="13.97" y1="11.43" x2="13.335" y2="11.43" width="0.2032" layer="16"/>
+<via x="13.335" y="11.43" extent="1-16" drill="0.3048"/>
+<wire x1="12.63625" y1="13.625" x2="12.63625" y2="12.12875" width="0.2032" layer="1"/>
+<wire x1="12.63625" y1="12.12875" x2="13.335" y2="11.43" width="0.2032" layer="1"/>
 </signal>
 <signal name="!RES">
 <via x="4.206875" y="9.445625" extent="1-16" drill="0.3048"/>
-<wire x1="7.52625" y1="8.73125" x2="7.46125" y2="8.73125" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="9"/>
-<wire x1="8.335" y1="8.71625" x2="7.47625" y2="8.71625" width="0.2032" layer="16"/>
-<wire x1="7.47625" y1="8.71625" x2="7.46125" y2="8.73125" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="9"/>
-<wire x1="6.53625" y1="12.325" x2="4.47871875" y2="12.325" width="0.2032" layer="1"/>
-<wire x1="4.47871875" y1="12.325" x2="4.206875" y2="12.05315625" width="0.2032" layer="1"/>
-<wire x1="4.206875" y1="12.05315625" x2="4.206875" y2="9.445625" width="0.2032" layer="1"/>
-<wire x1="7.46125" y1="8.73125" x2="4.92125" y2="8.73125" width="0.2032" layer="16"/>
-<wire x1="4.92125" y1="8.73125" x2="4.206875" y2="9.445625" width="0.2032" layer="16"/>
+<contactref element="U1" pad="9"/>
+<wire x1="6.53625" y1="12.325" x2="5.457221875" y2="12.325" width="0.2032" layer="1"/>
+<wire x1="5.457221875" y1="12.325" x2="4.206875" y2="11.074653125" width="0.2032" layer="1"/>
+<wire x1="4.206875" y1="11.074653125" x2="4.206875" y2="9.445625" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="8.875" x2="4.7775" y2="8.875" width="0.2032" layer="16"/>
+<wire x1="4.7775" y1="8.875" x2="4.206875" y2="9.445625" width="0.2032" layer="16"/>
 </signal>
 <signal name="D/!C">
-<via x="4.445" y="8.09625" extent="1-16" drill="0.3048"/>
-<wire x1="5.26875" y1="8.06625" x2="4.445" y2="8.09625" width="0.2032" layer="16"/>
+<via x="4.445" y="8.255" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="10"/>
-<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.53625" y1="11.525" x2="5.20379375" y2="11.525" width="0.2032" layer="1"/>
-<wire x1="4.445" y1="8.09625" x2="4.7625" y2="8.41375" width="0.2032" layer="1"/>
-<wire x1="5.08" y1="11.40120625" x2="5.20379375" y2="11.525" width="0.2032" layer="1"/>
-<wire x1="4.7625" y1="8.41375" x2="4.7625" y2="9.2075" width="0.2032" layer="1"/>
-<wire x1="4.7625" y1="9.2075" x2="5.08" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="5.08" y1="9.525" x2="5.08" y2="11.40120625" width="0.2032" layer="1"/>
+<contactref element="U1" pad="10"/>
+<wire x1="4.92125" y1="8.73125" x2="4.92125" y2="10.894946875" width="0.2032" layer="1"/>
+<wire x1="4.92125" y1="10.894946875" x2="5.551303125" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="5.551303125" y1="11.525" x2="6.53625" y2="11.525" width="0.2032" layer="1"/>
+<wire x1="4.445" y1="8.255" x2="4.92125" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="4.445" y1="8.255" x2="4.475" y2="8.225" width="0.2032" layer="16"/>
+<wire x1="4.475" y1="8.225" x2="8.335" y2="8.225" width="0.2032" layer="16"/>
 </signal>
 <signal name="T-">
 <contactref element="JP4" pad="P2"/>
@@ -3059,7 +3086,7 @@ design rules under a new name.</descript
 <wire x1="19.605625" y1="10.00125" x2="19.20875" y2="9.604375" width="0.2032" layer="16"/>
 <wire x1="19.20875" y1="9.604375" x2="18.57375" y2="9.604375" width="0.2032" layer="16"/>
 <via x="18.57375" y="9.604375" extent="1-16" drill="0.3048"/>
-<contactref element="U$8" pad="27"/>
+<contactref element="U1" pad="27"/>
 <wire x1="14.73625" y1="8.325" x2="15.6275" y2="8.325" width="0.2032" layer="1"/>
 <wire x1="16.906875" y1="9.604375" x2="18.57375" y2="9.604375" width="0.2032" layer="1"/>
 <wire x1="15.6275" y1="8.325" x2="16.906875" y2="9.604375" width="0.2032" layer="1"/>
@@ -3067,15 +3094,13 @@ design rules under a new name.</descript
 <signal name="SPI_MOSI">
 <via x="4.365625" y="7.223125" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="12"/>
-<wire x1="8.335" y1="6.76625" x2="4.8225" y2="6.76625" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="13"/>
-<wire x1="6.53625" y1="9.125" x2="5.318153125" y2="9.125" width="0.2032" layer="1"/>
-<wire x1="5.318153125" y1="9.125" x2="5.159375" y2="8.966221875" width="0.2032" layer="1"/>
-<wire x1="4.8225" y1="6.76625" x2="4.365625" y2="7.223125" width="0.2032" layer="16"/>
-<wire x1="5.159375" y1="8.966221875" x2="5.156221875" y2="8.966221875" width="0.2032" layer="1"/>
-<wire x1="5.156221875" y1="8.966221875" x2="5.159375" y2="8.175625" width="0.2032" layer="1"/>
-<wire x1="5.159375" y1="8.175625" x2="5.159375" y2="8.016875" width="0.2032" layer="1"/>
-<wire x1="5.159375" y1="8.016875" x2="4.365625" y2="7.223125" width="0.2032" layer="1"/>
+<contactref element="U1" pad="13"/>
+<wire x1="6.53625" y1="9.125" x2="5.556278125" y2="9.125" width="0.2032" layer="1"/>
+<wire x1="5.556278125" y1="9.125" x2="5.3975" y2="8.966221875" width="0.2032" layer="1"/>
+<wire x1="5.3975" y1="8.255" x2="4.365625" y2="7.223125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="6.925" x2="4.66375" y2="6.925" width="0.2032" layer="16"/>
+<wire x1="4.66375" y1="6.925" x2="4.365625" y2="7.223125" width="0.2032" layer="16"/>
+<wire x1="5.3975" y1="8.255" x2="5.3975" y2="8.966221875" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MISO">
 <contactref element="U3" pad="7"/>
@@ -3085,14 +3110,15 @@ design rules under a new name.</descript
 <wire x1="25.796875" y1="8.810625" 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"/>
-<contactref element="U$8" pad="12"/>
-<via x="12.303125" y="10.080625" extent="1-16" drill="0.3048"/>
-<wire x1="6.53625" y1="9.925" x2="6.981875" y2="10.08375" width="0.2032" layer="1"/>
-<wire x1="6.981875" y1="10.08375" x2="12.303125" y2="10.080625" width="0.2032" layer="1"/>
-<wire x1="19.52625" y1="7.699375" x2="17.145" y2="10.080625" width="0.2032" layer="16"/>
-<wire x1="17.145" y1="10.080625" x2="12.303125" y2="10.080625" width="0.2032" layer="16"/>
+<contactref element="U1" pad="12"/>
+<via x="11.985625" y="10.16" extent="1-16" drill="0.3048"/>
+<wire x1="19.52625" y1="7.699375" x2="17.065625" y2="10.16" width="0.2032" layer="16"/>
+<wire x1="17.065625" y1="10.16" x2="11.985625" y2="10.16" width="0.2032" layer="16"/>
 <wire x1="19.52625" y1="7.699375" x2="19.923125" y2="7.699375" width="0.2032" layer="16"/>
 <wire x1="19.923125" y1="7.699375" x2="21.034375" y2="8.810625" width="0.2032" layer="16"/>
+<wire x1="6.53625" y1="9.925" x2="9.29" y2="9.925" width="0.2032" layer="1"/>
+<wire x1="9.29" y1="9.925" x2="9.525" y2="10.16" width="0.2032" layer="1"/>
+<wire x1="9.525" y1="10.16" x2="11.985625" y2="10.16" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_SCK">
 <contactref element="LCD1" pad="11"/>
@@ -3100,34 +3126,34 @@ design rules under a new name.</descript
 <via x="25.479375" y="8.175625" extent="1-16" drill="0.3048"/>
 <wire x1="21.193125" y1="8.41375" x2="25.24125" y2="8.41375" width="0.2032" layer="16"/>
 <wire x1="25.24125" y1="8.41375" x2="25.479375" y2="8.175625" width="0.2032" layer="16"/>
-<wire x1="11.668125" y1="8.810625" x2="11.668125" y2="9.36625" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="11"/>
-<via x="11.668125" y="10.795" extent="1-16" drill="0.3048"/>
-<wire x1="11.668125" y1="9.36625" x2="11.668125" y2="10.795" width="0.2032" layer="16"/>
-<wire x1="6.53625" y1="10.725" x2="11.51875" y2="10.725" width="0.2032" layer="1"/>
-<wire x1="11.51875" y1="10.725" x2="11.668125" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="11.350625" y1="8.493125" x2="11.350625" y2="9.36625" width="0.2032" layer="16"/>
+<contactref element="U1" pad="11"/>
+<via x="10.95375" y="10.795" extent="1-16" drill="0.3048"/>
+<wire x1="11.350625" y1="9.36625" x2="11.350625" y2="10.398125" width="0.2032" layer="16"/>
+<wire x1="11.350625" y1="10.398125" x2="10.95375" y2="10.795" width="0.2032" layer="16"/>
+<wire x1="6.53625" y1="10.725" x2="10.88375" y2="10.725" width="0.2032" layer="1"/>
+<wire x1="10.88375" y1="10.725" x2="10.95375" y2="10.795" width="0.2032" layer="1"/>
 <wire x1="19.3675" y1="7.3025" x2="17.30375" y2="9.36625" width="0.2032" layer="16"/>
-<wire x1="8.335" y1="7.41625" x2="10.27375" y2="7.41625" width="0.2032" layer="16"/>
-<wire x1="17.30375" y1="9.36625" x2="11.668125" y2="9.36625" width="0.2032" layer="16"/>
+<wire x1="17.30375" y1="9.36625" x2="11.350625" y2="9.36625" width="0.2032" layer="16"/>
 <wire x1="19.3675" y1="7.3025" x2="20.081875" y2="7.3025" width="0.2032" layer="16"/>
 <wire x1="20.081875" y1="7.3025" x2="21.193125" y2="8.41375" width="0.2032" layer="16"/>
-<wire x1="10.27375" y1="7.41625" x2="11.668125" y2="8.810625" width="0.2032" layer="16"/>
 <wire x1="25.479375" y1="8.175625" x2="25.479375" y2="5.38625" width="0.2032" layer="1"/>
 <wire x1="25.479375" y1="5.38625" x2="25.55875" y2="5.306875" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="7.575" x2="10.4325" y2="7.575" width="0.2032" layer="16"/>
+<wire x1="10.4325" y1="7.575" x2="11.350625" y2="8.493125" width="0.2032" layer="16"/>
 </signal>
 <signal name="!CS_OLED">
 <contactref element="LCD1" pad="8"/>
-<contactref element="U$8" pad="8"/>
+<contactref element="U1" pad="8"/>
 <wire x1="7.83625" y1="13.625" x2="7.83625" y2="12.325" width="0.2032" layer="1"/>
 <wire x1="7.83625" y1="12.325" x2="8.73125" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="8.73125" y1="11.43" x2="12.54125" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="12.54125" y1="11.43" x2="13.0175" y2="10.95375" width="0.2032" layer="1"/>
-<wire x1="13.0175" y1="10.95375" x2="13.0175" y2="9.763125" width="0.2032" layer="1"/>
-<wire x1="13.0175" y1="9.763125" x2="12.54125" y2="9.286875" width="0.2032" layer="1"/>
-<wire x1="12.54125" y1="9.286875" x2="10.00125" y2="9.286875" width="0.2032" layer="1"/>
-<wire x1="8.335" y1="9.36625" x2="9.286875" y2="9.36625" width="0.2032" layer="16"/>
-<wire x1="9.286875" y1="9.36625" x2="10.00125" y2="9.286875" width="0.2032" layer="16"/>
-<via x="10.00125" y="9.286875" extent="1-16" drill="0.3048"/>
+<wire x1="8.73125" y1="11.43" x2="11.626059375" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="11.626059375" y1="11.43" x2="12.620625" y2="10.435434375" width="0.2032" layer="1"/>
+<wire x1="12.620625" y1="10.435434375" x2="12.620625" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="8.335" y1="9.525" x2="10.00125" y2="9.525" width="0.2032" layer="16"/>
+<via x="10.00125" y="9.525" extent="1-16" drill="0.3048"/>
+<wire x1="10.00125" y1="9.525" x2="12.3825" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="12.3825" y1="9.525" x2="12.620625" y2="9.763125" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_MAX">
 <contactref element="U3" pad="6"/>
@@ -3137,14 +3163,14 @@ design rules under a new name.</descript
 <via x="19.764375" y="8.334375" extent="1-16" drill="0.3048"/>
 <wire x1="20.6375" y1="9.2075" x2="26.273125" y2="9.2075" width="0.2032" layer="16"/>
 <wire x1="26.273125" y1="9.2075" x2="26.82875" y2="8.651875" width="0.2032" layer="16"/>
-<contactref element="U$8" pad="25"/>
+<contactref element="U1" pad="25"/>
 <wire x1="14.73625" y1="6.725" x2="15.615" y2="6.725" width="0.2032" layer="1"/>
 <wire x1="15.615" y1="6.725" x2="17.224375" y2="8.334375" width="0.2032" layer="1"/>
 <wire x1="19.764375" y1="8.334375" x2="17.224375" y2="8.334375" width="0.2032" layer="1"/>
 </signal>
 <signal name="AUX-TX">
 <contactref element="JP1" pad="P2"/>
-<contactref element="U$8" pad="19"/>
+<contactref element="U1" pad="19"/>
 <wire x1="15.001875" y1="4.841875" x2="14.366875" y2="4.206875" width="0.2032" layer="1"/>
 <wire x1="14.366875" y1="4.206875" x2="9.604375" y2="4.206875" width="0.2032" layer="1"/>
 <wire x1="9.604375" y1="4.206875" x2="9.445625" y2="4.365625" width="0.2032" layer="1"/>
@@ -3153,7 +3179,7 @@ design rules under a new name.</descript
 </signal>
 <signal name="AUX-RX">
 <contactref element="JP1" pad="P1"/>
-<contactref element="U$8" pad="20"/>
+<contactref element="U1" pad="20"/>
 <wire x1="10.23625" y1="5.425" x2="10.23625" y2="6.664375" width="0.2032" layer="1"/>
 <wire x1="10.23625" y1="6.664375" x2="10.239375" y2="6.6675" width="0.2032" layer="1"/>
 <via x="10.239375" y="6.6675" extent="1-16" drill="0.3048"/>
@@ -3166,7 +3192,7 @@ design rules under a new name.</descript
 </signal>
 <signal name="SWCLK">
 <contactref element="J1" pad="3"/>
-<contactref element="U$8" pad="24"/>
+<contactref element="U1" pad="24"/>
 <via x="13.414375" y="8.5725" extent="1-16" drill="0.3048"/>
 <wire x1="13.414375" y1="8.5725" x2="13.414375" y2="5.446875" width="0.2032" layer="1"/>
 <wire x1="13.414375" y1="5.446875" x2="13.43625" y2="5.425" width="0.2032" layer="1"/>
@@ -3178,7 +3204,7 @@ design rules under a new name.</descript
 </signal>
 <signal name="SWDIO">
 <contactref element="J1" pad="4"/>
-<contactref element="U$8" pad="23"/>
+<contactref element="U1" pad="23"/>
 <via x="12.620625" y="8.255" extent="1-16" drill="0.3048"/>
 <wire x1="12.620625" y1="5.440625" x2="12.63625" y2="5.425" width="0.2032" layer="1"/>
 <wire x1="22.145625" y1="4.683125" x2="22.145625" y2="6.0325" width="0.2032" layer="16"/>
diff --git a/zoncoffee.sch b/zoncoffee.sch
--- a/zoncoffee.sch
+++ b/zoncoffee.sch
@@ -8,34 +8,34 @@
 </settings>
 <grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="no" active="no"/>
-<layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
-<layer number="3" name="Route3" color="4" fill="3" visible="no" active="no"/>
-<layer number="4" name="Route4" color="1" fill="4" visible="no" active="no"/>
-<layer number="5" name="Route5" color="4" fill="4" visible="no" active="no"/>
-<layer number="6" name="Route6" color="1" fill="8" visible="no" active="no"/>
-<layer number="7" name="Route7" color="4" fill="8" visible="no" active="no"/>
-<layer number="8" name="Route8" color="1" fill="2" visible="no" active="no"/>
-<layer number="9" name="Route9" color="4" fill="2" visible="no" active="no"/>
-<layer number="10" name="Route10" color="1" fill="7" visible="no" active="no"/>
-<layer number="11" name="Route11" color="4" fill="7" visible="no" active="no"/>
-<layer number="12" name="Route12" color="1" fill="5" visible="no" active="no"/>
-<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="no"/>
-<layer number="17" name="Pads" color="2" fill="1" visible="no" active="no"/>
-<layer number="18" name="Vias" color="2" fill="1" visible="no" active="no"/>
-<layer number="19" name="Unrouted" color="6" fill="1" visible="no" active="no"/>
-<layer number="20" name="Dimension" color="15" fill="1" visible="no" active="no"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="no"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="no"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="no"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="no"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="no" active="no"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="no" active="no"/>
-<layer number="27" name="tValues" color="7" fill="1" visible="no" active="no"/>
-<layer number="28" name="bValues" color="7" fill="1" visible="no" active="no"/>
+<layer number="1" name="Top" color="4" fill="1" visible="yes" active="no"/>
+<layer number="2" name="Route2" color="1" fill="3" visible="yes" active="no"/>
+<layer number="3" name="Route3" color="4" fill="3" visible="yes" active="no"/>
+<layer number="4" name="Route4" color="1" fill="4" visible="yes" active="no"/>
+<layer number="5" name="Route5" color="4" fill="4" visible="yes" active="no"/>
+<layer number="6" name="Route6" color="1" fill="8" visible="yes" active="no"/>
+<layer number="7" name="Route7" color="4" fill="8" visible="yes" active="no"/>
+<layer number="8" name="Route8" color="1" fill="2" visible="yes" active="no"/>
+<layer number="9" name="Route9" color="4" fill="2" visible="yes" active="no"/>
+<layer number="10" name="Route10" color="1" fill="7" visible="yes" active="no"/>
+<layer number="11" name="Route11" color="4" fill="7" visible="yes" active="no"/>
+<layer number="12" name="Route12" color="1" fill="5" visible="yes" active="no"/>
+<layer number="13" name="Route13" color="4" fill="5" visible="yes" active="no"/>
+<layer number="14" name="Route14" color="1" fill="6" visible="yes" active="no"/>
+<layer number="15" name="Route15" color="4" fill="6" visible="yes" active="no"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="no"/>
+<layer number="17" name="Pads" color="2" fill="1" visible="yes" active="no"/>
+<layer number="18" name="Vias" color="2" fill="1" visible="yes" active="no"/>
+<layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="no"/>
+<layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="no"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="no"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="no"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="no"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="no"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="no"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="no"/>
+<layer number="27" name="tValues" color="7" fill="1" visible="yes" active="no"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="yes" active="no"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="no"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="no"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="no"/>
@@ -44,8 +44,8 @@
 <layer number="34" name="bFinish" color="6" fill="6" visible="no" active="no"/>
 <layer number="35" name="tGlue" color="7" fill="4" visible="no" active="no"/>
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="no"/>
-<layer number="37" name="tTest" color="7" fill="1" visible="no" active="no"/>
-<layer number="38" name="bTest" color="7" fill="1" visible="no" active="no"/>
+<layer number="37" name="tTest" color="7" fill="1" visible="yes" active="no"/>
+<layer number="38" name="bTest" color="7" fill="1" visible="yes" active="no"/>
 <layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="no"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="no"/>
 <layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="no"/>
@@ -53,17 +53,17 @@
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="no"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="no"/>
 <layer number="45" name="Holes" color="7" fill="1" visible="no" active="no"/>
-<layer number="46" name="Milling" color="3" fill="1" visible="no" active="no"/>
-<layer number="47" name="Measures" color="7" fill="1" visible="no" active="no"/>
-<layer number="48" name="Document" color="7" fill="1" visible="no" active="no"/>
-<layer number="49" name="Reference" color="7" fill="1" visible="no" active="no"/>
-<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="no"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="no"/>
-<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"/>
-<layer number="57" name="tCAD" color="7" fill="1" visible="no" active="no"/>
+<layer number="46" name="Milling" color="3" fill="1" visible="yes" active="no"/>
+<layer number="47" name="Measures" color="7" fill="1" visible="yes" active="no"/>
+<layer number="48" name="Document" color="7" fill="1" visible="yes" active="no"/>
+<layer number="49" name="Reference" color="7" fill="1" visible="yes" active="no"/>
+<layer number="50" name="dxf" color="7" fill="1" visible="yes" active="no"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="no"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="no"/>
+<layer number="53" name="tGND_GNDA" color="7" fill="9" visible="yes" active="no"/>
+<layer number="54" name="bGND_GNDA" color="1" fill="9" visible="yes" active="no"/>
+<layer number="56" name="wert" color="7" fill="1" visible="yes" active="no"/>
+<layer number="57" name="tCAD" color="7" fill="1" visible="yes" active="no"/>
 <layer number="91" name="Nets" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="92" name="Busses" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="93" name="Pins" color="2" fill="1" visible="no" active="yes"/>
@@ -4037,7 +4037,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="SW1" library="dp_devices" deviceset="JOYSTICK_SF303GJ26-3" device=""/>
 <part name="J2" library="SparkFun-Connectors" deviceset="USB" device="-MICROB"/>
 <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="U2" library="SparkFun-PowerIC" deviceset="MIC5205" device="3.3V" value="AP2210K-3.3"/>
 <part name="LED1" library="SparkFun-LED" deviceset="LED" device="0603"/>
 <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"/>
@@ -4051,7 +4051,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="U$5" library="microbuilder" deviceset="GND" device=""/>
 <part name="D1" library="SparkFun-DiscreteSemi" deviceset="DIODE" device="SOD523"/>
 <part name="SUPPLY5" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
-<part name="C5" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="4.7uF"/>
+<part name="C5" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="4.7uF"/>
 <part name="C7" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="4.7uF"/>
 <part name="R1" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES"/>
 <part name="GND3" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
@@ -4073,7 +4073,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="SUPPLY11" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <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="CA1" library="Protofusion" deviceset="CAP-ARRAY" device="" value="1uF"/>
 <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=""/>
@@ -4083,7 +4083,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="U$1" library="microbuilder" deviceset="GND" device=""/>
 <part name="SUPPLY2" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <part name="C4" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.01uF"/>
-<part name="U$8" library="Protofusion" deviceset="STM32F042K-T" device=""/>
+<part name="U1" library="Protofusion" deviceset="STM32F042K-T" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -4094,7 +4094,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <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="215.9" y="177.8" size="2.54" layer="113">TC Amp</text>
 <text x="101.6" y="172.72" size="2.54" layer="113">Micro</text>
 </plain>
 <instances>
@@ -4108,8 +4108,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <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="SUPPLY1" gate="G$1" x="246.38" y="132.08"/>
+<instance part="GND1" gate="1" x="246.38" 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"/>
@@ -4120,7 +4120,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <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="GND3" gate="1" x="246.38" y="106.68"/>
 <instance part="GND4" gate="1" x="27.94" y="38.1"/>
 <instance part="U$10" gate="G$1" x="269.24" y="152.4"/>
 <instance part="SUPPLY9" gate="G$1" x="269.24" y="167.64"/>
@@ -4129,30 +4129,30 @@ Standard 0603 ceramic capacitor, and 0.1
 <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="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="C2" gate="G$1" x="40.64" y="144.78"/>
+<instance part="C1" gate="G$1" x="27.94" y="152.4"/>
+<instance part="C6" gate="G$1" x="170.18" y="116.84"/>
+<instance part="U$14" gate="G$1" x="27.94" y="137.16"/>
+<instance part="U$15" gate="G$1" x="40.64" y="137.16"/>
+<instance part="U$16" gate="G$1" x="170.18" 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="SUPPLY11" gate="G$1" x="27.94" y="165.1"/>
+<instance part="SUPPLY12" gate="G$1" x="40.64" y="154.94"/>
+<instance part="SUPPLY13" gate="G$1" x="170.18" y="127"/>
+<instance part="CA1" gate="1" x="68.58" y="60.96" rot="R90"/>
+<instance part="CA1" gate="2" x="63.5" y="55.88" rot="R90"/>
+<instance part="CA1" gate="3" x="68.58" y="38.1" rot="R90"/>
+<instance part="CA1" 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"/>
+<instance part="J1" gate="J" x="259.08" y="63.5"/>
+<instance part="U$7" gate="G$1" x="165.1" y="157.48"/>
 <instance part="C9" gate="G$1" x="71.12" y="71.12" rot="R90"/>
 <instance part="R3" gate="G$1" x="55.88" y="40.64"/>
 <instance part="C3" gate="G$1" x="60.96" y="66.04" rot="R270"/>
 <instance part="U$1" gate="G$1" x="223.52" y="152.4"/>
 <instance part="SUPPLY2" gate="G$1" x="223.52" y="167.64"/>
 <instance part="C4" gate="G$1" x="251.46" y="162.56" rot="R180"/>
-<instance part="U$8" gate="G$1" x="111.76" y="144.78"/>
+<instance part="U1" gate="G$1" x="111.76" y="144.78"/>
 </instances>
 <busses>
 </busses>
@@ -4210,17 +4210,17 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="48.26" y="38.1"/>
 <pinref part="U$2" gate="G$1" pin="GND"/>
 <pinref part="LCD1" gate="G$1" pin="VSS"/>
-<pinref part="RA1" gate="1" pin="1"/>
-<pinref part="RA1" gate="2" pin="1"/>
-<pinref part="RA1" gate="3" pin="1"/>
-<pinref part="RA1" gate="4" pin="1"/>
+<pinref part="CA1" gate="1" pin="1"/>
+<pinref part="CA1" gate="2" pin="1"/>
+<pinref part="CA1" gate="3" pin="1"/>
+<pinref part="CA1" gate="4" pin="1"/>
 <pinref part="R3" gate="G$1" pin="1"/>
 </segment>
 <segment>
 <pinref part="JP2" gate="G$1" pin="2"/>
 <pinref part="GND1" gate="1" pin="GND"/>
-<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"/>
+<wire x1="254" y1="127" x2="246.38" y2="127" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="127" x2="246.38" y2="124.46" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U2" gate="G$1" pin="GND"/>
@@ -4241,8 +4241,8 @@ Standard 0603 ceramic capacitor, and 0.1
 </segment>
 <segment>
 <pinref part="JP3" gate="G$1" pin="2"/>
-<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"/>
+<wire x1="254" y1="111.76" x2="246.38" y2="111.76" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="111.76" x2="246.38" y2="109.22" width="0.1524" layer="91"/>
 <pinref part="GND3" gate="1" pin="GND"/>
 </segment>
 <segment>
@@ -4267,33 +4267,34 @@ Standard 0603 ceramic capacitor, and 0.1
 </segment>
 <segment>
 <pinref part="C1" gate="G$1" pin="2"/>
-<wire x1="20.32" y1="149.86" x2="20.32" y2="139.7" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="149.86" x2="27.94" 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="33.02" y1="142.24" x2="33.02" y2="139.7" width="0.1524" layer="91"/>
+<wire x1="40.64" y1="142.24" x2="40.64" 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="160.02" y1="114.3" x2="160.02" y2="111.76" width="0.1524" layer="91"/>
+<wire x1="170.18" y1="114.3" x2="170.18" y2="111.76" width="0.1524" layer="91"/>
 <pinref part="U$16" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="U$18" gate="G$1" pin="GND"/>
 <wire x1="106.68" y1="111.76" x2="106.68" y2="114.3" width="0.1524" layer="91"/>
-<pinref part="U$8" gate="G$1" pin="GND"/>
+<pinref part="U1" gate="G$1" pin="GND"/>
 </segment>
 <segment>
 <pinref part="J1" gate="J" pin="GND"/>
-<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"/>
+<wire x1="246.38" y1="66.04" x2="256.54" y2="66.04" width="0.1524" layer="91"/>
+<label x="246.38" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<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"/>
+<wire x1="152.4" y1="162.56" x2="165.1" y2="162.56" width="0.1524" layer="91"/>
+<wire x1="165.1" y1="162.56" x2="165.1" y2="160.02" width="0.1524" layer="91"/>
 <pinref part="U$7" gate="G$1" pin="GND"/>
+<pinref part="U1" gate="G$1" pin="BOOT0/I2C1_SCL/CAN_RX/PB8"/>
 </segment>
 <segment>
 <pinref part="U3" gate="G$1" pin="GND"/>
@@ -4313,14 +4314,14 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <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"/>
+<pinref part="CA1" gate="3" pin="2"/>
 </segment>
 </net>
 <net name="N$15" class="0">
 <segment>
 <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"/>
+<pinref part="CA1" gate="4" pin="2"/>
 </segment>
 </net>
 <net name="3.3V" class="0">
@@ -4337,8 +4338,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="76.2" y="60.96"/>
 <pinref part="LCD1" gate="G$1" pin="VDD"/>
 <junction x="76.2" y="55.88"/>
-<pinref part="RA1" gate="1" pin="2"/>
-<pinref part="RA1" gate="2" pin="2"/>
+<pinref part="CA1" gate="1" pin="2"/>
+<pinref part="CA1" gate="2" pin="2"/>
 </segment>
 <segment>
 <pinref part="U2" gate="G$1" pin="OUT"/>
@@ -4357,29 +4358,30 @@ Standard 0603 ceramic capacitor, and 0.1
 </segment>
 <segment>
 <pinref part="C1" gate="G$1" pin="1"/>
-<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"/>
+<wire x1="66.04" y1="162.56" x2="27.94" y2="162.56" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="162.56" x2="27.94" y2="157.48" width="0.1524" layer="91"/>
 <pinref part="SUPPLY11" gate="G$1" pin="3.3V"/>
-<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"/>
-<pinref part="U$8" gate="G$1" pin="VDD"/>
+<wire x1="27.94" y1="165.1" x2="27.94" y2="162.56" width="0.1524" layer="91"/>
+<junction x="27.94" y="162.56"/>
+<pinref part="U1" gate="G$1" pin="VDD"/>
 </segment>
 <segment>
 <pinref part="C2" gate="G$1" pin="1"/>
-<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"/>
+<wire x1="66.04" y1="152.4" x2="40.64" y2="152.4" width="0.1524" layer="91"/>
+<wire x1="40.64" y1="152.4" x2="40.64" y2="149.86" width="0.1524" layer="91"/>
 <pinref part="SUPPLY12" gate="G$1" pin="3.3V"/>
-<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"/>
-<pinref part="U$8" gate="G$1" pin="VDDA"/>
+<wire x1="40.64" y1="154.94" x2="40.64" y2="152.4" width="0.1524" layer="91"/>
+<junction x="40.64" y="152.4"/>
+<pinref part="U1" gate="G$1" pin="VDDA"/>
 </segment>
 <segment>
 <pinref part="C6" gate="G$1" pin="1"/>
-<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"/>
+<wire x1="170.18" y1="127" x2="170.18" y2="124.46" width="0.1524" layer="91"/>
 <pinref part="SUPPLY13" gate="G$1" pin="3.3V"/>
-<junction x="160.02" y="124.46"/>
-<pinref part="U$8" gate="G$1" pin="VDDIO2"/>
+<pinref part="U1" gate="G$1" pin="VDDIO2"/>
+<wire x1="170.18" y1="124.46" x2="170.18" y2="121.92" width="0.1524" layer="91"/>
+<wire x1="152.4" y1="124.46" x2="170.18" y2="124.46" width="0.1524" layer="91"/>
+<junction x="170.18" y="124.46"/>
 </segment>
 <segment>
 <pinref part="U3" gate="G$1" pin="VCC"/>
@@ -4392,8 +4394,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="JP2" gate="G$1" pin="1"/>
 <pinref part="SUPPLY1" gate="G$1" pin="V_BATT"/>
-<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"/>
+<wire x1="254" y1="129.54" x2="246.38" y2="129.54" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="129.54" x2="246.38" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U2" gate="G$1" pin="EN"/>
@@ -4420,82 +4422,82 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="SW1" gate="SW" pin="A"/>
 <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"/>
+<label x="129.54" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <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="U$8" gate="G$1" pin="SPI1_MOSI/PB5"/>
+<label x="154.94" y="152.4" size="1.27" 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="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"/>
+<label x="129.54" y="27.94" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <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="U$8" gate="G$1" pin="SPI1_SCK/PB3"/>
+<label x="154.94" y="147.32" size="1.27" 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="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"/>
+<label x="162.56" y="33.02" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
 <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="U$8" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
+<label x="154.94" y="157.48" size="1.27" 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="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"/>
+<label x="162.56" y="27.94" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
 <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="U$8" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
+<label x="154.94" y="154.94" size="1.27" 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="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"/>
+<label x="248.92" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="182.88" y="137.16" size="1.016" layer="95" xref="yes"/>
-<wire x1="152.4" y1="137.16" x2="182.88" y2="137.16" width="0.1524" layer="91"/>
-<pinref part="U$8" gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12"/>
+<label x="154.94" y="137.16" size="1.27" layer="95" xref="yes"/>
+<wire x1="152.4" y1="137.16" x2="154.94" y2="137.16" width="0.1524" layer="91"/>
+<pinref part="U1" gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12"/>
 </segment>
 <segment>
 <pinref part="J1" gate="J" pin="MOSI"/>
-<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"/>
+<wire x1="246.38" y1="58.42" x2="256.54" y2="58.42" width="0.1524" layer="91"/>
+<label x="246.38" 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="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"/>
+<label x="248.92" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="182.88" y="134.62" size="1.016" layer="95" xref="yes"/>
-<wire x1="152.4" y1="134.62" x2="182.88" y2="134.62" width="0.1524" layer="91"/>
-<pinref part="U$8" gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11"/>
+<label x="154.94" y="134.62" size="1.27" layer="95" xref="yes"/>
+<wire x1="152.4" y1="134.62" x2="154.94" y2="134.62" width="0.1524" layer="91"/>
+<pinref part="U1" gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11"/>
 </segment>
 <segment>
 <pinref part="J1" gate="J" pin="\RST"/>
-<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"/>
+<wire x1="246.38" y1="55.88" x2="256.54" y2="55.88" width="0.1524" layer="91"/>
+<label x="246.38" y="55.88" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="VUSB" class="0">
@@ -4511,20 +4513,20 @@ Standard 0603 ceramic capacitor, and 0.1
 </segment>
 <segment>
 <pinref part="J1" gate="J" pin="VCC"/>
-<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"/>
+<wire x1="256.54" y1="68.58" x2="246.38" y2="68.58" width="0.1524" layer="91"/>
+<label x="246.38" 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="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"/>
+<wire x1="254" y1="114.3" x2="246.38" y2="114.3" width="0.1524" layer="91"/>
+<label x="246.38" y="114.3" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<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="U$8" gate="G$1" pin="PA1/ADC1"/>
+<label x="63.5" y="147.32" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="63.5" 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>
 <net name="N$23" class="0">
@@ -4541,40 +4543,40 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="27.94" y="66.04" size="1.27" layer="95" rot="R90" xref="yes"/>
 </segment>
 <segment>
-<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="U$8" gate="G$1" pin="BOOT0/I2C1_SCL/CAN_RX/PB8"/>
+<wire x1="63.5" y1="160.02" x2="66.04" y2="160.02" width="0.1524" layer="91"/>
+<label x="63.5" y="160.02" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="PF0/I2C1_SDA"/>
 </segment>
 </net>
 <net name="!RES" class="0">
 <segment>
 <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"/>
+<label x="73.66" y="50.8" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="RES#"/>
 </segment>
 <segment>
-<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="U$8" gate="G$1" pin="PA3/ADC3/USART2_RX"/>
+<label x="63.5" y="142.24" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="63.5" 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="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"/>
+<label x="73.66" y="48.26" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="D/C#"/>
 </segment>
 <segment>
-<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="U$8" gate="G$1" pin="PA4/ADC4"/>
+<label x="63.5" y="139.7" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="63.5" 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="JP4" gate="G$1" pin="2"/>
-<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"/>
+<wire x1="254" y1="96.52" x2="246.38" y2="96.52" width="0.1524" layer="91"/>
+<label x="246.38" y="96.52" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <pinref part="C4" gate="G$1" pin="1"/>
@@ -4591,8 +4593,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <net name="T+" class="0">
 <segment>
 <pinref part="JP4" gate="G$1" pin="1"/>
-<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"/>
+<wire x1="254" y1="99.06" x2="246.38" y2="99.06" width="0.1524" layer="91"/>
+<label x="246.38" y="99.06" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <pinref part="C4" gate="G$1" pin="2"/>
@@ -4610,125 +4612,125 @@ Standard 0603 ceramic capacitor, and 0.1
 <segment>
 <pinref part="SW1" gate="SW" pin="CENTER"/>
 <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"/>
+<label x="129.54" y="30.48" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <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="U$8" gate="G$1" pin="SPI1_MISO/PB4"/>
+<label x="154.94" y="149.86" size="1.27" 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="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"/>
+<label x="73.66" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="SDIN"/>
 </segment>
 <segment>
-<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="U$8" gate="G$1" pin="PA7/ADC7/SPI1_MOSI"/>
+<wire x1="66.04" y1="132.08" x2="63.5" y2="132.08" width="0.1524" layer="91"/>
+<label x="63.5" 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="187.96" y1="160.02" x2="190.5" y2="160.02" width="0.1524" layer="91"/>
-<label x="187.96" y="160.02" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="187.96" y="160.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<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="U$8" gate="G$1" pin="PA6/ADC6/SPI1_MISO"/>
+<wire x1="66.04" y1="134.62" x2="63.5" y2="134.62" width="0.1524" layer="91"/>
+<label x="63.5" 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="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"/>
+<label x="73.66" y="45.72" size="1.27" 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="187.96" y1="165.1" x2="190.5" y2="165.1" width="0.1524" layer="91"/>
-<label x="187.96" y="165.1" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="187.96" y="165.1" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<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="U$8" gate="G$1" pin="PA5/ADC5/SPI1_SCK"/>
+<wire x1="66.04" y1="137.16" x2="63.5" y2="137.16" width="0.1524" layer="91"/>
+<label x="63.5" 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="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"/>
+<label x="73.66" y="53.34" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="LCD1" gate="G$1" pin="CS#"/>
 </segment>
 <segment>
-<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="U$8" gate="G$1" pin="PA2/ADC2/USART2_TX"/>
+<wire x1="66.04" y1="144.78" x2="63.5" y2="144.78" width="0.1524" layer="91"/>
+<label x="63.5" 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="187.96" y1="162.56" x2="190.5" y2="162.56" width="0.1524" layer="91"/>
-<label x="187.96" y="162.56" size="1.016" layer="95" rot="R180" xref="yes"/>
+<label x="187.96" y="162.56" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<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="U$8" gate="G$1" pin="USART2_RX/PA15"/>
+<wire x1="152.4" y1="144.78" x2="154.94" y2="144.78" width="0.1524" layer="91"/>
+<label x="154.94" 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>
-<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"/>
-<pinref part="U$8" gate="G$1" pin="USART1_TX/I2C1_SCL/PA9"/>
+<wire x1="152.4" y1="129.54" x2="154.94" y2="129.54" width="0.1524" layer="91"/>
+<label x="154.94" y="129.54" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="USART1_TX/I2C1_SCL/PA9"/>
 </segment>
 <segment>
 <pinref part="JP1" gate="G$1" pin="2"/>
-<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"/>
+<wire x1="246.38" y1="81.28" x2="254" y2="81.28" width="0.1524" layer="91"/>
+<label x="246.38" y="81.28" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="AUX-RX" class="0">
 <segment>
-<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"/>
-<pinref part="U$8" gate="G$1" pin="USART1_RX/I2C1_SDA/PA10"/>
+<wire x1="152.4" y1="132.08" x2="154.94" y2="132.08" width="0.1524" layer="91"/>
+<label x="154.94" y="132.08" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="USART1_RX/I2C1_SDA/PA10"/>
 </segment>
 <segment>
 <pinref part="JP1" gate="G$1" pin="1"/>
-<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"/>
+<wire x1="246.38" y1="83.82" x2="254" y2="83.82" width="0.1524" layer="91"/>
+<label x="246.38" y="83.82" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SWCLK" class="0">
 <segment>
 <pinref part="J1" gate="J" pin="SCK"/>
-<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"/>
+<wire x1="246.38" y1="63.5" x2="256.54" y2="63.5" width="0.1524" layer="91"/>
+<label x="246.38" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<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"/>
-<pinref part="U$8" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
+<wire x1="154.94" y1="142.24" x2="152.4" y2="142.24" width="0.1524" layer="91"/>
+<label x="154.94" y="142.24" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
 </segment>
 </net>
 <net name="SWDIO" class="0">
 <segment>
 <pinref part="J1" gate="J" pin="MISO"/>
-<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"/>
+<wire x1="246.38" y1="60.96" x2="256.54" y2="60.96" width="0.1524" layer="91"/>
+<label x="246.38" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<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"/>
-<pinref part="U$8" gate="G$1" pin="SWDIO/PA13"/>
+<wire x1="154.94" y1="139.7" x2="152.4" y2="139.7" width="0.1524" layer="91"/>
+<label x="154.94" y="139.7" size="1.27" layer="95" xref="yes"/>
+<pinref part="U1" gate="G$1" pin="SWDIO/PA13"/>
 </segment>
 </net>
 </nets>