diff --git a/hardware/gerbers/u2f-zero.GBL b/hardware/gerbers/u2f-zero.GBL
index ad2b71f..9ac4a56 100644
--- a/hardware/gerbers/u2f-zero.GBL
+++ b/hardware/gerbers/u2f-zero.GBL
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Copper,L2,Bot,Signal*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 5:05:17 PM*
+G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 7:41:23 PM*
 %MOMM*%
 G01*
 G04 APERTURE LIST*
@@ -26,8 +26,8 @@ X63900000Y-31400000D03*
 X54600000Y-35800000D03*
 X60200000Y-31600000D03*
 X55550000Y-38100000D03*
-X53800000Y-38550000D03*
-X65600000Y-39750000D03*
+X64450000Y-40300000D03*
+X54050000Y-37700000D03*
 X64400000Y-35275000D03*
 X62550000Y-36575000D03*
 X54650000Y-41700000D03*
@@ -37,6 +37,8 @@ X62200000Y-41625000D03*
 X63525000Y-36525000D03*
 X67050000Y-37400000D03*
 X57301040Y-33400380D03*
+X67050000Y-35100000D03*
+X65400000Y-35900000D03*
 X57301040Y-32399620D03*
 X48850000Y-36950000D03*
 X53750000Y-41075000D03*
@@ -85,34 +87,32 @@ X55500000Y-35600000D01*
 X55550000Y-38100000D02*
 X55500000Y-38050000D01*
 D13*
-X55975000Y-40800000D02*
-X55350000Y-40800000D01*
-X55350000Y-40800000D02*
-X55275000Y-40725000D01*
-X53800000Y-39250000D02*
-X53800000Y-38550000D01*
-X61537500Y-40387500D02*
-X61275000Y-40650000D01*
-X60375000Y-40800000D02*
-X55975000Y-40800000D01*
-X60525000Y-40650000D02*
-X60375000Y-40800000D01*
-X61275000Y-40650000D02*
-X60525000Y-40650000D01*
-X65600000Y-39750000D02*
-X64962500Y-40387500D01*
-X61537500Y-40387500D02*
-X64962500Y-40387500D01*
-X55275000Y-40725000D02*
-X53800000Y-39250000D01*
-X65600000Y-39750000D02*
-X65075000Y-40275000D01*
+X64450000Y-40300000D02*
+X63950000Y-40800000D01*
+X63950000Y-40800000D02*
+X55650000Y-40800000D01*
+X55650000Y-40800000D02*
+X53800000Y-38950000D01*
+X53800000Y-38950000D02*
+X53800000Y-37950000D01*
+X53800000Y-37950000D02*
+X54050000Y-37700000D01*
 D14*
 X63850000Y-35275000D02*
 X64400000Y-35275000D01*
 X62550000Y-36575000D02*
 X63850000Y-35275000D01*
 D15*
+X50500000Y-40250000D02*
+X50962500Y-40712500D01*
+X50500000Y-39700000D02*
+X50500000Y-40250000D01*
+X50300000Y-39500000D02*
+X50500000Y-39700000D01*
+X50300000Y-38100000D02*
+X50300000Y-39500000D01*
+X49950000Y-37750000D02*
+X50300000Y-38100000D01*
 X49500000Y-37750000D02*
 X49950000Y-37750000D01*
 X53025000Y-41700000D02*
@@ -131,16 +131,18 @@ X47000000Y-36500000D02*
 X48000000Y-35500000D01*
 X52037500Y-40712500D02*
 X50962500Y-40712500D01*
-X50500000Y-40250000D02*
-X50962500Y-40712500D01*
-X50500000Y-39700000D02*
-X50500000Y-40250000D01*
-X50300000Y-39500000D02*
-X50500000Y-39700000D01*
-X50300000Y-38100000D02*
-X50300000Y-39500000D01*
-X49950000Y-37750000D02*
-X50300000Y-38100000D01*
+X55200000Y-41325000D02*
+X55125000Y-41325000D01*
+X55125000Y-41325000D02*
+X53175000Y-39375000D01*
+X53175000Y-39375000D02*
+X53175000Y-39250000D01*
+X52925000Y-37225000D02*
+X51250000Y-37225000D01*
+X53175000Y-37475000D02*
+X52925000Y-37225000D01*
+X53175000Y-39250000D02*
+X53175000Y-37475000D01*
 X48850000Y-35500000D02*
 X48750000Y-35500000D01*
 X51250000Y-37225000D02*
@@ -149,20 +151,8 @@ X50000000Y-36500000D02*
 X49000000Y-35500000D01*
 X50725000Y-37225000D02*
 X50000000Y-36500000D01*
-X55200000Y-41325000D02*
-X55125000Y-41325000D01*
-X53175000Y-39250000D02*
-X53175000Y-37475000D01*
-X53175000Y-37475000D02*
-X52925000Y-37225000D01*
-X52925000Y-37225000D02*
-X51250000Y-37225000D01*
 X51250000Y-37225000D02*
 X51150000Y-37225000D01*
-X53175000Y-39375000D02*
-X53175000Y-39250000D01*
-X55125000Y-41325000D02*
-X53175000Y-39375000D01*
 X62200000Y-41625000D02*
 X62150000Y-41675000D01*
 X62150000Y-41675000D02*
@@ -181,6 +171,10 @@ X64950000Y-36525000D02*
 X65825000Y-37400000D01*
 X64950000Y-36525000D02*
 X63525000Y-36525000D01*
+X66200000Y-35100000D02*
+X67050000Y-35100000D01*
+X65400000Y-35900000D02*
+X66200000Y-35100000D01*
 X51250000Y-39500000D02*
 X50900000Y-39500000D01*
 X48850000Y-36950000D02*
diff --git a/hardware/gerbers/u2f-zero.GBO b/hardware/gerbers/u2f-zero.GBO
index 9f4d618..e0bed09 100644
--- a/hardware/gerbers/u2f-zero.GBO
+++ b/hardware/gerbers/u2f-zero.GBO
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Legend,Bot*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 5:05:17 PM*
+G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 7:41:23 PM*
 %MOMM*%
 G01*
 G04 APERTURE LIST*
diff --git a/hardware/gerbers/u2f-zero.GBS b/hardware/gerbers/u2f-zero.GBS
index 1ba000e..5ea08fa 100644
--- a/hardware/gerbers/u2f-zero.GBS
+++ b/hardware/gerbers/u2f-zero.GBS
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Soldermask,Bot*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 5:05:17 PM*
+G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 7:41:23 PM*
 %MOMM*%
 G01*
 G04 APERTURE LIST*
diff --git a/hardware/gerbers/u2f-zero.GKO b/hardware/gerbers/u2f-zero.GKO
index 0784b69..ae8c67c 100644
--- a/hardware/gerbers/u2f-zero.GKO
+++ b/hardware/gerbers/u2f-zero.GKO
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Profile,NP*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 5:05:17 PM*
+G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 7:41:23 PM*
 %MOMM*%
 G01*
 G04 APERTURE LIST*
diff --git a/hardware/gerbers/u2f-zero.GTL b/hardware/gerbers/u2f-zero.GTL
index b71665d..ae04b08 100644
--- a/hardware/gerbers/u2f-zero.GTL
+++ b/hardware/gerbers/u2f-zero.GTL
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Copper,L1,Top,Signal*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 5:05:17 PM*
+G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 7:41:23 PM*
 %MOMM*%
 G01*
 G04 APERTURE LIST*
@@ -17,7 +17,7 @@ G04 APERTURE LIST*
 %ADD19R,0.500000X0.900000*%
 %ADD20R,0.449580X0.299720*%
 %ADD21R,0.650000X0.850000*%
-%ADD22R,0.550000X0.350000*%
+%ADD22R,0.550000X0.300000*%
 %ADD23R,1.300000X1.500000*%
 %ADD24R,1.400000X1.600000*%
 %ADD25C,0.780000*%
@@ -112,8 +112,8 @@ X63900000Y-31400000D03*
 X54600000Y-35800000D03*
 X60200000Y-31600000D03*
 X55550000Y-38100000D03*
