diff --git a/fabrication/cryptostick-B.Mask.gbs b/fabrication/cryptostick-B.Mask.gbs
index d90a161..695ccb4 100644
--- a/fabrication/cryptostick-B.Mask.gbs
+++ b/fabrication/cryptostick-B.Mask.gbs
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.0.1)-4*
-G04 #@! TF.CreationDate,2018-12-21T18:48:29+01:00*
+G04 #@! TF.CreationDate,2019-01-16T13:56:46+01:00*
 G04 #@! TF.ProjectId,cryptostick,63727970746F737469636B2E6B696361,R1*
 G04 #@! TF.SameCoordinates,PX791ddc0PY5e69114*
 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.1)-4) date 21.12.2018 18:48:29*
+G04 Created by KiCad (PCBNEW (5.0.1)-4) date 16.01.2019 13:56:46*
 %MOMM*%
 %LPD*%
 G01*
@@ -15,12 +15,12 @@ G04 APERTURE LIST*
 G04 APERTURE END LIST*
 D10*
 G36*
-X-1816280Y-8094810D02*
-X-2666520Y-8094810D01*
-X-2666520Y-6744190D01*
-X-1816280Y-6744190D01*
-X-1816280Y-8094810D01*
-X-1816280Y-8094810D01*
+X708480Y-8094810D02*
+X-141760Y-8094810D01*
+X-141760Y-6744190D01*
+X708480Y-6744190D01*
+X708480Y-8094810D01*
+X708480Y-8094810D01*
 G37*
 G36*
 X-541200Y-8094810D02*
@@ -31,14 +31,6 @@ X-541200Y-8094810D01*
 X-541200Y-8094810D01*
 G37*
 G36*
-X708480Y-8094810D02*
-X-141760Y-8094810D01*
-X-141760Y-6744190D01*
-X708480Y-6744190D01*
-X708480Y-8094810D01*
-X708480Y-8094810D01*
-G37*
-G36*
 X-5641520Y-8094810D02*
 X-6491760Y-8094810D01*
 X-6491760Y-6744190D01*
@@ -63,6 +55,14 @@ X-3091360Y-8094810D01*
 X-3091360Y-8094810D01*
 G37*
 G36*
+X-1816280Y-8094810D02*
+X-2666520Y-8094810D01*
+X-2666520Y-6744190D01*
+X-1816280Y-6744190D01*
+X-1816280Y-8094810D01*
+X-1816280Y-8094810D01*
+G37*
+G36*
 X8705845Y-6872715D02*
 X8796839Y-6910406D01*
 X8878731Y-6965125D01*
@@ -137,14 +137,6 @@ X8156029Y-4926764D01*
 X8156029Y-4926764D01*
 G37*
 G36*
-X-9567090Y-5944700D02*
-X-10216670Y-5944700D01*
-X-10216670Y-4444220D01*
-X-9567090Y-4444220D01*
-X-9567090Y-5944700D01*
-X-9567090Y-5944700D01*
-G37*
-G36*
 X2731590Y-5944700D02*
 X2082010Y-5944700D01*
 X2082010Y-4444220D01*
@@ -153,6 +145,14 @@ X2731590Y-5944700D01*
 X2731590Y-5944700D01*
 G37*
 G36*
+X-9567090Y-5944700D02*
+X-10216670Y-5944700D01*
+X-10216670Y-4444220D01*
+X-9567090Y-4444220D01*
+X-9567090Y-5944700D01*
+X-9567090Y-5944700D01*
+G37*
+G36*
 X5648510Y-4165550D02*
 X3549530Y-4165550D01*
 X3549530Y-2866670D01*
@@ -161,14 +161,6 @@ X5648510Y-4165550D01*
 X5648510Y-4165550D01*
 G37*
 G36*
-X2731590Y-3943180D02*
-X2082010Y-3943180D01*
-X2082010Y-2442700D01*
-X2731590Y-2442700D01*
-X2731590Y-3943180D01*
-X2731590Y-3943180D01*
-G37*
-G36*
 X-9567090Y-3943180D02*
 X-10216670Y-3943180D01*
 X-10216670Y-2442700D01*
@@ -177,6 +169,14 @@ X-9567090Y-3943180D01*
 X-9567090Y-3943180D01*
 G37*
 G36*
+X2731590Y-3943180D02*
+X2082010Y-3943180D01*
+X2082010Y-2442700D01*
+X2731590Y-2442700D01*
+X2731590Y-3943180D01*
+X2731590Y-3943180D01*
+G37*
+G36*
 X7174587Y-1689574D02*
 X7283764Y-1734796D01*
 X7382021Y-1800449D01*
@@ -213,42 +213,6 @@ X7174587Y-1689574D01*
 X7174587Y-1689574D01*
 G37*
 G36*
-X-3189622Y-2154878D02*
-X-3152788Y-2170136D01*
-X-3119638Y-2192286D01*
-X-3091446Y-2220478D01*
-X-3069296Y-2253628D01*
-X-3054038Y-2290462D01*
-X-3046260Y-2329565D01*
-X-3046260Y-2369435D01*
-X-3054038Y-2408538D01*
-X-3069296Y-2445372D01*
-X-3091446Y-2478522D01*
-X-3119638Y-2506714D01*
-X-3152788Y-2528864D01*
-X-3189622Y-2544122D01*
-X-3228725Y-2551900D01*
-X-3268595Y-2551900D01*
-X-3307698Y-2544122D01*
-X-3344532Y-2528864D01*
-X-3377682Y-2506714D01*
-X-3405874Y-2478522D01*
-X-3428024Y-2445372D01*
-X-3443282Y-2408538D01*
-X-3451060Y-2369435D01*
-X-3451060Y-2329565D01*
-X-3443282Y-2290462D01*
-X-3428024Y-2253628D01*
-X-3405874Y-2220478D01*
-X-3377682Y-2192286D01*
-X-3344532Y-2170136D01*
-X-3307698Y-2154878D01*
-X-3268595Y-2147100D01*
-X-3228725Y-2147100D01*
-X-3189622Y-2154878D01*
-X-3189622Y-2154878D01*
-G37*
-G36*
 X-4190382Y-2154878D02*
 X-4153548Y-2170136D01*
 X-4120398Y-2192286D01*
@@ -285,6 +249,42 @@ X-4190382Y-2154878D01*
 X-4190382Y-2154878D01*
 G37*
 G36*
+X-3189622Y-2154878D02*
+X-3152788Y-2170136D01*
+X-3119638Y-2192286D01*
+X-3091446Y-2220478D01*
+X-3069296Y-2253628D01*
+X-3054038Y-2290462D01*
+X-3046260Y-2329565D01*
+X-3046260Y-2369435D01*
+X-3054038Y-2408538D01*
+X-3069296Y-2445372D01*
+X-3091446Y-2478522D01*
+X-3119638Y-2506714D01*
+X-3152788Y-2528864D01*
+X-3189622Y-2544122D01*
+X-3228725Y-2551900D01*
+X-3268595Y-2551900D01*
+X-3307698Y-2544122D01*
+X-3344532Y-2528864D01*
+X-3377682Y-2506714D01*
+X-3405874Y-2478522D01*
+X-3428024Y-2445372D01*
+X-3443282Y-2408538D01*
+X-3451060Y-2369435D01*
+X-3451060Y-2329565D01*
+X-3443282Y-2290462D01*
+X-3428024Y-2253628D01*
+X-3405874Y-2220478D01*
+X-3377682Y-2192286D01*
+X-3344532Y-2170136D01*
+X-3307698Y-2154878D01*
+X-3268595Y-2147100D01*
+X-3228725Y-2147100D01*
+X-3189622Y-2154878D01*
+X-3189622Y-2154878D01*
+G37*
+G36*
 X-5191142Y-2154878D02*
 X-5154308Y-2170136D01*
 X-5121158Y-2192286D01*
@@ -345,40 +345,40 @@ X5648510Y-1666190D01*
 X5648510Y-1666190D01*
 G37*
 G36*
-X-4190382Y-1154118D02*
-X-4153548Y-1169376D01*
-X-4120398Y-1191526D01*
-X-4092206Y-1219718D01*
-X-4070056Y-1252868D01*
-X-4054798Y-1289702D01*
-X-4047020Y-1328805D01*
-X-4047020Y-1368675D01*
-X-4054798Y-1407778D01*
-X-4070056Y-1444612D01*
-X-4092206Y-1477762D01*
-X-4120398Y-1505954D01*
-X-4153548Y-1528104D01*
-X-4190382Y-1543362D01*
-X-4229485Y-1551140D01*
-X-4269355Y-1551140D01*
-X-4308458Y-1543362D01*
-X-4345292Y-1528104D01*
-X-4378442Y-1505954D01*
-X-4406634Y-1477762D01*
-X-4428784Y-1444612D01*
-X-4444042Y-1407778D01*
-X-4451820Y-1368675D01*
-X-4451820Y-1328805D01*
-X-4444042Y-1289702D01*
-X-4428784Y-1252868D01*
-X-4406634Y-1219718D01*
-X-4378442Y-1191526D01*
-X-4345292Y-1169376D01*
-X-4308458Y-1154118D01*
-X-4269355Y-1146340D01*
-X-4229485Y-1146340D01*
-X-4190382Y-1154118D01*
-X-4190382Y-1154118D01*
+X-5191142Y-1154118D02*
+X-5154308Y-1169376D01*
+X-5121158Y-1191526D01*
+X-5092966Y-1219718D01*
+X-5070816Y-1252868D01*
+X-5055558Y-1289702D01*
+X-5047780Y-1328805D01*
+X-5047780Y-1368675D01*
+X-5055558Y-1407778D01*
+X-5070816Y-1444612D01*
+X-5092966Y-1477762D01*
+X-5121158Y-1505954D01*
+X-5154308Y-1528104D01*
+X-5191142Y-1543362D01*
+X-5230245Y-1551140D01*
+X-5270115Y-1551140D01*
+X-5309218Y-1543362D01*
+X-5346052Y-1528104D01*
+X-5379202Y-1505954D01*
+X-5407394Y-1477762D01*
+X-5429544Y-1444612D01*
+X-5444802Y-1407778D01*
+X-5452580Y-1368675D01*
+X-5452580Y-1328805D01*
+X-5444802Y-1289702D01*
+X-5429544Y-1252868D01*
+X-5407394Y-1219718D01*
+X-5379202Y-1191526D01*
+X-5346052Y-1169376D01*
+X-5309218Y-1154118D01*
+X-5270115Y-1146340D01*
+X-5230245Y-1146340D01*
+X-5191142Y-1154118D01*
+X-5191142Y-1154118D01*
 G37*
 G36*
 X-3189622Y-1154118D02*
@@ -417,48 +417,40 @@ X-3189622Y-1154118D01*
 X-3189622Y-1154118D01*
 G37*
 G36*
-X-5191142Y-1154118D02*
-X-5154308Y-1169376D01*
-X-5121158Y-1191526D01*
-X-5092966Y-1219718D01*
-X-5070816Y-1252868D01*
-X-5055558Y-1289702D01*
-X-5047780Y-1328805D01*
-X-5047780Y-1368675D01*
-X-5055558Y-1407778D01*
-X-5070816Y-1444612D01*
-X-5092966Y-1477762D01*
-X-5121158Y-1505954D01*
-X-5154308Y-1528104D01*
-X-5191142Y-1543362D01*
-X-5230245Y-1551140D01*
-X-5270115Y-1551140D01*
-X-5309218Y-1543362D01*
-X-5346052Y-1528104D01*
-X-5379202Y-1505954D01*
-X-5407394Y-1477762D01*
-X-5429544Y-1444612D01*
-X-5444802Y-1407778D01*
-X-5452580Y-1368675D01*
-X-5452580Y-1328805D01*
-X-5444802Y-1289702D01*
-X-5429544Y-1252868D01*
-X-5407394Y-1219718D01*
-X-5379202Y-1191526D01*
-X-5346052Y-1169376D01*
-X-5309218Y-1154118D01*
-X-5270115Y-1146340D01*
-X-5230245Y-1146340D01*
-X-5191142Y-1154118D01*
-X-5191142Y-1154118D01*
-G37*
-G36*
-X-10278810Y-771690D02*
-X-10828390Y-771690D01*
-X-10828390Y-171310D01*
-X-10278810Y-171310D01*
-X-10278810Y-771690D01*
-X-10278810Y-771690D01*
+X-4190382Y-1154118D02*
+X-4153548Y-1169376D01*
+X-4120398Y-1191526D01*
+X-4092206Y-1219718D01*
+X-4070056Y-1252868D01*
+X-4054798Y-1289702D01*
+X-4047020Y-1328805D01*
+X-4047020Y-1368675D01*
+X-4054798Y-1407778D01*
+X-4070056Y-1444612D01*
+X-4092206Y-1477762D01*
+X-4120398Y-1505954D01*
+X-4153548Y-1528104D01*
+X-4190382Y-1543362D01*
+X-4229485Y-1551140D01*
+X-4269355Y-1551140D01*
+X-4308458Y-1543362D01*
+X-4345292Y-1528104D01*
+X-4378442Y-1505954D01*
+X-4406634Y-1477762D01*
+X-4428784Y-1444612D01*
+X-4444042Y-1407778D01*
+X-4451820Y-1368675D01*
+X-4451820Y-1328805D01*
+X-4444042Y-1289702D01*
+X-4428784Y-1252868D01*
+X-4406634Y-1219718D01*
+X-4378442Y-1191526D01*
+X-4345292Y-1169376D01*
+X-4308458Y-1154118D01*
+X-4269355Y-1146340D01*
+X-4229485Y-1146340D01*
+X-4190382Y-1154118D01*
+X-4190382Y-1154118D01*
 G37*
 G36*
 X-11091610Y-771690D02*
@@ -469,6 +461,14 @@ X-11091610Y-771690D01*
 X-11091610Y-771690D01*
 G37*
 G36*
+X-10278810Y-771690D02*
+X-10828390Y-771690D01*
+X-10828390Y-171310D01*
+X-10278810Y-171310D01*
+X-10278810Y-771690D01*
+X-10278810Y-771690D01*
+G37*
+G36*
 X-5191142Y-153358D02*
 X-5154308Y-168616D01*
 X-5121158Y-190766D01*
