diff --git a/plot/ulx3s-B.Cu.gbl b/plot/ulx3s-B.Cu.gbl
index 20d40c0..5e9e1bd 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-2*
-G04 #@! TF.CreationDate,2018-06-07T21:01:42+02:00*
+G04 #@! TF.CreationDate,2018-06-07T22:26:40+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-2) date Thu Jun  7 21:01:42 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Thu Jun  7 22:26:40 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-B.Mask.gbs b/plot/ulx3s-B.Mask.gbs
index c0926ec..a1c191e 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-2*
-G04 #@! TF.CreationDate,2018-06-07T21:01:42+02:00*
+G04 #@! TF.CreationDate,2018-06-07T22:26:40+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-2) date Thu Jun  7 21:01:42 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Thu Jun  7 22:26:40 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-B.Paste.gbp b/plot/ulx3s-B.Paste.gbp
index c5db866..92122eb 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-2*
-G04 #@! TF.CreationDate,2018-06-07T21:01:42+02:00*
+G04 #@! TF.CreationDate,2018-06-07T22:26:40+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-2) date Thu Jun  7 21:01:42 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Thu Jun  7 22:26:40 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-B.SilkS.gbo b/plot/ulx3s-B.SilkS.gbo
index b693ac2..22b224c 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-2*
-G04 #@! TF.CreationDate,2018-06-07T21:01:42+02:00*
+G04 #@! TF.CreationDate,2018-06-07T22:26:40+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-2) date Thu Jun  7 21:01:42 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Thu Jun  7 22:26:40 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-Edge.Cuts.gm1 b/plot/ulx3s-Edge.Cuts.gm1
index 623ca0f..1a76cd1 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-2*
-G04 #@! TF.CreationDate,2018-06-07T21:01:42+02:00*
+G04 #@! TF.CreationDate,2018-06-07T22:26:40+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-2) date Thu Jun  7 21:01:42 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Thu Jun  7 22:26:40 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Cu.gtl b/plot/ulx3s-F.Cu.gtl
index 2343f71..eb60525 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+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-07T21:01:41+02:00*
+G04 #@! TF.CreationDate,2018-06-07T22:26:40+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-2) date Thu Jun  7 21:01:41 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Thu Jun  7 22:26:40 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -90,16 +90,16 @@ G04 #@! TA.AperFunction,SMDPad,CuDef*
 %ADD35R,1.295000X1.400000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD36R,2.100000X1.600000*%
+%ADD36R,1.800000X1.900000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD37R,1.900000X1.900000*%
+%ADD37R,0.400000X1.350000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD38R,0.400000X1.350000*%
+%ADD38R,1.900000X1.900000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD39R,1.800000X1.900000*%
+%ADD39R,2.100000X1.600000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
 %ADD40C,0.400000*%
@@ -2269,59 +2269,59 @@ G04 #@! TD*
 D36*
 G04 #@! TO.P,US1,6*
 G04 #@! TO.N,GND*
-X114980000Y-65875000D03*
-X108780000Y-65875000D03*
+X108080000Y-63325000D03*
+X115680000Y-63325000D03*
 D37*
-X113080000Y-63325000D03*
-X110680000Y-63325000D03*
-D38*
-G04 #@! TO.P,US1,1*
-G04 #@! TO.N,USB5V*
-X113180000Y-66000000D03*
-G04 #@! TO.P,US1,2*
-G04 #@! TO.N,/usb/FTD-*
-X112530000Y-66000000D03*
-G04 #@! TO.P,US1,3*
-G04 #@! TO.N,/usb/FTD+*
-X111880000Y-66000000D03*
+G04 #@! TO.P,US1,5*
+X110580000Y-66000000D03*
 G04 #@! TO.P,US1,4*
 G04 #@! TO.N,Net-(US1-Pad4)*
 X111230000Y-66000000D03*
-G04 #@! TO.P,US1,5*
+G04 #@! TO.P,US1,3*
+G04 #@! TO.N,/usb/FTD+*
+X111880000Y-66000000D03*
+G04 #@! TO.P,US1,2*
+G04 #@! TO.N,/usb/FTD-*
+X112530000Y-66000000D03*
+G04 #@! TO.P,US1,1*
+G04 #@! TO.N,USB5V*
+X113180000Y-66000000D03*
+D38*
+G04 #@! TO.P,US1,6*
 G04 #@! TO.N,GND*
-X110580000Y-66000000D03*
+X110680000Y-63325000D03*
+X113080000Y-63325000D03*
 D39*
-G04 #@! TO.P,US1,6*
-X115680000Y-63325000D03*
-X108080000Y-63325000D03*
+X108780000Y-65875000D03*
+X114980000Y-65875000D03*
 G04 #@! TD*
 G04 #@! TO.P,US2,6*
 G04 #@! TO.N,GND*
-X166500000Y-63325000D03*
-X174100000Y-63325000D03*
+X173400000Y-65875000D03*
+X167200000Y-65875000D03*
 D38*
-G04 #@! TO.P,US2,5*
-X169000000Y-66000000D03*
-G04 #@! TO.P,US2,4*
-G04 #@! TO.N,Net-(US2-Pad4)*
-X169650000Y-66000000D03*
-G04 #@! TO.P,US2,3*
-G04 #@! TO.N,/usb/FPD+*
-X170300000Y-66000000D03*
-G04 #@! TO.P,US2,2*
-G04 #@! TO.N,/usb/FPD-*
-X170950000Y-66000000D03*
+X171500000Y-63325000D03*
+X169100000Y-63325000D03*
+D37*
 G04 #@! TO.P,US2,1*
 G04 #@! TO.N,/usb/US2VBUS*
 X171600000Y-66000000D03*
-D37*
-G04 #@! TO.P,US2,6*
+G04 #@! TO.P,US2,2*
+G04 #@! TO.N,/usb/FPD-*
+X170950000Y-66000000D03*
+G04 #@! TO.P,US2,3*
+G04 #@! TO.N,/usb/FPD+*
+X170300000Y-66000000D03*
+G04 #@! TO.P,US2,4*
+G04 #@! TO.N,Net-(US2-Pad4)*
+X169650000Y-66000000D03*
+G04 #@! TO.P,US2,5*
 G04 #@! TO.N,GND*
-X169100000Y-63325000D03*
-X171500000Y-63325000D03*
+X169000000Y-66000000D03*
 D36*
-X167200000Y-65875000D03*
-X173400000Y-65875000D03*
+G04 #@! TO.P,US2,6*
+X174100000Y-63325000D03*
+X166500000Y-63325000D03*
 G04 #@! TD*
 D40*
 G04 #@! TO.N,*