-X53800000Y-38550000D03*
-X65600000Y-39750000D03*
+X64450000Y-40300000D03*
+X54050000Y-37700000D03*
 X64400000Y-35275000D03*
 X62550000Y-36575000D03*
 X54650000Y-41700000D03*
@@ -123,10 +123,30 @@ X62200000Y-41625000D03*
 X63525000Y-36525000D03*
 X67050000Y-37400000D03*
 X57301040Y-33400380D03*
+X67050000Y-35100000D03*
+X65400000Y-35900000D03*
 X57301040Y-32399620D03*
 X48850000Y-36950000D03*
 X53750000Y-41075000D03*
 D27*
+X66950000Y-40500000D02*
+X65500000Y-40500000D01*
+X66800000Y-40400000D02*
+X65600000Y-40400000D01*
+X66850000Y-40200000D02*
+X65600000Y-40200000D01*
+X66850000Y-40000000D02*
+X65600000Y-40000000D01*
+X66750000Y-39800000D02*
+X65650000Y-39800000D01*
+X66700000Y-39600000D02*
+X65700000Y-39600000D01*
+X66850000Y-39400000D02*
+X65650000Y-39400000D01*
+X66800000Y-39200000D02*
+X65700000Y-39200000D01*
+X66900000Y-39000000D02*
+X65700000Y-39000000D01*
 X52650000Y-38200000D02*
 X52650000Y-38350000D01*
 X52650000Y-38350000D02*
@@ -158,22 +178,20 @@ X52650000Y-36600000D01*
 X52650000Y-36600000D02*
 X52950000Y-36300000D01*
 D28*
-X58900000Y-36900000D02*
-X57325000Y-36900000D01*
+X54600000Y-36600000D02*
+X54900000Y-36900000D01*
 X63900000Y-31400000D02*
 X63900000Y-32700000D01*
-X63800000Y-32800000D02*
-X63250000Y-32800000D01*
+X63250000Y-32800000D02*
+X63800000Y-32800000D01*
 X63900000Y-32700000D02*
 X63800000Y-32800000D01*
 X54600000Y-36600000D02*
 X54600000Y-35800000D01*
-X55025000Y-37025000D02*
-X54600000Y-36600000D01*
-X57200000Y-37025000D02*
-X55025000Y-37025000D01*
 X57325000Y-36900000D02*
-X57200000Y-37025000D01*
+X58900000Y-36900000D01*
+X54900000Y-36900000D02*
+X57325000Y-36900000D01*
 X55550000Y-38100000D02*
 X56125000Y-38100000D01*
 X60900000Y-31600000D02*
@@ -188,88 +206,38 @@ X60900000Y-31600000D02*
 X62550000Y-31600000D01*
 X62550000Y-31600000D02*
 X63250000Y-32300000D01*
+X60600000Y-32300000D02*
+X59400000Y-32300000D01*
+X59400000Y-32300000D02*
+X59100000Y-32000000D01*
 D27*
-X45650000Y-40050000D02*
-X52675000Y-40050000D01*
-X53800000Y-38925000D02*
-X53800000Y-38550000D01*
-X52675000Y-40050000D02*
-X53800000Y-38925000D01*
-X45650000Y-32850000D02*
-X45650000Y-40050000D01*
-X57400522Y-37474478D02*
-X57625522Y-37474478D01*
-X53800000Y-38550000D02*
-X53800000Y-38500000D01*
-X57625522Y-37474478D02*
-X57700000Y-37400000D01*
-X57700000Y-37400000D02*
-X58900000Y-37400000D01*
-X54700522Y-37474478D02*
-X57400522Y-37474478D01*
-X53800000Y-38500000D02*
-X54700522Y-37474478D01*
-X51450000Y-36300000D02*
-X51450000Y-35700000D01*
-X50900000Y-35150000D02*
-X50900000Y-34350000D01*
-X51450000Y-35700000D02*
-X50900000Y-35150000D01*
+X55898960Y-32900000D02*
+X54850000Y-32900000D01*
+X54050000Y-37700000D02*
+X54600000Y-37700000D01*
+X62550000Y-38400000D02*
+X64450000Y-40300000D01*
 X61400000Y-38400000D02*
-X64250000Y-38400000D01*
-X64250000Y-38400000D02*
-X65600000Y-39750000D01*
-X65600000Y-39750000D02*
-X67650000Y-39750000D01*
-D28*
-X55100000Y-33200000D02*
-X55100000Y-32100000D01*
-X58200000Y-32300000D02*
-X57800000Y-31900000D01*
-X57800000Y-31900000D02*
-X55300000Y-31900000D01*
-X58200000Y-32300000D02*
-X60600000Y-32300000D01*
-X55100000Y-32100000D02*
-X55300000Y-31900000D01*
-X52400000Y-34550000D02*
-X52650000Y-34550000D01*
-X52650000Y-34550000D02*
-X53500522Y-33699478D01*
-X55400000Y-32900000D02*
-X55898960Y-32900000D01*
-X54600522Y-33699478D02*
-X55100000Y-33200000D01*
-X55100000Y-33200000D02*
-X55400000Y-32900000D01*
-X53500522Y-33699478D02*
-X54600522Y-33699478D01*
-D27*
-X50900000Y-34350000D02*
-X50200000Y-34350000D01*
-X50200000Y-34350000D02*
-X49900000Y-34050000D01*
-X49900000Y-34050000D02*
-X49900000Y-32700000D01*
-X46650000Y-32850000D02*
-X45650000Y-32850000D01*
-X49200000Y-32000000D02*
-X49900000Y-32700000D01*
-X47500000Y-32000000D02*
-X49200000Y-32000000D01*
-X46650000Y-32850000D02*
-X47500000Y-32000000D01*
-X52400000Y-34550000D02*
-X52400000Y-34400000D01*
-X51550000Y-38200000D02*
-X51550000Y-36400000D01*
-X51550000Y-36400000D02*
-X51450000Y-36300000D01*
+X62550000Y-38400000D01*
+X54900000Y-37400000D02*
+X58900000Y-37400000D01*
+X54600000Y-37700000D02*
+X54900000Y-37400000D01*
 X50900000Y-34350000D02*
 X52200000Y-34350000D01*
 X52200000Y-34350000D02*
 X52400000Y-34550000D01*
 D28*
+X52400000Y-34550000D02*
+X52650000Y-34550000D01*
+D27*
+X52400000Y-34550000D02*
+X52400000Y-34400000D01*
+X51550000Y-36400000D02*
+X51450000Y-36300000D01*
+X52200000Y-34350000D02*
+X52400000Y-34550000D01*
+D28*
 X61400000Y-36900000D02*
 X62225000Y-36900000D01*
 X64700000Y-34975000D02*
@@ -346,18 +314,20 @@ X63525000Y-36525000D02*
 X63525000Y-37150000D01*
 X63525000Y-37150000D02*
 X63275000Y-37400000D01*
+X64150000Y-36100000D02*
+X64150000Y-36050000D01*
+X64300000Y-35900000D02*
+X65400000Y-35900000D01*
+X64150000Y-36050000D02*
+X64300000Y-35900000D01*
 X63425000Y-37900000D02*
 X64150000Y-37175000D01*
 X64150000Y-36075000D02*
+X64150000Y-36100000D01*
+X64150000Y-36100000D02*
 X64150000Y-37175000D01*
 X63425000Y-37900000D02*
 X61400000Y-37900000D01*
-D28*
-X64150000Y-36075000D02*
-X65750000Y-36075000D01*
-X65750000Y-36075000D02*
-X66725000Y-35100000D01*
-D29*
 X62575000Y-35225000D02*
 X63300000Y-35225000D01*
 X57301040Y-32399620D02*
@@ -378,6 +348,10 @@ X61850000Y-34500000D02*
 X62575000Y-35225000D01*
 X63300000Y-35225000D02*
 X64150000Y-36075000D01*
+D27*
+X42650000Y-32850000D02*
+X42650000Y-40050000D01*
+D29*
 X44100000Y-41400000D02*
 X52000000Y-41400000D01*
 X42750000Y-40050000D02*
