diff --git a/plot/ulx3s-B.Cu.gbl b/plot/ulx3s-B.Cu.gbl
index 8efc741..02cb63a 100644
--- a/plot/ulx3s-B.Cu.gbl
+++ b/plot/ulx3s-B.Cu.gbl
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2-dev-unknown+dfsg1+20180318-2*
-G04 #@! TF.CreationDate,2018-05-19T20:02:20+02:00*
+G04 #@! TF.CreationDate,2018-05-20T11:16:33+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L4,Bot,Signal*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sat May 19 20:02:20 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sun May 20 11:16:33 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -22,28 +22,28 @@ G04 APERTURE LIST*
 %ADD18C,9.000000*%
 %ADD19R,0.600000X1.550000*%
 %ADD20O,0.600000X1.550000*%
-%ADD21R,1.550000X0.600000*%
-%ADD22O,1.550000X0.600000*%
-%ADD23O,2.500000X0.900000*%
-%ADD24O,0.900000X2.500000*%
-%ADD25R,6.000000X6.000000*%
-%ADD26R,1.800000X1.400000*%
-%ADD27R,0.970000X1.500000*%
-%ADD28R,1.500000X0.970000*%
-%ADD29R,0.670000X1.000000*%
-%ADD30R,1.000000X0.670000*%
-%ADD31C,2.000000*%
-%ADD32R,1.825000X2.200000*%
-%ADD33R,1.000000X1.000000*%
-%ADD34R,0.800000X1.900000*%
-%ADD35R,1.900000X0.800000*%
-%ADD36R,3.500000X1.800000*%
-%ADD37R,1.800000X3.500000*%
-%ADD38C,0.300000*%
-%ADD39R,1.000000X0.845000*%
-%ADD40R,0.845000X1.000000*%
-%ADD41R,1.700000X1.700000*%
-%ADD42O,1.700000X1.700000*%
+%ADD21O,2.500000X0.900000*%
+%ADD22O,0.900000X2.500000*%
+%ADD23R,6.000000X6.000000*%
+%ADD24R,1.800000X1.400000*%
+%ADD25R,0.970000X1.500000*%
+%ADD26R,1.500000X0.970000*%
+%ADD27R,0.670000X1.000000*%
+%ADD28R,1.000000X0.670000*%
+%ADD29C,2.000000*%
+%ADD30R,1.825000X2.200000*%
+%ADD31R,1.000000X1.000000*%
+%ADD32R,0.800000X1.900000*%
+%ADD33R,1.900000X0.800000*%
+%ADD34R,3.500000X1.800000*%
+%ADD35R,1.800000X3.500000*%
+%ADD36C,0.300000*%
+%ADD37R,1.000000X0.845000*%
+%ADD38R,0.845000X1.000000*%
+%ADD39R,1.700000X1.700000*%
+%ADD40O,1.700000X1.700000*%
+%ADD41R,1.550000X0.600000*%
+%ADD42O,1.550000X0.600000*%
 %ADD43C,0.400000*%
 %ADD44C,0.454000*%
 %ADD45C,0.600000*%
@@ -233,16 +233,6 @@ X171585000Y-90615000D03*
 X172855000Y-90615000D03*
 X174125000Y-90615000D03*
 X175395000Y-90615000D03*
-D21*
-X141980000Y-67706500D03*
-D22*
-X141980000Y-66436500D03*
-X141980000Y-65166500D03*
-X141980000Y-63896500D03*
-X147380000Y-63896500D03*
-X147380000Y-65166500D03*
-X147380000Y-66436500D03*
-X147380000Y-67706500D03*
 D19*
 X116325000Y-84120000D03*
 D20*
@@ -253,7 +243,7 @@ X120135000Y-89520000D03*
 X118865000Y-89520000D03*
 X117595000Y-89520000D03*
 X116325000Y-89520000D03*
-D23*
+D21*
 X126230000Y-111000000D03*
 X126230000Y-109730000D03*
 X126230000Y-108460000D03*
@@ -268,7 +258,7 @@ X126230000Y-98300000D03*
 X126230000Y-97030000D03*
 X126230000Y-95760000D03*
 X126230000Y-94490000D03*
-D24*
+D22*
 X122945000Y-93000000D03*
 X121675000Y-93000000D03*
 X120405000Y-93000000D03*
@@ -279,7 +269,7 @@ X115325000Y-93000000D03*
 X114055000Y-93000000D03*
 X112785000Y-93000000D03*
 X111515000Y-93000000D03*
-D23*
+D21*
 X108230000Y-94490000D03*
 X108230000Y-95760000D03*
 X108230000Y-97030000D03*
@@ -294,80 +284,80 @@ X108230000Y-107190000D03*
 X108230000Y-108460000D03*
 X108230000Y-109730000D03*
 X108230000Y-111000000D03*
-D25*
+D23*
 X116930000Y-103300000D03*
-D26*
+D24*
 X178576000Y-98522000D03*
 X172976000Y-98522000D03*
 X172976000Y-101322000D03*
 X178576000Y-101322000D03*
-D27*
+D25*
 X133546000Y-68550000D03*
 X135456000Y-68550000D03*
-D28*
+D26*
 X101085000Y-83960000D03*
 X101085000Y-85870000D03*
-D29*
+D27*
 X153985000Y-96910000D03*
 X155735000Y-96910000D03*
-D27*
+D25*
 X156015000Y-90630000D03*
 X154105000Y-90630000D03*
 X154105000Y-92535000D03*
 X156015000Y-92535000D03*
-D28*
+D26*
 X163315000Y-90945000D03*
 X163315000Y-92855000D03*
-D29*
+D27*
 X151645000Y-82375000D03*
 X153395000Y-82375000D03*
-D27*
+D25*
 X153475000Y-79200000D03*
 X151565000Y-79200000D03*
 X153475000Y-77295000D03*
 X151565000Y-77295000D03*
-D28*
+D26*
 X160775000Y-79520000D03*
 X160775000Y-77610000D03*
-D29*
+D27*
 X108465000Y-81105000D03*
 X110215000Y-81105000D03*
-D27*
+D25*
 X108385000Y-84280000D03*
 X110295000Y-84280000D03*
 X110295000Y-86185000D03*
 X108385000Y-86185000D03*
-D28*
+D26*
 X173221000Y-83833000D03*
 X173221000Y-85743000D03*
-D30*
+D28*
 X175380000Y-76900000D03*
 X175380000Y-75150000D03*
-D28*
+D26*
 X105276000Y-99967000D03*
 X105276000Y-98057000D03*
 X167506000Y-88029000D03*
 X167506000Y-86119000D03*
 X138500000Y-90665000D03*
 X138500000Y-92575000D03*
-D30*
+D28*
 X150589600Y-64359000D03*
 X150589600Y-62609000D03*
-D28*
+D26*
 X138500000Y-82375000D03*
 X138500000Y-80465000D03*
 X138500000Y-87575000D03*
 X138500000Y-85665000D03*
 X101593000Y-99967000D03*
 X101593000Y-98057000D03*
-D27*
+D25*
 X154359000Y-98504000D03*
 X156269000Y-98504000D03*
 X105591000Y-91392000D03*
 X107501000Y-91392000D03*
 X151189000Y-74882000D03*
 X149279000Y-74882000D03*
-D30*
+D28*
 X140900000Y-87095000D03*
 X140900000Y-85345000D03*
 X136100000Y-87095000D03*
@@ -380,7 +370,7 @@ X142100000Y-92095000D03*
 X142100000Y-90345000D03*
 X134900000Y-90145000D03*
 X134900000Y-91895000D03*
-D29*
+D27*
 X135225000Y-88420000D03*
 X136975000Y-88420000D03*
 X140025000Y-88420000D03*
@@ -389,45 +379,45 @@ X163425000Y-82220000D03*
 X165175000Y-82220000D03*
 X158375000Y-82220000D03*
 X156625000Y-82220000D03*
-D30*
+D28*
 X177300000Y-94025000D03*
 X177300000Y-95775000D03*
-D27*
+D25*
 X145342000Y-103584000D03*
 X147252000Y-103584000D03*
-D29*
+D27*
 X103995000Y-70963000D03*
 X102245000Y-70963000D03*
 X103245000Y-91410000D03*
 X101495000Y-91410000D03*
-D30*
+D28*
 X180094000Y-87586000D03*
 X180094000Y-85836000D03*
-D29*
+D27*
 X180473000Y-103856000D03*
 X178723000Y-103856000D03*
 X158645000Y-96490000D03*
 X160395000Y-96490000D03*
 X132827200Y-86330000D03*
 X134577200Y-86330000D03*
-D28*
+D26*
 X169172000Y-95281000D03*
 X169172000Y-97191000D03*
 X179190000Y-80790000D03*
 X179190000Y-78880000D03*
-D31*
+D29*
 X152546000Y-69312000D03*
 X138046000Y-69312000D03*
 X153146000Y-64412000D03*
 X137446000Y-64412000D03*
