fully routed

8 years ago · 1a122bfc67
parent dbf4b92a22
commit 1a122bfc67
18 changed files with 13287 additions and 13016 deletions
--- a/gpio.bak
+++ b/gpio.bak
@ -608,11 +608,11 @@ Text GLabel 4150 4450 0    60   Input ~ 0
 AUDIO_L1
 Text GLabel 5650 4450 2    60   Input ~ 0
 AUDIO_L2
-Text GLabel 4150 4650 0    60   Input ~ 0
+Text GLabel 4150 4550 0    60   Input ~ 0
 AUDIO_L3
 Text GLabel 5650 4050 2    60   Input ~ 0
 AUDIO_R0
-Text GLabel 4150 4550 0    60   Input ~ 0
+Text GLabel 5650 4550 2    60   Input ~ 0
 AUDIO_R1
 Text GLabel 4150 4050 0    60   Input ~ 0
 AUDIO_R2
--- a/plot/ulx3s-B.Cu.gbl
+++ b/plot/ulx3s-B.Cu.gbl
--- a/plot/ulx3s-B.Mask.gbs
+++ b/plot/ulx3s-B.Mask.gbs
@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Soldermask,Bot*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Tue May 16 14:48:21 2017*
+G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Wed May 17 14:14:23 2017*
 %MOMM*%
 %LPD*%
 G01*
@ -135,8 +135,8 @@ X177285000Y-77075000D03*
 X169030000Y-80885000D03*
 X169030000Y-78785000D03*
 D22*
-X123310000Y-66540000D03*
+X123945000Y-66540000D03*
-X123310000Y-73540000D03*
+X123945000Y-73540000D03*
 D23*
 X176965000Y-85780000D03*
 X175065000Y-85780000D03*
@ -203,14 +203,14 @@ X124582000Y-82375000D03*
 X126782000Y-80470000D03*
 X124582000Y-80470000D03*
 D28*
-X130930000Y-75687000D03*
+X130930000Y-74417000D03*
-X130930000Y-73487000D03*
+X130930000Y-72217000D03*
-X132835000Y-75687000D03*
+X132835000Y-74417000D03*
-X132835000Y-73487000D03*
+X132835000Y-72217000D03*
-X134740000Y-75687000D03*
+X134740000Y-74417000D03*
-X134740000Y-73487000D03*
+X134740000Y-72217000D03*
-X136645000Y-75687000D03*
+X136645000Y-74417000D03*
-X136645000Y-73487000D03*
+X136645000Y-72217000D03*
 D29*
 X152280000Y-69650000D03*
 X137680000Y-69650000D03*
--- a/plot/ulx3s-B.SilkS.gbo
+++ b/plot/ulx3s-B.SilkS.gbo
@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Legend,Bot*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Tue May 16 14:48:21 2017*
+G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Wed May 17 14:14:23 2017*
 %MOMM*%
 %LPD*%
 G01*
@ -339,22 +339,22 @@ X125182000Y-81145000D02*
 X126182000Y-81145000D01*
 X126182000Y-79795000D02*
 X125182000Y-79795000D01*
-X130255000Y-74087000D02*
+X130255000Y-72817000D02*
-X130255000Y-75087000D01*
+X130255000Y-73817000D01*
-X131605000Y-75087000D02*
+X131605000Y-73817000D02*
-X131605000Y-74087000D01*
+X131605000Y-72817000D01*
-X132160000Y-74087000D02*
+X132160000Y-72817000D02*
-X132160000Y-75087000D01*
+X132160000Y-73817000D01*
-X133510000Y-75087000D02*
+X133510000Y-73817000D02*
-X133510000Y-74087000D01*
+X133510000Y-72817000D01*
-X134065000Y-74087000D02*
+X134065000Y-72817000D02*
-X134065000Y-75087000D01*
+X134065000Y-73817000D01*
-X135415000Y-75087000D02*
+X135415000Y-73817000D02*
-X135415000Y-74087000D01*
+X135415000Y-72817000D01*
-X135970000Y-74087000D02*
+X135970000Y-72817000D02*
-X135970000Y-75087000D01*
+X135970000Y-73817000D01*
-X137320000Y-75087000D02*
+X137320000Y-73817000D02*
-X137320000Y-74087000D01*
+X137320000Y-72817000D01*
 X115655000Y-84745000D02*
 X115705000Y-84745000D01*
 X115655000Y-88895000D02*
@ -2152,176 +2152,176 @@ X125943905Y-78308095D01*
 X125039143Y-78022381D02*
 X124372476Y-78022381D01*
 X124801048Y-79022381D01*
-X133282381Y-73944143D02*
+X133282381Y-72674143D02*
-X132806190Y-73610809D01*
+X132806190Y-72340809D01*
-X133282381Y-73372714D02*
+X133282381Y-72102714D02*
-X132282381Y-73372714D01*
+X132282381Y-72102714D01*
-X132282381Y-73753667D01*
+X132282381Y-72483667D01*
-X132330000Y-73848905D01*
+X132330000Y-72578905D01*
-X132377619Y-73896524D01*
+X132377619Y-72626524D01*
-X132472857Y-73944143D01*
+X132472857Y-72674143D01*
-X132615714Y-73944143D01*
+X132615714Y-72674143D01*
-X132710952Y-73896524D01*
+X132710952Y-72626524D01*
-X132758571Y-73848905D01*
+X132758571Y-72578905D01*
-X132806190Y-73753667D01*
+X132806190Y-72483667D01*
-X132806190Y-73372714D01*
+X132806190Y-72102714D01*
-X133282381Y-74896524D02*
+X133282381Y-73626524D02*
-X133282381Y-74325095D01*
+X133282381Y-73055095D01*
-X133282381Y-74610809D02*
+X133282381Y-73340809D02*
-X132282381Y-74610809D01*
+X132282381Y-73340809D01*
-X132425238Y-74515571D01*
+X132425238Y-73245571D01*
-X132520476Y-74420333D01*
+X132520476Y-73150333D01*
-X132568095Y-74325095D01*
+X132568095Y-73055095D01*
-X132710952Y-75467952D02*
+X132710952Y-74197952D02*
-X132663333Y-75372714D01*
+X132663333Y-74102714D01*
-X132615714Y-75325095D01*
+X132615714Y-74055095D01*
-X132520476Y-75277476D01*
+X132520476Y-74007476D01*
-X132472857Y-75277476D01*
+X132472857Y-74007476D01*
-X132377619Y-75325095D01*
+X132377619Y-74055095D01*
-X132330000Y-75372714D01*
+X132330000Y-74102714D01*
-X132282381Y-75467952D01*
+X132282381Y-74197952D01*
-X132282381Y-75658429D01*
+X132282381Y-74388429D01*
-X132330000Y-75753667D01*
+X132330000Y-74483667D01*
-X132377619Y-75801286D01*
+X132377619Y-74531286D01*
-X132472857Y-75848905D01*
+X132472857Y-74578905D01*
-X132520476Y-75848905D01*
+X132520476Y-74578905D01*
-X132615714Y-75801286D01*
+X132615714Y-74531286D01*
-X132663333Y-75753667D01*
+X132663333Y-74483667D01*
-X132710952Y-75658429D01*
+X132710952Y-74388429D01*
-X132710952Y-75467952D01*
+X132710952Y-74197952D01*
-X132758571Y-75372714D01*
+X132758571Y-74102714D01*
-X132806190Y-75325095D01*
+X132806190Y-74055095D01*
-X132901429Y-75277476D01*
+X132901429Y-74007476D01*
-X133091905Y-75277476D01*
+X133091905Y-74007476D01*
-X133187143Y-75325095D01*
+X133187143Y-74055095D01*
-X133234762Y-75372714D01*
+X133234762Y-74102714D01*
-X133282381Y-75467952D01*
+X133282381Y-74197952D01*
-X133282381Y-75658429D01*
+X133282381Y-74388429D01*
-X133234762Y-75753667D01*
+X133234762Y-74483667D01*
-X133187143Y-75801286D01*
+X133187143Y-74531286D01*
-X133091905Y-75848905D01*
+X133091905Y-74578905D01*
-X132901429Y-75848905D01*
+X132901429Y-74578905D01*
-X132806190Y-75801286D01*
+X132806190Y-74531286D01*
-X132758571Y-75753667D01*
+X132758571Y-74483667D01*
-X132710952Y-75658429D01*
+X132710952Y-74388429D01*
-X135187381Y-73944143D02*
+X135187381Y-72674143D02*
-X134711190Y-73610809D01*
+X134711190Y-72340809D01*
-X135187381Y-73372714D02*
+X135187381Y-72102714D02*
-X134187381Y-73372714D01*
+X134187381Y-72102714D01*
-X134187381Y-73753667D01*
+X134187381Y-72483667D01*
-X134235000Y-73848905D01*
+X134235000Y-72578905D01*
-X134282619Y-73896524D01*
+X134282619Y-72626524D01*
-X134377857Y-73944143D01*
+X134377857Y-72674143D01*
-X134520714Y-73944143D01*
+X134520714Y-72674143D01*
-X134615952Y-73896524D01*
+X134615952Y-72626524D01*
-X134663571Y-73848905D01*
+X134663571Y-72578905D01*
-X134711190Y-73753667D01*
+X134711190Y-72483667D01*
-X134711190Y-73372714D01*
+X134711190Y-72102714D01*
-X135187381Y-74896524D02*
+X135187381Y-73626524D02*
-X135187381Y-74325095D01*
+X135187381Y-73055095D01*
-X135187381Y-74610809D02*
+X135187381Y-73340809D02*
-X134187381Y-74610809D01*
+X134187381Y-73340809D01*
-X134330238Y-74515571D01*
+X134330238Y-73245571D01*
-X134425476Y-74420333D01*
+X134425476Y-73150333D01*
-X134473095Y-74325095D01*
+X134473095Y-73055095D01*
-X135187381Y-75372714D02*
+X135187381Y-74102714D02*
-X135187381Y-75563190D01*
+X135187381Y-74293190D01*
-X135139762Y-75658429D01*
+X135139762Y-74388429D01*
-X135092143Y-75706048D01*
+X135092143Y-74436048D01*
-X134949286Y-75801286D01*
+X134949286Y-74531286D01*
-X134758810Y-75848905D01*
+X134758810Y-74578905D01*
-X134377857Y-75848905D01*
+X134377857Y-74578905D01*
-X134282619Y-75801286D01*
+X134282619Y-74531286D01*
-X134235000Y-75753667D01*
+X134235000Y-74483667D01*
-X134187381Y-75658429D01*
+X134187381Y-74388429D01*
-X134187381Y-75467952D01*
+X134187381Y-74197952D01*
-X134235000Y-75372714D01*
+X134235000Y-74102714D01*
-X134282619Y-75325095D01*
+X134282619Y-74055095D01*
-X134377857Y-75277476D01*
+X134377857Y-74007476D01*
-X134615952Y-75277476D01*
+X134615952Y-74007476D01*
-X134711190Y-75325095D01*
+X134711190Y-74055095D01*
-X134758810Y-75372714D01*
+X134758810Y-74102714D01*
-X134806429Y-75467952D01*
+X134806429Y-74197952D01*
-X134806429Y-75658429D01*
+X134806429Y-74388429D01*
-X134758810Y-75753667D01*
+X134758810Y-74483667D01*
-X134711190Y-75801286D01*
+X134711190Y-74531286D01*
-X134615952Y-75848905D01*
+X134615952Y-74578905D01*
-X137092381Y-73944143D02*
+X137092381Y-72674143D02*
-X136616190Y-73610809D01*
+X136616190Y-72340809D01*
-X137092381Y-73372714D02*
+X137092381Y-72102714D02*
-X136092381Y-73372714D01*
+X136092381Y-72102714D01*
-X136092381Y-73753667D01*
+X136092381Y-72483667D01*
-X136140000Y-73848905D01*
+X136140000Y-72578905D01*
-X136187619Y-73896524D01*
+X136187619Y-72626524D01*
-X136282857Y-73944143D01*
+X136282857Y-72674143D01*
-X136425714Y-73944143D01*
+X136425714Y-72674143D01*
-X136520952Y-73896524D01*
+X136520952Y-72626524D01*
-X136568571Y-73848905D01*
+X136568571Y-72578905D01*
-X136616190Y-73753667D01*
+X136616190Y-72483667D01*
-X136616190Y-73372714D01*
+X136616190Y-72102714D01*
-X136187619Y-74325095D02*
+X136187619Y-73055095D02*
-X136140000Y-74372714D01*
+X136140000Y-73102714D01*
-X136092381Y-74467952D01*
+X136092381Y-73197952D01*
-X136092381Y-74706048D01*
+X136092381Y-73436048D01*
-X136140000Y-74801286D01*
+X136140000Y-73531286D01*
-X136187619Y-74848905D01*
+X136187619Y-73578905D01*
-X136282857Y-74896524D01*
+X136282857Y-73626524D01*
-X136378095Y-74896524D01*
+X136378095Y-73626524D01*
-X136520952Y-74848905D01*
+X136520952Y-73578905D01*
-X137092381Y-74277476D01*
+X137092381Y-73007476D01*
-X137092381Y-74896524D01*
+X137092381Y-73626524D01*
-X136092381Y-75515571D02*
+X136092381Y-74245571D02*
-X136092381Y-75610810D01*
+X136092381Y-74340810D01*
-X136140000Y-75706048D01*
+X136140000Y-74436048D01*
-X136187619Y-75753667D01*
+X136187619Y-74483667D01*
-X136282857Y-75801286D01*
+X136282857Y-74531286D01*
-X136473333Y-75848905D01*
+X136473333Y-74578905D01*
-X136711429Y-75848905D01*
+X136711429Y-74578905D01*
-X136901905Y-75801286D01*
+X136901905Y-74531286D01*
-X136997143Y-75753667D01*
+X136997143Y-74483667D01*
-X137044762Y-75706048D01*
+X137044762Y-74436048D01*
-X137092381Y-75610810D01*
+X137092381Y-74340810D01*
-X137092381Y-75515571D01*
+X137092381Y-74245571D01*
-X137044762Y-75420333D01*
+X137044762Y-74150333D01*
-X136997143Y-75372714D01*
+X136997143Y-74102714D01*
-X136901905Y-75325095D01*
+X136901905Y-74055095D01*
-X136711429Y-75277476D01*
+X136711429Y-74007476D01*
-X136473333Y-75277476D01*
+X136473333Y-74007476D01*
-X136282857Y-75325095D01*
+X136282857Y-74055095D01*
-X136187619Y-75372714D01*
+X136187619Y-74102714D01*
-X136140000Y-75420333D01*
+X136140000Y-74150333D01*
-X136092381Y-75515571D01*
+X136092381Y-74245571D01*
-X138997381Y-73944143D02*
+X138997381Y-72674143D02*
-X138521190Y-73610809D01*
+X138521190Y-72340809D01*
-X138997381Y-73372714D02*
+X138997381Y-72102714D02*
-X137997381Y-73372714D01*
+X137997381Y-72102714D01*
-X137997381Y-73753667D01*
+X137997381Y-72483667D01*
-X138045000Y-73848905D01*
+X138045000Y-72578905D01*
-X138092619Y-73896524D01*
+X138092619Y-72626524D01*
-X138187857Y-73944143D01*
+X138187857Y-72674143D01*
-X138330714Y-73944143D01*
+X138330714Y-72674143D01*
-X138425952Y-73896524D01*
+X138425952Y-72626524D01*
-X138473571Y-73848905D01*
+X138473571Y-72578905D01*
-X138521190Y-73753667D01*
+X138521190Y-72483667D01*
-X138521190Y-73372714D01*
+X138521190Y-72102714D01*
-X138092619Y-74325095D02*
+X138092619Y-73055095D02*
-X138045000Y-74372714D01*
+X138045000Y-73102714D01*
-X137997381Y-74467952D01*
+X137997381Y-73197952D01*
-X137997381Y-74706048D01*
+X137997381Y-73436048D01*
-X138045000Y-74801286D01*
+X138045000Y-73531286D01*
-X138092619Y-74848905D01*
+X138092619Y-73578905D01*
-X138187857Y-74896524D01*
+X138187857Y-73626524D01*
-X138283095Y-74896524D01*
+X138283095Y-73626524D01*
-X138425952Y-74848905D01*
+X138425952Y-73578905D01*
-X138997381Y-74277476D01*
+X138997381Y-73007476D01*
-X138997381Y-74896524D01*
+X138997381Y-73626524D01*
-X138997381Y-75848905D02*
+X138997381Y-74578905D02*
-X138997381Y-75277476D01*
+X138997381Y-74007476D01*
-X138997381Y-75563190D02*
+X138997381Y-74293190D02*
-X137997381Y-75563190D01*
+X137997381Y-74293190D01*
-X138140238Y-75467952D01*
+X138140238Y-74197952D01*
-X138235476Y-75372714D01*
+X138235476Y-74102714D01*
-X138283095Y-75277476D01*
+X138283095Y-74007476D01*
 X114182381Y-85581905D02*
 X114991905Y-85581905D01*
 X115087143Y-85629524D01*