@@ -395,8 +369,6 @@ X58900000Y-38900000D01*
 X42650000Y-40050000D02*
 X42750000Y-40050000D01*
 D27*
-X42650000Y-40050000D02*
-X42650000Y-32850000D01*
 X48000000Y-39000000D02*
 X48000000Y-36950000D01*
 D29*
@@ -493,16 +465,810 @@ X66677000Y-36527000D01*
 X74123000Y-36527000D01*
 X74123000Y-38273000D01*
 G36*
-X74623000Y-40623000D02*
-X66677000Y-40623000D01*
-X66677000Y-38877000D01*
-X74623000Y-38877000D01*
-X74623000Y-40623000D01*
-X74623000Y-40623000D01*
+X64869673Y-36692192D02*
+X65213201Y-36834838D01*
+X65585167Y-36835162D01*
+X65873000Y-36716232D01*
+X65873000Y-41540000D01*
+X63296163Y-41540000D01*
+X63405581Y-41430582D01*
+X63560574Y-41198619D01*
+X63566332Y-41169673D01*
+X63615000Y-40925000D01*
+X63615000Y-39700000D01*
+X63607541Y-39662500D01*
+X63615000Y-39625000D01*
+X63560574Y-39351382D01*
+X63405581Y-39119419D01*
+X62901162Y-38615000D01*
+X63425000Y-38615000D01*
+X63698619Y-38560574D01*
+X63930581Y-38405581D01*
+X64655581Y-37680581D01*
+X64660233Y-37673619D01*
+X64810574Y-37448619D01*
+X64865000Y-37175000D01*
+X64865000Y-36687511D01*
+X64869673Y-36692192D01*
+X64869673Y-36692192D01*
 G37*
