diff --git a/plot/ulx3s-B.Cu.gbl b/plot/ulx3s-B.Cu.gbl
index a4fcadb..90a61b3 100644
--- a/plot/ulx3s-B.Cu.gbl
+++ b/plot/ulx3s-B.Cu.gbl
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Copper,L4,Bot,Signal*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 18:08:20 2017*
+G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 19:05:11 2017*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-B.Fab.gbr b/plot/ulx3s-B.Fab.gbr
index 6d52914..4e54fad 100644
--- a/plot/ulx3s-B.Fab.gbr
+++ b/plot/ulx3s-B.Fab.gbr
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Other,Fab,Bot*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 18:08:20 2017*
+G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 19:05:11 2017*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-B.Mask.gbs b/plot/ulx3s-B.Mask.gbs
index f714c84..fe66bad 100644
--- 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.7+dfsg1-1) date Fri Dec  8 18:08:20 2017*
+G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 19:05:11 2017*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-B.SilkS.gbo b/plot/ulx3s-B.SilkS.gbo
index 08d058e..48f6118 100644
--- a/plot/ulx3s-B.SilkS.gbo
+++ b/plot/ulx3s-B.SilkS.gbo
@@ -1,14 +1,14 @@
 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.7+dfsg1-1) date Fri Dec  8 18:08:20 2017*
+G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 19:05:11 2017*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
 %ADD10C,0.100000*%
-%ADD11C,0.200000*%
-%ADD12C,0.300000*%
+%ADD11C,0.300000*%
+%ADD12C,0.200000*%
 %ADD13C,0.250000*%
 %ADD14C,0.150000*%
 %ADD15C,0.120000*%
@@ -37,6 +37,7 @@ X99688000Y-85042000D02*
 X99688000Y-86058000D01*
 X98926000Y-85550000D02*
 X100196000Y-85550000D01*
+D12*
 X187826000Y-62690000D02*
 G75*
 G03X187826000Y-62690000I-1016000J0D01*
@@ -149,7 +150,7 @@ X94354000Y-89106000D02*
 X98926000Y-89106000D01*
 X94354000Y-87074000D02*
 X94354000Y-89106000D01*
-D12*
+D11*
 X182872857Y-82331429D02*
 X182801428Y-82260000D01*
 X182658571Y-82188571D01*
@@ -260,12 +261,12 @@ X96909905Y-69111429D02*
 X96148000Y-69111429D01*
 X96528952Y-69492381D02*
 X96528952Y-68730476D01*
-D12*
+D11*
 X182492000Y-107902000D02*
 X182492000Y-108918000D01*
 X183254000Y-108410000D02*
 X182492000Y-108410000D01*
-D11*
+D12*
 X95370000Y-96726000D02*
 X95370000Y-97234000D01*
 X96386000Y-95710000D02*
@@ -574,7 +575,7 @@ X182952286Y-62793143D01*
 X182095143Y-61888381D02*
 X181761810Y-62888381D01*
 X181428476Y-61888381D01*
-D12*
+D11*
 X182492000Y-64722000D02*
 X182492000Y-65738000D01*
 X183254000Y-65230000D02*
@@ -594,7 +595,7 @@ X182428476Y-68222381D01*
 X182095143Y-67222381D02*
 X181428476Y-67222381D01*
 X181857048Y-68222381D01*
-D12*
+D11*
 X182872857Y-69631429D02*
 X182801428Y-69560000D01*
 X182658571Y-69488571D01*
@@ -781,7 +782,7 @@ X180253619Y-111815143D01*
 X179348857Y-110910381D02*
 X179015524Y-111910381D01*
 X178682190Y-110910381D01*
-D12*
+D11*
 X99688000Y-108918000D02*
 X99688000Y-107902000D01*
 X98926000Y-108410000D02*