--- a/plot/ulx3s-Edge.Cuts.gm1
+++ b/plot/ulx3s-Edge.Cuts.gm1
@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Profile,NP*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Tue May 16 14:48:21 2017*
+G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Wed May 17 14:14:23 2017*
 %MOMM*%
 %LPD*%
 G01*
--- a/plot/ulx3s-F.Cu.gtl
+++ b/plot/ulx3s-F.Cu.gtl
@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Copper,L1,Top,Signal*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Tue May 16 14:48:21 2017*
+G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Wed May 17 14:14:23 2017*
 %MOMM*%
 %LPD*%
 G01*
@ -482,14 +482,14 @@ X104260000Y-79420980D03*
 X101720000Y-81519020D03*
 X101720000Y-79420980D03*
 D19*
-X119610000Y-62640000D03*
+X120245000Y-62640000D03*
-X119610000Y-65440000D03*
+X120245000Y-65440000D03*
 D20*
-X119610000Y-74840000D03*
+X120245000Y-74840000D03*
-X124060000Y-78940000D03*
+X124695000Y-78940000D03*
 D21*
-X127010000Y-67340000D03*
+X127645000Y-67340000D03*
-X127010000Y-64540000D03*
+X127645000Y-64540000D03*
 D22*
 X175480000Y-82270000D03*
 X154680000Y-93330000D03*
@ -689,6 +689,7 @@ D33*
 X107480000Y-102700000D03*
 X107480000Y-104900000D03*
 D34*
 X131254529Y-86251357D03*
 X166480000Y-85600000D03*
 X146602990Y-71792990D03*
 X141828352Y-71792990D03*
@ -701,7 +702,6 @@ X164978793Y-81224197D03*
 X124080000Y-110877010D03*
 X140880000Y-81400000D03*
 X106080000Y-76600000D03*
 X131380496Y-86561019D03*
 X119500000Y-77930000D03*
 X136085174Y-89394826D03*
 X109340000Y-77930000D03*
@ -757,6 +757,7 @@ X164080000Y-77200000D03*
 X165680000Y-79800000D03*
 X166280000Y-94800000D03*
 X172280000Y-102800000D03*
 X181730000Y-92550000D03*
 X109880000Y-72200000D03*
 X112515000Y-83010000D03*
 X165680000Y-96800000D03*
@ -816,8 +817,10 @@ X142480000Y-91000000D03*
 X142480000Y-83800000D03*
 X134480000Y-83800000D03*
 X134480000Y-91000000D03*
-X155480000Y-71792990D03*
+X155480000Y-71722990D03*
 X105480000Y-90600000D03*
 X174110000Y-108410000D03*
 X158870000Y-108410000D03*
 X137288700Y-97538741D03*
 X135884156Y-106800406D03*
 X133680000Y-91800000D03*
@ -835,11 +838,12 @@ X129563728Y-104680338D03*
 X132918584Y-104800000D03*
 X135853254Y-108792386D03*
 X133685668Y-93402482D03*
-X131426885Y-97278295D03*
+X131414026Y-97291163D03*
 X132846234Y-94197073D03*
 X131019992Y-102364188D03*
 X135471949Y-109409592D03*
 X122480000Y-62900000D03*
 X130930000Y-67135000D03*
 D35*
 X145851858Y-65189228D03*
 D34*
@ -849,10 +853,10 @@ X145873729Y-63920849D03*
 D34*
 X143680000Y-63900000D03*
 X140035989Y-81400000D03*
-X129346243Y-86561022D03*
+X129349300Y-86610340D03*
-X132080000Y-86244011D03*
+X132077895Y-86214963D03*
 X117121665Y-97817265D03*
-X119130057Y-95662364D03*
+X118843798Y-95498222D03*
 D35*
 X119978162Y-95412951D03*
 X120634035Y-94977604D03*
@ -914,15 +918,14 @@ X132080000Y-93400000D03*
 X129280000Y-93200000D03*
 X133919980Y-96038729D03*
 X141280000Y-97600000D03*
-X132954301Y-96239373D03*
+X132959536Y-96270333D03*
 X135770000Y-97200000D03*
 X132080000Y-94200000D03*
-X128606412Y-84518181D03*
+X128573992Y-84468304D03*
 X111080000Y-106000000D03*
 X129212186Y-89291571D03*
 X132080000Y-89444020D03*
 X130839486Y-103354982D03*
 X132880000Y-86200000D03*
 X129880000Y-104200000D03*
 X128356145Y-89085098D03*
 X132880000Y-88600000D03*
@ -938,29 +941,29 @@ X141029139Y-73391006D03*
 X143625670Y-75521246D03*
 X142775852Y-75939146D03*
 D34*
-X135058026Y-77491517D03*
+X135158117Y-77502884D03*
 X135274882Y-81390604D03*
-X134527010Y-81390604D03*
+X134546021Y-81390604D03*
-X133573575Y-77765579D03*
+X133091535Y-76687359D03*
-X133668154Y-77111081D03*
+X133595078Y-76531839D03*
-X126806396Y-78251801D03*
+X126814764Y-78114372D03*
-X126425397Y-79239391D03*
+X126603964Y-79068383D03*
-X127789562Y-79234967D03*
+X127831380Y-79289249D03*
-X127416908Y-78862313D03*
+X127557975Y-78838703D03*
-X132427111Y-78217208D03*
+X131565025Y-77790995D03*
-X132492381Y-78810273D03*
+X132210454Y-78375833D03*
-X132884441Y-81391117D03*
+X132857990Y-81390526D03*
-X128066237Y-82397414D03*
+X132084821Y-82977990D03*
-X132084319Y-83022010D03*
+X128702010Y-82422010D03*
-X128546476Y-82836338D03*
+X128702010Y-82949023D03*
 X132886504Y-83777990D03*
-X128967292Y-83153599D03*
+X129279954Y-83186575D03*
 X132117443Y-83866021D03*
-X128047208Y-83558437D03*
+X128126480Y-83691644D03*
-X132033945Y-84555989D03*
+X132079996Y-84503337D03*
-X128558092Y-83989293D03*
+X128615019Y-83914799D03*
 X133671942Y-84595200D03*
-X127975965Y-84402448D03*
+X127992473Y-84535656D03*
 X132875802Y-85421990D03*
 D35*
 X147131990Y-96348010D03*
@ -998,7 +1001,7 @@ X137023753Y-76742518D03*
 X136645199Y-77109176D03*
 X136170384Y-77530992D03*
 X136102010Y-78268593D03*
-X135473038Y-76949878D03*
+X135473781Y-76949230D03*
 X136080000Y-81400000D03*
 X148668800Y-84550312D03*
 X144877691Y-84532933D03*
@ -1019,38 +1022,45 @@ X145172870Y-74240536D03*
 X141657990Y-82130345D03*
 X142457990Y-81382236D03*
 X140080000Y-82200000D03*
-X141346021Y-77170289D03*
+X141499915Y-76647924D03*
 X141046643Y-74873804D03*
 X140864029Y-83041403D03*
 X140924011Y-82179283D03*
 X141329877Y-75415642D03*
-X133680000Y-82977990D03*
+X129680000Y-86200000D03*
-X132080000Y-81400000D03*
+X132880000Y-83000000D03*
 X132080000Y-82177990D03*
-X130976883Y-77755103D03*
+X132080000Y-81400000D03*
-X133680000Y-81400000D03*
+X131880000Y-79200000D03*
-X133680000Y-83822010D03*
+X130919839Y-77742623D03*
 X132397609Y-77214811D03*
 X133680000Y-82200000D03*
 X133702010Y-81400000D03*
 X129365043Y-91730742D03*
 X132880000Y-91000000D03*
 X128848343Y-91514164D03*
 X132077648Y-90977990D03*
-X129963132Y-80608536D03*
+X130169622Y-80402046D03*
 X131180000Y-80500000D03*
-X129482623Y-84960036D03*
+X129457989Y-84960036D03*
-X132080000Y-85400000D03*
+X132079620Y-85370951D03*
 X134314106Y-77564232D03*
 X163632576Y-72315545D03*
 X134105000Y-77603945D03*
 X134480000Y-82200000D03*
 X138500159Y-104911875D03*
 X135680000Y-105400000D03*
 X152728307Y-103529015D03*
 X169030000Y-77295000D03*
 X128803269Y-85311469D03*
 X129457989Y-83682604D03*
 X101680000Y-74000000D03*
 X128880000Y-85400000D03*
 X129521213Y-83758787D03*
 X112515000Y-86185000D03*
 X161880000Y-97800000D03*
 D37*
 X131331357Y-86251357D02*
 X131254529Y-86251357D01*
 X131680000Y-86600000D02*
 X131331357Y-86251357D01*
 X146480000Y-71700000D02*
 X146572990Y-71792990D01*
 X146572990Y-71792990D02*
@ -1099,10 +1109,6 @@ X124279999Y-110677011D02*
 X124080000Y-110877010D01*
 X141280000Y-81000000D02*
 X140880000Y-81400000D01*
 X131419477Y-86600000D02*
 X131380496Y-86561019D01*
 X131680000Y-86600000D02*
 X131419477Y-86600000D01*
 X119500000Y-79420980D02*
 X119500000Y-77930000D01*
 X135685174Y-89394826D02*
@ -1852,38 +1858,38 @@ X136654999Y-85974999D01*
 X136654999Y-89625001D02*
 X136480000Y-89800000D01*
 D38*
-X147611309Y-98358968D02*
+X136241989Y-96599106D02*
-X148678556Y-98358968D01*
+X145851447Y-96599106D01*
 X134999192Y-96460988D02*
 X136103871Y-96460988D01*
 X150857011Y-100884385D02*
 X155770000Y-105797374D01*
 X155770000Y-105820000D02*
 X155770000Y-106560000D01*
 X130835903Y-96539283D02*
 X131707280Y-96539283D01*
 X148678556Y-98358968D02*
 X150857011Y-100537423D01*
 X130041550Y-94638450D02*
 X130041550Y-95744930D01*
 X150857011Y-100537423D02*
 X150857011Y-100884385D01*
-X150857011Y-100884385D02*
+X131707280Y-96539283D02*
-X155770000Y-105797374D01*
+X132607902Y-97439905D01*
 X132661378Y-97439905D02*
 X134020275Y-97439905D01*
 X134020275Y-97439905D02*
 X134999192Y-96460988D01*
 X134999192Y-96460988D02*
 X136103871Y-96460988D01*
 X136103871Y-96460988D02*
 X136241989Y-96599106D01*
-X136241989Y-96599106D02*
+X134020275Y-97439905D02*
-X145851447Y-96599106D01*
+X134999192Y-96460988D01*
 X145851447Y-96599106D02*
 X147611309Y-98358968D01*
 X130880000Y-93800000D02*
 X130041550Y-94638450D01*
-X130041550Y-94638450D02*
+X147611309Y-98358968D02*
-X130041550Y-95744930D01*
+X148678556Y-98358968D01*
 X145851447Y-96599106D02*
 X147611309Y-98358968D01*
 X130041550Y-95744930D02*
 X130835903Y-96539283D01*
-X130835903Y-96539283D02*
+X132607902Y-97439905D02*
-X131760756Y-96539283D01*
+X134020275Y-97439905D01*
 X131760756Y-96539283D02*
 X132661378Y-97439905D01*
 X155770000Y-105820000D02*
 X155770000Y-106560000D01*
 X155770000Y-105797374D02*
 X155770000Y-105820000D01*
 X155770000Y-106560000D02*
@ -1918,88 +1924,80 @@ X112590000Y-91210000D02*
 X118790000Y-91210000D01*
 X129702002Y-93226237D02*
 X129702002Y-95865485D01*
-X130692811Y-96856294D02*
+X129702002Y-95865485D02*
-X131623795Y-96856294D01*
+X130703342Y-96866825D01*
 X150540000Y-105820000D02*
 X150540000Y-106560000D01*
 X150540000Y-100668733D02*
 X150540000Y-105820000D01*
 X147479999Y-98675979D02*
 X148547246Y-98675979D01*
 X145720137Y-96916117D02*
 X147479999Y-98675979D01*
 X130703342Y-96866825D02*
 X131586501Y-96866825D01*
 X131586501Y-96866825D02*
 X132476592Y-97756916D01*
 X135972561Y-96777999D02*
 X136110679Y-96916117D01*
 X130103238Y-92825001D02*
 X129702002Y-93226237D01*
 X135130502Y-96777999D02*
 X135972561Y-96777999D01*
 X130880000Y-93000000D02*
 X130705001Y-92825001D01*
 X130705001Y-92825001D02*
 X130103238Y-92825001D01*
-X131623795Y-96856294D02*
+X130880000Y-93000000D02*
-X132524417Y-97756916D01*
+X130705001Y-92825001D01*
 X134151585Y-97756916D02*
 X135130502Y-96777999D01*
-X135972561Y-96777999D02*
+X132476592Y-97756916D02*
 X136110679Y-96916117D01*
 X132524417Y-97756916D02*
 X134151585Y-97756916D01*
 X129702002Y-95865485D02*
 X130692811Y-96856294D01*
 X150540000Y-100668733D02*
 X150540000Y-105820000D01*
 X136110679Y-96916117D02*
 X145720137Y-96916117D01*
 X148547246Y-98675979D02*
 X150540000Y-100668733D01*
-X147479999Y-98675979D02*
+X136110679Y-96916117D02*
-X148547246Y-98675979D01*
+X145720137Y-96916117D01*
-X150540000Y-105820000D02*
+X135130502Y-96777999D02*
-X150540000Y-106560000D01*
+X135972561Y-96777999D01*
 X145720137Y-96916117D02*
 X147479999Y-98675979D01*
 X144340000Y-106560000D02*
 X150540000Y-106560000D01*
-X163069032Y-101689032D02*
+X136504609Y-95965084D02*
-X167200000Y-105820000D01*
+X146114067Y-95965084D01*
 X167200000Y-105820000D02*
 X167200000Y-106560000D01*
 X149004946Y-97724946D02*
 X152969032Y-101689032D01*
 X152969032Y-101689032D02*
 X163069032Y-101689032D01*
 X133757655Y-96805883D02*
 X134736572Y-95826966D01*
 X134736572Y-95826966D02*
 X136366491Y-95826966D01*
-X136366491Y-95826966D02*
+X133757655Y-96805883D02*
-X136504609Y-95965084D01*
+X134736572Y-95826966D01*
-X136504609Y-95965084D02*
+X132870522Y-96805883D02*
 X146114067Y-95965084D01*
 X146114067Y-95965084D02*
 X147873929Y-97724946D01*
 X147873929Y-97724946D02*
 X149004946Y-97724946D01*
 X132923998Y-96805883D02*
 X133757655Y-96805883D01*
 X131854999Y-95736884D02*
 X132923998Y-96805883D01*
 X131854999Y-95574999D02*
-X131854999Y-95736884D01*
+X131854999Y-95790360D01*
 X131680000Y-95400000D02*
 X131854999Y-95574999D01*
 X147873929Y-97724946D02*
 X149004946Y-97724946D01*
 X146114067Y-95965084D02*
 X147873929Y-97724946D01*
 X136366491Y-95826966D02*
 X136504609Y-95965084D01*
 X163069032Y-101689032D02*
 X167200000Y-105820000D01*
 X167200000Y-105820000D02*
 X167200000Y-106560000D01*
 X131854999Y-95790360D02*
 X132870522Y-96805883D01*
 X167200000Y-106560000D02*
 X173400000Y-106560000D01*
-X130705001Y-94774999D02*
+X155770000Y-102640000D02*
-X130880000Y-94600000D01*
+X153407909Y-102640000D01*
 X130358561Y-95121439D02*
 X130705001Y-94774999D01*
 X130358561Y-95613620D02*
 X130358561Y-95121439D01*
 X130967213Y-96222272D02*
 X130358561Y-95613620D01*
 X131892066Y-96222272D02*
 X130967213Y-96222272D01*
 X132792688Y-97122894D02*
 X131892066Y-96222272D01*
 X133888965Y-97122894D02*
