diff --git a/plot/ulx3s-B.Cu.gbl b/plot/ulx3s-B.Cu.gbl
index ca3f094..80dcda6 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-07-05T08:26:03+02:00*
+G04 #@! TF.CreationDate,2018-07-05T08:41:50+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 Thu Jul  5 08:26:03 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Thu Jul  5 08:41:50 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -129,19 +129,19 @@ G04 #@! TA.AperFunction,ViaPad*
 %ADD48C,2.000000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD49C,0.700000*%
+%ADD49C,0.454000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD50C,0.454000*%
+%ADD50C,0.600000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD51C,0.600000*%
+%ADD51C,1.000000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD52C,1.000000*%
+%ADD52C,0.800000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD53C,0.800000*%
+%ADD53C,0.700000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
 %ADD54C,0.300000*%
@@ -1908,8 +1908,6 @@ X124632693Y-93120351D03*
 D48*
 G04 #@! TO.N,GND*
 X118689500Y-101316000D03*
-D49*
-X112784000Y-102840000D03*
 D47*
 X141742847Y-69038361D03*
 X152408000Y-72169500D03*
@@ -1917,7 +1915,7 @@ X138480000Y-92600000D03*
 X140080000Y-92600000D03*
 X135280000Y-87000000D03*
 X145687392Y-90996646D03*
-D50*
+D49*
 X141675979Y-86986521D03*
 D47*
 X140876932Y-84552536D03*
@@ -1925,23 +1923,23 @@ X132882184Y-84635369D03*
 X132879996Y-82103336D03*
 X140922639Y-81447441D03*
 X177287984Y-96778661D03*
-D51*
+D50*
 X152510125Y-81695229D03*
 D47*
 X131264297Y-86227110D03*
 X135342764Y-89381630D03*
 X144103496Y-84660400D03*
-D52*
+D51*
 X177658444Y-82281349D03*
 D47*
 X145680000Y-81405125D03*
 X145691238Y-94166752D03*
-D52*
+D51*
 X163203000Y-94966000D03*
 X158539988Y-94868772D03*
-D53*
+D52*
 X164727000Y-81123000D03*
-D51*
+D50*
 X156262773Y-81349374D03*
 X123437000Y-108972000D03*
 D47*
@@ -1957,9 +1955,9 @@ X135284627Y-94985297D03*
 X135288625Y-94225619D03*
 X134455822Y-94267172D03*
 X136095958Y-93369652D03*
-D50*
+D49*
 X139264636Y-91615205D03*
-D52*
+D51*
 X116880503Y-64802940D03*
 X106974809Y-64953974D03*
 D47*
@@ -1972,65 +1970,65 @@ X136880000Y-92600000D03*
 X135280000Y-92600000D03*
 X132880000Y-91800000D03*
 X132880000Y-93400000D03*
-D50*
+D49*
 X139280000Y-87000000D03*
 X137680000Y-87000000D03*
 X136080000Y-84600000D03*
 X139280000Y-88600000D03*
-D52*
+D51*
 X175776000Y-63343000D03*
 X164854000Y-63343000D03*
 D47*
 X174252000Y-71471000D03*
-D52*
+D51*
 X158645000Y-98635000D03*
 X104402000Y-76932000D03*
 X123198000Y-64232000D03*
-D53*
+D52*
 X167267000Y-68677000D03*
-D51*
+D50*
 X179459000Y-71344000D03*
 D47*
 X170061000Y-103094000D03*
 X173109000Y-103094000D03*
-D52*
+D51*
 X166632000Y-96363000D03*
 X173490000Y-94585000D03*
-D53*
-X176411000Y-86838000D03*
 D52*
+X176411000Y-86838000D03*
+D51*
 X159266000Y-72360000D03*
 D47*
 X122944000Y-67788000D03*
-D52*
+D51*
 X118245000Y-67534000D03*
 D47*
 X114181000Y-76678000D03*
 X111006000Y-76551000D03*
 X106815000Y-76424000D03*
-D52*
+D51*
 X104910000Y-71725000D03*
 D47*
 X101354000Y-76297000D03*
 X116340000Y-76678000D03*
-D52*
+D51*
 X121674000Y-104618000D03*
-D53*
-X116594000Y-95474000D03*
 D52*
+X116594000Y-95474000D03*
+D51*
 X101989000Y-100681000D03*
 X108339000Y-71852000D03*
 X181491000Y-78202000D03*
 X178443000Y-89505000D03*
 X147455000Y-107031000D03*
 X149741000Y-108809000D03*
-D51*
+D50*
 X152408000Y-92997500D03*
 X154567000Y-77567000D03*
 X154567000Y-79154500D03*
 D47*
 X169045000Y-79535500D03*
-D52*
+D51*
 X173045500Y-77567000D03*
 X173934500Y-68550000D03*
 X180221000Y-94712000D03*
@@ -2038,10 +2036,12 @@ X181618000Y-92045000D03*
 X161171000Y-81123000D03*
 D48*
 X115197000Y-101316000D03*
+D52*
+X112784000Y-101633500D03*
 D47*
 G04 #@! TO.N,+5V*
 X149169500Y-68867500D03*
-D52*
+D51*
 X166275426Y-77459534D03*
 X107021491Y-67043629D03*
 X166255545Y-79350736D03*
@@ -2050,7 +2050,7 @@ X101707889Y-82423180D03*
 X166284693Y-95025145D03*
 D47*
 X174379000Y-85743000D03*
-D52*
+D51*
 G04 #@! TO.N,/gpio/IN5V*
 X157600000Y-62944000D03*
 G04 #@! TO.N,/gpio/OUT5V*
@@ -2061,29 +2061,29 @@ G04 #@! TO.N,+3V3*
 X119692151Y-77494120D03*
 X135263000Y-87727000D03*
 X141740000Y-89250994D03*
-D51*
+D50*
 X156091000Y-94585000D03*
 D47*
 X137803000Y-91664000D03*
-D51*
+D50*
 X181155918Y-104980708D03*
-D52*
+D51*
 X135105588Y-66616618D03*
 D47*
 X181491000Y-91156000D03*
 X113660608Y-89375718D03*
-D52*
+D51*
 X148268387Y-79050018D03*
 D47*
 X114513935Y-82409431D03*
 X132110753Y-92527478D03*
 X165803369Y-97344883D03*
-D51*
+D50*
 X154593901Y-94607945D03*
-D52*
+D51*
 X164625730Y-94982471D03*
 X176254940Y-94288458D03*
-D53*
+D52*
 X110593913Y-108636458D03*
 D47*
 X180340784Y-77316932D03*
@@ -2093,22 +2093,22 @@ X139272517Y-84611349D03*
 X141680000Y-86200000D03*
 X132880000Y-92600000D03*
 X141680000Y-85400000D03*
-D49*
+D53*
 X102624000Y-98141000D03*
-D52*
+D51*
 X100973000Y-94331000D03*
 D47*
 X110117000Y-71852000D03*
 X148979000Y-67529972D03*
-D52*
+D51*
 X181745000Y-99919000D03*
-D53*
+D52*
 X172347000Y-87473000D03*
-D51*
+D50*
 X163457000Y-81123000D03*
-D52*
-X161044000Y-94966000D03*
 D51*
+X161044000Y-94966000D03*
+D50*
 X158758000Y-81250000D03*
 D47*
 G04 #@! TO.N,BTN_F1*
@@ -2126,7 +2126,7 @@ X147175985Y-97333919D03*
 X147700000Y-93820000D03*
 G04 #@! TO.N,+2V5*
 X142107219Y-91201016D03*
-D52*
+D51*
 X110128890Y-90028152D03*
 D47*
 X142480000Y-83800000D03*
@@ -2150,7 +2150,7 @@ X133680000Y-91800000D03*
 G04 #@! TO.N,JTAG_TCK*
 X135517000Y-97633000D03*
 X134675868Y-108131585D03*
-D50*
+D49*
 X133449289Y-102232615D03*
 D47*
 X133680000Y-92600000D03*
@@ -2200,7 +2200,7 @@ X144894316Y-86977564D03*
 G04 #@! TO.N,SDRAM_D13*
 X144896700Y-83863953D03*
 X149527221Y-80838006D03*
-D50*
+D49*
 G04 #@! TO.N,SDRAM_D6*
 X147343891Y-93217126D03*
 D47*
@@ -2211,7 +2211,7 @@ X144875155Y-86292748D03*
 G04 #@! TO.N,SDRAM_D12*
 X144916886Y-83019942D03*
 X148696112Y-80861847D03*
-D50*
+D49*
 G04 #@! TO.N,SDRAM_D5*
 X148349010Y-93322307D03*
 D47*
@@ -2318,7 +2318,7 @@ X135656559Y-110610712D03*
 G04 #@! TO.N,FTDI_nSLEEP*
 X149577281Y-103320847D03*
 X132468001Y-104503413D03*
-D49*
+D53*
 G04 #@! TO.N,/sdcard/SD3V3*
 X104260000Y-100790000D03*
 D47*
@@ -2410,11 +2410,11 @@ X139322319Y-90164039D03*
 X140080000Y-89400000D03*
 X136880000Y-89400000D03*
 X140896226Y-87816226D03*
-D50*
+D49*
 X136938110Y-86196311D03*
 D47*
 X140014602Y-86192969D03*
-D52*
+D51*
 X151758000Y-99774000D03*
 D47*
 G04 #@! TO.N,SW4*
@@ -2458,7 +2458,7 @@ X135034780Y-77831198D03*
 G04 #@! TO.N,GP6*
 X134508502Y-81406751D03*
 X134177298Y-77721089D03*
-D50*
+D49*
 G04 #@! TO.N,GN14*
 X146942280Y-96452058D03*
 G04 #@! TO.N,GP14*
@@ -2604,11 +2604,11 @@ G04 #@! TO.N,/gpdi/FPDI_CEC*
 X144606344Y-79361357D03*
 G04 #@! TO.N,2V5_3V3*
 X157996000Y-72487000D03*
-D52*
+D51*
 X100855891Y-71574861D03*
 D47*
 X135280000Y-85400000D03*
-D51*
+D50*
 X100652119Y-90162239D03*
 D47*
 X137550785Y-84577294D03*
diff --git a/plot/ulx3s-B.Mask.gbs b/plot/ulx3s-B.Mask.gbs
index fe8b1ab..d1ef8b1 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-07-05T08:26:04+02:00*
+G04 #@! TF.CreationDate,2018-07-05T08:41:50+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 Thu Jul  5 08:26:04 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Thu Jul  5 08:41:50 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-B.Paste.gbp b/plot/ulx3s-B.Paste.gbp
index a21ae05..5c52b73 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-07-05T08:26:04+02:00*
+G04 #@! TF.CreationDate,2018-07-05T08:41:50+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 Thu Jul  5 08:26:04 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Thu Jul  5 08:41:50 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-B.SilkS.gbo b/plot/ulx3s-B.SilkS.gbo
index 4e85dc5..4dfde27 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-07-05T08:26:04+02:00*
+G04 #@! TF.CreationDate,2018-07-05T08:41:50+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 Thu Jul  5 08:26:04 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Thu Jul  5 08:41:50 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-Edge.Cuts.gm1 b/plot/ulx3s-Edge.Cuts.gm1
index ffab8b2..e1d371d 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-07-05T08:26:04+02:00*
+G04 #@! TF.CreationDate,2018-07-05T08:41:50+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 Thu Jul  5 08:26:04 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Thu Jul  5 08:41:50 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Cu.gtl b/plot/ulx3s-F.Cu.gtl
index f8c56db..1c5f7b2 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-3*
-G04 #@! TF.CreationDate,2018-07-05T08:26:03+02:00*
+G04 #@! TF.CreationDate,2018-07-05T08:41:50+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 Thu Jul  5 08:26:03 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Thu Jul  5 08:41:50 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -108,31 +108,31 @@ G04 #@! TA.AperFunction,ViaPad*
 %ADD41C,2.000000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD42C,0.700000*%
+%ADD42C,0.454000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD43C,0.454000*%
+%ADD43C,0.600000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD44C,0.600000*%
+%ADD44C,1.000000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD45C,1.000000*%
+%ADD45C,0.800000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD46C,0.800000*%
+%ADD46C,0.700000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD47C,0.700000*%
+%ADD47C,0.300000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD48C,0.300000*%
+%ADD48C,0.500000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD49C,0.500000*%
+%ADD49C,1.000000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
-%ADD50C,1.000000*%
+%ADD50C,0.700000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
 %ADD51C,0.190000*%
@@ -2332,8 +2332,6 @@ X124632693Y-93120351D03*
 D41*
 G04 #@! TO.N,GND*
 X118689500Y-101316000D03*
-D42*
-X112784000Y-102840000D03*
 D40*
 X141742847Y-69038361D03*
 X152408000Y-72169500D03*
@@ -2341,7 +2339,7 @@ X138480000Y-92600000D03*
 X140080000Y-92600000D03*
 X135280000Y-87000000D03*
 X145687392Y-90996646D03*
-D43*
+D42*
 X141675979Y-86986521D03*
 D40*
 X140876932Y-84552536D03*
@@ -2349,23 +2347,23 @@ X132882184Y-84635369D03*
 X132879996Y-82103336D03*
 X140922639Y-81447441D03*
 X177287984Y-96778661D03*