diff --git a/plot/ulx3s-F.Mask.gts b/plot/ulx3s-F.Mask.gts
index f318a13..cfee892 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+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-07T21:01:42+02:00*
+G04 #@! TF.CreationDate,2018-06-07T22:26:40+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-2) date Thu Jun  7 21:01:42 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Thu Jun  7 22:26:40 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -38,10 +38,10 @@ G04 APERTURE LIST*
 %ADD34R,1.700000X1.700000*%
 %ADD35O,1.800000X1.800000*%
 %ADD36R,1.295000X1.400000*%
-%ADD37R,2.100000X1.600000*%
-%ADD38R,1.900000X1.900000*%
-%ADD39R,0.400000X1.350000*%
-%ADD40R,1.800000X1.900000*%
+%ADD37R,1.800000X1.900000*%
+%ADD38R,0.400000X1.350000*%
+%ADD39R,1.900000X1.900000*%
+%ADD40R,2.100000X1.600000*%
 G04 APERTURE END LIST*
 D10*
 G04 #@! TO.C,J1*
@@ -932,35 +932,35 @@ X135166000Y-69566000D03*
 G04 #@! TD*
 D37*
 G04 #@! TO.C,US1*
-X114980000Y-65875000D03*
-X108780000Y-65875000D03*
+X108080000Y-63325000D03*
+X115680000Y-63325000D03*
 D38*
-X113080000Y-63325000D03*
-X110680000Y-63325000D03*
-D39*
-X113180000Y-66000000D03*
-X112530000Y-66000000D03*
-X111880000Y-66000000D03*
-X111230000Y-66000000D03*
 X110580000Y-66000000D03*
+X111230000Y-66000000D03*
+X111880000Y-66000000D03*
+X112530000Y-66000000D03*
+X113180000Y-66000000D03*
+D39*
+X110680000Y-63325000D03*
+X113080000Y-63325000D03*
 D40*
-X115680000Y-63325000D03*
-X108080000Y-63325000D03*
+X108780000Y-65875000D03*
+X114980000Y-65875000D03*
 G04 #@! TD*
 G04 #@! TO.C,US2*
-X166500000Y-63325000D03*
-X174100000Y-63325000D03*
+X173400000Y-65875000D03*
+X167200000Y-65875000D03*
 D39*
-X169000000Y-66000000D03*
-X169650000Y-66000000D03*
-X170300000Y-66000000D03*
-X170950000Y-66000000D03*
-X171600000Y-66000000D03*
-D38*
-X169100000Y-63325000D03*
 X171500000Y-63325000D03*
+X169100000Y-63325000D03*
+D38*
+X171600000Y-66000000D03*
+X170950000Y-66000000D03*
+X170300000Y-66000000D03*
+X169650000Y-66000000D03*
+X169000000Y-66000000D03*
 D37*
-X167200000Y-65875000D03*
-X173400000Y-65875000D03*
+X174100000Y-63325000D03*
+X166500000Y-63325000D03*
 G04 #@! TD*
 M02*
diff --git a/plot/ulx3s-F.Paste.gtp b/plot/ulx3s-F.Paste.gtp
index a1cf6c5..7289747 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+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-07T21:01:42+02:00*
+G04 #@! TF.CreationDate,2018-06-07T22:26:40+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-2) date Thu Jun  7 21:01:42 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Thu Jun  7 22:26:40 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -28,10 +28,10 @@ G04 APERTURE LIST*
 %ADD24R,1.500000X0.970000*%
 %ADD25R,0.300000X1.900000*%
 %ADD26R,1.295000X1.400000*%
-%ADD27R,2.100000X1.600000*%
-%ADD28R,1.900000X1.900000*%
-%ADD29R,0.400000X1.350000*%
-%ADD30R,1.800000X1.900000*%
+%ADD27R,1.800000X1.900000*%
+%ADD28R,0.400000X1.350000*%
+%ADD29R,1.900000X1.900000*%
+%ADD30R,2.100000X1.600000*%
 G04 APERTURE END LIST*
 D10*
 G04 #@! TO.C,U8*
@@ -759,35 +759,35 @@ X135166000Y-69566000D03*
 G04 #@! TD*
 D27*
 G04 #@! TO.C,US1*
-X114980000Y-65875000D03*
-X108780000Y-65875000D03*
+X108080000Y-63325000D03*
+X115680000Y-63325000D03*
 D28*
-X113080000Y-63325000D03*
-X110680000Y-63325000D03*
-D29*
-X113180000Y-66000000D03*
-X112530000Y-66000000D03*
-X111880000Y-66000000D03*
-X111230000Y-66000000D03*
 X110580000Y-66000000D03*
+X111230000Y-66000000D03*
+X111880000Y-66000000D03*
+X112530000Y-66000000D03*
+X113180000Y-66000000D03*
+D29*
+X110680000Y-63325000D03*
+X113080000Y-63325000D03*
 D30*
-X115680000Y-63325000D03*
-X108080000Y-63325000D03*
+X108780000Y-65875000D03*
+X114980000Y-65875000D03*
 G04 #@! TD*
 G04 #@! TO.C,US2*
-X166500000Y-63325000D03*
-X174100000Y-63325000D03*
+X173400000Y-65875000D03*
+X167200000Y-65875000D03*
 D29*
-X169000000Y-66000000D03*
-X169650000Y-66000000D03*
-X170300000Y-66000000D03*
-X170950000Y-66000000D03*
-X171600000Y-66000000D03*
-D28*
-X169100000Y-63325000D03*
 X171500000Y-63325000D03*
+X169100000Y-63325000D03*
+D28*
+X171600000Y-66000000D03*
+X170950000Y-66000000D03*
+X170300000Y-66000000D03*
+X169650000Y-66000000D03*
+X169000000Y-66000000D03*
 D27*
-X167200000Y-65875000D03*
-X173400000Y-65875000D03*
+X174100000Y-63325000D03*
+X166500000Y-63325000D03*
 G04 #@! TD*
 M02*
diff --git a/plot/ulx3s-F.SilkS.gto b/plot/ulx3s-F.SilkS.gto
index 120fef1..8d8e1ee 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+dfsg1-2*
-G04 #@! TF.CreationDate,2018-06-07T21:01:42+02:00*
+G04 #@! TF.CreationDate,2018-06-07T22:26:40+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-2) date Thu Jun  7 21:01:42 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Thu Jun  7 22:26:40 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -3140,23 +3140,23 @@ X128726000Y-73055000D02*
 X128726000Y-71725000D01*
 D13*
 G04 #@! TO.C,US1*
-X116280000Y-64925000D02*
-X116280000Y-66925000D01*
-X116280000Y-66925000D02*
-X114130000Y-66925000D01*
-X109630000Y-66925000D02*
-X107480000Y-66925000D01*
 X107480000Y-66925000D02*
 X107480000Y-64975000D01*