diff --git a/fabrication/cryptostick-B.Paste.gbp b/fabrication/cryptostick-B.Paste.gbp
index 2544435..d380c15 100644
--- a/fabrication/cryptostick-B.Paste.gbp
+++ b/fabrication/cryptostick-B.Paste.gbp
@@ -1,34 +1,46 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.0.1)-4*
-G04 #@! TF.CreationDate,2018-12-21T18:48:29+01:00*
+G04 #@! TF.CreationDate,2019-01-16T13:56:46+01:00*
 G04 #@! TF.ProjectId,cryptostick,63727970746F737469636B2E6B696361,R1*
 G04 #@! TF.SameCoordinates,PX791ddc0PY5e69114*
 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.1)-4) date 21.12.2018 18:48:29*
+G04 Created by KiCad (PCBNEW (5.0.1)-4) date 16.01.2019 13:56:46*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
-%ADD10R,1.599184X0.959104*%
-%ADD11C,0.520192*%
-%ADD12C,0.150000*%
-%ADD13C,0.359664*%
-%ADD14C,1.119632*%
-%ADD15C,0.432816*%
+%ADD10C,0.300000*%
+%ADD11R,1.599184X0.959104*%
+%ADD12C,0.520192*%
+%ADD13C,0.150000*%
+%ADD14C,0.359664*%
+%ADD15C,1.119632*%
+%ADD16C,0.432816*%
 G04 APERTURE END LIST*
 D10*
+G04 #@! TO.C,REF\002A\002A*
+X-11340000Y7146500D02*
+G75*
+G03X-11340000Y7146500I-100000J0D01*
+G01*
+X8660000Y-7353500D02*
+G75*
+G03X8660000Y-7353500I-100000J0D01*
+G01*
+G04 #@! TD*
+D11*
 G04 #@! TO.C,J2*
 X4599020Y-1016750D03*
 X4599020Y1000010D03*
 X4599020Y-3516110D03*
 X4599020Y3484130D03*
 G04 #@! TD*
-D11*
+D12*
 G04 #@! TO.C,J1*
 X-966320Y-7419500D03*
-D12*
+D13*
 G36*
 X-706224Y-7879748D02*
 X-1226416Y-7879748D01*
@@ -37,9 +49,9 @@ X-706224Y-6959252D01*
 X-706224Y-7879748D01*
 X-706224Y-7879748D01*
 G37*
-D11*
-X283360Y-7419500D03*
 D12*
+X283360Y-7419500D03*
+D13*
 G36*
 X543456Y-7879748D02*
 X23264Y-7879748D01*
@@ -48,9 +60,9 @@ X543456Y-6959252D01*
 X543456Y-7879748D01*
 X543456Y-7879748D01*
 G37*
-D11*
-X-2241400Y-7419500D03*
 D12*
+X-2241400Y-7419500D03*
+D13*
 G36*
 X-1981304Y-7879748D02*
 X-2501496Y-7879748D01*
@@ -59,9 +71,9 @@ X-1981304Y-6959252D01*
 X-1981304Y-7879748D01*
 X-1981304Y-7879748D01*
 G37*
-D11*
-X-3516480Y-7419500D03*
 D12*
+X-3516480Y-7419500D03*
+D13*
 G36*
 X-3256384Y-7879748D02*
 X-3776576Y-7879748D01*
@@ -70,9 +82,9 @@ X-3256384Y-6959252D01*
 X-3256384Y-7879748D01*
 X-3256384Y-7879748D01*
 G37*
-D11*
-X-4791560Y-7419500D03*
 D12*
+X-4791560Y-7419500D03*
+D13*
 G36*
 X-4531464Y-7879748D02*
 X-5051656Y-7879748D01*
@@ -81,9 +93,9 @@ X-4531464Y-6959252D01*
 X-4531464Y-7879748D01*
 X-4531464Y-7879748D01*
 G37*
-D11*
-X-6066640Y-7419500D03*
 D12*
+X-6066640Y-7419500D03*
+D13*
 G36*
 X-5806544Y-7879748D02*
 X-6326736Y-7879748D01*
@@ -92,9 +104,9 @@ X-5806544Y-6959252D01*
 X-5806544Y-7879748D01*
 X-5806544Y-7879748D01*
 G37*
-D13*
+D14*
 X2406800Y-5194460D03*
-D12*
+D13*
 G36*
 X2586632Y-5714652D02*
 X2226968Y-5714652D01*
@@ -103,9 +115,9 @@ X2586632Y-4674268D01*
 X2586632Y-5714652D01*
 X2586632Y-5714652D01*
 G37*
-D13*
+D14*
 X2406800Y-3192940D03*
-D12*
+D13*
 G36*
 X2586632Y-3713132D02*
 X2226968Y-3713132D01*
@@ -114,9 +126,9 @@ X2586632Y-2672748D01*
 X2586632Y-3713132D01*
 X2586632Y-3713132D01*
 G37*
-D13*
+D14*
 X-9891880Y-3192940D03*
-D12*
+D13*
 G36*
 X-9712048Y-3713132D02*
 X-10071712Y-3713132D01*
@@ -125,9 +137,9 @@ X-9712048Y-2672748D01*
 X-9712048Y-3713132D01*
 X-9712048Y-3713132D01*
 G37*
-D13*
+D14*
 X-9891880Y-5194460D03*
-D12*
+D13*
 G36*
 X-9712048Y-5714652D02*
 X-10071712Y-5714652D01*
@@ -136,9 +148,9 @@ X-9712048Y-4674268D01*
 X-9712048Y-5714652D01*
 X-9712048Y-5714652D01*
 G37*
-D14*
+D15*
 X2358540Y6255860D03*
-D12*
+D13*
 G36*
 X2918356Y5576156D02*
 X1798724Y5576156D01*
@@ -147,9 +159,9 @@ X2918356Y6935564D01*
 X2918356Y5576156D01*
 X2918356Y5576156D01*
 G37*
-D14*
+D15*
 X-9841080Y6357460D03*
-D12*
+D13*
 G36*
 X-9281264Y5677756D02*
 X-10400896Y5677756D01*
@@ -158,9 +170,9 @@ X-9281264Y7037164D01*
 X-9281264Y5677756D01*
 X-9281264Y5677756D01*
 G37*
-D15*
+D16*
 X-1141580Y5857080D03*
-D12*
+D13*
 G36*
 X-925172Y5537040D02*
 X-1357988Y5537040D01*
@@ -169,9 +181,9 @@ X-925172Y6177120D01*
 X-925172Y5537040D01*
 X-925172Y5537040D01*
 G37*
-D15*
+D16*
 X-6241900Y5857080D03*
-D12*
+D13*
 G36*
 X-6025492Y5537040D02*
 X-6458308Y5537040D01*
@@ -181,10 +193,10 @@ X-6025492Y5537040D01*
 X-6025492Y5537040D01*
 G37*
 G04 #@! TD*
-D13*
+D14*
 G04 #@! TO.C,D1*
 X-11366400Y-1995500D03*
-D12*
+D13*
 G36*
 X-11546232Y-1795348D02*
 X-11186568Y-1795348D01*
@@ -193,9 +205,9 @@ X-11546232Y-2195652D01*
 X-11546232Y-1795348D01*
 X-11546232Y-1795348D01*
 G37*
-D13*
+D14*
 X-11366400Y-471500D03*
-D12*
+D13*
 G36*
 X-11546232Y-271348D02*
 X-11186568Y-271348D01*
@@ -204,9 +216,9 @@ X-11546232Y-671652D01*
 X-11546232Y-271348D01*
 X-11546232Y-271348D01*
 G37*
-D13*
+D14*
 X-10553600Y-1995500D03*
-D12*
+D13*
 G36*
 X-10733432Y-1795348D02*
 X-10373768Y-1795348D01*
@@ -215,9 +227,9 @@ X-10733432Y-2195652D01*
 X-10733432Y-1795348D01*
 X-10733432Y-1795348D01*
 G37*
-D13*
+D14*
 X-10553600Y-471500D03*
-D12*
+D13*
 G36*
 X-10733432Y-271348D02*
 X-10373768Y-271348D01*
diff --git a/fabrication/cryptostick-B.SilkS.gbo b/fabrication/cryptostick-B.SilkS.gbo
index e0ba3a8..f228deb 100644
--- a/fabrication/cryptostick-B.SilkS.gbo
+++ b/fabrication/cryptostick-B.SilkS.gbo
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.0.1)-4*
-G04 #@! TF.CreationDate,2018-12-21T18:48:29+01:00*
+G04 #@! TF.CreationDate,2019-01-16T13:56:46+01:00*
 G04 #@! TF.ProjectId,cryptostick,63727970746F737469636B2E6B696361,R1*
 G04 #@! TF.SameCoordinates,PX791ddc0PY5e69114*
 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.1)-4) date 21.12.2018 18:48:29*
+G04 Created by KiCad (PCBNEW (5.0.1)-4) date 16.01.2019 13:56:46*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/fabrication/cryptostick-Back.gbl b/fabrication/cryptostick-Back.gbl
index 0db8e88..1b869a8 100644
--- a/fabrication/cryptostick-Back.gbl
+++ b/fabrication/cryptostick-Back.gbl
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.0.1)-4*
-G04 #@! TF.CreationDate,2018-12-21T18:48:29+01:00*
+G04 #@! TF.CreationDate,2019-01-16T13:56:46+01:00*
 G04 #@! TF.ProjectId,cryptostick,63727970746F737469636B2E6B696361,R1*
 G04 #@! TF.SameCoordinates,PX791ddc0PY5e69114*
 G04 #@! TF.FileFunction,Copper,L2,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.1)-4) date 21.12.2018 18:48:29*
+G04 Created by KiCad (PCBNEW (5.0.1)-4) date 16.01.2019 13:56:46*
 %MOMM*%
 %LPD*%
 G01*
@@ -66,6 +66,10 @@ G04 APERTURE END LIST*
 D10*
 G04 #@! TO.P,REF\002A\002A,~*
 G04 #@! TO.N,N/C*
+X-11440000Y7146500D03*
+G04 #@! TD*
+G04 #@! TO.P,REF\002A\002A,~*
+G04 #@! TO.N,N/C*
 X8560000Y-7353500D03*
 G04 #@! TD*
 D11*
@@ -395,11 +399,6 @@ X-10778390Y-721690D01*
 X-10778390Y-221310D01*
 X-10778390Y-221310D01*
 G37*
-D10*
-G04 #@! TO.P,REF\002A\002A,~*
-G04 #@! TO.N,N/C*
-X-11440000Y7146500D03*
-G04 #@! TD*
 D20*
 G04 #@! TO.N,+3.3V*
 X-4318000Y6184900D03*
diff --git a/fabrication/cryptostick-Edge.Cuts.gm1 b/fabrication/cryptostick-Edge.Cuts.gm1
index d37ac14..2136976 100644
--- a/fabrication/cryptostick-Edge.Cuts.gm1
+++ b/fabrication/cryptostick-Edge.Cuts.gm1
@@ -1,11 +1,11 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.0.1)-4*
-G04 #@! TF.CreationDate,2018-12-21T18:48:29+01:00*
+G04 #@! TF.CreationDate,2019-01-16T13:56:46+01:00*
 G04 #@! TF.ProjectId,cryptostick,63727970746F737469636B2E6B696361,R1*
 G04 #@! TF.SameCoordinates,PX791ddc0PY5e69114*
 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.1)-4) date 21.12.2018 18:48:29*
+G04 Created by KiCad (PCBNEW (5.0.1)-4) date 16.01.2019 13:56:46*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/fabrication/cryptostick-F.Mask.gts b/fabrication/cryptostick-F.Mask.gts
index 72f520a..9dcb88d 100644
--- a/fabrication/cryptostick-F.Mask.gts
+++ b/fabrication/cryptostick-F.Mask.gts
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.0.1)-4*
-G04 #@! TF.CreationDate,2018-12-21T18:48:29+01:00*
+G04 #@! TF.CreationDate,2019-01-16T13:56:46+01:00*
 G04 #@! TF.ProjectId,cryptostick,63727970746F737469636B2E6B696361,R1*
 G04 #@! TF.SameCoordinates,PX791ddc0PY5e69114*
 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.1)-4) date 21.12.2018 18:48:29*
+G04 Created by KiCad (PCBNEW (5.0.1)-4) date 16.01.2019 13:56:46*
 %MOMM*%
 %LPD*%
 G01*
@@ -83,14 +83,6 @@ X-350050Y-7348690D01*
 X-350050Y-7348690D01*
 G37*
 G36*
-X-9298590Y-7302750D02*
-X-10198690Y-7302750D01*
-X-10198690Y-6504250D01*
-X-9298590Y-6504250D01*
-X-9298590Y-7302750D01*
-X-9298590Y-7302750D01*
-G37*
-G36*
 X-8201310Y-7302750D02*
 X-9101410Y-7302750D01*
 X-9101410Y-6504250D01*
@@ -99,6 +91,14 @@ X-8201310Y-7302750D01*
 X-8201310Y-7302750D01*
 G37*
 G36*
+X-9298590Y-7302750D02*
+X-10198690Y-7302750D01*
+X-10198690Y-6504250D01*
+X-9298590Y-6504250D01*
+X-9298590Y-7302750D01*
+X-9298590Y-7302750D01*
+G37*
+G36*
 X3099270Y-6914350D02*
 X2199170Y-6914350D01*
 X2199170Y-6115850D01*
@@ -153,14 +153,6 @@ X8156029Y-4926764D01*
 X8156029Y-4926764D01*
 G37*
 G36*
-X-9298590Y-6002750D02*
-X-10198690Y-6002750D01*
-X-10198690Y-5204250D01*
-X-9298590Y-5204250D01*
-X-9298590Y-6002750D01*
-X-9298590Y-6002750D01*
-G37*
-G36*
 X-8201310Y-6002750D02*
 X-9101410Y-6002750D01*
 X-9101410Y-5204250D01*
@@ -169,12 +161,12 @@ X-8201310Y-6002750D01*
 X-8201310Y-6002750D01*
 G37*
 G36*
-X-350050Y-5949150D02*
-X-1250150Y-5949150D01*
-X-1250150Y-5150650D01*
-X-350050Y-5150650D01*
-X-350050Y-5949150D01*
-X-350050Y-5949150D01*
+X-9298590Y-6002750D02*
+X-10198690Y-6002750D01*
+X-10198690Y-5204250D01*
+X-9298590Y-5204250D01*
+X-9298590Y-6002750D01*
+X-9298590Y-6002750D01*
 G37*
 G36*
 X-1447330Y-5949150D02*