-D44*
+D43*
 X152510125Y-81695229D03*
 D40*
 X131264297Y-86227110D03*
 X135342764Y-89381630D03*
 X144103496Y-84660400D03*
-D45*
+D44*
 X177658444Y-82281349D03*
 D40*
 X145680000Y-81405125D03*
 X145691238Y-94166752D03*
-D45*
+D44*
 X163203000Y-94966000D03*
 X158539988Y-94868772D03*
-D46*
+D45*
 X164727000Y-81123000D03*
-D44*
+D43*
 X156262773Y-81349374D03*
 X123437000Y-108972000D03*
 D40*
@@ -2381,9 +2379,9 @@ X135284627Y-94985297D03*
 X135288625Y-94225619D03*
 X134455822Y-94267172D03*
 X136095958Y-93369652D03*
-D43*
+D42*
 X139264636Y-91615205D03*
-D45*
+D44*
 X116880503Y-64802940D03*
 X106974809Y-64953974D03*
 D40*
@@ -2396,65 +2394,65 @@ X136880000Y-92600000D03*
 X135280000Y-92600000D03*
 X132880000Y-91800000D03*
 X132880000Y-93400000D03*
-D43*
+D42*
 X139280000Y-87000000D03*
 X137680000Y-87000000D03*
 X136080000Y-84600000D03*
 X139280000Y-88600000D03*
-D45*
+D44*
 X175776000Y-63343000D03*
 X164854000Y-63343000D03*
 D40*
 X174252000Y-71471000D03*
-D45*
+D44*
 X158645000Y-98635000D03*
 X104402000Y-76932000D03*
 X123198000Y-64232000D03*
-D46*
+D45*
 X167267000Y-68677000D03*
-D44*
+D43*
 X179459000Y-71344000D03*
 D40*
 X170061000Y-103094000D03*
 X173109000Y-103094000D03*
-D45*
+D44*
 X166632000Y-96363000D03*
 X173490000Y-94585000D03*
-D46*
-X176411000Y-86838000D03*
 D45*
+X176411000Y-86838000D03*
+D44*
 X159266000Y-72360000D03*
 D40*
 X122944000Y-67788000D03*
-D45*
+D44*
 X118245000Y-67534000D03*
 D40*
 X114181000Y-76678000D03*
 X111006000Y-76551000D03*
 X106815000Y-76424000D03*
-D45*
+D44*
 X104910000Y-71725000D03*
 D40*
 X101354000Y-76297000D03*
 X116340000Y-76678000D03*
-D45*
+D44*
 X121674000Y-104618000D03*
-D46*
-X116594000Y-95474000D03*
 D45*
+X116594000Y-95474000D03*
+D44*
 X101989000Y-100681000D03*
 X108339000Y-71852000D03*
 X181491000Y-78202000D03*
 X178443000Y-89505000D03*
 X147455000Y-107031000D03*
 X149741000Y-108809000D03*
-D44*
+D43*
 X152408000Y-92997500D03*
 X154567000Y-77567000D03*
 X154567000Y-79154500D03*
 D40*
 X169045000Y-79535500D03*
-D45*
+D44*
 X173045500Y-77567000D03*
 X173934500Y-68550000D03*
 X180221000Y-94712000D03*
@@ -2462,10 +2460,12 @@ X181618000Y-92045000D03*
 X161171000Y-81123000D03*
 D41*
 X115197000Y-101316000D03*
+D45*
+X112784000Y-101633500D03*
 D40*
 G04 #@! TO.N,+5V*
 X149169500Y-68867500D03*
-D45*
+D44*
 X166275426Y-77459534D03*
 X107021491Y-67043629D03*
 X166255545Y-79350736D03*
@@ -2474,7 +2474,7 @@ X101707889Y-82423180D03*
 X166284693Y-95025145D03*
 D40*
 X174379000Y-85743000D03*
-D45*
+D44*
 G04 #@! TO.N,/gpio/IN5V*
 X157600000Y-62944000D03*
 G04 #@! TO.N,/gpio/OUT5V*
@@ -2485,29 +2485,29 @@ G04 #@! TO.N,+3V3*
 X119692151Y-77494120D03*
 X135263000Y-87727000D03*
 X141740000Y-89250994D03*
-D44*
+D43*
 X156091000Y-94585000D03*
 D40*
 X137803000Y-91664000D03*
-D44*
+D43*
 X181155918Y-104980708D03*
-D45*
+D44*
 X135105588Y-66616618D03*
 D40*
 X181491000Y-91156000D03*
 X113660608Y-89375718D03*
-D45*
+D44*
 X148268387Y-79050018D03*
 D40*
 X114513935Y-82409431D03*
 X132110753Y-92527478D03*
 X165803369Y-97344883D03*
-D44*
+D43*
 X154593901Y-94607945D03*
-D45*
+D44*
 X164625730Y-94982471D03*
 X176254940Y-94288458D03*
-D46*
+D45*
 X110593913Y-108636458D03*
 D40*
 X180340784Y-77316932D03*
@@ -2517,22 +2517,22 @@ X139272517Y-84611349D03*
 X141680000Y-86200000D03*
 X132880000Y-92600000D03*
 X141680000Y-85400000D03*
-D42*
+D46*
 X102624000Y-98141000D03*
-D45*
+D44*
 X100973000Y-94331000D03*
 D40*
 X110117000Y-71852000D03*
 X148979000Y-67529972D03*
-D45*
+D44*
 X181745000Y-99919000D03*
-D46*
+D45*
 X172347000Y-87473000D03*
-D44*
+D43*
 X163457000Y-81123000D03*
-D45*
-X161044000Y-94966000D03*
 D44*
+X161044000Y-94966000D03*
+D43*
 X158758000Y-81250000D03*
 D40*
 G04 #@! TO.N,BTN_F1*
@@ -2550,7 +2550,7 @@ X147175985Y-97333919D03*
 X147700000Y-93820000D03*
 G04 #@! TO.N,+2V5*
 X142107219Y-91201016D03*
-D45*
+D44*
 X110128890Y-90028152D03*
 D40*
 X142480000Y-83800000D03*
@@ -2574,7 +2574,7 @@ X133680000Y-91800000D03*
 G04 #@! TO.N,JTAG_TCK*
 X135517000Y-97633000D03*
 X134675868Y-108131585D03*
-D43*
+D42*
 X133449289Y-102232615D03*
 D40*
 X133680000Y-92600000D03*
@@ -2624,7 +2624,7 @@ X144894316Y-86977564D03*
 G04 #@! TO.N,SDRAM_D13*
 X144896700Y-83863953D03*
 X149527221Y-80838006D03*
-D43*
+D42*
 G04 #@! TO.N,SDRAM_D6*
 X147343891Y-93217126D03*
 D40*
@@ -2635,7 +2635,7 @@ X144875155Y-86292748D03*
 G04 #@! TO.N,SDRAM_D12*
 X144916886Y-83019942D03*
 X148696112Y-80861847D03*
-D43*
+D42*
 G04 #@! TO.N,SDRAM_D5*
 X148349010Y-93322307D03*
 D40*
@@ -2742,7 +2742,7 @@ X135656559Y-110610712D03*
 G04 #@! TO.N,FTDI_nSLEEP*
 X149577281Y-103320847D03*
 X132468001Y-104503413D03*
-D42*
+D46*
 G04 #@! TO.N,/sdcard/SD3V3*
 X104260000Y-100790000D03*
 D40*
@@ -2834,11 +2834,11 @@ X139322319Y-90164039D03*
 X140080000Y-89400000D03*
 X136880000Y-89400000D03*
 X140896226Y-87816226D03*
-D43*
+D42*
 X136938110Y-86196311D03*
 D40*
 X140014602Y-86192969D03*
-D45*
+D44*
 X151758000Y-99774000D03*
 D40*
 G04 #@! TO.N,SW4*
@@ -2882,7 +2882,7 @@ X135034780Y-77831198D03*
 G04 #@! TO.N,GP6*
 X134508502Y-81406751D03*
 X134177298Y-77721089D03*
-D43*
+D42*
 G04 #@! TO.N,GN14*
 X146942280Y-96452058D03*
 G04 #@! TO.N,GP14*
@@ -3028,11 +3028,11 @@ G04 #@! TO.N,/gpdi/FPDI_CEC*
 X144606344Y-79361357D03*
 G04 #@! TO.N,2V5_3V3*
 X157996000Y-72487000D03*
-D45*
+D44*
 X100855891Y-71574861D03*
 D40*
 X135280000Y-85400000D03*
-D44*
+D43*
 X100652119Y-90162239D03*
 D40*
 X137550785Y-84577294D03*
@@ -3051,11 +3051,6 @@ X167648000Y-97252000D03*
 G04 #@! TD*
 D47*
 G04 #@! TO.N,GND*
-X112750000Y-102874000D02*
-X112784000Y-102840000D01*
-X112750000Y-105250000D02*
-X112750000Y-102874000D01*
-D48*
 X153146000Y-64412000D02*
 X152146001Y-65411999D01*
 X152146001Y-65411999D02*
@@ -3250,28 +3245,28 @@ X177285000Y-96781645D02*
 X177287984Y-96778661D01*
 X177285000Y-97705000D02*
 X177285000Y-96781645D01*
-D49*
+D48*
 X184230000Y-85550000D02*
 X182920003Y-84240003D01*
 X182920003Y-84240003D02*
 X182920003Y-84225534D01*
-D48*
+D47*
 X184270000Y-85550000D02*
 X184230000Y-85550000D01*
-D49*
+D48*
 X184270000Y-85610000D02*
 X182952738Y-86927262D01*
 X182952738Y-86927262D02*
 X182916738Y-86927262D01*
-D48*
+D47*
 X184270000Y-85550000D02*
 X184270000Y-85610000D01*
-D49*
+D48*
 X97910000Y-88090000D02*
 X99203955Y-86796045D01*
 X99203955Y-86796045D02*
 X99203955Y-86791266D01*
-D48*
+D47*
 X155962030Y-83029572D02*
 X155023970Y-83029572D01*
 X155023970Y-83029572D02*
@@ -3330,17 +3325,17 @@ X156280000Y-82270000D02*
 X156280000Y-81366601D01*
 X156280000Y-81366601D02*
 X156262773Y-81349374D01*
-D49*
+D48*
 X175480000Y-82270000D02*
 X177241260Y-82270000D01*
-D48*
+D47*
 X134455822Y-94267172D02*
 X134455822Y-94224178D01*
 X134455822Y-94224178D02*
 X134880000Y-93800000D01*
 X121930000Y-107465000D02*
 X123437000Y-108972000D01*
-D50*
+D49*
 X184270000Y-65230000D02*
 X186810000Y-65230000D01*
 X184270000Y-85550000D02*
@@ -3349,18 +3344,18 @@ X184270000Y-108410000D02*
 X186810000Y-108410000D01*
 X95370000Y-108410000D02*
 X97910000Y-108410000D01*
-D49*
+D48*
 X97910000Y-88090000D02*
 X99013590Y-89193590D01*
-D48*
+D47*
 X99013590Y-89193590D02*
 X99060056Y-89193590D01*
-D50*
+D49*
 X95370000Y-88090000D02*
 X97910000Y-88090000D01*
 X95370000Y-65230000D02*
 X97910000Y-65230000D01*
-D48*
+D47*
 X139264636Y-90984636D02*
 X139295364Y-90984636D01*
 X139295364Y-90984636D02*
@@ -3815,6 +3810,14 @@ X174252000Y-71647000D02*
 X174252000Y-71471000D01*
 X161080000Y-82270000D02*
 X161044000Y-82234000D01*
+D50*
+X112750000Y-105250000D02*
+X112750000Y-102747000D01*
+X112750000Y-101667500D02*
+X112784000Y-101633500D01*
+X112750000Y-102747000D02*
+X112750000Y-101667500D01*
+D47*
 G04 #@! TO.N,+5V*
 X149046000Y-68991000D02*
 X149169500Y-68867500D01*
@@ -3823,7 +3826,7 @@ X149046000Y-68991000D01*
 G04 #@! TO.N,/gpio/OUT5V*
 X186810000Y-62877865D02*
 X186810000Y-62690000D01*
-D49*
+D48*
 G04 #@! TO.N,+3V3*
 X175522000Y-94007914D02*
 X175802544Y-94288458D01*
@@ -3831,7 +3834,7 @@ X175522000Y-93442000D02*
 X175522000Y-94007914D01*
 X175802544Y-94288458D02*
 X176254940Y-94288458D01*
-D48*
+D47*
 X156280000Y-93330000D02*
 X156280000Y-94396000D01*
 X156280000Y-94396000D02*
@@ -3898,10 +3901,10 @@ X141680000Y-86200000D02*
 X142080000Y-86200000D01*
 X135105588Y-66805157D02*
 X135105588Y-66616618D01*
-D50*
+D49*
 X135105588Y-71694588D02*
 X135105588Y-66616618D01*
-D48*
+D47*
 X135037757Y-66872988D02*
 X135105588Y-66805157D01*
 X135105588Y-71694588D02*
@@ -3918,12 +3921,12 @@ X165125729Y-93375729D02*
 X165125729Y-94482472D01*
 X165080000Y-93330000D02*
 X165125729Y-93375729D01*