+X109630000Y-66925000D02*
+X107480000Y-66925000D01*
+X116280000Y-66925000D02*
+X114130000Y-66925000D01*
+X116280000Y-64925000D02*
+X116280000Y-66925000D01*
 G04 #@! TO.C,US2*
-X165900000Y-66925000D02*
-X165900000Y-64975000D01*
-X168050000Y-66925000D02*
-X165900000Y-66925000D01*
-X174700000Y-66925000D02*
-X172550000Y-66925000D01*
 X174700000Y-64925000D02*
 X174700000Y-66925000D01*
+X174700000Y-66925000D02*
+X172550000Y-66925000D01*
+X168050000Y-66925000D02*
+X165900000Y-66925000D01*
+X165900000Y-66925000D02*
+X165900000Y-64975000D01*
 G04 #@! TO.C,J1*
 D10*
 X103760000Y-102508571D02*
diff --git a/plot/ulx3s-In1.Cu.g2 b/plot/ulx3s-In1.Cu.g2
index b26b05b..c2fda1c 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-2*
-G04 #@! TF.CreationDate,2018-06-07T21:01:41+02:00*
+G04 #@! TF.CreationDate,2018-06-07T22:26:40+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-2) date Thu Jun  7 21:01:41 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Thu Jun  7 22:26:40 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-In2.Cu.g3 b/plot/ulx3s-In2.Cu.g3
index 64319f0..e61faf2 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-2*
-G04 #@! TF.CreationDate,2018-06-07T21:01:41+02:00*
+G04 #@! TF.CreationDate,2018-06-07T22:26:40+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-2) date Thu Jun  7 21:01:41 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Thu Jun  7 22:26:40 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-bottom.pos b/plot/ulx3s-bottom.pos
index b766c91..a806cb5 100644
--- a/plot/ulx3s-bottom.pos
+++ b/plot/ulx3s-bottom.pos
@@ -1,4 +1,4 @@
-### Module positions - created on Thu Jun  7 21:01:52 2018 ###
+### Module positions - created on Thu Jun  7 22:26:47 2018 ###
 ### Printed by Pcbnew version kicad 5.0.0-rc2+dfsg1-2
 ## Unit = inches, Angle = deg.
 ## Side : bottom
diff --git a/plot/ulx3s-drl_map.gbr b/plot/ulx3s-drl_map.gbr
index 67ab421..7892b77 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-2) date Thu Jun  7 21:01:34 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-2) date Thu Jun  7 22:26:36 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -1840,429 +1840,60 @@ X13513600Y-7122500D02*
 X13513600Y-7222500D01*
 X13463600Y-7172500D02*
 X13563600Y-7172500D01*