-D32*
+D30*
 X157582500Y-88090000D03*
 X160157500Y-88090000D03*
 X103607500Y-88725000D03*
 X106182500Y-88725000D03*
 X157617500Y-74755000D03*
 X155042500Y-74755000D03*
-D33*
+D31*
 X169050000Y-84280000D03*
 X171550000Y-84280000D03*
 X169030000Y-78585000D03*
@@ -454,43 +444,43 @@ X177412000Y-72322000D03*
 X177412000Y-69822000D03*
 X179444000Y-69822000D03*
 X179444000Y-72322000D03*
-D34*
+D32*
 X176015000Y-82780000D03*
 X175065000Y-85780000D03*
 X176965000Y-85780000D03*
-D35*
+D33*
 X172435000Y-75075000D03*
 X172435000Y-76975000D03*
 X169435000Y-76025000D03*
-D36*
+D34*
 X114761000Y-69802000D03*
 X109761000Y-69802000D03*
 X167212000Y-73612000D03*
 X162212000Y-73612000D03*
-D37*
+D35*
 X155695000Y-69000000D03*
 X155695000Y-64000000D03*
 X160140000Y-69000000D03*
 X160140000Y-64000000D03*
-D38*
+D36*
 X182888000Y-111603000D03*
-D30*
+D28*
 X113277000Y-74360000D03*
 X113277000Y-72610000D03*
 X111372000Y-72610000D03*
 X111372000Y-74360000D03*
-D29*
+D27*
 X155455000Y-72850000D03*
 X157205000Y-72850000D03*
-D30*
+D28*
 X171316000Y-66090000D03*
 X171316000Y-67840000D03*
 X169919000Y-67840000D03*
 X169919000Y-66090000D03*
-D29*
+D27*
 X174477000Y-65738000D03*
 X172727000Y-65738000D03*
-D30*
+D28*
 X128390000Y-106321000D03*
 X128390000Y-104571000D03*
 X117722000Y-72483000D03*
@@ -501,28 +491,28 @@ X120770000Y-72483000D03*
 X120770000Y-74233000D03*
 X122294000Y-74233000D03*
 X122294000Y-72483000D03*
-D29*
+D27*
 X145655000Y-69900000D03*
 X143905000Y-69900000D03*
-D39*
+D37*
 X152393000Y-96398500D03*
 X152393000Y-98323500D03*
-D40*
+D38*
 X111064500Y-88598000D03*
 X109139500Y-88598000D03*
-D39*
+D37*
 X149472000Y-77348500D03*
 X149472000Y-79273500D03*
-D41*
+D39*
 X102990000Y-95710000D03*
-D42*
+D40*
 X105530000Y-95710000D03*
-D41*
+D39*
 X130056000Y-71725000D03*
-D42*
+D40*
 X132596000Y-71725000D03*
 X135136000Y-71725000D03*
-D29*
+D27*
 X166631000Y-65738000D03*
 X168381000Y-65738000D03*
 X124721000Y-85060000D03*
@@ -533,7 +523,7 @@ X126471000Y-82012000D03*
 X124721000Y-82012000D03*
 X124721000Y-80470000D03*
 X126471000Y-80470000D03*
-D30*
+D28*
 X130422000Y-73898000D03*
 X130422000Y-75648000D03*
 X131961000Y-75648000D03*
@@ -544,81 +534,81 @@ X135009000Y-75648000D03*
 X135009000Y-73898000D03*
 X113785000Y-83405000D03*
 X113785000Y-85155000D03*
-D29*
+D27*
 X151264000Y-103076000D03*
 X153014000Y-103076000D03*
 X164190000Y-96345000D03*
 X162440000Y-96345000D03*
-D30*
+D28*
 X178555000Y-85790000D03*
 X178555000Y-84040000D03*
 X112896000Y-89219000D03*
 X112896000Y-87469000D03*
 X170935000Y-80710000D03*
 X170935000Y-78960000D03*
-D29*
+D27*
 X103865000Y-102060000D03*
 X102115000Y-102060000D03*
-D30*
+D28*
 X114420000Y-89219000D03*
 X114420000Y-87469000D03*
-D29*
+D27*
 X171175000Y-82375000D03*
 X169425000Y-82375000D03*
-D30*
+D28*
 X172840000Y-80710000D03*
 X172840000Y-78960000D03*
 X162045000Y-69435000D03*
 X162045000Y-71185000D03*
-D29*
+D27*
 X175140000Y-80470000D03*
 X176890000Y-80470000D03*
-D30*
+D28*
 X174110000Y-75150000D03*
 X174110000Y-76900000D03*
 X128390000Y-110555000D03*
 X128390000Y-108805000D03*
 X119500000Y-79595000D03*
 X119500000Y-81345000D03*
-D29*
+D27*
 X176890000Y-78565000D03*
 X175140000Y-78565000D03*
-D30*
+D28*
 X140025500Y-66105000D03*
 X140025500Y-64355000D03*
 X140597000Y-71076000D03*
 X140597000Y-69326000D03*
 X150615000Y-65897000D03*
 X150615000Y-67647000D03*
-D29*
+D27*
 X150050000Y-72215000D03*
 X148300000Y-72215000D03*
 X150362000Y-69693000D03*
 X148612000Y-69693000D03*
-D30*
+D28*
 X129025000Y-95300000D03*
 X129025000Y-97050000D03*
 X117595000Y-79595000D03*
 X117595000Y-81345000D03*
 X115690000Y-81345000D03*
 X115690000Y-79595000D03*
-D29*
+D27*
 X142755000Y-98250000D03*
 X144505000Y-98250000D03*
-D30*
+D28*
 X132835000Y-98490000D03*
 X132835000Y-96740000D03*
 X130930000Y-96740000D03*
 X130930000Y-98490000D03*
-D29*
+D27*
 X103865000Y-103600000D03*
 X102115000Y-103600000D03*
-D30*
+D28*
 X103498000Y-99633000D03*
 X103498000Y-97883000D03*
 X134740000Y-96740000D03*
 X134740000Y-98490000D03*
-D29*
+D27*
 X166631000Y-67135000D03*
 X168381000Y-67135000D03*
 X172725000Y-67120000D03*
@@ -629,13 +619,23 @@ X108465000Y-82375000D03*
 X110215000Y-82375000D03*
 X153395000Y-81105000D03*
 X151645000Y-81105000D03*
-D30*
+D28*
 X158235000Y-91025000D03*
 X158235000Y-92775000D03*
 X106165000Y-85790000D03*
 X106165000Y-84040000D03*
 X155695000Y-77690000D03*
 X155695000Y-79440000D03*
+D41*
+X141980000Y-67706500D03*
+D42*
+X141980000Y-66436500D03*
+X141980000Y-65166500D03*
+X141980000Y-63896500D03*
+X147380000Y-63896500D03*
+X147380000Y-65166500D03*
+X147380000Y-66436500D03*
+X147380000Y-67706500D03*
 D43*
 X124632693Y-93120351D03*
 X141742847Y-69038361D03*
diff --git a/plot/ulx3s-B.Fab.gbr b/plot/ulx3s-B.Fab.gbr
index 0a5d77a..db97f5a 100644
--- a/plot/ulx3s-B.Fab.gbr
+++ b/plot/ulx3s-B.Fab.gbr
@@ -1,11 +1,11 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2-dev-unknown+dfsg1+20180318-2*
-G04 #@! TF.CreationDate,2018-05-19T20:02:20+02:00*
+G04 #@! TF.CreationDate,2018-05-20T11:16:33+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Other,Fab,Bot*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sat May 19 20:02:20 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sun May 20 11:16:33 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -76,16 +76,6 @@ X171040000Y-95265000D02*
 X174940000Y-95265000D01*
 X174940000Y-95265000D02*
 X175940000Y-94265000D01*
-X143730000Y-68251500D02*
-X146630000Y-68251500D01*
-X146630000Y-68251500D02*
-X146630000Y-63351500D01*
-X146630000Y-63351500D02*
-X142730000Y-63351500D01*
-X142730000Y-63351500D02*
-X142730000Y-67251500D01*
-X142730000Y-67251500D02*
-X143730000Y-68251500D01*
 X115780000Y-85870000D02*
 X115780000Y-88770000D01*
 X115780000Y-88770000D02*
@@ -1397,6 +1387,18 @@ X155295000Y-79365000D02*
 X156095000Y-79365000D01*
 X156095000Y-79365000D02*
 X156095000Y-77765000D01*
+D10*
+X143730000Y-68251500D02*
+X146630000Y-68251500D01*
+X146630000Y-68251500D02*
+X146630000Y-63351500D01*
+X146630000Y-63351500D02*
+X142730000Y-63351500D01*
+X142730000Y-63351500D02*
+X142730000Y-67251500D01*
+X142730000Y-67251500D02*
+X143730000Y-68251500D01*
+D11*
 X162746428Y-93966952D02*
 X162517857Y-93966952D01*
 X162632142Y-94366952D02*
