diff --git a/plot/ulx3s-B.Cu.gbl b/plot/ulx3s-B.Cu.gbl
index d386f4f..e3a5c7a 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+dfsg1-3*
-G04 #@! TF.CreationDate,2018-06-08T21:14:18+02:00*
+G04 #@! TF.CreationDate,2018-06-08T22:23:43+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+dfsg1-3) date Fri Jun  8 21:14:18 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Fri Jun  8 22:23:43 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-B.Mask.gbs b/plot/ulx3s-B.Mask.gbs
index 26ac11f..12b17c4 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+dfsg1-3*
-G04 #@! TF.CreationDate,2018-06-08T21:14:18+02:00*
+G04 #@! TF.CreationDate,2018-06-08T22:23:43+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+dfsg1-3) date Fri Jun  8 21:14:18 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Fri Jun  8 22:23:43 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-B.Paste.gbp b/plot/ulx3s-B.Paste.gbp
index b7443dc..1e7e4a3 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+dfsg1-3*
-G04 #@! TF.CreationDate,2018-06-08T21:14:18+02:00*
+G04 #@! TF.CreationDate,2018-06-08T22:23:43+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+dfsg1-3) date Fri Jun  8 21:14:18 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Fri Jun  8 22:23:43 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-B.SilkS.gbo b/plot/ulx3s-B.SilkS.gbo
index d8f8745..1cfa80b 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+dfsg1-3*
-G04 #@! TF.CreationDate,2018-06-08T21:14:18+02:00*
+G04 #@! TF.CreationDate,2018-06-08T22:23:43+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+dfsg1-3) date Fri Jun  8 21:14:18 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Fri Jun  8 22:23:43 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-Edge.Cuts.gm1 b/plot/ulx3s-Edge.Cuts.gm1
index c1837ea..ad1b925 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+dfsg1-3*
-G04 #@! TF.CreationDate,2018-06-08T21:14:18+02:00*
+G04 #@! TF.CreationDate,2018-06-08T22:23:43+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+dfsg1-3) date Fri Jun  8 21:14:18 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Fri Jun  8 22:23:43 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Cu.gtl b/plot/ulx3s-F.Cu.gtl
index 4168549..d929bdc 100644
--- a/plot/ulx3s-F.Cu.gtl
+++ b/plot/ulx3s-F.Cu.gtl
@@ -1,72 +1,72 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-3*
-G04 #@! TF.CreationDate,2018-06-08T21:14:18+02:00*
+G04 #@! TF.CreationDate,2018-06-08T22:23:42+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+dfsg1-3) date Fri Jun  8 21:14:18 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Fri Jun  8 22:23:42 2018*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
+%ADD10R,0.560000X0.900000*%
+G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD10O,1.727200X1.727200*%
+%ADD11O,1.727200X1.727200*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD11R,1.727200X1.727200*%
+%ADD12R,1.727200X1.727200*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD12C,5.500000*%
+%ADD13C,5.500000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD13O,0.850000X0.300000*%
+%ADD14O,0.850000X0.300000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD14O,0.300000X0.850000*%
+%ADD15O,0.300000X0.850000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD15R,1.675000X1.675000*%
+%ADD16R,1.675000X1.675000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD16R,1.727200X2.032000*%
+%ADD17R,1.727200X2.032000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD17O,1.727200X2.032000*%
+%ADD18O,1.727200X2.032000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD18R,1.550000X1.300000*%
+%ADD19R,1.550000X1.300000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD19R,1.120000X2.440000*%
+%ADD20R,1.120000X2.440000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,BGAPad,CuDef*
-%ADD20C,0.350000*%
-G04 #@! TD*
-G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD21R,2.800000X2.000000*%
+%ADD21C,0.350000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD22R,2.800000X2.200000*%
+%ADD22R,2.800000X2.000000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD23R,2.800000X2.800000*%
+%ADD23R,2.800000X2.200000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD24R,0.700000X1.500000*%
+%ADD24R,2.800000X2.800000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD25R,1.450000X0.900000*%
+%ADD25R,0.700000X1.500000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD26R,1.450000X2.000000*%
+%ADD26R,1.450000X0.900000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD27R,2.200000X1.800000*%
+%ADD27R,1.450000X2.000000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD28R,0.560000X0.900000*%
+%ADD28R,2.200000X1.800000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
 %ADD29R,1.000000X0.670000*%
@@ -151,18 +151,182 @@ G04 #@! TA.AperFunction,Conductor*
 G04 #@! TD*
 G04 APERTURE END LIST*
 D10*
+G04 #@! TO.P,U2,28*
+G04 #@! TO.N,GND*
+X175493000Y-82270000D03*
+G04 #@! TO.P,U2,1*
+G04 #@! TO.N,+3V3*
+X154693000Y-93330000D03*
+G04 #@! TO.P,U2,2*
+G04 #@! TO.N,SDRAM_D0*
+X155493000Y-93330000D03*
+G04 #@! TO.P,U2,3*
+G04 #@! TO.N,+3V3*
+X156293000Y-93330000D03*
+G04 #@! TO.P,U2,4*
+G04 #@! TO.N,SDRAM_D1*
+X157093000Y-93330000D03*
+G04 #@! TO.P,U2,5*
+G04 #@! TO.N,SDRAM_D2*
+X157893000Y-93330000D03*
+G04 #@! TO.P,U2,6*
+G04 #@! TO.N,GND*
+X158693000Y-93330000D03*
+G04 #@! TO.P,U2,7*
+G04 #@! TO.N,SDRAM_D3*
+X159493000Y-93330000D03*
+G04 #@! TO.P,U2,8*
+G04 #@! TO.N,SDRAM_D4*
+X160293000Y-93330000D03*
+G04 #@! TO.P,U2,9*
+G04 #@! TO.N,+3V3*
+X161093000Y-93330000D03*
+G04 #@! TO.P,U2,10*
+G04 #@! TO.N,SDRAM_D5*
+X161893000Y-93330000D03*
+G04 #@! TO.P,U2,11*
+G04 #@! TO.N,SDRAM_D6*
+X162693000Y-93330000D03*
+G04 #@! TO.P,U2,12*
+G04 #@! TO.N,GND*
+X163493000Y-93330000D03*
+G04 #@! TO.P,U2,13*
+G04 #@! TO.N,SDRAM_D7*
+X164293000Y-93330000D03*
+G04 #@! TO.P,U2,14*
+G04 #@! TO.N,+3V3*
+X165093000Y-93330000D03*
+G04 #@! TO.P,U2,15*
+G04 #@! TO.N,SDRAM_DQM0*
+X165893000Y-93330000D03*
+G04 #@! TO.P,U2,16*
+G04 #@! TO.N,SDRAM_nWE*
+X166693000Y-93330000D03*
+G04 #@! TO.P,U2,17*
+G04 #@! TO.N,SDRAM_nCAS*
+X167493000Y-93330000D03*
+G04 #@! TO.P,U2,18*
+G04 #@! TO.N,SDRAM_nRAS*
+X168293000Y-93330000D03*
+G04 #@! TO.P,U2,19*
+G04 #@! TO.N,SDRAM_nCS*
+X169093000Y-93330000D03*
+G04 #@! TO.P,U2,20*
+G04 #@! TO.N,SDRAM_BA0*
+X169893000Y-93330000D03*
+G04 #@! TO.P,U2,21*
+G04 #@! TO.N,SDRAM_BA1*
+X170693000Y-93330000D03*
+G04 #@! TO.P,U2,22*
+G04 #@! TO.N,SDRAM_A10*
+X171493000Y-93330000D03*
+G04 #@! TO.P,U2,23*
+G04 #@! TO.N,SDRAM_A0*
+X172293000Y-93330000D03*
+G04 #@! TO.P,U2,24*
+G04 #@! TO.N,SDRAM_A1*
+X173093000Y-93330000D03*
+G04 #@! TO.P,U2,25*
+G04 #@! TO.N,SDRAM_A2*
+X173893000Y-93330000D03*
+G04 #@! TO.P,U2,26*
+G04 #@! TO.N,SDRAM_A3*
+X174693000Y-93330000D03*
+G04 #@! TO.P,U2,27*
+G04 #@! TO.N,+3V3*
+X175493000Y-93330000D03*
+G04 #@! TO.P,U2,29*
+G04 #@! TO.N,SDRAM_A4*
+X174693000Y-82270000D03*
+G04 #@! TO.P,U2,30*
+G04 #@! TO.N,SDRAM_A5*
+X173893000Y-82270000D03*
+G04 #@! TO.P,U2,31*
+G04 #@! TO.N,SDRAM_A6*
+X173093000Y-82270000D03*
+G04 #@! TO.P,U2,32*
+G04 #@! TO.N,SDRAM_A7*
+X172293000Y-82270000D03*
+G04 #@! TO.P,U2,33*
+G04 #@! TO.N,SDRAM_A8*
+X171493000Y-82270000D03*
+G04 #@! TO.P,U2,34*
+G04 #@! TO.N,SDRAM_A9*
+X170693000Y-82270000D03*
+G04 #@! TO.P,U2,35*
+G04 #@! TO.N,SDRAM_A11*
+X169893000Y-82270000D03*
+G04 #@! TO.P,U2,36*
+G04 #@! TO.N,SDRAM_A12*
+X169093000Y-82270000D03*
+G04 #@! TO.P,U2,37*
+G04 #@! TO.N,SDRAM_CKE*
+X168293000Y-82270000D03*
+G04 #@! TO.P,U2,38*
+G04 #@! TO.N,SDRAM_CLK*
+X167493000Y-82270000D03*
+G04 #@! TO.P,U2,39*
+G04 #@! TO.N,SDRAM_DQM1*
+X166693000Y-82270000D03*
+G04 #@! TO.P,U2,40*
+G04 #@! TO.N,N/C*
+X165893000Y-82270000D03*
+G04 #@! TO.P,U2,41*
+G04 #@! TO.N,GND*
+X165093000Y-82270000D03*
+G04 #@! TO.P,U2,42*
+G04 #@! TO.N,SDRAM_D8*
+X164293000Y-82270000D03*
+G04 #@! TO.P,U2,43*
+G04 #@! TO.N,+3V3*
+X163493000Y-82270000D03*
+G04 #@! TO.P,U2,44*
+G04 #@! TO.N,SDRAM_D9*
+X162693000Y-82270000D03*
+G04 #@! TO.P,U2,45*
+G04 #@! TO.N,SDRAM_D10*
+X161893000Y-82270000D03*
+G04 #@! TO.P,U2,46*
+G04 #@! TO.N,GND*
+X161093000Y-82270000D03*
+G04 #@! TO.P,U2,47*
+G04 #@! TO.N,SDRAM_D11*
+X160293000Y-82270000D03*
+G04 #@! TO.P,U2,48*
+G04 #@! TO.N,SDRAM_D12*
+X159493000Y-82270000D03*
+G04 #@! TO.P,U2,49*
+G04 #@! TO.N,+3V3*
+X158693000Y-82270000D03*
+G04 #@! TO.P,U2,50*
+G04 #@! TO.N,SDRAM_D13*
+X157893000Y-82270000D03*
+G04 #@! TO.P,U2,51*
+G04 #@! TO.N,SDRAM_D14*
+X157093000Y-82270000D03*
+G04 #@! TO.P,U2,52*
+G04 #@! TO.N,GND*
+X156293000Y-82270000D03*
+G04 #@! TO.P,U2,53*
+G04 #@! TO.N,SDRAM_D15*
+X155493000Y-82270000D03*
+G04 #@! TO.P,U2,54*
+G04 #@! TO.N,GND*
+X154693000Y-82270000D03*
+G04 #@! TD*
+D11*
 G04 #@! TO.P,J1,1*
 G04 #@! TO.N,2V5_3V3*
 X97910000Y-62690000D03*
 G04 #@! TO.P,J1,2*
 X95370000Y-62690000D03*