@@ -185,12 +177,12 @@ X-1447330Y-5949150D01*
 X-1447330Y-5949150D01*
 G37*
 G36*
-X3809200Y-5691340D02*
-X2510320Y-5691340D01*
-X2510320Y-4971580D01*
-X3809200Y-4971580D01*
-X3809200Y-5691340D01*
-X3809200Y-5691340D01*
+X-350050Y-5949150D02*
+X-1250150Y-5949150D01*
+X-1250150Y-5150650D01*
+X-350050Y-5150650D01*
+X-350050Y-5949150D01*
+X-350050Y-5949150D01*
 G37*
 G36*
 X1172680Y-5691340D02*
@@ -201,6 +193,14 @@ X1172680Y-5691340D01*
 X1172680Y-5691340D01*
 G37*
 G36*
+X3809200Y-5691340D02*
+X2510320Y-5691340D01*
+X2510320Y-4971580D01*
+X3809200Y-4971580D01*
+X3809200Y-5691340D01*
+X3809200Y-5691340D01*
+G37*
+G36*
 X3809200Y-4741380D02*
 X2510320Y-4741380D01*
 X2510320Y-4021620D01*
@@ -297,12 +297,12 @@ X7174587Y-1689574D01*
 X7174587Y-1689574D01*
 G37*
 G36*
-X-6051080Y-4549610D02*
-X-6450800Y-4549610D01*
-X-6450800Y-3700310D01*
-X-6051080Y-3700310D01*
-X-6051080Y-4549610D01*
-X-6051080Y-4549610D01*
+X-4049560Y-4549610D02*
+X-4449280Y-4549610D01*
+X-4449280Y-3700310D01*
+X-4049560Y-3700310D01*
+X-4049560Y-4549610D01*
+X-4049560Y-4549610D01*
 G37*
 G36*
 X-5550700Y-4549610D02*
@@ -313,14 +313,6 @@ X-5550700Y-4549610D01*
 X-5550700Y-4549610D01*
 G37*
 G36*
-X-5050320Y-4549610D02*
-X-5450040Y-4549610D01*
-X-5450040Y-3700310D01*
-X-5050320Y-3700310D01*
-X-5050320Y-4549610D01*
-X-5050320Y-4549610D01*
-G37*
-G36*
 X-4549940Y-4549610D02*
 X-4949660Y-4549610D01*
 X-4949660Y-3700310D01*
@@ -329,14 +321,6 @@ X-4549940Y-4549610D01*
 X-4549940Y-4549610D01*
 G37*
 G36*
-X-4049560Y-4549610D02*
-X-4449280Y-4549610D01*
-X-4449280Y-3700310D01*
-X-4049560Y-3700310D01*
-X-4049560Y-4549610D01*
-X-4049560Y-4549610D01*
-G37*
-G36*
 X-3549180Y-4549610D02*
 X-3948900Y-4549610D01*
 X-3948900Y-3700310D01*
@@ -369,6 +353,22 @@ X-2048040Y-4549610D01*
 X-2048040Y-4549610D01*
 G37*
 G36*
+X-6051080Y-4549610D02*
+X-6450800Y-4549610D01*
+X-6450800Y-3700310D01*
+X-6051080Y-3700310D01*
+X-6051080Y-4549610D01*
+X-6051080Y-4549610D01*
+G37*
+G36*
+X-5050320Y-4549610D02*
+X-5450040Y-4549610D01*
+X-5450040Y-3700310D01*
+X-5050320Y-3700310D01*
+X-5050320Y-4549610D01*
+X-5050320Y-4549610D01*
+G37*
+G36*
 X1172680Y-3791420D02*
 X-126200Y-3791420D01*
 X-126200Y-3071660D01*
@@ -409,14 +409,6 @@ X-2149640Y-3448520D01*
 X-2149640Y-3448520D01*
 G37*
 G36*
-X-6600990Y-3049740D02*
-X-7450290Y-3049740D01*
-X-7450290Y-2650020D01*
-X-6600990Y-2650020D01*
-X-6600990Y-3049740D01*
-X-6600990Y-3049740D01*
-G37*
-G36*
 X-1048550Y-3049740D02*
 X-1897850Y-3049740D01*
 X-1897850Y-2650020D01*
@@ -425,12 +417,12 @@ X-1048550Y-3049740D01*
 X-1048550Y-3049740D01*
 G37*
 G36*
-X-8051330Y-2898610D02*
-X-8951430Y-2898610D01*
-X-8951430Y-2100110D01*
-X-8051330Y-2100110D01*
-X-8051330Y-2898610D01*
-X-8051330Y-2898610D01*
+X-6600990Y-3049740D02*
+X-7450290Y-3049740D01*
+X-7450290Y-2650020D01*
+X-6600990Y-2650020D01*
+X-6600990Y-3049740D01*
+X-6600990Y-3049740D01*
 G37*
 G36*
 X-9148610Y-2898610D02*
@@ -441,6 +433,14 @@ X-9148610Y-2898610D01*
 X-9148610Y-2898610D01*
 G37*
 G36*
+X-8051330Y-2898610D02*
+X-8951430Y-2898610D01*
+X-8951430Y-2100110D01*
+X-8051330Y-2100110D01*
+X-8051330Y-2898610D01*
+X-8051330Y-2898610D01*
+G37*
+G36*
 X1476210Y-2697950D02*
 X576110Y-2697950D01*
 X576110Y-1899450D01*
@@ -457,14 +457,6 @@ X2573490Y-2697950D01*
 X2573490Y-2697950D01*
 G37*
 G36*
-X-1048550Y-2549360D02*
-X-1897850Y-2549360D01*
-X-1897850Y-2149640D01*
-X-1048550Y-2149640D01*
-X-1048550Y-2549360D01*
-X-1048550Y-2549360D01*
-G37*
-G36*
 X-6600990Y-2549360D02*
 X-7450290Y-2549360D01*
 X-7450290Y-2149640D01*
@@ -473,20 +465,12 @@ X-6600990Y-2549360D01*
 X-6600990Y-2549360D01*
 G37*
 G36*
-X3603600Y-2206900D02*
-X3203600Y-2206900D01*
-X3203600Y-1656900D01*
-X3603600Y-1656900D01*
-X3603600Y-2206900D01*
-X3603600Y-2206900D01*
-G37*
-G36*
-X4103600Y-2206900D02*
-X3703600Y-2206900D01*
-X3703600Y-1656900D01*
-X4103600Y-1656900D01*
-X4103600Y-2206900D01*
-X4103600Y-2206900D01*
+X-1048550Y-2549360D02*
+X-1897850Y-2549360D01*
+X-1897850Y-2149640D01*
+X-1048550Y-2149640D01*
+X-1048550Y-2549360D01*
+X-1048550Y-2549360D01*
 G37*
 G36*
 X3103600Y-2206900D02*
@@ -497,44 +481,20 @@ X3103600Y-2206900D01*
 X3103600Y-2206900D01*
 G37*
 G36*
-X8455926Y-287839D02*
-X8517106Y-300008D01*
-X8689994Y-371620D01*
-X8845589Y-475586D01*
-X8977914Y-607911D01*
-X9081880Y-763506D01*
-X9153492Y-936394D01*
-X9190000Y-1119935D01*
-X9190000Y-1307065D01*
-X9153492Y-1490606D01*
-X9081880Y-1663494D01*
-X8977914Y-1819089D01*
-X8845589Y-1951414D01*
-X8689994Y-2055380D01*
-X8517106Y-2126992D01*
-X8455926Y-2139161D01*
-X8333567Y-2163500D01*
-X8146433Y-2163500D01*
-X8024074Y-2139161D01*
-X7962894Y-2126992D01*
-X7790006Y-2055380D01*
-X7634411Y-1951414D01*
-X7502086Y-1819089D01*
-X7398120Y-1663494D01*
-X7326508Y-1490606D01*
-X7290000Y-1307065D01*
-X7290000Y-1119935D01*
-X7326508Y-936394D01*
-X7398120Y-763506D01*
-X7502086Y-607911D01*
-X7634411Y-475586D01*
-X7790006Y-371620D01*
-X7962894Y-300008D01*
-X8024074Y-287839D01*
-X8146433Y-263500D01*
-X8333567Y-263500D01*
-X8455926Y-287839D01*
-X8455926Y-287839D01*
+X4103600Y-2206900D02*
+X3703600Y-2206900D01*
+X3703600Y-1656900D01*
+X4103600Y-1656900D01*
+X4103600Y-2206900D01*
+X4103600Y-2206900D01*
+G37*
+G36*
+X3603600Y-2206900D02*
+X3203600Y-2206900D01*
+X3203600Y-1656900D01*
+X3603600Y-1656900D01*
+X3603600Y-2206900D01*
+X3603600Y-2206900D01*
 G37*
 G36*
 X5915926Y-287839D02*
@@ -577,12 +537,44 @@ X5915926Y-287839D01*
 X5915926Y-287839D01*
 G37*
 G36*
-X-1048550Y-2048980D02*
-X-1897850Y-2048980D01*
-X-1897850Y-1649260D01*
-X-1048550Y-1649260D01*
-X-1048550Y-2048980D01*
-X-1048550Y-2048980D01*
+X8455926Y-287839D02*
+X8517106Y-300008D01*
+X8689994Y-371620D01*
+X8845589Y-475586D01*
+X8977914Y-607911D01*
+X9081880Y-763506D01*
+X9153492Y-936394D01*
+X9190000Y-1119935D01*
+X9190000Y-1307065D01*
+X9153492Y-1490606D01*
+X9081880Y-1663494D01*
+X8977914Y-1819089D01*
+X8845589Y-1951414D01*
+X8689994Y-2055380D01*
+X8517106Y-2126992D01*
+X8455926Y-2139161D01*
+X8333567Y-2163500D01*
+X8146433Y-2163500D01*
+X8024074Y-2139161D01*
+X7962894Y-2126992D01*
+X7790006Y-2055380D01*
+X7634411Y-1951414D01*
+X7502086Y-1819089D01*
+X7398120Y-1663494D01*
+X7326508Y-1490606D01*
+X7290000Y-1307065D01*
+X7290000Y-1119935D01*
+X7326508Y-936394D01*
+X7398120Y-763506D01*
+X7502086Y-607911D01*
+X7634411Y-475586D01*
+X7790006Y-371620D01*
+X7962894Y-300008D01*
+X8024074Y-287839D01*
+X8146433Y-263500D01*
+X8333567Y-263500D01*
+X8455926Y-287839D01*
+X8455926Y-287839D01*
 G37*
 G36*
 X-6600990Y-2048980D02*
@@ -593,12 +585,12 @@ X-6600990Y-2048980D01*
 X-6600990Y-2048980D01*
 G37*
 G36*
-X-1048550Y-1548600D02*
-X-1897850Y-1548600D01*
-X-1897850Y-1148880D01*
-X-1048550Y-1148880D01*
-X-1048550Y-1548600D01*
-X-1048550Y-1548600D01*
+X-1048550Y-2048980D02*
+X-1897850Y-2048980D01*
+X-1897850Y-1649260D01*
+X-1048550Y-1649260D01*
+X-1048550Y-2048980D01*
+X-1048550Y-2048980D01*
 G37*
 G36*
 X-6600990Y-1548600D02*
@@ -609,6 +601,14 @@ X-6600990Y-1548600D01*
 X-6600990Y-1548600D01*
 G37*
 G36*
+X-1048550Y-1548600D02*
+X-1897850Y-1548600D01*
+X-1897850Y-1148880D01*
+X-1048550Y-1148880D01*
+X-1048550Y-1548600D01*
+X-1048550Y-1548600D01*
+G37*
+G36*
 X-8051330Y-1250150D02*
 X-8951430Y-1250150D01*
 X-8951430Y-451650D01*
@@ -625,14 +625,6 @@ X-9148610Y-1250150D01*
 X-9148610Y-1250150D01*
 G37*
 G36*
-X-6600990Y-1048220D02*
-X-7450290Y-1048220D01*
-X-7450290Y-648500D01*
-X-6600990Y-648500D01*
-X-6600990Y-1048220D01*
-X-6600990Y-1048220D01*
-G37*
-G36*
 X-1048550Y-1048220D02*
 X-1897850Y-1048220D01*
 X-1897850Y-648500D01*
@@ -641,12 +633,12 @@ X-1048550Y-1048220D01*
 X-1048550Y-1048220D01*
 G37*
 G36*
-X4103600Y-806900D02*
-X3703600Y-806900D01*
-X3703600Y-256900D01*
-X4103600Y-256900D01*
-X4103600Y-806900D01*
-X4103600Y-806900D01*
+X-6600990Y-1048220D02*
+X-7450290Y-1048220D01*
+X-7450290Y-648500D01*
+X-6600990Y-648500D01*
+X-6600990Y-1048220D01*
+X-6600990Y-1048220D01*
 G37*
 G36*
 X3103600Y-806900D02*
@@ -657,12 +649,12 @@ X3103600Y-806900D01*
 X3103600Y-806900D01*
 G37*
 G36*
-X2573490Y-716750D02*
-X1673390Y-716750D01*
-X1673390Y81750D01*
-X2573490Y81750D01*
-X2573490Y-716750D01*
-X2573490Y-716750D01*
+X4103600Y-806900D02*
+X3703600Y-806900D01*
+X3703600Y-256900D01*
+X4103600Y-256900D01*
+X4103600Y-806900D01*
+X4103600Y-806900D01*
 G37*
 G36*
 X1476210Y-716750D02*
@@ -673,12 +665,12 @@ X1476210Y-716750D01*
 X1476210Y-716750D01*
 G37*
 G36*
-X-1048550Y-547840D02*
-X-1897850Y-547840D01*
-X-1897850Y-148120D01*
-X-1048550Y-148120D01*
-X-1048550Y-547840D01*
-X-1048550Y-547840D01*
+X2573490Y-716750D02*
+X1673390Y-716750D01*
+X1673390Y81750D01*
+X2573490Y81750D01*
+X2573490Y-716750D01*
+X2573490Y-716750D01*
 G37*
 G36*
 X-6600990Y-547840D02*
@@ -689,6 +681,14 @@ X-6600990Y-547840D01*
 X-6600990Y-547840D01*
 G37*
 G36*