-X74623000Y-40623000D02*
-X66677000Y-40623000D01*
-X66677000Y-38877000D01*
-X74623000Y-38877000D01*
-X74623000Y-40623000D01*
+X64869673Y-36692192D02*
+X65213201Y-36834838D01*
+X65585167Y-36835162D01*
+X65873000Y-36716232D01*
+X65873000Y-41540000D01*
+X63296163Y-41540000D01*
+X63405581Y-41430582D01*
+X63560574Y-41198619D01*
+X63566332Y-41169673D01*
+X63615000Y-40925000D01*
+X63615000Y-39700000D01*
+X63607541Y-39662500D01*
+X63615000Y-39625000D01*
+X63560574Y-39351382D01*
+X63405581Y-39119419D01*
+X62901162Y-38615000D01*
+X63425000Y-38615000D01*
+X63698619Y-38560574D01*
+X63930581Y-38405581D01*
+X64655581Y-37680581D01*
+X64660233Y-37673619D01*
+X64810574Y-37448619D01*
+X64865000Y-37175000D01*
+X64865000Y-36687511D01*
+X64869673Y-36692192D01*
+G36*
+X51880277Y-31380277D02*
+X51720949Y-31618728D01*
+X51665000Y-31900000D01*
+X51665000Y-32127069D01*
+X51573559Y-32185910D01*
+X51440825Y-32380172D01*
+X51401890Y-32353569D01*
+X51150000Y-32302560D01*
+X50650000Y-32302560D01*
+X50414683Y-32346838D01*
+X50198559Y-32485910D01*
+X50053569Y-32698110D01*
+X50002560Y-32950000D01*
+X50002560Y-33550000D01*
+X50046838Y-33785317D01*
+X50062339Y-33809406D01*
+X50015000Y-33923691D01*
+X50015000Y-34064250D01*
+X50173750Y-34223000D01*
+X50775000Y-34223000D01*
+X50775000Y-34203000D01*
+X51025000Y-34203000D01*
+X51025000Y-34223000D01*
+X51047000Y-34223000D01*
+X51047000Y-34477000D01*
+X51025000Y-34477000D01*
+X51025000Y-35126250D01*
+X51183750Y-35285000D01*
+X51276310Y-35285000D01*
+X51447134Y-35214242D01*
+X51486673Y-35309698D01*
+X51601362Y-35424388D01*
+X51577000Y-35448750D01*
+X51577000Y-36173000D01*
+X51597000Y-36173000D01*
+X51597000Y-36427000D01*
+X51577000Y-36427000D01*
+X51577000Y-37151250D01*
+X51735750Y-37310000D01*
+X51890000Y-37310000D01*
+X51890000Y-37315000D01*
+X51835750Y-37315000D01*
+X51677000Y-37473750D01*
+X51677000Y-38075000D01*
+X51697000Y-38075000D01*
+X51697000Y-38228198D01*
+X51685198Y-38240000D01*
+X50305105Y-38240000D01*
+X50214090Y-38098559D01*
+X50001890Y-37953569D01*
+X49750000Y-37902560D01*
+X49527806Y-37902560D01*
+X49626441Y-37839090D01*
+X49636963Y-37823690D01*
+X50615000Y-37823690D01*
+X50615000Y-37916250D01*
+X50773750Y-38075000D01*
+X51423000Y-38075000D01*
+X51423000Y-37473750D01*
+X51264250Y-37315000D01*
+X51123691Y-37315000D01*
+X50890302Y-37411673D01*
+X50711673Y-37590301D01*
+X50615000Y-37823690D01*
+X49636963Y-37823690D01*
+X49771431Y-37626890D01*
+X49822440Y-37375000D01*
+X49822440Y-36585750D01*
+X50415000Y-36585750D01*
+X50415000Y-36801310D01*
+X50511673Y-37034699D01*
+X50690302Y-37213327D01*
+X50923691Y-37310000D01*
+X51164250Y-37310000D01*
+X51323000Y-37151250D01*
+X51323000Y-36427000D01*
+X50573750Y-36427000D01*
+X50415000Y-36585750D01*
+X49822440Y-36585750D01*
+X49822440Y-36525000D01*
+X49778162Y-36289683D01*
+X49737519Y-36226522D01*
+X49771431Y-36176890D01*
+X49822440Y-35925000D01*
+X49822440Y-35798690D01*
+X50415000Y-35798690D01*
+X50415000Y-36014250D01*
+X50573750Y-36173000D01*
+X51323000Y-36173000D01*
+X51323000Y-35448750D01*
+X51164250Y-35290000D01*
+X50923691Y-35290000D01*
+X50690302Y-35386673D01*
+X50511673Y-35565301D01*
+X50415000Y-35798690D01*
+X49822440Y-35798690D01*
+X49822440Y-35075000D01*
+X49778162Y-34839683D01*
+X49646935Y-34635750D01*
+X50015000Y-34635750D01*
+X50015000Y-34776309D01*
+X50111673Y-35009698D01*
+X50290301Y-35188327D01*
+X50523690Y-35285000D01*
+X50616250Y-35285000D01*
+X50775000Y-35126250D01*
+X50775000Y-34477000D01*
+X50173750Y-34477000D01*
+X50015000Y-34635750D01*
+X49646935Y-34635750D01*
+X49639090Y-34623559D01*
+X49426890Y-34478569D01*
+X49175000Y-34427560D01*
+X48525000Y-34427560D01*
+X48421329Y-34447067D01*
+X48325000Y-34427560D01*
+X47675000Y-34427560D01*
+X47439683Y-34471838D01*
+X47223559Y-34610910D01*
+X47078569Y-34823110D01*
+X47027560Y-35075000D01*
+X47027560Y-35925000D01*
+X47071838Y-36160317D01*
+X47112481Y-36223478D01*
+X47078569Y-36273110D01*
+X47027560Y-36525000D01*
+X47027560Y-37375000D01*
+X47071838Y-37610317D01*
+X47210910Y-37826441D01*
+X47240000Y-37846317D01*
+X47240000Y-38171614D01*
+X47153569Y-38298110D01*
+X47102560Y-38550000D01*
+X47102560Y-39450000D01*
+X47146838Y-39685317D01*
+X47285910Y-39901441D01*
+X47498110Y-40046431D01*
+X47750000Y-40097440D01*
+X48250000Y-40097440D01*
+X48485317Y-40053162D01*
+X48701441Y-39914090D01*
+X48749134Y-39844289D01*
+X48785910Y-39901441D01*
+X48998110Y-40046431D01*
+X49250000Y-40097440D01*
+X49750000Y-40097440D01*
+X49985317Y-40053162D01*
+X50201441Y-39914090D01*
+X50306726Y-39760000D01*
+X52000000Y-39760000D01*
+X52290839Y-39702148D01*
+X52537401Y-39537401D01*
+X52983704Y-39091098D01*
+X53185317Y-39053162D01*
+X53401441Y-38914090D01*
+X53546431Y-38701890D01*
+X53597440Y-38450000D01*
+X53597440Y-37950000D01*
+X53553162Y-37714683D01*
+X53414090Y-37498559D01*
+X53410000Y-37495764D01*
+X53410000Y-37311150D01*
+X53585317Y-37278162D01*
+X53801441Y-37139090D01*
+X53946431Y-36926890D01*
+X53947594Y-36921149D01*
+X54080277Y-37119723D01*
+X54380276Y-37419723D01*
+X54575250Y-37550000D01*
+X54618728Y-37579051D01*
+X54743600Y-37603890D01*
+X54615162Y-37913201D01*
+X54615067Y-38021921D01*
+X54401381Y-38064426D01*
+X54169418Y-38219419D01*
+X51703838Y-40685000D01*
+X46985000Y-40685000D01*
+X46985000Y-40335750D01*
+X46826250Y-40177000D01*
+X45777000Y-40177000D01*
+X45777000Y-40197000D01*
+X45523000Y-40197000D01*
+X45523000Y-40177000D01*
+X44473750Y-40177000D01*
+X44315000Y-40335750D01*
+X44315000Y-40603837D01*
+X43997440Y-40286277D01*
+X43997440Y-39250000D01*
+X43973674Y-39123691D01*
+X44315000Y-39123691D01*
+X44315000Y-39764250D01*
+X44473750Y-39923000D01*
+X45523000Y-39923000D01*
+X45523000Y-38773750D01*
+X45777000Y-38773750D01*
+X45777000Y-39923000D01*
+X46826250Y-39923000D01*
+X46985000Y-39764250D01*
+X46985000Y-39123691D01*
+X46888327Y-38890302D01*
+X46709699Y-38711673D01*
+X46476310Y-38615000D01*
+X45935750Y-38615000D01*
+X45777000Y-38773750D01*
+X45523000Y-38773750D01*
+X45364250Y-38615000D01*
+X44823690Y-38615000D01*
+X44590301Y-38711673D01*
+X44411673Y-38890302D01*
+X44315000Y-39123691D01*
+X43973674Y-39123691D01*
+X43953162Y-39014683D01*
+X43814090Y-38798559D01*
+X43601890Y-38653569D01*
+X43410000Y-38614710D01*
+X43410000Y-34286150D01*
+X43585317Y-34253162D01*
+X43801441Y-34114090D01*
+X43946431Y-33901890D01*
+X43997440Y-33650000D01*
+X43997440Y-33135750D01*
+X44315000Y-33135750D01*
+X44315000Y-33776309D01*
+X44411673Y-34009698D01*
+X44590301Y-34188327D01*
+X44823690Y-34285000D01*
+X45364250Y-34285000D01*
+X45523000Y-34126250D01*
+X45523000Y-32977000D01*
+X45777000Y-32977000D01*
+X45777000Y-34126250D01*
+X45935750Y-34285000D01*
+X46476310Y-34285000D01*
+X46709699Y-34188327D01*
+X46888327Y-34009698D01*
+X46985000Y-33776309D01*
+X46985000Y-33135750D01*
+X46826250Y-32977000D01*
+X45777000Y-32977000D01*
+X45523000Y-32977000D01*
+X44473750Y-32977000D01*
+X44315000Y-33135750D01*
+X43997440Y-33135750D01*
+X43997440Y-32050000D01*
+X43973674Y-31923691D01*
+X44315000Y-31923691D01*
+X44315000Y-32564250D01*
+X44473750Y-32723000D01*
+X45523000Y-32723000D01*
+X45523000Y-31573750D01*
+X45777000Y-31573750D01*
+X45777000Y-32723000D01*
+X46826250Y-32723000D01*
+X46985000Y-32564250D01*
+X46985000Y-31923691D01*
+X46888327Y-31690302D01*
+X46709699Y-31511673D01*
+X46476310Y-31415000D01*
+X45935750Y-31415000D01*
+X45777000Y-31573750D01*
+X45523000Y-31573750D01*
+X45364250Y-31415000D01*
+X44823690Y-31415000D01*
+X44590301Y-31511673D01*
+X44411673Y-31690302D01*
+X44315000Y-31923691D01*
+X43973674Y-31923691D01*
+X43953162Y-31814683D01*
+X43814090Y-31598559D01*
+X43601890Y-31453569D01*
+X43350000Y-31402560D01*
+X41950000Y-31402560D01*
+X41714683Y-31446838D01*
+X41498559Y-31585910D01*
+X41353569Y-31798110D01*
+X41302560Y-32050000D01*
+X41302560Y-33650000D01*
+X41346838Y-33885317D01*
+X41485910Y-34101441D01*
+X41698110Y-34246431D01*
+X41890000Y-34285290D01*
+X41890000Y-38613850D01*
+X41714683Y-38646838D01*
+X41498559Y-38785910D01*
+X41353569Y-38998110D01*
+X41302560Y-39250000D01*
+X41302560Y-40850000D01*
+X41346838Y-41085317D01*
+X41485910Y-41301441D01*
+X41698110Y-41446431D01*
+X41950000Y-41497440D01*
+X43186277Y-41497440D01*
+X43228837Y-41540000D01*
+X34710000Y-41540000D01*
+X34710000Y-36250000D01*
+X35040000Y-36250000D01*
+X35265317Y-37382743D01*
+X35906964Y-38343036D01*
+X36867257Y-38984683D01*
+X38000000Y-39210000D01*
+X39132743Y-38984683D01*
+X40093036Y-38343036D01*
+X40734683Y-37382743D01*
+X40960000Y-36250000D01*
+X40734683Y-35117257D01*
+X40093036Y-34156964D01*
+X39132743Y-33515317D01*
+X38000000Y-33290000D01*
+X36867257Y-33515317D01*
+X35906964Y-34156964D01*
+X35265317Y-35117257D01*
+X35040000Y-36250000D01*
+X34710000Y-36250000D01*
+X34710000Y-30960000D01*
+X52300554Y-30960000D01*
+X51880277Y-31380277D01*
+X51880277Y-31380277D01*
+G37*
+X51880277Y-31380277D02*
+X51720949Y-31618728D01*
+X51665000Y-31900000D01*
+X51665000Y-32127069D01*
+X51573559Y-32185910D01*
+X51440825Y-32380172D01*
+X51401890Y-32353569D01*
+X51150000Y-32302560D01*
+X50650000Y-32302560D01*
+X50414683Y-32346838D01*
+X50198559Y-32485910D01*
+X50053569Y-32698110D01*
+X50002560Y-32950000D01*
+X50002560Y-33550000D01*
+X50046838Y-33785317D01*
+X50062339Y-33809406D01*
+X50015000Y-33923691D01*
+X50015000Y-34064250D01*
+X50173750Y-34223000D01*
+X50775000Y-34223000D01*
+X50775000Y-34203000D01*
+X51025000Y-34203000D01*
+X51025000Y-34223000D01*
+X51047000Y-34223000D01*
+X51047000Y-34477000D01*
+X51025000Y-34477000D01*
+X51025000Y-35126250D01*
+X51183750Y-35285000D01*
+X51276310Y-35285000D01*
+X51447134Y-35214242D01*
+X51486673Y-35309698D01*
+X51601362Y-35424388D01*
+X51577000Y-35448750D01*
+X51577000Y-36173000D01*
+X51597000Y-36173000D01*
+X51597000Y-36427000D01*
+X51577000Y-36427000D01*
+X51577000Y-37151250D01*
+X51735750Y-37310000D01*
+X51890000Y-37310000D01*
+X51890000Y-37315000D01*
+X51835750Y-37315000D01*
+X51677000Y-37473750D01*
+X51677000Y-38075000D01*
+X51697000Y-38075000D01*
+X51697000Y-38228198D01*
+X51685198Y-38240000D01*
+X50305105Y-38240000D01*
+X50214090Y-38098559D01*
+X50001890Y-37953569D01*
+X49750000Y-37902560D01*
+X49527806Y-37902560D01*
+X49626441Y-37839090D01*
+X49636963Y-37823690D01*
+X50615000Y-37823690D01*
+X50615000Y-37916250D01*
+X50773750Y-38075000D01*
+X51423000Y-38075000D01*
+X51423000Y-37473750D01*
+X51264250Y-37315000D01*
+X51123691Y-37315000D01*
+X50890302Y-37411673D01*
+X50711673Y-37590301D01*
+X50615000Y-37823690D01*
+X49636963Y-37823690D01*
+X49771431Y-37626890D01*
+X49822440Y-37375000D01*
+X49822440Y-36585750D01*
+X50415000Y-36585750D01*
+X50415000Y-36801310D01*
+X50511673Y-37034699D01*
+X50690302Y-37213327D01*
+X50923691Y-37310000D01*
+X51164250Y-37310000D01*
+X51323000Y-37151250D01*
+X51323000Y-36427000D01*
+X50573750Y-36427000D01*
+X50415000Y-36585750D01*
+X49822440Y-36585750D01*
+X49822440Y-36525000D01*
+X49778162Y-36289683D01*
+X49737519Y-36226522D01*
+X49771431Y-36176890D01*
+X49822440Y-35925000D01*
+X49822440Y-35798690D01*
+X50415000Y-35798690D01*
+X50415000Y-36014250D01*
+X50573750Y-36173000D01*
+X51323000Y-36173000D01*
+X51323000Y-35448750D01*
+X51164250Y-35290000D01*
+X50923691Y-35290000D01*
+X50690302Y-35386673D01*
+X50511673Y-35565301D01*
+X50415000Y-35798690D01*
+X49822440Y-35798690D01*
+X49822440Y-35075000D01*
+X49778162Y-34839683D01*
+X49646935Y-34635750D01*
+X50015000Y-34635750D01*
+X50015000Y-34776309D01*
+X50111673Y-35009698D01*
+X50290301Y-35188327D01*
+X50523690Y-35285000D01*
+X50616250Y-35285000D01*
+X50775000Y-35126250D01*
+X50775000Y-34477000D01*
+X50173750Y-34477000D01*
+X50015000Y-34635750D01*
+X49646935Y-34635750D01*
+X49639090Y-34623559D01*
+X49426890Y-34478569D01*
+X49175000Y-34427560D01*
+X48525000Y-34427560D01*
+X48421329Y-34447067D01*
+X48325000Y-34427560D01*
+X47675000Y-34427560D01*
+X47439683Y-34471838D01*
+X47223559Y-34610910D01*
+X47078569Y-34823110D01*
+X47027560Y-35075000D01*
+X47027560Y-35925000D01*
+X47071838Y-36160317D01*
+X47112481Y-36223478D01*
+X47078569Y-36273110D01*
+X47027560Y-36525000D01*
+X47027560Y-37375000D01*
+X47071838Y-37610317D01*
+X47210910Y-37826441D01*
+X47240000Y-37846317D01*
+X47240000Y-38171614D01*
+X47153569Y-38298110D01*
+X47102560Y-38550000D01*
+X47102560Y-39450000D01*
+X47146838Y-39685317D01*
+X47285910Y-39901441D01*
+X47498110Y-40046431D01*
+X47750000Y-40097440D01*
+X48250000Y-40097440D01*
+X48485317Y-40053162D01*
+X48701441Y-39914090D01*
+X48749134Y-39844289D01*
+X48785910Y-39901441D01*
+X48998110Y-40046431D01*
+X49250000Y-40097440D01*
+X49750000Y-40097440D01*
+X49985317Y-40053162D01*
+X50201441Y-39914090D01*
+X50306726Y-39760000D01*
+X52000000Y-39760000D01*
+X52290839Y-39702148D01*
+X52537401Y-39537401D01*
+X52983704Y-39091098D01*
+X53185317Y-39053162D01*
+X53401441Y-38914090D01*
+X53546431Y-38701890D01*
+X53597440Y-38450000D01*
+X53597440Y-37950000D01*
+X53553162Y-37714683D01*
+X53414090Y-37498559D01*
+X53410000Y-37495764D01*
+X53410000Y-37311150D01*
+X53585317Y-37278162D01*
+X53801441Y-37139090D01*
+X53946431Y-36926890D01*
+X53947594Y-36921149D01*
+X54080277Y-37119723D01*
+X54380276Y-37419723D01*
+X54575250Y-37550000D01*
+X54618728Y-37579051D01*
+X54743600Y-37603890D01*
+X54615162Y-37913201D01*
+X54615067Y-38021921D01*
+X54401381Y-38064426D01*
+X54169418Y-38219419D01*
+X51703838Y-40685000D01*
+X46985000Y-40685000D01*
+X46985000Y-40335750D01*
+X46826250Y-40177000D01*
+X45777000Y-40177000D01*
+X45777000Y-40197000D01*
+X45523000Y-40197000D01*
+X45523000Y-40177000D01*
+X44473750Y-40177000D01*
+X44315000Y-40335750D01*
+X44315000Y-40603837D01*
+X43997440Y-40286277D01*
+X43997440Y-39250000D01*
+X43973674Y-39123691D01*
+X44315000Y-39123691D01*
+X44315000Y-39764250D01*
+X44473750Y-39923000D01*
+X45523000Y-39923000D01*
+X45523000Y-38773750D01*
+X45777000Y-38773750D01*
+X45777000Y-39923000D01*
+X46826250Y-39923000D01*
+X46985000Y-39764250D01*
+X46985000Y-39123691D01*
+X46888327Y-38890302D01*
+X46709699Y-38711673D01*
+X46476310Y-38615000D01*
+X45935750Y-38615000D01*
+X45777000Y-38773750D01*
+X45523000Y-38773750D01*
+X45364250Y-38615000D01*
+X44823690Y-38615000D01*
+X44590301Y-38711673D01*
+X44411673Y-38890302D01*
+X44315000Y-39123691D01*
+X43973674Y-39123691D01*
+X43953162Y-39014683D01*
+X43814090Y-38798559D01*
+X43601890Y-38653569D01*
+X43410000Y-38614710D01*
+X43410000Y-34286150D01*
+X43585317Y-34253162D01*
+X43801441Y-34114090D01*
+X43946431Y-33901890D01*
+X43997440Y-33650000D01*
+X43997440Y-33135750D01*
+X44315000Y-33135750D01*
+X44315000Y-33776309D01*
+X44411673Y-34009698D01*
+X44590301Y-34188327D01*
+X44823690Y-34285000D01*
+X45364250Y-34285000D01*
+X45523000Y-34126250D01*
+X45523000Y-32977000D01*
+X45777000Y-32977000D01*
+X45777000Y-34126250D01*
+X45935750Y-34285000D01*
+X46476310Y-34285000D01*
+X46709699Y-34188327D01*
+X46888327Y-34009698D01*
+X46985000Y-33776309D01*
+X46985000Y-33135750D01*
+X46826250Y-32977000D01*
+X45777000Y-32977000D01*
+X45523000Y-32977000D01*
+X44473750Y-32977000D01*
+X44315000Y-33135750D01*
+X43997440Y-33135750D01*
+X43997440Y-32050000D01*
+X43973674Y-31923691D01*
+X44315000Y-31923691D01*
+X44315000Y-32564250D01*
+X44473750Y-32723000D01*
+X45523000Y-32723000D01*
+X45523000Y-31573750D01*
+X45777000Y-31573750D01*
+X45777000Y-32723000D01*
+X46826250Y-32723000D01*
+X46985000Y-32564250D01*
+X46985000Y-31923691D01*
+X46888327Y-31690302D01*
+X46709699Y-31511673D01*
+X46476310Y-31415000D01*
+X45935750Y-31415000D01*
+X45777000Y-31573750D01*
+X45523000Y-31573750D01*
+X45364250Y-31415000D01*
+X44823690Y-31415000D01*
+X44590301Y-31511673D01*
+X44411673Y-31690302D01*
+X44315000Y-31923691D01*
+X43973674Y-31923691D01*
+X43953162Y-31814683D01*
+X43814090Y-31598559D01*
+X43601890Y-31453569D01*
+X43350000Y-31402560D01*
+X41950000Y-31402560D01*
+X41714683Y-31446838D01*
+X41498559Y-31585910D01*
+X41353569Y-31798110D01*
+X41302560Y-32050000D01*
+X41302560Y-33650000D01*
+X41346838Y-33885317D01*
+X41485910Y-34101441D01*
+X41698110Y-34246431D01*
+X41890000Y-34285290D01*
+X41890000Y-38613850D01*
+X41714683Y-38646838D01*
+X41498559Y-38785910D01*
+X41353569Y-38998110D01*
+X41302560Y-39250000D01*
+X41302560Y-40850000D01*
+X41346838Y-41085317D01*
+X41485910Y-41301441D01*
+X41698110Y-41446431D01*
+X41950000Y-41497440D01*
+X43186277Y-41497440D01*
+X43228837Y-41540000D01*
+X34710000Y-41540000D01*
+X34710000Y-36250000D01*
+X35040000Y-36250000D01*
+X35265317Y-37382743D01*
+X35906964Y-38343036D01*
+X36867257Y-38984683D01*
+X38000000Y-39210000D01*
+X39132743Y-38984683D01*
+X40093036Y-38343036D01*
+X40734683Y-37382743D01*
+X40960000Y-36250000D01*
+X40734683Y-35117257D01*
+X40093036Y-34156964D01*
+X39132743Y-33515317D01*
+X38000000Y-33290000D01*
+X36867257Y-33515317D01*
+X35906964Y-34156964D01*
+X35265317Y-35117257D01*
+X35040000Y-36250000D01*
+X34710000Y-36250000D01*
+X34710000Y-30960000D01*
+X52300554Y-30960000D01*
+X51880277Y-31380277D01*
+G36*
+X59265162Y-31413201D02*
+X59264838Y-31785167D01*
+X59388726Y-32085000D01*
+X58396162Y-32085000D01*
+X58205201Y-31894039D01*
+X57973239Y-31739046D01*
+X57960158Y-31736444D01*
+X57831367Y-31607428D01*
+X57487839Y-31464782D01*
+X57115873Y-31464458D01*
+X56772097Y-31606503D01*
+X56583154Y-31795117D01*
+X56375640Y-31653329D01*
+X56123750Y-31602320D01*
+X55674170Y-31602320D01*
+X55438853Y-31646598D01*
+X55222729Y-31785670D01*
+X55077739Y-31997870D01*
+X55026730Y-32249760D01*
+X55026730Y-32549480D01*
+X55040236Y-32621257D01*
+X55039170Y-32623830D01*
+X55039170Y-32666320D01*
+X55050927Y-32678077D01*
+X55071008Y-32784797D01*
+X55145135Y-32899993D01*
+X55077739Y-32998630D01*
+X55053240Y-33119610D01*
+X55039170Y-33133680D01*
+X55039170Y-33176170D01*
+X55040927Y-33180412D01*
+X55039947Y-33185251D01*
+X53399724Y-34825474D01*
+X53251250Y-34677000D01*
+X52527000Y-34677000D01*
+X52527000Y-34697000D01*
+X52273000Y-34697000D01*
+X52273000Y-34677000D01*
+X52253000Y-34677000D01*
+X52253000Y-34423000D01*
+X52273000Y-34423000D01*
+X52273000Y-34403000D01*
+X52527000Y-34403000D01*
+X52527000Y-34423000D01*
+X53251250Y-34423000D01*
+X53410000Y-34264250D01*
+X53410000Y-34023691D01*
+X53313327Y-33790302D01*
+X53311957Y-33788932D01*
+X53371431Y-33701890D01*
+X53422440Y-33450000D01*
+X53422440Y-32650000D01*
+X53378162Y-32414683D01*
+X53239090Y-32198559D01*
+X53180750Y-32158697D01*
+X54004447Y-31335000D01*
+X59297634Y-31335000D01*
+X59265162Y-31413201D01*
+X59265162Y-31413201D01*
+G37*
+X59265162Y-31413201D02*
+X59264838Y-31785167D01*
+X59388726Y-32085000D01*
+X58396162Y-32085000D01*
+X58205201Y-31894039D01*
+X57973239Y-31739046D01*
+X57960158Y-31736444D01*
+X57831367Y-31607428D01*
+X57487839Y-31464782D01*
+X57115873Y-31464458D01*
+X56772097Y-31606503D01*
+X56583154Y-31795117D01*
+X56375640Y-31653329D01*
+X56123750Y-31602320D01*
+X55674170Y-31602320D01*
+X55438853Y-31646598D01*
+X55222729Y-31785670D01*
+X55077739Y-31997870D01*
+X55026730Y-32249760D01*
+X55026730Y-32549480D01*
+X55040236Y-32621257D01*
+X55039170Y-32623830D01*
+X55039170Y-32666320D01*
+X55050927Y-32678077D01*
+X55071008Y-32784797D01*
+X55145135Y-32899993D01*
+X55077739Y-32998630D01*
+X55053240Y-33119610D01*
+X55039170Y-33133680D01*
+X55039170Y-33176170D01*
+X55040927Y-33180412D01*
+X55039947Y-33185251D01*
+X53399724Y-34825474D01*
+X53251250Y-34677000D01*
+X52527000Y-34677000D01*
+X52527000Y-34697000D01*
+X52273000Y-34697000D01*
+X52273000Y-34677000D01*
+X52253000Y-34677000D01*
+X52253000Y-34423000D01*
+X52273000Y-34423000D01*
+X52273000Y-34403000D01*
+X52527000Y-34403000D01*
+X52527000Y-34423000D01*
+X53251250Y-34423000D01*
+X53410000Y-34264250D01*
+X53410000Y-34023691D01*
+X53313327Y-33790302D01*
+X53311957Y-33788932D01*
+X53371431Y-33701890D01*
+X53422440Y-33450000D01*
+X53422440Y-32650000D01*
+X53378162Y-32414683D01*
+X53239090Y-32198559D01*
+X53180750Y-32158697D01*
+X54004447Y-31335000D01*
+X59297634Y-31335000D01*
+X59265162Y-31413201D01*
 M02*