@@ -850,7 +851,7 @@ X99370571Y-106322381D01*
 X99656286Y-106322381D01*
 X99751524Y-106274762D01*
 X99799143Y-106227143D01*
-D12*
+D11*
 X100100714Y-96388571D02*
 X99814999Y-96388571D01*
 X99672142Y-96317143D01*
@@ -966,7 +967,7 @@ X99545142Y-76068571D01*
 X99973714Y-76068571D01*
 X100116571Y-75997143D01*
 X100187999Y-75925714D01*
-D12*
+D11*
 X100116571Y-72171429D02*
 X100045142Y-72100000D01*
 X99902285Y-72028571D01*
@@ -1247,7 +1248,7 @@ X161799285Y-99799714D01*
 X161704047Y-99847333D01*
 X161656428Y-99942571D01*
 X161656428Y-100466381D01*
-D12*
+D11*
 X155027856Y-110215714D02*
 X155099285Y-110287143D01*
 X155313571Y-110358571D01*
@@ -1592,7 +1593,7 @@ X145035000Y-110949905D01*
 X144987381Y-111045143D01*
 X144987381Y-111283239D01*
 X145035000Y-111426096D01*
-D12*
+D11*
 X174967142Y-94356571D02*
 X175467142Y-93642286D01*
 X175824285Y-94356571D02*
@@ -2277,7 +2278,7 @@ X180212000Y-99882000D02*
 X180212000Y-100682000D01*
 X181012000Y-99882000D02*
 X181012000Y-100682000D01*
-D12*
+D11*
 X148494000Y-91322000D02*
 X146894000Y-91322000D01*
 X147494000Y-91922000D02*
@@ -2490,7 +2491,7 @@ X158465238Y-84842381D01*
 X158560476Y-84985238D01*
 X158655714Y-85080476D01*
 X158750952Y-85128095D01*
-D11*
+D12*
 X161155905Y-94400381D02*
 X161155905Y-95209905D01*
 X161108286Y-95305143D01*
@@ -2530,7 +2531,7 @@ X108649523Y-89098095D01*
 X108697142Y-89240952D01*
 X109268571Y-89812381D01*
 X108649523Y-89812381D01*
-D11*
+D12*
 X104386905Y-81670381D02*
 X104386905Y-82479905D01*
 X104339286Y-82575143D01*
@@ -2564,7 +2565,7 @@ X155829999Y-72794381D01*
 X156115714Y-72794381D01*
 X156210952Y-72746762D01*
 X156258571Y-72699143D01*
-D11*
+D12*
 X158869905Y-80811381D02*
 X158869905Y-81620905D01*
 X158822286Y-81716143D01*
diff --git a/plot/ulx3s-Edge.Cuts.gm1 b/plot/ulx3s-Edge.Cuts.gm1
index bca0cbf..4164190 100644
--- 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.7+dfsg1-1) date Fri Dec  8 18:08:20 2017*
+G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 19:05:11 2017*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Cu.gtl b/plot/ulx3s-F.Cu.gtl
index 12edb7d..3a1ece3 100644
--- 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.7+dfsg1-1) date Fri Dec  8 18:08:20 2017*
+G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 19:05:11 2017*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Fab.gbr b/plot/ulx3s-F.Fab.gbr
index 10e639b..c8ab551 100644
--- a/plot/ulx3s-F.Fab.gbr
+++ b/plot/ulx3s-F.Fab.gbr
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Other,Fab,Top*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 18:08:20 2017*
+G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 19:05:11 2017*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Mask.gts b/plot/ulx3s-F.Mask.gts
index 12db410..e57d0d0 100644
--- 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.7+dfsg1-1) date Fri Dec  8 18:08:20 2017*
+G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 19:05:11 2017*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.SilkS.gto b/plot/ulx3s-F.SilkS.gto
index 5f266f9..332adad 100644
--- a/plot/ulx3s-F.SilkS.gto
+++ b/plot/ulx3s-F.SilkS.gto
@@ -1,15 +1,15 @@
 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.7+dfsg1-1) date Fri Dec  8 18:08:20 2017*