-D50*
+D49*
 X184270000Y-88090000D02*
 X186810000Y-88090000D01*
 X184270000Y-110950000D02*
 X186810000Y-110950000D01*
-D48*
+D47*
 X137680000Y-90800000D02*
 X137880000Y-90800000D01*
 X137480000Y-90800000D02*
@@ -3992,14 +3995,14 @@ X163457000Y-81688685D02*
 X163457000Y-81123000D01*
 X163457000Y-82247000D02*
 X163457000Y-81688685D01*
-D49*
+D48*
 X161044000Y-93672243D02*
 X161044000Y-94258894D01*
 X161044000Y-94258894D02*
 X161044000Y-94966000D01*
 X161080000Y-93636243D02*
 X161044000Y-93672243D01*
-D48*
+D47*
 X158758000Y-82192000D02*
 X158758000Y-81674264D01*
 X158680000Y-82270000D02*
@@ -4221,7 +4224,7 @@ X148225572Y-97533918D02*
 X147375984Y-97533918D01*
 X147375984Y-97533918D02*
 X147175985Y-97333919D01*
-D48*
+D47*
 G04 #@! TO.N,+2V5*
 X142080000Y-90600000D02*
 X142080000Y-91173797D01*
@@ -4240,7 +4243,7 @@ X129723500Y-71392500D02*
 X130056000Y-71725000D01*
 X129723500Y-69566000D02*
 X129723500Y-71392500D01*
-D48*
+D47*
 X136406000Y-66137000D02*
 X139200000Y-66137000D01*
 X135771000Y-65502000D02*
@@ -4339,12 +4342,16 @@ X118880000Y-95855000D02*
 X121928000Y-95855000D01*
 X116721000Y-98014000D02*
 X118880000Y-95855000D01*
-X116721000Y-101633500D02*
+X116721000Y-101951000D02*
 X116721000Y-98014000D01*
+X116050000Y-102622000D02*
+X116721000Y-101951000D01*
+D50*
+X116050000Y-102749000D02*
+X116086000Y-102713000D01*
 X116050000Y-105250000D02*
-X116050000Y-102304500D01*
-X116050000Y-102304500D02*
-X116721000Y-101633500D01*
+X116050000Y-102749000D01*
+D51*
 G04 #@! TO.N,SD_CLK*
 X114273994Y-97888052D02*
 X114073995Y-98088051D01*
@@ -4374,12 +4381,14 @@ X129373203Y-86709444D02*
 X128467583Y-86709444D01*
 X131680000Y-85800000D02*
 X131280000Y-85400000D01*
-X115314501Y-98467999D02*
-X115514500Y-98268000D01*
+D50*
 X113850000Y-105250000D02*
-X113850000Y-99932500D01*
+X113850000Y-102599500D01*
+D51*
 X113850000Y-99932500D02*
-X115314501Y-98467999D01*
+X113850000Y-102599500D01*
+X115514500Y-98268000D02*
+X113850000Y-99932500D01*
 G04 #@! TO.N,SD_D0*
 X122309000Y-95347000D02*
 X122625636Y-95030364D01*
@@ -4399,8 +4408,6 @@ X118824142Y-95347000D02*
 X122026158Y-95347000D01*
 X111650000Y-101557180D02*
 X115092499Y-98114681D01*
-X111650000Y-105250000D02*
-X111650000Y-101557180D01*
 X115092499Y-98114681D02*
 X115092499Y-98065439D01*
 X115092499Y-98065439D02*
@@ -4409,6 +4416,10 @@ X116347642Y-97823500D02*
 X118824142Y-95347000D01*
 X115334438Y-97823500D02*
 X116347642Y-97823500D01*
+D50*
+X111650000Y-105250000D02*
+X111650000Y-101557180D01*
+D51*
 G04 #@! TO.N,SD_D1*
 X122203636Y-94585375D02*
 X122308625Y-94585375D01*
@@ -4428,27 +4439,29 @@ X129518276Y-87026455D02*
 X130569732Y-85974999D01*
 X130569732Y-85974999D02*
 X130705001Y-85974999D01*
-X122003637Y-94785374D02*
-X122203636Y-94585375D01*
-X115203129Y-97506490D02*
-X116216334Y-97506490D01*
-X110550000Y-101518000D02*
-X112085500Y-99982500D01*
-X118937450Y-94785374D02*
-X122003637Y-94785374D01*
-X114775489Y-97983373D02*
-X114775489Y-97934130D01*
+D50*
 X110550000Y-105250000D02*
 X110550000Y-101518000D01*
-X112085500Y-99982500D02*
-X112776362Y-99982500D01*
+D51*
+X122003637Y-94785374D02*
+X122203636Y-94585375D01*
 X116216334Y-97506490D02*
 X118937450Y-94785374D01*
-X112776362Y-99982500D02*
-X114775489Y-97983373D01*
+X112847500Y-99220500D02*
+X113538362Y-99220500D01*
+X114775489Y-97983373D02*
+X114775489Y-97934130D01*
 X114775489Y-97934130D02*
 X115203129Y-97506490D01*
-D48*
+X110550000Y-101518000D02*
+X112847500Y-99220500D01*
+X118937450Y-94785374D02*
+X122003637Y-94785374D01*
+X113538362Y-99220500D02*
+X114775489Y-97983373D01*
+X115203129Y-97506490D02*
+X116216334Y-97506490D01*
+D47*
 G04 #@! TO.N,USB5V*
 X113157250Y-67060787D02*
 X113157250Y-67343629D01*
@@ -5433,18 +5446,18 @@ X119080249Y-96534407D02*
 X118797407Y-96534407D01*
 X122645593Y-96534407D02*
 X119080249Y-96534407D01*
-X118797407Y-96817249D02*
-X118797407Y-96534407D01*
-X118797407Y-98096593D02*
-X118797407Y-96817249D01*
-X117165500Y-99728500D02*
-X118797407Y-98096593D01*
-X117165500Y-104294500D02*
-X117165500Y-99728500D01*
+D50*
 X117150000Y-105250000D02*
-X117150000Y-104310000D01*
-X117150000Y-104310000D02*
-X117165500Y-104294500D01*
+X117150000Y-102665000D01*
+D51*
+X118514565Y-96817249D02*
+X118797407Y-96534407D01*
+X117150000Y-102665000D02*
+X117165500Y-102649500D01*
+X117165500Y-98166314D02*
+X118514565Y-96817249D01*
+X117165500Y-102649500D02*
+X117165500Y-98166314D01*
 G04 #@! TO.N,AUDIO_L3*
 X131783916Y-79697994D02*
 X131677570Y-79697994D01*
@@ -5705,7 +5718,7 @@ X130930000Y-110780000D02*
 X135487271Y-110780000D01*
 X135487271Y-110780000D02*
 X135656559Y-110610712D01*
-D48*
+D47*
 G04 #@! TO.N,FTDI_nSLEEP*
 X149294439Y-103320847D02*
 X149577281Y-103320847D01*
@@ -5728,14 +5741,14 @@ X128390000Y-104820980D02*
 X129262981Y-103947999D01*
 X133870468Y-104503413D02*
 X132750843Y-104503413D01*
-D48*
+D47*
 G04 #@! TO.N,/blinkey/LED_PWREN*
 X128390000Y-106919020D02*
 X128390000Y-108580000D01*
 G04 #@! TO.N,/blinkey/LED_TXLED*
 X130930000Y-108580000D02*
 X130930000Y-107173020D01*
-D47*
+D50*
 G04 #@! TO.N,/sdcard/SD3V3*
 X109417708Y-106331708D02*
 X109417708Y-103381176D01*
@@ -5785,7 +5798,7 @@ X122503321Y-97125000D02*
 X120213500Y-97125000D01*
 X120213500Y-97125000D02*
 X119797842Y-97125000D01*
-D47*
+D50*
 X118250000Y-105250000D02*
 X118250000Y-102845000D01*
 D51*
@@ -5830,7 +5843,7 @@ X101694000Y-74560000D02*
 X103132000Y-74560000D01*
 X100718726Y-75535274D02*
 X101694000Y-74560000D01*
-D48*
+D47*
 G04 #@! TO.N,/blinkey/BTNPUL*
 X107704000Y-87110000D02*
 X101550000Y-87110000D01*
@@ -5949,7 +5962,7 @@ X142880000Y-83400000D02*
 X143237990Y-83042010D01*
 X143237990Y-83042010D02*
 X143287402Y-83042010D01*
-D48*
+D47*
 G04 #@! TO.N,/blinkey/ALED0*
 X120770000Y-80935000D02*
 X120770000Y-81752000D01*
@@ -6135,7 +6148,7 @@ X142080000Y-83400000D02*
 X142460000Y-83020000D01*
 X142880000Y-84200000D02*
 X143280000Y-83800000D01*
-D48*
+D47*
 G04 #@! TO.N,/usb/FPD+*
 X170249000Y-67026000D02*
 X170188000Y-67026000D01*
@@ -6166,7 +6179,7 @@ X127304845Y-89398330D02*
 X126448356Y-89398330D01*
 X129914212Y-88872123D02*
 X127831052Y-88872123D01*
-D48*
+D47*
 G04 #@! TO.N,/usb/ANT_433MHz*
 X129219111Y-86337433D02*
 X128621675Y-86337433D01*
@@ -6248,7 +6261,7 @@ X147014311Y-84600000D02*
 X147021277Y-84593034D01*
 X154082018Y-85303649D02*
 X156903982Y-85303649D01*
-D48*
+D47*
 G04 #@! TO.N,/analog/AUDIO_V*
 X120008000Y-67008000D02*
 X120008000Y-66312000D01*
@@ -6290,7 +6303,7 @@ X128713014Y-85305854D02*
 X128913013Y-85505853D01*
 X128275042Y-83691508D02*
 X128034710Y-83931840D01*
-D48*
+D47*
 G04 #@! TO.N,/blinkey/LED_WIFI*
 X125850000Y-106970000D02*
 X125850000Y-108580000D01*
@@ -6501,7 +6514,7 @@ X136279000Y-70455000D02*
 X137231500Y-71407500D01*
 X137231500Y-71407500D02*
 X137231500Y-72983537D01*
-D48*
+D47*
 G04 #@! TO.N,/blinkey/SWPU*
 X161410000Y-78425000D02*
 X163950000Y-78425000D01*
@@ -7027,7 +7040,7 @@ X125769916Y-101189452D02*
 X125769916Y-101784181D01*
 X125769916Y-101784181D02*
 X125850000Y-101864265D01*
-D48*
+D47*
 X125850000Y-104770000D02*
 X125677342Y-104597342D01*
 D51*
@@ -7060,7 +7073,7 @@ X140028978Y-81451022D02*
 X140028978Y-81400000D01*
 X139680000Y-81800000D02*
 X140028978Y-81451022D01*
-D48*
+D47*
 G04 #@! TO.N,/gpdi/GPDI_ETH+*
 X147046000Y-71562000D02*
 X147046000Y-70312000D01*
@@ -7082,7 +7095,7 @@ X149290724Y-77769449D02*
 X150361000Y-76699173D01*
 X150361000Y-76699173D02*
 X150361000Y-76521000D01*
-D48*
+D47*
 G04 #@! TO.N,/gpdi/GPDI_ETH-*
 X150312500Y-73122000D02*
 X150584500Y-72850000D01*
@@ -7120,7 +7133,7 @@ X147490529Y-78641471D02*
 X147490529Y-79589471D01*
 X147490529Y-79589471D02*
 X146080000Y-81000000D01*
-D48*
+D47*
 G04 #@! TO.N,/gpdi/GPDI_D2-*
 X140328000Y-74760247D02*
 X141546000Y-73542247D01*
@@ -7140,7 +7153,7 @@ X140480000Y-77519679D02*
 X140480000Y-79952513D01*
 X140480000Y-79952513D02*
 X140480000Y-80200000D01*
-D48*
+D47*
 G04 #@! TO.N,/gpdi/GPDI_D1-*
 X143046000Y-73534000D02*
 X142913999Y-73666001D01*
@@ -7164,7 +7177,7 @@ X142363826Y-78248375D02*
 X142363826Y-77049152D01*
 X142363826Y-77049152D02*
 X142891978Y-76521000D01*
-D48*
+D47*
 G04 #@! TO.N,/gpdi/GPDI_D0-*
 X145789000Y-74992140D02*
 X144546000Y-73749140D01*
@@ -7194,7 +7207,7 @@ X145789000Y-76546000D02*
 X145050071Y-77284929D01*
 X143280000Y-80600000D02*
 X143054999Y-80825001D01*
-D48*
+D47*
 G04 #@! TO.N,/gpdi/GPDI_CLK-*
 X146046000Y-73165159D02*
 X147099178Y-74218337D01*
@@ -7226,7 +7239,7 @@ X144882999Y-80597001D02*
 X144882999Y-80009439D01*
 X144480000Y-81000000D02*
 X144882999Y-80597001D01*
-D48*
+D47*
 G04 #@! TO.N,/gpdi/GPDI_D2+*
 X140546000Y-71562000D02*
 X140545490Y-71562510D01*
@@ -7250,7 +7263,7 @@ X139736658Y-79895855D02*
 X139736658Y-78383058D01*
 X139736658Y-78383058D02*
 X139058000Y-77704400D01*