-X13169200Y-10028200D02*
-X13270800Y-10129800D01*
-X13270800Y-10028200D02*
-X13169200Y-10129800D01*
-X13255921Y-10114921D02*
-X13255921Y-10043079D01*
-X13184079Y-10043079D01*
-X13184079Y-10114921D01*
-X13255921Y-10114921D01*
-X13423200Y-10028200D02*
-X13524800Y-10129800D01*
-X13524800Y-10028200D02*
-X13423200Y-10129800D01*
-X13509921Y-10114921D02*
-X13509921Y-10043079D01*
-X13438079Y-10043079D01*
-X13438079Y-10114921D01*
-X13509921Y-10114921D01*
-X13677200Y-10028200D02*
-X13778800Y-10129800D01*
-X13778800Y-10028200D02*
-X13677200Y-10129800D01*
-X13763921Y-10114921D02*
-X13763921Y-10043079D01*
-X13692079Y-10043079D01*
-X13692079Y-10114921D01*
-X13763921Y-10114921D01*
-X13931200Y-10028200D02*
-X14032800Y-10129800D01*
-X14032800Y-10028200D02*
-X13931200Y-10129800D01*
-X14017921Y-10114921D02*
-X14017921Y-10043079D01*
-X13946079Y-10043079D01*
-X13946079Y-10114921D01*
-X14017921Y-10114921D01*
-X14185200Y-10028200D02*
-X14286800Y-10129800D01*
-X14286800Y-10028200D02*
-X14185200Y-10129800D01*
-X14271921Y-10114921D02*
-X14271921Y-10043079D01*
-X14200079Y-10043079D01*
-X14200079Y-10114921D01*
-X14271921Y-10114921D01*
-X14439200Y-10028200D02*
-X14540800Y-10129800D01*
-X14540800Y-10028200D02*
-X14439200Y-10129800D01*
-X14525921Y-10114921D02*
-X14525921Y-10043079D01*
-X14454079Y-10043079D01*
-X14454079Y-10114921D01*
-X14525921Y-10114921D01*
-X14693200Y-10028200D02*
-X14794800Y-10129800D01*
-X14794800Y-10028200D02*
-X14693200Y-10129800D01*
-X14779921Y-10114921D02*
-X14779921Y-10043079D01*
-X14708079Y-10043079D01*
-X14708079Y-10114921D01*
-X14779921Y-10114921D01*
-X18376200Y-6218200D02*
-X18477800Y-6319800D01*
-X18477800Y-6218200D02*
-X18376200Y-6319800D01*
-X18462921Y-6304921D02*
-X18462921Y-6233079D01*
-X18391079Y-6233079D01*
-X18391079Y-6304921D01*
-X18462921Y-6304921D01*
-X18376200Y-6472200D02*
-X18477800Y-6573800D01*
-X18477800Y-6472200D02*
-X18376200Y-6573800D01*
-X18462921Y-6558921D02*
-X18462921Y-6487079D01*
-X18391079Y-6487079D01*
-X18391079Y-6558921D01*
-X18462921Y-6558921D01*
-X18376200Y-6726200D02*
-X18477800Y-6827800D01*
-X18477800Y-6726200D02*
-X18376200Y-6827800D01*
-X18462921Y-6812921D02*
-X18462921Y-6741079D01*
-X18391079Y-6741079D01*
-X18391079Y-6812921D01*
-X18462921Y-6812921D01*
-X18376200Y-6980200D02*
-X18477800Y-7081800D01*
-X18477800Y-6980200D02*
-X18376200Y-7081800D01*
-X18462921Y-7066921D02*
-X18462921Y-6995079D01*
-X18391079Y-6995079D01*
-X18391079Y-7066921D01*
-X18462921Y-7066921D01*
-X18376200Y-7234200D02*
-X18477800Y-7335800D01*
-X18477800Y-7234200D02*
-X18376200Y-7335800D01*
-X18462921Y-7320921D02*
-X18462921Y-7249079D01*
-X18391079Y-7249079D01*
-X18391079Y-7320921D01*
-X18462921Y-7320921D01*
-X18376200Y-7488200D02*
-X18477800Y-7589800D01*
-X18477800Y-7488200D02*
-X18376200Y-7589800D01*
-X18462921Y-7574921D02*
-X18462921Y-7503079D01*
-X18391079Y-7503079D01*
-X18391079Y-7574921D01*
-X18462921Y-7574921D01*
-X18376200Y-7742200D02*
-X18477800Y-7843800D01*
-X18477800Y-7742200D02*
-X18376200Y-7843800D01*
-X18462921Y-7828921D02*
-X18462921Y-7757079D01*
-X18391079Y-7757079D01*
-X18391079Y-7828921D01*
-X18462921Y-7828921D01*
-X18376200Y-7996200D02*
-X18477800Y-8097800D01*
-X18477800Y-7996200D02*
-X18376200Y-8097800D01*
-X18462921Y-8082921D02*
-X18462921Y-8011079D01*
-X18391079Y-8011079D01*
-X18391079Y-8082921D01*
-X18462921Y-8082921D01*
-X18376200Y-8250200D02*
-X18477800Y-8351800D01*
-X18477800Y-8250200D02*
-X18376200Y-8351800D01*
-X18462921Y-8336921D02*
-X18462921Y-8265079D01*
-X18391079Y-8265079D01*
-X18391079Y-8336921D01*
-X18462921Y-8336921D01*
-X18376200Y-8504200D02*
-X18477800Y-8605800D01*
-X18477800Y-8504200D02*
-X18376200Y-8605800D01*
-X18462921Y-8590921D02*
-X18462921Y-8519079D01*
-X18391079Y-8519079D01*
-X18391079Y-8590921D01*
-X18462921Y-8590921D01*
-X18376200Y-8758200D02*
-X18477800Y-8859800D01*
-X18477800Y-8758200D02*
-X18376200Y-8859800D01*
-X18462921Y-8844921D02*
-X18462921Y-8773079D01*
-X18391079Y-8773079D01*
-X18391079Y-8844921D01*
-X18462921Y-8844921D01*
-X18376200Y-9012200D02*
-X18477800Y-9113800D01*
-X18477800Y-9012200D02*
-X18376200Y-9113800D01*
-X18462921Y-9098921D02*
-X18462921Y-9027079D01*
-X18391079Y-9027079D01*
-X18391079Y-9098921D01*
-X18462921Y-9098921D01*
-X18376200Y-9266200D02*
-X18477800Y-9367800D01*
-X18477800Y-9266200D02*
-X18376200Y-9367800D01*
-X18462921Y-9352921D02*
-X18462921Y-9281079D01*
-X18391079Y-9281079D01*
-X18391079Y-9352921D01*
-X18462921Y-9352921D01*
-X18376200Y-9520200D02*
-X18477800Y-9621800D01*
-X18477800Y-9520200D02*
-X18376200Y-9621800D01*
-X18462921Y-9606921D02*
-X18462921Y-9535079D01*
-X18391079Y-9535079D01*
-X18391079Y-9606921D01*
-X18462921Y-9606921D01*
-X18376200Y-9774200D02*
-X18477800Y-9875800D01*
-X18477800Y-9774200D02*
-X18376200Y-9875800D01*
-X18462921Y-9860921D02*
-X18462921Y-9789079D01*
-X18391079Y-9789079D01*
-X18391079Y-9860921D01*
-X18462921Y-9860921D01*
-X18376200Y-10028200D02*
-X18477800Y-10129800D01*
-X18477800Y-10028200D02*
-X18376200Y-10129800D01*
-X18462921Y-10114921D02*
-X18462921Y-10043079D01*
-X18391079Y-10043079D01*
-X18391079Y-10114921D01*
-X18462921Y-10114921D01*
-X18376200Y-10282200D02*
-X18477800Y-10383800D01*
-X18477800Y-10282200D02*
-X18376200Y-10383800D01*
-X18462921Y-10368921D02*
-X18462921Y-10297079D01*
-X18391079Y-10297079D01*
-X18391079Y-10368921D01*
-X18462921Y-10368921D01*
-X18376200Y-10536200D02*
-X18477800Y-10637800D01*
-X18477800Y-10536200D02*
-X18376200Y-10637800D01*
-X18462921Y-10622921D02*
-X18462921Y-10551079D01*
-X18391079Y-10551079D01*
-X18391079Y-10622921D01*
-X18462921Y-10622921D01*
-X18376200Y-10790200D02*
-X18477800Y-10891800D01*
-X18477800Y-10790200D02*
-X18376200Y-10891800D01*
-X18462921Y-10876921D02*
-X18462921Y-10805079D01*
-X18391079Y-10805079D01*
-X18391079Y-10876921D01*
-X18462921Y-10876921D01*
-X18376200Y-11044200D02*
-X18477800Y-11145800D01*
-X18477800Y-11044200D02*
-X18376200Y-11145800D01*
-X18462921Y-11130921D02*
-X18462921Y-11059079D01*
-X18391079Y-11059079D01*
-X18391079Y-11130921D01*
-X18462921Y-11130921D01*
-X18630200Y-6218200D02*
-X18731800Y-6319800D01*
-X18731800Y-6218200D02*
-X18630200Y-6319800D01*
-X18716921Y-6304921D02*
-X18716921Y-6233079D01*
-X18645079Y-6233079D01*
-X18645079Y-6304921D01*
-X18716921Y-6304921D01*
-X18630200Y-6472200D02*
-X18731800Y-6573800D01*
-X18731800Y-6472200D02*
-X18630200Y-6573800D01*
-X18716921Y-6558921D02*
-X18716921Y-6487079D01*
-X18645079Y-6487079D01*
-X18645079Y-6558921D01*
-X18716921Y-6558921D01*
-X18630200Y-6726200D02*
-X18731800Y-6827800D01*
-X18731800Y-6726200D02*
-X18630200Y-6827800D01*
-X18716921Y-6812921D02*
-X18716921Y-6741079D01*
-X18645079Y-6741079D01*
-X18645079Y-6812921D01*
-X18716921Y-6812921D01*
-X18630200Y-6980200D02*
-X18731800Y-7081800D01*
-X18731800Y-6980200D02*
-X18630200Y-7081800D01*
-X18716921Y-7066921D02*
-X18716921Y-6995079D01*
-X18645079Y-6995079D01*
-X18645079Y-7066921D01*
-X18716921Y-7066921D01*
-X18630200Y-7234200D02*
-X18731800Y-7335800D01*
-X18731800Y-7234200D02*
-X18630200Y-7335800D01*
-X18716921Y-7320921D02*
-X18716921Y-7249079D01*
-X18645079Y-7249079D01*
-X18645079Y-7320921D01*
-X18716921Y-7320921D01*
-X18630200Y-7488200D02*
-X18731800Y-7589800D01*
-X18731800Y-7488200D02*
-X18630200Y-7589800D01*
-X18716921Y-7574921D02*
-X18716921Y-7503079D01*
-X18645079Y-7503079D01*
-X18645079Y-7574921D01*
-X18716921Y-7574921D01*
-X18630200Y-7742200D02*
-X18731800Y-7843800D01*
-X18731800Y-7742200D02*
-X18630200Y-7843800D01*
-X18716921Y-7828921D02*
-X18716921Y-7757079D01*
-X18645079Y-7757079D01*
-X18645079Y-7828921D01*
-X18716921Y-7828921D01*
-X18630200Y-7996200D02*
-X18731800Y-8097800D01*
-X18731800Y-7996200D02*
-X18630200Y-8097800D01*
-X18716921Y-8082921D02*
-X18716921Y-8011079D01*
-X18645079Y-8011079D01*
-X18645079Y-8082921D01*
-X18716921Y-8082921D01*
-X18630200Y-8250200D02*
-X18731800Y-8351800D01*
-X18731800Y-8250200D02*
-X18630200Y-8351800D01*
-X18716921Y-8336921D02*
-X18716921Y-8265079D01*
-X18645079Y-8265079D01*
-X18645079Y-8336921D01*
-X18716921Y-8336921D01*
-X18630200Y-8504200D02*
-X18731800Y-8605800D01*
-X18731800Y-8504200D02*
-X18630200Y-8605800D01*
-X18716921Y-8590921D02*
-X18716921Y-8519079D01*
-X18645079Y-8519079D01*
-X18645079Y-8590921D01*
-X18716921Y-8590921D01*
-X18630200Y-8758200D02*
-X18731800Y-8859800D01*
-X18731800Y-8758200D02*
-X18630200Y-8859800D01*
-X18716921Y-8844921D02*
-X18716921Y-8773079D01*
-X18645079Y-8773079D01*
-X18645079Y-8844921D01*
-X18716921Y-8844921D01*
-X18630200Y-9012200D02*
-X18731800Y-9113800D01*
-X18731800Y-9012200D02*
-X18630200Y-9113800D01*
-X18716921Y-9098921D02*
-X18716921Y-9027079D01*
-X18645079Y-9027079D01*
-X18645079Y-9098921D01*
-X18716921Y-9098921D01*
-X18630200Y-9266200D02*
-X18731800Y-9367800D01*
-X18731800Y-9266200D02*
-X18630200Y-9367800D01*
-X18716921Y-9352921D02*
-X18716921Y-9281079D01*
-X18645079Y-9281079D01*
-X18645079Y-9352921D01*
-X18716921Y-9352921D01*
-X18630200Y-9520200D02*
-X18731800Y-9621800D01*
-X18731800Y-9520200D02*
-X18630200Y-9621800D01*
-X18716921Y-9606921D02*
-X18716921Y-9535079D01*
-X18645079Y-9535079D01*
-X18645079Y-9606921D01*
-X18716921Y-9606921D01*
-X18630200Y-9774200D02*
-X18731800Y-9875800D01*
-X18731800Y-9774200D02*
-X18630200Y-9875800D01*
-X18716921Y-9860921D02*
-X18716921Y-9789079D01*
-X18645079Y-9789079D01*
-X18645079Y-9860921D01*
-X18716921Y-9860921D01*
-X18630200Y-10028200D02*
-X18731800Y-10129800D01*
-X18731800Y-10028200D02*
-X18630200Y-10129800D01*
-X18716921Y-10114921D02*
-X18716921Y-10043079D01*
-X18645079Y-10043079D01*
-X18645079Y-10114921D01*
-X18716921Y-10114921D01*
-X18630200Y-10282200D02*
-X18731800Y-10383800D01*
-X18731800Y-10282200D02*
-X18630200Y-10383800D01*
-X18716921Y-10368921D02*
-X18716921Y-10297079D01*
-X18645079Y-10297079D01*
-X18645079Y-10368921D01*
-X18716921Y-10368921D01*
-X18630200Y-10536200D02*
-X18731800Y-10637800D01*
-X18731800Y-10536200D02*
-X18630200Y-10637800D01*
-X18716921Y-10622921D02*
-X18716921Y-10551079D01*
-X18645079Y-10551079D01*
-X18645079Y-10622921D01*
-X18716921Y-10622921D01*
-X18630200Y-10790200D02*
-X18731800Y-10891800D01*
-X18731800Y-10790200D02*
-X18630200Y-10891800D01*
-X18716921Y-10876921D02*
-X18716921Y-10805079D01*
-X18645079Y-10805079D01*
-X18645079Y-10876921D01*
-X18716921Y-10876921D01*
-X18630200Y-11044200D02*
-X18731800Y-11145800D01*
-X18731800Y-11044200D02*
-X18630200Y-11145800D01*
-X18716921Y-11130921D02*
-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*
@@ -2623,60 +2254,429 @@ X9826921Y-11059079D01*
 X9755079Y-11059079D01*
 X9755079Y-11130921D01*
 X9826921Y-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*