-X132792688Y-97122894D01*
+X132739212Y-97122894D01*
-X155770000Y-102640000D02*
+X134867882Y-96143977D02*
-X153407909Y-102640000D01*
+X133888965Y-97122894D01*
 X153407909Y-102640000D02*
 X148809866Y-98041957D01*
 X136235181Y-96143977D02*
 X134867882Y-96143977D01*
 X136373299Y-96282095D02*
@ -2008,10 +2006,18 @@ X145982757Y-96282095D02*
 X136373299Y-96282095D01*
 X147742619Y-98041957D02*
 X145982757Y-96282095D01*
 X153407909Y-102640000D02*
 X148809866Y-98041957D01*
 X148809866Y-98041957D02*
 X147742619Y-98041957D01*
-X134867882Y-96143977D02*
+X130705001Y-94774999D02*
-X133888965Y-97122894D01*
+X130880000Y-94600000D01*
 X130967213Y-96222272D02*
 X130358561Y-95613620D01*
 X131838590Y-96222272D02*
 X130967213Y-96222272D01*
 X132739212Y-97122894D02*
 X131838590Y-96222272D01*
 D37*
 X155770000Y-102640000D02*
 X161970000Y-102640000D01*
@ -2025,6 +2031,8 @@ X134880000Y-84200000D02*
 X134480000Y-83800000D01*
 X134880000Y-90600000D02*
 X134480000Y-91000000D01*
 X158870000Y-108410000D02*
 X174110000Y-108410000D01*
 D38*
 X134080000Y-91400000D02*
 X133680000Y-91800000D01*
@ -2047,6 +2055,10 @@ X122480000Y-62900000D02*
 X119870000Y-62900000D01*
 X119870000Y-62900000D02*
 X119610000Y-62640000D01*
 X127645000Y-67340000D02*
 X130725000Y-67340000D01*
 X130725000Y-67340000D02*
 X130930000Y-67135000D01*
 D38*
 X146078857Y-65416227D02*
 X145851858Y-65189228D01*
@ -2094,82 +2106,84 @@ X139680000Y-81800000D02*
 X140035989Y-81444011D01*
 X140035989Y-81444011D02*
 X140035989Y-81400000D01*
 X117121665Y-96479539D02*
 X127050172Y-86551032D01*
 X129336253Y-86551032D02*
 X129346243Y-86561022D01*
 X127050172Y-86551032D02*
 X129336253Y-86551032D01*
 X117121665Y-97817265D02*
 X117121665Y-96479539D01*
-X132124011Y-86244011D02*
+X127050172Y-86551032D02*
-X132080000Y-86244011D01*
+X129289992Y-86551032D01*
 X117121665Y-96479539D02*
 X127050172Y-86551032D01*
 X129289992Y-86551032D02*
 X129349300Y-86610340D01*
 X132094963Y-86214963D02*
 X132077895Y-86214963D01*
 X132480000Y-86600000D02*
-X132124011Y-86244011D01*
+X132094963Y-86214963D01*
 X117130000Y-99520000D02*
 X117130000Y-97825600D01*
 X117130000Y-97825600D02*
 X117121665Y-97817265D01*
-X119130057Y-94919468D02*
+X118843798Y-95205727D02*
-X119130057Y-95379522D01*
+X118843798Y-95215380D01*
 X129548805Y-86983024D02*
 X129118063Y-86983024D01*
 X119130057Y-95379522D02*
 X119130057Y-95662364D01*
 X129931829Y-86600000D02*
 X129548805Y-86983024D01*
 X130880000Y-86600000D02*
 X129931829Y-86600000D01*
 X129118063Y-86983024D02*
 X129003082Y-86868043D01*
 X129003082Y-86868043D02*
 X127181482Y-86868043D01*
 X127181482Y-86868043D02*
-X119130057Y-94919468D01*
+X118843798Y-95205727D01*
-X119330000Y-95862307D02*
+X118843798Y-95215380D02*
-X119130057Y-95662364D01*
+X118843798Y-95498222D01*
 X128982439Y-86868043D02*
 X127181482Y-86868043D01*
 X129146738Y-87032342D02*
 X128982439Y-86868043D01*
 X129551862Y-87032342D02*
 X129146738Y-87032342D01*
 X130880000Y-86600000D02*
 X129984204Y-86600000D01*
 X129984204Y-86600000D02*
 X129551862Y-87032342D01*
 X119330000Y-95984424D02*
 X119043797Y-95698221D01*
 X119330000Y-99520000D02*
-X119330000Y-95862307D01*
+X119330000Y-95984424D01*
-X129980150Y-87000000D02*
+X119043797Y-95698221D02*
-X129680115Y-87300035D01*
+X118843798Y-95498222D01*
-X128986753Y-87300035D02*
+X128851129Y-87185054D02*
-X128871772Y-87185054D01*
+X127312792Y-87185054D01*
 X131680000Y-87400000D02*
 X131280000Y-87000000D01*
 X119978162Y-94519684D02*
 X119978162Y-95091925D01*
 X129683172Y-87349353D02*
 X129015428Y-87349353D01*
 X119978162Y-95091925D02*
 X119978162Y-95412951D01*
-X129680115Y-87300035D02*
+X130032525Y-87000000D02*
-X128986753Y-87300035D01*
+X129683172Y-87349353D01*
-X128871772Y-87185054D02*
+X129015428Y-87349353D02*
-X127312792Y-87185054D01*
+X128851129Y-87185054D01*
 X131280000Y-87000000D02*
 X129980150Y-87000000D01*
 X127312792Y-87185054D02*
 X119978162Y-94519684D01*
-X119978162Y-94519684D02*
+X131280000Y-87000000D02*
-X119978162Y-95091925D01*
+X130032525Y-87000000D01*
 X131680000Y-87400000D02*
 X131280000Y-87000000D01*
 X120205161Y-95639950D02*
 X119978162Y-95412951D01*
 X121530000Y-96964789D02*
 X120205161Y-95639950D01*
 X121530000Y-99520000D02*
 X121530000Y-96964789D01*
 X129811425Y-87617046D02*
 X128582841Y-87617046D01*
 X130028470Y-87400000D02*
 X129811425Y-87617046D01*
 X120634035Y-94656578D02*
 X120634035Y-94977604D01*
 X128467860Y-87502065D02*
 X127444102Y-87502065D01*
 X120634035Y-94312132D02*
 X120634035Y-94656578D01*
 X130880000Y-87400000D02*
 X130028470Y-87400000D01*
 X127444102Y-87502065D02*
 X120634035Y-94312132D01*
-X128582841Y-87617046D02*
+X120634035Y-94656578D02*
 X120634035Y-94977604D01*
 X120634035Y-94312132D02*
 X120634035Y-94656578D01*
 X128632159Y-87666364D02*
 X128467860Y-87502065D01*
 X130080845Y-87400000D02*
 X129814482Y-87666364D01*
 X129814482Y-87666364D02*
 X128632159Y-87666364D01*
 X130880000Y-87400000D02*
 X130080845Y-87400000D01*
 X122630000Y-99520000D02*
 X122630000Y-96973569D01*
 X122630000Y-96973569D02*
@ -2839,11 +2853,11 @@ X133919980Y-96038729D01*
 X132480000Y-94600000D02*
 X133918729Y-96038729D01*
 X132480000Y-95400000D02*
-X132480000Y-95765072D01*
+X132959536Y-95879536D01*
-X132480000Y-95765072D02*
+X132959536Y-95879536D02*
-X132754302Y-96039374D01*
+X132959536Y-95987491D01*
-X132754302Y-96039374D02*
+X132959536Y-95987491D02*
-X132954301Y-96239373D01*
+X132959536Y-96270333D01*
 X132480000Y-93800000D02*
 X132080000Y-94200000D01*
 X137280000Y-100637600D02*
@ -2920,16 +2934,16 @@ X129997093Y-90141120D02*
 X129269647Y-90141120D01*
 X129269647Y-90141120D02*
 X128952636Y-90458132D01*
 X129705238Y-84600000D02*
 X129623419Y-84518181D01*
 X131680000Y-85000000D02*
 X131280000Y-84600000D01*
-X128889254Y-84518181D02*
+X128609335Y-84432961D02*
-X128606412Y-84518181D01*
+X128573992Y-84468304D01*
 X129623419Y-84518181D02*
 X128889254Y-84518181D01*
 X131280000Y-84600000D02*
 X129705238Y-84600000D01*
 X129538199Y-84432961D02*
 X128609335Y-84432961D01*
 X129705238Y-84600000D02*
 X129538199Y-84432961D01*
 X129946545Y-103354982D02*
 X126955932Y-100364369D01*
 X130839486Y-103354982D02*
@ -2948,8 +2962,6 @@ X132080000Y-89400000D02*
 X132080000Y-89444020D01*
 X132480000Y-89000000D02*
 X132080000Y-89400000D01*
 X133280000Y-86600000D02*
 X132880000Y-86200000D01*
 X128778146Y-89287659D02*
 X128778146Y-89120107D01*
 X129028712Y-88869541D02*
@ -3020,32 +3032,32 @@ X131680000Y-88200000D02*
 X131280000Y-88600000D01*
 X127628042Y-88663088D02*
 X125827283Y-90463847D01*
-X128564026Y-88208482D02*
+X124485260Y-107207639D02*
-X128426431Y-88346077D01*
+X124202418Y-107207639D01*
 X127496732Y-88346077D02*
 X125405282Y-90437527D01*
 X133280000Y-87400000D02*
 X132880000Y-87800000D01*
 X125405282Y-93635324D02*
 X125803334Y-94033376D01*
 X128426431Y-88346077D02*
 X127496732Y-88346077D01*
 X125803334Y-94033376D02*
 X125803334Y-105955181D01*
 X124550876Y-107207639D02*
 X124485260Y-107207639D01*
 X129668311Y-88208482D02*
 X128564026Y-88208482D01*
 X132880000Y-87800000D02*
-X130076793Y-87800000D01*
+X130129167Y-87800000D01*
 X125803334Y-105955181D02*
 X124550876Y-107207639D01*
 X125803334Y-94033376D02*
 X125803334Y-105955181D01*
 X125405282Y-93635324D02*
 X125803334Y-94033376D01*
 X125405282Y-90437527D02*
 X125405282Y-93635324D01*
-X124485260Y-107207639D02*
+X127496732Y-88346077D02*
-X124202418Y-107207639D01*
+X125405282Y-90437527D01*
-X130076793Y-87800000D02*
+X128426431Y-88346077D02*
-X129668311Y-88208482D01*
+X127496732Y-88346077D01*
 X129720685Y-88208482D02*
 X128564026Y-88208482D01*
 X133280000Y-87400000D02*
 X132880000Y-87800000D01*
 X130129167Y-87800000D02*
 X129720685Y-88208482D01*
 X128564026Y-88208482D02*
 X128426431Y-88346077D01*
 X140513619Y-73234097D02*
 X140480000Y-73200478D01*
 X140480000Y-71590000D02*
@ -3072,42 +3084,46 @@ X140980000Y-73341867D02*
 X141029139Y-73391006D01*
 X140980000Y-70600000D02*
 X140980000Y-73341867D01*
 X141921917Y-77218957D02*
 X141057046Y-78083828D01*
 X141768023Y-76291468D02*
 X141921917Y-76445362D01*
 X141921917Y-76445362D02*
 X141921917Y-77218957D01*
 X141057046Y-78083828D02*
 X141057046Y-79468570D01*
 X141406350Y-72156032D02*
 X141768023Y-72517705D01*
 X141406350Y-70673650D02*
 X141406350Y-72156032D01*
 X141768023Y-77372851D02*
 X141057046Y-78083828D01*
 X141057046Y-79468570D02*
 X141280000Y-79691524D01*
 X141406350Y-72156032D02*
 X141768023Y-72517705D01*
 X141480000Y-70600000D02*
 X141406350Y-70673650D01*
 X141768023Y-72517705D02*
-X141768023Y-77372851D01*
+X141768023Y-76291468D01*
 X141057046Y-78083828D02*
 X141057046Y-79468570D01*
 X141280000Y-79691524D02*
 X141280000Y-79952513D01*
 X141480000Y-70600000D02*
 X141406350Y-70673650D01*
 X141280000Y-79952513D02*
 X141280000Y-80200000D01*
 X141454999Y-81625001D02*
 X141280000Y-81800000D01*
 X141374057Y-79335953D02*
 X141678144Y-79640040D01*
 X141678144Y-81401856D02*
 X141454999Y-81625001D01*
 X141374057Y-78215138D02*
 X141374057Y-79335953D01*
 X142480000Y-70600000D02*
 X142480000Y-74998356D01*
 X142480000Y-74998356D02*
 X142236998Y-75241358D01*
 X141454999Y-81625001D02*
 X141280000Y-81800000D01*
 X142236998Y-75241358D02*
 X142236998Y-77352197D01*
 X142236998Y-77352197D02*
 X141374057Y-78215138D01*
 X141678144Y-79640040D02*
 X141678144Y-81401856D01*
-X141374057Y-79335953D02*
+X142238928Y-75239428D02*
-X141678144Y-79640040D01*
+X142238928Y-77350267D01*
 X141374057Y-78215138D02*
 X141374057Y-79335953D01*
 X142238928Y-77350267D02*
 X141374057Y-78215138D01*
 X142480000Y-74998356D02*
 X142238928Y-75239428D01*
 X142970700Y-71599300D02*
 X142980000Y-71590000D01*
 X142650508Y-77835329D02*
@ -3216,104 +3232,108 @@ X135680000Y-81800000D02*
 X135274882Y-81394882D01*
 X135274882Y-81394882D02*
 X135274882Y-81390604D01*
 X134527010Y-81447010D02*
 X134527010Y-81390604D01*
 X134880000Y-81800000D02*
-X134527010Y-81447010D01*
+X134546021Y-81466021D01*
-X133773574Y-77965578D02*
+X134546021Y-81466021D02*
-X133573575Y-77765579D01*
+X134546021Y-81390604D01*
-X134480099Y-78672103D02*
+X133900499Y-77904964D02*
-X133773574Y-77965578D01*
+X133900499Y-77648032D01*
 X133900499Y-77648032D02*
 X133291534Y-77039067D01*
 X134480099Y-78484564D02*
 X133900499Y-77904964D01*
 X134480099Y-80600099D02*
-X134480099Y-78672103D01*
+X134480099Y-78484564D01*
 X133291534Y-76887358D02*
 X133091535Y-76687359D01*
 X134880000Y-81000000D02*
 X134480099Y-80600099D01*
-X134552360Y-77344733D02*
+X133291534Y-77039067D02*
-X134118709Y-76911082D01*
+X133291534Y-76887358D01*
 X134552360Y-77749855D02*
 X134552360Y-77344733D01*
 X134880000Y-80200000D02*
-X134880000Y-78077495D01*
+X134880000Y-77910686D01*
-X133868153Y-76911082D02*
+X134736107Y-77766793D02*
-X133668154Y-77111081D01*
+X134736107Y-77361671D01*
-X134118709Y-76911082D02*
+X134736107Y-77361671D02*
-X133868153Y-76911082D01*
+X133906275Y-76531839D01*
-X134880000Y-78077495D02*
+X134880000Y-77910686D02*
-X134552360Y-77749855D01*
+X134736107Y-77766793D01*
-X133441825Y-78195450D02*
+X133906275Y-76531839D02*
-X133371014Y-78195450D01*
+X133877920Y-76531839D01*
 X133877920Y-76531839D02*
 X133595078Y-76531839D01*
 X127014763Y-77914373D02*
 X126814764Y-78114372D01*
 X128136327Y-76792809D02*
 X127014763Y-77914373D01*
 X132596955Y-76792809D02*
 X128136327Y-76792809D01*
 X133583488Y-77779342D02*
 X132596955Y-76792809D01*
 X134080000Y-78553026D02*
 X133583488Y-78056514D01*
 X134080000Y-80200000D02*