@@ -2056,130 +2058,6 @@ X164187619Y-92497380D01*
 X164473333Y-92497380D01*
 X164568571Y-92449761D01*
 X164616190Y-92402142D01*
-X148495238Y-63142380D02*
-X148495238Y-62142380D01*
-X148114285Y-62142380D01*
-X148019047Y-62190000D01*
-X147971428Y-62237619D01*
-X147923809Y-62332857D01*
-X147923809Y-62475714D01*
-X147971428Y-62570952D01*
-X148019047Y-62618571D01*
-X148114285Y-62666190D01*
-X148495238Y-62666190D01*
-X146923809Y-63047142D02*
-X146971428Y-63094761D01*
-X147114285Y-63142380D01*
-X147209523Y-63142380D01*
-X147352380Y-63094761D01*
-X147447619Y-62999523D01*
-X147495238Y-62904285D01*
-X147542857Y-62713809D01*
-X147542857Y-62570952D01*
-X147495238Y-62380476D01*
-X147447619Y-62285238D01*
-X147352380Y-62190000D01*
-X147209523Y-62142380D01*
-X147114285Y-62142380D01*
-X146971428Y-62190000D01*
-X146923809Y-62237619D01*
-X146542857Y-62856666D02*
-X146066666Y-62856666D01*
-X146638095Y-63142380D02*
-X146304761Y-62142380D01*
-X145971428Y-63142380D01*
-X145590476Y-63142380D02*
-X145400000Y-63142380D01*
-X145304761Y-63094761D01*
-X145257142Y-63047142D01*
-X145161904Y-62904285D01*
-X145114285Y-62713809D01*
-X145114285Y-62332857D01*
-X145161904Y-62237619D01*
-X145209523Y-62190000D01*
-X145304761Y-62142380D01*
-X145495238Y-62142380D01*
-X145590476Y-62190000D01*
-X145638095Y-62237619D01*
-X145685714Y-62332857D01*
-X145685714Y-62570952D01*
-X145638095Y-62666190D01*
-X145590476Y-62713809D01*
-X145495238Y-62761428D01*
-X145304761Y-62761428D01*
-X145209523Y-62713809D01*
-X145161904Y-62666190D01*
-X145114285Y-62570952D01*
-X144780952Y-62142380D02*
-X144161904Y-62142380D01*
-X144495238Y-62523333D01*
-X144352380Y-62523333D01*
-X144257142Y-62570952D01*
-X144209523Y-62618571D01*
-X144161904Y-62713809D01*
-X144161904Y-62951904D01*
-X144209523Y-63047142D01*
-X144257142Y-63094761D01*
-X144352380Y-63142380D01*
-X144638095Y-63142380D01*
-X144733333Y-63094761D01*
-X144780952Y-63047142D01*
-X143542857Y-62142380D02*
-X143447619Y-62142380D01*
-X143352380Y-62190000D01*
-X143304761Y-62237619D01*
-X143257142Y-62332857D01*
-X143209523Y-62523333D01*
-X143209523Y-62761428D01*
-X143257142Y-62951904D01*
-X143304761Y-63047142D01*
-X143352380Y-63094761D01*
-X143447619Y-63142380D01*
-X143542857Y-63142380D01*
-X143638095Y-63094761D01*
-X143685714Y-63047142D01*
-X143733333Y-62951904D01*
-X143780952Y-62761428D01*
-X143780952Y-62523333D01*
-X143733333Y-62332857D01*
-X143685714Y-62237619D01*
-X143638095Y-62190000D01*
-X143542857Y-62142380D01*
-X142352380Y-62142380D02*
-X142542857Y-62142380D01*
-X142638095Y-62190000D01*
-X142685714Y-62237619D01*
-X142780952Y-62380476D01*
-X142828571Y-62570952D01*
-X142828571Y-62951904D01*
-X142780952Y-63047142D01*
-X142733333Y-63094761D01*
-X142638095Y-63142380D01*
-X142447619Y-63142380D01*
-X142352380Y-63094761D01*
-X142304761Y-63047142D01*
-X142257142Y-62951904D01*
-X142257142Y-62713809D01*
-X142304761Y-62618571D01*
-X142352380Y-62570952D01*
-X142447619Y-62523333D01*
-X142638095Y-62523333D01*
-X142733333Y-62570952D01*
-X142780952Y-62618571D01*
-X142828571Y-62713809D01*
-X141828571Y-63142380D02*
-X141828571Y-62142380D01*
-X141590476Y-62142380D01*
-X141447619Y-62190000D01*
-X141352380Y-62285238D01*
-X141304761Y-62380476D01*
-X141257142Y-62570952D01*
-X141257142Y-62713809D01*
-X141304761Y-62904285D01*
-X141352380Y-62999523D01*
-X141447619Y-63094761D01*
-X141590476Y-63142380D01*
-X141828571Y-63142380D01*
 X131960857Y-91590380D02*
 X131960857Y-90590380D01*
 X131532285Y-91542761D02*
@@ -12544,4 +12422,129 @@ X155921190Y-79112619D01*
 X155921190Y-78969761D01*
 X155897380Y-78922142D01*
 X155873571Y-78898333D01*
+D10*
+X142687238Y-61935880D02*
+X142687238Y-60935880D01*
+X142306285Y-60935880D01*
+X142211047Y-60983500D01*
+X142163428Y-61031119D01*
+X142115809Y-61126357D01*
+X142115809Y-61269214D01*
+X142163428Y-61364452D01*
+X142211047Y-61412071D01*
+X142306285Y-61459690D01*
+X142687238Y-61459690D01*
+X141115809Y-61840642D02*
+X141163428Y-61888261D01*
+X141306285Y-61935880D01*
+X141401523Y-61935880D01*
+X141544380Y-61888261D01*
+X141639619Y-61793023D01*
+X141687238Y-61697785D01*
+X141734857Y-61507309D01*
+X141734857Y-61364452D01*
+X141687238Y-61173976D01*
+X141639619Y-61078738D01*
+X141544380Y-60983500D01*
+X141401523Y-60935880D01*
+X141306285Y-60935880D01*
+X141163428Y-60983500D01*
+X141115809Y-61031119D01*
+X140734857Y-61650166D02*
+X140258666Y-61650166D01*
+X140830095Y-61935880D02*
+X140496761Y-60935880D01*
+X140163428Y-61935880D01*
+X139782476Y-61935880D02*
+X139592000Y-61935880D01*
+X139496761Y-61888261D01*
+X139449142Y-61840642D01*
+X139353904Y-61697785D01*
+X139306285Y-61507309D01*
+X139306285Y-61126357D01*
+X139353904Y-61031119D01*
+X139401523Y-60983500D01*
+X139496761Y-60935880D01*
+X139687238Y-60935880D01*
+X139782476Y-60983500D01*
+X139830095Y-61031119D01*
+X139877714Y-61126357D01*
+X139877714Y-61364452D01*
+X139830095Y-61459690D01*
+X139782476Y-61507309D01*
+X139687238Y-61554928D01*
+X139496761Y-61554928D01*
+X139401523Y-61507309D01*
+X139353904Y-61459690D01*
+X139306285Y-61364452D01*
+X138972952Y-60935880D02*
+X138353904Y-60935880D01*
+X138687238Y-61316833D01*
+X138544380Y-61316833D01*
+X138449142Y-61364452D01*
+X138401523Y-61412071D01*
+X138353904Y-61507309D01*
+X138353904Y-61745404D01*
+X138401523Y-61840642D01*
+X138449142Y-61888261D01*
+X138544380Y-61935880D01*
+X138830095Y-61935880D01*
+X138925333Y-61888261D01*
+X138972952Y-61840642D01*
+X137734857Y-60935880D02*
+X137639619Y-60935880D01*
+X137544380Y-60983500D01*
+X137496761Y-61031119D01*
+X137449142Y-61126357D01*
+X137401523Y-61316833D01*
+X137401523Y-61554928D01*
+X137449142Y-61745404D01*
+X137496761Y-61840642D01*
+X137544380Y-61888261D01*
+X137639619Y-61935880D01*
+X137734857Y-61935880D01*
+X137830095Y-61888261D01*
+X137877714Y-61840642D01*
+X137925333Y-61745404D01*
+X137972952Y-61554928D01*
+X137972952Y-61316833D01*
+X137925333Y-61126357D01*
+X137877714Y-61031119D01*
+X137830095Y-60983500D01*
+X137734857Y-60935880D01*
+X136544380Y-60935880D02*
+X136734857Y-60935880D01*
+X136830095Y-60983500D01*
+X136877714Y-61031119D01*
+X136972952Y-61173976D01*
+X137020571Y-61364452D01*
+X137020571Y-61745404D01*
+X136972952Y-61840642D01*
+X136925333Y-61888261D01*
+X136830095Y-61935880D01*
+X136639619Y-61935880D01*
+X136544380Y-61888261D01*
+X136496761Y-61840642D01*
+X136449142Y-61745404D01*
+X136449142Y-61507309D01*
+X136496761Y-61412071D01*
+X136544380Y-61364452D01*
+X136639619Y-61316833D01*
+X136830095Y-61316833D01*
+X136925333Y-61364452D01*
+X136972952Y-61412071D01*
+X137020571Y-61507309D01*
+X136020571Y-61935880D02*
+X136020571Y-60935880D01*
+X135782476Y-60935880D01*
+X135639619Y-60983500D01*
+X135544380Y-61078738D01*
+X135496761Y-61173976D01*
+X135449142Y-61364452D01*
+X135449142Y-61507309D01*
+X135496761Y-61697785D01*
+X135544380Y-61793023D01*
+X135639619Y-61888261D01*
+X135782476Y-61935880D01*
+X136020571Y-61935880D01*
 M02*