diff --git a/hardware/gerbers/u2f-zero.GTO b/hardware/gerbers/u2f-zero.GTO
index 30b9e1f..f96aed5 100644
--- a/hardware/gerbers/u2f-zero.GTO
+++ b/hardware/gerbers/u2f-zero.GTO
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Legend,Top*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 5:05:17 PM*
+G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 7:41:23 PM*
 %MOMM*%
 G01*
 G04 APERTURE LIST*
@@ -314,26 +314,26 @@ X54575238Y-36536190D01*
 X54456191Y-36012381D02*
 X54337143Y-36369524D01*
 X54646667Y-36369524D01*
-X49106190Y-40793333D02*
-X48868095Y-40960000D01*
-X49106190Y-41079047D02*
-X48606190Y-41079047D01*
-X48606190Y-40888571D01*
-X48630000Y-40840952D01*
-X48653810Y-40817143D01*
-X48701429Y-40793333D01*
-X48772857Y-40793333D01*
-X48820476Y-40817143D01*
-X48844286Y-40840952D01*
-X48868095Y-40888571D01*
-X48868095Y-41079047D01*
-X49106190Y-40317143D02*
-X49106190Y-40602857D01*
-X49106190Y-40460000D02*
-X48606190Y-40460000D01*
-X48677619Y-40507619D01*
-X48725238Y-40555238D01*
-X48749048Y-40602857D01*
+X48976190Y-39083333D02*
+X48738095Y-39250000D01*
+X48976190Y-39369047D02*
+X48476190Y-39369047D01*
+X48476190Y-39178571D01*
+X48500000Y-39130952D01*
+X48523810Y-39107143D01*
+X48571429Y-39083333D01*
+X48642857Y-39083333D01*
+X48690476Y-39107143D01*
+X48714286Y-39130952D01*
+X48738095Y-39178571D01*
+X48738095Y-39369047D01*
+X48976190Y-38607143D02*
+X48976190Y-38892857D01*
+X48976190Y-38750000D02*
+X48476190Y-38750000D01*
+X48547619Y-38797619D01*
+X48595238Y-38845238D01*
+X48619048Y-38892857D01*
 X56235239Y-33976190D02*
 X56568572Y-33976190D01*
 X56235239Y-34476190D01*