+X-1048550Y-547840D02*
+X-1897850Y-547840D01*
+X-1897850Y-148120D01*
+X-1048550Y-148120D01*
+X-1048550Y-547840D01*
+X-1048550Y-547840D01*
+G37*
+G36*
 X-1048550Y-47460D02*
 X-1897850Y-47460D01*
 X-1897850Y352260D01*
@@ -861,6 +861,14 @@ X7174587Y2811306D01*
 X7174587Y2811306D01*
 G37*
 G36*
+X1476210Y400850D02*
+X576110Y400850D01*
+X576110Y1199350D01*
+X1476210Y1199350D01*
+X1476210Y400850D01*
+X1476210Y400850D01*
+G37*
+G36*
 X2573490Y400850D02*
 X1673390Y400850D01*
 X1673390Y1199350D01*
@@ -869,12 +877,12 @@ X2573490Y400850D01*
 X2573490Y400850D01*
 G37*
 G36*
-X1476210Y400850D02*
-X576110Y400850D01*
-X576110Y1199350D01*
-X1476210Y1199350D01*
-X1476210Y400850D01*
-X1476210Y400850D01*
+X-6600990Y452920D02*
+X-7450290Y452920D01*
+X-7450290Y852640D01*
+X-6600990Y852640D01*
+X-6600990Y452920D01*
+X-6600990Y452920D01*
 G37*
 G36*
 X-1048550Y452920D02*
@@ -885,12 +893,12 @@ X-1048550Y452920D01*
 X-1048550Y452920D01*
 G37*
 G36*
-X-6600990Y452920D02*
-X-7450290Y452920D01*
-X-7450290Y852640D01*
-X-6600990Y852640D01*
-X-6600990Y452920D01*
-X-6600990Y452920D01*
+X-2048040Y1002830D02*
+X-2447760Y1002830D01*
+X-2447760Y1852130D01*
+X-2048040Y1852130D01*
+X-2048040Y1002830D01*
+X-2048040Y1002830D01*
 G37*
 G36*
 X-5550700Y1002830D02*
@@ -901,14 +909,6 @@ X-5550700Y1002830D01*
 X-5550700Y1002830D01*
 G37*
 G36*
-X-5050320Y1002830D02*
-X-5450040Y1002830D01*
-X-5450040Y1852130D01*
-X-5050320Y1852130D01*
-X-5050320Y1002830D01*
-X-5050320Y1002830D01*
-G37*
-G36*
 X-6051080Y1002830D02*
 X-6450800Y1002830D01*
 X-6450800Y1852130D01*
@@ -917,6 +917,14 @@ X-6051080Y1002830D01*
 X-6051080Y1002830D01*
 G37*
 G36*
+X-5050320Y1002830D02*
+X-5450040Y1002830D01*
+X-5450040Y1852130D01*
+X-5050320Y1852130D01*
+X-5050320Y1002830D01*
+X-5050320Y1002830D01*
+G37*
+G36*
 X-4549940Y1002830D02*
 X-4949660Y1002830D01*
 X-4949660Y1852130D01*
@@ -933,14 +941,6 @@ X-4049560Y1002830D01*
 X-4049560Y1002830D01*
 G37*
 G36*
-X-3549180Y1002830D02*
-X-3948900Y1002830D01*
-X-3948900Y1852130D01*
-X-3549180Y1852130D01*
-X-3549180Y1002830D01*
-X-3549180Y1002830D01*
-G37*
-G36*
 X-2548420Y1002830D02*
 X-2948140Y1002830D01*
 X-2948140Y1852130D01*
@@ -949,14 +949,6 @@ X-2548420Y1002830D01*
 X-2548420Y1002830D01*
 G37*
 G36*
-X-2048040Y1002830D02*
-X-2447760Y1002830D01*
-X-2447760Y1852130D01*
-X-2048040Y1852130D01*
-X-2048040Y1002830D01*
-X-2048040Y1002830D01*
-G37*
-G36*
 X-3048800Y1002830D02*
 X-3448520Y1002830D01*
 X-3448520Y1852130D01*
@@ -965,12 +957,12 @@ X-3048800Y1002830D01*
 X-3048800Y1002830D01*
 G37*
 G36*
-X2573490Y1416850D02*
-X1673390Y1416850D01*
-X1673390Y2215350D01*
-X2573490Y2215350D01*
-X2573490Y1416850D01*
-X2573490Y1416850D01*
+X-3549180Y1002830D02*
+X-3948900Y1002830D01*
+X-3948900Y1852130D01*
+X-3549180Y1852130D01*
+X-3549180Y1002830D01*
+X-3549180Y1002830D01*
 G37*
 G36*
 X1476210Y1416850D02*
@@ -981,12 +973,12 @@ X1476210Y1416850D01*
 X1476210Y1416850D01*
 G37*
 G36*
-X-7252500Y2502700D02*
-X-8546300Y2502700D01*
-X-8546300Y3999700D01*
-X-7252500Y3999700D01*
-X-7252500Y2502700D01*
-X-7252500Y2502700D01*
+X2573490Y1416850D02*
+X1673390Y1416850D01*
+X1673390Y2215350D01*
+X2573490Y2215350D01*
+X2573490Y1416850D01*
+X2573490Y1416850D01*
 G37*
 G36*
 X-8954300Y2502700D02*
@@ -997,12 +989,12 @@ X-8954300Y2502700D01*
 X-8954300Y2502700D01*
 G37*
 G36*
-X-3700750Y2697810D02*
-X-4499250Y2697810D01*
-X-4499250Y3597910D01*
-X-3700750Y3597910D01*
-X-3700750Y2697810D01*
-X-3700750Y2697810D01*
+X-7252500Y2502700D02*
+X-8546300Y2502700D01*
+X-8546300Y3999700D01*
+X-7252500Y3999700D01*
+X-7252500Y2502700D01*
+X-7252500Y2502700D01*
 G37*
 G36*
 X-5900750Y2697810D02*
@@ -1013,6 +1005,14 @@ X-5900750Y2697810D01*
 X-5900750Y2697810D01*
 G37*
 G36*
+X-3700750Y2697810D02*
+X-4499250Y2697810D01*
+X-4499250Y3597910D01*
+X-3700750Y3597910D01*
+X-3700750Y2697810D01*
+X-3700750Y2697810D01*
+G37*
+G36*
 X7185926Y4792161D02*
 X7247106Y4779992D01*
 X7419994Y4708380D01*
@@ -1057,14 +1057,6 @@ X7185926Y4792161D01*
 X7185926Y4792161D01*
 G37*
 G36*
-X-5900750Y3795090D02*
-X-6699250Y3795090D01*
-X-6699250Y4695190D01*
-X-5900750Y4695190D01*
-X-5900750Y3795090D01*
-X-5900750Y3795090D01*
-G37*
-G36*
 X-3700750Y3795090D02*
 X-4499250Y3795090D01*
 X-4499250Y4695190D01*
@@ -1073,12 +1065,12 @@ X-3700750Y3795090D01*
 X-3700750Y3795090D01*
 G37*
 G36*
-X-8954300Y4702340D02*
-X-10248100Y4702340D01*
-X-10248100Y6199340D01*
-X-8954300Y6199340D01*
-X-8954300Y4702340D01*
-X-8954300Y4702340D01*
+X-5900750Y3795090D02*
+X-6699250Y3795090D01*
+X-6699250Y4695190D01*
+X-5900750Y4695190D01*
+X-5900750Y3795090D01*
+X-5900750Y3795090D01*
 G37*
 G36*
 X-7252500Y4702340D02*
@@ -1089,6 +1081,14 @@ X-7252500Y4702340D01*
 X-7252500Y4702340D01*
 G37*
 G36*
+X-8954300Y4702340D02*
+X-10248100Y4702340D01*
+X-10248100Y6199340D01*
+X-8954300Y6199340D01*
+X-8954300Y4702340D01*
+X-8954300Y4702340D01*
+G37*
+G36*
 X8156029Y6472756D02*
 X8306937Y6426978D01*
 X8446015Y6352640D01*
@@ -1143,14 +1143,6 @@ X3124670Y4901730D01*
 X3124670Y4901730D01*
 G37*
 G36*
-X-4701310Y5197250D02*
-X-5601410Y5197250D01*
-X-5601410Y5995750D01*
-X-4701310Y5995750D01*
-X-4701310Y5197250D01*
-X-4701310Y5197250D01*
-G37*
-G36*
 X-5798590Y5197250D02*
 X-6698690Y5197250D01*
 X-6698690Y5995750D01*
@@ -1159,6 +1151,14 @@ X-5798590Y5197250D01*
 X-5798590Y5197250D01*
 G37*
 G36*
+X-4701310Y5197250D02*
+X-5601410Y5197250D01*
+X-5601410Y5995750D01*
+X-4701310Y5995750D01*
+X-4701310Y5197250D01*
+X-4701310Y5197250D01*
+G37*
+G36*
 X-3030000Y5771500D02*
 X-3980000Y5771500D01*
 X-3980000Y6721500D01*
diff --git a/fabrication/cryptostick-F.Paste.gtp b/fabrication/cryptostick-F.Paste.gtp
index ce432e8..2a93c20 100644
--- a/fabrication/cryptostick-F.Paste.gtp
+++ b/fabrication/cryptostick-F.Paste.gtp
@@ -1,26 +1,38 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.0.1)-4*
-G04 #@! TF.CreationDate,2018-12-21T18:48:29+01:00*
+G04 #@! TF.CreationDate,2019-01-16T13:56:46+01:00*
 G04 #@! TF.ProjectId,cryptostick,63727970746F737469636B2E6B696361,R1*
 G04 #@! TF.SameCoordinates,PX791ddc0PY5e69114*
 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.1)-4) date 21.12.2018 18:48:29*
+G04 Created by KiCad (PCBNEW (5.0.1)-4) date 16.01.2019 13:56:46*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
-%ADD10R,0.640080X0.558800*%
-%ADD11R,0.599440X0.239776*%
-%ADD12R,0.239776X0.599440*%
-%ADD13R,3.279648X3.279648*%
-%ADD14R,0.959104X0.495808*%
-%ADD15R,0.955040X1.117600*%
-%ADD16R,0.558800X0.640080*%
-%ADD17R,0.240000X0.360000*%
+%ADD10C,0.300000*%
+%ADD11R,0.640080X0.558800*%
+%ADD12R,0.599440X0.239776*%
+%ADD13R,0.239776X0.599440*%
+%ADD14R,3.279648X3.279648*%
+%ADD15R,0.959104X0.495808*%
+%ADD16R,0.955040X1.117600*%
+%ADD17R,0.558800X0.640080*%
+%ADD18R,0.240000X0.360000*%
 G04 APERTURE END LIST*
 D10*
+G04 #@! TO.C,REF\002A\002A*
+X8660000Y-7353500D02*
+G75*
+G03X8660000Y-7353500I-100000J0D01*
+G01*
+X-11340000Y7146500D02*
+G75*
+G03X-11340000Y7146500I-100000J0D01*
+G01*
+G04 #@! TD*
+D11*
 G04 #@! TO.C,R3*
 X-3464560Y-6959600D03*
 X-4561840Y-6959600D03*
@@ -33,7 +45,7 @@ G04 #@! TO.C,C7*
 X-1897380Y-5549900D03*
 X-800100Y-5549900D03*
 G04 #@! TD*
-D11*
+D12*
 G04 #@! TO.C,U1*
 X-7025640Y652780D03*
 X-7025640Y152400D03*
@@ -44,7 +56,7 @@ X-7025640Y-1849120D03*
 X-7025640Y-2349500D03*
 X-7025640Y-2849880D03*
 X-7025640Y-3350260D03*
-D12*
+D13*
 X-6250940Y-4124960D03*
 X-5750560Y-4124960D03*
 X-5250180Y-4124960D03*
@@ -54,7 +66,7 @@ X-3749040Y-4124960D03*
 X-3248660Y-4124960D03*
 X-2748280Y-4124960D03*
 X-2247900Y-4124960D03*
-D11*
+D12*
 X-1473200Y-3350260D03*
 X-1473200Y-2849880D03*
 X-1473200Y-2349500D03*
@@ -64,7 +76,7 @@ X-1473200Y-848360D03*
 X-1473200Y-347980D03*
 X-1473200Y152400D03*
 X-1473200Y652780D03*
-D12*
+D13*
 X-2247900Y1427480D03*
 X-2748280Y1427480D03*
 X-3248660Y1427480D03*
@@ -74,10 +86,10 @@ X-4749800Y1427480D03*
 X-5250180Y1427480D03*
 X-5750560Y1427480D03*
 X-6250940Y1427480D03*
-D13*
+D14*
 X-4249420Y-1348740D03*
 G04 #@! TD*
-D14*
+D15*
 G04 #@! TO.C,U2*
 X3159760Y-5331460D03*
 X3159760Y-4381500D03*
@@ -85,14 +97,14 @@ X3159760Y-3431540D03*
 X523240Y-3431540D03*
 X523240Y-5331460D03*
 G04 #@! TD*
-D15*
+D16*
 G04 #@! TO.C,X1*
 X-9601200Y5450840D03*
 X-7899400Y5450840D03*
 X-7899400Y3251200D03*
 X-9601200Y3251200D03*
 G04 #@! TD*
-D10*
+D11*
 G04 #@! TO.C,C3*
 X-8501380Y-850900D03*
 X-9598660Y-850900D03*
@@ -101,12 +113,12 @@ G04 #@! TO.C,R1*
 X-9748640Y-5603500D03*
 X-8651360Y-5603500D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,C1*
 X-6300000Y3147860D03*
 X-6300000Y4245140D03*
 G04 #@! TD*
-D10*
+D11*
 G04 #@! TO.C,C7*
 X-1897380Y-5549900D03*
 X-800100Y-5549900D03*
@@ -115,12 +127,12 @@ G04 #@! TO.C,C6*
 X2674620Y6550660D03*
 X1577340Y6550660D03*
 G04 #@! TD*
-D16*
+D17*
 G04 #@! TO.C,C5*
 X-4100000Y3147860D03*
 X-4100000Y4245140D03*
 G04 #@! TD*
-D10*
+D11*
 G04 #@! TO.C,C4*
 X-9598660Y-2499360D03*
 X-8501380Y-2499360D03*
@@ -161,7 +173,7 @@ G04 #@! TO.C,R5*
 X1026160Y-317500D03*
 X2123440Y-317500D03*
 G04 #@! TD*