+X18376200Y-6218200D02*
+X18477800Y-6319800D01*
+X18477800Y-6218200D02*
+X18376200Y-6319800D01*
+X18462921Y-6304921D02*
+X18462921Y-6233079D01*
+X18391079Y-6233079D01*
+X18391079Y-6304921D01*
+X18462921Y-6304921D01*
+X18376200Y-6472200D02*
+X18477800Y-6573800D01*
+X18477800Y-6472200D02*
+X18376200Y-6573800D01*
+X18462921Y-6558921D02*
+X18462921Y-6487079D01*
+X18391079Y-6487079D01*
+X18391079Y-6558921D01*
+X18462921Y-6558921D01*
+X18376200Y-6726200D02*
+X18477800Y-6827800D01*
+X18477800Y-6726200D02*
+X18376200Y-6827800D01*
+X18462921Y-6812921D02*
+X18462921Y-6741079D01*
+X18391079Y-6741079D01*
+X18391079Y-6812921D01*
+X18462921Y-6812921D01*
+X18376200Y-6980200D02*
+X18477800Y-7081800D01*
+X18477800Y-6980200D02*
+X18376200Y-7081800D01*
+X18462921Y-7066921D02*
+X18462921Y-6995079D01*
+X18391079Y-6995079D01*
+X18391079Y-7066921D01*
+X18462921Y-7066921D01*
+X18376200Y-7234200D02*
+X18477800Y-7335800D01*
+X18477800Y-7234200D02*
+X18376200Y-7335800D01*
+X18462921Y-7320921D02*
+X18462921Y-7249079D01*
+X18391079Y-7249079D01*
+X18391079Y-7320921D01*
+X18462921Y-7320921D01*
+X18376200Y-7488200D02*
+X18477800Y-7589800D01*
+X18477800Y-7488200D02*
+X18376200Y-7589800D01*
+X18462921Y-7574921D02*
+X18462921Y-7503079D01*
+X18391079Y-7503079D01*
+X18391079Y-7574921D01*
+X18462921Y-7574921D01*
+X18376200Y-7742200D02*
+X18477800Y-7843800D01*
+X18477800Y-7742200D02*
+X18376200Y-7843800D01*
+X18462921Y-7828921D02*
+X18462921Y-7757079D01*
+X18391079Y-7757079D01*
+X18391079Y-7828921D01*
+X18462921Y-7828921D01*
+X18376200Y-7996200D02*
+X18477800Y-8097800D01*
+X18477800Y-7996200D02*
+X18376200Y-8097800D01*
+X18462921Y-8082921D02*
+X18462921Y-8011079D01*
+X18391079Y-8011079D01*
+X18391079Y-8082921D01*
+X18462921Y-8082921D01*
+X18376200Y-8250200D02*
+X18477800Y-8351800D01*
+X18477800Y-8250200D02*
+X18376200Y-8351800D01*
+X18462921Y-8336921D02*
+X18462921Y-8265079D01*
+X18391079Y-8265079D01*
+X18391079Y-8336921D01*
+X18462921Y-8336921D01*
+X18376200Y-8504200D02*
+X18477800Y-8605800D01*
+X18477800Y-8504200D02*
+X18376200Y-8605800D01*
+X18462921Y-8590921D02*
+X18462921Y-8519079D01*
+X18391079Y-8519079D01*
+X18391079Y-8590921D01*
+X18462921Y-8590921D01*
+X18376200Y-8758200D02*
+X18477800Y-8859800D01*
+X18477800Y-8758200D02*
+X18376200Y-8859800D01*
+X18462921Y-8844921D02*
+X18462921Y-8773079D01*
+X18391079Y-8773079D01*
+X18391079Y-8844921D01*
+X18462921Y-8844921D01*
+X18376200Y-9012200D02*
+X18477800Y-9113800D01*
+X18477800Y-9012200D02*
+X18376200Y-9113800D01*
+X18462921Y-9098921D02*
+X18462921Y-9027079D01*
+X18391079Y-9027079D01*
+X18391079Y-9098921D01*
+X18462921Y-9098921D01*
+X18376200Y-9266200D02*
+X18477800Y-9367800D01*
+X18477800Y-9266200D02*
+X18376200Y-9367800D01*
+X18462921Y-9352921D02*
+X18462921Y-9281079D01*
+X18391079Y-9281079D01*
+X18391079Y-9352921D01*
+X18462921Y-9352921D01*
+X18376200Y-9520200D02*
+X18477800Y-9621800D01*
+X18477800Y-9520200D02*
+X18376200Y-9621800D01*
+X18462921Y-9606921D02*
+X18462921Y-9535079D01*
+X18391079Y-9535079D01*
+X18391079Y-9606921D01*
+X18462921Y-9606921D01*
+X18376200Y-9774200D02*
+X18477800Y-9875800D01*
+X18477800Y-9774200D02*
+X18376200Y-9875800D01*
+X18462921Y-9860921D02*
+X18462921Y-9789079D01*
+X18391079Y-9789079D01*
+X18391079Y-9860921D01*
+X18462921Y-9860921D01*
+X18376200Y-10028200D02*
+X18477800Y-10129800D01*
+X18477800Y-10028200D02*
+X18376200Y-10129800D01*
+X18462921Y-10114921D02*
+X18462921Y-10043079D01*
+X18391079Y-10043079D01*
+X18391079Y-10114921D01*
+X18462921Y-10114921D01*
+X18376200Y-10282200D02*
+X18477800Y-10383800D01*
+X18477800Y-10282200D02*
+X18376200Y-10383800D01*
+X18462921Y-10368921D02*
+X18462921Y-10297079D01*
+X18391079Y-10297079D01*
+X18391079Y-10368921D01*
+X18462921Y-10368921D01*
+X18376200Y-10536200D02*
+X18477800Y-10637800D01*
+X18477800Y-10536200D02*
+X18376200Y-10637800D01*
+X18462921Y-10622921D02*
+X18462921Y-10551079D01*
+X18391079Y-10551079D01*
+X18391079Y-10622921D01*
+X18462921Y-10622921D01*
+X18376200Y-10790200D02*
+X18477800Y-10891800D01*
+X18477800Y-10790200D02*
+X18376200Y-10891800D01*
+X18462921Y-10876921D02*
+X18462921Y-10805079D01*
+X18391079Y-10805079D01*
+X18391079Y-10876921D01*
+X18462921Y-10876921D01*
+X18376200Y-11044200D02*
+X18477800Y-11145800D01*
+X18477800Y-11044200D02*
+X18376200Y-11145800D01*
+X18462921Y-11130921D02*
+X18462921Y-11059079D01*
+X18391079Y-11059079D01*
+X18391079Y-11130921D01*
+X18462921Y-11130921D01*
+X18630200Y-6218200D02*
+X18731800Y-6319800D01*
+X18731800Y-6218200D02*
+X18630200Y-6319800D01*
+X18716921Y-6304921D02*
+X18716921Y-6233079D01*
+X18645079Y-6233079D01*
+X18645079Y-6304921D01*
+X18716921Y-6304921D01*
+X18630200Y-6472200D02*
+X18731800Y-6573800D01*
+X18731800Y-6472200D02*
+X18630200Y-6573800D01*
+X18716921Y-6558921D02*
+X18716921Y-6487079D01*
+X18645079Y-6487079D01*
+X18645079Y-6558921D01*
+X18716921Y-6558921D01*
+X18630200Y-6726200D02*
+X18731800Y-6827800D01*
+X18731800Y-6726200D02*
+X18630200Y-6827800D01*
+X18716921Y-6812921D02*
+X18716921Y-6741079D01*
+X18645079Y-6741079D01*
+X18645079Y-6812921D01*
+X18716921Y-6812921D01*
+X18630200Y-6980200D02*
+X18731800Y-7081800D01*
+X18731800Y-6980200D02*
+X18630200Y-7081800D01*
+X18716921Y-7066921D02*
+X18716921Y-6995079D01*
+X18645079Y-6995079D01*
+X18645079Y-7066921D01*
+X18716921Y-7066921D01*
+X18630200Y-7234200D02*
+X18731800Y-7335800D01*
+X18731800Y-7234200D02*
+X18630200Y-7335800D01*
+X18716921Y-7320921D02*
+X18716921Y-7249079D01*
+X18645079Y-7249079D01*
+X18645079Y-7320921D01*
+X18716921Y-7320921D01*
+X18630200Y-7488200D02*
+X18731800Y-7589800D01*
+X18731800Y-7488200D02*
+X18630200Y-7589800D01*
+X18716921Y-7574921D02*
+X18716921Y-7503079D01*
+X18645079Y-7503079D01*
+X18645079Y-7574921D01*
+X18716921Y-7574921D01*
+X18630200Y-7742200D02*
+X18731800Y-7843800D01*
+X18731800Y-7742200D02*
+X18630200Y-7843800D01*
+X18716921Y-7828921D02*
+X18716921Y-7757079D01*
+X18645079Y-7757079D01*
+X18645079Y-7828921D01*
+X18716921Y-7828921D01*
+X18630200Y-7996200D02*
+X18731800Y-8097800D01*
+X18731800Y-7996200D02*
+X18630200Y-8097800D01*
+X18716921Y-8082921D02*
+X18716921Y-8011079D01*
+X18645079Y-8011079D01*
+X18645079Y-8082921D01*
+X18716921Y-8082921D01*
+X18630200Y-8250200D02*
+X18731800Y-8351800D01*
+X18731800Y-8250200D02*
+X18630200Y-8351800D01*
+X18716921Y-8336921D02*
+X18716921Y-8265079D01*
+X18645079Y-8265079D01*
+X18645079Y-8336921D01*
+X18716921Y-8336921D01*
+X18630200Y-8504200D02*
+X18731800Y-8605800D01*
+X18731800Y-8504200D02*
+X18630200Y-8605800D01*
+X18716921Y-8590921D02*
+X18716921Y-8519079D01*
+X18645079Y-8519079D01*
+X18645079Y-8590921D01*
+X18716921Y-8590921D01*
+X18630200Y-8758200D02*
+X18731800Y-8859800D01*
+X18731800Y-8758200D02*
+X18630200Y-8859800D01*
+X18716921Y-8844921D02*
+X18716921Y-8773079D01*
+X18645079Y-8773079D01*
+X18645079Y-8844921D01*
+X18716921Y-8844921D01*
+X18630200Y-9012200D02*
+X18731800Y-9113800D01*
+X18731800Y-9012200D02*
+X18630200Y-9113800D01*
+X18716921Y-9098921D02*
+X18716921Y-9027079D01*
+X18645079Y-9027079D01*
+X18645079Y-9098921D01*
+X18716921Y-9098921D01*
+X18630200Y-9266200D02*
+X18731800Y-9367800D01*
+X18731800Y-9266200D02*
+X18630200Y-9367800D01*
+X18716921Y-9352921D02*
+X18716921Y-9281079D01*
+X18645079Y-9281079D01*
+X18645079Y-9352921D01*
+X18716921Y-9352921D01*
+X18630200Y-9520200D02*
+X18731800Y-9621800D01*
+X18731800Y-9520200D02*
+X18630200Y-9621800D01*
+X18716921Y-9606921D02*
+X18716921Y-9535079D01*
+X18645079Y-9535079D01*
+X18645079Y-9606921D01*
+X18716921Y-9606921D01*
+X18630200Y-9774200D02*
+X18731800Y-9875800D01*
+X18731800Y-9774200D02*
+X18630200Y-9875800D01*
+X18716921Y-9860921D02*
+X18716921Y-9789079D01*
+X18645079Y-9789079D01*
+X18645079Y-9860921D01*
+X18716921Y-9860921D01*
+X18630200Y-10028200D02*
+X18731800Y-10129800D01*
+X18731800Y-10028200D02*
+X18630200Y-10129800D01*
+X18716921Y-10114921D02*
+X18716921Y-10043079D01*
+X18645079Y-10043079D01*
+X18645079Y-10114921D01*
+X18716921Y-10114921D01*
+X18630200Y-10282200D02*
+X18731800Y-10383800D01*
+X18731800Y-10282200D02*
+X18630200Y-10383800D01*
+X18716921Y-10368921D02*
+X18716921Y-10297079D01*
+X18645079Y-10297079D01*
+X18645079Y-10368921D01*
+X18716921Y-10368921D01*
+X18630200Y-10536200D02*
+X18731800Y-10637800D01*
+X18731800Y-10536200D02*
+X18630200Y-10637800D01*
+X18716921Y-10622921D02*
+X18716921Y-10551079D01*
+X18645079Y-10551079D01*
+X18645079Y-10622921D01*
+X18716921Y-10622921D01*
+X18630200Y-10790200D02*
+X18731800Y-10891800D01*
+X18731800Y-10790200D02*
+X18630200Y-10891800D01*
+X18716921Y-10876921D02*
+X18716921Y-10805079D01*
+X18645079Y-10805079D01*
+X18645079Y-10876921D01*
+X18716921Y-10876921D01*
+X18630200Y-11044200D02*
+X18731800Y-11145800D01*
+X18731800Y-11044200D02*
+X18630200Y-11145800D01*
+X18716921Y-11130921D02*
+X18716921Y-11059079D01*
+X18645079Y-11059079D01*
+X18645079Y-11130921D01*
+X18716921Y-11130921D01*
+X13169200Y-10028200D02*
+X13270800Y-10129800D01*
+X13270800Y-10028200D02*
+X13169200Y-10129800D01*
+X13255921Y-10114921D02*
+X13255921Y-10043079D01*
+X13184079Y-10043079D01*
+X13184079Y-10114921D01*
+X13255921Y-10114921D01*
+X13423200Y-10028200D02*
+X13524800Y-10129800D01*
+X13524800Y-10028200D02*
+X13423200Y-10129800D01*
+X13509921Y-10114921D02*
+X13509921Y-10043079D01*
+X13438079Y-10043079D01*
+X13438079Y-10114921D01*
+X13509921Y-10114921D01*
+X13677200Y-10028200D02*
+X13778800Y-10129800D01*
+X13778800Y-10028200D02*
+X13677200Y-10129800D01*
+X13763921Y-10114921D02*
+X13763921Y-10043079D01*
+X13692079Y-10043079D01*
+X13692079Y-10114921D01*
+X13763921Y-10114921D01*
+X13931200Y-10028200D02*
+X14032800Y-10129800D01*
+X14032800Y-10028200D02*
+X13931200Y-10129800D01*
+X14017921Y-10114921D02*
+X14017921Y-10043079D01*
+X13946079Y-10043079D01*
+X13946079Y-10114921D01*
+X14017921Y-10114921D01*
+X14185200Y-10028200D02*
+X14286800Y-10129800D01*
+X14286800Y-10028200D02*
+X14185200Y-10129800D01*
+X14271921Y-10114921D02*
+X14271921Y-10043079D01*
+X14200079Y-10043079D01*
+X14200079Y-10114921D01*
+X14271921Y-10114921D01*
+X14439200Y-10028200D02*
+X14540800Y-10129800D01*
+X14540800Y-10028200D02*
+X14439200Y-10129800D01*
+X14525921Y-10114921D02*
+X14525921Y-10043079D01*
+X14454079Y-10043079D01*
+X14454079Y-10114921D01*
+X14525921Y-10114921D01*
+X14693200Y-10028200D02*
+X14794800Y-10129800D01*
+X14794800Y-10028200D02*
+X14693200Y-10129800D01*
+X14779921Y-10114921D02*
+X14779921Y-10043079D01*
+X14708079Y-10043079D01*
+X14708079Y-10114921D01*
+X14779921Y-10114921D01*
 X13679600Y-6376200D02*
 X13809600Y-6506200D01*
 X13809600Y-6376200D02*