@@ -415,36 +415,36 @@ X58802381Y-32621429D01*
 X58945238Y-32716667D01*
 X59040476Y-32811905D01*
 X59088095Y-32907143D01*
-X40954762Y-40853333D02*
-X41002381Y-40710476D01*
-X41002381Y-40472380D01*
-X40954762Y-40377142D01*
-X40907143Y-40329523D01*
-X40811905Y-40281904D01*
-X40716667Y-40281904D01*
-X40621429Y-40329523D01*
-X40573810Y-40377142D01*
-X40526190Y-40472380D01*
-X40478571Y-40662857D01*
-X40430952Y-40758095D01*
-X40383333Y-40805714D01*
-X40288095Y-40853333D01*
-X40192857Y-40853333D01*
-X40097619Y-40805714D01*
-X40050000Y-40758095D01*
-X40002381Y-40662857D01*
-X40002381Y-40424761D01*
-X40050000Y-40281904D01*
-X40002381Y-39948571D02*
-X41002381Y-39710476D01*
-X40288095Y-39519999D01*
-X41002381Y-39329523D01*
-X40002381Y-39091428D01*
-X41002381Y-38186666D02*
-X41002381Y-38758095D01*
-X41002381Y-38472381D02*
-X40002381Y-38472381D01*
-X40145238Y-38567619D01*
-X40240476Y-38662857D01*
-X40288095Y-38758095D01*
+X44704762Y-37633333D02*
+X44752381Y-37490476D01*
+X44752381Y-37252380D01*
+X44704762Y-37157142D01*
+X44657143Y-37109523D01*
+X44561905Y-37061904D01*
+X44466667Y-37061904D01*
+X44371429Y-37109523D01*
+X44323810Y-37157142D01*
+X44276190Y-37252380D01*
+X44228571Y-37442857D01*
+X44180952Y-37538095D01*
+X44133333Y-37585714D01*
+X44038095Y-37633333D01*
+X43942857Y-37633333D01*
+X43847619Y-37585714D01*
+X43800000Y-37538095D01*
+X43752381Y-37442857D01*
+X43752381Y-37204761D01*
+X43800000Y-37061904D01*
+X43752381Y-36728571D02*
+X44752381Y-36490476D01*
+X44038095Y-36299999D01*
+X44752381Y-36109523D01*
+X43752381Y-35871428D01*
+X44752381Y-34966666D02*
+X44752381Y-35538095D01*
+X44752381Y-35252381D02*
+X43752381Y-35252381D01*
+X43895238Y-35347619D01*
+X43990476Y-35442857D01*
+X44038095Y-35538095D01*
 M02*