-D17*
+D18*
 G04 #@! TO.C,U3*
 X2903600Y-1931900D03*
 X3903600Y-1931900D03*
diff --git a/fabrication/cryptostick-F.SilkS.gto b/fabrication/cryptostick-F.SilkS.gto
index 374e1b5..074100c 100644
--- a/fabrication/cryptostick-F.SilkS.gto
+++ b/fabrication/cryptostick-F.SilkS.gto
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.0.1)-4*
-G04 #@! TF.CreationDate,2018-12-21T18:48:29+01:00*
+G04 #@! TF.CreationDate,2019-01-16T13:56:46+01:00*
 G04 #@! TF.ProjectId,cryptostick,63727970746F737469636B2E6B696361,R1*
 G04 #@! TF.SameCoordinates,PX791ddc0PY5e69114*
 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.1)-4) date 21.12.2018 18:48:29*
+G04 Created by KiCad (PCBNEW (5.0.1)-4) date 16.01.2019 13:56:46*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/fabrication/cryptostick-Front.gtl b/fabrication/cryptostick-Front.gtl
index f1fa24e..d870cfa 100644
--- a/fabrication/cryptostick-Front.gtl
+++ b/fabrication/cryptostick-Front.gtl
@@ -1,60 +1,60 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,(5.0.1)-4*
-G04 #@! TF.CreationDate,2018-12-21T18:48:29+01:00*
+G04 #@! TF.CreationDate,2019-01-16T13:56:46+01:00*
 G04 #@! TF.ProjectId,cryptostick,63727970746F737469636B2E6B696361,R1*
 G04 #@! TF.SameCoordinates,PX791ddc0PY5e69114*
 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.1)-4) date 21.12.2018 18:48:29*
+G04 Created by KiCad (PCBNEW (5.0.1)-4) date 16.01.2019 13:56:46*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
+G04 #@! TA.AperFunction,BGAPad,CuDef*
+%ADD10C,0.500000*%
+G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD10R,0.800100X0.698500*%
+%ADD11R,0.800100X0.698500*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD11O,3.500120X1.501140*%
+%ADD12O,3.500120X1.501140*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD12C,1.099820*%
+%ADD13C,1.099820*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,BGAPad,CuDef*
-%ADD13C,0.850000*%
+%ADD14C,0.850000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD14R,0.850000X0.850000*%
+%ADD15R,0.850000X0.850000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD15R,0.749300X0.299720*%
+%ADD16R,0.749300X0.299720*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD16R,0.299720X0.749300*%
+%ADD17R,0.299720X0.749300*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD17R,4.099560X4.099560*%
+%ADD18R,4.099560X4.099560*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ComponentPad*
-%ADD18C,0.304800*%
+%ADD19C,0.304800*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD19R,1.198880X0.619760*%
+%ADD20R,1.198880X0.619760*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD20R,1.193800X1.397000*%
+%ADD21R,1.193800X1.397000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD21R,0.698500X0.800100*%
+%ADD22R,0.698500X0.800100*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,BGAPad,CuDef*
-%ADD22C,1.800000*%
+%ADD23C,1.800000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,SMDPad,CuDef*
-%ADD23R,0.300000X0.450000*%
-G04 #@! TD*
-G04 #@! TA.AperFunction,BGAPad,CuDef*
-%ADD24C,0.500000*%
+%ADD24R,0.300000X0.450000*%
 G04 #@! TD*
 G04 #@! TA.AperFunction,ViaPad*
 %ADD25C,0.540000*%
@@ -85,6 +85,15 @@ G04 #@! TA.AperFunction,Conductor*
 G04 #@! TD*
 G04 APERTURE END LIST*
 D10*
+G04 #@! TO.P,REF\002A\002A,~*
+G04 #@! TO.N,N/C*
+X8560000Y-7353500D03*
+G04 #@! TD*
+G04 #@! TO.P,REF\002A\002A,~*
+G04 #@! TO.N,N/C*
+X-11440000Y7146500D03*
+G04 #@! TD*
+D11*
 G04 #@! TO.P,R3,1*
 G04 #@! TO.N,GND*
 X-3464560Y-6959600D03*
@@ -92,19 +101,19 @@ G04 #@! TO.P,R3,2*
 G04 #@! TO.N,/BOOT1*
 X-4561840Y-6959600D03*
 G04 #@! TD*
-D11*
+D12*
 G04 #@! TO.P,J2,5*
 G04 #@! TO.N,N/C*
 X6999600Y5683770D03*
 G04 #@! TO.P,J2,6*
 X6999600Y-5715750D03*
-D12*
+D13*
 G04 #@! TO.P,J2,7*
 X6999600Y-2266430D03*
 G04 #@! TO.P,J2,8*
 X6999600Y2234450D03*
 G04 #@! TD*
-D10*
+D11*
 G04 #@! TO.P,C11,1*
 G04 #@! TO.N,/VBUS*
 X2649220Y-6515100D03*
@@ -119,23 +128,23 @@ G04 #@! TO.P,C7,2*
 G04 #@! TO.N,+3.3V*
 X-800100Y-5549900D03*
 G04 #@! TD*
-D13*
+D14*
 G04 #@! TO.P,P1,2*
 G04 #@! TO.N,GND*
 X-2235000Y6246500D03*
 G04 #@! TO.P,P1,3*
 G04 #@! TO.N,/SWCLK*
 X-965000Y6246500D03*
-D14*
+D15*
 G04 #@! TO.P,P1,1*
 G04 #@! TO.N,+3.3V*
 X-3505000Y6246500D03*
-D13*
+D14*
 G04 #@! TO.P,P1,4*
 G04 #@! TO.N,/SWDIO*
 X305000Y6246500D03*
 G04 #@! TD*
-D15*
+D16*
 G04 #@! TO.P,U1,1*
 G04 #@! TO.N,+3.3V*
 X-7025640Y652780D03*
@@ -161,7 +170,7 @@ G04 #@! TO.P,U1,8*
 X-7025640Y-2849880D03*
 G04 #@! TO.P,U1,9*
 X-7025640Y-3350260D03*
-D16*
+D17*
 G04 #@! TO.P,U1,10*
 X-6250940Y-4124960D03*
 G04 #@! TO.P,U1,11*
@@ -185,7 +194,7 @@ X-2748280Y-4124960D03*
 G04 #@! TO.P,U1,18*
 G04 #@! TO.N,GND*
 X-2247900Y-4124960D03*
-D15*
+D16*
 G04 #@! TO.P,U1,19*
 G04 #@! TO.N,+3.3V*
 X-1473200Y-3350260D03*
@@ -212,7 +221,7 @@ X-1473200Y152400D03*
 G04 #@! TO.P,U1,27*
 G04 #@! TO.N,+3.3V*
 X-1473200Y652780D03*
-D16*
+D17*
 G04 #@! TO.P,U1,28*
 G04 #@! TO.N,/SWCLK*
 X-2247900Y1427480D03*
@@ -239,10 +248,10 @@ X-5750560Y1427480D03*
 G04 #@! TO.P,U1,36*
 G04 #@! TO.N,GND*
 X-6250940Y1427480D03*
-D17*
+D18*
 G04 #@! TO.P,U1,37*
 X-4249420Y-1348740D03*
-D18*
+D19*
 X-4249420Y-1348740D03*
 X-3248660Y-1348740D03*
 X-5250180Y-1348740D03*
@@ -253,7 +262,7 @@ X-3248660Y-2349500D03*
 X-4249420Y-2349500D03*
 X-5250180Y-2349500D03*
 G04 #@! TD*
-D19*
+D20*
 G04 #@! TO.P,U2,1*
 G04 #@! TO.N,/VBUS*
 X3159760Y-5331460D03*
@@ -270,7 +279,7 @@ G04 #@! TO.P,U2,5*
 G04 #@! TO.N,+3.3V*
 X523240Y-5331460D03*
 G04 #@! TD*
-D20*
+D21*
 G04 #@! TO.P,X1,2*
 G04 #@! TO.N,/OSC_OUT*
 X-9601200Y5450840D03*
@@ -284,7 +293,7 @@ G04 #@! TO.P,X1,3*
 G04 #@! TO.N,GND*
 X-9601200Y3251200D03*
 G04 #@! TD*
-D10*
+D11*
 G04 #@! TO.P,C3,1*
 G04 #@! TO.N,/NRST*
 X-8501380Y-850900D03*
@@ -299,7 +308,7 @@ G04 #@! TO.P,R1,2*
 G04 #@! TO.N,N-000008*
 X-8651360Y-5603500D03*
 G04 #@! TD*
-D21*
+D22*
 G04 #@! TO.P,C1,1*
 G04 #@! TO.N,/OSC_IN*
 X-6300000Y3147860D03*
@@ -307,7 +316,7 @@ G04 #@! TO.P,C1,2*
 G04 #@! TO.N,GND*
 X-6300000Y4245140D03*
 G04 #@! TD*
-D10*
+D11*
 G04 #@! TO.P,C7,1*
 G04 #@! TO.N,GND*
 X-1897380Y-5549900D03*
@@ -322,7 +331,7 @@ G04 #@! TO.P,C6,2*
 G04 #@! TO.N,+3.3V*
 X1577340Y6550660D03*
 G04 #@! TD*
-D21*
+D22*
 G04 #@! TO.P,C5,1*
 G04 #@! TO.N,/SCVCC*
 X-4100000Y3147860D03*
@@ -330,7 +339,7 @@ G04 #@! TO.P,C5,2*
 G04 #@! TO.N,GND*
 X-4100000Y4245140D03*
 G04 #@! TD*
-D10*
+D11*
 G04 #@! TO.P,C4,1*
 G04 #@! TO.N,GND*
 X-9598660Y-2499360D03*
@@ -380,7 +389,7 @@ G04 #@! TO.P,R4,2*
 G04 #@! TO.N,GND*
 X-6248640Y5596500D03*
 G04 #@! TD*
-D22*
+D23*
 G04 #@! TO.P,p1,1*
 G04 #@! TO.N,GND*
 X6970000Y3866500D03*
@@ -405,7 +414,7 @@ G04 #@! TO.P,p6,1*
 G04 #@! TO.N,/SWDIO*
 X8240000Y-1213500D03*
 G04 #@! TD*
-D10*
+D11*
 G04 #@! TO.P,R6,1*
 G04 #@! TO.N,/D+*
 X1026160Y800100D03*
@@ -427,7 +436,7 @@ G04 #@! TO.P,R5,2*
 G04 #@! TO.N,/D-_PLUG*
 X2123440Y-317500D03*
 G04 #@! TD*
-D23*
+D24*
 G04 #@! TO.P,U3,1*
 G04 #@! TO.N,N/C*
 X2903600Y-1931900D03*
@@ -444,15 +453,6 @@ G04 #@! TO.P,U3,4*
 G04 #@! TO.N,/D-_PLUG*
 X3903600Y-531900D03*
 G04 #@! TD*
-D24*
-G04 #@! TO.P,REF\002A\002A,~*
-G04 #@! TO.N,N/C*
-X-11440000Y7146500D03*
-G04 #@! TD*
-G04 #@! TO.P,REF\002A\002A,~*
-G04 #@! TO.N,N/C*
-X8560000Y-7353500D03*
-G04 #@! TD*
 D25*
 G04 #@! TO.N,+3.3V*
 X-4318000Y6184900D03*
diff --git a/fabrication/cryptostick-NPTH.drl b/fabrication/cryptostick-NPTH.drl
index 16e6c37..868c81c 100644
--- a/fabrication/cryptostick-NPTH.drl
+++ b/fabrication/cryptostick-NPTH.drl
@@ -1,5 +1,5 @@
 M48
-;DRILL file {KiCad (5.0.1)-4} date 21.12.2018 18:48:31
+;DRILL file {KiCad (5.0.1)-4} date 16.01.2019 13:56:49
 ;FORMAT={-:-/ absolute / metric / decimal}
 FMAT,2
 METRIC,TZ
diff --git a/fabrication/cryptostick-PTH.drl b/fabrication/cryptostick-PTH.drl
index 40ade07..6eb713b 100644
--- a/fabrication/cryptostick-PTH.drl
+++ b/fabrication/cryptostick-PTH.drl
@@ -1,5 +1,5 @@
 M48
-;DRILL file {KiCad (5.0.1)-4} date 21.12.2018 18:48:31
+;DRILL file {KiCad (5.0.1)-4} date 16.01.2019 13:56:49
 ;FORMAT={-:-/ absolute / metric / decimal}
 FMAT,2
 METRIC,TZ
diff --git a/src/cryptostick.kicad_pcb b/src/cryptostick.kicad_pcb
index 8650427..bbfb3cc 100644
--- a/src/cryptostick.kicad_pcb
+++ b/src/cryptostick.kicad_pcb
@@ -18,14 +18,14 @@
 
   (layers
     (0 Front signal)
-    (31 Back signal hide)
+    (31 Back signal)
     (32 B.Adhes user hide)
     (33 F.Adhes user hide)
-    (34 B.Paste user hide)
-    (35 F.Paste user hide)
-    (36 B.SilkS user hide)
-    (37 F.SilkS user hide)
-    (38 B.Mask user hide)
+    (34 B.Paste user)
+    (35 F.Paste user)
+    (36 B.SilkS user)
+    (37 F.SilkS user)
+    (38 B.Mask user)
     (39 F.Mask user)
     (40 Dwgs.User user hide)
     (41 Cmts.User user hide)
@@ -179,7 +179,70 @@
     (add_net +3.3V)
   )
 