-D11*
+D12*
 G04 #@! TO.P,J1,3*
 G04 #@! TO.N,GND*
 X97910000Y-65230000D03*
 G04 #@! TO.P,J1,4*
 X95370000Y-65230000D03*
-D10*
+D11*
 G04 #@! TO.P,J1,5*
 G04 #@! TO.N,GN0*
 X97910000Y-67770000D03*
@@ -210,13 +374,13 @@ G04 #@! TO.N,2V5_3V3*
 X97910000Y-85550000D03*
 G04 #@! TO.P,J1,20*
 X95370000Y-85550000D03*
-D11*
+D12*
 G04 #@! TO.P,J1,21*
 G04 #@! TO.N,GND*
 X97910000Y-88090000D03*
 G04 #@! TO.P,J1,22*
 X95370000Y-88090000D03*
-D10*
+D11*
 G04 #@! TO.P,J1,23*
 G04 #@! TO.N,GN7*
 X97910000Y-90630000D03*
@@ -259,13 +423,13 @@ X97910000Y-105870000D03*
 G04 #@! TO.P,J1,36*
 G04 #@! TO.N,GP13*
 X95370000Y-105870000D03*
-D11*
+D12*
 G04 #@! TO.P,J1,37*
 G04 #@! TO.N,GND*
 X97910000Y-108410000D03*
 G04 #@! TO.P,J1,38*
 X95370000Y-108410000D03*
-D10*
+D11*
 G04 #@! TO.P,J1,39*
 G04 #@! TO.N,2V5_3V3*
 X97910000Y-110950000D03*
@@ -277,13 +441,13 @@ G04 #@! TO.N,+3V3*
 X184270000Y-110950000D03*
 G04 #@! TO.P,J2,2*
 X186810000Y-110950000D03*
-D11*
+D12*
 G04 #@! TO.P,J2,3*
 G04 #@! TO.N,GND*
 X184270000Y-108410000D03*
 G04 #@! TO.P,J2,4*
 X186810000Y-108410000D03*
-D10*
+D11*
 G04 #@! TO.P,J2,5*
 G04 #@! TO.N,GN14*
 X184270000Y-105870000D03*
@@ -331,13 +495,13 @@ G04 #@! TO.N,+3V3*
 X184270000Y-88090000D03*
 G04 #@! TO.P,J2,20*
 X186810000Y-88090000D03*
-D11*
+D12*
 G04 #@! TO.P,J2,21*
 G04 #@! TO.N,GND*
 X184270000Y-85550000D03*
 G04 #@! TO.P,J2,22*
 X186810000Y-85550000D03*
-D10*
+D11*
 G04 #@! TO.P,J2,23*
 G04 #@! TO.N,GN21*
 X184270000Y-83010000D03*
@@ -380,13 +544,13 @@ X184270000Y-67770000D03*
 G04 #@! TO.P,J2,36*
 G04 #@! TO.N,GP27*
 X186810000Y-67770000D03*
-D11*
+D12*
 G04 #@! TO.P,J2,37*
 G04 #@! TO.N,GND*
 X184270000Y-65230000D03*
 G04 #@! TO.P,J2,38*
 X186810000Y-65230000D03*
-D10*
+D11*
 G04 #@! TO.P,J2,39*
 G04 #@! TO.N,/gpio/IN5V*
 X184270000Y-62690000D03*
@@ -394,7 +558,7 @@ G04 #@! TO.P,J2,40*
 G04 #@! TO.N,/gpio/OUT5V*
 X186810000Y-62690000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.P,H1,1*
 G04 #@! TO.N,GND*
 X102990000Y-108410000D03*
@@ -411,11 +575,11 @@ G04 #@! TO.P,H4,1*
 G04 #@! TO.N,GND*
 X102990000Y-65230000D03*
 G04 #@! TD*
-D11*
+D12*
 G04 #@! TO.P,J4,1*
 G04 #@! TO.N,GND*
 X140455000Y-104600000D03*
-D10*
+D11*
 G04 #@! TO.P,J4,2*
 G04 #@! TO.N,+3V3*
 X137915000Y-104600000D03*
@@ -432,7 +596,7 @@ G04 #@! TO.P,J4,6*
 G04 #@! TO.N,JTAG_TDO*
 X137915000Y-109680000D03*
 G04 #@! TD*
-D13*
+D14*
 G04 #@! TO.P,U8,1*
 G04 #@! TO.N,GP15*
 X179735000Y-101655000D03*
@@ -453,7 +617,7 @@ G04 #@! TO.N,GND*
 X179735000Y-99155000D03*
 G04 #@! TO.P,U8,7*
 X179735000Y-98655000D03*
-D14*
+D15*
 G04 #@! TO.P,U8,8*
 X178785000Y-97705000D03*
 G04 #@! TO.P,U8,9*
@@ -470,7 +634,7 @@ G04 #@! TO.N,GND*
 X176285000Y-97705000D03*
 G04 #@! TO.P,U8,14*
 X175785000Y-97705000D03*
-D13*
+D14*
 G04 #@! TO.P,U8,15*
 G04 #@! TO.N,+3V3*
 X174835000Y-98655000D03*
@@ -491,7 +655,7 @@ X174835000Y-101155000D03*
 G04 #@! TO.P,U8,21*
 G04 #@! TO.N,ADC_MOSI*
 X174835000Y-101655000D03*
-D14*
+D15*
 G04 #@! TO.P,U8,22*
 G04 #@! TO.N,GND*
 X175785000Y-102605000D03*
@@ -513,7 +677,7 @@ X178285000Y-102605000D03*
 G04 #@! TO.P,U8,28*
 G04 #@! TO.N,GN15*
 X178785000Y-102605000D03*
-D15*
+D16*
 G04 #@! TO.P,U8,29*
 G04 #@! TO.N,GND*
 X176447500Y-99317500D03*
@@ -521,11 +685,11 @@ X176447500Y-100992500D03*
 X178122500Y-99317500D03*
 X178122500Y-100992500D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.P,OLED1,1*
 G04 #@! TO.N,GND*
 X147440000Y-100790000D03*
-D17*
+D18*
 G04 #@! TO.P,OLED1,2*
 G04 #@! TO.N,+3V3*
 X144900000Y-100790000D03*
@@ -545,7 +709,7 @@ G04 #@! TO.P,OLED1,7*
 G04 #@! TO.N,OLED_CS*
 X132200000Y-100790000D03*
 G04 #@! TD*
-D18*
+D19*
 G04 #@! TO.P,BTN0,2*
 G04 #@! TO.N,GND*
 X175550000Y-71870000D03*
@@ -623,7 +787,7 @@ G04 #@! TO.P,BTN6,2*
 G04 #@! TO.N,BTN_R*
 X167590000Y-106160000D03*
 G04 #@! TD*
-D19*
+D20*
 G04 #@! TO.P,SW1,1*
 G04 #@! TO.N,/blinkey/SWPU*
 X156330000Y-78425000D03*