-X134080000Y-78833625D01*
+X134080000Y-78553026D01*
-X133371014Y-78195450D02*
+X133583488Y-78056514D02*
-X133151574Y-77976010D01*
+X133583488Y-77779342D01*
-X133151574Y-77976010D02*
+X128351734Y-77320613D02*
-X133151574Y-77795049D01*
+X126803963Y-78868384D01*
-X133151574Y-77795049D02*
+X126803963Y-78868384D02*
-X132117512Y-76760987D01*
+X126603964Y-79068383D01*
-X128297210Y-76760987D02*
+X131719207Y-77320613D02*
-X127006395Y-78051802D01*
+X128351734Y-77320613D01*
-X127006395Y-78051802D02*
+X132544325Y-77636821D02*
-X126806396Y-78251801D01*
+X132035415Y-77636821D01*
-X132117512Y-76760987D02*
+X133280000Y-78673101D02*
-X128297210Y-76760987D01*
+X132949466Y-78342567D01*
-X134080000Y-78833625D02*
+X132949466Y-78041962D02*
-X133441825Y-78195450D01*
+X132544325Y-77636821D01*
 X131986202Y-77077998D02*
 X128586790Y-77077998D01*
 X128586790Y-77077998D02*
 X126625396Y-79039392D01*
 X132834563Y-78107320D02*
 X132834563Y-77926359D01*
 X132834563Y-77926359D02*
 X131986202Y-77077998D01*
 X133280000Y-80200000D02*
-X133280000Y-78552757D01*
+X133280000Y-78673101D01*
-X133280000Y-78552757D02*
+X132035415Y-77636821D02*
-X132834563Y-78107320D01*
+X131719207Y-77320613D01*
-X126625396Y-79039392D02*
+X132949466Y-78342567D02*
-X126425397Y-79239391D01*
+X132949466Y-78041962D01*
-X130705001Y-80825001D02*
+X128114222Y-79289249D02*
-X130705001Y-80738551D01*
+X127831380Y-79289249D01*
 X130880000Y-81000000D02*
 X130705001Y-80825001D01*
-X130705001Y-80738551D02*
+X129681389Y-79289249D02*
-X129201417Y-79234967D01*
+X128114222Y-79289249D01*
-X129201417Y-79234967D02*
+X130705001Y-80825001D02*
-X128072404Y-79234967D01*
+X130705001Y-80312861D01*
-X128072404Y-79234967D02*
+X130705001Y-80312861D02*
-X127789562Y-79234967D01*
+X129681389Y-79289249D01*
 X127616907Y-78662314D02*
 X127416908Y-78862313D01*
 X130142314Y-78662314D02*
 X127616907Y-78662314D01*
 X131680000Y-80200000D02*
-X130142314Y-78662314D01*
+X130318703Y-78838703D01*
-X132474002Y-78200000D02*
+X130318703Y-78838703D02*
-X132456794Y-78217208D01*
+X127840817Y-78838703D01*
-X132927010Y-78648088D02*
+X127840817Y-78838703D02*
-X132496130Y-78217208D01*
+X127557975Y-78838703D01*
-X132927010Y-78999384D02*
+X132413015Y-77953832D02*
-X132927010Y-78648088D01*
+X131727862Y-77953832D01*
 X131727862Y-77953832D02*
 X131565025Y-77790995D01*
 X132632455Y-78173272D02*
 X132413015Y-77953832D01*
 X132632455Y-78473877D02*
 X132632455Y-78173272D01*
 X133280000Y-81000000D02*
 X132877001Y-80597001D01*
 X132877001Y-80597001D02*
-X132877001Y-79049393D01*
+X132877001Y-78718423D01*
-X132456794Y-78217208D02*
+X132877001Y-78718423D02*
-X132427111Y-78217208D01*
+X132632455Y-78473877D01*
 X132496130Y-78217208D02*
 X132427111Y-78217208D01*
 X132877001Y-79049393D02*
 X132927010Y-78999384D01*
 D39*
 X132884441Y-81404441D02*
 X132884441Y-81391117D01*
 X133280000Y-81800000D02*
-X132884441Y-81404441D01*
+X132870526Y-81390526D01*
 X132870526Y-81390526D02*
 X132857990Y-81390526D01*
 D38*
 X132084821Y-83004821D02*
 X132084821Y-82977990D01*
 X132480000Y-83400000D02*
-X132102010Y-83022010D01*
+X132084821Y-83004821D01*
 X132102010Y-83022010D02*
 X132084319Y-83022010D01*
 X133280000Y-84200000D02*
 X132886504Y-83806504D01*
 X132886504Y-83806504D02*
@ -3323,10 +3343,10 @@ X132146021Y-83866021D02*
 X132117443Y-83866021D01*
 X132480000Y-84200000D02*
 X132146021Y-83866021D01*
-X132035989Y-84555989D02*
+X132079996Y-84599996D02*
-X132033945Y-84555989D01*
+X132079996Y-84503337D01*
 X132480000Y-85000000D02*
-X132035989Y-84555989D01*
+X132079996Y-84599996D01*
 X133675200Y-84595200D02*
 X133671942Y-84595200D01*
 X134080000Y-85000000D02*
@ -3558,18 +3578,18 @@ X142080000Y-81000000D02*
 X142457990Y-81377990D01*
 X140480000Y-81800000D02*
 X140080000Y-82200000D01*
-X140480000Y-81000000D02*
+X140740035Y-77407804D02*
-X140878407Y-80601593D01*
+X141299916Y-76847923D01*
 X140878407Y-80601593D02*
 X140878407Y-79738252D01*
 X140740035Y-79599880D02*
 X140740035Y-77407804D01*
 X140480000Y-81000000D02*
 X140878407Y-80601593D01*
 X140878407Y-79738252D02*
 X140740035Y-79599880D01*
-X141146022Y-77370288D02*
+X141299916Y-76847923D02*
-X141346021Y-77170289D01*
+X141499915Y-76647924D01*
 X140740035Y-77776275D02*
 X141146022Y-77370288D01*
 X140740035Y-79599880D02*
 X140740035Y-77776275D01*
 X140838597Y-83041403D02*
 X140864029Y-83041403D01*
 X140480000Y-83400000D02*
@ -3578,56 +3598,64 @@ X140900717Y-82179283D02*
 X140924011Y-82179283D01*
 X140480000Y-82600000D02*
 X140900717Y-82179283D01*
 X130880000Y-85800000D02*
 X130540988Y-86139012D01*
 X116030000Y-97122883D02*
 X116030000Y-98430000D01*
-X130540988Y-86139012D02*
+X127005595Y-86147288D02*
 X128037629Y-86139012D01*
 X128037629Y-86139012D02*
 X127942620Y-86234021D01*
 X127942620Y-86234021D02*
 X126918862Y-86234021D01*
 X126918862Y-86234021D02*
 X116030000Y-97122883D01*
 X130632513Y-85800000D02*
 X130610512Y-85777999D01*
 X129389837Y-85777999D02*
 X129020548Y-86147288D01*
 X130610512Y-85777999D02*
 X129389837Y-85777999D01*
 X130880000Y-85800000D02*
 X130632513Y-85800000D01*
 X129020548Y-86147288D02*
 X127005595Y-86147288D01*
 X116030000Y-98430000D02*
 X116030000Y-99520000D01*
-X134080000Y-83400000D02*
+X133280000Y-83400000D02*
-X133680000Y-83000000D01*
+X132880000Y-83000000D01*
 X133680000Y-83000000D02*
 X133680000Y-82977990D01*
 X132480000Y-81800000D02*
 X132080000Y-81400000D01*
 X132080000Y-82200000D02*
 X132080000Y-82177990D01*
 X132480000Y-82600000D02*
 X132080000Y-82200000D01*
 X132480000Y-81800000D02*
 X132080000Y-81400000D01*
 X132082999Y-79402999D02*
 X131880000Y-79200000D01*
 X132082999Y-80602999D02*
 X132082999Y-79402999D01*
 X132480000Y-81000000D02*
 X132082999Y-80602999D01*
-X130976883Y-78037945D02*
+X131955214Y-78777998D02*
-X130976883Y-77755103D01*
+X131119838Y-77942622D01*
 X131119838Y-77942622D02*
 X130919839Y-77742623D01*
 X132082562Y-78777998D02*
 X131955214Y-78777998D01*
 X132480000Y-80200000D02*
-X130976883Y-78696883D01*
+X132480000Y-79175436D01*
-X130976883Y-78696883D02*
+X132480000Y-79175436D02*
-X130976883Y-78037945D01*
+X132082562Y-78777998D01*
 X133266477Y-78211257D02*
 X133266477Y-77910652D01*
 X133677001Y-78621781D02*
 X133266477Y-78211257D01*
 X133266477Y-77910652D02*
 X132570636Y-77214811D01*
 X132570636Y-77214811D02*
 X132397609Y-77214811D01*
 X133677001Y-80597001D02*
 X133677001Y-78621781D01*
 X134080000Y-81000000D02*
-X133675857Y-80595857D01*
+X133677001Y-80597001D01*
-X133675857Y-80595857D02*
+X134080000Y-82600000D02*
-X133675857Y-80391705D01*
+X133680000Y-82200000D01*
 X133675857Y-80391705D02*
 X133677001Y-80390561D01*
 X133677001Y-80390561D02*
 X133677001Y-80009439D01*
 X133677001Y-80009439D02*
 X133675857Y-80008295D01*
 X133675857Y-80008295D02*
 X133675857Y-78882817D01*
 X134080000Y-81800000D02*
-X133680000Y-81400000D01*
+X133702010Y-81422010D01*
-X133702010Y-83822010D02*
+X133702010Y-81422010D02*
-X133680000Y-83822010D01*
+X133702010Y-81400000D01*
 X134080000Y-84200000D02*
 X133702010Y-83822010D01*
 X128857998Y-96539671D02*
 X128857998Y-92237787D01*
 X128857998Y-92237787D02*
@ -3672,120 +3700,128 @@ X132480000Y-90600000D02*
 X132102010Y-90977990D01*
 X139820000Y-100790000D02*
 X139820000Y-100942400D01*
-X129427943Y-80073347D02*
+X129969623Y-80202047D02*
-X129763133Y-80408537D01*
+X130169622Y-80402046D01*
-X129763133Y-80408537D02*
+X129840923Y-80073347D02*
-X129963132Y-80608536D01*
+X129969623Y-80202047D01*
 X125296230Y-81519020D02*
 X126741902Y-80073347D01*
 X126741902Y-80073347D02*
 X129840923Y-80073347D01*
 X119500000Y-81519020D02*
-X124976061Y-81519020D01*
+X125296230Y-81519020D01*
 X126421734Y-80073347D02*
 X129427943Y-80073347D01*
 X124976061Y-81519020D02*
 X126421734Y-80073347D01*
 X131680000Y-81000000D02*
 X131180000Y-80500000D01*
-X131280000Y-81400000D02*
+X126873212Y-80390358D02*
-X130078289Y-81400000D01*
+X124463570Y-82800000D01*
-X130078289Y-81400000D02*
+X129561121Y-80390358D02*
-X129068647Y-80390358D01*
+X126873212Y-80390358D01*
 X117749440Y-81519020D02*
 X116960000Y-81519020D01*
 X119030420Y-82800000D02*
 X117749440Y-81519020D01*
 X130570763Y-81400000D02*
 X129561121Y-80390358D01*
 X131280000Y-81400000D02*
 X130570763Y-81400000D01*
 X131680000Y-81800000D02*
 X131280000Y-81400000D01*
-X129068647Y-80390358D02*
+X124463570Y-82800000D02*
 X126553043Y-80390358D01*
 X117749440Y-81519020D02*
 X116960000Y-81519020D01*
 X124143401Y-82800000D02*
 X119030420Y-82800000D01*
-X126553043Y-80390358D02*
+X127004522Y-80707369D02*
-X124143401Y-82800000D01*
+X124594880Y-83117011D01*
 X115209440Y-81519020D02*
 X114420000Y-81519020D01*
-X128937337Y-80707369D02*
+X124594880Y-83117011D02*
 X126684353Y-80707369D01*
 X130880000Y-81800000D02*
 X130029968Y-81800000D01*
 X130029968Y-81800000D02*
 X128937337Y-80707369D01*
 X126684353Y-80707369D02*
 X124274711Y-83117011D01*
 X124274711Y-83117011D02*
 X116807431Y-83117011D01*
 X130522442Y-81800000D02*
 X129429811Y-80707369D01*
 X129429811Y-80707369D02*
 X127004522Y-80707369D01*
 X116807431Y-83117011D02*
 X115209440Y-81519020D01*
-X126815663Y-81024380D02*
+X130880000Y-81800000D02*
-X124406021Y-83434022D01*
+X130522442Y-81800000D01*
 X127135832Y-81024380D02*
 X124726190Y-83434022D01*
 X112669440Y-81519020D02*
 X111880000Y-81519020D01*
 X130476168Y-82202047D02*
 X129298501Y-81024380D01*
 X124726190Y-83434022D02*
 X114584442Y-83434022D01*
 X131282047Y-82202047D02*
 X130476168Y-82202047D01*
 X131680000Y-82600000D02*
 X131282047Y-82202047D01*
-X124406021Y-83434022D02*
+X129298501Y-81024380D02*
-X114584442Y-83434022D01*
+X127135832Y-81024380D01*
 X129983695Y-82202047D02*
 X128806028Y-81024380D01*
 X128806028Y-81024380D02*
 X126815663Y-81024380D01*
 X114584442Y-83434022D02*
 X112669440Y-81519020D01*
-X131282047Y-82202047D02*
+X124791522Y-83817011D02*
-X129983695Y-82202047D01*
+X112427431Y-83817011D01*
-X112669440Y-81519020D02*
+X129167191Y-81341391D02*
-X111880000Y-81519020D01*
+X127267142Y-81341391D01*
-X129933328Y-82600000D02*
+X130425800Y-82600000D02*
-X128674719Y-81341391D01*
+X129167191Y-81341391D01*
 X130880000Y-82600000D02*
-X129933328Y-82600000D01*
+X130425800Y-82600000D01*
 X128674719Y-81341391D02*
 X126946973Y-81341391D01*
 X126946973Y-81341391D02*
 X124471353Y-83817011D01*
 X110129440Y-81519020D02*
 X109340000Y-81519020D01*
 X112427431Y-83817011D02*
 X110129440Y-81519020D01*
-X124471353Y-83817011D02*
+X127267142Y-81341391D02*
-X112427431Y-83817011D01*
+X124791522Y-83817011D01*
-X127078283Y-81658402D02*
+X124922832Y-84134022D02*
-X124602663Y-84134022D01*
+X110204442Y-84134022D01*
 X107589440Y-81519020D02*
 X106800000Y-81519020D01*
 X110204442Y-84134022D02*
 X107589440Y-81519020D01*
 X129035881Y-81658402D02*
 X127398452Y-81658402D01*
 X130374480Y-82997001D02*
 X129035881Y-81658402D01*
 X127398452Y-81658402D02*
 X124922832Y-84134022D01*
 X107589440Y-81519020D02*
 X106800000Y-81519020D01*
 X131680000Y-83400000D02*
 X131277001Y-82997001D01*
 X129882008Y-82997001D02*
 X128543409Y-81658402D01*
 X128543409Y-81658402D02*
 X127078283Y-81658402D01*
 X131277001Y-82997001D02*
-X129882008Y-82997001D01*
+X130374480Y-82997001D01*
 X124602663Y-84134022D02*
 X110204442Y-84134022D01*
 X127209593Y-81975413D02*
 X124733973Y-84451033D01*
 X130880000Y-83400000D02*
 X129836686Y-83400000D01*
 X105049440Y-81519020D02*
 X104260000Y-81519020D01*
 X107981453Y-84451033D02*
 X105049440Y-81519020D01*
-X129836686Y-83400000D02*
+X125054142Y-84451033D02*
 X128412099Y-81975413D01*
 X128412099Y-81975413D02*
 X127209593Y-81975413D01*
 X124733973Y-84451033D02*
 X107981453Y-84451033D01*
-X129181818Y-84977999D02*
+X127529762Y-81975413D02*
-X129199781Y-84960036D01*
+X125054142Y-84451033D01*
-X105968419Y-84977999D02*
+X130880000Y-83400000D02*
-X129181818Y-84977999D01*
+X130329158Y-83400000D01*
 X128904571Y-81975413D02*
 X127529762Y-81975413D01*
 X130329158Y-83400000D02*
 X128904571Y-81975413D01*
 X128776553Y-84890305D02*
 X128906821Y-84760037D01*
 X128906821Y-84760037D02*
 X129257990Y-84760037D01*
 X128476487Y-84977999D02*
 X128564181Y-84890305D01*
 X129257990Y-84760037D02*
 X129457989Y-84960036D01*
 X128564181Y-84890305D02*
 X128776553Y-84890305D01*
 X101720000Y-81519020D02*
 X102509440Y-81519020D01*
 X129199781Y-84960036D02*
 X129482623Y-84960036D01*
 X102509440Y-81519020D02*
 X105968419Y-84977999D01*
 X105968419Y-84977999D02*
 X128476487Y-84977999D01*
 X132079620Y-85399620D02*
 X132079620Y-85370951D01*
 X132480000Y-85800000D02*