diff --git a/plot/ulx3s-B.Mask.gbs b/plot/ulx3s-B.Mask.gbs
index e51d630..375eff7 100644
--- a/plot/ulx3s-B.Mask.gbs
+++ b/plot/ulx3s-B.Mask.gbs
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2-dev-unknown+dfsg1+20180318-2*
-G04 #@! TF.CreationDate,2018-05-19T20:02:20+02:00*
+G04 #@! TF.CreationDate,2018-05-20T11:16:33+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Soldermask,Bot*
 G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sat May 19 20:02:20 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sun May 20 11:16:33 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -23,28 +23,28 @@ G04 APERTURE LIST*
 %ADD19C,1.800000*%
 %ADD20R,0.700000X1.650000*%
 %ADD21O,0.700000X1.650000*%
-%ADD22R,1.650000X0.700000*%
-%ADD23O,1.650000X0.700000*%
-%ADD24O,2.600000X1.000000*%
-%ADD25O,1.000000X2.600000*%
-%ADD26R,6.100000X6.100000*%
-%ADD27R,1.900000X1.500000*%
-%ADD28R,1.070000X1.600000*%
-%ADD29R,1.600000X1.070000*%
-%ADD30R,0.770000X1.100000*%
-%ADD31R,1.100000X0.770000*%
-%ADD32C,2.100000*%
-%ADD33R,1.925000X2.300000*%
-%ADD34R,1.100000X1.100000*%
-%ADD35R,0.900000X2.000000*%
-%ADD36R,2.000000X0.900000*%
-%ADD37R,3.600000X1.900000*%
-%ADD38R,1.900000X3.600000*%
-%ADD39C,0.400000*%
-%ADD40R,1.100000X0.945000*%
-%ADD41R,0.945000X1.100000*%
-%ADD42R,1.800000X1.800000*%
-%ADD43O,1.800000X1.800000*%
+%ADD22O,2.600000X1.000000*%
+%ADD23O,1.000000X2.600000*%
+%ADD24R,6.100000X6.100000*%
+%ADD25R,1.900000X1.500000*%
+%ADD26R,1.070000X1.600000*%
+%ADD27R,1.600000X1.070000*%
+%ADD28R,0.770000X1.100000*%
+%ADD29R,1.100000X0.770000*%
+%ADD30C,2.100000*%
+%ADD31R,1.925000X2.300000*%
+%ADD32R,1.100000X1.100000*%
+%ADD33R,0.900000X2.000000*%
+%ADD34R,2.000000X0.900000*%
+%ADD35R,3.600000X1.900000*%
+%ADD36R,1.900000X3.600000*%
+%ADD37C,0.400000*%
+%ADD38R,1.100000X0.945000*%
+%ADD39R,0.945000X1.100000*%
+%ADD40R,1.800000X1.800000*%
+%ADD41O,1.800000X1.800000*%
+%ADD42R,1.650000X0.700000*%
+%ADD43O,1.650000X0.700000*%
 G04 APERTURE END LIST*
 D10*
 X97910000Y-62690000D03*
@@ -217,16 +217,6 @@ X171585000Y-90615000D03*
 X172855000Y-90615000D03*
 X174125000Y-90615000D03*
 X175395000Y-90615000D03*
-D22*
-X141980000Y-67706500D03*
-D23*
-X141980000Y-66436500D03*
-X141980000Y-65166500D03*
-X141980000Y-63896500D03*
-X147380000Y-63896500D03*
-X147380000Y-65166500D03*
-X147380000Y-66436500D03*
-X147380000Y-67706500D03*
 D20*
 X116325000Y-84120000D03*
 D21*
@@ -237,7 +227,7 @@ X120135000Y-89520000D03*
 X118865000Y-89520000D03*
 X117595000Y-89520000D03*
 X116325000Y-89520000D03*
-D24*
+D22*
 X126230000Y-111000000D03*
 X126230000Y-109730000D03*
 X126230000Y-108460000D03*
@@ -252,7 +242,7 @@ X126230000Y-98300000D03*
 X126230000Y-97030000D03*
 X126230000Y-95760000D03*
 X126230000Y-94490000D03*
-D25*
+D23*
 X122945000Y-93000000D03*
 X121675000Y-93000000D03*
 X120405000Y-93000000D03*
@@ -263,7 +253,7 @@ X115325000Y-93000000D03*
 X114055000Y-93000000D03*
 X112785000Y-93000000D03*
 X111515000Y-93000000D03*
-D24*
+D22*
 X108230000Y-94490000D03*
 X108230000Y-95760000D03*
 X108230000Y-97030000D03*
@@ -278,80 +268,80 @@ X108230000Y-107190000D03*
 X108230000Y-108460000D03*
 X108230000Y-109730000D03*
 X108230000Y-111000000D03*
-D26*
+D24*
 X116930000Y-103300000D03*
-D27*
+D25*
 X178576000Y-98522000D03*
 X172976000Y-98522000D03*
 X172976000Y-101322000D03*
 X178576000Y-101322000D03*
-D28*
+D26*
 X133546000Y-68550000D03*
 X135456000Y-68550000D03*
-D29*
+D27*
 X101085000Y-83960000D03*
 X101085000Y-85870000D03*
-D30*
+D28*
 X153985000Y-96910000D03*
 X155735000Y-96910000D03*
-D28*
+D26*
 X156015000Y-90630000D03*
 X154105000Y-90630000D03*
 X154105000Y-92535000D03*
 X156015000Y-92535000D03*
-D29*
+D27*
 X163315000Y-90945000D03*
 X163315000Y-92855000D03*
-D30*
+D28*
 X151645000Y-82375000D03*
 X153395000Y-82375000D03*
-D28*
+D26*
 X153475000Y-79200000D03*
 X151565000Y-79200000D03*
 X153475000Y-77295000D03*
 X151565000Y-77295000D03*
-D29*
+D27*
 X160775000Y-79520000D03*
 X160775000Y-77610000D03*
-D30*
+D28*
 X108465000Y-81105000D03*
 X110215000Y-81105000D03*
-D28*
+D26*
 X108385000Y-84280000D03*
 X110295000Y-84280000D03*
 X110295000Y-86185000D03*
 X108385000Y-86185000D03*
-D29*
+D27*
 X173221000Y-83833000D03*
 X173221000Y-85743000D03*
-D31*
+D29*
 X175380000Y-76900000D03*
 X175380000Y-75150000D03*
-D29*
+D27*
 X105276000Y-99967000D03*
 X105276000Y-98057000D03*
 X167506000Y-88029000D03*
 X167506000Y-86119000D03*
 X138500000Y-90665000D03*
 X138500000Y-92575000D03*
-D31*
+D29*
 X150589600Y-64359000D03*
 X150589600Y-62609000D03*
-D29*
+D27*
 X138500000Y-82375000D03*
 X138500000Y-80465000D03*
 X138500000Y-87575000D03*
 X138500000Y-85665000D03*
 X101593000Y-99967000D03*
 X101593000Y-98057000D03*
-D28*
+D26*
 X154359000Y-98504000D03*
 X156269000Y-98504000D03*
 X105591000Y-91392000D03*
 X107501000Y-91392000D03*
 X151189000Y-74882000D03*
 X149279000Y-74882000D03*
-D31*
+D29*
 X140900000Y-87095000D03*
 X140900000Y-85345000D03*
 X136100000Y-87095000D03*
@@ -364,7 +354,7 @@ X142100000Y-92095000D03*
 X142100000Y-90345000D03*
 X134900000Y-90145000D03*
 X134900000Y-91895000D03*
-D30*
+D28*
 X135225000Y-88420000D03*
 X136975000Y-88420000D03*
 X140025000Y-88420000D03*
@@ -373,45 +363,45 @@ X163425000Y-82220000D03*
 X165175000Y-82220000D03*
 X158375000Y-82220000D03*
 X156625000Y-82220000D03*
-D31*
+D29*
 X177300000Y-94025000D03*
 X177300000Y-95775000D03*