@@ -649,7 +813,7 @@ G04 #@! TO.P,SW1,8*
 G04 #@! TO.N,SW1*
 X156330000Y-69815000D03*
 G04 #@! TD*
-D20*
+D21*
 G04 #@! TO.P,U1,A2*
 G04 #@! TO.N,GP9*
 X131680000Y-80200000D03*
@@ -1697,31 +1861,31 @@ X143680000Y-95400000D03*
 G04 #@! TO.P,U1,Y19*
 X145280000Y-95400000D03*
 G04 #@! TD*
-D21*
+D22*
 G04 #@! TO.P,AUDIO1,1*
 G04 #@! TO.N,GND*
 X120668000Y-62618000D03*
-D22*
+D23*
 G04 #@! TO.P,AUDIO1,4*
 G04 #@! TO.N,/analog/AUDIO_V*
 X120668000Y-65418000D03*
-D23*
+D24*
 G04 #@! TO.P,AUDIO1,2*
 G04 #@! TO.N,/analog/AUDIO_L*
 X120668000Y-74818000D03*
 G04 #@! TO.P,AUDIO1,5*
 G04 #@! TO.N,Net-(AUDIO1-Pad5)*
 X125218000Y-78918000D03*
-D22*
+D23*
 G04 #@! TO.P,AUDIO1,3*
 G04 #@! TO.N,/analog/AUDIO_R*
 X128268000Y-67318000D03*
-D21*
+D22*
 G04 #@! TO.P,AUDIO1,6*
 G04 #@! TO.N,Net-(AUDIO1-Pad6)*
 X128268000Y-64518000D03*
 G04 #@! TD*
-D24*
+D25*
 G04 #@! TO.P,SD1,1*
 G04 #@! TO.N,SD_D2*
 X118250000Y-105250000D03*
@@ -1746,20 +1910,20 @@ X111650000Y-105250000D03*
 G04 #@! TO.P,SD1,8*
 G04 #@! TO.N,SD_D1*
 X110550000Y-105250000D03*
-D25*
+D26*
 G04 #@! TO.P,SD1,10*
 G04 #@! TO.N,GND*
 X121925000Y-109550000D03*
 G04 #@! TO.P,SD1,11*
 X108175000Y-97850000D03*
-D26*
+D27*
 G04 #@! TO.P,SD1,9*
 X108175000Y-107850000D03*
 X121925000Y-107850000D03*
 X121925000Y-99550000D03*
 X108175000Y-99550000D03*
 G04 #@! TD*
-D27*
+D28*
 G04 #@! TO.P,Y1,1*
 G04 #@! TO.N,+3V3*
 X108040000Y-69220000D03*
@@ -1773,170 +1937,6 @@ G04 #@! TO.P,Y1,4*
 G04 #@! TO.N,+3V3*
 X108040000Y-73620000D03*
 G04 #@! TD*
-D28*
-G04 #@! TO.P,U2,28*
-G04 #@! TO.N,GND*
-X175493000Y-82270000D03*
-G04 #@! TO.P,U2,1*
-G04 #@! TO.N,+3V3*
-X154693000Y-93330000D03*
-G04 #@! TO.P,U2,2*
-G04 #@! TO.N,SDRAM_D0*
-X155493000Y-93330000D03*
-G04 #@! TO.P,U2,3*
-G04 #@! TO.N,+3V3*
-X156293000Y-93330000D03*
-G04 #@! TO.P,U2,4*
-G04 #@! TO.N,SDRAM_D1*
-X157093000Y-93330000D03*
-G04 #@! TO.P,U2,5*
-G04 #@! TO.N,SDRAM_D2*
-X157893000Y-93330000D03*
-G04 #@! TO.P,U2,6*
-G04 #@! TO.N,GND*
-X158693000Y-93330000D03*
-G04 #@! TO.P,U2,7*
-G04 #@! TO.N,SDRAM_D3*
-X159493000Y-93330000D03*
-G04 #@! TO.P,U2,8*
-G04 #@! TO.N,SDRAM_D4*
-X160293000Y-93330000D03*
-G04 #@! TO.P,U2,9*
-G04 #@! TO.N,+3V3*
-X161093000Y-93330000D03*
-G04 #@! TO.P,U2,10*
-G04 #@! TO.N,SDRAM_D5*
-X161893000Y-93330000D03*
-G04 #@! TO.P,U2,11*
-G04 #@! TO.N,SDRAM_D6*
-X162693000Y-93330000D03*
-G04 #@! TO.P,U2,12*
-G04 #@! TO.N,GND*
-X163493000Y-93330000D03*
-G04 #@! TO.P,U2,13*
-G04 #@! TO.N,SDRAM_D7*
-X164293000Y-93330000D03*
-G04 #@! TO.P,U2,14*
-G04 #@! TO.N,+3V3*
-X165093000Y-93330000D03*
-G04 #@! TO.P,U2,15*
-G04 #@! TO.N,SDRAM_DQM0*
-X165893000Y-93330000D03*
-G04 #@! TO.P,U2,16*
-G04 #@! TO.N,SDRAM_nWE*
-X166693000Y-93330000D03*
-G04 #@! TO.P,U2,17*
-G04 #@! TO.N,SDRAM_nCAS*
-X167493000Y-93330000D03*
-G04 #@! TO.P,U2,18*
-G04 #@! TO.N,SDRAM_nRAS*
-X168293000Y-93330000D03*
-G04 #@! TO.P,U2,19*
-G04 #@! TO.N,SDRAM_nCS*
-X169093000Y-93330000D03*
-G04 #@! TO.P,U2,20*
-G04 #@! TO.N,SDRAM_BA0*
-X169893000Y-93330000D03*
-G04 #@! TO.P,U2,21*
-G04 #@! TO.N,SDRAM_BA1*
-X170693000Y-93330000D03*
-G04 #@! TO.P,U2,22*
-G04 #@! TO.N,SDRAM_A10*
-X171493000Y-93330000D03*
-G04 #@! TO.P,U2,23*
-G04 #@! TO.N,SDRAM_A0*
-X172293000Y-93330000D03*
-G04 #@! TO.P,U2,24*
-G04 #@! TO.N,SDRAM_A1*
-X173093000Y-93330000D03*
-G04 #@! TO.P,U2,25*
-G04 #@! TO.N,SDRAM_A2*
-X173893000Y-93330000D03*
-G04 #@! TO.P,U2,26*
-G04 #@! TO.N,SDRAM_A3*
-X174693000Y-93330000D03*
-G04 #@! TO.P,U2,27*
-G04 #@! TO.N,+3V3*
-X175493000Y-93330000D03*
-G04 #@! TO.P,U2,29*
-G04 #@! TO.N,SDRAM_A4*
-X174693000Y-82270000D03*
-G04 #@! TO.P,U2,30*
-G04 #@! TO.N,SDRAM_A5*
-X173893000Y-82270000D03*
-G04 #@! TO.P,U2,31*
-G04 #@! TO.N,SDRAM_A6*
-X173093000Y-82270000D03*
-G04 #@! TO.P,U2,32*
-G04 #@! TO.N,SDRAM_A7*
-X172293000Y-82270000D03*
-G04 #@! TO.P,U2,33*
-G04 #@! TO.N,SDRAM_A8*
-X171493000Y-82270000D03*
-G04 #@! TO.P,U2,34*
-G04 #@! TO.N,SDRAM_A9*
-X170693000Y-82270000D03*
-G04 #@! TO.P,U2,35*
-G04 #@! TO.N,SDRAM_A11*
-X169893000Y-82270000D03*
-G04 #@! TO.P,U2,36*
-G04 #@! TO.N,SDRAM_A12*
-X169093000Y-82270000D03*
-G04 #@! TO.P,U2,37*
-G04 #@! TO.N,SDRAM_CKE*
-X168293000Y-82270000D03*
-G04 #@! TO.P,U2,38*
-G04 #@! TO.N,SDRAM_CLK*
-X167493000Y-82270000D03*
-G04 #@! TO.P,U2,39*
-G04 #@! TO.N,SDRAM_DQM1*
-X166693000Y-82270000D03*
-G04 #@! TO.P,U2,40*
-G04 #@! TO.N,N/C*
-X165893000Y-82270000D03*
-G04 #@! TO.P,U2,41*
-G04 #@! TO.N,GND*
-X165093000Y-82270000D03*
-G04 #@! TO.P,U2,42*
-G04 #@! TO.N,SDRAM_D8*
-X164293000Y-82270000D03*
-G04 #@! TO.P,U2,43*
-G04 #@! TO.N,+3V3*
-X163493000Y-82270000D03*
-G04 #@! TO.P,U2,44*
-G04 #@! TO.N,SDRAM_D9*
-X162693000Y-82270000D03*
-G04 #@! TO.P,U2,45*
-G04 #@! TO.N,SDRAM_D10*
-X161893000Y-82270000D03*
-G04 #@! TO.P,U2,46*
-G04 #@! TO.N,GND*
-X161093000Y-82270000D03*
-G04 #@! TO.P,U2,47*
-G04 #@! TO.N,SDRAM_D11*
-X160293000Y-82270000D03*
-G04 #@! TO.P,U2,48*
-G04 #@! TO.N,SDRAM_D12*
-X159493000Y-82270000D03*
-G04 #@! TO.P,U2,49*
-G04 #@! TO.N,+3V3*
-X158693000Y-82270000D03*
-G04 #@! TO.P,U2,50*
-G04 #@! TO.N,SDRAM_D13*
-X157893000Y-82270000D03*
-G04 #@! TO.P,U2,51*
-G04 #@! TO.N,SDRAM_D14*
-X157093000Y-82270000D03*
-G04 #@! TO.P,U2,52*
-G04 #@! TO.N,GND*
-X156293000Y-82270000D03*
-G04 #@! TO.P,U2,53*
-G04 #@! TO.N,SDRAM_D15*
-X155493000Y-82270000D03*
-G04 #@! TO.P,U2,54*
-G04 #@! TO.N,GND*
-X154693000Y-82270000D03*
-G04 #@! TD*
 D29*
 G04 #@! TO.P,C36,1*
 G04 #@! TO.N,FPDI_ETH+*