@@ -2713,6 +2713,14 @@ X15379600Y-6441200D01*
 X15314600Y-6376200D01*
 X15249600Y-6441200D01*
 X15314600Y-6506200D01*
+X10299000Y-6363000D02*
+X10299000Y-6683000D01*
+X10139000Y-6523000D02*
+X10459000Y-6523000D01*
+X10459000Y-6523000D02*
+G75*
+G03X10459000Y-6523000I-160000J0D01*
+G01*
 X17919000Y-10681000D02*
 X17919000Y-11001000D01*
 X17759000Y-10841000D02*
@@ -2737,14 +2745,6 @@ X18079000Y-6523000D02*
 G75*
 G03X18079000Y-6523000I-160000J0D01*
 G01*
-X10299000Y-6363000D02*
-X10299000Y-6683000D01*
-X10139000Y-6523000D02*
-X10459000Y-6523000D01*
-X10459000Y-6523000D02*
-G75*
-G03X10459000Y-6523000I-160000J0D01*
-G01*
 X12506905Y-6711905D02*
 X12506905Y-6591695D01*
 X12386695Y-6591695D01*
diff --git a/plot/ulx3s-top.pos b/plot/ulx3s-top.pos
index 86ad64c..ecf779c 100644
--- a/plot/ulx3s-top.pos
+++ b/plot/ulx3s-top.pos
@@ -1,4 +1,4 @@
-### Module positions - created on Thu Jun  7 21:01:52 2018 ###
+### Module positions - created on Thu Jun  7 22:26:47 2018 ###
 ### Printed by Pcbnew version kicad 5.0.0-rc2+dfsg1-2
 ## Unit = inches, Angle = deg.
 ## Side : top