diff --git a/hardware/gerbers/u2f-zero.GTS b/hardware/gerbers/u2f-zero.GTS
index b90404a..c9b8883 100644
--- a/hardware/gerbers/u2f-zero.GTS
+++ b/hardware/gerbers/u2f-zero.GTS
@@ -1,7 +1,7 @@
 G04 #@! TF.FileFunction,Soldermask,Top*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 5:05:17 PM*
+G04 Created by KiCad (PCBNEW 4.0.1-stable) date 1/23/2016 7:41:23 PM*
 %MOMM*%
 G01*
 G04 APERTURE LIST*
@@ -17,7 +17,7 @@ G04 APERTURE LIST*
 %ADD19R,0.700000X1.100000*%
 %ADD20R,0.649580X0.499720*%
 %ADD21R,0.850000X1.050000*%
-%ADD22R,0.750000X0.550000*%
+%ADD22R,0.750000X0.500000*%
 %ADD23R,1.500000X1.700000*%
 %ADD24R,1.600000X1.800000*%
 %ADD25C,0.980000*%
diff --git a/hardware/gerbers/u2f-zero.TXT b/hardware/gerbers/u2f-zero.TXT
index 7df158e..be8c847 100644
--- a/hardware/gerbers/u2f-zero.TXT
+++ b/hardware/gerbers/u2f-zero.TXT
@@ -10,7 +10,7 @@ X1.8898Y-1.3976
 X1.9232Y-1.3976
 X1.9232Y-1.4547
 X2.1161Y-1.6171
-X2.1181Y-1.5177
+X2.128Y-1.4843
 X2.1496Y-1.4094
 X2.1516Y-1.6417
 X2.187Y-1.5
@@ -24,8 +24,10 @@ X2.4626Y-1.44
 X2.501Y-1.438
 X2.5157Y-1.2362
 X2.5354Y-1.3888
-X2.5827Y-1.565
+X2.5374Y-1.5866
+X2.5748Y-1.4134
 X2.6398Y-1.2894
+X2.6398Y-1.3819
 X2.6398Y-1.4724
 T2
 X2.2067Y-1.5571
diff --git a/hardware/gerbers/u2f-zero.drl b/hardware/gerbers/u2f-zero.drl
new file mode 100644
index 0000000..be8c847
--- /dev/null
+++ b/hardware/gerbers/u2f-zero.drl
@@ -0,0 +1,38 @@
+M48
+INCH,TZ
+T1C0.016
+T2C0.028
+%
+G90
+G05
+T1
+X1.8898Y-1.3976
+X1.9232Y-1.3976
+X1.9232Y-1.4547
+X2.1161Y-1.6171
+X2.128Y-1.4843
+X2.1496Y-1.4094
+X2.1516Y-1.6417
+X2.187Y-1.5
+X2.2146Y-1.3563
+X2.2559Y-1.2756
+X2.2559Y-1.315
+X2.3701Y-1.2441
+X2.4252Y-1.4055
+X2.4488Y-1.6388
+X2.4626Y-1.44
+X2.501Y-1.438
+X2.5157Y-1.2362
+X2.5354Y-1.3888
+X2.5374Y-1.5866
+X2.5748Y-1.4134
+X2.6398Y-1.2894
+X2.6398Y-1.3819
+X2.6398Y-1.4724
+T2
+X2.2067Y-1.5571
+X2.2224Y-1.4213
+X2.2559Y-1.5559
+X2.2717Y-1.4213
+T0
+M30
diff --git a/hardware/gerbers/u2f-zero.zip b/hardware/gerbers/u2f-zero.zip
index cccde3d..0acc96e 100644
Binary files a/hardware/gerbers/u2f-zero.zip and b/hardware/gerbers/u2f-zero.zip differ
diff --git a/hardware/u2f-zero.kicad_pcb b/hardware/u2f-zero.kicad_pcb
index 2b824f3..311ca38 100644
--- a/hardware/u2f-zero.kicad_pcb
+++ b/hardware/u2f-zero.kicad_pcb
@@ -335,13 +335,13 @@
     (pad 21 smd rect (at 1.25 1.25) (size 1.8 1.8) (layers F.Cu F.Paste F.Mask))
   )
 