diff --git a/plot/ulx3s-F.Mask.gts b/plot/ulx3s-F.Mask.gts
index c2f6350..cdfc88b 100644
--- a/plot/ulx3s-F.Mask.gts
+++ b/plot/ulx3s-F.Mask.gts
@@ -1,36 +1,36 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-3*
-G04 #@! TF.CreationDate,2018-06-08T21:14:18+02:00*
+G04 #@! TF.CreationDate,2018-06-08T22:23:43+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+dfsg1-3) date Fri Jun  8 21:14:18 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Fri Jun  8 22:23:43 2018*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
-%ADD10O,1.827200X1.827200*%
-%ADD11R,1.727200X1.727200*%
-%ADD12C,5.600000*%
-%ADD13O,0.950000X0.400000*%
-%ADD14O,0.400000X0.950000*%
-%ADD15R,1.675000X1.675000*%
-%ADD16R,1.727200X2.032000*%
-%ADD17O,1.827200X2.132000*%
-%ADD18R,1.550000X1.300000*%
-%ADD19R,1.120000X2.440000*%
-%ADD20C,0.430000*%
-%ADD21R,2.800000X2.000000*%
-%ADD22R,2.800000X2.200000*%
-%ADD23R,2.800000X2.800000*%
-%ADD24C,1.800000*%
-%ADD25R,0.700000X1.500000*%
-%ADD26R,1.450000X0.900000*%
-%ADD27R,1.450000X2.000000*%
-%ADD28R,2.200000X1.800000*%
-%ADD29R,0.560000X0.900000*%
+%ADD10R,0.560000X0.900000*%
+%ADD11O,1.827200X1.827200*%
+%ADD12R,1.727200X1.727200*%
+%ADD13C,5.600000*%
+%ADD14O,0.950000X0.400000*%
+%ADD15O,0.400000X0.950000*%
+%ADD16R,1.675000X1.675000*%
+%ADD17R,1.727200X2.032000*%
+%ADD18O,1.827200X2.132000*%
+%ADD19R,1.550000X1.300000*%
+%ADD20R,1.120000X2.440000*%
+%ADD21C,0.430000*%
+%ADD22R,2.800000X2.000000*%
+%ADD23R,2.800000X2.200000*%
+%ADD24R,2.800000X2.800000*%
+%ADD25C,1.800000*%
+%ADD26R,0.700000X1.500000*%
+%ADD27R,1.450000X0.900000*%
+%ADD28R,1.450000X2.000000*%
+%ADD29R,2.200000X1.800000*%
 %ADD30R,1.000000X0.670000*%
 %ADD31R,1.500000X0.970000*%
 %ADD32R,0.300000X1.900000*%
@@ -44,13 +44,70 @@ G04 APERTURE LIST*
 %ADD40R,2.100000X1.600000*%
 G04 APERTURE END LIST*
 D10*
+G04 #@! TO.C,U2*
+X175493000Y-82270000D03*
+X154693000Y-93330000D03*
+X155493000Y-93330000D03*
+X156293000Y-93330000D03*
+X157093000Y-93330000D03*
+X157893000Y-93330000D03*
+X158693000Y-93330000D03*
+X159493000Y-93330000D03*
+X160293000Y-93330000D03*
+X161093000Y-93330000D03*
+X161893000Y-93330000D03*
+X162693000Y-93330000D03*
+X163493000Y-93330000D03*
+X164293000Y-93330000D03*
+X165093000Y-93330000D03*
+X165893000Y-93330000D03*
+X166693000Y-93330000D03*
+X167493000Y-93330000D03*
+X168293000Y-93330000D03*
+X169093000Y-93330000D03*
+X169893000Y-93330000D03*
+X170693000Y-93330000D03*
+X171493000Y-93330000D03*
+X172293000Y-93330000D03*
+X173093000Y-93330000D03*
+X173893000Y-93330000D03*
+X174693000Y-93330000D03*
+X175493000Y-93330000D03*
+X174693000Y-82270000D03*
+X173893000Y-82270000D03*
+X173093000Y-82270000D03*
+X172293000Y-82270000D03*
+X171493000Y-82270000D03*
+X170693000Y-82270000D03*
+X169893000Y-82270000D03*
+X169093000Y-82270000D03*
+X168293000Y-82270000D03*
+X167493000Y-82270000D03*
+X166693000Y-82270000D03*
+X165893000Y-82270000D03*
+X165093000Y-82270000D03*
+X164293000Y-82270000D03*
+X163493000Y-82270000D03*
+X162693000Y-82270000D03*
+X161893000Y-82270000D03*
+X161093000Y-82270000D03*
+X160293000Y-82270000D03*
+X159493000Y-82270000D03*
+X158693000Y-82270000D03*
+X157893000Y-82270000D03*
+X157093000Y-82270000D03*
+X156293000Y-82270000D03*
+X155493000Y-82270000D03*
+X154693000Y-82270000D03*
+G04 #@! TD*
+D11*
 G04 #@! TO.C,J1*
 X97910000Y-62690000D03*
 X95370000Y-62690000D03*
-D11*
+D12*
 X97910000Y-65230000D03*
 X95370000Y-65230000D03*
-D10*
+D11*
 X97910000Y-67770000D03*
 X95370000Y-67770000D03*
 X97910000Y-70310000D03*
@@ -67,10 +124,10 @@ X97910000Y-83010000D03*
 X95370000Y-83010000D03*
 X97910000Y-85550000D03*
 X95370000Y-85550000D03*
-D11*
+D12*
 X97910000Y-88090000D03*
 X95370000Y-88090000D03*
-D10*
+D11*
 X97910000Y-90630000D03*
 X95370000Y-90630000D03*
 X97910000Y-93170000D03*
@@ -85,20 +142,20 @@ X97910000Y-103330000D03*
 X95370000Y-103330000D03*
 X97910000Y-105870000D03*
 X95370000Y-105870000D03*
-D11*
+D12*
 X97910000Y-108410000D03*
 X95370000Y-108410000D03*
-D10*
+D11*
 X97910000Y-110950000D03*
 X95370000Y-110950000D03*
 G04 #@! TD*
 G04 #@! TO.C,J2*
 X184270000Y-110950000D03*
 X186810000Y-110950000D03*
-D11*
+D12*
 X184270000Y-108410000D03*
 X186810000Y-108410000D03*
-D10*
+D11*
 X184270000Y-105870000D03*
 X186810000Y-105870000D03*
 X184270000Y-103330000D03*
@@ -115,10 +172,10 @@ X184270000Y-90630000D03*
 X186810000Y-90630000D03*
 X184270000Y-88090000D03*
 X186810000Y-88090000D03*
-D11*
+D12*
 X184270000Y-85550000D03*
 X186810000Y-85550000D03*
-D10*
+D11*
 X184270000Y-83010000D03*
 X186810000Y-83010000D03*
 X184270000Y-80470000D03*
@@ -133,14 +190,14 @@ X184270000Y-70310000D03*
 X186810000Y-70310000D03*
 X184270000Y-67770000D03*
 X186810000Y-67770000D03*
-D11*
+D12*
 X184270000Y-65230000D03*
 X186810000Y-65230000D03*
-D10*
+D11*
 X184270000Y-62690000D03*
 X186810000Y-62690000D03*
 G04 #@! TD*
-D12*
+D13*
 G04 #@! TO.C,H1*
 X102990000Y-108410000D03*
 G04 #@! TD*
@@ -153,17 +210,17 @@ G04 #@! TD*
 G04 #@! TO.C,H4*
 X102990000Y-65230000D03*
 G04 #@! TD*
-D11*
+D12*
 G04 #@! TO.C,J4*
 X140455000Y-104600000D03*
-D10*
+D11*
 X137915000Y-104600000D03*
 X140455000Y-107140000D03*
 X137915000Y-107140000D03*
 X140455000Y-109680000D03*
 X137915000Y-109680000D03*
 G04 #@! TD*
-D13*
+D14*
 G04 #@! TO.C,U8*
 X179735000Y-101655000D03*
 X179735000Y-101155000D03*
@@ -172,7 +229,7 @@ X179735000Y-100155000D03*
 X179735000Y-99655000D03*
 X179735000Y-99155000D03*
 X179735000Y-98655000D03*
-D14*
+D15*
 X178785000Y-97705000D03*
 X178285000Y-97705000D03*
 X177785000Y-97705000D03*
@@ -180,7 +237,7 @@ X177285000Y-97705000D03*
 X176785000Y-97705000D03*
 X176285000Y-97705000D03*
 X175785000Y-97705000D03*
-D13*
+D14*
 X174835000Y-98655000D03*
 X174835000Y-99155000D03*
 X174835000Y-99655000D03*
@@ -188,7 +245,7 @@ X174835000Y-100155000D03*
 X174835000Y-100655000D03*
 X174835000Y-101155000D03*
 X174835000Y-101655000D03*