@@ -50,5 +50,7 @@ SW1       DIPSW              SW_DIP_x4_W8.61mm_Slide_LowProfile              2.6
 U1        LFE5U-85F-6BG381C  BGA-381_pitch0.8mm_dia0.4mm                     1.7472     0.9614    0.0000  top
 U2        MT48LC16M16A2TG    TSOP54                                          2.7950     0.9614   90.0000  top
 U8        MAX11125           QFN-28-1EP_5x5mm_Pitch0.5mm                     3.2750     0.4750  180.0000  top
+US1       MICRO_USB          USB-MICRO-B-FCI-10118192-0001LF                 0.7000     1.9250  180.0000  top
+US2       MICRO_USB          USB-MICRO-B-FCI-10118192-0001LF                 3.0000     1.9250  180.0000  top
 Y1        FNETHE025          Crystal_SMD_7050_4Pads                          0.4488     1.6063  180.0000  top
 ## End
diff --git a/plot/ulx3s.drl b/plot/ulx3s.drl
index 55461d3..4f00546 100644
--- a/plot/ulx3s.drl
+++ b/plot/ulx3s.drl
@@ -1,5 +1,5 @@
 M48
-;DRILL file {KiCad 5.0.0-rc2+dfsg1-2} date Thu Jun  7 21:01:33 2018
+;DRILL file {KiCad 5.0.0-rc2+dfsg1-2} date Thu Jun  7 22:26:36 2018
 ;FORMAT={-:-/ absolute / inch / decimal}
 FMAT,2
 INCH,TZ