-D48*
+D47*
 G04 #@! TO.N,/gpdi/GPDI_D1+*
 X141598000Y-74215206D02*
 X142046000Y-73767206D01*
@@ -7276,7 +7289,7 @@ X142046815Y-78117065D02*
 X142046815Y-77711941D01*
 X141280000Y-79952513D02*
 X141280000Y-80200000D01*
-D48*
+D47*
 G04 #@! TO.N,/gpdi/GPDI_D0+*
 X144392000Y-74273948D02*
 X143995001Y-73876949D01*
@@ -7304,7 +7317,7 @@ X142880000Y-79412689D02*
 X142880000Y-79400000D01*
 X142880000Y-80200000D02*
 X142880000Y-79412689D01*
-D48*
+D47*
 G04 #@! TO.N,/gpdi/GPDI_CLK+*
 X145046000Y-72868124D02*
 X147186876Y-75009000D01*
@@ -7407,18 +7420,18 @@ X144606344Y-79826169D02*
 X144606344Y-79644199D01*
 X144480000Y-79952513D02*
 X144606344Y-79826169D01*
-D48*
+D47*
 G04 #@! TO.N,2V5_3V3*
 X135280000Y-85800000D02*
 X135280000Y-85400000D01*
-D50*
+D49*
 X95370000Y-110950000D02*
 X97910000Y-110950000D01*
 X95370000Y-85550000D02*
 X97910000Y-85550000D01*
 X95370000Y-62690000D02*
 X97910000Y-62690000D01*
-D48*
+D47*
 X137550785Y-84294452D02*
 X137550785Y-84577294D01*
 X137676000Y-84200000D02*
@@ -7450,7 +7463,7 @@ X132596000Y-71725000D02*
 X132596000Y-69566000D01*
 X132596000Y-69566000D02*
 X133279500Y-69566000D01*
-D48*
+D47*
 G04 #@! TO.N,/usb/US2VBUS*
 X169920981Y-69686488D02*
 X169799881Y-69686488D01*
@@ -7526,6 +7539,31 @@ G04 #@! TD*
 D56*
 G04 #@! TO.N,GND*
 G36*
+X148395034Y-108484726D02*
+X148395037Y-108484726D01*
+X148447327Y-108495127D01*
+X148499617Y-108484726D01*
+X152159001Y-108484726D01*
+X152159001Y-109045000D01*
+X145261000Y-109045000D01*
+X145261000Y-108669947D01*
+X145449948Y-108481000D01*
+X148376302Y-108481000D01*
+X148395034Y-108484726D01*
+X148395034Y-108484726D01*
+G37*
+X148395034Y-108484726D02*
+X148395037Y-108484726D01*
+X148447327Y-108495127D01*
+X148499617Y-108484726D01*
+X152159001Y-108484726D01*
+X152159001Y-109045000D01*
+X145261000Y-109045000D01*
+X145261000Y-108669947D01*
+X145449948Y-108481000D01*
+X148376302Y-108481000D01*
+X148395034Y-108484726D01*
+G36*
 X140699657Y-97757578D02*
 X140788109Y-97971120D01*
 X140951547Y-98134558D01*
@@ -8485,31 +8523,6 @@ X136570932Y-97652985D01*
 X140699657Y-97652985D01*
 X140699657Y-97757578D01*
 G36*
-X148395034Y-108484726D02*
-X148395037Y-108484726D01*
-X148447327Y-108495127D01*
-X148499617Y-108484726D01*
-X152159001Y-108484726D01*
-X152159001Y-109045000D01*
-X145261000Y-109045000D01*
-X145261000Y-108669947D01*
-X145449948Y-108481000D01*
-X148376302Y-108481000D01*
-X148395034Y-108484726D01*
-X148395034Y-108484726D01*
-G37*
-X148395034Y-108484726D02*
-X148395037Y-108484726D01*
-X148447327Y-108495127D01*
-X148499617Y-108484726D01*
-X152159001Y-108484726D01*
-X152159001Y-109045000D01*
-X145261000Y-109045000D01*
-X145261000Y-108669947D01*
-X145449948Y-108481000D01*
-X148376302Y-108481000D01*
-X148395034Y-108484726D01*
-G36*
 X101079629Y-62355620D02*
 X101065487Y-62365068D01*
 X100753339Y-62813734D01*
@@ -11220,24 +11233,20 @@ X113581447Y-97758941D01*
 X113492995Y-97972483D01*
 X113492995Y-98203619D01*
 X113581447Y-98417161D01*
-X113624991Y-98460705D01*
-X112579198Y-99506500D01*
-X112132380Y-99506500D01*
-X112085500Y-99497175D01*
-X112038620Y-99506500D01*
-X111899774Y-99534118D01*
-X111742323Y-99639323D01*
-X111715767Y-99679067D01*
-X110246571Y-101148265D01*
-X110206824Y-101174823D01*
-X110137717Y-101278250D01*
-X110101618Y-101332275D01*
-X110064675Y-101518000D01*
-X110074001Y-101564885D01*
-X110074001Y-103047621D01*
-X110033376Y-102986823D01*
-X109944730Y-102854154D01*
-X109883691Y-102813370D01*
+X113624992Y-98460706D01*
+X113341198Y-98744500D01*
+X112894380Y-98744500D01*
+X112847500Y-98735175D01*
+X112661774Y-98772118D01*
+X112504323Y-98877323D01*
+X112477767Y-98917067D01*
+X110610185Y-100784651D01*
+X110550000Y-100772679D01*
+X110264779Y-100829413D01*
+X110022979Y-100990978D01*
+X109861414Y-101232778D01*
+X109819001Y-101446003D01*
+X109819001Y-102748679D01*
 X108255321Y-101185000D01*
 X108302002Y-101185000D01*
 X108302002Y-101026252D01*
@@ -15539,24 +15548,20 @@ X113581447Y-97758941D01*
 X113492995Y-97972483D01*
 X113492995Y-98203619D01*
 X113581447Y-98417161D01*
-X113624991Y-98460705D01*
-X112579198Y-99506500D01*
-X112132380Y-99506500D01*
-X112085500Y-99497175D01*
-X112038620Y-99506500D01*
-X111899774Y-99534118D01*
-X111742323Y-99639323D01*
-X111715767Y-99679067D01*
-X110246571Y-101148265D01*
-X110206824Y-101174823D01*
-X110137717Y-101278250D01*
-X110101618Y-101332275D01*
-X110064675Y-101518000D01*
-X110074001Y-101564885D01*
-X110074001Y-103047621D01*
-X110033376Y-102986823D01*
-X109944730Y-102854154D01*
-X109883691Y-102813370D01*
+X113624992Y-98460706D01*
+X113341198Y-98744500D01*
+X112894380Y-98744500D01*
+X112847500Y-98735175D01*
+X112661774Y-98772118D01*
+X112504323Y-98877323D01*
+X112477767Y-98917067D01*
+X110610185Y-100784651D01*
+X110550000Y-100772679D01*
+X110264779Y-100829413D01*
+X110022979Y-100990978D01*
+X109861414Y-101232778D01*
+X109819001Y-101446003D01*
+X109819001Y-102748679D01*
 X108255321Y-101185000D01*
 X108302002Y-101185000D01*
 X108302002Y-101026252D01*
@@ -17147,8 +17152,11 @@ X98913083Y-61951000D01*
 X102063317Y-61951000D01*
 X101079629Y-62355620D01*
 G36*
-X113374000Y-103926176D02*
-X113226309Y-103865000D01*
+X113374001Y-102038386D02*
+X113322979Y-102072478D01*
+X113161414Y-102314278D01*
+X113119001Y-102527503D01*
+X113119001Y-103865000D01*
 X113035750Y-103865000D01*
 X112877000Y-104023750D01*
 X112877000Y-105123000D01*
@@ -17163,15 +17171,17 @@ X112603000Y-105123000D01*
 X112623000Y-105123000D01*
 X112623000Y-104023750D01*
 X112464250Y-103865000D01*
-X112273691Y-103865000D01*
-X112126000Y-103926176D01*
-X112126000Y-101754344D01*
-X113374001Y-100506344D01*
-X113374000Y-103926176D01*
-X113374000Y-103926176D01*
+X112381000Y-103865000D01*
+X112381000Y-101499344D01*
+X113374000Y-100506345D01*
+X113374001Y-102038386D01*
+X113374001Y-102038386D01*
 G37*
-X113374000Y-103926176D02*
-X113226309Y-103865000D01*
+X113374001Y-102038386D02*
+X113322979Y-102072478D01*
+X113161414Y-102314278D01*
+X113119001Y-102527503D01*
+X113119001Y-103865000D01*
 X113035750Y-103865000D01*
 X112877000Y-104023750D01*
 X112877000Y-105123000D01*
@@ -17186,11 +17196,10 @@ X112603000Y-105123000D01*
 X112623000Y-105123000D01*
 X112623000Y-104023750D01*
 X112464250Y-103865000D01*
-X112273691Y-103865000D01*
-X112126000Y-103926176D01*
-X112126000Y-101754344D01*
-X113374001Y-100506344D01*
-X113374000Y-103926176D01*
+X112381000Y-103865000D01*
+X112381000Y-101499344D01*
+X113374000Y-100506345D01*
+X113374001Y-102038386D01*
 G36*
 X148255434Y-95998736D02*
 X148418872Y-96162174D01*
@@ -17324,7 +17333,7 @@ X154731823Y-100464823D01*
 X154705263Y-100504573D01*
 X154517571Y-100692265D01*
 X154477824Y-100718823D01*
-X154403935Y-100829406D01*
+X154398942Y-100836879D01*
 X154372618Y-100876275D01*
 X154335675Y-101062000D01*
 X154345001Y-101108884D01*
@@ -17496,7 +17505,7 @@ X154731823Y-100464823D01*
 X154705263Y-100504573D01*
 X154517571Y-100692265D01*
 X154477824Y-100718823D01*
-X154403935Y-100829406D01*
+X154398942Y-100836879D01*
 X154372618Y-100876275D01*
 X154335675Y-101062000D01*
 X154345001Y-101108884D01*
@@ -17535,63 +17544,67 @@ X148142467Y-95879406D01*
 X148196701Y-95856941D01*
 X148255434Y-95998736D01*
 G36*
-X119801000Y-102134835D02*
+X118934000Y-97240568D02*
+X119022452Y-97454110D01*
+X119185890Y-97617548D01*
+X119399432Y-97706000D01*
+X119630568Y-97706000D01*
+X119801001Y-97635404D01*
+X119801000Y-102134835D01*
 X119688835Y-102247000D01*
 X118670796Y-102247000D01*
 X118535222Y-102156413D01*
 X118250000Y-102099679D01*
 X117964779Y-102156413D01*
-X117722979Y-102317978D01*
-X117641500Y-102439920D01*
-X117641500Y-99925664D01*
-X119100837Y-98466328D01*
-X119140584Y-98439770D01*
-X119245789Y-98282319D01*
-X119250623Y-98258015D01*
-X119282732Y-98096594D01*
-X119273407Y-98049714D01*
-X119273407Y-97653799D01*
+X117774356Y-102283649D01*
+X117677022Y-102137978D01*
+X117641500Y-102114243D01*
+X117641500Y-98363478D01*
+X118884296Y-97120683D01*
+X118884298Y-97120680D01*
+X118889571Y-97115407D01*
+X118912975Y-97115407D01*
+X118934000Y-97106698D01*
+X118934000Y-97240568D01*
+X118934000Y-97240568D01*
+G37*
+X118934000Y-97240568D02*
+X119022452Y-97454110D01*
+X119185890Y-97617548D01*
 X119399432Y-97706000D01*
 X119630568Y-97706000D01*
 X119801001Y-97635404D01*
 X119801000Y-102134835D01*
-X119801000Y-102134835D01*
-G37*
-X119801000Y-102134835D02*
 X119688835Y-102247000D01*
 X118670796Y-102247000D01*
 X118535222Y-102156413D01*
 X118250000Y-102099679D01*
 X117964779Y-102156413D01*
-X117722979Y-102317978D01*
-X117641500Y-102439920D01*
-X117641500Y-99925664D01*
-X119100837Y-98466328D01*
-X119140584Y-98439770D01*
-X119245789Y-98282319D01*
-X119250623Y-98258015D01*
-X119282732Y-98096594D01*
-X119273407Y-98049714D01*
-X119273407Y-97653799D01*
-X119399432Y-97706000D01*
-X119630568Y-97706000D01*
-X119801001Y-97635404D01*
-X119801000Y-102134835D01*
+X117774356Y-102283649D01*
+X117677022Y-102137978D01*
+X117641500Y-102114243D01*
+X117641500Y-98363478D01*
+X118884296Y-97120683D01*
+X118884298Y-97120680D01*
+X118889571Y-97115407D01*
+X118912975Y-97115407D01*
+X118934000Y-97106698D01*
+X118934000Y-97240568D01*
 G36*