+G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 19:05:11 2017*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
 %ADD10C,0.100000*%
-%ADD11C,0.200000*%
-%ADD12C,0.250000*%
-%ADD13C,0.300000*%
+%ADD11C,0.300000*%
+%ADD12C,0.200000*%
+%ADD13C,0.250000*%
 %ADD14C,0.150000*%
 %ADD15C,0.120000*%
 %ADD16C,0.700000*%
@@ -40,6 +40,7 @@ X99688000Y-85042000D02*
 X99688000Y-86058000D01*
 X98926000Y-85550000D02*
 X100196000Y-85550000D01*
+D12*
 X97910000Y-63706000D02*
 G75*
 G03X97910000Y-61674000I0J1016000D01*
@@ -152,7 +153,7 @@ X187826000Y-86566000D02*
 X183254000Y-86566000D01*
 X187826000Y-84534000D02*
 X187826000Y-86566000D01*
-D12*
+D13*
 X96148000Y-69111429D02*
 X96909905Y-69111429D01*
 X96528953Y-69492381D02*
@@ -201,14 +202,14 @@ X185270095Y-69111429D02*
 X186032000Y-69111429D01*
 X185651048Y-69492381D02*
 X185651048Y-68730476D01*
-D13*
+D11*
 X176928000Y-83117143D02*
 X178070857Y-83117143D01*
 X178785143Y-83117143D02*
 X179928000Y-83117143D01*
 X179356571Y-83688571D02*
 X179356571Y-82545714D01*
-D11*
+D12*
 X187826000Y-67770000D02*
 G75*
 G03X187826000Y-67770000I-1016000J0D01*
@@ -321,7 +322,7 @@ X96386000Y-67770000D02*
 G75*
 G03X96386000Y-67770000I-1016000J0D01*
 G01*
-D13*
+D11*
 X177793143Y-85054000D02*
 X177650286Y-84982571D01*
 X177436000Y-84982571D01*
@@ -364,7 +365,7 @@ X182492000Y-107902000D02*
 X182492000Y-108918000D01*
 X182492000Y-108410000D02*
 X183254000Y-108410000D01*
-D12*
+D13*
 X182047524Y-106322381D02*
 X181476095Y-106322381D01*
 X181761809Y-106322381D02*
@@ -391,7 +392,7 @@ X182047524Y-68222381D01*
 X182380857Y-67222381D02*
 X183047524Y-67222381D01*
 X182618952Y-68222381D01*
-D13*
+D11*
 X182492000Y-64722000D02*
 X182492000Y-65738000D01*
 X182492000Y-65230000D02*
@@ -400,7 +401,7 @@ X99688000Y-107902000D02*
 X99688000Y-108918000D01*
 X98926000Y-108410000D02*
 X99688000Y-108410000D01*
-D12*
+D13*
 X98846667Y-74842381D02*
 X99465715Y-74842381D01*
 X99132381Y-75223333D01*
@@ -457,10 +458,10 @@ X100513429Y-106322381D01*
 X100227714Y-106322381D01*
 X100132476Y-106274762D01*
 X100084857Y-106227143D01*
-X98846667Y-90082381D02*
-X99513334Y-90082381D01*
-X99084762Y-91082381D01*
-D13*
+X99354667Y-89574381D02*
+X100021334Y-89574381D01*
+X99592762Y-90574381D01*
+D11*
 X99688000Y-87582000D02*
 X99688000Y-88598000D01*
 X98926000Y-88090000D02*
@@ -469,7 +470,7 @@ X99688000Y-64722000D02*
 X99688000Y-65738000D01*
 X98926000Y-65230000D02*
 X99688000Y-65230000D01*
-D12*
+D13*
 X100497810Y-61634381D02*
 X101116858Y-61634381D01*
 X100783524Y-62015333D01*