-D28*
+D26*
 X145342000Y-103584000D03*
 X147252000Y-103584000D03*
-D30*
+D28*
 X103995000Y-70963000D03*
 X102245000Y-70963000D03*
 X103245000Y-91410000D03*
 X101495000Y-91410000D03*
-D31*
+D29*
 X180094000Y-87586000D03*
 X180094000Y-85836000D03*
-D30*
+D28*
 X180473000Y-103856000D03*
 X178723000Y-103856000D03*
 X158645000Y-96490000D03*
 X160395000Y-96490000D03*
 X132827200Y-86330000D03*
 X134577200Y-86330000D03*
-D29*
+D27*
 X169172000Y-95281000D03*
 X169172000Y-97191000D03*
 X179190000Y-80790000D03*
 X179190000Y-78880000D03*
-D32*
+D30*
 X152546000Y-69312000D03*
 X138046000Y-69312000D03*
 X153146000Y-64412000D03*
 X137446000Y-64412000D03*
-D33*
+D31*
 X157582500Y-88090000D03*
 X160157500Y-88090000D03*
 X103607500Y-88725000D03*
 X106182500Y-88725000D03*
 X157617500Y-74755000D03*
 X155042500Y-74755000D03*
-D34*
+D32*
 X169050000Y-84280000D03*
 X171550000Y-84280000D03*
 X169030000Y-78585000D03*
@@ -438,43 +428,43 @@ X177412000Y-72322000D03*
 X177412000Y-69822000D03*
 X179444000Y-69822000D03*
 X179444000Y-72322000D03*
-D35*
+D33*
 X176015000Y-82780000D03*
 X175065000Y-85780000D03*
 X176965000Y-85780000D03*
-D36*
+D34*
 X172435000Y-75075000D03*
 X172435000Y-76975000D03*
 X169435000Y-76025000D03*
-D37*
+D35*
 X114761000Y-69802000D03*
 X109761000Y-69802000D03*
 X167212000Y-73612000D03*
 X162212000Y-73612000D03*
-D38*
+D36*
 X155695000Y-69000000D03*
 X155695000Y-64000000D03*
 X160140000Y-69000000D03*
 X160140000Y-64000000D03*
-D39*
+D37*
 X182888000Y-111603000D03*
-D31*
+D29*
 X113277000Y-74360000D03*
 X113277000Y-72610000D03*
 X111372000Y-72610000D03*
 X111372000Y-74360000D03*
-D30*
+D28*
 X155455000Y-72850000D03*
 X157205000Y-72850000D03*
-D31*
+D29*
 X171316000Y-66090000D03*
 X171316000Y-67840000D03*
 X169919000Y-67840000D03*
 X169919000Y-66090000D03*
-D30*
+D28*
 X174477000Y-65738000D03*
 X172727000Y-65738000D03*
-D31*
+D29*
 X128390000Y-106321000D03*
 X128390000Y-104571000D03*
 X117722000Y-72483000D03*
@@ -485,28 +475,28 @@ X120770000Y-72483000D03*
 X120770000Y-74233000D03*
 X122294000Y-74233000D03*
 X122294000Y-72483000D03*
-D30*
+D28*
 X145655000Y-69900000D03*
 X143905000Y-69900000D03*
-D40*
+D38*
 X152393000Y-96398500D03*
 X152393000Y-98323500D03*
-D41*
+D39*
 X111064500Y-88598000D03*
 X109139500Y-88598000D03*
-D40*
+D38*
 X149472000Y-77348500D03*
 X149472000Y-79273500D03*
-D42*
+D40*
 X102990000Y-95710000D03*
-D43*
+D41*
 X105530000Y-95710000D03*
-D42*
+D40*
 X130056000Y-71725000D03*
-D43*
+D41*
 X132596000Y-71725000D03*
 X135136000Y-71725000D03*
-D30*
+D28*
 X166631000Y-65738000D03*
 X168381000Y-65738000D03*
 X124721000Y-85060000D03*
@@ -517,7 +507,7 @@ X126471000Y-82012000D03*
 X124721000Y-82012000D03*
 X124721000Y-80470000D03*
 X126471000Y-80470000D03*
-D31*
+D29*
 X130422000Y-73898000D03*
 X130422000Y-75648000D03*
 X131961000Y-75648000D03*
@@ -528,81 +518,81 @@ X135009000Y-75648000D03*
 X135009000Y-73898000D03*
 X113785000Y-83405000D03*
 X113785000Y-85155000D03*
-D30*
+D28*
 X151264000Y-103076000D03*
 X153014000Y-103076000D03*
 X164190000Y-96345000D03*
 X162440000Y-96345000D03*
-D31*
+D29*
 X178555000Y-85790000D03*
 X178555000Y-84040000D03*
 X112896000Y-89219000D03*
 X112896000Y-87469000D03*
 X170935000Y-80710000D03*
 X170935000Y-78960000D03*
-D30*
+D28*
 X103865000Y-102060000D03*
 X102115000Y-102060000D03*
-D31*
+D29*
 X114420000Y-89219000D03*
 X114420000Y-87469000D03*
-D30*
+D28*
 X171175000Y-82375000D03*
 X169425000Y-82375000D03*
-D31*
+D29*
 X172840000Y-80710000D03*
 X172840000Y-78960000D03*
 X162045000Y-69435000D03*
 X162045000Y-71185000D03*
-D30*
+D28*
 X175140000Y-80470000D03*
 X176890000Y-80470000D03*
-D31*
+D29*
 X174110000Y-75150000D03*
 X174110000Y-76900000D03*
 X128390000Y-110555000D03*
 X128390000Y-108805000D03*
 X119500000Y-79595000D03*
 X119500000Y-81345000D03*
-D30*
+D28*
 X176890000Y-78565000D03*
 X175140000Y-78565000D03*
-D31*
+D29*
 X140025500Y-66105000D03*
 X140025500Y-64355000D03*
 X140597000Y-71076000D03*
 X140597000Y-69326000D03*
 X150615000Y-65897000D03*
 X150615000Y-67647000D03*
-D30*
+D28*
 X150050000Y-72215000D03*
 X148300000Y-72215000D03*
 X150362000Y-69693000D03*
 X148612000Y-69693000D03*
-D31*
+D29*
 X129025000Y-95300000D03*
 X129025000Y-97050000D03*
 X117595000Y-79595000D03*
 X117595000Y-81345000D03*
 X115690000Y-81345000D03*
 X115690000Y-79595000D03*
-D30*
+D28*
 X142755000Y-98250000D03*
 X144505000Y-98250000D03*
-D31*
+D29*
 X132835000Y-98490000D03*
 X132835000Y-96740000D03*
 X130930000Y-96740000D03*
 X130930000Y-98490000D03*
-D30*
+D28*
 X103865000Y-103600000D03*
 X102115000Y-103600000D03*
-D31*
+D29*
 X103498000Y-99633000D03*
 X103498000Y-97883000D03*
 X134740000Y-96740000D03*
 X134740000Y-98490000D03*
-D30*
+D28*
 X166631000Y-67135000D03*
 X168381000Y-67135000D03*
 X172725000Y-67120000D03*
@@ -613,11 +603,21 @@ X108465000Y-82375000D03*
 X110215000Y-82375000D03*
 X153395000Y-81105000D03*
 X151645000Y-81105000D03*
-D31*
+D29*
 X158235000Y-91025000D03*
 X158235000Y-92775000D03*
 X106165000Y-85790000D03*
 X106165000Y-84040000D03*
 X155695000Y-77690000D03*
 X155695000Y-79440000D03*
+D42*
+X141980000Y-67706500D03*
+D43*
+X141980000Y-66436500D03*
+X141980000Y-65166500D03*
+X141980000Y-63896500D03*
+X147380000Y-63896500D03*
+X147380000Y-65166500D03*
+X147380000Y-66436500D03*
+X147380000Y-67706500D03*
 M02*
diff --git a/plot/ulx3s-B.Paste.gbp b/plot/ulx3s-B.Paste.gbp
index 540c3f4..a8975c5 100644
--- a/plot/ulx3s-B.Paste.gbp
+++ b/plot/ulx3s-B.Paste.gbp
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2-dev-unknown+dfsg1+20180318-2*
-G04 #@! TF.CreationDate,2018-05-19T20:02:20+02:00*
+G04 #@! TF.CreationDate,2018-05-20T11:16:33+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Paste,Bot*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sat May 19 20:02:20 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sun May 20 11:16:33 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -17,24 +17,24 @@ G04 APERTURE LIST*
 %ADD13R,3.500000X3.300000*%
 %ADD14R,0.600000X1.550000*%
 %ADD15O,0.600000X1.550000*%