-X116245000Y-101436335D02*
-X115746571Y-101934765D01*
-X115706824Y-101961323D01*
-X115633252Y-102071432D01*
-X115601618Y-102118775D01*
-X115564675Y-102304500D01*
-X115574001Y-102351385D01*
-X115574001Y-102401618D01*
+X116245000Y-101753835D02*
+X116017539Y-101981297D01*
+X115800779Y-102024413D01*
+X115620015Y-102145196D01*
+X115584017Y-102181194D01*
+X115522979Y-102221978D01*
+X115488474Y-102273618D01*
 X115477022Y-102256478D01*
 X115235222Y-102094913D01*
 X114950000Y-102038179D01*
 X114664779Y-102094913D01*
-X114422979Y-102256478D01*
-X114326000Y-102401618D01*
+X114476204Y-102220915D01*
+X114377022Y-102072478D01*
+X114326000Y-102038386D01*
 X114326000Y-100129664D01*
 X115606665Y-98849000D01*
 X115630068Y-98849000D01*
@@ -17600,23 +17613,23 @@ X116007048Y-98597110D01*
 X116095500Y-98383568D01*
 X116095500Y-98299500D01*
 X116245001Y-98299500D01*
-X116245000Y-101436335D01*
-X116245000Y-101436335D01*
+X116245000Y-101753835D01*
+X116245000Y-101753835D01*
 G37*
-X116245000Y-101436335D02*
-X115746571Y-101934765D01*
-X115706824Y-101961323D01*
-X115633252Y-102071432D01*
-X115601618Y-102118775D01*
-X115564675Y-102304500D01*
-X115574001Y-102351385D01*
-X115574001Y-102401618D01*
+X116245000Y-101753835D02*
+X116017539Y-101981297D01*
+X115800779Y-102024413D01*
+X115620015Y-102145196D01*
+X115584017Y-102181194D01*
+X115522979Y-102221978D01*
+X115488474Y-102273618D01*
 X115477022Y-102256478D01*
 X115235222Y-102094913D01*
 X114950000Y-102038179D01*
 X114664779Y-102094913D01*
-X114422979Y-102256478D01*
-X114326000Y-102401618D01*
+X114476204Y-102220915D01*
+X114377022Y-102072478D01*
+X114326000Y-102038386D01*
 X114326000Y-100129664D01*
 X115606665Y-98849000D01*
 X115630068Y-98849000D01*
@@ -17625,7 +17638,7 @@ X116007048Y-98597110D01*
 X116095500Y-98383568D01*
 X116095500Y-98299500D01*
 X116245001Y-98299500D01*
-X116245000Y-101436335D01*
+X116245000Y-101753835D01*
 G36*
 X176574500Y-99190500D02*
 X177995500Y-99190500D01*
diff --git a/plot/ulx3s-F.Mask.gts b/plot/ulx3s-F.Mask.gts
index 6592d04..cbe847a 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-3*
-G04 #@! TF.CreationDate,2018-07-05T08:26:04+02:00*
+G04 #@! TF.CreationDate,2018-07-05T08:41:50+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 Thu Jul  5 08:26:04 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Thu Jul  5 08:41:50 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.Paste.gtp b/plot/ulx3s-F.Paste.gtp
index 35bb928..02eea76 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-3*
-G04 #@! TF.CreationDate,2018-07-05T08:26:03+02:00*
+G04 #@! TF.CreationDate,2018-07-05T08:41:50+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 Thu Jul  5 08:26:03 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Thu Jul  5 08:41:50 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-F.SilkS.gto b/plot/ulx3s-F.SilkS.gto
index 1e65a2c..516a2c4 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-3*
-G04 #@! TF.CreationDate,2018-07-05T08:26:04+02:00*
+G04 #@! TF.CreationDate,2018-07-05T08:41:50+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 Thu Jul  5 08:26:04 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Thu Jul  5 08:41:50 2018*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/plot/ulx3s-In1.Cu.g2 b/plot/ulx3s-In1.Cu.g2
index b6515ff..108f2d7 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-07-05T08:26:03+02:00*
+G04 #@! TF.CreationDate,2018-07-05T08:41:50+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 Thu Jul  5 08:26:03 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Thu Jul  5 08:41:50 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -39,19 +39,19 @@ G04 #@! TA.AperFunction,ViaPad*
 %ADD18C,0.400000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD19C,0.700000*%
+%ADD19C,0.454000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD20C,0.454000*%
+%ADD20C,0.600000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD21C,0.600000*%
+%ADD21C,1.000000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD22C,1.000000*%
+%ADD22C,0.800000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD23C,0.800000*%
+%ADD23C,0.700000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
 %ADD24C,0.300000*%
@@ -342,8 +342,6 @@ X124632693Y-93120351D03*
 D15*
 G04 #@! TO.N,GND*
 X118689500Y-101316000D03*
-D19*
-X112784000Y-102840000D03*
 D18*
 X141742847Y-69038361D03*
 X152408000Y-72169500D03*
@@ -351,7 +349,7 @@ X138480000Y-92600000D03*
 X140080000Y-92600000D03*
 X135280000Y-87000000D03*
 X145687392Y-90996646D03*
-D20*
+D19*
 X141675979Y-86986521D03*
 D18*
 X140876932Y-84552536D03*
@@ -359,23 +357,23 @@ X132882184Y-84635369D03*
 X132879996Y-82103336D03*
 X140922639Y-81447441D03*
 X177287984Y-96778661D03*
-D21*
+D20*
 X152510125Y-81695229D03*
 D18*
 X131264297Y-86227110D03*
 X135342764Y-89381630D03*
 X144103496Y-84660400D03*
-D22*
+D21*
 X177658444Y-82281349D03*
 D18*
 X145680000Y-81405125D03*
 X145691238Y-94166752D03*
-D22*
+D21*
 X163203000Y-94966000D03*
 X158539988Y-94868772D03*
-D23*
+D22*
 X164727000Y-81123000D03*
-D21*
+D20*
 X156262773Y-81349374D03*
 X123437000Y-108972000D03*
 D18*
@@ -391,9 +389,9 @@ X135284627Y-94985297D03*
 X135288625Y-94225619D03*
 X134455822Y-94267172D03*
 X136095958Y-93369652D03*
-D20*
+D19*
 X139264636Y-91615205D03*
-D22*
+D21*
 X116880503Y-64802940D03*
 X106974809Y-64953974D03*
 D18*
@@ -406,65 +404,65 @@ X136880000Y-92600000D03*
 X135280000Y-92600000D03*
 X132880000Y-91800000D03*
 X132880000Y-93400000D03*
-D20*
+D19*
 X139280000Y-87000000D03*
 X137680000Y-87000000D03*
 X136080000Y-84600000D03*
 X139280000Y-88600000D03*
-D22*
+D21*
 X175776000Y-63343000D03*
 X164854000Y-63343000D03*
 D18*
 X174252000Y-71471000D03*
-D22*
+D21*
 X158645000Y-98635000D03*
 X104402000Y-76932000D03*
 X123198000Y-64232000D03*
-D23*
+D22*
 X167267000Y-68677000D03*
-D21*
+D20*
 X179459000Y-71344000D03*
 D18*
 X170061000Y-103094000D03*
 X173109000Y-103094000D03*
-D22*
+D21*
 X166632000Y-96363000D03*
 X173490000Y-94585000D03*
-D23*
-X176411000Y-86838000D03*
 D22*
+X176411000Y-86838000D03*
+D21*
 X159266000Y-72360000D03*
 D18*
 X122944000Y-67788000D03*
-D22*
+D21*
 X118245000Y-67534000D03*
 D18*
 X114181000Y-76678000D03*
 X111006000Y-76551000D03*
 X106815000Y-76424000D03*
-D22*
+D21*
 X104910000Y-71725000D03*
 D18*
 X101354000Y-76297000D03*
 X116340000Y-76678000D03*
-D22*
+D21*
 X121674000Y-104618000D03*
-D23*
-X116594000Y-95474000D03*
 D22*
+X116594000Y-95474000D03*
+D21*
 X101989000Y-100681000D03*
 X108339000Y-71852000D03*
 X181491000Y-78202000D03*
 X178443000Y-89505000D03*
 X147455000Y-107031000D03*
 X149741000Y-108809000D03*
-D21*
+D20*
 X152408000Y-92997500D03*
 X154567000Y-77567000D03*
 X154567000Y-79154500D03*
 D18*
 X169045000Y-79535500D03*
-D22*
+D21*
 X173045500Y-77567000D03*
 X173934500Y-68550000D03*
 X180221000Y-94712000D03*
@@ -472,10 +470,12 @@ X181618000Y-92045000D03*
 X161171000Y-81123000D03*
 D15*
 X115197000Y-101316000D03*
+D22*
+X112784000Y-101633500D03*
 D18*
 G04 #@! TO.N,+5V*
 X149169500Y-68867500D03*
-D22*
+D21*
 X166275426Y-77459534D03*
 X107021491Y-67043629D03*
 X166255545Y-79350736D03*
@@ -484,7 +484,7 @@ X101707889Y-82423180D03*
 X166284693Y-95025145D03*
 D18*
 X174379000Y-85743000D03*
-D22*
+D21*
 G04 #@! TO.N,/gpio/IN5V*
 X157600000Y-62944000D03*
 G04 #@! TO.N,/gpio/OUT5V*
@@ -495,29 +495,29 @@ G04 #@! TO.N,+3V3*
 X119692151Y-77494120D03*
 X135263000Y-87727000D03*
 X141740000Y-89250994D03*
-D21*
+D20*
 X156091000Y-94585000D03*
 D18*
 X137803000Y-91664000D03*
-D21*
+D20*
 X181155918Y-104980708D03*
-D22*
+D21*
 X135105588Y-66616618D03*
 D18*
 X181491000Y-91156000D03*
 X113660608Y-89375718D03*
-D22*
+D21*
 X148268387Y-79050018D03*
 D18*
 X114513935Y-82409431D03*
 X132110753Y-92527478D03*
 X165803369Y-97344883D03*
-D21*
+D20*
 X154593901Y-94607945D03*
-D22*
+D21*
 X164625730Y-94982471D03*
 X176254940Y-94288458D03*
-D23*
+D22*
 X110593913Y-108636458D03*
 D18*
 X180340784Y-77316932D03*
@@ -527,22 +527,22 @@ X139272517Y-84611349D03*
 X141680000Y-86200000D03*
 X132880000Y-92600000D03*
 X141680000Y-85400000D03*
-D19*
+D23*
 X102624000Y-98141000D03*
-D22*
+D21*
 X100973000Y-94331000D03*
 D18*
 X110117000Y-71852000D03*
 X148979000Y-67529972D03*
-D22*
+D21*
 X181745000Y-99919000D03*
-D23*
+D22*
 X172347000Y-87473000D03*
-D21*
+D20*
 X163457000Y-81123000D03*
-D22*
-X161044000Y-94966000D03*
 D21*
+X161044000Y-94966000D03*
+D20*
 X158758000Y-81250000D03*
 D18*
 G04 #@! TO.N,BTN_F1*
@@ -560,7 +560,7 @@ X147175985Y-97333919D03*
 X147700000Y-93820000D03*
 G04 #@! TO.N,+2V5*
 X142107219Y-91201016D03*
-D22*
+D21*
 X110128890Y-90028152D03*
 D18*
 X142480000Y-83800000D03*
@@ -584,7 +584,7 @@ X133680000Y-91800000D03*
 G04 #@! TO.N,JTAG_TCK*
 X135517000Y-97633000D03*
 X134675868Y-108131585D03*
-D20*
+D19*
 X133449289Y-102232615D03*
 D18*
 X133680000Y-92600000D03*
@@ -634,7 +634,7 @@ X144894316Y-86977564D03*
 G04 #@! TO.N,SDRAM_D13*
 X144896700Y-83863953D03*
 X149527221Y-80838006D03*
-D20*
+D19*
 G04 #@! TO.N,SDRAM_D6*
 X147343891Y-93217126D03*
 D18*
@@ -645,7 +645,7 @@ X144875155Y-86292748D03*
 G04 #@! TO.N,SDRAM_D12*
 X144916886Y-83019942D03*
 X148696112Y-80861847D03*
-D20*
+D19*
 G04 #@! TO.N,SDRAM_D5*
 X148349010Y-93322307D03*
 D18*
@@ -752,7 +752,7 @@ X135656559Y-110610712D03*
 G04 #@! TO.N,FTDI_nSLEEP*
 X149577281Y-103320847D03*
 X132468001Y-104503413D03*
-D19*
+D23*
 G04 #@! TO.N,/sdcard/SD3V3*
 X104260000Y-100790000D03*
 D18*
@@ -844,11 +844,11 @@ X139322319Y-90164039D03*
 X140080000Y-89400000D03*
 X136880000Y-89400000D03*
 X140896226Y-87816226D03*
-D20*
+D19*
 X136938110Y-86196311D03*
 D18*
 X140014602Y-86192969D03*
-D22*
+D21*
 X151758000Y-99774000D03*
 D18*
 G04 #@! TO.N,SW4*
@@ -892,7 +892,7 @@ X135034780Y-77831198D03*
 G04 #@! TO.N,GP6*
 X134508502Y-81406751D03*
 X134177298Y-77721089D03*
-D20*
+D19*
 G04 #@! TO.N,GN14*
 X146942280Y-96452058D03*
 G04 #@! TO.N,GP14*