-X132080000Y-85400000D01*
+X132079620Y-85399620D01*
 X134880000Y-82600000D02*
 X134480000Y-82200000D01*
 D37*
@ -3806,46 +3842,38 @@ X107480000Y-102700000D01*
 X107480000Y-100750000D02*
 X107480000Y-101800000D01*
 D38*
 X114930000Y-99520000D02*
 X114930000Y-97774562D01*
 X114930000Y-97774562D02*
-X126787552Y-85917010D01*
+X126874285Y-85830277D01*
-X131280000Y-85400000D02*
+X128889238Y-85830277D02*
-X131505001Y-85625001D01*
+X129319515Y-85400000D01*
 X131505001Y-85625001D02*
 X131680000Y-85800000D01*
-X126787552Y-85917010D02*
+X129319515Y-85400000D02*
 X127811310Y-85917010D01*
 X127811310Y-85917010D02*
 X127906319Y-85822001D01*
 X127906319Y-85822001D02*
 X130270437Y-85822001D01*
 X130270437Y-85822001D02*
 X130692438Y-85400000D01*
 X130692438Y-85400000D02*
 X131280000Y-85400000D01*
-X100480000Y-75200000D02*
+X114930000Y-99520000D02*
-X101480001Y-74199999D01*
+X114930000Y-97774562D01*
-X101480001Y-74199999D02*
+X131280000Y-85400000D02*
-X101680000Y-74000000D01*
+X131505001Y-85625001D01*
-X100898559Y-81993997D02*
+X126874285Y-85830277D02*
-X100480000Y-81575438D01*
+X128889238Y-85830277D01*
 X103913967Y-85311469D02*
 X128520427Y-85311469D01*
 X129855228Y-83797001D02*
 X129740831Y-83682604D01*
 X100898559Y-82296061D02*
-X100898559Y-81993997D01*
+X103913967Y-85311469D01*
-X104002498Y-85400000D02*
+X100898559Y-74781441D02*
 X100898559Y-82296061D01*
-X100480000Y-81575438D02*
+X101680000Y-74000000D02*
-X100480000Y-75200000D01*
+X100898559Y-74781441D01*
-X128880000Y-85400000D02*
+X128520427Y-85311469D02*
-X104002498Y-85400000D01*
+X128803269Y-85311469D01*
-X129804055Y-83758787D02*
+X131277001Y-83797001D02*
-X129521213Y-83758787D01*
+X129855228Y-83797001D01*
 X129842269Y-83797001D02*
 X129804055Y-83758787D01*
 X131680000Y-84200000D02*
 X131277001Y-83797001D01*
-X131277001Y-83797001D02*
+X129740831Y-83682604D02*
-X129842269Y-83797001D01*
+X129457989Y-83682604D01*
 D37*
 X112515000Y-86185000D02*
 X112515000Y-87435000D01*
@ -3858,19 +3886,19 @@ X112590000Y-87510000D01*
 X101160000Y-87510000D02*
 X107360000Y-87510000D01*
 X175380000Y-105870000D02*
-X175380000Y-107430000D01*
+X175380000Y-108630000D01*
 X175380000Y-107430000D02*
 X173400000Y-109410000D01*
 X173400000Y-109410000D02*
 X173400000Y-110260000D01*
 X174745000Y-105235000D02*
 X175380000Y-105870000D01*
-X167415000Y-105235000D02*
+X169465000Y-105235000D02*
 X174745000Y-105235000D01*
 X163170000Y-98940000D02*
 X169465000Y-105235000D01*
 X173750000Y-110260000D02*
 X173400000Y-110260000D01*
 X175380000Y-108630000D02*
 X173750000Y-110260000D01*
 X161970000Y-98940000D02*
-X161970000Y-99790000D01*
+X163170000Y-98940000D01*
 X161970000Y-99790000D02*
 X167415000Y-105235000D01*
 X161880000Y-97800000D02*
 X161880000Y-98850000D01*
 X161880000Y-98850000D02*
--- a/plot/ulx3s-F.Mask.gts
+++ b/plot/ulx3s-F.Mask.gts
@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Soldermask,Top*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Tue May 16 14:48:21 2017*
+G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Wed May 17 14:14:23 2017*
 %MOMM*%
 %LPD*%
 G01*
@ -477,17 +477,17 @@ X104260000Y-79420980D03*
 X101720000Y-81519020D03*
 X101720000Y-79420980D03*
 D19*
-X119610000Y-62640000D03*
+X120245000Y-62640000D03*
-X119610000Y-65440000D03*
+X120245000Y-65440000D03*
 D20*
-X119610000Y-74840000D03*
+X120245000Y-74840000D03*
-X124060000Y-78940000D03*
+X124695000Y-78940000D03*
 D21*
-X127010000Y-67340000D03*
+X127645000Y-67340000D03*
-X127010000Y-64540000D03*
+X127645000Y-64540000D03*
 D22*
-X123310000Y-66540000D03*
+X123945000Y-66540000D03*
-X123310000Y-73540000D03*
+X123945000Y-73540000D03*
 D23*
 X175480000Y-82270000D03*
 X154680000Y-93330000D03*
--- a/plot/ulx3s-F.SilkS.gto
+++ b/plot/ulx3s-F.SilkS.gto
@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Legend,Top*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Tue May 16 14:48:21 2017*
+G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Wed May 17 14:14:23 2017*
 %MOMM*%
 %LPD*%
 G01*
@ -420,24 +420,24 @@ X101370000Y-80470000D01*
 X101370000Y-80470000D02*
 X101720000Y-80120000D01*
 D13*
-X120310000Y-77540000D02*
+X120945000Y-77540000D02*
-X120310000Y-67540000D01*
+X120945000Y-67540000D01*
-X120310000Y-67540000D02*
+X120945000Y-67540000D02*
-X119610000Y-67540000D01*
+X120245000Y-67540000D01*
-X119610000Y-67540000D02*
+X120245000Y-67540000D02*
-X119610000Y-62040000D01*
+X120245000Y-62040000D01*
-X126310000Y-77540000D02*
+X126945000Y-77540000D02*
-X120310000Y-77540000D01*
+X120945000Y-77540000D01*
-X126310000Y-62040000D02*
+X126945000Y-62040000D02*
-X126310000Y-77540000D01*
+X126945000Y-77540000D01*
-X126310000Y-62040000D02*
+X126945000Y-62040000D02*
-X119610000Y-62040000D01*
+X120245000Y-62040000D01*
-X125810000Y-62040000D02*
+X126445000Y-62040000D02*
-X125810000Y-60540000D01*
+X126445000Y-60540000D01*
-X125810000Y-60540000D02*
+X126445000Y-60540000D02*
-X120810000Y-60540000D01*
+X121445000Y-60540000D01*
-X120810000Y-60540000D02*
+X121445000Y-60540000D02*
-X120810000Y-62040000D01*
+X121445000Y-62040000D01*
 D11*
 X176180000Y-92880000D02*
 X175980000Y-92880000D01*
@ -1616,194 +1616,194 @@ X102922381Y-80303333D02*
 X102922381Y-79636666D01*
 X103922381Y-80065238D01*
 D13*
-X119611600Y-70064000D02*
+X120246600Y-70064000D02*
-X119611600Y-69773714D01*
+X120246600Y-69773714D01*
-X119785771Y-70122057D02*
+X120420771Y-70122057D02*
-X119176171Y-69918857D01*
+X119811171Y-69918857D01*
-X119785771Y-69715657D01*
+X120420771Y-69715657D01*
-X119176171Y-69512457D02*
+X119811171Y-69512457D02*
-X119669657Y-69512457D01*
+X120304657Y-69512457D01*
-X119727714Y-69483429D01*
+X120362714Y-69483429D01*
-X119756743Y-69454400D01*
+X120391743Y-69454400D01*
-X119785771Y-69396343D01*
+X120420771Y-69396343D01*
-X119785771Y-69280229D01*
+X120420771Y-69280229D01*
-X119756743Y-69222171D01*
+X120391743Y-69222171D01*
-X119727714Y-69193143D01*
+X120362714Y-69193143D01*
-X119669657Y-69164114D01*
+X120304657Y-69164114D01*
-X119176171Y-69164114D01*
+X119811171Y-69164114D01*
-X119785771Y-68873828D02*
+X120420771Y-68873828D02*
-X119176171Y-68873828D01*
+X119811171Y-68873828D01*
-X119176171Y-68728685D01*
+X119811171Y-68728685D01*
-X119205200Y-68641600D01*
+X119840200Y-68641600D01*
-X119263257Y-68583542D01*
+X119898257Y-68583542D01*
-X119321314Y-68554514D01*
+X119956314Y-68554514D01*
-X119437429Y-68525485D01*
+X120072429Y-68525485D01*
-X119524514Y-68525485D01*
+X120159514Y-68525485D01*
-X119640629Y-68554514D01*
+X120275629Y-68554514D01*
-X119698686Y-68583542D01*
+X120333686Y-68583542D01*
-X119756743Y-68641600D01*
+X120391743Y-68641600D01*
-X119785771Y-68728685D01*
+X120420771Y-68728685D01*
-X119785771Y-68873828D01*
+X120420771Y-68873828D01*
-X119785771Y-68264228D02*
+X120420771Y-68264228D02*
-X119176171Y-68264228D01*
+X119811171Y-68264228D01*
-X119176171Y-67857828D02*
+X119811171Y-67857828D02*
-X119176171Y-67741714D01*
+X119811171Y-67741714D01*
-X119205200Y-67683656D01*
+X119840200Y-67683656D01*
-X119263257Y-67625599D01*
+X119898257Y-67625599D01*
-X119379371Y-67596571D01*
+X120014371Y-67596571D01*
-X119582571Y-67596571D01*
+X120217571Y-67596571D01*
-X119698686Y-67625599D01*
+X120333686Y-67625599D01*
-X119756743Y-67683656D01*
+X120391743Y-67683656D01*
-X119785771Y-67741714D01*
+X120420771Y-67741714D01*
-X119785771Y-67857828D01*
+X120420771Y-67857828D01*
-X119756743Y-67915885D01*
+X120391743Y-67915885D01*
-X119698686Y-67973942D01*
+X120333686Y-67973942D01*
-X119582571Y-68002971D01*
+X120217571Y-68002971D01*
-X119379371Y-68002971D01*
+X120014371Y-68002971D01*
-X119263257Y-67973942D01*
+X119898257Y-67973942D01*
-X119205200Y-67915885D01*
+X119840200Y-67915885D01*
-X119176171Y-67857828D01*
+X119811171Y-67857828D01*
-X119785771Y-67015999D02*
+X120420771Y-67015999D02*
-X119785771Y-67364342D01*
+X120420771Y-67364342D01*
-X119785771Y-67190170D02*
+X120420771Y-67190170D02*
-X119176171Y-67190170D01*
+X119811171Y-67190170D01*
-X119263257Y-67248227D01*
+X119898257Y-67248227D01*
-X119321314Y-67306285D01*
+X119956314Y-67306285D01*
-X119350343Y-67364342D01*
+X119985343Y-67364342D01*
 D11*
-X122762381Y-74659047D02*
+X123397381Y-74659047D02*
-X123476667Y-74659047D01*
+X124111667Y-74659047D01*
-X123619524Y-74706667D01*
+X124254524Y-74706667D01*
-X123714762Y-74801905D01*
+X124349762Y-74801905D01*
-X123762381Y-74944762D01*
+X124397381Y-74944762D01*
-X123762381Y-75040000D01*
+X124397381Y-75040000D01*
-X123476667Y-74230476D02*
+X124111667Y-74230476D02*
-X123476667Y-73754285D01*
+X124111667Y-73754285D01*
-X123762381Y-74325714D02*
+X124397381Y-74325714D02*
-X122762381Y-73992381D01*
+X123397381Y-73992381D01*
-X123762381Y-73659047D01*
+X124397381Y-73659047D01*
-X123667143Y-72754285D02*
+X124302143Y-72754285D02*
-X123714762Y-72801904D01*
+X124349762Y-72801904D01*
-X123762381Y-72944761D01*
+X124397381Y-72944761D01*
-X123762381Y-73039999D01*
+X124397381Y-73039999D01*
-X123714762Y-73182857D01*
+X124349762Y-73182857D01*
-X123619524Y-73278095D01*
+X124254524Y-73278095D01*
-X123524286Y-73325714D01*
+X124159286Y-73325714D01*
-X123333810Y-73373333D01*
+X123968810Y-73373333D01*
-X123190952Y-73373333D01*
+X123825952Y-73373333D01*
-X123000476Y-73325714D01*
+X123635476Y-73325714D01*
-X122905238Y-73278095D01*
+X123540238Y-73278095D01*
-X122810000Y-73182857D01*
+X123445000Y-73182857D01*
-X122762381Y-73039999D01*
+X123397381Y-73039999D01*
-X122762381Y-72944761D01*
+X123397381Y-72944761D01*
-X122810000Y-72801904D01*
+X123445000Y-72801904D01*
-X122857619Y-72754285D01*
+X123492619Y-72754285D01*
-X123762381Y-72325714D02*
+X124397381Y-72325714D02*
-X122762381Y-72325714D01*
+X123397381Y-72325714D01*
-X123762381Y-71754285D02*
+X124397381Y-71754285D02*
-X123190952Y-72182857D01*
+X123825952Y-72182857D01*
-X122762381Y-71754285D02*
+X123397381Y-71754285D02*
-X123333810Y-72325714D01*
+X123968810Y-72325714D01*
-X123857619Y-71563809D02*
+X124492619Y-71563809D02*
-X123857619Y-70801904D01*
+X124492619Y-70801904D01*
-X122762381Y-70706666D02*
+X123397381Y-70706666D02*
-X122762381Y-70135237D01*
+X123397381Y-70135237D01*
-X123762381Y-70420952D02*
+X124397381Y-70420952D02*
-X122762381Y-70420952D01*
+X123397381Y-70420952D01*
-X123762381Y-69230475D02*
+X124397381Y-69230475D02*
-X123286190Y-69563809D01*
+X123921190Y-69563809D01*
-X123762381Y-69801904D02*
+X124397381Y-69801904D02*
-X122762381Y-69801904D01*
+X123397381Y-69801904D01*
-X122762381Y-69420951D01*
+X123397381Y-69420951D01*
-X122810000Y-69325713D01*
+X123445000Y-69325713D01*
-X122857619Y-69278094D01*
+X123492619Y-69278094D01*
-X122952857Y-69230475D01*
+X123587857Y-69230475D01*
-X123095714Y-69230475D01*
+X123730714Y-69230475D01*
-X123190952Y-69278094D01*
+X123825952Y-69278094D01*
-X123238571Y-69325713D01*
+X123873571Y-69325713D01*
-X123286190Y-69420951D01*
+X123921190Y-69420951D01*
-X123286190Y-69801904D01*
+X123921190Y-69801904D01*
-X123714762Y-68849523D02*
+X124349762Y-68849523D02*
-X123762381Y-68706666D01*
+X124397381Y-68706666D01*
-X123762381Y-68468570D01*
+X124397381Y-68468570D01*
-X123714762Y-68373332D01*
+X124349762Y-68373332D01*
-X123667143Y-68325713D01*
+X124302143Y-68325713D01*
-X123571905Y-68278094D01*
+X124206905Y-68278094D01*
-X123476667Y-68278094D01*
+X124111667Y-68278094D01*
-X123381429Y-68325713D01*
+X124016429Y-68325713D01*
-X123333810Y-68373332D01*
+X123968810Y-68373332D01*
-X123286190Y-68468570D01*
+X123921190Y-68468570D01*
-X123238571Y-68659047D01*
+X123873571Y-68659047D01*
-X123190952Y-68754285D01*
+X123825952Y-68754285D01*
-X123143333Y-68801904D01*
+X123778333Y-68801904D01*
-X123048095Y-68849523D01*
+X123683095Y-68849523D01*
-X122952857Y-68849523D01*
+X123587857Y-68849523D01*
-X122857619Y-68801904D01*
+X123492619Y-68801904D01*
-X122810000Y-68754285D01*
+X123445000Y-68754285D01*
-X122762381Y-68659047D01*
+X123397381Y-68659047D01*
-X122762381Y-68420951D01*
+X123397381Y-68420951D01*
-X122810000Y-68278094D01*
+X123445000Y-68278094D01*
-X123857619Y-68087618D02*
+X124492619Y-68087618D02*
-X123857619Y-67325713D01*
+X124492619Y-67325713D01*
-X122762381Y-66659046D02*
+X123397381Y-66659046D02*
-X122762381Y-66849523D01*
+X123397381Y-66849523D01*
-X122810000Y-66944761D01*
+X123445000Y-66944761D01*
-X122857619Y-66992380D01*
+X123492619Y-66992380D01*
-X123000476Y-67087618D01*
+X123635476Y-67087618D01*
-X123190952Y-67135237D01*
+X123825952Y-67135237D01*
-X123571905Y-67135237D01*
+X124206905Y-67135237D01*
-X123667143Y-67087618D01*
+X124302143Y-67087618D01*
-X123714762Y-67039999D01*
+X124349762Y-67039999D01*
-X123762381Y-66944761D01*
+X124397381Y-66944761D01*
-X123762381Y-66754284D01*
+X124397381Y-66754284D01*
-X123714762Y-66659046D01*
+X124349762Y-66659046D01*
-X123667143Y-66611427D01*
+X124302143Y-66611427D01*
-X123571905Y-66563808D01*
+X124206905Y-66563808D01*
-X123333810Y-66563808D01*
+X123968810Y-66563808D01*
-X123238571Y-66611427D01*
+X123873571Y-66611427D01*
-X123190952Y-66659046D01*
+X123825952Y-66659046D01*
-X123143333Y-66754284D01*
+X123778333Y-66754284D01*
-X123143333Y-66944761D01*
+X123778333Y-66944761D01*
-X123190952Y-67039999D01*
+X123825952Y-67039999D01*
-X123238571Y-67087618D01*
+X123873571Y-67087618D01*
-X123333810Y-67135237D01*
+X123968810Y-67135237D01*
-X123762381Y-66135237D02*
+X124397381Y-66135237D02*
-X122762381Y-66135237D01*
+X123397381Y-66135237D01*
-X122762381Y-65754284D01*
+X123397381Y-65754284D01*
-X122810000Y-65659046D01*
+X123445000Y-65659046D01*
-X122857619Y-65611427D01*
+X123492619Y-65611427D01*
-X122952857Y-65563808D01*
+X123587857Y-65563808D01*
-X123095714Y-65563808D01*
+X123730714Y-65563808D01*
-X123190952Y-65611427D01*
+X123825952Y-65611427D01*
-X123238571Y-65659046D01*
+X123873571Y-65659046D01*
-X123286190Y-65754284D01*
+X123921190Y-65754284D01*
-X123286190Y-66135237D01*
+X123921190Y-66135237D01*
-X123762381Y-65135237D02*
+X124397381Y-65135237D02*
-X122762381Y-65135237D01*
+X123397381Y-65135237D01*
-X123762381Y-64659047D02*
+X124397381Y-64659047D02*
-X122762381Y-64659047D01*
+X123397381Y-64659047D01*
-X123762381Y-64087618D01*
+X124397381Y-64087618D01*
-X122762381Y-64087618D01*
+X123397381Y-64087618D01*
-X123714762Y-63659047D02*
+X124349762Y-63659047D02*
-X123762381Y-63516190D01*
+X124397381Y-63516190D01*
-X123762381Y-63278094D01*
+X124397381Y-63278094D01*
-X123714762Y-63182856D01*
+X124349762Y-63182856D01*
-X123667143Y-63135237D01*
+X124302143Y-63135237D01*
-X123571905Y-63087618D01*
+X124206905Y-63087618D01*
-X123476667Y-63087618D01*
+X124111667Y-63087618D01*
-X123381429Y-63135237D01*
+X124016429Y-63135237D01*
-X123333810Y-63182856D01*
+X123968810Y-63182856D01*
-X123286190Y-63278094D01*
+X123921190Y-63278094D01*
-X123238571Y-63468571D01*
+X123873571Y-63468571D01*
-X123190952Y-63563809D01*
+X123825952Y-63563809D01*
-X123143333Y-63611428D01*
+X123778333Y-63611428D01*
-X123048095Y-63659047D01*
+X123683095Y-63659047D01*
-X122952857Y-63659047D01*
+X123587857Y-63659047D01*
-X122857619Y-63611428D01*
+X123492619Y-63611428D01*
-X122810000Y-63563809D01*
+X123445000Y-63563809D01*
-X122762381Y-63468571D01*
+X123397381Y-63468571D01*
-X122762381Y-63230475D01*
+X123397381Y-63230475D01*
-X122810000Y-63087618D01*
+X123445000Y-63087618D01*
 X152532381Y-88561905D02*
 X153341905Y-88561905D01*
 X153437143Y-88514286D01*