@@ -453,53 +453,12 @@ X5.1203Y-2.8238
 X5.2203Y-2.8238
 X5.3203Y-2.8238
 T8
-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
-X7.2547Y-2.4681
-X7.2547Y-2.5681
-X7.2547Y-2.6681
-X7.2547Y-2.7681
-X7.2547Y-2.8681
-X7.2547Y-2.9681
-X7.2547Y-3.0681
-X7.2547Y-3.1681
-X7.2547Y-3.2681
-X7.2547Y-3.3681
-X7.2547Y-3.4681
-X7.2547Y-3.5681
-X7.2547Y-3.6681
-X7.2547Y-3.7681
-X7.2547Y-3.8681
-X7.2547Y-3.9681
-X7.2547Y-4.0681
-X7.2547Y-4.1681
-X7.2547Y-4.2681
-X7.2547Y-4.3681
-X7.3547Y-2.4681
-X7.3547Y-2.5681
-X7.3547Y-2.6681
-X7.3547Y-2.7681
-X7.3547Y-2.8681
-X7.3547Y-2.9681
-X7.3547Y-3.0681
-X7.3547Y-3.1681
-X7.3547Y-3.2681
-X7.3547Y-3.3681
-X7.3547Y-3.4681
-X7.3547Y-3.5681
-X7.3547Y-3.6681
-X7.3547Y-3.7681
-X7.3547Y-3.8681
-X7.3547Y-3.9681
-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
@@ -540,22 +499,63 @@ X3.8547Y-4.0681
 X3.8547Y-4.1681
 X3.8547Y-4.2681
 X3.8547Y-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
+X7.2547Y-2.4681
+X7.2547Y-2.5681
+X7.2547Y-2.6681
+X7.2547Y-2.7681
+X7.2547Y-2.8681
+X7.2547Y-2.9681
+X7.2547Y-3.0681
+X7.2547Y-3.1681
+X7.2547Y-3.2681
+X7.2547Y-3.3681
+X7.2547Y-3.4681
+X7.2547Y-3.5681
+X7.2547Y-3.6681
+X7.2547Y-3.7681
+X7.2547Y-3.8681
+X7.2547Y-3.9681
+X7.2547Y-4.0681
+X7.2547Y-4.1681
+X7.2547Y-4.2681
+X7.2547Y-4.3681
+X7.3547Y-2.4681
+X7.3547Y-2.5681
+X7.3547Y-2.6681
+X7.3547Y-2.7681
+X7.3547Y-2.8681
+X7.3547Y-2.9681
+X7.3547Y-3.0681
+X7.3547Y-3.1681
+X7.3547Y-3.2681
+X7.3547Y-3.3681
+X7.3547Y-3.4681
+X7.3547Y-3.5681
+X7.3547Y-3.6681
+X7.3547Y-3.7681
+X7.3547Y-3.8681
+X7.3547Y-3.9681
+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
 T9
 X5.4113Y-2.5359
 X5.4349Y-2.7288
 X6.0057Y-2.7288
 X6.0294Y-2.5359
 T10
+X4.0547Y-2.5681
 X7.0547Y-4.2681
 X4.0547Y-4.2681
 X7.0547Y-2.5681
-X4.0547Y-2.5681
 T11
 X4.9003Y-2.6188
 X4.9003Y-2.8944