@@ -1038,11 +1038,11 @@ G04 #@! TO.N,/gpdi/FPDI_CEC*
 X144606344Y-79361357D03*
 G04 #@! TO.N,2V5_3V3*
 X157996000Y-72487000D03*
-D22*
+D21*
 X100855891Y-71574861D03*
 D18*
 X135280000Y-85400000D03*
-D21*
+D20*
 X100652119Y-90162239D03*
 D18*
 X137550785Y-84577294D03*
@@ -12473,25 +12473,6 @@ X105943644Y-103147370D01*
 X106062196Y-103098264D01*
 X106172046Y-102988414D01*
 X106231496Y-102844889D01*
-X106231496Y-102732488D01*
-X112243500Y-102732488D01*
-X112243500Y-102947512D01*
-X112325786Y-103146169D01*
-X112477831Y-103298214D01*
-X112676488Y-103380500D01*
-X112891512Y-103380500D01*
-X113090169Y-103298214D01*
-X113242214Y-103146169D01*
-X113324500Y-102947512D01*
-X113324500Y-102732488D01*
-X113242214Y-102533831D01*
-X113090169Y-102381786D01*
-X112891512Y-102299500D01*
-X112676488Y-102299500D01*
-X112477831Y-102381786D01*
-X112325786Y-102533831D01*
-X112243500Y-102732488D01*
-X106231496Y-102732488D01*
 X106231496Y-102689539D01*
 X106172046Y-102546014D01*
 X106109997Y-102483965D01*
@@ -12507,6 +12488,62 @@ X105998452Y-101702965D01*
 X105952568Y-101721971D01*
 X105963259Y-101696160D01*
 X105963259Y-101540810D01*
+X105953000Y-101516042D01*
+X112193500Y-101516042D01*
+X112193500Y-101750958D01*
+X112283398Y-101967992D01*
+X112449508Y-102134102D01*
+X112666542Y-102224000D01*
+X112901458Y-102224000D01*
+X113118492Y-102134102D01*
+X113284602Y-101967992D01*
+X113374500Y-101750958D01*
+X113374500Y-101516042D01*
+X113284602Y-101299008D01*
+X113118492Y-101132898D01*
+X112988841Y-101079195D01*
+X114006500Y-101079195D01*
+X114006500Y-101552805D01*
+X114187743Y-101990364D01*
+X114522636Y-102325257D01*
+X114960195Y-102506500D01*
+X115433805Y-102506500D01*
+X115871364Y-102325257D01*
+X116206257Y-101990364D01*
+X116387500Y-101552805D01*
+X116387500Y-101079195D01*
+X117499000Y-101079195D01*
+X117499000Y-101552805D01*
+X117680243Y-101990364D01*
+X118015136Y-102325257D01*
+X118452695Y-102506500D01*
+X118926305Y-102506500D01*
+X119363864Y-102325257D01*
+X119698757Y-101990364D01*
+X119880000Y-101552805D01*
+X119880000Y-101079195D01*
+X119698757Y-100641636D01*
+X119363864Y-100306743D01*
+X118926305Y-100125500D01*
+X118452695Y-100125500D01*
+X118015136Y-100306743D01*
+X117680243Y-100641636D01*
+X117499000Y-101079195D01*
+X116387500Y-101079195D01*
+X116206257Y-100641636D01*
+X115871364Y-100306743D01*
+X115433805Y-100125500D01*
+X114960195Y-100125500D01*
+X114522636Y-100306743D01*
+X114187743Y-100641636D01*
+X114006500Y-101079195D01*
+X112988841Y-101079195D01*
+X112901458Y-101043000D01*
+X112666542Y-101043000D01*
+X112449508Y-101132898D01*
+X112283398Y-101299008D01*
+X112193500Y-101516042D01*
+X105953000Y-101516042D01*
 X105903809Y-101397285D01*
 X105793959Y-101287435D01*
 X105650434Y-101227985D01*
@@ -12571,43 +12608,6 @@ X104152488Y-101330500D01*
 X104367512Y-101330500D01*
 X104566169Y-101248214D01*
 X104718214Y-101096169D01*
-X104725244Y-101079195D01*
-X114006500Y-101079195D01*
-X114006500Y-101552805D01*
-X114187743Y-101990364D01*
-X114522636Y-102325257D01*
-X114960195Y-102506500D01*
-X115433805Y-102506500D01*
-X115871364Y-102325257D01*
-X116206257Y-101990364D01*
-X116387500Y-101552805D01*
-X116387500Y-101079195D01*
-X117499000Y-101079195D01*
-X117499000Y-101552805D01*
-X117680243Y-101990364D01*
-X118015136Y-102325257D01*
-X118452695Y-102506500D01*
-X118926305Y-102506500D01*
-X119363864Y-102325257D01*
-X119698757Y-101990364D01*
-X119880000Y-101552805D01*
-X119880000Y-101079195D01*
-X119698757Y-100641636D01*
-X119363864Y-100306743D01*
-X118926305Y-100125500D01*
-X118452695Y-100125500D01*
-X118015136Y-100306743D01*
-X117680243Y-100641636D01*
-X117499000Y-101079195D01*
-X116387500Y-101079195D01*
-X116206257Y-100641636D01*
-X115871364Y-100306743D01*
-X115433805Y-100125500D01*
-X114960195Y-100125500D01*
-X114522636Y-100306743D01*
-X114187743Y-100641636D01*
-X114006500Y-101079195D01*
-X104725244Y-101079195D01*
 X104800500Y-100897512D01*
 X104800500Y-100682488D01*
 X104718214Y-100483831D01*
@@ -18948,25 +18948,6 @@ X105943644Y-103147370D01*
 X106062196Y-103098264D01*
 X106172046Y-102988414D01*
 X106231496Y-102844889D01*
-X106231496Y-102732488D01*
-X112243500Y-102732488D01*
-X112243500Y-102947512D01*
-X112325786Y-103146169D01*
-X112477831Y-103298214D01*
-X112676488Y-103380500D01*
-X112891512Y-103380500D01*
-X113090169Y-103298214D01*
-X113242214Y-103146169D01*
-X113324500Y-102947512D01*
-X113324500Y-102732488D01*
-X113242214Y-102533831D01*
-X113090169Y-102381786D01*
-X112891512Y-102299500D01*
-X112676488Y-102299500D01*
-X112477831Y-102381786D01*
-X112325786Y-102533831D01*
-X112243500Y-102732488D01*
-X106231496Y-102732488D01*
 X106231496Y-102689539D01*
 X106172046Y-102546014D01*
 X106109997Y-102483965D01*
@@ -18982,6 +18963,62 @@ X105998452Y-101702965D01*
 X105952568Y-101721971D01*
 X105963259Y-101696160D01*
 X105963259Y-101540810D01*
+X105953000Y-101516042D01*
+X112193500Y-101516042D01*
+X112193500Y-101750958D01*
+X112283398Y-101967992D01*
+X112449508Y-102134102D01*
+X112666542Y-102224000D01*
+X112901458Y-102224000D01*
+X113118492Y-102134102D01*
+X113284602Y-101967992D01*
+X113374500Y-101750958D01*
+X113374500Y-101516042D01*
+X113284602Y-101299008D01*
+X113118492Y-101132898D01*
+X112988841Y-101079195D01*
+X114006500Y-101079195D01*
+X114006500Y-101552805D01*
+X114187743Y-101990364D01*
+X114522636Y-102325257D01*
+X114960195Y-102506500D01*
+X115433805Y-102506500D01*
+X115871364Y-102325257D01*
+X116206257Y-101990364D01*
+X116387500Y-101552805D01*
+X116387500Y-101079195D01*
+X117499000Y-101079195D01*
+X117499000Y-101552805D01*
+X117680243Y-101990364D01*
+X118015136Y-102325257D01*
+X118452695Y-102506500D01*
+X118926305Y-102506500D01*
+X119363864Y-102325257D01*
+X119698757Y-101990364D01*
+X119880000Y-101552805D01*
+X119880000Y-101079195D01*
+X119698757Y-100641636D01*
+X119363864Y-100306743D01*
+X118926305Y-100125500D01*
+X118452695Y-100125500D01*
+X118015136Y-100306743D01*
+X117680243Y-100641636D01*
+X117499000Y-101079195D01*
+X116387500Y-101079195D01*
+X116206257Y-100641636D01*
+X115871364Y-100306743D01*
+X115433805Y-100125500D01*
+X114960195Y-100125500D01*
+X114522636Y-100306743D01*
+X114187743Y-100641636D01*
+X114006500Y-101079195D01*
+X112988841Y-101079195D01*
+X112901458Y-101043000D01*
+X112666542Y-101043000D01*
+X112449508Y-101132898D01*
+X112283398Y-101299008D01*
+X112193500Y-101516042D01*
+X105953000Y-101516042D01*
 X105903809Y-101397285D01*
 X105793959Y-101287435D01*
 X105650434Y-101227985D01*
@@ -19046,43 +19083,6 @@ X104152488Y-101330500D01*
 X104367512Y-101330500D01*
 X104566169Y-101248214D01*
 X104718214Y-101096169D01*
-X104725244Y-101079195D01*
-X114006500Y-101079195D01*
-X114006500Y-101552805D01*
-X114187743Y-101990364D01*
-X114522636Y-102325257D01*
-X114960195Y-102506500D01*
-X115433805Y-102506500D01*
-X115871364Y-102325257D01*
-X116206257Y-101990364D01*
-X116387500Y-101552805D01*
-X116387500Y-101079195D01*
-X117499000Y-101079195D01*
-X117499000Y-101552805D01*
-X117680243Y-101990364D01*
-X118015136Y-102325257D01*
-X118452695Y-102506500D01*
-X118926305Y-102506500D01*
-X119363864Y-102325257D01*
-X119698757Y-101990364D01*
-X119880000Y-101552805D01*
-X119880000Y-101079195D01*
-X119698757Y-100641636D01*
-X119363864Y-100306743D01*
-X118926305Y-100125500D01*
-X118452695Y-100125500D01*
-X118015136Y-100306743D01*
-X117680243Y-100641636D01*
-X117499000Y-101079195D01*
-X116387500Y-101079195D01*
-X116206257Y-100641636D01*
-X115871364Y-100306743D01*
-X115433805Y-100125500D01*
-X114960195Y-100125500D01*
-X114522636Y-100306743D01*
-X114187743Y-100641636D01*
-X114006500Y-101079195D01*
-X104725244Y-101079195D01*
 X104800500Y-100897512D01*
 X104800500Y-100682488D01*
 X104718214Y-100483831D01*
diff --git a/plot/ulx3s-In2.Cu.g3 b/plot/ulx3s-In2.Cu.g3
index e66bd90..8208dca 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-07-05T08:26:03+02:00*
+G04 #@! TF.CreationDate,2018-07-05T08:41:50+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 Thu Jul  5 08:26:03 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Thu Jul  5 08:41:50 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -39,19 +39,19 @@ G04 #@! TA.AperFunction,ViaPad*
 %ADD18C,0.400000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD19C,0.700000*%
+%ADD19C,0.454000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD20C,0.454000*%
+%ADD20C,0.600000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD21C,0.600000*%
+%ADD21C,1.000000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD22C,1.000000*%
+%ADD22C,0.800000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
-%ADD23C,0.800000*%
+%ADD23C,0.700000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,Conductor*
 %ADD24C,0.300000*%
@@ -324,8 +324,6 @@ X124632693Y-93120351D03*
 D15*
 G04 #@! TO.N,GND*
 X118689500Y-101316000D03*
-D19*
-X112784000Y-102840000D03*
 D18*
 X141742847Y-69038361D03*
 X152408000Y-72169500D03*
@@ -333,7 +331,7 @@ X138480000Y-92600000D03*
 X140080000Y-92600000D03*
 X135280000Y-87000000D03*
 X145687392Y-90996646D03*
-D20*
+D19*
 X141675979Y-86986521D03*
 D18*
 X140876932Y-84552536D03*
@@ -341,23 +339,23 @@ X132882184Y-84635369D03*
 X132879996Y-82103336D03*
 X140922639Y-81447441D03*
 X177287984Y-96778661D03*
-D21*
+D20*
 X152510125Y-81695229D03*
 D18*
 X131264297Y-86227110D03*
 X135342764Y-89381630D03*
 X144103496Y-84660400D03*
-D22*
+D21*
 X177658444Y-82281349D03*
 D18*
 X145680000Y-81405125D03*
 X145691238Y-94166752D03*
-D22*
+D21*
 X163203000Y-94966000D03*
 X158539988Y-94868772D03*
-D23*
+D22*
 X164727000Y-81123000D03*
-D21*
+D20*
 X156262773Y-81349374D03*
 X123437000Y-108972000D03*
 D18*
@@ -373,9 +371,9 @@ X135284627Y-94985297D03*
 X135288625Y-94225619D03*
 X134455822Y-94267172D03*
 X136095958Y-93369652D03*
-D20*
+D19*
 X139264636Y-91615205D03*
-D22*
+D21*
 X116880503Y-64802940D03*
 X106974809Y-64953974D03*
 D18*
@@ -388,65 +386,65 @@ X136880000Y-92600000D03*
 X135280000Y-92600000D03*
 X132880000Y-91800000D03*
 X132880000Y-93400000D03*