-  (module Fiducial:Fiducial_0.5mm_Dia_1mm_Outer (layer Back) (tedit 5C1CC838) (tstamp 5C292C87)
+  (module footprints:Fiducial_0.5mm_Dia_1mm_Outer (layer Front) (tedit 5C3F2901) (tstamp 5C292CCD)
+    (at 135.56 106.35)
+    (descr "Circular Fiducial, 0.5mm bare copper top; 1mm keepout (Level C)")
+    (tags marker)
+    (attr virtual)
+    (fp_text reference REF** (at 0 -1.5) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value Fiducial_0.5mm_Dia_1mm_Outer (at 0 1.5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 0.1 0) (layer F.Paste) (width 0.3))
+    (fp_circle (center 0 0) (end 0.5 0) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.2 0.2) (thickness 0.04)))
+    )
+    (fp_circle (center 0 0) (end 0.75 0) (layer F.CrtYd) (width 0.05))
+    (pad ~ smd circle (at 0 0) (size 0.5 0.5) (layers Front F.Mask)
+      (solder_mask_margin 0.25) (clearance 0.25))
+  )
+
+  (module footprints:Fiducial_0.5mm_Dia_1mm_Outer (layer Back) (tedit 5C3F2901) (tstamp 5C292CEB)
+    (at 115.56 91.85)
+    (descr "Circular Fiducial, 0.5mm bare copper top; 1mm keepout (Level C)")
+    (tags marker)
+    (attr virtual)
+    (fp_text reference REF** (at 0 1.5) (layer B.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value Fiducial_0.5mm_Dia_1mm_Outer (at 0 -1.5) (layer B.Fab) hide
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_circle (center 0 0) (end 0.1 0) (layer B.Paste) (width 0.3))
+    (fp_circle (center 0 0) (end 0.5 0) (layer B.Fab) (width 0.1))
+    (fp_text user %R (at 0 0) (layer B.Fab)
+      (effects (font (size 0.2 0.2) (thickness 0.04)) (justify mirror))
+    )
+    (fp_circle (center 0 0) (end 0.75 0) (layer B.CrtYd) (width 0.05))
+    (pad ~ smd circle (at 0 0) (size 0.5 0.5) (layers Back B.Mask)
+      (solder_mask_margin 0.25) (clearance 0.25))
+  )
+
+  (module footprints:Fiducial_0.5mm_Dia_1mm_Outer (layer Front) (tedit 5C3F2901) (tstamp 5C292C79)
+    (at 115.56 91.85)
+    (descr "Circular Fiducial, 0.5mm bare copper top; 1mm keepout (Level C)")
+    (tags marker)
+    (attr virtual)
+    (fp_text reference REF** (at 0 -1.5) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value Fiducial_0.5mm_Dia_1mm_Outer (at 0 1.5) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 0.1 0) (layer F.Paste) (width 0.3))
+    (fp_circle (center 0 0) (end 0.5 0) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 0) (layer F.Fab)
+      (effects (font (size 0.2 0.2) (thickness 0.04)))
+    )
+    (fp_circle (center 0 0) (end 0.75 0) (layer F.CrtYd) (width 0.05))
+    (pad ~ smd circle (at 0 0) (size 0.5 0.5) (layers Front F.Mask)
+      (solder_mask_margin 0.25) (clearance 0.25))
+  )
+
+  (module Fiducial:Fiducial_0.5mm_Dia_1mm_Outer (layer Back) (tedit 5C3F2890) (tstamp 5C292C87)
     (at 135.56 106.35)
     (descr "Circular Fiducial, 0.5mm bare copper top; 1mm keepout (Level C)")
     (tags marker)
@@ -195,6 +258,7 @@
       (effects (font (size 0.2 0.2) (thickness 0.04)) (justify mirror))
     )
     (fp_circle (center 0 0) (end 0.75 0) (layer B.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 0.1 0) (layer B.Paste) (width 0.3))
     (pad ~ smd circle (at 0 0) (size 0.5 0.5) (layers Back B.Mask)
       (solder_mask_margin 0.25) (clearance 0.25))
   )
@@ -1243,66 +1307,6 @@
     )
   )
 