@@ -541,7 +542,7 @@ X181523524Y-111910381D01*
 X181237809Y-111910381D01*
 X181142571Y-111862762D01*
 X181094952Y-111815143D01*
-D13*
+D11*
 X100775715Y-84220571D02*
 X101704286Y-84220571D01*
 X101204286Y-84792000D01*
@@ -579,7 +580,7 @@ X102918572Y-85577714D01*
 X104275714Y-84220571D02*
 X104775714Y-85720571D01*
 X105275714Y-84220571D01*
-D12*
+D13*
 X100672381Y-110910381D02*
 X101291429Y-110910381D01*
 X100958095Y-111291333D01*
@@ -633,7 +634,7 @@ X181523714Y-62793143D01*
 X182380857Y-61888381D02*
 X182714190Y-62888381D01*
 X183047524Y-61888381D01*
-D13*
+D11*
 X180587143Y-69631429D02*
 X180658572Y-69560000D01*
 X180801429Y-69488571D01*
@@ -974,7 +975,7 @@ X182587143Y-104008571D01*
 X182230000Y-104008571D01*
 X182087143Y-103937143D01*
 X182015714Y-103865714D01*
-D11*
+D12*
 X186810000Y-66500000D02*
 X186810000Y-66754000D01*
 X187826000Y-67770000D02*
@@ -1149,7 +1150,7 @@ X96386000Y-105870000D02*
 X96640000Y-105870000D01*
 X94100000Y-105870000D02*
 X94354000Y-105870000D01*
-D13*
+D11*
 X100982000Y-83117143D02*
 X102124857Y-83117143D01*
 X101553428Y-83688571D02*
@@ -1549,7 +1550,7 @@ X173252571Y-99206571D01*
 X173395428Y-99206571D01*
 X173609714Y-99278000D01*
 X173681143Y-99349429D01*
-D12*
+D13*
 X142447381Y-111521333D02*
 X142447381Y-110949904D01*
 X143447381Y-111235619D02*
@@ -2368,7 +2369,7 @@ X147080000Y-79200000D02*
 X147080000Y-96400000D01*
 X129880000Y-79200000D02*
 X147080000Y-79200000D01*
-D13*
+D11*
 X149980000Y-94836000D02*
 X149980000Y-94136000D01*
 X148980000Y-94836000D02*
@@ -2528,7 +2529,7 @@ X129400000Y-71396000D02*
 X130800000Y-71396000D01*
 X129400000Y-72596000D02*
 X130800000Y-72596000D01*
-D11*
+D12*
 X115760000Y-70764000D02*
 X116160000Y-70364000D01*
 X115760000Y-69764000D02*
@@ -2835,7 +2836,7 @@ X106324000Y-74080000D02*
 X103924000Y-74080000D01*
 X101624000Y-70480000D02*
 X101624000Y-72680000D01*
-D13*
+D11*
 X103125000Y-102508571D02*
 X103125000Y-103580000D01*
 X103053572Y-103794286D01*
diff --git a/plot/ulx3s-In1.Cu.g2 b/plot/ulx3s-In1.Cu.g2
index 64e3003..af6afd4 100644
--- a/plot/ulx3s-In1.Cu.g2
+++ b/plot/ulx3s-In1.Cu.g2
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Copper,L2,Inr,Signal*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 18:08:20 2017*
+G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 19:05:11 2017*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-In2.Cu.g3 b/plot/ulx3s-In2.Cu.g3
index 3e6d91e..7cc1b63 100644
--- a/plot/ulx3s-In2.Cu.g3
+++ b/plot/ulx3s-In2.Cu.g3
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Copper,L3,Inr,Signal*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 18:08:20 2017*
+G04 Created by KiCad (PCBNEW 4.0.7+dfsg1-1) date Fri Dec  8 19:05:11 2017*
 %MOMM*%
 %LPD*%
 G01*