-D20*
+D19*
 X139280000Y-87000000D03*
 X137680000Y-87000000D03*
 X136080000Y-84600000D03*
 X139280000Y-88600000D03*
-D22*
+D21*
 X175776000Y-63343000D03*
 X164854000Y-63343000D03*
 D18*
 X174252000Y-71471000D03*
-D22*
+D21*
 X158645000Y-98635000D03*
 X104402000Y-76932000D03*
 X123198000Y-64232000D03*
-D23*
+D22*
 X167267000Y-68677000D03*
-D21*
+D20*
 X179459000Y-71344000D03*
 D18*
 X170061000Y-103094000D03*
 X173109000Y-103094000D03*
-D22*
+D21*
 X166632000Y-96363000D03*
 X173490000Y-94585000D03*
-D23*
-X176411000Y-86838000D03*
 D22*
+X176411000Y-86838000D03*
+D21*
 X159266000Y-72360000D03*
 D18*
 X122944000Y-67788000D03*
-D22*
+D21*
 X118245000Y-67534000D03*
 D18*
 X114181000Y-76678000D03*
 X111006000Y-76551000D03*
 X106815000Y-76424000D03*
-D22*
+D21*
 X104910000Y-71725000D03*
 D18*
 X101354000Y-76297000D03*
 X116340000Y-76678000D03*
-D22*
+D21*
 X121674000Y-104618000D03*
-D23*
-X116594000Y-95474000D03*
 D22*
+X116594000Y-95474000D03*
+D21*
 X101989000Y-100681000D03*
 X108339000Y-71852000D03*
 X181491000Y-78202000D03*
 X178443000Y-89505000D03*
 X147455000Y-107031000D03*
 X149741000Y-108809000D03*
-D21*
+D20*
 X152408000Y-92997500D03*
 X154567000Y-77567000D03*
 X154567000Y-79154500D03*
 D18*
 X169045000Y-79535500D03*
-D22*
+D21*
 X173045500Y-77567000D03*
 X173934500Y-68550000D03*
 X180221000Y-94712000D03*
@@ -454,10 +452,12 @@ X181618000Y-92045000D03*
 X161171000Y-81123000D03*
 D15*
 X115197000Y-101316000D03*
+D22*
+X112784000Y-101633500D03*
 D18*
 G04 #@! TO.N,+5V*
 X149169500Y-68867500D03*
-D22*
+D21*
 X166275426Y-77459534D03*
 X107021491Y-67043629D03*
 X166255545Y-79350736D03*
@@ -466,7 +466,7 @@ X101707889Y-82423180D03*
 X166284693Y-95025145D03*
 D18*
 X174379000Y-85743000D03*
-D22*
+D21*
 G04 #@! TO.N,/gpio/IN5V*
 X157600000Y-62944000D03*
 G04 #@! TO.N,/gpio/OUT5V*
@@ -477,29 +477,29 @@ G04 #@! TO.N,+3V3*
 X119692151Y-77494120D03*
 X135263000Y-87727000D03*
 X141740000Y-89250994D03*
-D21*
+D20*
 X156091000Y-94585000D03*
 D18*
 X137803000Y-91664000D03*
-D21*
+D20*
 X181155918Y-104980708D03*
-D22*
+D21*
 X135105588Y-66616618D03*
 D18*
 X181491000Y-91156000D03*
 X113660608Y-89375718D03*
-D22*
+D21*
 X148268387Y-79050018D03*
 D18*
 X114513935Y-82409431D03*
 X132110753Y-92527478D03*
 X165803369Y-97344883D03*
-D21*
+D20*
 X154593901Y-94607945D03*
-D22*
+D21*
 X164625730Y-94982471D03*
 X176254940Y-94288458D03*
-D23*
+D22*
 X110593913Y-108636458D03*
 D18*
 X180340784Y-77316932D03*
@@ -509,22 +509,22 @@ X139272517Y-84611349D03*
 X141680000Y-86200000D03*
 X132880000Y-92600000D03*
 X141680000Y-85400000D03*
-D19*
+D23*
 X102624000Y-98141000D03*
-D22*
+D21*
 X100973000Y-94331000D03*
 D18*
 X110117000Y-71852000D03*
 X148979000Y-67529972D03*
-D22*
+D21*
 X181745000Y-99919000D03*
-D23*
+D22*
 X172347000Y-87473000D03*
-D21*
+D20*
 X163457000Y-81123000D03*
-D22*
-X161044000Y-94966000D03*
 D21*
+X161044000Y-94966000D03*
+D20*
 X158758000Y-81250000D03*
 D18*
 G04 #@! TO.N,BTN_F1*
@@ -542,7 +542,7 @@ X147175985Y-97333919D03*
 X147700000Y-93820000D03*
 G04 #@! TO.N,+2V5*
 X142107219Y-91201016D03*
-D22*
+D21*
 X110128890Y-90028152D03*
 D18*
 X142480000Y-83800000D03*
@@ -566,7 +566,7 @@ X133680000Y-91800000D03*
 G04 #@! TO.N,JTAG_TCK*
 X135517000Y-97633000D03*
 X134675868Y-108131585D03*
-D20*
+D19*
 X133449289Y-102232615D03*
 D18*
 X133680000Y-92600000D03*
@@ -616,7 +616,7 @@ X144894316Y-86977564D03*
 G04 #@! TO.N,SDRAM_D13*
 X144896700Y-83863953D03*
 X149527221Y-80838006D03*
-D20*
+D19*
 G04 #@! TO.N,SDRAM_D6*
 X147343891Y-93217126D03*
 D18*
@@ -627,7 +627,7 @@ X144875155Y-86292748D03*
 G04 #@! TO.N,SDRAM_D12*
 X144916886Y-83019942D03*
 X148696112Y-80861847D03*
-D20*
+D19*
 G04 #@! TO.N,SDRAM_D5*
 X148349010Y-93322307D03*
 D18*
@@ -734,7 +734,7 @@ X135656559Y-110610712D03*
 G04 #@! TO.N,FTDI_nSLEEP*
 X149577281Y-103320847D03*
 X132468001Y-104503413D03*
-D19*
+D23*
 G04 #@! TO.N,/sdcard/SD3V3*
 X104260000Y-100790000D03*
 D18*
@@ -826,11 +826,11 @@ X139322319Y-90164039D03*
 X140080000Y-89400000D03*
 X136880000Y-89400000D03*
 X140896226Y-87816226D03*
-D20*
+D19*
 X136938110Y-86196311D03*
 D18*
 X140014602Y-86192969D03*
-D22*
+D21*
 X151758000Y-99774000D03*
 D18*
 G04 #@! TO.N,SW4*
@@ -874,7 +874,7 @@ X135034780Y-77831198D03*
 G04 #@! TO.N,GP6*
 X134508502Y-81406751D03*
 X134177298Y-77721089D03*
-D20*
+D19*
 G04 #@! TO.N,GN14*
 X146942280Y-96452058D03*
 G04 #@! TO.N,GP14*
@@ -1020,11 +1020,11 @@ G04 #@! TO.N,/gpdi/FPDI_CEC*
 X144606344Y-79361357D03*
 G04 #@! TO.N,2V5_3V3*
 X157996000Y-72487000D03*
-D22*
+D21*
 X100855891Y-71574861D03*
 D18*
 X135280000Y-85400000D03*
-D21*
+D20*
 X100652119Y-90162239D03*
 D18*
 X137550785Y-84577294D03*
diff --git a/plot/ulx3s-bottom.pos b/plot/ulx3s-bottom.pos
index a37aea9..00c9c7f 100644
--- a/plot/ulx3s-bottom.pos
+++ b/plot/ulx3s-bottom.pos
@@ -1,4 +1,4 @@
-### Module positions - created on Thu Jul  5 08:26:15 2018 ###
+### Module positions - created on Thu Jul  5 08:41:39 2018 ###
 ### Printed by Pcbnew version kicad 5.0.0-rc2+dfsg1-3
 ## Unit = mm, Angle = deg.
 ## Side : bottom
diff --git a/plot/ulx3s-drl_map.gbr b/plot/ulx3s-drl_map.gbr
index 81b54f2..d030129 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 Thu Jul  5 08:26:02 2018*
+G04 Created by KiCad (PCBNEW 5.0.0-rc2+dfsg1-3) date Thu Jul  5 08:41:48 2018*
 %MOMM*%
 %LPD*%
 G01*
@@ -1598,10 +1598,6 @@ X10426000Y-10064000D02*
 X10426000Y-10094000D01*
 X10411000Y-10079000D02*
 X10441000Y-10079000D01*
-X11278400Y-10269000D02*
-X11278400Y-10299000D01*
-X11263400Y-10284000D02*
-X11293400Y-10284000D01*
 X12343700Y-10882200D02*
 X12343700Y-10912200D01*
 X12328700Y-10897200D02*
@@ -1660,6 +1656,11 @@ X11079391Y-10863646D01*
 X11059391Y-10843646D01*
 X11039391Y-10863646D01*
 X11059391Y-10883646D01*
+X11278400Y-10183350D02*
+X11298400Y-10163350D01*
+X11278400Y-10143350D01*
+X11258400Y-10163350D01*
+X11278400Y-10183350D01*
 X11659400Y-9567400D02*
 X11679400Y-9547400D01*
 X11659400Y-9527400D01*
@@ -2095,60 +2096,6 @@ X13548956Y-7137144D01*
 X13478244Y-7137144D01*
 X13478244Y-7207856D01*
 X13548956Y-7207856D01*
-X13740700Y-10409200D02*
-X13842300Y-10510800D01*
-X13842300Y-10409200D02*
-X13740700Y-10510800D01*
-X13791500Y-10510800D02*
-X13842300Y-10460000D01*
-X13791500Y-10409200D01*
-X13740700Y-10460000D01*
-X13791500Y-10510800D01*
-X13740700Y-10663200D02*
-X13842300Y-10764800D01*
-X13842300Y-10663200D02*
-X13740700Y-10764800D01*
-X13791500Y-10764800D02*
-X13842300Y-10714000D01*
-X13791500Y-10663200D01*
-X13740700Y-10714000D01*
-X13791500Y-10764800D01*
-X13740700Y-10917200D02*
-X13842300Y-11018800D01*
-X13842300Y-10917200D02*
-X13740700Y-11018800D01*
-X13791500Y-11018800D02*
-X13842300Y-10968000D01*
-X13791500Y-10917200D01*
-X13740700Y-10968000D01*
-X13791500Y-11018800D01*
-X13994700Y-10409200D02*
-X14096300Y-10510800D01*
-X14096300Y-10409200D02*
-X13994700Y-10510800D01*
-X14045500Y-10510800D02*
-X14096300Y-10460000D01*
-X14045500Y-10409200D01*
-X13994700Y-10460000D01*
-X14045500Y-10510800D01*
-X13994700Y-10663200D02*
-X14096300Y-10764800D01*
-X14096300Y-10663200D02*
-X13994700Y-10764800D01*
-X14045500Y-10764800D02*
-X14096300Y-10714000D01*
-X14045500Y-10663200D01*
-X13994700Y-10714000D01*
-X14045500Y-10764800D01*
-X13994700Y-10917200D02*
-X14096300Y-11018800D01*
-X14096300Y-10917200D02*
-X13994700Y-11018800D01*
-X14045500Y-11018800D02*
-X14096300Y-10968000D01*
-X14045500Y-10917200D01*
-X13994700Y-10968000D01*
-X14045500Y-11018800D01*
 X9486200Y-6218200D02*
 X9587800Y-6319800D01*
 X9587800Y-6218200D02*
@@ -2509,69 +2456,60 @@ X9841800Y-11095000D01*
 X9791000Y-11044200D01*
 X9740200Y-11095000D01*
 X9791000Y-11145800D01*