-D14*
+D15*
 X175785000Y-102605000D03*
 X176285000Y-102605000D03*
 X176785000Y-102605000D03*
@@ -196,16 +253,16 @@ X177285000Y-102605000D03*
 X177785000Y-102605000D03*
 X178285000Y-102605000D03*
 X178785000Y-102605000D03*
-D15*
+D16*
 X176447500Y-99317500D03*
 X176447500Y-100992500D03*
 X178122500Y-99317500D03*
 X178122500Y-100992500D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,OLED1*
 X147440000Y-100790000D03*
-D17*
+D18*
 X144900000Y-100790000D03*
 X142360000Y-100790000D03*
 X139820000Y-100790000D03*
@@ -213,7 +270,7 @@ X137280000Y-100790000D03*
 X134740000Y-100790000D03*
 X132200000Y-100790000D03*
 G04 #@! TD*
-D18*
+D19*
 G04 #@! TO.C,BTN0*
 X175550000Y-71870000D03*
 X175550000Y-76370000D03*
@@ -256,7 +313,7 @@ X175550000Y-110660000D03*
 X167590000Y-110660000D03*
 X167590000Y-106160000D03*
 G04 #@! TD*
-D19*
+D20*
 G04 #@! TO.C,SW1*
 X156330000Y-78425000D03*
 X163950000Y-69815000D03*
@@ -267,7 +324,7 @@ X158870000Y-69815000D03*
 X163950000Y-78425000D03*
 X156330000Y-69815000D03*
 G04 #@! TD*
-D20*
+D21*
 G04 #@! TO.C,U1*
 X131680000Y-80200000D03*
 X132480000Y-80200000D03*
@@ -651,23 +708,23 @@ X142880000Y-95400000D03*
 X143680000Y-95400000D03*
 X145280000Y-95400000D03*
 G04 #@! TD*
-D21*
+D22*
 G04 #@! TO.C,AUDIO1*
 X120668000Y-62618000D03*
-D22*
-X120668000Y-65418000D03*
 D23*
+X120668000Y-65418000D03*
+D24*
 X120668000Y-74818000D03*
 X125218000Y-78918000D03*
-D22*
+D23*
 X128268000Y-67318000D03*
-D21*
+D22*
 X128268000Y-64518000D03*
-D24*
+D25*
 X124468000Y-66518000D03*
 X124468000Y-73518000D03*
 G04 #@! TD*
-D25*
+D26*
 G04 #@! TO.C,SD1*
 X118250000Y-105250000D03*
 X117150000Y-105250000D03*
@@ -677,79 +734,22 @@ X113850000Y-105250000D03*
 X112750000Y-105250000D03*
 X111650000Y-105250000D03*
 X110550000Y-105250000D03*
-D26*
+D27*
 X121925000Y-109550000D03*
 X108175000Y-97850000D03*
-D27*
+D28*
 X108175000Y-107850000D03*
 X121925000Y-107850000D03*
 X121925000Y-99550000D03*
 X108175000Y-99550000D03*
 G04 #@! TD*
-D28*
+D29*
 G04 #@! TO.C,Y1*
 X108040000Y-69220000D03*
 X102960000Y-69220000D03*
 X102960000Y-73620000D03*
 X108040000Y-73620000D03*
 G04 #@! TD*
-D29*
-G04 #@! TO.C,U2*
-X175493000Y-82270000D03*
-X154693000Y-93330000D03*
-X155493000Y-93330000D03*
-X156293000Y-93330000D03*
-X157093000Y-93330000D03*
-X157893000Y-93330000D03*
-X158693000Y-93330000D03*
-X159493000Y-93330000D03*
-X160293000Y-93330000D03*
-X161093000Y-93330000D03*
-X161893000Y-93330000D03*
-X162693000Y-93330000D03*
-X163493000Y-93330000D03*
-X164293000Y-93330000D03*
-X165093000Y-93330000D03*
-X165893000Y-93330000D03*
-X166693000Y-93330000D03*
-X167493000Y-93330000D03*
-X168293000Y-93330000D03*
-X169093000Y-93330000D03*
-X169893000Y-93330000D03*
-X170693000Y-93330000D03*
-X171493000Y-93330000D03*
-X172293000Y-93330000D03*
-X173093000Y-93330000D03*
-X173893000Y-93330000D03*
-X174693000Y-93330000D03*
-X175493000Y-93330000D03*
-X174693000Y-82270000D03*
-X173893000Y-82270000D03*
-X173093000Y-82270000D03*
-X172293000Y-82270000D03*
-X171493000Y-82270000D03*
-X170693000Y-82270000D03*
-X169893000Y-82270000D03*
-X169093000Y-82270000D03*
-X168293000Y-82270000D03*
-X167493000Y-82270000D03*
-X166693000Y-82270000D03*
-X165893000Y-82270000D03*
-X165093000Y-82270000D03*
-X164293000Y-82270000D03*
-X163493000Y-82270000D03*
-X162693000Y-82270000D03*
-X161893000Y-82270000D03*
-X161093000Y-82270000D03*
-X160293000Y-82270000D03*
-X159493000Y-82270000D03*
-X158693000Y-82270000D03*
-X157893000Y-82270000D03*
-X157093000Y-82270000D03*
-X156293000Y-82270000D03*
-X155493000Y-82270000D03*
-X154693000Y-82270000D03*
-G04 #@! TD*
 D30*
 G04 #@! TO.C,C36*
 X150361000Y-76646000D03*
diff --git a/plot/ulx3s-F.Paste.gtp b/plot/ulx3s-F.Paste.gtp
index eb43662..01559ee 100644
--- a/plot/ulx3s-F.Paste.gtp
+++ b/plot/ulx3s-F.Paste.gtp
@@ -1,29 +1,29 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-3*
-G04 #@! TF.CreationDate,2018-06-08T21:14:18+02:00*
+G04 #@! TF.CreationDate,2018-06-08T22:23:43+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+dfsg1-3) date Fri Jun  8 21:14:18 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Fri Jun  8 22:23:43 2018*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
-%ADD10O,0.850000X0.300000*%
-%ADD11O,0.300000X0.850000*%
-%ADD12R,1.675000X1.675000*%
-%ADD13R,1.550000X1.300000*%
-%ADD14C,0.350000*%
-%ADD15R,2.800000X2.000000*%
-%ADD16R,2.800000X2.200000*%
-%ADD17R,2.800000X2.800000*%
-%ADD18R,0.700000X1.500000*%
-%ADD19R,1.450000X0.900000*%
-%ADD20R,1.450000X2.000000*%
-%ADD21R,2.200000X1.800000*%
-%ADD22R,0.560000X0.900000*%
+%ADD10R,0.560000X0.900000*%
+%ADD11O,0.850000X0.300000*%
+%ADD12O,0.300000X0.850000*%
+%ADD13R,1.675000X1.675000*%
+%ADD14R,1.550000X1.300000*%
+%ADD15C,0.350000*%
+%ADD16R,2.800000X2.000000*%
+%ADD17R,2.800000X2.200000*%
+%ADD18R,2.800000X2.800000*%
+%ADD19R,0.700000X1.500000*%
+%ADD20R,1.450000X0.900000*%
+%ADD21R,1.450000X2.000000*%
+%ADD22R,2.200000X1.800000*%
 %ADD23R,1.000000X0.670000*%
 %ADD24R,1.500000X0.970000*%
 %ADD25R,0.300000X1.900000*%
@@ -34,6 +34,63 @@ G04 APERTURE LIST*
 %ADD30R,2.100000X1.600000*%
 G04 APERTURE END LIST*
 D10*
+G04 #@! TO.C,U2*
+X175493000Y-82270000D03*
+X154693000Y-93330000D03*
+X155493000Y-93330000D03*
+X156293000Y-93330000D03*
+X157093000Y-93330000D03*
+X157893000Y-93330000D03*
+X158693000Y-93330000D03*
+X159493000Y-93330000D03*
+X160293000Y-93330000D03*
+X161093000Y-93330000D03*
+X161893000Y-93330000D03*
+X162693000Y-93330000D03*
+X163493000Y-93330000D03*
+X164293000Y-93330000D03*
+X165093000Y-93330000D03*
+X165893000Y-93330000D03*
+X166693000Y-93330000D03*
+X167493000Y-93330000D03*
+X168293000Y-93330000D03*
+X169093000Y-93330000D03*
+X169893000Y-93330000D03*
+X170693000Y-93330000D03*
+X171493000Y-93330000D03*
+X172293000Y-93330000D03*
+X173093000Y-93330000D03*
+X173893000Y-93330000D03*
+X174693000Y-93330000D03*
+X175493000Y-93330000D03*
+X174693000Y-82270000D03*
+X173893000Y-82270000D03*
+X173093000Y-82270000D03*
+X172293000Y-82270000D03*
+X171493000Y-82270000D03*
+X170693000Y-82270000D03*
+X169893000Y-82270000D03*
+X169093000Y-82270000D03*
+X168293000Y-82270000D03*
+X167493000Y-82270000D03*
+X166693000Y-82270000D03*
+X165893000Y-82270000D03*
+X165093000Y-82270000D03*
+X164293000Y-82270000D03*
+X163493000Y-82270000D03*
+X162693000Y-82270000D03*
+X161893000Y-82270000D03*
+X161093000Y-82270000D03*
+X160293000Y-82270000D03*
+X159493000Y-82270000D03*
+X158693000Y-82270000D03*
+X157893000Y-82270000D03*
+X157093000Y-82270000D03*
+X156293000Y-82270000D03*
+X155493000Y-82270000D03*
+X154693000Y-82270000D03*
+G04 #@! TD*
+D11*
 G04 #@! TO.C,U8*
 X179735000Y-101655000D03*
 X179735000Y-101155000D03*