--- a/plot/ulx3s-In1.Cu.g2
+++ b/plot/ulx3s-In1.Cu.g2
--- a/plot/ulx3s-In2.Cu.g3
+++ b/plot/ulx3s-In2.Cu.g3
--- a/plot/ulx3s-drl_map.gbr
+++ b/plot/ulx3s-drl_map.gbr
@ -1,6 +1,6 @@
 %FSLAX45Y45*%
 G04 Gerber Fmt 4.5, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Tue May 16 14:48:24 2017*
+G04 Created by KiCad (PCBNEW 4.0.5+dfsg1-4) date Wed May 17 14:14:25 2017*
 %MOMM*%
 %LPD*%
 G01*
@ -92,10 +92,10 @@ X11738000Y-7470000D02*
 X11758000Y-7490000D01*
 X11758000Y-7470000D02*
 X11738000Y-7490000D01*
-X11903006Y-9556236D02*
+X11874380Y-9539822D02*
-X11923006Y-9576236D01*
+X11894380Y-9559822D01*
-X11923006Y-9556236D02*
+X11894380Y-9539822D02*
-X11903006Y-9576236D01*
+X11874380Y-9559822D01*
 X11940000Y-7783000D02*
 X11960000Y-7803000D01*
 X11960000Y-7783000D02*
@ -132,34 +132,30 @@ X12572728Y-9335266D02*
 X12592728Y-9355266D01*
 X12592728Y-9335266D02*
 X12572728Y-9355266D01*
-X12632540Y-7913939D02*
+X12650396Y-7896838D02*
-X12652540Y-7933939D01*
+X12670396Y-7916838D01*
-X12652540Y-7913939D02*
+X12670396Y-7896838D02*
-X12632540Y-7933939D01*
+X12650396Y-7916838D01*
-X12670640Y-7815180D02*
+X12671476Y-7801437D02*
-X12690640Y-7835180D01*
+X12691476Y-7821437D01*
-X12690640Y-7815180D02*
+X12691476Y-7801437D02*
-X12670640Y-7835180D01*
+X12671476Y-7821437D01*
-X12731691Y-7876231D02*
+X12745797Y-7873870D02*
-X12751691Y-7896231D01*
+X12765797Y-7893870D01*
-X12751691Y-7876231D02*
+X12765797Y-7873870D02*
-X12731691Y-7896231D01*
+X12745797Y-7893870D01*
-X12768956Y-7913497D02*
+X12773138Y-7918925D02*
-X12788956Y-7933497D01*
+X12793138Y-7938925D01*
-X12788956Y-7913497D02*
+X12793138Y-7918925D02*
-X12768956Y-7933497D01*
+X12773138Y-7938925D01*
-X12787596Y-8430245D02*
+X12789247Y-8443566D02*
-X12807596Y-8450245D01*
+X12809247Y-8463566D01*
-X12807596Y-8430245D02*
+X12809247Y-8443566D02*
-X12787596Y-8450245D01*
+X12789247Y-8463566D01*
-X12794721Y-8345844D02*
+X12802648Y-8359164D02*
-X12814721Y-8365844D01*
+X12822648Y-8379164D01*
-X12814721Y-8345844D02*
+X12822648Y-8359164D02*
-X12794721Y-8365844D01*
+X12802648Y-8379164D01*
 X12796624Y-8229741D02*
 X12816624Y-8249741D01*
 X12816624Y-8229741D02*
 X12796624Y-8249741D01*
 X12812387Y-8782408D02*
 X12832387Y-8802408D01*
 X12832387Y-8782408D02*
@ -172,54 +168,58 @@ X12834133Y-10069588D02*
 X12854133Y-10089588D01*
 X12854133Y-10069588D02*
 X12834133Y-10089588D01*
-X12844648Y-8273634D02*
+X12847399Y-8436830D02*
-X12864648Y-8293634D01*
+X12867399Y-8456830D01*
-X12864648Y-8273634D02*
+X12867399Y-8436830D02*
-X12844648Y-8293634D01*
+X12847399Y-8456830D01*
-X12845809Y-8388929D02*
+X12851502Y-8381480D02*
-X12865809Y-8408929D01*
+X12871502Y-8401480D01*
-X12865809Y-8388929D02*
+X12871502Y-8381480D02*
-X12845809Y-8408929D01*
+X12851502Y-8401480D01*
-X12850641Y-8441818D02*
+X12860201Y-8232201D02*
-X12870641Y-8461818D01*
+X12880201Y-8252201D01*
-X12870641Y-8441818D02*
+X12880201Y-8232201D02*
-X12850641Y-8461818D01*
+X12860201Y-8252201D01*
 X12860201Y-8284902D02*
 X12880201Y-8304902D01*
 X12880201Y-8284902D02*
 X12860201Y-8304902D01*
 X12870327Y-8521147D02*
 X12890327Y-8541147D01*
 X12890327Y-8521147D02*
 X12870327Y-8541147D01*
 X12874834Y-9141416D02*
 X12894834Y-9161416D01*
 X12894834Y-9141416D02*
 X12874834Y-9161416D01*
 X12878000Y-8530000D02*
 X12898000Y-8550000D01*
 X12898000Y-8530000D02*
 X12878000Y-8550000D01*
 X12886729Y-8305360D02*
 X12906729Y-8325360D01*
 X12906729Y-8305360D02*
 X12886729Y-8325360D01*
 X12911219Y-8919157D02*
 X12931219Y-8939157D01*
 X12931219Y-8919157D02*
 X12911219Y-8939157D01*
 X12917995Y-8308657D02*
 X12937995Y-8328657D01*
 X12937995Y-8308657D02*
 X12917995Y-8328657D01*
 X12918000Y-9310000D02*
 X12938000Y-9330000D01*
 X12938000Y-9310000D02*
 X12918000Y-9330000D01*
-X12924624Y-8646102D02*
+X12924930Y-8651034D02*
-X12944624Y-8666102D01*
+X12944930Y-8671034D01*
-X12944624Y-8646102D02*
+X12944930Y-8651034D02*
-X12924624Y-8666102D01*
+X12924930Y-8671034D01*
 X12926504Y-9163074D02*
 X12946504Y-9183074D01*
 X12946504Y-9163074D02*
 X12926504Y-9183074D01*
-X12938262Y-8486004D02*
+X12935799Y-8358260D02*
-X12958262Y-8506004D01*
+X12955799Y-8378260D01*
-X12958262Y-8486004D02*
+X12955799Y-8358260D02*
-X12938262Y-8506004D01*
+X12935799Y-8378260D01*
-X12942121Y-8365879D02*
+X12935799Y-8486004D02*
-X12962121Y-8385879D01*
+X12955799Y-8506004D01*
-X12962121Y-8365879D02*
+X12955799Y-8486004D02*
-X12942121Y-8385879D01*
+X12935799Y-8506004D01*
 X12946373Y-10458034D02*
 X12966373Y-10478034D01*
 X12966373Y-10458034D02*
@ -228,6 +228,10 @@ X12952940Y-9117483D02*
 X12972940Y-9137483D01*
 X12972940Y-9117483D02*
 X12952940Y-9137483D01*
 X12958000Y-8610000D02*
 X12978000Y-8630000D01*
 X12978000Y-8610000D02*
 X12958000Y-8630000D01*
 X12958000Y-10650000D02*
 X12978000Y-10670000D01*
 X12978000Y-10650000D02*
@ -240,14 +244,14 @@ X12978000Y-10410000D02*
 X12998000Y-10430000D01*
 X12998000Y-10410000D02*
 X12978000Y-10430000D01*
 X12986313Y-8050854D02*
 X13006313Y-8070854D01*
 X13006313Y-8050854D02*
 X12986313Y-8070854D01*
 X13002401Y-9331328D02*
 X13022401Y-9351328D01*
 X13022401Y-9331328D02*
 X13002401Y-9351328D01*
 X13006962Y-8030205D02*
 X13026962Y-8050205D01*
 X13026962Y-8030205D02*
 X13006962Y-8050205D01*
 X13070707Y-9535414D02*
 X13090707Y-9555414D01*
 X13090707Y-9535414D02*
@ -256,10 +260,14 @@ X13073949Y-10325498D02*
 X13093949Y-10345498D01*
 X13093949Y-10325498D02*
 X13073949Y-10345498D01*
-X13087688Y-7765510D02*
+X13081984Y-7764262D02*
-X13107688Y-7785510D01*
+X13101984Y-7784262D01*
-X13107688Y-7765510D02*
+X13101984Y-7764262D02*
-X13087688Y-7785510D01*
+X13081984Y-7784262D01*
 X13083000Y-6703500D02*
 X13103000Y-6723500D01*
 X13103000Y-6703500D02*
 X13083000Y-6723500D01*
 X13091999Y-10226419D02*
 X13111999Y-10246419D01*
 X13111999Y-10226419D02*
@ -268,30 +276,46 @@ X13108000Y-8040000D02*
 X13128000Y-8060000D01*
 X13128000Y-8040000D02*
 X13108000Y-8060000D01*
 X13115453Y-8615136D02*
 X13135453Y-8635136D01*
 X13135453Y-8615136D02*
 X13115453Y-8635136D01*
 X13118000Y-8930000D02*
 X13138000Y-8950000D01*
 X13138000Y-8930000D02*
 X13118000Y-8950000D01*
-X13128050Y-8646102D02*
+X13131403Y-9719116D02*
-X13148050Y-8666102D01*
+X13151403Y-9739116D01*
-X13148050Y-8646102D02*
+X13151403Y-9719116D02*
-X13128050Y-8666102D01*
+X13131403Y-9739116D01*
 X13132688Y-9717830D02*
 X13152688Y-9737830D01*
 X13152688Y-9717830D02*
 X13132688Y-9737830D01*
 X13135385Y-10319621D02*
 X13155385Y-10339621D01*
 X13155385Y-10319621D02*
 X13135385Y-10339621D01*
-X13193394Y-8445599D02*
+X13146502Y-7769099D02*
-X13213394Y-8465599D01*
+X13166502Y-7789099D01*
-X13213394Y-8445599D02*
+X13166502Y-7769099D02*
-X13193394Y-8465599D01*
+X13146502Y-7789099D01*
 X13178000Y-7910000D02*
 X13198000Y-7930000D01*
 X13198000Y-7910000D02*
 X13178000Y-7930000D01*
 X13197765Y-9087799D02*
 X13217765Y-9107799D01*
 X13217765Y-9087799D02*
 X13197765Y-9107799D01*
 X13197789Y-8611496D02*
 X13217789Y-8631496D01*
 X13217789Y-8611496D02*
 X13197789Y-8631496D01*
 X13197962Y-8527095D02*
 X13217962Y-8547095D01*
 X13217962Y-8527095D02*
 X13197962Y-8547095D01*
 X13198000Y-8440334D02*
 X13218000Y-8460334D01*
 X13218000Y-8440334D02*
 X13198000Y-8460334D01*
 X13198000Y-8130000D02*
 X13218000Y-8150000D01*
 X13218000Y-8130000D02*
@ -300,14 +324,6 @@ X13198000Y-8207799D02*
 X13218000Y-8227799D01*
 X13218000Y-8207799D02*
 X13198000Y-8227799D01*
 X13198000Y-8530000D02*
 X13218000Y-8550000D01*
 X13218000Y-8530000D02*
 X13198000Y-8550000D01*
 X13198000Y-8614401D02*
 X13218000Y-8634401D01*
 X13218000Y-8614401D02*
 X13198000Y-8634401D01*
 X13198000Y-8690000D02*
 X13218000Y-8710000D01*
 X13218000Y-8690000D02*
@ -328,22 +344,22 @@ X13198000Y-9410000D02*
 X13218000Y-9430000D01*
 X13218000Y-9410000D02*
 X13198000Y-9430000D01*
-X13198432Y-8292201D02*
+X13198482Y-8287799D02*
-X13218432Y-8312201D01*
+X13218482Y-8307799D01*
-X13218432Y-8292201D02*
+X13218482Y-8287799D02*
-X13198432Y-8312201D01*
+X13198482Y-8307799D01*
 X13201744Y-8376602D02*
 X13221744Y-8396602D01*
 X13221744Y-8376602D02*
 X13201744Y-8396602D01*