-%ADD16R,1.550000X0.600000*%
-%ADD17O,1.550000X0.600000*%
-%ADD18O,2.500000X0.900000*%
-%ADD19O,0.900000X2.500000*%
-%ADD20R,6.000000X6.000000*%
-%ADD21R,1.800000X1.400000*%
-%ADD22R,0.970000X1.500000*%
-%ADD23R,1.500000X0.970000*%
-%ADD24R,0.670000X1.000000*%
-%ADD25R,1.000000X0.670000*%
-%ADD26R,1.825000X2.200000*%
-%ADD27R,1.000000X1.000000*%
-%ADD28R,0.800000X1.900000*%
-%ADD29R,1.900000X0.800000*%
-%ADD30R,3.500000X1.800000*%
-%ADD31R,1.800000X3.500000*%
-%ADD32R,1.000000X0.845000*%
-%ADD33R,0.845000X1.000000*%
+%ADD16O,2.500000X0.900000*%
+%ADD17O,0.900000X2.500000*%
+%ADD18R,6.000000X6.000000*%
+%ADD19R,1.800000X1.400000*%
+%ADD20R,0.970000X1.500000*%
+%ADD21R,1.500000X0.970000*%
+%ADD22R,0.670000X1.000000*%
+%ADD23R,1.000000X0.670000*%
+%ADD24R,1.825000X2.200000*%
+%ADD25R,1.000000X1.000000*%
+%ADD26R,0.800000X1.900000*%
+%ADD27R,1.900000X0.800000*%
+%ADD28R,3.500000X1.800000*%
+%ADD29R,1.800000X3.500000*%
+%ADD30R,1.000000X0.845000*%
+%ADD31R,0.845000X1.000000*%
+%ADD32R,1.550000X0.600000*%
+%ADD33O,1.550000X0.600000*%
 G04 APERTURE END LIST*
 D10*
 X150296000Y-71062000D02*
@@ -93,16 +93,6 @@ X171585000Y-90615000D03*
 X172855000Y-90615000D03*
 X174125000Y-90615000D03*
 X175395000Y-90615000D03*
-D16*
-X141980000Y-67706500D03*
-D17*
-X141980000Y-66436500D03*
-X141980000Y-65166500D03*
-X141980000Y-63896500D03*
-X147380000Y-63896500D03*
-X147380000Y-65166500D03*
-X147380000Y-66436500D03*
-X147380000Y-67706500D03*
 D14*
 X116325000Y-84120000D03*
 D15*
@@ -113,7 +103,7 @@ X120135000Y-89520000D03*
 X118865000Y-89520000D03*
 X117595000Y-89520000D03*
 X116325000Y-89520000D03*
-D18*
+D16*
 X126230000Y-111000000D03*
 X126230000Y-109730000D03*
 X126230000Y-108460000D03*
@@ -128,7 +118,7 @@ X126230000Y-98300000D03*
 X126230000Y-97030000D03*
 X126230000Y-95760000D03*
 X126230000Y-94490000D03*
-D19*
+D17*
 X122945000Y-93000000D03*
 X121675000Y-93000000D03*
 X120405000Y-93000000D03*
@@ -139,7 +129,7 @@ X115325000Y-93000000D03*
 X114055000Y-93000000D03*
 X112785000Y-93000000D03*
 X111515000Y-93000000D03*
-D18*
+D16*
 X108230000Y-94490000D03*
 X108230000Y-95760000D03*
 X108230000Y-97030000D03*
@@ -154,80 +144,80 @@ X108230000Y-107190000D03*
 X108230000Y-108460000D03*
 X108230000Y-109730000D03*
 X108230000Y-111000000D03*
-D20*
+D18*
 X116930000Y-103300000D03*
-D21*
+D19*
 X178576000Y-98522000D03*
 X172976000Y-98522000D03*
 X172976000Y-101322000D03*
 X178576000Y-101322000D03*
-D22*
+D20*
 X133546000Y-68550000D03*
 X135456000Y-68550000D03*
-D23*
+D21*
 X101085000Y-83960000D03*
 X101085000Y-85870000D03*
-D24*
+D22*
 X153985000Y-96910000D03*
 X155735000Y-96910000D03*
-D22*
+D20*
 X156015000Y-90630000D03*
 X154105000Y-90630000D03*
 X154105000Y-92535000D03*
 X156015000Y-92535000D03*
-D23*
+D21*
 X163315000Y-90945000D03*
 X163315000Y-92855000D03*
-D24*
+D22*
 X151645000Y-82375000D03*
 X153395000Y-82375000D03*
-D22*
+D20*
 X153475000Y-79200000D03*
 X151565000Y-79200000D03*
 X153475000Y-77295000D03*
 X151565000Y-77295000D03*
-D23*
+D21*
 X160775000Y-79520000D03*
 X160775000Y-77610000D03*
-D24*
+D22*
 X108465000Y-81105000D03*
 X110215000Y-81105000D03*
-D22*
+D20*
 X108385000Y-84280000D03*
 X110295000Y-84280000D03*
 X110295000Y-86185000D03*
 X108385000Y-86185000D03*
-D23*
+D21*
 X173221000Y-83833000D03*
 X173221000Y-85743000D03*
-D25*
+D23*
 X175380000Y-76900000D03*
 X175380000Y-75150000D03*
-D23*
+D21*
 X105276000Y-99967000D03*
 X105276000Y-98057000D03*
 X167506000Y-88029000D03*
 X167506000Y-86119000D03*
 X138500000Y-90665000D03*
 X138500000Y-92575000D03*
-D25*
+D23*
 X150589600Y-64359000D03*
 X150589600Y-62609000D03*
-D23*
+D21*
 X138500000Y-82375000D03*
 X138500000Y-80465000D03*
 X138500000Y-87575000D03*
 X138500000Y-85665000D03*
 X101593000Y-99967000D03*
 X101593000Y-98057000D03*
-D22*
+D20*
 X154359000Y-98504000D03*
 X156269000Y-98504000D03*
 X105591000Y-91392000D03*
 X107501000Y-91392000D03*
 X151189000Y-74882000D03*
 X149279000Y-74882000D03*
-D25*
+D23*
 X140900000Y-87095000D03*
 X140900000Y-85345000D03*
 X136100000Y-87095000D03*
@@ -240,7 +230,7 @@ X142100000Y-92095000D03*
 X142100000Y-90345000D03*
 X134900000Y-90145000D03*
 X134900000Y-91895000D03*
-D24*
+D22*
 X135225000Y-88420000D03*
 X136975000Y-88420000D03*
 X140025000Y-88420000D03*
@@ -249,40 +239,40 @@ X163425000Y-82220000D03*
 X165175000Y-82220000D03*
 X158375000Y-82220000D03*
 X156625000Y-82220000D03*
-D25*
+D23*
 X177300000Y-94025000D03*
 X177300000Y-95775000D03*
-D22*
+D20*
 X145342000Y-103584000D03*
 X147252000Y-103584000D03*
-D24*
+D22*
 X103995000Y-70963000D03*
 X102245000Y-70963000D03*
 X103245000Y-91410000D03*
 X101495000Y-91410000D03*
-D25*
+D23*
 X180094000Y-87586000D03*
 X180094000Y-85836000D03*
-D24*
+D22*
 X180473000Y-103856000D03*
 X178723000Y-103856000D03*
 X158645000Y-96490000D03*
 X160395000Y-96490000D03*
 X132827200Y-86330000D03*
 X134577200Y-86330000D03*
-D23*
+D21*
 X169172000Y-95281000D03*
 X169172000Y-97191000D03*
 X179190000Y-80790000D03*
 X179190000Y-78880000D03*
-D26*
+D24*
 X157582500Y-88090000D03*
 X160157500Y-88090000D03*
 X103607500Y-88725000D03*
 X106182500Y-88725000D03*
 X157617500Y-74755000D03*
 X155042500Y-74755000D03*
-D27*
+D25*
 X169050000Y-84280000D03*
 X171550000Y-84280000D03*
 X169030000Y-78585000D03*
@@ -309,41 +299,41 @@ X177412000Y-72322000D03*
 X177412000Y-69822000D03*
 X179444000Y-69822000D03*
 X179444000Y-72322000D03*
-D28*
+D26*
 X176015000Y-82780000D03*
 X175065000Y-85780000D03*
 X176965000Y-85780000D03*
-D29*
+D27*
 X172435000Y-75075000D03*
 X172435000Y-76975000D03*
 X169435000Y-76025000D03*
-D30*
+D28*
 X114761000Y-69802000D03*
 X109761000Y-69802000D03*
 X167212000Y-73612000D03*
 X162212000Y-73612000D03*
-D31*
+D29*
 X155695000Y-69000000D03*
 X155695000Y-64000000D03*
 X160140000Y-69000000D03*
 X160140000Y-64000000D03*
-D25*
+D23*
 X113277000Y-74360000D03*
 X113277000Y-72610000D03*
 X111372000Y-72610000D03*
 X111372000Y-74360000D03*
-D24*
+D22*
 X155455000Y-72850000D03*
 X157205000Y-72850000D03*