@@ -42,7 +99,7 @@ X179735000Y-100155000D03*
 X179735000Y-99655000D03*
 X179735000Y-99155000D03*
 X179735000Y-98655000D03*
-D11*
+D12*
 X178785000Y-97705000D03*
 X178285000Y-97705000D03*
 X177785000Y-97705000D03*
@@ -50,7 +107,7 @@ X177285000Y-97705000D03*
 X176785000Y-97705000D03*
 X176285000Y-97705000D03*
 X175785000Y-97705000D03*
-D10*
+D11*
 X174835000Y-98655000D03*
 X174835000Y-99155000D03*
 X174835000Y-99655000D03*
@@ -58,7 +115,7 @@ X174835000Y-100155000D03*
 X174835000Y-100655000D03*
 X174835000Y-101155000D03*
 X174835000Y-101655000D03*
-D11*
+D12*
 X175785000Y-102605000D03*
 X176285000Y-102605000D03*
 X176785000Y-102605000D03*
@@ -66,13 +123,13 @@ X177285000Y-102605000D03*
 X177785000Y-102605000D03*
 X178285000Y-102605000D03*
 X178785000Y-102605000D03*
-D12*
+D13*
 X176447500Y-99317500D03*
 X176447500Y-100992500D03*
 X178122500Y-99317500D03*
 X178122500Y-100992500D03*
 G04 #@! TD*
-D13*
+D14*
 G04 #@! TO.C,BTN0*
 X175550000Y-71870000D03*
 X175550000Y-76370000D03*
@@ -115,7 +172,7 @@ X175550000Y-110660000D03*
 X167590000Y-110660000D03*
 X167590000Y-106160000D03*
 G04 #@! TD*
-D14*
+D15*
 G04 #@! TO.C,U1*
 X131680000Y-80200000D03*
 X132480000Y-80200000D03*
@@ -499,20 +556,20 @@ X142880000Y-95400000D03*
 X143680000Y-95400000D03*
 X145280000Y-95400000D03*
 G04 #@! TD*
-D15*
+D16*
 G04 #@! TO.C,AUDIO1*
 X120668000Y-62618000D03*
-D16*
-X120668000Y-65418000D03*
 D17*
+X120668000Y-65418000D03*
+D18*
 X120668000Y-74818000D03*
 X125218000Y-78918000D03*
-D16*
+D17*
 X128268000Y-67318000D03*
-D15*
+D16*
 X128268000Y-64518000D03*
 G04 #@! TD*
-D18*
+D19*
 G04 #@! TO.C,SD1*
 X118250000Y-105250000D03*
 X117150000Y-105250000D03*
@@ -522,79 +579,22 @@ X113850000Y-105250000D03*
 X112750000Y-105250000D03*
 X111650000Y-105250000D03*
 X110550000Y-105250000D03*
-D19*
+D20*
 X121925000Y-109550000D03*
 X108175000Y-97850000D03*
-D20*
+D21*
 X108175000Y-107850000D03*
 X121925000Y-107850000D03*
 X121925000Y-99550000D03*
 X108175000Y-99550000D03*
 G04 #@! TD*
-D21*
+D22*
 G04 #@! TO.C,Y1*
 X108040000Y-69220000D03*
 X102960000Y-69220000D03*
 X102960000Y-73620000D03*
 X108040000Y-73620000D03*
 G04 #@! TD*
-D22*
-G04 #@! TO.C,U2*
-X175493000Y-82270000D03*
-X154693000Y-93330000D03*
-X155493000Y-93330000D03*
-X156293000Y-93330000D03*
-X157093000Y-93330000D03*
-X157893000Y-93330000D03*
-X158693000Y-93330000D03*
-X159493000Y-93330000D03*
-X160293000Y-93330000D03*
-X161093000Y-93330000D03*
-X161893000Y-93330000D03*
-X162693000Y-93330000D03*
-X163493000Y-93330000D03*
-X164293000Y-93330000D03*
-X165093000Y-93330000D03*
-X165893000Y-93330000D03*
-X166693000Y-93330000D03*
-X167493000Y-93330000D03*
-X168293000Y-93330000D03*
-X169093000Y-93330000D03*
-X169893000Y-93330000D03*
-X170693000Y-93330000D03*
-X171493000Y-93330000D03*
-X172293000Y-93330000D03*
-X173093000Y-93330000D03*
-X173893000Y-93330000D03*
-X174693000Y-93330000D03*
-X175493000Y-93330000D03*
-X174693000Y-82270000D03*
-X173893000Y-82270000D03*
-X173093000Y-82270000D03*
-X172293000Y-82270000D03*
-X171493000Y-82270000D03*
-X170693000Y-82270000D03*
-X169893000Y-82270000D03*
-X169093000Y-82270000D03*
-X168293000Y-82270000D03*
-X167493000Y-82270000D03*
-X166693000Y-82270000D03*
-X165893000Y-82270000D03*
-X165093000Y-82270000D03*
-X164293000Y-82270000D03*
-X163493000Y-82270000D03*
-X162693000Y-82270000D03*
-X161893000Y-82270000D03*
-X161093000Y-82270000D03*
-X160293000Y-82270000D03*
-X159493000Y-82270000D03*
-X158693000Y-82270000D03*
-X157893000Y-82270000D03*
-X157093000Y-82270000D03*
-X156293000Y-82270000D03*
-X155493000Y-82270000D03*
-X154693000Y-82270000D03*
-G04 #@! TD*
 D23*
 G04 #@! TO.C,C36*
 X150361000Y-76646000D03*
diff --git a/plot/ulx3s-F.SilkS.gto b/plot/ulx3s-F.SilkS.gto
index c80841c..6a26d4d 100644
--- a/plot/ulx3s-F.SilkS.gto
+++ b/plot/ulx3s-F.SilkS.gto
@@ -1,27 +1,36 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.0.0-rc2+dfsg1-3*
-G04 #@! TF.CreationDate,2018-06-08T21:14:18+02:00*
+G04 #@! TF.CreationDate,2018-06-08T22:23:43+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+dfsg1-3) date Fri Jun  8 21:14:18 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Fri Jun  8 22:23:43 2018*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
-%ADD10C,0.300000*%
-%ADD11C,0.200000*%
+%ADD10C,0.200000*%
+%ADD11C,0.300000*%
 %ADD12C,0.250000*%
-%ADD13C,1.000000*%
-%ADD14C,0.150000*%
+%ADD13C,0.150000*%
+%ADD14C,1.000000*%
 %ADD15C,0.120000*%
 %ADD16C,0.152400*%
 %ADD17C,0.124460*%
 %ADD18C,0.075000*%
 G04 APERTURE END LIST*
 D10*
+X153678000Y-76551000D02*
+G75*
+G03X153678000Y-76551000I-127000J0D01*
+G01*
+X179586000Y-103475000D02*
+G75*
+G03X179586000Y-103475000I-127000J0D01*
+G01*
+D11*
 X134560428Y-62144714D02*
 X134560428Y-63073285D01*
 X133989000Y-62573285D01*
@@ -189,7 +198,7 @@ X99688000Y-85042000D02*
 X99688000Y-86058000D01*
 X98926000Y-85550000D02*
 X100196000Y-85550000D01*
-D11*
+D10*
 X97910000Y-63706000D02*
 G75*
 G03X97910000Y-61674000I0J1016000D01*
@@ -351,14 +360,14 @@ X185270095Y-69111428D02*
 X186032000Y-69111428D01*
 X185651047Y-69492380D02*
 X185651047Y-68730476D01*
-D10*
+D11*
 X176420000Y-72957142D02*
 X177562857Y-72957142D01*
 X178277142Y-72957142D02*
 X179420000Y-72957142D01*
 X178848571Y-73528571D02*
 X178848571Y-72385714D01*
-D11*
+D10*
 X187826000Y-67770000D02*
 G75*
 G03X187826000Y-67770000I-1016000J0D01*
@@ -471,7 +480,7 @@ X96386000Y-67770000D02*
 G75*
 G03X96386000Y-67770000I-1016000J0D01*
 G01*
-D10*
+D11*
 X177793142Y-84800000D02*
 X177650285Y-84728571D01*
 X177436000Y-84728571D01*
@@ -541,7 +550,7 @@ X182047523Y-68222380D01*
 X182380857Y-67222380D02*
 X183047523Y-67222380D01*
 X182618952Y-68222380D01*
-D10*
+D11*
 X182492000Y-64722000D02*
 X182492000Y-65738000D01*
 X182492000Y-65230000D02*
@@ -607,7 +616,7 @@ X100513428Y-106322380D01*
 X100227714Y-106322380D01*
 X100132476Y-106274761D01*
 X100084857Y-106227142D01*
-D10*
+D11*
 X99315000Y-89808571D02*
 X100315000Y-89808571D01*
 X99672142Y-91308571D01*
@@ -729,7 +738,7 @@ X179788833Y-111815142D01*
 X180693595Y-110910380D02*
 X181026928Y-111910380D01*
 X181360261Y-110910380D01*