-X13232711Y-7811721D02*
+X13211045Y-7827583D02*
-X13252711Y-7831721D01*
+X13231045Y-7847583D01*
-X13252711Y-7811721D02*
+X13231045Y-7827583D02*
-X13232711Y-7831721D01*
+X13211045Y-7847583D01*
-X13239238Y-7871027D02*
+X13229761Y-7711481D02*
-X13259238Y-7891027D01*
+X13249761Y-7731481D01*
-X13259238Y-7871027D02*
+X13249761Y-7711481D02*
-X13239238Y-7891027D01*
+X13229761Y-7731481D01*
 X13267509Y-9807892D02*
 X13287509Y-9827892D01*
 X13287509Y-9807892D02*
@ -352,6 +368,10 @@ X13274623Y-9409707D02*
 X13294623Y-9429707D01*
 X13294623Y-9409707D02*
 X13274623Y-9429707D01*
 X13275799Y-8129053D02*
 X13295799Y-8149053D01*
 X13295799Y-8129053D02*
 X13275799Y-8149053D01*
 X13277580Y-8532199D02*
 X13297580Y-8552199D01*
 X13297580Y-8532199D02*
@ -360,10 +380,10 @@ X13278000Y-8210000D02*
 X13298000Y-8230000D01*
 X13298000Y-8210000D02*
 X13278000Y-8230000D01*
-X13278000Y-8610000D02*
+X13278000Y-8290000D02*
-X13298000Y-8630000D01*
+X13298000Y-8310000D01*
-X13298000Y-8610000D02*
+X13298000Y-8290000D02*
-X13278000Y-8630000D01*
+X13278000Y-8310000D01*
 X13278000Y-8850000D02*
 X13298000Y-8870000D01*
 X13298000Y-8850000D02*
@ -388,10 +408,6 @@ X13278042Y-8446513D02*
 X13298042Y-8466513D01*
 X13298042Y-8446513D02*
 X13278042Y-8466513D01*
 X13278444Y-8129112D02*
 X13298444Y-8149112D01*
 X13298444Y-8129112D02*
 X13278444Y-8149112D01*
 X13278650Y-8367799D02*
 X13298650Y-8387799D01*
 X13298650Y-8367799D02*
@ -400,38 +416,30 @@ X13281858Y-10470000D02*
 X13301858Y-10490000D01*
 X13301858Y-10470000D02*
 X13281858Y-10490000D01*
-X13285430Y-9613937D02*
+X13285954Y-9617033D02*
-X13305430Y-9633937D01*
+X13305954Y-9637033D01*
-X13305430Y-9613937D02*
+X13305954Y-9617033D02*
-X13285430Y-9633937D01*
+X13285954Y-9637033D01*
 X13299153Y-7658736D02*
 X13319153Y-7678736D01*
 X13319153Y-7658736D02*
 X13299153Y-7678736D01*
 X13338000Y-10884000D02*
 X13358000Y-10904000D01*
 X13358000Y-10884000D02*
 X13338000Y-10904000D01*
-X13347357Y-7766558D02*
+X13349508Y-7643184D02*
-X13367357Y-7786558D01*
+X13369508Y-7663184D01*
-X13367357Y-7766558D02*
+X13369508Y-7643184D02*
-X13347357Y-7786558D01*
+X13349508Y-7663184D01*
 X13356815Y-7701108D02*
 X13376815Y-7721108D01*
 X13376815Y-7701108D02*
 X13356815Y-7721108D01*
 X13357194Y-8449520D02*
 X13377194Y-8469520D01*
 X13377194Y-8449520D02*
 X13357194Y-8469520D01*
-X13358000Y-8130000D02*
+X13358000Y-8210000D02*
-X13378000Y-8150000D01*
+X13378000Y-8230000D01*
-X13378000Y-8130000D02*
+X13378000Y-8210000D02*
-X13358000Y-8150000D01*
+X13358000Y-8230000D01*
 X13358000Y-8287799D02*
 X13378000Y-8307799D01*
 X13378000Y-8287799D02*
 X13358000Y-8307799D01*
 X13358000Y-8372201D02*
 X13378000Y-8392201D01*
 X13378000Y-8372201D02*
 X13358000Y-8392201D01*
 X13358000Y-9170000D02*
 X13378000Y-9190000D01*
 X13378000Y-9170000D02*
@ -448,6 +456,10 @@ X13359024Y-9408016D02*
 X13379024Y-9428016D01*
 X13379024Y-9408016D02*
 X13359024Y-9428016D01*
 X13360201Y-8130000D02*
 X13380201Y-8150000D01*
 X13380201Y-8130000D02*
 X13360201Y-8150000D01*
 X13378000Y-6330000D02*
 X13398000Y-6350000D01*
 X13398000Y-6330000D02*
@ -456,10 +468,10 @@ X13381998Y-9593873D02*
 X13401998Y-9613873D01*
 X13401998Y-9593873D02*
 X13381998Y-9613873D01*
-X13400500Y-7750394D02*
+X13421411Y-7746423D02*
-X13420500Y-7770394D01*
+X13441411Y-7766423D01*
-X13420500Y-7750394D02*
+X13441411Y-7746423D02*
-X13400500Y-7770394D01*
+X13421411Y-7766423D01*
 X13438000Y-8210000D02*
 X13458000Y-8230000D01*
 X13458000Y-8210000D02*
@ -472,18 +484,18 @@ X13438000Y-9090000D02*
 X13458000Y-9110000D01*
 X13458000Y-9090000D02*
 X13438000Y-9110000D01*
-X13442701Y-8129060D02*
+X13444602Y-8129060D02*
-X13462701Y-8149060D01*
+X13464602Y-8149060D01*
-X13462701Y-8129060D02*
+X13464602Y-8129060D02*
-X13442701Y-8149060D01*
+X13444602Y-8149060D01*
 X13495803Y-7739152D02*
 X13515803Y-7759152D01*
 X13515803Y-7739152D02*
 X13495803Y-7759152D01*
 X13498546Y-9743179D02*
 X13518546Y-9763179D01*
 X13518546Y-9743179D02*
 X13498546Y-9763179D01*
 X13505812Y-7740288D02*
 X13525812Y-7760288D01*
 X13525812Y-7740288D02*
 X13505812Y-7760288D01*
 X13517331Y-8851860D02*
 X13537331Y-8871860D01*
 X13537331Y-8851860D02*
@ -516,10 +528,10 @@ X13537195Y-10930959D02*
 X13557195Y-10950959D01*
 X13557195Y-10930959D02*
 X13537195Y-10950959D01*
-X13537304Y-7684988D02*
+X13537378Y-7684923D02*
-X13557304Y-7704988D01*
+X13557378Y-7704923D01*
-X13557304Y-7684988D02*
+X13557378Y-7684923D02*
-X13537304Y-7704988D01*
+X13537378Y-7704923D01*
 X13558000Y-10530000D02*
 X13578000Y-10550000D01*
 X13578000Y-10530000D02*
@ -708,10 +720,10 @@ X14122988Y-7531564D02*
 X14142988Y-7551564D01*
 X14142988Y-7531564D02*
 X14122988Y-7551564D01*
-X14124602Y-7707029D02*
+X14139991Y-7654792D02*
-X14144602Y-7727029D01*
+X14159991Y-7674792D01*
-X14144602Y-7707029D02*
+X14159991Y-7654792D02*
-X14124602Y-7727029D01*
+X14139991Y-7674792D01*
 X14155799Y-8203034D02*
 X14175799Y-8223034D01*
 X14175799Y-8203034D02*
@ -1016,10 +1028,10 @@ X15438000Y-9430000D02*
 X15458000Y-9450000D01*
 X15458000Y-9430000D02*
 X15438000Y-9450000D01*
-X15538000Y-7169299D02*
+X15538000Y-7162299D02*
-X15558000Y-7189299D01*
+X15558000Y-7182299D01*
-X15558000Y-7169299D02*
+X15558000Y-7162299D02*
-X15538000Y-7189299D01*
+X15538000Y-7182299D01*
 X15584572Y-9434482D02*
 X15604572Y-9454482D01*
 X15604572Y-9434482D02*
@ -1036,6 +1048,10 @@ X15858000Y-8110000D02*
 X15878000Y-8130000D01*
 X15878000Y-8110000D02*
 X15858000Y-8130000D01*
 X15877000Y-10831000D02*
 X15897000Y-10851000D01*
 X15897000Y-10831000D02*
 X15877000Y-10851000D01*
 X15938000Y-6450000D02*
 X15958000Y-6470000D01*
 X15958000Y-6450000D02*
@ -1120,6 +1136,10 @@ X17358000Y-6250000D02*
 X17378000Y-6270000D01*
 X17378000Y-6250000D02*
 X17358000Y-6270000D01*
 X17401000Y-10831000D02*
 X17421000Y-10851000D01*
 X17421000Y-10831000D02*
 X17401000Y-10851000D01*
 X17448799Y-8887335D02*
 X17468799Y-8907335D01*
 X17468799Y-8887335D02*
@ -1136,6 +1156,10 @@ X18096500Y-7868500D02*
 X18116500Y-7888500D01*
 X18116500Y-7868500D02*
 X18096500Y-7888500D01*
 X18163000Y-9245000D02*
 X18183000Y-9265000D01*
 X18183000Y-9245000D02*
 X18163000Y-9265000D01*
 X12010516Y-9541295D02*
 G75*
 G03X12010516Y-9541295I-12700J0D01*
@ -2086,24 +2110,24 @@ X17919000Y-10681000D02*
 X17919000Y-11001000D01*
 X17759000Y-10841000D02*
 X18079000Y-10841000D01*
-X12246000Y-6569000D02*
+X12309500Y-6569000D02*
-X12416000Y-6739000D01*
+X12479500Y-6739000D01*
-X12416000Y-6569000D02*
+X12479500Y-6569000D02*
-X12246000Y-6739000D01*
+X12309500Y-6739000D01*
-X12391105Y-6714105D02*
+X12454605Y-6714105D02*
-X12391105Y-6593895D01*
+X12454605Y-6593895D01*
-X12270895Y-6593895D01*
+X12334395Y-6593895D01*
-X12270895Y-6714105D01*
+X12334395Y-6714105D01*
-X12391105Y-6714105D01*
+X12454605Y-6714105D01*
-X12246000Y-7269000D02*
+X12309500Y-7269000D02*
-X12416000Y-7439000D01*
+X12479500Y-7439000D01*
-X12416000Y-7269000D02*
+X12479500Y-7269000D02*
-X12246000Y-7439000D01*
+X12309500Y-7439000D01*
-X12391105Y-7414105D02*
+X12454605Y-7414105D02*
-X12391105Y-7293895D01*
+X12454605Y-7293895D01*
-X12270895Y-7293895D01*
+X12334395Y-7293895D01*
-X12270895Y-7414105D01*
+X12334395Y-7414105D01*
-X12391105Y-7414105D01*
+X12454605Y-7414105D01*
 D11*
 X9666429Y-11702714D02*
 X9666429Y-11402714D01*
@ -2413,31 +2437,54 @@ X14337857Y-12118429D01*
 X14323571Y-12161286D01*
 X14152143Y-12332714D01*
 X14337857Y-12332714D01*
-X14437857Y-12032714D02*
+X14509285Y-12161286D02*
-X14637857Y-12032714D01*
+X14480714Y-12147000D01*
 X14466428Y-12132714D01*
 X14452143Y-12104143D01*
 X14452143Y-12089857D01*
 X14466428Y-12061286D01*
 X14480714Y-12047000D01*
 X14509285Y-12032714D01*
 X14566428Y-12032714D01*
 X14595000Y-12047000D01*
 X14609285Y-12061286D01*
 X14623571Y-12089857D01*
 X14623571Y-12104143D01*
 X14609285Y-12132714D01*
 X14595000Y-12147000D01*
 X14566428Y-12161286D01*
 X14509285Y-12161286D01*
 X14480714Y-12175571D01*
 X14466428Y-12189857D01*
 X14452143Y-12218429D01*
 X14452143Y-12275571D01*
 X14466428Y-12304143D01*
 X14480714Y-12318429D01*
 X14509285Y-12332714D01*
-X14766428Y-12332714D02*
+X14566428Y-12332714D01*
-X14823571Y-12332714D01*
+X14595000Y-12318429D01*
-X14852143Y-12318429D01*
+X14609285Y-12304143D01*
-X14866428Y-12304143D01*
+X14623571Y-12275571D01*
-X14895000Y-12261286D01*
+X14623571Y-12218429D01*
 X14609285Y-12189857D01*
 X14595000Y-12175571D01*
 X14566428Y-12161286D01*
 X14895000Y-12032714D02*
 X14752143Y-12032714D01*
 X14737857Y-12175571D01*
 X14752143Y-12161286D01*
 X14780714Y-12147000D01*
 X14852143Y-12147000D01*
 X14880714Y-12161286D01*
 X14895000Y-12175571D01*
 X14909285Y-12204143D01*
-X14909285Y-12089857D01*
+X14909285Y-12275571D01*
-X14895000Y-12061286D01*
+X14895000Y-12304143D01*
-X14880714Y-12047000D01*
+X14880714Y-12318429D01*
-X14852143Y-12032714D01*
+X14852143Y-12332714D01*
-X14795000Y-12032714D01*
+X14780714Y-12332714D01*
-X14766428Y-12047000D01*
+X14752143Y-12318429D01*
-X14752143Y-12061286D01*
+X14737857Y-12304143D01*
 X14737857Y-12089857D01*
 X14737857Y-12161286D01*
 X14752143Y-12189857D01*
 X14766428Y-12204143D01*
 X14795000Y-12218429D01*
 X14852143Y-12218429D01*
 X14880714Y-12204143D01*
 X14895000Y-12189857D01*
 X14909285Y-12161286D01*
 X15266428Y-12332714D02*
 X15266428Y-12032714D01*
 X15395000Y-12332714D02*
--- a/plot/ulx3s.drl
+++ b/plot/ulx3s.drl
@ -1,5 +1,5 @@
 M48
-;DRILL file {KiCad 4.0.5+dfsg1-4} date Tue May 16 14:48:23 2017
+;DRILL file {KiCad 4.0.5+dfsg1-4} date Wed May 17 14:14:25 2017
 ;FORMAT={-:-/ absolute / inch / decimal}
 FMAT,2
 INCH,TZ
@ -34,7 +34,7 @@ X4.452Y-3.4961
 X4.5547Y-3.0713
 X4.6111Y-3.8511
 X4.6252Y-2.9449
-X4.6902Y-3.7662
+X4.6789Y-3.7598
 X4.7047Y-3.0681
 X4.7413Y-3.8209
 X4.7591Y-3.5827
@ -44,94 +44,97 @@ X4.885Y-4.3652
 X4.8899Y-4.2208
 X4.8919Y-4.1725
 X4.9538Y-3.6792
-X4.9774Y-3.1197
+X4.9844Y-3.1129
-X4.9924Y-3.0808
+X4.9927Y-3.0754
-X5.0164Y-3.1048
+X5.022Y-3.1039
-X5.0311Y-3.1195
+X5.0327Y-3.1216
-X5.0384Y-3.3229
+X5.0391Y-3.3282
-X5.0412Y-3.2897
+X5.0443Y-3.2949
 X5.042Y-3.244
 X5.0482Y-3.4616
 X5.0534Y-3.5073
 X5.0567Y-3.9683
-X5.0609Y-3.2613
+X5.062Y-3.3255
-X5.0613Y-3.3067
+X5.0636Y-3.3037
-X5.0632Y-3.3275
+X5.067Y-3.245
 X5.067Y-3.2657
 X5.071Y-3.3587
 X5.0728Y-3.6029
 X5.074Y-3.3622
 X5.0775Y-3.2738
 X5.0871Y-3.5154
 X5.0898Y-3.2751
 X5.0898Y-3.6693
-X5.0924Y-3.4079
+X5.0925Y-3.4099
 X5.0931Y-3.6114
-X5.0977Y-3.3449
+X5.0968Y-3.2946
-X5.0993Y-3.2976
+X5.0968Y-3.3449
 X5.1009Y-4.1213
 X5.1035Y-3.5935
 X5.1055Y-3.3937
 X5.1055Y-4.1969
 X5.1108Y-3.6422
 X5.1134Y-4.1024
 X5.1167Y-3.1736
 X5.123Y-3.6777
 X5.1248Y-3.1654
 X5.1499Y-3.758
 X5.1512Y-4.0691