-D25*
+D23*
 X171316000Y-66090000D03*
 X171316000Y-67840000D03*
 X169919000Y-67840000D03*
 X169919000Y-66090000D03*
-D24*
+D22*
 X174477000Y-65738000D03*
 X172727000Y-65738000D03*
-D25*
+D23*
 X128390000Y-106321000D03*
 X128390000Y-104571000D03*
 X117722000Y-72483000D03*
@@ -354,19 +344,19 @@ X120770000Y-72483000D03*
 X120770000Y-74233000D03*
 X122294000Y-74233000D03*
 X122294000Y-72483000D03*
-D24*
+D22*
 X145655000Y-69900000D03*
 X143905000Y-69900000D03*
-D32*
+D30*
 X152393000Y-96398500D03*
 X152393000Y-98323500D03*
-D33*
+D31*
 X111064500Y-88598000D03*
 X109139500Y-88598000D03*
-D32*
+D30*
 X149472000Y-77348500D03*
 X149472000Y-79273500D03*
-D24*
+D22*
 X166631000Y-65738000D03*
 X168381000Y-65738000D03*
 X124721000Y-85060000D03*
@@ -377,7 +367,7 @@ X126471000Y-82012000D03*
 X124721000Y-82012000D03*
 X124721000Y-80470000D03*
 X126471000Y-80470000D03*
-D25*
+D23*
 X130422000Y-73898000D03*
 X130422000Y-75648000D03*
 X131961000Y-75648000D03*
@@ -388,81 +378,81 @@ X135009000Y-75648000D03*
 X135009000Y-73898000D03*
 X113785000Y-83405000D03*
 X113785000Y-85155000D03*
-D24*
+D22*
 X151264000Y-103076000D03*
 X153014000Y-103076000D03*
 X164190000Y-96345000D03*
 X162440000Y-96345000D03*
-D25*
+D23*
 X178555000Y-85790000D03*
 X178555000Y-84040000D03*
 X112896000Y-89219000D03*
 X112896000Y-87469000D03*
 X170935000Y-80710000D03*
 X170935000Y-78960000D03*
-D24*
+D22*
 X103865000Y-102060000D03*
 X102115000Y-102060000D03*
-D25*
+D23*
 X114420000Y-89219000D03*
 X114420000Y-87469000D03*
-D24*
+D22*
 X171175000Y-82375000D03*
 X169425000Y-82375000D03*
-D25*
+D23*
 X172840000Y-80710000D03*
 X172840000Y-78960000D03*
 X162045000Y-69435000D03*
 X162045000Y-71185000D03*
-D24*
+D22*
 X175140000Y-80470000D03*
 X176890000Y-80470000D03*
-D25*
+D23*
 X174110000Y-75150000D03*
 X174110000Y-76900000D03*
 X128390000Y-110555000D03*
 X128390000Y-108805000D03*
 X119500000Y-79595000D03*
 X119500000Y-81345000D03*
-D24*
+D22*
 X176890000Y-78565000D03*
 X175140000Y-78565000D03*
-D25*
+D23*
 X140025500Y-66105000D03*
 X140025500Y-64355000D03*
 X140597000Y-71076000D03*
 X140597000Y-69326000D03*
 X150615000Y-65897000D03*
 X150615000Y-67647000D03*
-D24*
+D22*
 X150050000Y-72215000D03*
 X148300000Y-72215000D03*
 X150362000Y-69693000D03*
 X148612000Y-69693000D03*
-D25*
+D23*
 X129025000Y-95300000D03*
 X129025000Y-97050000D03*
 X117595000Y-79595000D03*
 X117595000Y-81345000D03*
 X115690000Y-81345000D03*
 X115690000Y-79595000D03*
-D24*
+D22*
 X142755000Y-98250000D03*
 X144505000Y-98250000D03*
-D25*
+D23*
 X132835000Y-98490000D03*
 X132835000Y-96740000D03*
 X130930000Y-96740000D03*
 X130930000Y-98490000D03*
-D24*
+D22*
 X103865000Y-103600000D03*
 X102115000Y-103600000D03*
-D25*
+D23*
 X103498000Y-99633000D03*
 X103498000Y-97883000D03*
 X134740000Y-96740000D03*
 X134740000Y-98490000D03*
-D24*
+D22*
 X166631000Y-67135000D03*
 X168381000Y-67135000D03*
 X172725000Y-67120000D03*
@@ -473,11 +463,21 @@ X108465000Y-82375000D03*
 X110215000Y-82375000D03*
 X153395000Y-81105000D03*
 X151645000Y-81105000D03*
-D25*
+D23*
 X158235000Y-91025000D03*
 X158235000Y-92775000D03*
 X106165000Y-85790000D03*
 X106165000Y-84040000D03*
 X155695000Y-77690000D03*
 X155695000Y-79440000D03*
+D32*
+X141980000Y-67706500D03*
+D33*
+X141980000Y-66436500D03*
+X141980000Y-65166500D03*
+X141980000Y-63896500D03*
+X147380000Y-63896500D03*
+X147380000Y-65166500D03*
+X147380000Y-66436500D03*
+X147380000Y-67706500D03*
 M02*
diff --git a/plot/ulx3s-B.SilkS.gbo b/plot/ulx3s-B.SilkS.gbo
index b50019b..5eb0d42 100644
--- a/plot/ulx3s-B.SilkS.gbo
+++ b/plot/ulx3s-B.SilkS.gbo
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2-dev-unknown+dfsg1+20180318-2*
-G04 #@! TF.CreationDate,2018-05-19T20:02:20+02:00*
+G04 #@! TF.CreationDate,2018-05-20T11:16:33+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Legend,Bot*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sat May 19 20:02:20 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sun May 20 11:16:33 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -1977,28 +1977,6 @@ X170915000Y-95390000D02*
 X170915000Y-91240000D01*
 X176015000Y-95390000D02*
 X176015000Y-96790000D01*
-X143817303Y-68087500D02*
-G75*
-G03X143817303Y-68087500I-89803J0D01*
-G01*
-X142902000Y-63261500D02*
-X142902000Y-68341500D01*
-X143410000Y-68341500D02*
-X143410000Y-63261500D01*
-X142605000Y-68376500D02*
-X142605000Y-68326500D01*
-X146755000Y-68376500D02*
-X146755000Y-68231500D01*
-X146755000Y-63226500D02*
-X146755000Y-63371500D01*
-X142605000Y-63226500D02*
-X142605000Y-63371500D01*
-X142605000Y-68376500D02*
-X146755000Y-68376500D01*
-X142605000Y-63226500D02*
-X146755000Y-63226500D01*
-X142605000Y-68326500D02*
-X141205000Y-68326500D01*
 X116033803Y-85867500D02*
 G75*
 G03X116033803Y-85867500I-89803J0D01*
@@ -2665,6 +2643,29 @@ X155185000Y-78345000D02*
 X155185000Y-78785000D01*
 X156205000Y-78345000D02*
 X156205000Y-78785000D01*
+D13*
+X143817303Y-68087500D02*
+G75*
+G03X143817303Y-68087500I-89803J0D01*
+G01*
+X142902000Y-63261500D02*
+X142902000Y-68341500D01*
+X143410000Y-68341500D02*
+X143410000Y-63261500D01*
+X142605000Y-68376500D02*
+X142605000Y-68326500D01*
+X146755000Y-68376500D02*
+X146755000Y-68231500D01*
+X146755000Y-63226500D02*
+X146755000Y-63371500D01*
+X142605000Y-63226500D02*
+X142605000Y-63371500D01*
+X142605000Y-68376500D02*
+X146755000Y-68376500D01*
+X142605000Y-63226500D02*
+X146755000Y-63226500D01*
+X142605000Y-68326500D02*
+X141205000Y-68326500D01*
 D11*
 X161241904Y-94252380D02*
 X161241904Y-95061904D01*
@@ -2812,30 +2813,6 @@ X177236476Y-89846380D01*
 X176855523Y-89846380D02*
 X176188857Y-89846380D01*
 X176617428Y-90846380D01*
-X145918095Y-61852380D02*
-X145918095Y-62661904D01*
-X145870476Y-62757142D01*
-X145822857Y-62804761D01*
-X145727619Y-62852380D01*
-X145537142Y-62852380D01*
-X145441904Y-62804761D01*
-X145394285Y-62757142D01*
-X145346666Y-62661904D01*
-X145346666Y-61852380D01*
-X144346666Y-62852380D02*
-X144918095Y-62852380D01*
-X144632380Y-62852380D02*
-X144632380Y-61852380D01*
-X144727619Y-61995238D01*
-X144822857Y-62090476D01*
-X144918095Y-62138095D01*
-X143394285Y-62852380D02*
-X143965714Y-62852380D01*
-X143680000Y-62852380D02*
-X143680000Y-61852380D01*
-X143775238Y-61995238D01*
-X143870476Y-62090476D01*
-X143965714Y-62138095D01*
 X123786095Y-88576380D02*
 X123786095Y-89385904D01*
 X123738476Y-89481142D01*