-D10*
+D11*
 X101199714Y-84381428D02*
 X101271142Y-84310000D01*
 X101414000Y-84238571D01*
@@ -894,7 +903,7 @@ X181523714Y-62920142D01*
 X182380857Y-62015380D02*
 X182714190Y-63015380D01*
 X183047523Y-62015380D01*
-D10*
+D11*
 X180587142Y-69631428D02*
 X180658571Y-69560000D01*
 X180801428Y-69488571D01*
@@ -1235,7 +1244,7 @@ X182587142Y-104008571D01*
 X182230000Y-104008571D01*
 X182087142Y-103937142D01*
 X182015714Y-103865714D01*
-D11*
+D10*
 X186810000Y-66500000D02*
 X186810000Y-66754000D01*
 X187826000Y-67770000D02*
@@ -1410,7 +1419,7 @@ X96386000Y-105870000D02*
 X96640000Y-105870000D01*
 X94100000Y-105870000D02*
 X94354000Y-105870000D01*
-D10*
+D11*
 X100164285Y-104008571D02*
 X99307142Y-104008571D01*
 X99735714Y-104008571D02*
@@ -1940,6 +1949,28 @@ X135827380Y-103250714D01*
 X135779761Y-103345952D01*
 X135732142Y-103393571D01*
 D13*
+G04 #@! TO.C,U2*
+X176193000Y-92880000D02*
+X175993000Y-92880000D01*
+X176193000Y-82720000D02*
+X175993000Y-82720000D01*
+X154193000Y-92880000D02*
+X154193000Y-93700000D01*
+X153993000Y-92880000D02*
+X154193000Y-92880000D01*
+X153993000Y-82720000D02*
+X154193000Y-82720000D01*
+X176203000Y-82720000D02*
+X176203000Y-92880000D01*
+X153983000Y-92880000D02*
+X153983000Y-88435000D01*
+X154044000Y-87165000D02*
+G75*
+G02X154044000Y-88435000I0J-635000D01*
+G01*
+X153983000Y-87165000D02*
+X153983000Y-82720000D01*
+D14*
 G04 #@! TO.C,fer*
 X164101000Y-65994000D02*
 X164101000Y-66594000D01*
@@ -1967,7 +1998,7 @@ X155901000Y-63394000D02*
 X157701000Y-63394000D01*
 X155901000Y-64994000D02*
 X157701000Y-64994000D01*
-D14*
+D13*
 G04 #@! TO.C,J1*
 X85270000Y-112220000D02*
 X94100000Y-112220000D01*
@@ -2520,7 +2551,7 @@ X163315000Y-72310000D02*
 X163315000Y-75930000D01*
 X163315000Y-74120000D02*
 X164585000Y-74120000D01*
-D14*
+D13*
 G04 #@! TO.C,U1*
 X130880000Y-80200000D02*
 X131080000Y-80200000D01*
@@ -2556,7 +2587,7 @@ X147080000Y-79200000D02*
 X147080000Y-96400000D01*
 X129880000Y-79200000D02*
 X147080000Y-79200000D01*
-D10*
+D11*
 G04 #@! TO.C,radiona*
 X149980000Y-94836000D02*
 X149980000Y-94136000D01*
@@ -2646,7 +2677,7 @@ G03X148980000Y-94136000I-500000J0D01*
 G01*
 X150980000Y-94836000D02*
 X148980000Y-94836000D01*
-D14*
+D13*
 G04 #@! TO.C,AUDIO1*
 X121968000Y-60418000D02*
 X121968000Y-61418000D01*
@@ -2704,26 +2735,7 @@ X106700000Y-73920000D02*
 X104300000Y-73920000D01*
 X102000000Y-70320000D02*
 X102000000Y-72520000D01*
-G04 #@! TO.C,U2*
-X176193000Y-92880000D02*
-X175993000Y-92880000D01*
-X176193000Y-82720000D02*
-X175993000Y-82720000D01*
-X155093000Y-92050000D02*
-G75*
-G03X155093000Y-92050000I-250000J0D01*
-G01*
-X154193000Y-92880000D02*
-X154193000Y-93700000D01*
-X153993000Y-92880000D02*
-X154193000Y-92880000D01*
-X153993000Y-82720000D02*
-X154193000Y-82720000D01*
-X176203000Y-82720000D02*
-X176203000Y-92880000D01*
-X153983000Y-92880000D02*
-X153983000Y-82720000D01*
-D10*
+D11*
 G04 #@! TO.C,REF\002A\002A*
 X124542000Y-89544000D02*
 X126142000Y-89544000D01*
@@ -2769,7 +2781,7 @@ X125342000Y-92944000D02*
 X127342000Y-93944000D01*
 X123342000Y-93944000D02*
 X125342000Y-92944000D01*
-D11*
+D10*
 G04 #@! TO.C,HR*
 X115000000Y-72653000D02*
 X115000000Y-73053000D01*
@@ -3124,7 +3136,7 @@ X130056000Y-73055000D02*
 X128726000Y-73055000D01*
 X128726000Y-73055000D02*
 X128726000Y-71725000D01*
-D14*
+D13*
 G04 #@! TO.C,US1*
 X107480000Y-66925000D02*
 X107480000Y-64975000D01*
@@ -3143,8 +3155,30 @@ X168050000Y-66925000D02*
 X165900000Y-66925000D01*
 X165900000Y-66925000D02*
 X165900000Y-64975000D01*
+G04 #@! TO.C,U2*
+X154338095Y-80272380D02*
+X154338095Y-81081904D01*
+X154385714Y-81177142D01*
+X154433333Y-81224761D01*
+X154528571Y-81272380D01*
+X154719047Y-81272380D01*
+X154814285Y-81224761D01*
+X154861904Y-81177142D01*
+X154909523Y-81081904D01*
+X154909523Y-80272380D01*
+X155338095Y-80367619D02*
+X155385714Y-80320000D01*
+X155480952Y-80272380D01*
+X155719047Y-80272380D01*
+X155814285Y-80320000D01*
+X155861904Y-80367619D01*
+X155909523Y-80462857D01*
+X155909523Y-80558095D01*
+X155861904Y-80700952D01*
+X155290476Y-81272380D01*
+X155909523Y-81272380D01*
 G04 #@! TO.C,J1*
-D10*
+D11*
 X103760000Y-102508571D02*
 X103760000Y-103580000D01*
 X103688571Y-103794285D01*
@@ -3177,7 +3211,7 @@ X178848571Y-70131428D01*
 X177991428Y-70988571D01*
 X178920000Y-70988571D01*
 G04 #@! TO.C,J4*
-D14*
+D13*
 X137073666Y-102274380D02*
 X137073666Y-102988666D01*
 X137026047Y-103131523D01*
@@ -3953,7 +3987,7 @@ X153868380Y-78305238D01*
 X153773142Y-78400476D01*
 X153677904Y-78448095D01*
 G04 #@! TO.C,U1*
-D14*
+D13*
 X129518095Y-77452380D02*
 X129518095Y-78261904D01*
 X129565714Y-78357142D01*
@@ -4027,7 +4061,7 @@ X120573669Y-68451521D01*
 X120660755Y-68509578D01*
 X120718812Y-68567635D01*
 X120747840Y-68625692D01*
-D14*
+D13*
 X125439878Y-75420397D02*
 X126154164Y-75420397D01*
 X126297021Y-75468016D01*
@@ -4348,7 +4382,7 @@ X117533394Y-107508824D01*
 X117561939Y-107480280D01*
 X117619028Y-107451735D01*
 G04 #@! TO.C,Y1*
-D14*
+D13*
 X110423809Y-69596190D02*
 X110423809Y-70072380D01*
 X110090476Y-69072380D02*
@@ -4361,28 +4395,6 @@ X111328571Y-69072380D01*
 X111233333Y-69215238D01*
 X111138095Y-69310476D01*
 X111042857Y-69358095D01*
-G04 #@! TO.C,U2*
-X154338095Y-80272380D02*
-X154338095Y-81081904D01*
-X154385714Y-81177142D01*
-X154433333Y-81224761D01*
-X154528571Y-81272380D01*
-X154719047Y-81272380D01*
-X154814285Y-81224761D01*
-X154861904Y-81177142D01*
-X154909523Y-81081904D01*
-X154909523Y-80272380D01*
-X155338095Y-80367619D02*
-X155385714Y-80320000D01*
-X155480952Y-80272380D01*
-X155719047Y-80272380D01*
-X155814285Y-80320000D01*
-X155861904Y-80367619D01*
-X155909523Y-80462857D01*
-X155909523Y-80558095D01*
-X155861904Y-80700952D01*
-X155290476Y-81272380D01*
-X155909523Y-81272380D01*
 G04 #@! TO.C,HR*
 D18*
 X113346428Y-73956571D02*
@@ -4525,7 +4537,7 @@ X116019047Y-69164904D01*
 X116519047Y-69379190D02*
 X116519047Y-68879190D01*
 G04 #@! TO.C,C36*
-D14*
+D13*
 X139037142Y-73957142D02*
 X138989523Y-74004761D01*
 X138846666Y-74052380D01*