-  (module Resistors_SMD:R_0603 (layer F.Cu) (tedit 56873657) (tstamp 5686DC42)
+  (module Resistors_SMD:R_0603 (layer F.Cu) (tedit 56A41D9C) (tstamp 5686DC42)
     (at 48.75 39 180)
     (descr "Resistor SMD 0603, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0603")
     (path /56857B9B)
     (attr smd)
-    (fp_text reference R1 (at -0.13 -1.71 270) (layer F.SilkS)
+    (fp_text reference R1 (at 0 0 270) (layer F.SilkS)
       (effects (font (size 0.5 0.5) (thickness 0.125)))
     )
     (fp_text value 100 (at 0 1.9 180) (layer F.Fab)
@@ -451,10 +451,10 @@
     (pad 9 smd rect (at 0.75 1.325 90) (size 1.5 1.3) (layers F.Cu F.Paste F.Mask))
   )
 
-  (module footprints:u2f-button (layer F.Cu) (tedit 56A3CC26) (tstamp 56A3CCAB)
+  (module footprints:u2f-button (layer F.Cu) (tedit 56A41D95) (tstamp 56A3CCAB)
     (at 42.65 40.05 90)
     (path /5685E9F9)
-    (fp_text reference SW1 (at 0.53 -2.1 90) (layer F.SilkS)
+    (fp_text reference SW1 (at 3.75 1.65 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value SW_PUSH (at 3.32 4.69 90) (layer F.Fab)
@@ -522,14 +522,14 @@
       (net 24 /TX))
   )
 
-  (gr_text u2fzero.com (at 38 33) (layer F.SilkS)
+  (gr_text u2fzero.com (at 41.7 29.45) (layer F.SilkS)
     (effects (font (size 0.8 0.8) (thickness 0.2)))
   )
-  (gr_text "U2F Zero" (at 37.75 31.5) (layer F.SilkS)
+  (gr_text "U2F Zero" (at 41.05 28) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.25)))
   )
-  (gr_circle (center 38 36.25) (end 40.25 36.25) (layer Edge.Cuts) (width 0.15))
-  (gr_line (start 34 42.25) (end 34 30.25) (angle 90) (layer Edge.Cuts) (width 0.15))
+  (gr_circle (center 38.85 36.25) (end 41.1 36.25) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 35.45 42.25) (end 35.45 30.25) (angle 90) (layer Edge.Cuts) (width 0.15))
   (gr_line (start 75.75 42.25) (end 75.75 30.25) (angle 90) (layer Edge.Cuts) (width 0.15))
   (gr_text "GND\n" (at 64.45 40.05) (layer Cmts.User)
     (effects (font (size 0.5 0.5) (thickness 0.125)))
@@ -559,18 +559,18 @@
   (gr_line (start 74.75 42.45) (end 74.75 40.7) (angle 90) (layer Cmts.User) (width 0.2))
   (gr_line (start 74.75 31.75) (end 76.45 31.75) (angle 90) (layer Cmts.User) (width 0.2))
   (gr_line (start 74.75 30) (end 74.75 31.7) (angle 90) (layer Cmts.User) (width 0.2))
-  (gr_line (start 34 30.25) (end 75.75 30.25) (angle 90) (layer Edge.Cuts) (width 0.15))
-  (gr_line (start 75.75 42.25) (end 34 42.25) (angle 90) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 35.45 30.25) (end 75.75 30.25) (angle 90) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 75.75 42.25) (end 35.45 42.25) (angle 90) (layer Edge.Cuts) (width 0.15))
 
-  (segment (start 66.95 40.5) (end 65.5 40.5) (width 0.25) (layer F.Cu) (net 0))
-  (segment (start 66.8 40.4) (end 65.6 40.4) (width 0.25) (layer F.Cu) (net 0))
-  (segment (start 66.85 40.2) (end 65.6 40.2) (width 0.25) (layer F.Cu) (net 0))
-  (segment (start 66.85 40) (end 65.6 40) (width 0.25) (layer F.Cu) (net 0))
-  (segment (start 66.75 39.8) (end 65.65 39.8) (width 0.25) (layer F.Cu) (net 0))
-  (segment (start 66.7 39.6) (end 65.7 39.6) (width 0.25) (layer F.Cu) (net 0))
-  (segment (start 66.85 39.4) (end 65.65 39.4) (width 0.25) (layer F.Cu) (net 0))
-  (segment (start 66.8 39.2) (end 65.7 39.2) (width 0.25) (layer F.Cu) (net 0))
-  (segment (start 66.9 39) (end 65.7 39) (width 0.25) (layer F.Cu) (net 0))
+  (segment (start 66.75 40.5) (end 65.3 40.5) (width 0.25) (layer F.Cu) (net 0))
+  (segment (start 66.6 40.4) (end 65.4 40.4) (width 0.25) (layer F.Cu) (net 0))
+  (segment (start 66.65 40.2) (end 65.4 40.2) (width 0.25) (layer F.Cu) (net 0))
+  (segment (start 66.65 40) (end 65.4 40) (width 0.25) (layer F.Cu) (net 0))
+  (segment (start 66.55 39.8) (end 65.45 39.8) (width 0.25) (layer F.Cu) (net 0))
+  (segment (start 66.5 39.6) (end 65.5 39.6) (width 0.25) (layer F.Cu) (net 0))
+  (segment (start 66.65 39.4) (end 65.45 39.4) (width 0.25) (layer F.Cu) (net 0))
+  (segment (start 66.6 39.2) (end 65.5 39.2) (width 0.25) (layer F.Cu) (net 0))
+  (segment (start 66.7 39) (end 65.5 39) (width 0.25) (layer F.Cu) (net 0))
   (segment (start 52.65 38.2) (end 52.65 38.35) (width 0.25) (layer F.Cu) (net 1))
   (segment (start 52.65 38.35) (end 52 39) (width 0.25) (layer F.Cu) (net 1) (tstamp 56A3F439))
   (segment (start 52 39) (end 49.5 39) (width 0.25) (layer F.Cu) (net 1) (tstamp 56A3F43B))
@@ -928,8 +928,8 @@
     (fill yes (arc_segments 16) (thermal_gap 0.508) (thermal_bridge_width 0.508))
     (polygon
       (pts
-        (xy 66 31.75) (xy 66 38.75) (xy 66 40.75) (xy 66 42.15) (xy 34.1 42.15)
-        (xy 34.1 30.35) (xy 66 30.35) (xy 66 31.75)
+        (xy 66 31.75) (xy 66 38.75) (xy 66 40.75) (xy 66 42.15) (xy 35.55 42.15)
+        (xy 35.55 30.35) (xy 66 30.35) (xy 66 31.75)
       )
     )
     (filled_polygon
@@ -1001,11 +1001,11 @@
         (xy 41.30256 32.05) (xy 41.30256 33.65) (xy 41.346838 33.885317) (xy 41.48591 34.101441) (xy 41.69811 34.246431)
         (xy 41.89 34.28529) (xy 41.89 38.61385) (xy 41.714683 38.646838) (xy 41.498559 38.78591) (xy 41.353569 38.99811)
         (xy 41.30256 39.25) (xy 41.30256 40.85) (xy 41.346838 41.085317) (xy 41.48591 41.301441) (xy 41.69811 41.446431)
-        (xy 41.95 41.49744) (xy 43.186277 41.49744) (xy 43.228837 41.54) (xy 34.71 41.54) (xy 34.71 36.25)
-        (xy 35.04 36.25) (xy 35.265317 37.382743) (xy 35.906964 38.343036) (xy 36.867257 38.984683) (xy 38 39.21)
-        (xy 39.132743 38.984683) (xy 40.093036 38.343036) (xy 40.734683 37.382743) (xy 40.96 36.25) (xy 40.734683 35.117257)
-        (xy 40.093036 34.156964) (xy 39.132743 33.515317) (xy 38 33.29) (xy 36.867257 33.515317) (xy 35.906964 34.156964)
-        (xy 35.265317 35.117257) (xy 35.04 36.25) (xy 34.71 36.25) (xy 34.71 30.96) (xy 52.300554 30.96)
+        (xy 41.95 41.49744) (xy 43.186277 41.49744) (xy 43.228837 41.54) (xy 36.16 41.54) (xy 36.16 37.449616)
+        (xy 36.756964 38.343036) (xy 37.717257 38.984683) (xy 38.85 39.21) (xy 39.982743 38.984683) (xy 40.943036 38.343036)
+        (xy 41.584683 37.382743) (xy 41.81 36.25) (xy 41.584683 35.117257) (xy 40.943036 34.156964) (xy 39.982743 33.515317)
+        (xy 38.85 33.29) (xy 37.717257 33.515317) (xy 36.756964 34.156964) (xy 36.16 35.050384) (xy 36.16 30.96)
+        (xy 52.300554 30.96)
       )
     )
     (filled_polygon