-X5.1566Y-3.0612
+X5.1543Y-3.0607
 X5.1547Y-2.6431
 X5.1583Y-4.0301
 X5.1646Y-3.1693
 X5.1675Y-3.3957
 X5.1685Y-3.5197
-X5.1725Y-3.4079
+X5.1738Y-3.8304
 X5.1743Y-3.8299
 X5.1753Y-4.0668
-X5.1982Y-3.329
+X5.1797Y-3.0626
 X5.1921Y-3.1181
 X5.1999Y-3.5818
 X5.1999Y-3.3943
 X5.2Y-3.3611
 X5.2Y-3.3269
 X5.2Y-3.2047
 X5.2Y-3.2354
 X5.2Y-3.3622
 X5.2Y-3.3954
 X5.2Y-3.4252
 X5.2Y-3.5214
 X5.2Y-3.6457
 X5.2Y-3.6772
 X5.2Y-3.7087
-X5.2002Y-3.2686
+X5.2002Y-3.2668
 X5.2015Y-3.3018
-X5.2137Y-3.0794
+X5.2051Y-3.0857
-X5.2162Y-3.1028
+X5.2125Y-3.04
 X5.2274Y-3.8653
 X5.2302Y-3.7085
 X5.2306Y-3.2044
 X5.2313Y-3.3631
 X5.2315Y-3.2362
-X5.2315Y-3.3937
+X5.2315Y-3.2677
 X5.2315Y-3.4882
 X5.2315Y-3.5827
 X5.2315Y-3.6142
 X5.2315Y-3.6457
 X5.2315Y-3.6772
 X5.2315Y-3.3293
 X5.2317Y-3.2044
 X5.2318Y-3.2983
 X5.233Y-4.126
-X5.2344Y-3.789
+X5.2346Y-3.7902
 X5.2398Y-3.0192
 X5.2551Y-4.289
-X5.2588Y-3.0616
+X5.2596Y-3.0131
 X5.2625Y-3.0359
 X5.2627Y-3.3305
-X5.263Y-3.2047
+X5.263Y-3.2362
 X5.263Y-3.2668
 X5.263Y-3.3001
 X5.263Y-3.6142
 X5.263Y-3.6457
 X5.2632Y-3.6773
 X5.2634Y-3.7079
 X5.2639Y-3.2047
 X5.2709Y-2.4961
 X5.2724Y-3.7811
-X5.2797Y-3.0553
+X5.288Y-3.0537
 X5.2945Y-3.2362
 X5.2945Y-3.2992
 X5.2945Y-3.5827
-X5.2963Y-3.2044
+X5.2971Y-3.2044
 X5.3172Y-3.0508
 X5.3183Y-3.8398
 X5.3212Y-3.0513
 X5.3257Y-3.4889
 X5.3258Y-3.2044
 X5.326Y-3.1732
@ -188,7 +191,7 @@ X5.5482Y-3.2354
 X5.553Y-2.9478
 X5.5622Y-3.8425
 X5.5642Y-2.9691
-X5.5648Y-3.0382
+X5.5709Y-3.0176
 X5.5771Y-3.2335
 X5.578Y-3.3622
 X5.578Y-3.3937
@ -265,11 +268,12 @@ X5.9308Y-2.8515
 X5.9844Y-4.1354
 X6.0129Y-4.0759
 X6.0819Y-3.7165
-X6.1213Y-2.8265
+X6.1213Y-2.8237
 X6.1396Y-3.7183
 X6.1528Y-3.1969
 X6.2236Y-3.7244
 X6.2472Y-3.1969
 X6.2547Y-4.2681
 X6.2787Y-2.5433
 X6.3281Y-3.7207
 X6.3297Y-2.7181
@ -291,10 +295,12 @@ X6.6273Y-2.7085
 X6.6547Y-3.0431
 X6.7827Y-4.0472
 X6.8378Y-2.4646
 X6.8547Y-4.2681
 X6.8735Y-3.5029
 X6.948Y-3.7244
 X6.9795Y-3.2362
 X7.1285Y-3.1018
 X7.1547Y-3.6437
 T2
 X4.7235Y-3.7564
 X4.7494Y-3.7393
@ -428,8 +434,8 @@ X4.0547Y-4.2681
 X7.0547Y-2.5681
 X7.0547Y-4.2681
 T8
-X4.8547Y-2.6197
+X4.8797Y-2.6197
-X4.8547Y-2.8953
+X4.8797Y-2.8953
 T5
 X5.4205Y-2.4843G85X5.4205Y-2.5236
 G05
--- a/power.bak
+++ b/power.bak
@ -617,17 +617,6 @@ F 3 "" H 2800 4150 50  0000 C CNN
 	1    2800 4150
 	1    0    0    -1  
 $EndComp
 $Comp
 L +2V5 #PWR051
 U 1 1 58D73C82
 P 2100 3050
 F 0 "#PWR051" H 2100 2900 50  0001 C CNN
 F 1 "+2V5" H 2100 3190 50  0000 C CNN
 F 2 "" H 2100 3050 50  0000 C CNN
 F 3 "" H 2100 3050 50  0000 C CNN
 	1    2100 3050
 	1    0    0    -1  
 $EndComp
 Text Label 2550 3750 0    60   ~ 0
 VBAT
 Text Notes 6750 4250 0    60   ~ 0
@ -666,10 +655,10 @@ F 3 "" H 4150 5500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR052
+L GND #PWR051
 U 1 1 58D7C223
 P 4150 6100
-F 0 "#PWR052" H 4150 5850 50  0001 C CNN
+F 0 "#PWR051" H 4150 5850 50  0001 C CNN
 F 1 "GND" H 4150 5950 50  0000 C CNN
 F 2 "" H 4150 6100 50  0000 C CNN
 F 3 "" H 4150 6100 50  0000 C CNN
@ -699,10 +688,10 @@ F 3 "" H 4700 4150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR053
+L +3V3 #PWR052
 U 1 1 58D7CCF7
 P 4700 3900
-F 0 "#PWR053" H 4700 3750 50  0001 C CNN
+F 0 "#PWR052" H 4700 3750 50  0001 C CNN
 F 1 "+3V3" H 4700 4040 50  0000 C CNN
 F 2 "" H 4700 3900 50  0000 C CNN
 F 3 "" H 4700 3900 50  0000 C CNN
@ -857,10 +846,10 @@ F 3 "" H 3900 4150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR054
+L GND #PWR053
 U 1 1 58DA2E46
 P 3900 4300
-F 0 "#PWR054" H 3900 4050 50  0001 C CNN
+F 0 "#PWR053" H 3900 4050 50  0001 C CNN
 F 1 "GND" H 3900 4150 50  0000 C CNN
 F 2 "" H 3900 4300 50  0000 C CNN
 F 3 "" H 3900 4300 50  0000 C CNN
@ -868,10 +857,10 @@ F 3 "" H 3900 4300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR055
+L +5V #PWR054
 U 1 1 58D67C25
 P 4150 3300
-F 0 "#PWR055" H 4150 3150 50  0001 C CNN
+F 0 "#PWR054" H 4150 3150 50  0001 C CNN
 F 1 "+5V" H 4150 3440 50  0000 C CNN
 F 2 "" H 4150 3300 50  0000 C CNN
 F 3 "" H 4150 3300 50  0000 C CNN
@ -892,10 +881,10 @@ F 3 "" H 3250 5300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR056
+L +3V3 #PWR055
 U 1 1 58DA569C
 P 3250 5150
-F 0 "#PWR056" H 3250 5000 50  0001 C CNN
+F 0 "#PWR055" H 3250 5000 50  0001 C CNN
 F 1 "+3V3" H 3250 5290 50  0000 C CNN
 F 2 "" H 3250 5150 50  0000 C CNN
 F 3 "" H 3250 5150 50  0000 C CNN
@ -931,10 +920,10 @@ $EndComp
 Text Label 750  6850 0    60   ~ 0
 WAKEUPn
 $Comp
-L +5V #PWR057
+L +5V #PWR056
 U 1 1 58E82A7E
 P 1500 6500
-F 0 "#PWR057" H 1500 6350 50  0001 C CNN
+F 0 "#PWR056" H 1500 6350 50  0001 C CNN
 F 1 "+5V" H 1500 6640 50  0000 C CNN
 F 2 "" H 1500 6500 50  0000 C CNN
 F 3 "" H 1500 6500 50  0000 C CNN
@ -966,10 +955,10 @@ F 3 "" H 1500 5950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR058
+L GND #PWR057
 U 1 1 58E840F5
 P 1500 7400
-F 0 "#PWR058" H 1500 7150 50  0001 C CNN
+F 0 "#PWR057" H 1500 7150 50  0001 C CNN
 F 1 "GND" H 1500 7250 50  0000 C CNN
 F 2 "" H 1500 7400 50  0000 C CNN
 F 3 "" H 1500 7400 50  0000 C CNN
@ -1645,4 +1634,17 @@ F 3 "" H 4850 2700 60  0000 C CNN
 	9    5900 1750
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3V3 #PWR058
 U 1 1 591C4E6A
 P 2100 3050
 F 0 "#PWR058" H 2100 2900 50  0001 C CNN
 F 1 "+3V3" H 2100 3190 50  0000 C CNN
 F 2 "" H 2100 3050 50  0000 C CNN
 F 3 "" H 2100 3050 50  0000 C CNN
 	1    2100 3050
 	1    0    0    -1  
 $EndComp
 Text Notes 1400 2850 0    60   ~ 0
 RTC can also be powered from 2.5V\nbut it is simpler to route 3.3V
 $EndSCHEMATC
--- a/power.sch
+++ b/power.sch
@ -617,17 +617,6 @@ F 3 "" H 2800 4150 50  0000 C CNN
 	1    2800 4150
 	1    0    0    -1  
 $EndComp
 $Comp
 L +2V5 #PWR051
 U 1 1 58D73C82
 P 2100 3050
 F 0 "#PWR051" H 2100 2900 50  0001 C CNN
 F 1 "+2V5" H 2100 3190 50  0000 C CNN
 F 2 "" H 2100 3050 50  0000 C CNN
 F 3 "" H 2100 3050 50  0000 C CNN
 	1    2100 3050
 	1    0    0    -1  
 $EndComp
 Text Label 2550 3750 0    60   ~ 0
 VBAT
 Text Notes 6750 4250 0    60   ~ 0
@ -666,10 +655,10 @@ F 3 "" H 4150 5500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR052
+L GND #PWR051
 U 1 1 58D7C223
 P 4150 6100
-F 0 "#PWR052" H 4150 5850 50  0001 C CNN
+F 0 "#PWR051" H 4150 5850 50  0001 C CNN
 F 1 "GND" H 4150 5950 50  0000 C CNN
 F 2 "" H 4150 6100 50  0000 C CNN
 F 3 "" H 4150 6100 50  0000 C CNN
@ -699,10 +688,10 @@ F 3 "" H 4700 4150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR053
+L +3V3 #PWR052
 U 1 1 58D7CCF7
 P 4700 3900
-F 0 "#PWR053" H 4700 3750 50  0001 C CNN
+F 0 "#PWR052" H 4700 3750 50  0001 C CNN
 F 1 "+3V3" H 4700 4040 50  0000 C CNN
 F 2 "" H 4700 3900 50  0000 C CNN
 F 3 "" H 4700 3900 50  0000 C CNN
@ -857,10 +846,10 @@ F 3 "" H 3900 4150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR054
+L GND #PWR053
 U 1 1 58DA2E46
 P 3900 4300
-F 0 "#PWR054" H 3900 4050 50  0001 C CNN
+F 0 "#PWR053" H 3900 4050 50  0001 C CNN
 F 1 "GND" H 3900 4150 50  0000 C CNN
 F 2 "" H 3900 4300 50  0000 C CNN
 F 3 "" H 3900 4300 50  0000 C CNN
@ -868,10 +857,10 @@ F 3 "" H 3900 4300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR055
+L +5V #PWR054
 U 1 1 58D67C25
 P 4150 3300
-F 0 "#PWR055" H 4150 3150 50  0001 C CNN
+F 0 "#PWR054" H 4150 3150 50  0001 C CNN
 F 1 "+5V" H 4150 3440 50  0000 C CNN
 F 2 "" H 4150 3300 50  0000 C CNN
 F 3 "" H 4150 3300 50  0000 C CNN
@ -892,10 +881,10 @@ F 3 "" H 3250 5300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR056
+L +3V3 #PWR055
 U 1 1 58DA569C
 P 3250 5150
-F 0 "#PWR056" H 3250 5000 50  0001 C CNN
+F 0 "#PWR055" H 3250 5000 50  0001 C CNN
 F 1 "+3V3" H 3250 5290 50  0000 C CNN
 F 2 "" H 3250 5150 50  0000 C CNN
 F 3 "" H 3250 5150 50  0000 C CNN
@ -931,10 +920,10 @@ $EndComp
 Text Label 750  6850 0    60   ~ 0
 WAKEUPn
 $Comp
-L +5V #PWR057
+L +5V #PWR056
 U 1 1 58E82A7E
 P 1500 6500
-F 0 "#PWR057" H 1500 6350 50  0001 C CNN
+F 0 "#PWR056" H 1500 6350 50  0001 C CNN
 F 1 "+5V" H 1500 6640 50  0000 C CNN
 F 2 "" H 1500 6500 50  0000 C CNN
 F 3 "" H 1500 6500 50  0000 C CNN
@ -966,10 +955,10 @@ F 3 "" H 1500 5950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR058
+L GND #PWR057
 U 1 1 58E840F5
 P 1500 7400
-F 0 "#PWR058" H 1500 7150 50  0001 C CNN
+F 0 "#PWR057" H 1500 7150 50  0001 C CNN
 F 1 "GND" H 1500 7250 50  0000 C CNN
 F 2 "" H 1500 7400 50  0000 C CNN
 F 3 "" H 1500 7400 50  0000 C CNN
@ -1645,4 +1634,17 @@ F 3 "" H 4850 2700 60  0000 C CNN
 	9    5900 1750
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3V3 #PWR058
 U 1 1 591C4E6A
 P 2100 3050
 F 0 "#PWR058" H 2100 2900 50  0001 C CNN
 F 1 "+3V3" H 2100 3190 50  0000 C CNN
 F 2 "" H 2100 3050 50  0000 C CNN
 F 3 "" H 2100 3050 50  0000 C CNN
 	1    2100 3050
 	1    0    0    -1  
 $EndComp
 Text Notes 1400 2850 0    60   ~ 0
 RTC can also be powered from 2.5V\nbut it is simpler to route 3.3V
 $EndSCHEMATC
--- a/ulx3s.kicad_pcb
+++ b/ulx3s.kicad_pcb
--- a/ulx3s.kicad_pcb-bak
+++ b/ulx3s.kicad_pcb-bak
--- a/usb.bak
+++ b/usb.bak
@ -387,9 +387,9 @@ Text GLabel 8650 2850 0    60   Input ~ 0
 OLED_DC
 Text GLabel 8650 2650 0    60   Input ~ 0
 OLED_CS
-Text GLabel 10150 2050 2    60   Input ~ 0
+Text GLabel 10450 2050 2    60   Input ~ 0
 USB_FPGA_D-
-Text GLabel 10150 1950 2    60   Input ~ 0
+Text GLabel 10450 1950 2    60   Input ~ 0
 USB_FPGA_D+
 $Comp
 L LFE5U-25F-6BG381C U1
--- a/usb.sch
+++ b/usb.sch
@ -373,7 +373,7 @@ Text GLabel 10150 1550 2    60   Input ~ 0
 WIFI_RXD
 Text GLabel 10150 2350 2    60   Input ~ 0
 WIFI_GPIO0
-Text GLabel 8150 1650 0    60   Input ~ 0
+Text GLabel 8600 2150 0    60   Input ~ 0
 WIFI_GPIO2
 Text GLabel 8650 1450 0    60   Input ~ 0
 WIFI_EN
@ -387,9 +387,9 @@ Text GLabel 8650 2850 0    60   Input ~ 0
 OLED_DC
 Text GLabel 8650 2650 0    60   Input ~ 0
 OLED_CS
-Text GLabel 10150 2050 2    60   Input ~ 0
+Text GLabel 10200 1650 2    60   Input ~ 0
 USB_FPGA_D-
-Text GLabel 10150 1950 2    60   Input ~ 0
+Text GLabel 8600 1650 0    60   Input ~ 0
 USB_FPGA_D+
 $Comp
 L LFE5U-25F-6BG381C U1