diff --git a/plot/ulx3s-In1.Cu.g2 b/plot/ulx3s-In1.Cu.g2
index 7627ab4..f7896e3 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+dfsg1-3*
-G04 #@! TF.CreationDate,2018-06-08T21:14:18+02:00*
+G04 #@! TF.CreationDate,2018-06-08T22:23:42+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+dfsg1-3) date Fri Jun  8 21:14:18 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Fri Jun  8 22:23:42 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-In2.Cu.g3 b/plot/ulx3s-In2.Cu.g3
index 100857f..935e361 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+dfsg1-3*
-G04 #@! TF.CreationDate,2018-06-08T21:14:18+02:00*
+G04 #@! TF.CreationDate,2018-06-08T22:23:42+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+dfsg1-3) date Fri Jun  8 21:14:18 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Fri Jun  8 22:23:42 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-bottom.pos b/plot/ulx3s-bottom.pos
index 217b5f6..664f865 100644
--- a/plot/ulx3s-bottom.pos
+++ b/plot/ulx3s-bottom.pos
@@ -1,4 +1,4 @@
-### Module positions - created on Fri Jun  8 21:14:29 2018 ###
+### Module positions - created on Fri Jun  8 22:23:54 2018 ###
 ### Printed by Pcbnew version kicad 5.0.0-rc2+dfsg1-3
 ## Unit = inches, Angle = deg.
 ## Side : bottom
diff --git a/plot/ulx3s-drl_map.gbr b/plot/ulx3s-drl_map.gbr
index 753fffd..c913b9c 100644
--- 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 5.0.0-rc2+dfsg1-3) date Fri Jun  8 21:14:14 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Fri Jun  8 22:23:39 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -1840,6 +1840,60 @@ X13513600Y-7122500D02*
 X13513600Y-7222500D01*
 X13463600Y-7172500D02*
 X13563600Y-7172500D01*
+X13740700Y-10409200D02*
+X13842300Y-10510800D01*
+X13842300Y-10409200D02*
+X13740700Y-10510800D01*
+X13827421Y-10495921D02*
+X13827421Y-10424079D01*
+X13755579Y-10424079D01*
+X13755579Y-10495921D01*
+X13827421Y-10495921D01*
+X13740700Y-10663200D02*
+X13842300Y-10764800D01*
+X13842300Y-10663200D02*
+X13740700Y-10764800D01*
+X13827421Y-10749921D02*
+X13827421Y-10678079D01*
+X13755579Y-10678079D01*
+X13755579Y-10749921D01*
+X13827421Y-10749921D01*
+X13740700Y-10917200D02*
+X13842300Y-11018800D01*
+X13842300Y-10917200D02*
+X13740700Y-11018800D01*
+X13827421Y-11003921D02*
+X13827421Y-10932079D01*
+X13755579Y-10932079D01*
+X13755579Y-11003921D01*
+X13827421Y-11003921D01*
+X13994700Y-10409200D02*
+X14096300Y-10510800D01*
+X14096300Y-10409200D02*
+X13994700Y-10510800D01*
+X14081421Y-10495921D02*
+X14081421Y-10424079D01*
+X14009579Y-10424079D01*
+X14009579Y-10495921D01*
+X14081421Y-10495921D01*
+X13994700Y-10663200D02*
+X14096300Y-10764800D01*
+X14096300Y-10663200D02*
+X13994700Y-10764800D01*
+X14081421Y-10749921D02*
+X14081421Y-10678079D01*
+X14009579Y-10678079D01*
+X14009579Y-10749921D01*
+X14081421Y-10749921D01*
+X13994700Y-10917200D02*
+X14096300Y-11018800D01*
+X14096300Y-10917200D02*
+X13994700Y-11018800D01*
+X14081421Y-11003921D02*
+X14081421Y-10932079D01*
+X14009579Y-10932079D01*
+X14009579Y-11003921D01*
+X14081421Y-11003921D01*
 X18376200Y-6218200D02*
 X18477800Y-6319800D01*
 X18477800Y-6218200D02*
@@ -2200,60 +2254,6 @@ X18716921Y-11059079D01*
 X18645079Y-11059079D01*
 X18645079Y-11130921D01*
 X18716921Y-11130921D01*
-X13740700Y-10409200D02*
-X13842300Y-10510800D01*
-X13842300Y-10409200D02*
-X13740700Y-10510800D01*
-X13827421Y-10495921D02*
-X13827421Y-10424079D01*
-X13755579Y-10424079D01*
-X13755579Y-10495921D01*
-X13827421Y-10495921D01*
-X13740700Y-10663200D02*
-X13842300Y-10764800D01*
-X13842300Y-10663200D02*
-X13740700Y-10764800D01*
-X13827421Y-10749921D02*
-X13827421Y-10678079D01*
-X13755579Y-10678079D01*
-X13755579Y-10749921D01*
-X13827421Y-10749921D01*
-X13740700Y-10917200D02*
-X13842300Y-11018800D01*
-X13842300Y-10917200D02*
-X13740700Y-11018800D01*
-X13827421Y-11003921D02*
-X13827421Y-10932079D01*
-X13755579Y-10932079D01*
-X13755579Y-11003921D01*
-X13827421Y-11003921D01*
-X13994700Y-10409200D02*
-X14096300Y-10510800D01*
-X14096300Y-10409200D02*
-X13994700Y-10510800D01*
-X14081421Y-10495921D02*
-X14081421Y-10424079D01*
-X14009579Y-10424079D01*
-X14009579Y-10495921D01*
-X14081421Y-10495921D01*
-X13994700Y-10663200D02*
-X14096300Y-10764800D01*
-X14096300Y-10663200D02*
-X13994700Y-10764800D01*
-X14081421Y-10749921D02*
-X14081421Y-10678079D01*
-X14009579Y-10678079D01*
-X14009579Y-10749921D01*
-X14081421Y-10749921D01*
-X13994700Y-10917200D02*
-X14096300Y-11018800D01*
-X14096300Y-10917200D02*
-X13994700Y-11018800D01*
-X14081421Y-11003921D02*
-X14081421Y-10932079D01*
-X14009579Y-10932079D01*
-X14009579Y-11003921D01*
-X14081421Y-11003921D01*
 X9486200Y-6218200D02*
 X9587800Y-6319800D01*
 X9587800Y-6218200D02*
@@ -2713,14 +2713,6 @@ X15379600Y-6441200D01*
 X15314600Y-6376200D01*
 X15249600Y-6441200D01*
 X15314600Y-6506200D01*
-X17919000Y-10681000D02*
-X17919000Y-11001000D01*
-X17759000Y-10841000D02*
-X18079000Y-10841000D01*
-X18079000Y-10841000D02*
-G75*
-G03X18079000Y-10841000I-160000J0D01*
-G01*
 X10299000Y-6363000D02*
 X10299000Y-6683000D01*
 X10139000Y-6523000D02*
@@ -2729,6 +2721,14 @@ X10459000Y-6523000D02*
 G75*
 G03X10459000Y-6523000I-160000J0D01*
 G01*
+X17919000Y-10681000D02*
+X17919000Y-11001000D01*
+X17759000Y-10841000D02*
+X18079000Y-10841000D01*
+X18079000Y-10841000D02*
+G75*
+G03X18079000Y-10841000I-160000J0D01*
+G01*
 X17919000Y-6363000D02*
 X17919000Y-6683000D01*
 X17759000Y-6523000D02*
diff --git a/plot/ulx3s-top.pos b/plot/ulx3s-top.pos
index 8d3990f..44a87f5 100644
--- a/plot/ulx3s-top.pos
+++ b/plot/ulx3s-top.pos
@@ -1,4 +1,4 @@
-### Module positions - created on Fri Jun  8 21:14:29 2018 ###
+### Module positions - created on Fri Jun  8 22:23:53 2018 ###
 ### Printed by Pcbnew version kicad 5.0.0-rc2+dfsg1-3
 ## Unit = inches, Angle = deg.
 ## Side : top
diff --git a/plot/ulx3s.drl b/plot/ulx3s.drl
index 4188e2e..dd567ad 100644
--- a/plot/ulx3s.drl
+++ b/plot/ulx3s.drl
@@ -1,5 +1,5 @@
 M48
-;DRILL file {KiCad 5.0.0-rc2+dfsg1-3} date Fri Jun  8 21:14:14 2018
+;DRILL file {KiCad 5.0.0-rc2+dfsg1-3} date Fri Jun  8 22:23:38 2018
 ;FORMAT={-:-/ absolute / inch / decimal}
 FMAT,2
 INCH,TZ
@@ -453,6 +453,12 @@ X5.1203Y-2.8238
 X5.2203Y-2.8238
 X5.3203Y-2.8238
 T8
+X5.4297Y-4.1181
+X5.4297Y-4.2181
+X5.4297Y-4.3181
+X5.5297Y-4.1181
+X5.5297Y-4.2181
+X5.5297Y-4.3181
 X7.2547Y-2.4681
 X7.2547Y-2.5681
 X7.2547Y-2.6681
@@ -493,12 +499,6 @@ X7.3547Y-4.0681
 X7.3547Y-4.1681
 X7.3547Y-4.2681
 X7.3547Y-4.3681
-X5.4297Y-4.1181
-X5.4297Y-4.2181
-X5.4297Y-4.3181
-X5.5297Y-4.1181
-X5.5297Y-4.2181
-X5.5297Y-4.3181
 X3.7547Y-2.4681
 X3.7547Y-2.5681
 X3.7547Y-2.6681
@@ -552,8 +552,8 @@ X5.4349Y-2.7288
 X6.0057Y-2.7288
 X6.0294Y-2.5359
 T10
-X7.0547Y-4.2681
 X4.0547Y-2.5681
+X7.0547Y-4.2681
 X7.0547Y-2.5681
 X4.0547Y-4.2681
 T11