@@ -8091,4 +8068,28 @@ X155527380Y-82599238D01*
 X155527380Y-82313523D01*
 X155479761Y-82218285D01*
 X155432142Y-82170666D01*
+X145899095Y-61906380D02*
+X145899095Y-62715904D01*
+X145851476Y-62811142D01*
+X145803857Y-62858761D01*
+X145708619Y-62906380D01*
+X145518142Y-62906380D01*
+X145422904Y-62858761D01*
+X145375285Y-62811142D01*
+X145327666Y-62715904D01*
+X145327666Y-61906380D01*
+X144327666Y-62906380D02*
+X144899095Y-62906380D01*
+X144613380Y-62906380D02*
+X144613380Y-61906380D01*
+X144708619Y-62049238D01*
+X144803857Y-62144476D01*
+X144899095Y-62192095D01*
+X143375285Y-62906380D02*
+X143946714Y-62906380D01*
+X143661000Y-62906380D02*
+X143661000Y-61906380D01*
+X143756238Y-62049238D01*
+X143851476Y-62144476D01*
+X143946714Y-62192095D01*
 M02*
diff --git a/plot/ulx3s-Edge.Cuts.gm1 b/plot/ulx3s-Edge.Cuts.gm1
index 12c1fa7..b1410c6 100644
--- a/plot/ulx3s-Edge.Cuts.gm1
+++ b/plot/ulx3s-Edge.Cuts.gm1
@@ -1,11 +1,11 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2-dev-unknown+dfsg1+20180318-2*
-G04 #@! TF.CreationDate,2018-05-19T20:02:20+02:00*
+G04 #@! TF.CreationDate,2018-05-20T11:16:33+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Profile,NP*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sat May 19 20:02:20 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sun May 20 11:16:33 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Cu.gtl b/plot/ulx3s-F.Cu.gtl
index adcdc4f..c0701ee 100644
--- a/plot/ulx3s-F.Cu.gtl
+++ b/plot/ulx3s-F.Cu.gtl
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2-dev-unknown+dfsg1+20180318-2*
-G04 #@! TF.CreationDate,2018-05-19T20:02:19+02:00*
+G04 #@! TF.CreationDate,2018-05-20T11:16:33+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L1,Top,Signal*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sat May 19 20:02:19 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sun May 20 11:16:33 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Fab.gbr b/plot/ulx3s-F.Fab.gbr
index 5db36ad..6fd26ad 100644
--- a/plot/ulx3s-F.Fab.gbr
+++ b/plot/ulx3s-F.Fab.gbr
@@ -1,11 +1,11 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2-dev-unknown+dfsg1+20180318-2*
-G04 #@! TF.CreationDate,2018-05-19T20:02:20+02:00*
+G04 #@! TF.CreationDate,2018-05-20T11:16:33+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Other,Fab,Top*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sat May 19 20:02:20 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sun May 20 11:16:33 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Mask.gts b/plot/ulx3s-F.Mask.gts
index a064dbd..d794179 100644
--- a/plot/ulx3s-F.Mask.gts
+++ b/plot/ulx3s-F.Mask.gts
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2-dev-unknown+dfsg1+20180318-2*
-G04 #@! TF.CreationDate,2018-05-19T20:02:20+02:00*
+G04 #@! TF.CreationDate,2018-05-20T11:16:33+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Soldermask,Top*
 G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sat May 19 20:02:20 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sun May 20 11:16:33 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Paste.gtp b/plot/ulx3s-F.Paste.gtp
index bbb200e..ebde74b 100644
--- a/plot/ulx3s-F.Paste.gtp
+++ b/plot/ulx3s-F.Paste.gtp
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2-dev-unknown+dfsg1+20180318-2*
-G04 #@! TF.CreationDate,2018-05-19T20:02:20+02:00*
+G04 #@! TF.CreationDate,2018-05-20T11:16:33+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Paste,Top*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sat May 19 20:02:20 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sun May 20 11:16:33 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.SilkS.gto b/plot/ulx3s-F.SilkS.gto
index 1861b05..1e3d751 100644
--- a/plot/ulx3s-F.SilkS.gto
+++ b/plot/ulx3s-F.SilkS.gto
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2-dev-unknown+dfsg1+20180318-2*
-G04 #@! TF.CreationDate,2018-05-19T20:02:20+02:00*
+G04 #@! TF.CreationDate,2018-05-20T11:16:33+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Legend,Top*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sat May 19 20:02:20 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sun May 20 11:16:33 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-In1.Cu.g2 b/plot/ulx3s-In1.Cu.g2
index 3486ac5..312d7e7 100644
--- a/plot/ulx3s-In1.Cu.g2
+++ b/plot/ulx3s-In1.Cu.g2
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2-dev-unknown+dfsg1+20180318-2*
-G04 #@! TF.CreationDate,2018-05-19T20:02:19+02:00*
+G04 #@! TF.CreationDate,2018-05-20T11:16:33+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L2,Inr,Signal*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sat May 19 20:02:19 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sun May 20 11:16:33 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-In2.Cu.g3 b/plot/ulx3s-In2.Cu.g3
index 22d08b1..45eb111 100644
--- a/plot/ulx3s-In2.Cu.g3
+++ b/plot/ulx3s-In2.Cu.g3
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2-dev-unknown+dfsg1+20180318-2*
-G04 #@! TF.CreationDate,2018-05-19T20:02:19+02:00*
+G04 #@! TF.CreationDate,2018-05-20T11:16:33+02:00*
 G04 #@! TF.ProjectId,ulx3s,756C7833732E6B696361645F70636200,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L3,Inr,Signal*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sat May 19 20:02:19 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2-dev-unknown+dfsg1+20180318-2) date Sun May 20 11:16:33 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-bottom.pos b/plot/ulx3s-bottom.pos
index 0382df9..897ce50 100644
--- a/plot/ulx3s-bottom.pos
+++ b/plot/ulx3s-bottom.pos
@@ -1,4 +1,4 @@
-### Module positions - created on Sat May 19 20:00:38 2018 ###
+### Module positions - created on Sun May 20 11:16:21 2018 ###
 ### Printed by Pcbnew version kicad 5.0.0-rc2-dev-unknown+dfsg1+20180318-2
 ## Unit = mm, Angle = deg.
 ## Side : bottom
diff --git a/plot/ulx3s-top.pos b/plot/ulx3s-top.pos
index 3bcc52c..b692d0d 100644
--- a/plot/ulx3s-top.pos
+++ b/plot/ulx3s-top.pos
@@ -1,4 +1,4 @@
-### Module positions - created on Sat May 19 20:00:38 2018 ###
+### Module positions - created on Sun May 20 11:16:21 2018 ###
 ### Printed by Pcbnew version kicad 5.0.0-rc2-dev-unknown+dfsg1+20180318-2
 ## Unit = mm, Angle = deg.
 ## Side : top
diff --git a/plot/ulx3s.drl b/plot/ulx3s.drl
index 632f9b9..ad02ba9 100644
--- a/plot/ulx3s.drl
+++ b/plot/ulx3s.drl
@@ -1,5 +1,5 @@
 M48
-;DRILL file {KiCad 5.0.0-rc2-dev-unknown+dfsg1+20180318-2} date Sat May 19 20:02:22 2018
+;DRILL file {KiCad 5.0.0-rc2-dev-unknown+dfsg1+20180318-2} date Sun May 20 11:16:36 2018
 ;FORMAT={-:-/ absolute / inch / decimal}
 FMAT,2
 INCH,TZ
@@ -496,6 +496,13 @@ X7.3547Y-4.0681
 X7.3547Y-4.1681
 X7.3547Y-4.2681
 X7.3547Y-4.3681
+X5.2047Y-3.9681
+X5.3047Y-3.9681
+X5.4047Y-3.9681
+X5.5047Y-3.9681
+X5.6047Y-3.9681
+X5.7047Y-3.9681
+X5.8047Y-3.9681
 X3.7547Y-2.4681
 X3.7547Y-2.5681
 X3.7547Y-2.6681
@@ -536,23 +543,16 @@ X3.8547Y-4.0681
 X3.8547Y-4.1681
 X3.8547Y-4.2681
 X3.8547Y-4.3681
-X5.2047Y-3.9681
-X5.3047Y-3.9681
-X5.4047Y-3.9681
-X5.5047Y-3.9681
-X5.6047Y-3.9681
-X5.7047Y-3.9681
-X5.8047Y-3.9681
 T8
 X5.4113Y-2.5359
 X5.4349Y-2.7288
 X6.0057Y-2.7288
 X6.0294Y-2.5359
 T9
-X7.0547Y-2.5681
-X4.0547Y-4.2681
 X4.0547Y-2.5681
+X4.0547Y-4.2681
 X7.0547Y-4.2681
+X7.0547Y-2.5681
 T10
 X4.9003Y-2.6188
 X4.9003Y-2.8944