-X13169200Y-10028200D02*
-X13270800Y-10129800D01*
-X13270800Y-10028200D02*
-X13169200Y-10129800D01*
-X13220000Y-10129800D02*
-X13270800Y-10079000D01*
-X13220000Y-10028200D01*
-X13169200Y-10079000D01*
-X13220000Y-10129800D01*
-X13423200Y-10028200D02*
-X13524800Y-10129800D01*
-X13524800Y-10028200D02*
-X13423200Y-10129800D01*
-X13474000Y-10129800D02*
-X13524800Y-10079000D01*
-X13474000Y-10028200D01*
-X13423200Y-10079000D01*
-X13474000Y-10129800D01*
-X13677200Y-10028200D02*
-X13778800Y-10129800D01*
-X13778800Y-10028200D02*
-X13677200Y-10129800D01*
-X13728000Y-10129800D02*
-X13778800Y-10079000D01*
-X13728000Y-10028200D01*
-X13677200Y-10079000D01*
-X13728000Y-10129800D01*
-X13931200Y-10028200D02*
-X14032800Y-10129800D01*
-X14032800Y-10028200D02*
-X13931200Y-10129800D01*
-X13982000Y-10129800D02*
-X14032800Y-10079000D01*
-X13982000Y-10028200D01*
-X13931200Y-10079000D01*
-X13982000Y-10129800D01*
-X14185200Y-10028200D02*
-X14286800Y-10129800D01*
-X14286800Y-10028200D02*
-X14185200Y-10129800D01*
-X14236000Y-10129800D02*
-X14286800Y-10079000D01*
-X14236000Y-10028200D01*
-X14185200Y-10079000D01*
-X14236000Y-10129800D01*
-X14439200Y-10028200D02*
-X14540800Y-10129800D01*
-X14540800Y-10028200D02*
-X14439200Y-10129800D01*
-X14490000Y-10129800D02*
-X14540800Y-10079000D01*
-X14490000Y-10028200D01*
-X14439200Y-10079000D01*
-X14490000Y-10129800D01*
-X14693200Y-10028200D02*
-X14794800Y-10129800D01*
-X14794800Y-10028200D02*
-X14693200Y-10129800D01*
-X14744000Y-10129800D02*
-X14794800Y-10079000D01*
-X14744000Y-10028200D01*
-X14693200Y-10079000D01*
-X14744000Y-10129800D01*
+X13740700Y-10409200D02*
+X13842300Y-10510800D01*
+X13842300Y-10409200D02*
+X13740700Y-10510800D01*
+X13791500Y-10510800D02*
+X13842300Y-10460000D01*
+X13791500Y-10409200D01*
+X13740700Y-10460000D01*
+X13791500Y-10510800D01*
+X13740700Y-10663200D02*
+X13842300Y-10764800D01*
+X13842300Y-10663200D02*
+X13740700Y-10764800D01*
+X13791500Y-10764800D02*
+X13842300Y-10714000D01*
+X13791500Y-10663200D01*
+X13740700Y-10714000D01*
+X13791500Y-10764800D01*
+X13740700Y-10917200D02*
+X13842300Y-11018800D01*
+X13842300Y-10917200D02*
+X13740700Y-11018800D01*
+X13791500Y-11018800D02*
+X13842300Y-10968000D01*
+X13791500Y-10917200D01*
+X13740700Y-10968000D01*
+X13791500Y-11018800D01*
+X13994700Y-10409200D02*
+X14096300Y-10510800D01*
+X14096300Y-10409200D02*
+X13994700Y-10510800D01*
+X14045500Y-10510800D02*
+X14096300Y-10460000D01*
+X14045500Y-10409200D01*
+X13994700Y-10460000D01*
+X14045500Y-10510800D01*
+X13994700Y-10663200D02*
+X14096300Y-10764800D01*
+X14096300Y-10663200D02*
+X13994700Y-10764800D01*
+X14045500Y-10764800D02*
+X14096300Y-10714000D01*
+X14045500Y-10663200D01*
+X13994700Y-10714000D01*
+X14045500Y-10764800D01*
+X13994700Y-10917200D02*
+X14096300Y-11018800D01*
+X14096300Y-10917200D02*
+X13994700Y-11018800D01*
+X14045500Y-11018800D02*
+X14096300Y-10968000D01*
+X14045500Y-10917200D01*
+X13994700Y-10968000D01*
+X14045500Y-11018800D01*
 X18376200Y-6218200D02*
 X18477800Y-6319800D01*
 X18477800Y-6218200D02*
@@ -2932,6 +2870,69 @@ X18731800Y-11095000D01*
 X18681000Y-11044200D01*
 X18630200Y-11095000D01*
 X18681000Y-11145800D01*
+X13169200Y-10028200D02*
+X13270800Y-10129800D01*
+X13270800Y-10028200D02*
+X13169200Y-10129800D01*
+X13220000Y-10129800D02*
+X13270800Y-10079000D01*
+X13220000Y-10028200D01*
+X13169200Y-10079000D01*
+X13220000Y-10129800D01*
+X13423200Y-10028200D02*
+X13524800Y-10129800D01*
+X13524800Y-10028200D02*
+X13423200Y-10129800D01*
+X13474000Y-10129800D02*
+X13524800Y-10079000D01*
+X13474000Y-10028200D01*
+X13423200Y-10079000D01*
+X13474000Y-10129800D01*
+X13677200Y-10028200D02*
+X13778800Y-10129800D01*
+X13778800Y-10028200D02*
+X13677200Y-10129800D01*
+X13728000Y-10129800D02*
+X13778800Y-10079000D01*
+X13728000Y-10028200D01*
+X13677200Y-10079000D01*
+X13728000Y-10129800D01*
+X13931200Y-10028200D02*
+X14032800Y-10129800D01*
+X14032800Y-10028200D02*
+X13931200Y-10129800D01*
+X13982000Y-10129800D02*
+X14032800Y-10079000D01*
+X13982000Y-10028200D01*
+X13931200Y-10079000D01*
+X13982000Y-10129800D01*
+X14185200Y-10028200D02*
+X14286800Y-10129800D01*
+X14286800Y-10028200D02*
+X14185200Y-10129800D01*
+X14236000Y-10129800D02*
+X14286800Y-10079000D01*
+X14236000Y-10028200D01*
+X14185200Y-10079000D01*
+X14236000Y-10129800D01*
+X14439200Y-10028200D02*
+X14540800Y-10129800D01*
+X14540800Y-10028200D02*
+X14439200Y-10129800D01*
+X14490000Y-10129800D02*
+X14540800Y-10079000D01*
+X14490000Y-10028200D01*
+X14439200Y-10079000D01*
+X14490000Y-10129800D01*
+X14693200Y-10028200D02*
+X14794800Y-10129800D01*
+X14794800Y-10028200D02*
+X14693200Y-10129800D01*
+X14744000Y-10129800D02*
+X14794800Y-10079000D01*
+X14744000Y-10028200D01*
+X14693200Y-10079000D01*
+X14744000Y-10129800D01*
 X13744600Y-6376200D02*
 X13744600Y-6506200D01*
 X13679600Y-6441200D02*
@@ -2982,14 +2983,14 @@ X11948950Y-10131600D02*
 G75*
 G03X11948950Y-10131600I-80000J0D01*
 G01*
-X17919000Y-6683000D02*
-X18079000Y-6523000D01*
-X17919000Y-6363000D01*
-X17759000Y-6523000D01*
-X17919000Y-6683000D01*
-X18079000Y-6523000D02*
+X10299000Y-11001000D02*
+X10459000Y-10841000D01*
+X10299000Y-10681000D01*
+X10139000Y-10841000D01*
+X10299000Y-11001000D01*
+X10459000Y-10841000D02*
 G75*
-G03X18079000Y-6523000I-160000J0D01*
+G03X10459000Y-10841000I-160000J0D01*
 G01*
 X17919000Y-11001000D02*
 X18079000Y-10841000D01*
@@ -3000,15 +3001,6 @@ X18079000Y-10841000D02*
 G75*
 G03X18079000Y-10841000I-160000J0D01*
 G01*
-X10299000Y-11001000D02*
-X10459000Y-10841000D01*
-X10299000Y-10681000D01*
-X10139000Y-10841000D01*
-X10299000Y-11001000D01*
-X10459000Y-10841000D02*
-G75*
-G03X10459000Y-10841000I-160000J0D01*
-G01*
 X10299000Y-6683000D02*
 X10459000Y-6523000D01*
 X10299000Y-6363000D01*
@@ -3018,6 +3010,15 @@ X10459000Y-6523000D02*
 G75*
 G03X10459000Y-6523000I-160000J0D01*
 G01*
+X17919000Y-6683000D02*
+X18079000Y-6523000D01*
+X17919000Y-6363000D01*
+X17759000Y-6523000D01*
+X17919000Y-6683000D01*
+X18079000Y-6523000D02*
+G75*
+G03X18079000Y-6523000I-160000J0D01*
+G01*
 X12446800Y-6566800D02*
 X12446800Y-6736800D01*
 X12361800Y-6651800D02*
@@ -3920,22 +3921,11 @@ X14267143Y-12824714D01*
 X14238571Y-12867571D01*
 X14210000Y-12896143D01*
 X14181428Y-12910429D01*
-X14624286Y-12824714D02*
-X14481428Y-12824714D01*
-X14467143Y-12967571D01*
-X14481428Y-12953286D01*
-X14510000Y-12939000D01*
-X14581428Y-12939000D01*
-X14610000Y-12953286D01*
-X14624286Y-12967571D01*
-X14638571Y-12996143D01*
-X14638571Y-13067571D01*
-X14624286Y-13096143D01*
-X14610000Y-13110429D01*
-X14581428Y-13124714D01*
-X14510000Y-13124714D01*
-X14481428Y-13110429D01*
-X14467143Y-13096143D01*
+X14610000Y-12924714D02*
+X14610000Y-13124714D01*
+X14538571Y-12810429D02*
+X14467143Y-13024714D01*
+X14652857Y-13024714D01*
 X14995714Y-13124714D02*
 X14995714Y-12824714D01*
 X15124286Y-13124714D02*
@@ -4426,9 +4416,38 @@ X14024286Y-13659571D01*
 X14038571Y-13631000D01*
 X14067143Y-13588143D01*
 X14081428Y-13573857D01*
-X14167143Y-13616714D02*
-X14367143Y-13616714D01*
+X14238571Y-13745286D02*
+X14210000Y-13731000D01*
+X14195714Y-13716714D01*
+X14181428Y-13688143D01*
+X14181428Y-13673857D01*
+X14195714Y-13645286D01*
+X14210000Y-13631000D01*
+X14238571Y-13616714D01*
+X14295714Y-13616714D01*
+X14324286Y-13631000D01*
+X14338571Y-13645286D01*
+X14352857Y-13673857D01*
+X14352857Y-13688143D01*
+X14338571Y-13716714D01*
+X14324286Y-13731000D01*
+X14295714Y-13745286D01*
+X14238571Y-13745286D01*
+X14210000Y-13759571D01*
+X14195714Y-13773857D01*
+X14181428Y-13802429D01*
+X14181428Y-13859571D01*
+X14195714Y-13888143D01*
+X14210000Y-13902429D01*
 X14238571Y-13916714D01*
+X14295714Y-13916714D01*
+X14324286Y-13902429D01*
+X14338571Y-13888143D01*
+X14352857Y-13859571D01*
+X14352857Y-13802429D01*
+X14338571Y-13773857D01*
+X14324286Y-13759571D01*
+X14295714Y-13745286D01*
 X14710000Y-13916714D02*
 X14710000Y-13616714D01*
 X14838571Y-13916714D02*
diff --git a/plot/ulx3s-top.pos b/plot/ulx3s-top.pos
index a55043a..e49cb93 100644
--- a/plot/ulx3s-top.pos
+++ b/plot/ulx3s-top.pos
@@ -1,4 +1,4 @@
-### Module positions - created on Thu Jul  5 08:26:15 2018 ###
+### Module positions - created on Thu Jul  5 08:41:39 2018 ###
 ### Printed by Pcbnew version kicad 5.0.0-rc2+dfsg1-3
 ## Unit = mm, Angle = deg.
 ## Side : top
diff --git a/plot/ulx3s.drl b/plot/ulx3s.drl
index 9762b8b..aa8f885 100644
--- a/plot/ulx3s.drl
+++ b/plot/ulx3s.drl
@@ -1,5 +1,5 @@
 M48
-;DRILL file {KiCad 5.0.0-rc2+dfsg1-3} date Thu Jul  5 08:26:01 2018
+;DRILL file {KiCad 5.0.0-rc2+dfsg1-3} date Thu Jul  5 08:41:48 2018
 ;FORMAT={2:4/ absolute / inch / suppress trailing zeros}
 FMAT,2
 INCH,LZ
@@ -418,7 +418,6 @@ X058405Y-036741
 T3
 X039627Y-035497
 X041047Y-039681
-X044403Y-040488
 X048597Y-042902
 X060003Y-036613
 X060043Y-032163
@@ -435,6 +434,7 @@ T4
 X040403Y-038638
 T5
 X043541Y-04277
+X044403Y-040013
 X045903Y-037588
 X064853Y-031938
 X065853Y-027038
@@ -495,12 +495,6 @@ X051203Y-028238
 X052203Y-028238
 X053203Y-028238
 T9
-X054297Y-041181
-X054297Y-042181
-X054297Y-043181
-X055297Y-041181
-X055297Y-042181
-X055297Y-043181
 X037547Y-024681
 X037547Y-025681
 X037547Y-026681
@@ -541,13 +535,12 @@ X038547Y-040681
 X038547Y-041681
 X038547Y-042681
 X038547Y-043681
-X052047Y-039681
-X053047Y-039681
-X054047Y-039681
-X055047Y-039681
-X056047Y-039681
-X057047Y-039681
-X058047Y-039681
+X054297Y-041181
+X054297Y-042181
+X054297Y-043181
+X055297Y-041181
+X055297Y-042181
+X055297Y-043181
 X072547Y-024681
 X072547Y-025681
 X072547Y-026681
@@ -588,6 +581,13 @@ X073547Y-040681
 X073547Y-041681
 X073547Y-042681
 X073547Y-043681
+X052047Y-039681
+X053047Y-039681
+X054047Y-039681
+X055047Y-039681
+X056047Y-039681
+X057047Y-039681
+X058047Y-039681
 T10
 X054113Y-025359
 X054349Y-027288
@@ -597,10 +597,10 @@ T11
 X045353Y-039888
 X046728Y-039888
 T12
-X070547Y-025681
-X070547Y-042681
 X040547Y-042681
+X070547Y-042681
 X040547Y-025681
+X070547Y-025681
 T13
 X049003Y-026188
 X049003Y-028944