-  (module Fiducial:Fiducial_0.5mm_Dia_1mm_Outer (layer Front) (tedit 5C1CC502) (tstamp 5C292C79)
-    (at 115.56 91.85)
-    (descr "Circular Fiducial, 0.5mm bare copper top; 1mm keepout (Level C)")
-    (tags marker)
-    (attr virtual)
-    (fp_text reference REF** (at 0 -1.5) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value Fiducial_0.5mm_Dia_1mm_Outer (at 0 1.5) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_circle (center 0 0) (end 0.75 0) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.2 0.2) (thickness 0.04)))
-    )
-    (fp_circle (center 0 0) (end 0.5 0) (layer F.Fab) (width 0.1))
-    (pad ~ smd circle (at 0 0) (size 0.5 0.5) (layers Front F.Mask)
-      (solder_mask_margin 0.25) (clearance 0.25))
-  )
-
-  (module Fiducial:Fiducial_0.5mm_Dia_1mm_Outer (layer Front) (tedit 5C1CC6B8) (tstamp 5C292CCD)
-    (at 135.56 106.35)
-    (descr "Circular Fiducial, 0.5mm bare copper top; 1mm keepout (Level C)")
-    (tags marker)
-    (attr virtual)
-    (fp_text reference REF** (at 0 -1.5) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value Fiducial_0.5mm_Dia_1mm_Outer (at 0 1.5) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_circle (center 0 0) (end 0.75 0) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0) (layer F.Fab)
-      (effects (font (size 0.2 0.2) (thickness 0.04)))
-    )
-    (fp_circle (center 0 0) (end 0.5 0) (layer F.Fab) (width 0.1))
-    (pad ~ smd circle (at 0 0) (size 0.5 0.5) (layers Front F.Mask)
-      (solder_mask_margin 0.25) (clearance 0.25))
-  )
-
-  (module Fiducial:Fiducial_0.5mm_Dia_1mm_Outer (layer Back) (tedit 5C1CC81A) (tstamp 5C292CEB)
-    (at 115.56 91.85)
-    (descr "Circular Fiducial, 0.5mm bare copper top; 1mm keepout (Level C)")
-    (tags marker)
-    (attr virtual)
-    (fp_text reference REF** (at 0 1.5) (layer B.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value Fiducial_0.5mm_Dia_1mm_Outer (at 0 -1.5) (layer B.Fab) hide
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_circle (center 0 0) (end 0.75 0) (layer B.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 0) (layer B.Fab)
-      (effects (font (size 0.2 0.2) (thickness 0.04)) (justify mirror))
-    )
-    (fp_circle (center 0 0) (end 0.5 0) (layer B.Fab) (width 0.1))
-    (pad ~ smd circle (at 0 0) (size 0.5 0.5) (layers Back B.Mask)
-      (solder_mask_margin 0.25) (clearance 0.25))
-  )
-
   (gr_text R3 (at 116.58 95.36 90) (layer B.SilkS)
     (effects (font (size 0.8 0.8) (thickness 0.15)) (justify mirror))
   )
diff --git a/src/cryptostick.kicad_pcb-bak b/src/cryptostick.kicad_pcb-bak
index 68a30e1..8650427 100644
--- a/src/cryptostick.kicad_pcb-bak
+++ b/src/cryptostick.kicad_pcb-bak
@@ -1360,7 +1360,7 @@
   (segment (start 122.682 93.197751) (end 122.682 92.8116) (width 0.3) (layer Back) (net 1))
   (segment (start 122.682 93.988889) (end 122.682 93.197751) (width 0.3) (layer Back) (net 1))
   (segment (start 122.7328 94.039689) (end 122.682 93.988889) (width 0.1524) (layer Back) (net 1))
-  (via (at 122.682 92.8116) (size 0.54) (drill 0.3) (layers Front Back) (net 1))
+  (via (at 122.682 92.8116) (size 0.54) (drill 0.2) (layers Front Back) (net 1))
   (segment (start 127.8636 100.8888) (end 127.8636 103.378) (width 0.3) (layer Back) (net 1))
   (segment (start 128.474919 94.994277) (end 128.474919 100.246926) (width 0.3) (layer Back) (net 1))
   (segment (start 125.5268 98.34372) (end 125.5268 95.758) (width 0.2) (layer Front) (net 1))
@@ -1374,11 +1374,11 @@
   (segment (start 118.5164 101.823445) (end 118.5164 102.209596) (width 0.3) (layer Back) (net 1))
   (segment (start 118.5164 98.9076) (end 118.5164 101.823445) (width 0.3) (layer Back) (net 1))
   (segment (start 119.7864 97.6376) (end 118.5164 98.9076) (width 0.3) (layer Back) (net 1))
-  (via (at 118.5164 102.209596) (size 0.54) (drill 0.3) (layers Front Back) (net 1))
+  (via (at 118.5164 102.209596) (size 0.54) (drill 0.2) (layers Front Back) (net 1))
   (segment (start 128.5367 94.963051) (end 128.505474 94.994277) (width 0.3) (layer Back) (net 1))
   (segment (start 128.57734 94.891856) (end 128.474919 94.994277) (width 0.1524) (layer Front) (net 1))
   (segment (start 128.47734 93.79552) (end 128.47734 94.991856) (width 0.3) (layer Front) (net 1))
-  (via (at 128.474919 94.994277) (size 0.54) (drill 0.3) (layers Front Back) (net 1))
+  (via (at 128.474919 94.994277) (size 0.54) (drill 0.2) (layers Front Back) (net 1))
   (segment (start 128.505474 94.994277) (end 128.474919 94.994277) (width 0.3) (layer Back) (net 1))
   (segment (start 127.52324 104.32796) (end 126.41834 104.32796) (width 0.3) (layer Front) (net 1))
   (segment (start 126.41834 104.32796) (end 126.1999 104.5464) (width 0.3) (layer Front) (net 1))
@@ -1386,7 +1386,7 @@
   (segment (start 126.1999 103.378) (end 126.1999 104.5464) (width 0.3) (layer Front) (net 1))
   (segment (start 127.8636 103.378) (end 126.1999 103.378) (width 0.3) (layer Front) (net 1))
   (segment (start 125.5268 102.34676) (end 126.1999 103.01986) (width 0.3) (layer Front) (net 1))
-  (via (at 127.8636 103.378) (size 0.54) (drill 0.3) (layers Front Back) (net 1))
+  (via (at 127.8636 103.378) (size 0.54) (drill 0.2) (layers Front Back) (net 1))
   (segment (start 119.7864 97.6376) (end 119.7864 97.7773) (width 0.1524) (layer Front) (net 1))
   (segment (start 119.8118 98.18116) (end 119.97436 98.34372) (width 0.1524) (layer Front) (net 1))
   (segment (start 119.7864 97.7773) (end 119.8118 97.8027) (width 0.1524) (layer Front) (net 1))
@@ -1400,13 +1400,13 @@
   (segment (start 118.49862 101.41458) (end 118.49862 101.49586) (width 0.1524) (layer Front) (net 1) (tstamp 530F8EAF))
   (segment (start 119.06758 100.84562) (end 118.49862 101.41458) (width 0.2) (layer Front) (net 1) (tstamp 530F8EAE))
   (segment (start 119.97436 100.84562) (end 119.06758 100.84562) (width 0.1524) (layer Front) (net 1))
-  (via (at 119.7864 97.6376) (size 0.54) (drill 0.3) (layers Front Back) (net 1))
-  (via (at 126.3396 94.9452) (size 0.54) (drill 0.3) (layers Front Back) (net 1))
+  (via (at 119.7864 97.6376) (size 0.54) (drill 0.2) (layers Front Back) (net 1))
+  (via (at 126.3396 94.9452) (size 0.54) (drill 0.2) (layers Front Back) (net 1))
   (segment (start 128.57734 92.44584) (end 128.28016 92.44584) (width 0.1524) (layer Front) (net 1))
   (segment (start 128.57734 92.44584) (end 128.28016 92.44584) (width 0.1524) (layer Front) (net 1) (tstamp 553E7A11))
-  (via (at 126.3396 94.9452) (size 0.54) (drill 0.3) (layers Front Back) (net 1) (tstamp 553E7A21))
+  (via (at 126.3396 94.9452) (size 0.54) (drill 0.2) (layers Front Back) (net 1) (tstamp 553E7A21))
   (segment (start 119.7864 97.6376) (end 118.7196 98.7044) (width 0.1524) (layer Back) (net 1) (tstamp 553E7A26))
-  (via (at 119.7864 97.6376) (size 0.54) (drill 0.3) (layers Front Back) (net 1) (tstamp 553E7A2A))
+  (via (at 119.7864 97.6376) (size 0.54) (drill 0.2) (layers Front Back) (net 1) (tstamp 553E7A2A))
   (segment (start 119.97436 100.84562) (end 119.06758 100.84562) (width 0.2) (layer Front) (net 1) (tstamp 553E7A2C))
   (segment (start 119.06758 100.84562) (end 118.49862 101.41458) (width 0.1524) (layer Front) (net 1) (tstamp 553E7A2D))
   (segment (start 118.49862 101.41458) (end 118.49862 101.49586) (width 0.1524) (layer Front) (net 1) (tstamp 553E7A2E))
@@ -1446,13 +1446,13 @@
   (segment (start 127.1016 100.076) (end 127.755694 100.076) (width 0.127) (layer Front) (net 4))
   (segment (start 127.755694 100.076) (end 127.768382 100.063312) (width 0.127) (layer Front) (net 4))
   (segment (start 127.469898 96.4438) (end 127.768382 96.742284) (width 0.127) (layer Back) (net 4))
-  (via (at 127.768382 100.063312) (size 0.54) (drill 0.3) (layers Front Back) (net 4))
+  (via (at 127.768382 100.063312) (size 0.54) (drill 0.2) (layers Front Back) (net 4))
   (segment (start 127.768382 96.742284) (end 127.768382 99.677161) (width 0.127) (layer Back) (net 4))
   (segment (start 127.768382 99.677161) (end 127.768382 100.063312) (width 0.127) (layer Back) (net 4))
   (segment (start 128.02616 98.1964) (end 127.77216 98.4504) (width 0.127) (layer Front) (net 4))
   (segment (start 127.196849 98.4504) (end 127.196849 98.7552) (width 0.127) (layer Front) (net 4))
   (segment (start 127.196849 96.716849) (end 127.469898 96.4438) (width 0.127) (layer Front) (net 4))
-  (via (at 127.469898 96.4438) (size 0.54) (drill 0.3) (layers Front Back) (net 4))
+  (via (at 127.469898 96.4438) (size 0.54) (drill 0.2) (layers Front Back) (net 4))
   (segment (start 127.336449 98.1904) (end 127.196849 98.33) (width 0.127) (layer Front) (net 4) (tstamp 5C293ADC))
   (segment (start 127.338225 98.19) (end 127.314674 98.19) (width 0.127) (layer Front) (net 4))
   (segment (start 127.196849 98.59) (end 127.196849 96.716849) (width 0.127) (layer Front) (net 4))
@@ -1468,7 +1468,7 @@
   (segment (start 129.7794 100.1776) (end 129.7432 100.1776) (width 0.3) (layer Front) (net 5))
   (segment (start 129.9036 100.0534) (end 129.7794 100.1776) (width 0.3) (layer Front) (net 5))
   (segment (start 129.9036 99.5284) (end 129.9036 100.0534) (width 0.3) (layer Front) (net 5))
-  (via (at 129.7432 100.1776) (size 0.54) (drill 0.3) (layers Front Back) (net 5))
+  (via (at 129.7432 100.1776) (size 0.54) (drill 0.2) (layers Front Back) (net 5))
   (segment (start 129.12344 97.1804) (end 129.12344 98.1964) (width 0.15) (layer Front) (net 5))
   (segment (start 129.12344 98.1964) (end 129.32664 97.9932) (width 0.127) (layer Front) (net 5))
   (segment (start 129.37024 97.95) (end 129.99 97.95) (width 0.2) (layer Front) (net 5))
@@ -1478,7 +1478,7 @@
   (segment (start 130.302 97.6376) (end 129.9972 97.9424) (width 0.3) (layer Front) (net 5))
   (segment (start 130.05129 97.99649) (end 129.9972 97.9424) (width 0.127) (layer Back) (net 5))
   (segment (start 131.54773 97.95) (end 130 97.95) (width 0.3) (layer Back) (net 5))
-  (via (at 129.9972 97.9424) (size 0.54) (drill 0.3) (layers Front Back) (net 5))
+  (via (at 129.9972 97.9424) (size 0.54) (drill 0.2) (layers Front Back) (net 5))
   (segment (start 132.7 97.67) (end 132.5188 97.67) (width 0.127) (layer Front) (net 5))
   (segment (start 125.5268 100.84562) (end 125.5268 100.3808) (width 0.127) (layer Front) (net 6))
   (segment (start 127.346 99.314) (end 128.02616 99.314) (width 0.127) (layer Front) (net 6))
@@ -1488,11 +1488,11 @@
   (segment (start 131.6736 100.08783) (end 131.6736 101.1936) (width 0.3) (layer Back) (net 7))
   (segment (start 131.7164 101.1936) (end 131.6736 101.1936) (width 0.127) (layer Front) (net 7))
   (segment (start 132.6572 100.21) (end 131.6736 101.1936) (width 0.3) (layer Front) (net 7))
-  (via (at 131.6736 101.1936) (size 0.54) (drill 0.3) (layers Front Back) (net 7))
+  (via (at 131.6736 101.1936) (size 0.54) (drill 0.2) (layers Front Back) (net 7))
   (segment (start 129.12344 99.314) (end 129.1844 99.314) (width 0.127) (layer Front) (net 7))
   (segment (start 129.1844 99.314) (end 129.5908 98.9076) (width 0.15) (layer Front) (net 7))
   (segment (start 129.5908 98.9076) (end 130.274211 98.9076) (width 0.15) (layer Front) (net 7))
-  (via (at 130.274211 98.9076) (size 0.54) (drill 0.3) (layers Front Back) (net 7))
+  (via (at 130.274211 98.9076) (size 0.54) (drill 0.2) (layers Front Back) (net 7))
   (segment (start 130.9116 98.9076) (end 130.274211 98.9076) (width 0.3) (layer Front) (net 7))
   (segment (start 131.3976 98.9076) (end 130.9116 98.9076) (width 0.3) (layer Front) (net 7))
   (segment (start 132.7 100.21) (end 131.3976 98.9076) (width 0.3) (layer Front) (net 7))
@@ -1536,11 +1536,11 @@
   (segment (start 125.6665 104.0638) (end 126.33324 103.39706) (width 0.127) (layer Back) (net 11))
   (segment (start 126.26212 101.84638) (end 126.33324 101.9175) (width 0.127) (layer Front) (net 11))
   (segment (start 125.67468 101.89) (end 126.41 101.89) (width 0.2) (layer Front) (net 11))
-  (via (at 126.33324 101.9175) (size 0.54) (drill 0.3) (layers Front Back) (net 11))
+  (via (at 126.33324 101.9175) (size 0.54) (drill 0.2) (layers Front Back) (net 11))
   (segment (start 123.75134 96.398105) (end 123.7488 96.395565) (width 0.127) (layer Front) (net 12))
-  (via (at 123.7488 96.395563) (size 0.54) (drill 0.3) (layers Front Back) (net 12))
+  (via (at 123.7488 96.395563) (size 0.54) (drill 0.2) (layers Front Back) (net 12))
   (segment (start 123.75134 97.56902) (end 123.75134 96.398105) (width 0.127) (layer Front) (net 12))
-  (via (at 123.7488 96.395565) (size 0.54) (drill 0.3) (layers Front Back) (net 12))
+  (via (at 123.7488 96.395565) (size 0.54) (drill 0.2) (layers Front Back) (net 12))
   (segment (start 123.75134 96.26854) (end 123.75134 97.56902) (width 0.127) (layer Front) (net 12) (tstamp 553E7A80))
   (segment (start 123.7488 96.266) (end 123.75134 96.26854) (width 0.127) (layer Front) (net 12) (tstamp 553E7A81))
   (segment (start 125.4 104.851211) (end 124.748789 104.851211) (width 0.127) (layer Back) (net 12))
@@ -1554,12 +1554,12 @@
   (segment (start 123.48352 105.67648) (end 124.308789 104.851211) (width 0.127) (layer Back) (net 12))
   (segment (start 125.051809 104.851211) (end 125.28 104.851211) (width 0.127) (layer Back) (net 12))
   (segment (start 125.28 104.851211) (end 125.4 104.851211) (width 0.127) (layer Back) (net 12))
-  (via (at 122.2248 96.774) (size 0.54) (drill 0.3) (layers Front Back) (net 13))
+  (via (at 122.2248 96.774) (size 0.54) (drill 0.2) (layers Front Back) (net 13))
   (segment (start 122.2248 96.774) (end 122.2502 96.7994) (width 0.127) (layer Front) (net 13) (tstamp 530F8C9D))
   (segment (start 122.2502 96.7994) (end 122.2502 97.56902) (width 0.2) (layer Front) (net 13) (tstamp 530F8C9E))
   (segment (start 122.2502 96.7994) (end 122.2502 97.56902) (width 0.127) (layer Front) (net 13) (tstamp 553E7A8E))
   (segment (start 122.2248 96.774) (end 122.2502 96.7994) (width 0.127) (layer Front) (net 13) (tstamp 553E7A8F))
-  (via (at 122.2248 96.774) (size 0.54) (drill 0.3) (layers Front Back) (net 13) (tstamp 553E7A90))
+  (via (at 122.2248 96.774) (size 0.54) (drill 0.2) (layers Front Back) (net 13) (tstamp 553E7A90))
   (segment (start 124.22124 104.4067) (end 124.4 104.4067) (width 0.127) (layer Back) (net 13))
   (segment (start 124.4 104.4067) (end 123.9933 104.4067) (width 0.127) (layer Back) (net 13))
   (segment (start 122.2248 96.774) (end 122.974 96.774) (width 0.127) (layer Back) (net 13))
@@ -1575,8 +1575,8 @@
   (segment (start 124.46 104.4067) (end 124.4 104.4067) (width 0.127) (layer Back) (net 13))
   (segment (start 122.99892 95.59748) (end 122.99892 96.46108) (width 0.127) (layer Front) (net 14) (tstamp 5C1BE89A))
   (segment (start 123.62261 95.84864) (end 123.7488 95.72245) (width 0.127) (layer Front) (net 14))
-  (via (at 123.7488 95.72245) (size 0.54) (drill 0.3) (layers Front Back) (net 14))
-  (via (at 123.7488 95.722452) (size 0.54) (drill 0.3) (layers Front Back) (net 14))
+  (via (at 123.7488 95.72245) (size 0.54) (drill 0.2) (layers Front Back) (net 14))
+  (via (at 123.7488 95.722452) (size 0.54) (drill 0.2) (layers Front Back) (net 14))
   (segment (start 122.75058 96.70542) (end 122.9995 96.4565) (width 0.127) (layer Front) (net 14) (tstamp 530F87B0))
   (segment (start 122.75058 97.56902) (end 122.75058 96.70542) (width 0.127) (layer Front) (net 14))
   (segment (start 123.25096 96.70796) (end 122.9995 96.4565) (width 0.127) (layer Front) (net 14) (tstamp 530F87B6))
@@ -1593,10 +1593,10 @@
   (segment (start 123.7488 95.72245) (end 125.49125 95.72245) (width 0.127) (layer Back) (net 14))
   (segment (start 123.026188 95.722452) (end 122.9 95.84864) (width 0.127) (layer Front) (net 14))
   (segment (start 123.7488 95.722452) (end 123.026188 95.722452) (width 0.2) (layer Front) (net 14))
-  (via (at 133.9596 98.552) (size 0.54) (drill 0.3) (layers Front Back) (net 15))
+  (via (at 133.9596 98.552) (size 0.54) (drill 0.2) (layers Front Back) (net 15))
   (segment (start 126.439976 93.8276) (end 126.438046 93.82953) (width 0.127) (layer Back) (net 15))
   (segment (start 126.492 93.8276) (end 126.439976 93.8276) (width 0.127) (layer Back) (net 15))
-  (via (at 126.438046 93.82953) (size 0.54) (drill 0.3) (layers Front Back) (net 15))
+  (via (at 126.438046 93.82953) (size 0.54) (drill 0.2) (layers Front Back) (net 15))
   (segment (start 135.24 97.67) (end 135.20467 97.67) (width 0.127) (layer Front) (net 15))
   (segment (start 133.686551 98.278951) (end 133.9596 98.552) (width 0.127) (layer Back) (net 15))
   (segment (start 133.259189 97.851589) (end 133.686551 98.278951) (width 0.127) (layer Back) (net 15))
@@ -1616,8 +1616,8 @@
   (segment (start 135.24 97.67) (end 133.9596 98.552) (width 0.3) (layer Front) (net 15))
   (segment (start 127.08 93.92) (end 126.9404 93.7804) (width 0.127) (layer Front) (net 16) (tstamp 5C1BEA27))
   (segment (start 127.08 93.92) (end 126.9404 94.0596) (width 0.127) (layer Front) (net 16) (tstamp 5C1BEA28))
-  (via (at 133.9596 99.314) (size 0.54) (drill 0.3) (layers Front Back) (net 16))
-  (via (at 127.508 93.9292) (size 0.54) (drill 0.3) (layers Front Back) (net 16))
+  (via (at 133.9596 99.314) (size 0.54) (drill 0.2) (layers Front Back) (net 16))
+  (via (at 127.508 93.9292) (size 0.54) (drill 0.2) (layers Front Back) (net 16))
   (segment (start 127.121849 93.9292) (end 127.508 93.9292) (width 0.127) (layer Front) (net 16))
   (segment (start 126.9492 93.9292) (end 127.121849 93.9292) (width 0.127) (layer Front) (net 16))
   (segment (start 126.9365 93.9165) (end 126.9492 93.9292) (width 0.127) (layer Front) (net 16))
@@ -1640,11 +1640,11 @@
   (segment (start 126.9365 93.36) (end 127.305 92.75) (width 0.127) (layer Front) (net 16))
   (segment (start 124.25172 94.08668) (end 124.3076 94.0308) (width 0.127) (layer Front) (net 17))
   (segment (start 124.25172 97.56902) (end 124.25172 94.08668) (width 0.15) (layer Front) (net 17))
-  (via (at 124.3076 94.0308) (size 0.54) (drill 0.3) (layers Front Back) (net 17))
+  (via (at 124.3076 94.0308) (size 0.54) (drill 0.2) (layers Front Back) (net 17))
   (segment (start 128.02616 97.1804) (end 128.02616 96.56064) (width 0.15) (layer Front) (net 17))
   (segment (start 128.02616 96.56064) (end 128.21403 96.37277) (width 0.15) (layer Front) (net 17))
   (segment (start 128.21403 96.37277) (end 129.249092 96.37277) (width 0.15) (layer Front) (net 17))
-  (via (at 129.249092 96.37277) (size 0.54) (drill 0.3) (layers Front Back) (net 17))
+  (via (at 129.249092 96.37277) (size 0.54) (drill 0.2) (layers Front Back) (net 17))
   (segment (start 124.25172 97.56902) (end 124.25172 94.33052) (width 0.127) (layer Front) (net 17) (tstamp 553E7AB9))
   (segment (start 124.693751 94.0308) (end 124.3076 94.0308) (width 0.15) (layer Back) (net 17))
   (segment (start 128.976043 96.099721) (end 128.976043 94.787643) (width 0.15) (layer Back) (net 17))
@@ -1666,7 +1666,7 @@
   (segment (start 131.59902 103.65902) (end 131.6228 103.6828) (width 0.3) (layer Back) (net 18))
   (segment (start 133.97 102.75) (end 133.0372 103.6828) (width 0.3) (layer Front) (net 18))
   (segment (start 131.59902 102.51261) (end 131.59902 103.65902) (width 0.3) (layer Back) (net 18))
-  (via (at 131.6228 103.6828) (size 0.54) (drill 0.3) (layers Front Back) (net 18))
+  (via (at 131.6228 103.6828) (size 0.54) (drill 0.2) (layers Front Back) (net 18))
   (segment (start 129.64922 105.5116) (end 129.64922 104.48798) (width 0.3) (layer Front) (net 18))
   (segment (start 129.80924 104.32796) (end 130.15976 104.32796) (width 0.15) (layer Front) (net 18))
   (segment (start 129.64922 104.48798) (end 129.80924 104.32796) (width 0.15) (layer Front) (net 18))
@@ -1682,7 +1682,7 @@
   (segment (start 124.35 104.21) (end 124.35 104.13) (width 0.127) (layer Front) (net 19))
   (segment (start 124.43294 104.02706) (end 124.53 103.93) (width 0.2) (layer Front) (net 19))
   (segment (start 118.82 100.52) (end 119.2 100.42) (width 0.2) (layer Front) (net 19))
-  (via (at 119.17 103.45) (size 0.54) (drill 0.3) (layers Front Back) (net 19) (tstamp 5C1BEEFC))
+  (via (at 119.17 103.45) (size 0.54) (drill 0.2) (layers Front Back) (net 19) (tstamp 5C1BEEFC))
   (segment (start 130.35 92.060533) (end 130.35 91.75) (width 0.18) (layer Back) (net 19) (tstamp 5C1BB717))
   (segment (start 130.36 91.8) (end 130.36 92.16) (width 0.17) (layer Front) (net 19))
   (segment (start 115.63 99.28019) (end 115.63 98.93) (width 0.20066) (layer Back) (net 19) (tstamp 5C1BD0DA))
@@ -1700,7 +1700,7 @@
   (segment (start 129.855723 106.596181) (end 125.202951 106.596181) (width 0.20066) (layer Front) (net 19))
   (segment (start 125.10262 106.49585) (end 125.10262 105.94594) (width 0.20066) (layer Front) (net 19))
   (segment (start 125.202951 106.596181) (end 125.10262 106.49585) (width 0.20066) (layer Front) (net 19))
-  (via (at 134.2136 106.426) (size 0.54) (drill 0.3) (layers Front Back) (net 19))
+  (via (at 134.2136 106.426) (size 0.54) (drill 0.2) (layers Front Back) (net 19))
   (segment (start 132.5372 106.426) (end 134.2136 106.426) (width 0.20066) (layer Back) (net 19))
   (segment (start 131.7752 105.664) (end 132.5372 106.426) (width 0.20066) (layer Back) (net 19))
   (segment (start 129.5908 105.664) (end 131.7752 105.664) (width 0.20066) (layer Back) (net 19))
@@ -1715,26 +1715,26 @@
   (segment (start 127.27686 106.426) (end 127.27686 105.387138) (width 0.20066) (layer Back) (net 19))
   (segment (start 128.4732 105.3592) (end 127.690949 105.3592) (width 0.20066) (layer Front) (net 19))
   (segment (start 127.690949 105.3592) (end 127.304798 105.3592) (width 0.20066) (layer Front) (net 19))
-  (via (at 127.304798 105.3592) (size 0.54) (drill 0.3) (layers Front Back) (net 19))
+  (via (at 127.304798 105.3592) (size 0.54) (drill 0.2) (layers Front Back) (net 19))
   (segment (start 127.304798 106.132126) (end 127.304798 105.745351) (width 0.20066) (layer Front) (net 19))
   (segment (start 125.202951 106.596181) (end 126.840743 106.596181) (width 0.20066) (layer Front) (net 19))
   (segment (start 127.304798 105.745351) (end 127.304798 105.3592) (width 0.20066) (layer Front) (net 19))
   (segment (start 126.840743 106.596181) (end 127.304798 106.132126) (width 0.20066) (layer Front) (net 19))
   (segment (start 127.27686 105.387138) (end 127.304798 105.3592) (width 0.20066) (layer Back) (net 19))
-  (via (at 127.6604 95.7072) (size 0.54) (drill 0.3) (layers Front Back) (net 19))
+  (via (at 127.6604 95.7072) (size 0.54) (drill 0.2) (layers Front Back) (net 19))
   (segment (start 122.08176 94.75136) (end 122.0724 94.742) (width 0.20066) (layer Front) (net 19))
   (segment (start 122.9 94.75136) (end 122.08176 94.75136) (width 0.20066) (layer Front) (net 19))
   (segment (start 122.345449 95.015049) (end 122.0724 94.742) (width 0.20066) (layer Back) (net 19))
   (segment (start 122.368458 95.015049) (end 122.345449 95.015049) (width 0.20066) (layer Back) (net 19))
-  (via (at 122.0724 94.742) (size 0.54) (drill 0.3) (layers Front Back) (net 19))
+  (via (at 122.0724 94.742) (size 0.54) (drill 0.2) (layers Front Back) (net 19))
   (segment (start 120.33123 96.9264) (end 119.562929 96.9264) (width 0.20066) (layer Front) (net 19))
   (segment (start 120.74906 97.34423) (end 120.33123 96.9264) (width 0.20066) (layer Front) (net 19))
-  (via (at 119.176778 96.9264) (size 0.54) (drill 0.3) (layers Front Back) (net 19))
+  (via (at 119.176778 96.9264) (size 0.54) (drill 0.2) (layers Front Back) (net 19))
   (segment (start 120.74906 97.56902) (end 120.74906 97.34423) (width 0.20066) (layer Front) (net 19))
   (segment (start 117.348 96.9772) (end 119.125978 96.9772) (width 0.20066) (layer Back) (net 19))
   (segment (start 119.562929 96.9264) (end 119.176778 96.9264) (width 0.20066) (layer Front) (net 19))
   (segment (start 119.2276 96.9264) (end 119.176778 96.9264) (width 0.20066) (layer Back) (net 19))
-  (via (at 119.176791 96.929061) (size 0.54) (drill 0.3) (layers Front Back) (net 19))
+  (via (at 119.176791 96.929061) (size 0.54) (drill 0.2) (layers Front Back) (net 19))
   (segment (start 119.125978 96.9772) (end 119.176778 96.9264) (width 0.20066) (layer Back) (net 19))
   (segment (start 126.1012 98.8441) (end 126.42468 98.52062) (width 0.20066) (layer Front) (net 19))
   (segment (start 125.5268 98.8441) (end 126.1012 98.8441) (width 0.20066) (layer Front) (net 19))
@@ -1747,7 +1747,7 @@
   (segment (start 131.620261 95.478601) (end 130.170071 95.478601) (width 0.20066) (layer Back) (net 19))
   (segment (start 130.170071 95.478601) (end 129.78392 95.478601) (width 0.20066) (layer Back) (net 19))
   (segment (start 131.6355 95.49384) (end 131.620261 95.478601) (width 0.20066) (layer Back) (net 19))
-  (via (at 129.78392 95.478601) (size 0.54) (drill 0.3) (layers Front Back) (net 19))
+  (via (at 129.78392 95.478601) (size 0.54) (drill 0.2) (layers Front Back) (net 19))
   (segment (start 129.67462 95.369301) (end 129.78392 95.478601) (width 0.20066) (layer Front) (net 19))
   (segment (start 129.67462 93.69552) (end 129.67462 95.47098) (width 0.20066) (layer Front) (net 19))
   (segment (start 129.67462 95.47098) (end 129.34688 95.79872) (width 0.20066) (layer Front) (net 19))
@@ -1771,7 +1771,7 @@
   (segment (start 127.254 95.8596) (end 127.326471 95.8596) (width 0.20066) (layer Back) (net 19))
   (segment (start 126.785431 95.8596) (end 126.39928 95.8596) (width 0.20066) (layer Back) (net 19))
   (segment (start 127.254 95.8596) (end 126.785431 95.8596) (width 0.20066) (layer Back) (net 19))
-  (via (at 126.39928 95.8596) (size 0.54) (drill 0.3) (layers Front Back) (net 19))
+  (via (at 126.39928 95.8596) (size 0.54) (drill 0.2) (layers Front Back) (net 19))
   (segment (start 124.25172 98.8441) (end 122.75058 100.34524) (width 0.20066) (layer Front) (net 19) (tstamp 530F8735))
   (segment (start 125.5268 98.8441) (end 124.25172 98.8441) (width 0.20066) (layer Front) (net 19))
   (segment (start 124.7521 102.34676) (end 122.75058 100.34524) (width 0.20066) (layer Front) (net 19) (tstamp 530F8745))
@@ -1784,7 +1784,7 @@
   (segment (start 116.3828 95.0976) (end 116.3828 91.6432) (width 0.20066) (layer Front) (net 19) (tstamp 530F89FE))
   (segment (start 117.3988 95.7453) (end 117.0305 95.7453) (width 0.20066) (layer Front) (net 19))
   (segment (start 117.348 96.9772) (end 117.3988 96.9264) (width 0.20066) (layer Front) (net 19) (tstamp 530F8A33))
-  (via (at 117.348 96.9772) (size 0.54) (drill 0.3) (layers Front Back) (net 19))
+  (via (at 117.348 96.9772) (size 0.54) (drill 0.2) (layers Front Back) (net 19) (status 1000000))
   (segment (start 117.3988 96.9264) (end 117.3988 95.7453) (width 0.20066) (layer Front) (net 19) (tstamp 530F8A34))
   (segment (start 129.67462 93.69552) (end 129.67462 92.44584) (width 0.20066) (layer Front) (net 19) (tstamp 530F8A71))
   (segment (start 125.10262 105.94594) (end 125.10262 104.5464) (width 0.20066) (layer Front) (net 19))
@@ -1811,8 +1811,8 @@
   (segment (start 129.4 91.65) (end 125.8 91.65) (width 0.20066) (layer Front) (net 19) (tstamp 54C6A6F2))
   (segment (start 129.67462 92.44584) (end 129.67462 91.92462) (width 0.20066) (layer Front) (net 19))
   (segment (start 125.8 91.65) (end 125.8 91.7) (width 0.20066) (layer Back) (net 19) (tstamp 54C6A6FD))
-  (via (at 125.8 91.65) (size 0.54) (drill 0.3) (layers Front Back) (net 19))
-  (via (at 125.8 91.65) (size 0.54) (drill 0.3) (layers Front Back) (net 19) (tstamp 553E7AD5))
+  (via (at 125.8 91.65) (size 0.54) (drill 0.2) (layers Front Back) (net 19))
+  (via (at 125.8 91.65) (size 0.54) (drill 0.2) (layers Front Back) (net 19) (tstamp 553E7AD5))
   (segment (start 125.8 91.65) (end 125.8 91.7) (width 0.20066) (layer Back) (net 19) (tstamp 553E7AD6))
   (segment (start 129.67462 92.44584) (end 129.67462 91.92462) (width 0.20066) (layer Front) (net 19) (tstamp 553E7AD7))
   (segment (start 129.4 91.65) (end 125.8 91.65) (width 0.20066) (layer Front) (net 19) (tstamp 553E7ADA))
@@ -1840,7 +1840,7 @@
   (segment (start 119.2276 96.9264) (end 119.1768 96.9772) (width 0.20066) (layer Back) (net 19) (tstamp 553E7B2E))
   (segment (start 119.1768 96.9772) (end 117.348 96.9772) (width 0.20066) (layer Back) (net 19) (tstamp 553E7B2F))
   (segment (start 117.3988 96.9264) (end 117.3988 95.7453) (width 0.20066) (layer Front) (net 19) (tstamp 553E7B30))
-  (via (at 117.348 96.9772) (size 0.54) (drill 0.3) (layers Front Back) (net 19) (tstamp 553E7B31))
+  (via (at 117.348 96.9772) (size 0.54) (drill 0.2) (layers Front Back) (net 19) (tstamp 553E7B31))
   (segment (start 117.348 96.9772) (end 117.3988 96.9264) (width 0.20066) (layer Front) (net 19) (tstamp 553E7B32))
   (segment (start 117.3988 95.7453) (end 117.0305 95.7453) (width 0.20066) (layer Front) (net 19) (tstamp 553E7B33))
   (segment (start 116.3828 95.0976) (end 116.3828 91.6432) (width 0.20066) (layer Front) (net 19) (tstamp 553E7B35))
@@ -1895,8 +1895,8 @@
   (segment (start 115.625 105.1) (end 115.625 102.75) (width 0.127) (layer Front) (net 21) (tstamp 553E7B51))
   (segment (start 115.625 102.75) (end 116.2 102.175) (width 0.127) (layer Front) (net 21) (tstamp 547D4541))
   (segment (start 115.625 102.75) (end 116.2 102.175) (width 0.127) (layer Front) (net 21) (tstamp 553E7B50))
-  (via (at 116.2 102.175) (size 0.54) (drill 0.3) (layers Front Back) (net 21))
-  (via (at 116.2 102.175) (size 0.54) (drill 0.3) (layers Front Back) (net 21) (tstamp 553E7B4F))
+  (via (at 116.2 102.175) (size 0.54) (drill 0.2) (layers Front Back) (net 21))
+  (via (at 116.2 102.175) (size 0.54) (drill 0.2) (layers Front Back) (net 21) (tstamp 553E7B4F))
   (segment (start 116.4464 101.542449) (end 116.4464 101.4) (width 0.127) (layer Back) (net 21))
   (segment (start 116.2 101.788849) (end 116.4464 101.542449) (width 0.127) (layer Back) (net 21))
   (segment (start 116.2 102.175) (end 116.2 101.788849) (width 0.127) (layer Back) (net 21))
@@ -1904,7 +1904,7 @@
   (segment (start 116.2812 103.2764) (end 115.6336 102.6288) (width 0.127) (layer Back) (net 22))
   (segment (start 115.6336 102.6288) (end 115.6336 100.992) (width 0.127) (layer Back) (net 22))
   (segment (start 116.2812 104.394) (end 116.2812 103.2764) (width 0.127) (layer Front) (net 22))
-  (via (at 116.2812 103.2764) (size 0.54) (drill 0.3) (layers Front Back) (net 22))
+  (via (at 116.2812 103.2764) (size 0.54) (drill 0.2) (layers Front Back) (net 22))
   (segment (start 116.4872 104.6) (end 116.2812 104.394) (width 0.127) (layer Front) (net 22))
   (segment (start 116.525 104.6) (end 116.4872 104.6) (width 0.127) (layer Front) (net 22))
   (segment (start 116.8 104.5972) (end 116.7384 104.5972) (width 0.127) (layer Front) (net 22) (tstamp 53135255))
diff --git a/src/footprints.pretty/Fiducial_0.5mm_Dia_1mm_Outer.kicad_mod b/src/footprints.pretty/Fiducial_0.5mm_Dia_1mm_Outer.kicad_mod
new file mode 100644
index 0000000..578f3a5
--- /dev/null
+++ b/src/footprints.pretty/Fiducial_0.5mm_Dia_1mm_Outer.kicad_mod
@@ -0,0 +1,19 @@
+(module Fiducial_0.5mm_Dia_1mm_Outer (layer F.Cu) (tedit 5C3F2901)
+  (descr "Circular Fiducial, 0.5mm bare copper top; 1mm keepout (Level C)")
+  (tags marker)
+  (attr virtual)
+  (fp_text reference REF** (at 0 -1.5) (layer F.SilkS) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value Fiducial_0.5mm_Dia_1mm_Outer (at 0 1.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_circle (center 0 0) (end 0.75 0) (layer F.CrtYd) (width 0.05))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 0.2 0.2) (thickness 0.04)))
+  )
+  (fp_circle (center 0 0) (end 0.5 0) (layer F.Fab) (width 0.1))
+  (fp_circle (center 0 0) (end 0.1 0) (layer F.Paste) (width 0.3))
+  (pad ~ smd circle (at 0 0) (size 0.5 0.5) (layers F.Cu F.Mask)
+    (solder_mask_margin 0.25) (clearance 0.25))
+)