diff --git a/hardware/footprints.pretty/debug.kicad_mod b/hardware/footprints.pretty/debug.kicad_mod
index 40ed450..337b607 100644
--- a/hardware/footprints.pretty/debug.kicad_mod
+++ b/hardware/footprints.pretty/debug.kicad_mod
@@ -1,12 +1,9 @@
-(module debug (layer F.Cu) (tedit 56A3BF19)
-  (fp_text reference DBG** (at 1.75 -1.5) (layer F.SilkS)
+(module debug (layer F.Cu) (tedit 56A3E64E)
+  (fp_text reference D** (at 0.63 -1.5) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (fp_text value debug (at 1.75 1.25) (layer F.Fab)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (pad 1 thru_hole circle (at 0 0) (size 1 1) (drill 0.7) (layers *.Cu *.Mask F.SilkS))
-  (pad 2 thru_hole circle (at 2.5 0) (size 1 1) (drill 0.7) (layers *.Cu *.Mask F.SilkS))
-  (pad 3 thru_hole circle (at 5 0) (size 1 1) (drill 0.7) (layers *.Cu *.Mask F.SilkS))
-  (pad 4 thru_hole circle (at 7.5 0) (size 1 1) (drill 0.7) (layers *.Cu *.Mask F.SilkS))
 )
diff --git a/hardware/footprints.pretty/u2f-button.kicad_mod b/hardware/footprints.pretty/u2f-button.kicad_mod
new file mode 100644
index 0000000..ce9a5d7
--- /dev/null
+++ b/hardware/footprints.pretty/u2f-button.kicad_mod
@@ -0,0 +1,12 @@
+(module u2f-button (layer F.Cu) (tedit 56A3CC26)
+  (fp_text reference B** (at 0.53 -2.1) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value u2f-button (at 3.32 4.69) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (pad 1 smd rect (at 0 0) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at 7.2 0) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at 7.2 3) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at 0 3) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask))
+)
diff --git a/hardware/library/debug.lib b/hardware/library/debug.lib
index eafca8c..2aedd32 100644
--- a/hardware/library/debug.lib
+++ b/hardware/library/debug.lib
@@ -16,4 +16,16 @@ X TX 4 100 -150 200 D 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# debug-pin
+#
+DEF ~debug-pin p 0 40 Y Y 1 F N
+F0 "p" -400 -250 60 H V C CNN
+F1 "debug-pin" 100 -250 60 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X p 1 -200 -150 200 D 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/hardware/u2f-zero-cache.lib b/hardware/u2f-zero-cache.lib
index 2b39cc1..55b42d8 100644
--- a/hardware/u2f-zero-cache.lib
+++ b/hardware/u2f-zero-cache.lib
@@ -180,18 +180,15 @@ X 2 2 300 0 200 L 50 50 0 1 P I
 ENDDRAW
 ENDDEF
 #
-# debug-header
+# debug-pin
 #
-DEF debug-header DBG 0 40 Y Y 1 F N
-F0 "DBG" -350 -250 60 H V C CNN
-F1 "debug-header" 450 -250 60 H V C CNN
+DEF ~debug-pin p 0 40 Y Y 1 F N
+F0 "p" -400 -250 60 H V C CNN
+F1 "debug-pin" 100 -250 60 H I C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 DRAW
-X C2CK ~ -100 -150 200 D 50 50 1 1 I
-X C2D ~ -200 -150 200 D 50 50 1 1 I
-X RX ~ 0 -150 200 D 50 50 1 1 I
-X TX ~ 100 -150 200 D 50 50 1 1 I
+X p 1 -200 -150 200 D 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
diff --git a/hardware/u2f-zero.kicad_pcb b/hardware/u2f-zero.kicad_pcb
index ea39e53..a1cce20 100644
--- a/hardware/u2f-zero.kicad_pcb
+++ b/hardware/u2f-zero.kicad_pcb
@@ -2,13 +2,13 @@
 
   (general
     (links 31)
-    (no_connects 31)
-    (area 33.924999 29.924999 75.825001 42.575001)
+    (no_connects 1)
+    (area 33.924999 30.174999 75.825001 42.325001)
     (thickness 1.6)
-    (drawings 29)
-    (tracks 2)
+    (drawings 27)
+    (tracks 249)
     (zones 0)
-    (modules 11)
+    (modules 14)
     (nets 25)
   )
 
@@ -21,11 +21,11 @@
     (34 B.Paste user)
     (35 F.Paste user)
     (36 B.SilkS user)
-    (37 F.SilkS user)
+    (37 F.SilkS user hide)
     (38 B.Mask user)
     (39 F.Mask user)
     (40 Dwgs.User user)
-    (41 Cmts.User user hide)
+    (41 Cmts.User user)
     (42 Eco1.User user)
     (43 Eco2.User user)
     (44 Edge.Cuts user)
@@ -37,11 +37,13 @@
   )
 
   (setup
-    (last_trace_width 0.25)
+    (last_trace_width 0.16)
+    (user_trace_width 0.16)
+    (user_trace_width 0.2)
     (trace_clearance 0.2)
     (zone_clearance 0.3)
     (zone_45_only no)
-    (trace_min 0.2)
+    (trace_min 0.15)
     (segment_width 0.2)
     (edge_width 0.15)
     (via_size 0.6)
@@ -63,7 +65,7 @@
     (pad_to_mask_clearance 0.1)
     (pad_to_paste_clearance -0.003)
     (aux_axis_origin 0 0)
-    (visible_elements 7FFFFFFF)
+    (visible_elements 7FFFFF5F)
     (pcbplotparams
       (layerselection 0x010f0_80000001)
       (usegerberextensions false)
@@ -114,8 +116,8 @@
   (net 20 /C2CK)
   (net 21 /C2D)
   (net 22 "Net-(E1-Pad20)")
-  (net 23 "Net-(DBG1-Pad3)")
-  (net 24 "Net-(DBG1-Pad4)")
+  (net 23 /RX)
+  (net 24 /TX)
 
   (net_class Default "This is the default net class."
     (clearance 0.2)
@@ -130,6 +132,8 @@
     (add_net /C2D)
     (add_net /HD+)
     (add_net /HD-)
+    (add_net /RX)
+    (add_net /TX)
     (add_net GND)
     (add_net "Net-(A1-Pad1)")
     (add_net "Net-(A1-Pad2)")
@@ -137,8 +141,6 @@
     (add_net "Net-(A1-Pad5)")
     (add_net "Net-(A1-Pad6)")
     (add_net "Net-(A1-Pad7)")
-    (add_net "Net-(DBG1-Pad3)")
-    (add_net "Net-(DBG1-Pad4)")
     (add_net "Net-(E1-Pad1)")
     (add_net "Net-(E1-Pad14)")
     (add_net "Net-(E1-Pad16)")
@@ -150,39 +152,25 @@
     (add_net "Net-(Z1-Pad1)")
   )
 
-  (module footprints:MJTP1230 (layer F.Cu) (tedit 56874203) (tstamp 568743AE)
-    (at 47 39 180)
-    (path /5685E9F9)
-    (fp_text reference SW1 (at 2.5 3 180) (layer F.SilkS)
-      (effects (font (size 0.5 0.5) (thickness 0.125)))
-    )
-    (fp_text value SW_PUSH (at 2 -2 180) (layer F.Fab) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1 -1) (end 5.5 -1) (layer F.SilkS) (width 0.15))
-    (fp_line (start 5.5 -1) (end 5.5 7.5) (layer F.SilkS) (width 0.15))
-    (fp_line (start 5.5 7.5) (end -1 7.5) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1 7.5) (end -1 -1) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole circle (at 0 0 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask F.SilkS)
-      (net 15 "Net-(E1-Pad14)"))
-    (pad 1 thru_hole circle (at 4.5 0 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask F.SilkS)
-      (net 15 "Net-(E1-Pad14)"))
-    (pad 2 thru_hole circle (at 0 6.5 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask F.SilkS)
-      (net 5 GND))
-    (pad 2 thru_hole circle (at 4.5 6.5 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask F.SilkS)
-      (net 5 GND))
+  (net_class small ""
+    (clearance 0.2)
+    (trace_width 0.15)
+    (via_dia 0.6)
+    (via_drill 0.4)
+    (uvia_dia 0.3)
+    (uvia_drill 0.1)
   )
 
   (module Capacitors_SMD:C_0402 (layer F.Cu) (tedit 5687360F) (tstamp 5686DC11)
-    (at 56 33.5 180)
+    (at 51.3 33.8 270)
     (descr "Capacitor SMD 0402, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0402")
     (path /56858041)
     (attr smd)
-    (fp_text reference C1 (at -0.085 -1.16 180) (layer F.SilkS)
+    (fp_text reference C1 (at -0.085 -1.16 270) (layer F.SilkS)
       (effects (font (size 0.5 0.5) (thickness 0.125)))
     )
-    (fp_text value 0.1uF (at 0 1.7 180) (layer F.Fab)
+    (fp_text value 0.1uF (at 0 1.7 270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.15 -0.6) (end 1.15 -0.6) (layer F.CrtYd) (width 0.05))
@@ -191,9 +179,9 @@
     (fp_line (start 1.15 -0.6) (end 1.15 0.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 0.25 -0.475) (end -0.25 -0.475) (layer F.SilkS) (width 0.15))
     (fp_line (start -0.25 0.475) (end 0.25 0.475) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -0.55 0 180) (size 0.6 0.5) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.55 0 270) (size 0.6 0.5) (layers F.Cu F.Paste F.Mask)
       (net 9 /+3.3V))
-    (pad 2 smd rect (at 0.55 0 180) (size 0.6 0.5) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.55 0 270) (size 0.6 0.5) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
     (model Capacitors_SMD.3dshapes/C_0402.wrl
       (at (xyz 0 0 0))
@@ -203,7 +191,7 @@
   )
 
   (module Capacitors_SMD:C_0603 (layer F.Cu) (tedit 56873606) (tstamp 5686DC17)
-    (at 53.25 37.5 270)
+    (at 52.8 33.8 270)
     (descr "Capacitor SMD 0603, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0603")
     (path /5685809E)
@@ -232,15 +220,15 @@
   )
 
   (module Capacitors_SMD:C_0402 (layer F.Cu) (tedit 56873627) (tstamp 5686DC1D)
-    (at 58 40.5)
+    (at 52.5 38.2 180)
     (descr "Capacitor SMD 0402, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0402")
     (path /56857DEB)
     (attr smd)
-    (fp_text reference C3 (at -1.75 -0.02) (layer F.SilkS)
+    (fp_text reference C3 (at -1.75 -0.02 180) (layer F.SilkS)
       (effects (font (size 0.5 0.5) (thickness 0.125)))
     )
-    (fp_text value 0.1uF (at 0 1.7) (layer F.Fab)
+    (fp_text value 0.1uF (at 0 1.7 180) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.15 -0.6) (end 1.15 -0.6) (layer F.CrtYd) (width 0.05))
@@ -249,9 +237,9 @@
     (fp_line (start 1.15 -0.6) (end 1.15 0.6) (layer F.CrtYd) (width 0.05))
     (fp_line (start 0.25 -0.475) (end -0.25 -0.475) (layer F.SilkS) (width 0.15))
     (fp_line (start -0.25 0.475) (end 0.25 0.475) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -0.55 0) (size 0.6 0.5) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.55 0 180) (size 0.6 0.5) (layers F.Cu F.Paste F.Mask)
       (net 1 /+5V))
-    (pad 2 smd rect (at 0.55 0) (size 0.6 0.5) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.55 0 180) (size 0.6 0.5) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
     (model Capacitors_SMD.3dshapes/C_0402.wrl
       (at (xyz 0 0 0))
@@ -261,15 +249,15 @@
   )
 
   (module Capacitors_SMD:C_0603 (layer F.Cu) (tedit 56873634) (tstamp 5686DC23)
-    (at 57.5 38.5 180)
+    (at 52.6 36.3)
     (descr "Capacitor SMD 0603, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0603")
     (path /56857E44)
     (attr smd)
-    (fp_text reference C4 (at 2.03 0.01 180) (layer F.SilkS)
+    (fp_text reference C4 (at 2.03 0.01) (layer F.SilkS)
       (effects (font (size 0.5 0.5) (thickness 0.125)))
     )
-    (fp_text value 4.7uF (at 0 1.9 180) (layer F.Fab)
+    (fp_text value 4.7uF (at 0 1.9) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1.45 -0.75) (end 1.45 -0.75) (layer F.CrtYd) (width 0.05))
@@ -278,9 +266,9 @@
     (fp_line (start 1.45 -0.75) (end 1.45 0.75) (layer F.CrtYd) (width 0.05))
     (fp_line (start -0.35 -0.6) (end 0.35 -0.6) (layer F.SilkS) (width 0.15))
     (fp_line (start 0.35 0.6) (end -0.35 0.6) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -0.75 0 180) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -0.75 0) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
-    (pad 2 smd rect (at 0.75 0 180) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.75 0) (size 0.8 0.75) (layers F.Cu F.Paste F.Mask)
       (net 1 /+5V))
     (model Capacitors_SMD.3dshapes/C_0603.wrl
       (at (xyz 0 0 0))
@@ -290,7 +278,7 @@
   )
 
   (module footprints:EFM8UB1 (layer F.Cu) (tedit 5686C774) (tstamp 5686DC3C)
-    (at 63.5 39.5 180)
+    (at 61.8 39.4 180)
     (descr 13)
     (path /56857441)
     (fp_text reference E1 (at 0 -1.5 180) (layer F.SilkS)
@@ -337,9 +325,9 @@
     (pad 16 smd rect (at 2.5 0 270) (size 0.3 0.3) (layers F.Cu F.Paste F.Mask)
       (net 16 "Net-(E1-Pad16)"))
     (pad 17 smd rect (at 2 0) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask)
-      (net 23 "Net-(DBG1-Pad3)"))
+      (net 23 /RX))
     (pad 18 smd rect (at 1.5 0) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask)
-      (net 24 "Net-(DBG1-Pad4)"))
+      (net 24 /TX))
     (pad 19 smd rect (at 1 0) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask)
       (net 17 "Net-(E1-Pad19)"))
     (pad 20 smd rect (at 0.5 0) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask)
@@ -348,7 +336,7 @@
   )
 
   (module Resistors_SMD:R_0603 (layer F.Cu) (tedit 56873657) (tstamp 5686DC42)
-    (at 52 40.5 180)
+    (at 49.1 38.2 180)
     (descr "Resistor SMD 0603, reflow soldering, Vishay (see dcrcw.pdf)")
     (tags "resistor 0603")
     (path /56857B9B)
@@ -377,7 +365,7 @@
   )
 
   (module TO_SOT_Packages_SMD:SOT-553 (layer F.Cu) (tedit 5687364C) (tstamp 5686DC5B)
-    (at 57.5 35.75)
+    (at 57 32.9)
     (descr SOT553)
     (path /56857EAF)
     (attr smd)
@@ -409,7 +397,7 @@
   )
 
   (module footprints:LED-0606 (layer F.Cu) (tedit 5686CF1E) (tstamp 568742F0)
-    (at 49.75 35.25)
+    (at 48.3 33.3)
     (path /5686DEFD)
     (fp_text reference RGB1 (at 0.50546 -1.18872) (layer F.SilkS)
       (effects (font (size 0.4 0.4) (thickness 0.1)))
@@ -422,82 +410,136 @@
     (fp_line (start 1.397 2.032) (end -0.508 2.032) (layer F.SilkS) (width 0.03))
     (fp_line (start -0.508 2.032) (end -0.508 -0.635) (layer F.SilkS) (width 0.03))
     (pad 1 smd rect (at 0 0) (size 0.65 0.85) (layers F.Cu F.Paste F.Mask)
-      (net 22 "Net-(E1-Pad20)"))
-    (pad 2 smd rect (at 0.85 0) (size 0.65 0.85) (layers F.Cu F.Paste F.Mask)
       (net 10 "Net-(E1-Pad1)"))
-    (pad 3 smd rect (at 0.85 1.45) (size 0.65 0.85) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.85 0) (size 0.65 0.85) (layers F.Cu F.Paste F.Mask)
       (net 11 "Net-(E1-Pad2)"))
+    (pad 3 smd rect (at 0.85 1.45) (size 0.65 0.85) (layers F.Cu F.Paste F.Mask)
+      (net 22 "Net-(E1-Pad20)"))
     (pad 4 smd rect (at 0 1.45) (size 0.65 0.85) (layers F.Cu F.Paste F.Mask)
       (net 18 "Net-(R1-Pad2)"))
   )
 
   (module footprints:UDFN-8Pad (layer F.Cu) (tedit 56A3B4A5) (tstamp 56A3B64F)
-    (at 60.5 31.75)
+    (at 61 33.8 90)
     (path /56857313)
-    (fp_text reference A1 (at 0.75 -1.25) (layer F.SilkS)
+    (fp_text reference A1 (at 0.75 -1.25 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value ATECC508A (at 1.25 4.25) (layer F.Fab)
+    (fp_text value ATECC508A (at 1.25 4.25 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 2 3.25) (end -0.5 3.25) (layer F.SilkS) (width 0.15))
     (fp_line (start -0.5 3.25) (end -0.5 -0.5) (layer F.SilkS) (width 0.15))
     (fp_line (start -0.5 -0.5) (end 2 -0.5) (layer F.SilkS) (width 0.15))
     (fp_line (start 2 -0.5) (end 2 3.25) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at 0 0) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at 0 0 90) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
       (net 8 "Net-(A1-Pad1)"))
-    (pad 2 smd rect (at 0.5 0) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 0.5 0 90) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
       (net 7 "Net-(A1-Pad2)"))
-    (pad 3 smd rect (at 1 0) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
+    (pad 3 smd rect (at 1 0 90) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
       (net 6 "Net-(A1-Pad3)"))
-    (pad 4 smd rect (at 1.5 0) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
+    (pad 4 smd rect (at 1.5 0 90) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
       (net 5 GND))
-    (pad 8 smd rect (at 0 2.65) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
+    (pad 8 smd rect (at 0 2.65 90) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
       (net 9 /+3.3V))
-    (pad 7 smd rect (at 0.5 2.65) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
+    (pad 7 smd rect (at 0.5 2.65 90) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
       (net 2 "Net-(A1-Pad7)"))
-    (pad 6 smd rect (at 1 2.65) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
+    (pad 6 smd rect (at 1 2.65 90) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
       (net 3 "Net-(A1-Pad6)"))
-    (pad 5 smd rect (at 1.5 2.65) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
+    (pad 5 smd rect (at 1.5 2.65 90) (size 0.35 0.55) (layers F.Cu F.Paste F.Mask)
       (net 4 "Net-(A1-Pad5)"))
-    (pad 9 smd rect (at 0.75 1.325) (size 1.5 1.3) (layers F.Cu F.Paste F.Mask))
+    (pad 9 smd rect (at 0.75 1.325 90) (size 1.5 1.3) (layers F.Cu F.Paste F.Mask))
   )
 
-  (module footprints:debug (layer F.Cu) (tedit 56A3BF19) (tstamp 56A3C129)
-    (at 50.25 31.25)
-    (path /56A3CC65)
-    (fp_text reference DBG1 (at 1.75 -1.5) (layer F.SilkS)
+  (module footprints:u2f-button (layer F.Cu) (tedit 56A3CC26) (tstamp 56A3CCAB)
+    (at 43.05 40.05 90)
+    (path /5685E9F9)
+    (fp_text reference SW1 (at 0.53 -2.1 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value debug-header (at 1.75 1.25) (layer F.Fab)
+    (fp_text value SW_PUSH (at 3.32 4.69 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 smd rect (at 0 0 90) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask)
+      (net 15 "Net-(E1-Pad14)"))
+    (pad 1 smd rect (at 7.2 0 90) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask)
+      (net 15 "Net-(E1-Pad14)"))
+    (pad 2 smd rect (at 7.2 3 90) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask)
+      (net 5 GND))
+    (pad 2 smd rect (at 0 3 90) (size 1.6 1.4) (layers F.Cu F.Paste F.Mask)
+      (net 5 GND))
+  )
+
+  (module footprints:debug (layer F.Cu) (tedit 56A3E64E) (tstamp 56A3E8B9)
+    (at 56.85 36.1)
+    (path /56A3F8D6)
+    (fp_text reference C2CK1 (at 0.63 -1.5) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value debug-pin (at 1.75 1.25) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 1 1) (drill 0.7) (layers *.Cu *.Mask F.SilkS)
+      (net 20 /C2CK))
+  )
+
+  (module footprints:debug (layer F.Cu) (tedit 56A3E64E) (tstamp 56A3E8BE)
+    (at 58.1 36.1)
+    (path /56A3F90D)
+    (fp_text reference C2D1 (at 0.63 -1.5) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value debug-pin (at 1.75 1.25) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (pad 1 thru_hole circle (at 0 0) (size 1 1) (drill 0.7) (layers *.Cu *.Mask F.SilkS)
       (net 21 /C2D))
-    (pad 2 thru_hole circle (at 2.5 0) (size 1 1) (drill 0.7) (layers *.Cu *.Mask F.SilkS)
-      (net 20 /C2CK))
-    (pad 3 thru_hole circle (at 5 0) (size 1 1) (drill 0.7) (layers *.Cu *.Mask F.SilkS)
-      (net 23 "Net-(DBG1-Pad3)"))
-    (pad 4 thru_hole circle (at 7.5 0) (size 1 1) (drill 0.7) (layers *.Cu *.Mask F.SilkS)
-      (net 24 "Net-(DBG1-Pad4)"))
   )
 
+  (module footprints:debug (layer F.Cu) (tedit 56A3E64E) (tstamp 56A3E8C3)
+    (at 57.7 39.52)
+    (path /56A3F89E)
+    (fp_text reference RX1 (at 0.63 -1.5) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value debug-pin (at 1.75 1.25) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 1 1) (drill 0.7) (layers *.Cu *.Mask F.SilkS)
+      (net 23 /RX))
+  )
+
+  (module footprints:debug (layer F.Cu) (tedit 56A3E64E) (tstamp 56A3E8C8)
+    (at 56.45 39.55)
+    (path /56A3F7EB)
+    (fp_text reference TX1 (at 0.63 -1.5) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value debug-pin (at 1.75 1.25) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0) (size 1 1) (drill 0.7) (layers *.Cu *.Mask F.SilkS)
+      (net 24 /TX))
+  )
+
+  (gr_line (start 34 42.25) (end 34 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 "https://0x123.xyz\n" (at 61.45 32.85) (layer F.SilkS)
     (effects (font (size 1 0.7) (thickness 0.16)))
   )
   (gr_text "U2F ZERO" (at 61.4 31.25) (layer F.SilkS)
     (effects (font (size 1.3 1) (thickness 0.25)))
   )
-  (gr_text "GND\n" (at 65.55 39.75) (layer Cmts.User)
+  (gr_text "GND\n" (at 64.85 40.05) (layer Cmts.User)
     (effects (font (size 0.5 0.5) (thickness 0.125)))
   )
-  (gr_text D+ (at 65.6 37.3) (layer Cmts.User)
+  (gr_text D+ (at 64.9 37.6) (layer Cmts.User)
     (effects (font (size 0.5 0.5) (thickness 0.125)))
   )
-  (gr_text D- (at 65.45 35.05) (layer Cmts.User)
+  (gr_text D- (at 64.75 35.35) (layer Cmts.User)
     (effects (font (size 0.5 0.5) (thickness 0.125)))
   )
-  (gr_text +5v (at 65.4 32.7) (layer Cmts.User)
+  (gr_text +5v (at 64.7 33) (layer Cmts.User)
     (effects (font (size 0.5 0.5) (thickness 0.125)))
   )
   (gr_line (start 74.25 33.75) (end 74.75 33.75) (angle 90) (layer Cmts.User) (width 0.2))
@@ -517,15 +559,258 @@
   (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_circle (center 37.15 35.85) (end 37.95 34.65) (layer F.SilkS) (width 0.2))
-  (gr_line (start 34 42.5) (end 34 42) (angle 90) (layer Edge.Cuts) (width 0.15))
-  (gr_line (start 75.75 42.5) (end 75.75 42) (angle 90) (layer Edge.Cuts) (width 0.15))
-  (gr_line (start 75.75 30) (end 75.75 42) (angle 90) (layer Edge.Cuts) (width 0.15))
-  (gr_line (start 34 30) (end 75.75 30) (angle 90) (layer Edge.Cuts) (width 0.15))
-  (gr_line (start 34 42) (end 34 30) (angle 90) (layer Edge.Cuts) (width 0.15))
-  (gr_line (start 75.75 42.5) (end 34 42.5) (angle 90) (layer Edge.Cuts) (width 0.15))
+  (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))
 
-  (segment (start 53.36538 37.65462) (end 53.5 37.52) (width 0.25) (layer F.Cu) (net 0) (tstamp 5686FCE2) (status 30))
-  (segment (start 53.7 37.72) (end 53.5 37.52) (width 0.25) (layer F.Cu) (net 0) (tstamp 5686FA61) (status 30))
+  (segment (start 51.1 39.3) (end 50.525 39.3) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 53.05 38.2) (end 53.05 39.25) (width 0.25) (layer F.Cu) (net 1) (tstamp 56A3CF9E))
+  (segment (start 53 39.3) (end 53.05 39.25) (width 0.25) (layer F.Cu) (net 1) (tstamp 56A3CF9D))
+  (segment (start 51.1 39.3) (end 53 39.3) (width 0.25) (layer F.Cu) (net 1) (tstamp 56A3CF9B))
+  (segment (start 50.525 39.3) (end 49.85 38.625) (width 0.25) (layer F.Cu) (net 1) (tstamp 56A3EA2D))
+  (segment (start 49.85 38.625) (end 49.85 38.2) (width 0.25) (layer F.Cu) (net 1) (tstamp 56A3EA2E))
+  (segment (start 63.1 34.6) (end 65.775 34.6) (width 0.2) (layer B.Cu) (net 1))
+  (via (at 67.15 32.75) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 1))
+  (segment (start 67.15 32.75) (end 66 33.9) (width 0.2) (layer B.Cu) (net 1) (tstamp 56A3DC42))
+  (segment (start 63.1 34.6) (end 62 35.7) (width 0.2) (layer B.Cu) (net 1) (tstamp 56A3DC3B))
+  (segment (start 66 34.375) (end 66 33.9) (width 0.2) (layer B.Cu) (net 1) (tstamp 56A3DF5A))
+  (segment (start 65.775 34.6) (end 66 34.375) (width 0.2) (layer B.Cu) (net 1) (tstamp 56A3DF56))
+  (segment (start 62 35.7) (end 60.75 35.7) (width 0.2) (layer B.Cu) (net 1))
+  (segment (start 56.29896 34.09896) (end 56.29896 33.40038) (width 0.2) (layer F.Cu) (net 1) (tstamp 56A3DC7B))
+  (segment (start 56.65 34.45) (end 56.29896 34.09896) (width 0.2) (layer F.Cu) (net 1) (tstamp 56A3DC7A))
+  (via (at 56.65 34.45) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 1))
+  (segment (start 57.45 35.25) (end 56.65 34.45) (width 0.2) (layer B.Cu) (net 1) (tstamp 56A3DC6E))
+  (segment (start 60.3 35.25) (end 57.45 35.25) (width 0.2) (layer B.Cu) (net 1) (tstamp 56A3DC6C))
+  (segment (start 60.75 35.7) (end 60.3 35.25) (width 0.2) (layer B.Cu) (net 1) (tstamp 56A3DC67))
+  (segment (start 61.3 36.9) (end 61.3 36.4) (width 0.2) (layer F.Cu) (net 1))
+  (segment (start 61.3 36.4) (end 62 35.7) (width 0.2) (layer F.Cu) (net 1) (tstamp 56A3DC36))
+  (via (at 62 35.7) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 1))
+  (segment (start 53.35 36.3) (end 53.4 36.3) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 53.4 36.3) (end 56.29896 33.40104) (width 0.25) (layer F.Cu) (net 1) (tstamp 56A3DA1A))
+  (segment (start 56.29896 33.40104) (end 56.29896 33.40038) (width 0.25) (layer F.Cu) (net 1) (tstamp 56A3DA1B))
+  (segment (start 56.29858 33.4) (end 56.29896 33.40038) (width 0.25) (layer F.Cu) (net 1) (tstamp 56A3D5F9) (status 30))
+  (segment (start 53.35 36.3) (end 53.35 36.05) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 53.05 38.2) (end 53.05 36.6) (width 0.25) (layer F.Cu) (net 1))
+  (segment (start 53.05 36.6) (end 53.35 36.3) (width 0.25) (layer F.Cu) (net 1) (tstamp 56A3CF94))
+  (segment (start 59.3 36.9) (end 57.725 36.9) (width 0.2) (layer F.Cu) (net 3))
+  (segment (start 64.3 31.4) (end 64.3 32.7) (width 0.2) (layer F.Cu) (net 3))
+  (segment (start 63.8 30.9) (end 64.3 31.4) (width 0.2) (layer B.Cu) (net 3) (tstamp 56A3D8C8))
+  (via (at 64.3 31.4) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 3))
+  (segment (start 54.5 30.9) (end 61.7 30.9) (width 0.2) (layer B.Cu) (net 3) (tstamp 56A3D386))
+  (segment (start 54.2 31.2) (end 54.5 30.9) (width 0.2) (layer B.Cu) (net 3) (tstamp 56A3D384))
+  (segment (start 54.2 35) (end 54.2 31.2) (width 0.2) (layer B.Cu) (net 3) (tstamp 56A3D382))
+  (segment (start 55 35.8) (end 54.2 35) (width 0.2) (layer B.Cu) (net 3) (tstamp 56A3D381))
+  (segment (start 61.7 30.9) (end 63.8 30.9) (width 0.2) (layer B.Cu) (net 3))
+  (segment (start 64.2 32.8) (end 63.65 32.8) (width 0.2) (layer F.Cu) (net 3) (tstamp 56A3D8DD))
+  (segment (start 64.3 32.7) (end 64.2 32.8) (width 0.2) (layer F.Cu) (net 3) (tstamp 56A3D8DA))
+  (via (at 55 35.8) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 3))
+  (segment (start 55 36.6) (end 55 35.8) (width 0.2) (layer F.Cu) (net 3) (tstamp 56A3DDD1))
+  (segment (start 55.425 37.025) (end 55 36.6) (width 0.2) (layer F.Cu) (net 3) (tstamp 56A3DDCD))
+  (segment (start 57.6 37.025) (end 55.425 37.025) (width 0.2) (layer F.Cu) (net 3) (tstamp 56A3DDCB))
+  (segment (start 57.725 36.9) (end 57.6 37.025) (width 0.2) (layer F.Cu) (net 3) (tstamp 56A3DDC1))
+  (segment (start 55.95 38.1) (end 56.525 38.1) (width 0.2) (layer F.Cu) (net 4))
+  (segment (start 61.3 31.6) (end 60.6 31.6) (width 0.2) (layer F.Cu) (net 4))
+  (segment (start 54.9 31.6) (end 60.6 31.6) (width 0.2) (layer B.Cu) (net 4) (tstamp 56A3D353))
+  (via (at 60.6 31.6) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 4))
+  (segment (start 54.7 34.1) (end 54.7 31.8) (width 0.2) (layer B.Cu) (net 4) (tstamp 56A3D194))
+  (segment (start 54.7 31.8) (end 54.9 31.6) (width 0.2) (layer B.Cu) (net 4))
+  (segment (start 54.7 34.4) (end 54.7 34.1) (width 0.2) (layer B.Cu) (net 4) (tstamp 56A3D6E2))
+  (segment (start 55.9 35.6) (end 54.7 34.4) (width 0.2) (layer B.Cu) (net 4) (tstamp 56A3D6C7))
+  (segment (start 55.9 38.05) (end 55.9 35.6) (width 0.2) (layer B.Cu) (net 4) (tstamp 56A3D6C6))
+  (segment (start 55.95 38.1) (end 55.9 38.05) (width 0.2) (layer B.Cu) (net 4) (tstamp 56A3D6C5))
+  (via (at 55.95 38.1) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 4))
+  (segment (start 56.725 37.9) (end 59.3 37.9) (width 0.2) (layer F.Cu) (net 4) (tstamp 56A3E9DE))
+  (segment (start 56.525 38.1) (end 56.725 37.9) (width 0.2) (layer F.Cu) (net 4) (tstamp 56A3E9DD))
+  (segment (start 61.25 31.6) (end 61.3 31.6) (width 0.2) (layer F.Cu) (net 4))
+  (segment (start 61.3 31.6) (end 62.95 31.6) (width 0.2) (layer F.Cu) (net 4) (tstamp 56A3D919))
+  (segment (start 62.95 31.6) (end 63.65 32.3) (width 0.2) (layer F.Cu) (net 4) (tstamp 56A3D90C))
+  (segment (start 56.375 40.8) (end 55.75 40.8) (width 0.25) (layer B.Cu) (net 5))
+  (segment (start 55.675 40.725) (end 54.2 39.25) (width 0.25) (layer B.Cu) (net 5) (tstamp 56A3EA42))
+  (segment (start 61.9375 40.3875) (end 65.3625 40.3875) (width 0.25) (layer B.Cu) (net 5))
+  (segment (start 66 39.75) (end 65.3625 40.3875) (width 0.25) (layer B.Cu) (net 5) (tstamp 56A3EA14))
+  (segment (start 57.800522 37.474478) (end 58.025522 37.474478) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 54.2 38.5) (end 55.100522 37.474478) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3DDFE))
+  (segment (start 55.100522 37.474478) (end 57.800522 37.474478) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3DE01))
+  (segment (start 58.1 37.4) (end 59.3 37.4) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3E9BB))
+  (segment (start 58.025522 37.474478) (end 58.1 37.4) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3E9BA))
+  (segment (start 61.675 40.65) (end 60.925 40.65) (width 0.25) (layer B.Cu) (net 5) (tstamp 56A3E92B))
+  (segment (start 60.925 40.65) (end 60.775 40.8) (width 0.25) (layer B.Cu) (net 5) (tstamp 56A3E92C))
+  (segment (start 60.775 40.8) (end 56.375 40.8) (width 0.25) (layer B.Cu) (net 5) (tstamp 56A3E92D))
+  (via (at 54.2 38.55) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 5))
+  (segment (start 54.2 38.55) (end 54.2 38.5) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3E0AF))
+  (segment (start 61.9375 40.3875) (end 61.675 40.65) (width 0.25) (layer B.Cu) (net 5) (tstamp 56A3EA12))
+  (segment (start 54.2 39.25) (end 54.2 38.55) (width 0.25) (layer B.Cu) (net 5) (tstamp 56A3E944))
+  (segment (start 55.75 40.8) (end 55.675 40.725) (width 0.25) (layer B.Cu) (net 5) (tstamp 56A3EA4C))
+  (segment (start 66 39.75) (end 65.475 40.275) (width 0.25) (layer B.Cu) (net 5) (tstamp 56A3E086))
+  (via (at 66 39.75) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 5))
+  (segment (start 51.85 36.3) (end 51.85 35.7) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 51.3 35.15) (end 51.3 34.35) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3E110))
+  (segment (start 51.85 35.7) (end 51.3 35.15) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3E10D))
+  (segment (start 61.8 38.4) (end 64.65 38.4) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 64.65 38.4) (end 66 39.75) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3DFB4))
+  (segment (start 66 39.75) (end 68.05 39.75) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3DFB8))
+  (segment (start 55.5 33.2) (end 55.5 32.1) (width 0.2) (layer F.Cu) (net 5))
+  (segment (start 58.6 32.3) (end 58.2 31.9) (width 0.2) (layer F.Cu) (net 5) (tstamp 56A3D659))
+  (segment (start 58.2 31.9) (end 55.7 31.9) (width 0.2) (layer F.Cu) (net 5) (tstamp 56A3D65D))
+  (segment (start 58.6 32.3) (end 61 32.3) (width 0.2) (layer F.Cu) (net 5) (status 10))
+  (segment (start 55.5 32.1) (end 55.7 31.9) (width 0.2) (layer F.Cu) (net 5) (tstamp 56A3DA13))
+  (segment (start 52.8 34.55) (end 53.05 34.55) (width 0.2) (layer F.Cu) (net 5))
+  (segment (start 53.05 34.55) (end 53.900522 33.699478) (width 0.2) (layer F.Cu) (net 5) (tstamp 56A3DA0A))
+  (segment (start 55.8 32.9) (end 56.29896 32.9) (width 0.2) (layer F.Cu) (net 5) (tstamp 56A3DA0E))
+  (segment (start 55.000522 33.699478) (end 55.5 33.2) (width 0.2) (layer F.Cu) (net 5) (tstamp 56A3DA0D))
+  (segment (start 55.5 33.2) (end 55.8 32.9) (width 0.2) (layer F.Cu) (net 5) (tstamp 56A3DA11))
+  (segment (start 53.900522 33.699478) (end 55.000522 33.699478) (width 0.2) (layer F.Cu) (net 5) (tstamp 56A3DA0B))
+  (segment (start 51.3 34.35) (end 50.6 34.35) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 50.6 34.35) (end 50.3 34.05) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3D67F))
+  (segment (start 50.3 34.05) (end 50.3 32.7) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3D683))
+  (segment (start 47.05 32.85) (end 46.05 32.85) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 49.6 32) (end 50.3 32.7) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3CFA6))
+  (segment (start 47.9 32) (end 49.6 32) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3CFA5))
+  (segment (start 47.05 32.85) (end 47.9 32) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3CFA4))
+  (segment (start 52.8 34.55) (end 52.8 34.4) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 51.95 38.2) (end 51.95 36.4) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 51.95 36.4) (end 51.85 36.3) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3CF91))
+  (segment (start 46.05 32.85) (end 45.8 40.1) (width 0.25) (layer F.Cu) (net 5))
+  (segment (start 51.3 34.35) (end 52.6 34.35) (width 0.25) (layer F.Cu) (net 5) (status 20))
+  (segment (start 52.6 34.35) (end 52.8 34.55) (width 0.25) (layer F.Cu) (net 5) (tstamp 56A3C1A2) (status 30))
+  (segment (start 61.8 36.9) (end 62.625 36.9) (width 0.2) (layer F.Cu) (net 9))
+  (segment (start 65.1 34.975) (end 65.1 33.375) (width 0.2) (layer F.Cu) (net 9) (tstamp 56A3DF3D))
+  (segment (start 64.8 35.275) (end 65.1 34.975) (width 0.2) (layer F.Cu) (net 9) (tstamp 56A3DF3C))
+  (via (at 64.8 35.275) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 9))
+  (segment (start 64.25 35.275) (end 64.8 35.275) (width 0.2) (layer B.Cu) (net 9) (tstamp 56A3DF37))
+  (segment (start 62.95 36.575) (end 64.25 35.275) (width 0.2) (layer B.Cu) (net 9) (tstamp 56A3DF36))
+  (via (at 62.95 36.575) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 9))
+  (segment (start 62.625 36.9) (end 62.95 36.575) (width 0.2) (layer F.Cu) (net 9) (tstamp 56A3DF2F))
+  (segment (start 64.9 33.6) (end 65.1 33.4) (width 0.2) (layer F.Cu) (net 9))
+  (segment (start 64.9 33.6) (end 64.7 33.8) (width 0.2) (layer F.Cu) (net 9) (tstamp 56A3D85C))
+  (segment (start 63.65 33.8) (end 64.7 33.8) (width 0.2) (layer F.Cu) (net 9) (tstamp 56A3D85D))
+  (segment (start 52.8 31.9) (end 52.8 33.05) (width 0.2) (layer F.Cu) (net 9))
+  (segment (start 54.1 30.6) (end 62.3 30.6) (width 0.2) (layer F.Cu) (net 9) (tstamp 56A3D466))
+  (segment (start 52.8 31.9) (end 54.1 30.6) (width 0.2) (layer F.Cu) (net 9) (tstamp 56A3D463))
+  (segment (start 62.3 30.6) (end 64.4 30.6) (width 0.2) (layer F.Cu) (net 9))
+  (segment (start 64.5 30.6) (end 64.4 30.6) (width 0.2) (layer F.Cu) (net 9) (tstamp 56A3D909))
+  (segment (start 65.1 31.2) (end 64.5 30.6) (width 0.2) (layer F.Cu) (net 9) (tstamp 56A3D906))
+  (segment (start 65.1 33.4) (end 65.1 33.3) (width 0.2) (layer F.Cu) (net 9) (tstamp 56A3D905))
+  (segment (start 65.1 33.3) (end 65.1 31.2) (width 0.2) (layer F.Cu) (net 9) (tstamp 56A3DF46))
+  (segment (start 51.3 33.25) (end 52.6 33.25) (width 0.25) (layer F.Cu) (net 9) (status 20))
+  (segment (start 52.6 33.25) (end 52.8 33.05) (width 0.25) (layer F.Cu) (net 9) (tstamp 56A3C1A5) (status 30))
+  (segment (start 53.5 41.7) (end 53.425 41.7) (width 0.16) (layer B.Cu) (net 10))
+  (segment (start 55.05 41.7) (end 53.5 41.7) (width 0.16) (layer B.Cu) (net 10) (tstamp 56A3E3FD))
+  (via (at 55.05 41.7) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 10))
+  (segment (start 61.25 41.7) (end 55.05 41.7) (width 0.16) (layer F.Cu) (net 10) (tstamp 56A3E3F4))
+  (segment (start 62.15 40.8) (end 61.25 41.7) (width 0.16) (layer F.Cu) (net 10) (tstamp 56A3E3F2))
+  (segment (start 62.15 39.95) (end 62.15 40.8) (width 0.16) (layer F.Cu) (net 10) (tstamp 56A3E3F1))
+  (segment (start 53.425 41.7) (end 52.35 40.625) (width 0.16) (layer B.Cu) (net 10) (tstamp 56A3EA0B))
+  (segment (start 61.8 39.4) (end 61.8 39.525) (width 0.16) (layer F.Cu) (net 10))
+  (segment (start 61.8 39.525) (end 62.15 39.875) (width 0.16) (layer F.Cu) (net 10) (tstamp 56A3E3F0))
+  (segment (start 52.35 40.625) (end 47.525 40.625) (width 0.16) (layer B.Cu) (net 10) (tstamp 56A3EA0E))
+  (segment (start 47.525 40.625) (end 47.25 40.35) (width 0.16) (layer B.Cu) (net 10) (tstamp 56A3E401))
+  (segment (start 47.25 40.35) (end 47.25 34.35) (width 0.16) (layer B.Cu) (net 10) (tstamp 56A3E405))
+  (segment (start 47.25 34.35) (end 48.275 33.325) (width 0.16) (layer B.Cu) (net 10) (tstamp 56A3E409))
+  (via (at 48.275 33.325) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 10))
+  (segment (start 48.275 33.325) (end 48.3 33.3) (width 0.16) (layer F.Cu) (net 10) (tstamp 56A3E40F))
+  (segment (start 55.6 41.325) (end 55.525 41.325) (width 0.16) (layer B.Cu) (net 11))
+  (segment (start 53.575 39.25) (end 53.575 37.475) (width 0.16) (layer B.Cu) (net 11) (tstamp 56A3E459))
+  (segment (start 53.575 37.475) (end 53.325 37.225) (width 0.16) (layer B.Cu) (net 11) (tstamp 56A3E469))
+  (segment (start 53.325 37.225) (end 51.55 37.225) (width 0.16) (layer B.Cu) (net 11) (tstamp 56A3E46C))
+  (segment (start 51.55 37.225) (end 49.9 35.575) (width 0.16) (layer B.Cu) (net 11) (tstamp 56A3E473))
+  (segment (start 49.9 35.575) (end 49.9 34.075) (width 0.16) (layer B.Cu) (net 11) (tstamp 56A3E474))
+  (segment (start 49.9 34.075) (end 49.15 33.325) (width 0.16) (layer B.Cu) (net 11) (tstamp 56A3E47A))
+  (via (at 49.15 33.325) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 11))
+  (segment (start 49.15 33.325) (end 49.15 33.3) (width 0.16) (layer F.Cu) (net 11) (tstamp 56A3E47F))
+  (segment (start 53.575 39.375) (end 53.575 39.25) (width 0.16) (layer B.Cu) (net 11) (tstamp 56A3EA29))
+  (segment (start 55.525 41.325) (end 53.575 39.375) (width 0.16) (layer B.Cu) (net 11) (tstamp 56A3EA28))
+  (segment (start 63.3 39.7) (end 63.3 40.925) (width 0.16) (layer F.Cu) (net 11) (tstamp 56A3E443))
+  (segment (start 63.3 40.925) (end 62.6 41.625) (width 0.16) (layer F.Cu) (net 11) (tstamp 56A3E445))
+  (via (at 62.6 41.625) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 11))
+  (segment (start 62.6 41.625) (end 62.55 41.675) (width 0.16) (layer B.Cu) (net 11) (tstamp 56A3E448))
+  (segment (start 62.55 41.675) (end 61.675 41.675) (width 0.16) (layer B.Cu) (net 11) (tstamp 56A3E449))
+  (segment (start 61.675 41.675) (end 61.325 41.325) (width 0.16) (layer B.Cu) (net 11) (tstamp 56A3E44A))
+  (segment (start 61.325 41.325) (end 55.6 41.325) (width 0.16) (layer B.Cu) (net 11) (tstamp 56A3E44B))
+  (segment (start 55.6 41.325) (end 55.575 41.325) (width 0.16) (layer B.Cu) (net 11) (tstamp 56A3EA26))
+  (segment (start 61.8 38.9) (end 62.575 38.9) (width 0.16) (layer F.Cu) (net 11))
+  (segment (start 62.575 38.9) (end 63.3 39.625) (width 0.16) (layer F.Cu) (net 11) (tstamp 56A3E441))
+  (segment (start 62.8 35.6) (end 63 35.6) (width 0.16) (layer F.Cu) (net 12))
+  (segment (start 62.2 35) (end 62.8 35.6) (width 0.16) (layer F.Cu) (net 12))
+  (segment (start 57.70104 33.40038) (end 59.50038 33.40038) (width 0.16) (layer F.Cu) (net 12))
+  (segment (start 60.4 35) (end 62.2 35) (width 0.16) (layer F.Cu) (net 12) (tstamp 56A3DBC8))
+  (segment (start 59.8 34.4) (end 60.4 35) (width 0.16) (layer F.Cu) (net 12) (tstamp 56A3DBC3))
+  (segment (start 59.8 33.7) (end 59.8 34.4) (width 0.16) (layer F.Cu) (net 12) (tstamp 56A3DBC1))
+  (segment (start 59.50038 33.40038) (end 59.8 33.7) (width 0.16) (layer F.Cu) (net 12) (tstamp 56A3DBBE))
+  (segment (start 63 35.6) (end 63.925 36.525) (width 0.16) (layer F.Cu) (net 12) (tstamp 56A3DEED))
+  (via (at 63.925 36.525) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 12))
+  (segment (start 65.35 36.525) (end 63.925 36.525) (width 0.16) (layer B.Cu) (net 12) (tstamp 56A3DE99))
+  (segment (start 65.35 36.525) (end 66.225 37.4) (width 0.16) (layer B.Cu) (net 12) (tstamp 56A3DE9A))
+  (segment (start 67.175 37.4) (end 66.225 37.4) (width 0.16) (layer B.Cu) (net 12) (tstamp 56A3DE9C))
+  (via (at 67.175 37.4) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 12))
+  (segment (start 61.8 37.4) (end 63.675 37.4) (width 0.16) (layer F.Cu) (net 12) (tstamp 56A3DE51))
+  (segment (start 63.925 36.525) (end 63.925 37.15) (width 0.16) (layer F.Cu) (net 12) (tstamp 56A3DE96))
+  (segment (start 63.925 37.15) (end 63.675 37.4) (width 0.16) (layer F.Cu) (net 12) (tstamp 56A3DE92))
+  (via (at 57.70104 33.40038) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 12) (status 30))
+  (segment (start 63.825 37.9) (end 64.55 37.175) (width 0.16) (layer F.Cu) (net 13))
+  (segment (start 64.55 36.075) (end 64.55 37.175) (width 0.16) (layer F.Cu) (net 13) (tstamp 56A3DF10))
+  (segment (start 63.825 37.9) (end 61.8 37.9) (width 0.16) (layer F.Cu) (net 13) (tstamp 56A3DE66))
+  (segment (start 64.55 36.075) (end 66.15 36.075) (width 0.2) (layer F.Cu) (net 13))
+  (segment (start 66.15 36.075) (end 67.125 35.1) (width 0.2) (layer F.Cu) (net 13) (tstamp 56A3DF81))
+  (segment (start 62.975 35.225) (end 63.7 35.225) (width 0.16) (layer F.Cu) (net 13))
+  (segment (start 57.70104 32.39962) (end 58.09962 32.39962) (width 0.16) (layer F.Cu) (net 13))
+  (segment (start 60.5 34.5) (end 62.25 34.5) (width 0.16) (layer F.Cu) (net 13) (tstamp 56A3DB6A))
+  (segment (start 60.2 34.2) (end 60.5 34.5) (width 0.16) (layer F.Cu) (net 13) (tstamp 56A3DB68))
+  (segment (start 60.2 33.2) (end 60.2 34.2) (width 0.16) (layer F.Cu) (net 13) (tstamp 56A3DB66))
+  (segment (start 59.8 32.8) (end 60.2 33.2) (width 0.16) (layer F.Cu) (net 13) (tstamp 56A3DB65))
+  (segment (start 58.5 32.8) (end 59.8 32.8) (width 0.16) (layer F.Cu) (net 13) (tstamp 56A3DB64))
+  (segment (start 58.09962 32.39962) (end 58.5 32.8) (width 0.16) (layer F.Cu) (net 13) (tstamp 56A3DB63))
+  (segment (start 62.25 34.5) (end 62.975 35.225) (width 0.16) (layer F.Cu) (net 13))
+  (segment (start 63.7 35.225) (end 64.55 36.075) (width 0.16) (layer F.Cu) (net 13) (tstamp 56A3DF0B))
+  (via (at 57.70104 32.39962) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 13) (status 30))
+  (segment (start 44.5 41.4) (end 52.4 41.4) (width 0.16) (layer F.Cu) (net 15))
+  (segment (start 43.15 40.05) (end 44.5 41.4) (width 0.16) (layer F.Cu) (net 15) (tstamp 56A3CE09))
+  (segment (start 56.875 38.4) (end 59.3 38.4) (width 0.16) (layer F.Cu) (net 15) (tstamp 56A3E9EC))
+  (segment (start 56.55 38.725) (end 56.875 38.4) (width 0.16) (layer F.Cu) (net 15) (tstamp 56A3E9EB))
+  (segment (start 55.075 38.725) (end 56.55 38.725) (width 0.16) (layer F.Cu) (net 15) (tstamp 56A3E9E9))
+  (segment (start 52.4 41.4) (end 55.075 38.725) (width 0.16) (layer F.Cu) (net 15) (tstamp 56A3E9E7))
+  (segment (start 59.3 38.4) (end 59.3 38.9) (width 0.16) (layer F.Cu) (net 15))
+  (segment (start 43.05 40.05) (end 43.15 40.05) (width 0.16) (layer F.Cu) (net 15))
+  (segment (start 43.05 40.05) (end 43.05 32.85) (width 0.25) (layer F.Cu) (net 15))
+  (segment (start 48.35 38.2) (end 48.35 34.8) (width 0.25) (layer F.Cu) (net 18))
+  (segment (start 48.35 34.8) (end 48.3 34.75) (width 0.25) (layer F.Cu) (net 18) (tstamp 56A3CFA1))
+  (segment (start 56.86 36.075) (end 56.85 35.4) (width 0.16) (layer F.Cu) (net 20) (status 10))
+  (segment (start 60.3 35.875) (end 60.3 36.9) (width 0.16) (layer F.Cu) (net 20) (tstamp 56A3E8F8))
+  (segment (start 60.025 35.6) (end 60.3 35.875) (width 0.16) (layer F.Cu) (net 20) (tstamp 56A3E8F7))
+  (segment (start 60.025 35.4) (end 60.025 35.6) (width 0.16) (layer F.Cu) (net 20) (tstamp 56A3E8F6))
+  (segment (start 59.35 34.725) (end 60.025 35.4) (width 0.16) (layer F.Cu) (net 20) (tstamp 56A3E8F5))
+  (segment (start 57.525 34.725) (end 59.35 34.725) (width 0.16) (layer F.Cu) (net 20) (tstamp 56A3E8F3))
+  (segment (start 56.85 35.4) (end 57.525 34.725) (width 0.16) (layer F.Cu) (net 20) (tstamp 56A3E8F2))
+  (segment (start 58.1 36.1) (end 59.3 36.1) (width 0.16) (layer F.Cu) (net 21) (status 10))
+  (segment (start 59.3 36.1) (end 59.8 36.6) (width 0.16) (layer F.Cu) (net 21) (tstamp 56A3E8EB))
+  (segment (start 59.8 36.9) (end 59.8 36.525) (width 0.16) (layer F.Cu) (net 21))
+  (segment (start 59.8 36.4) (end 59.8 36.9) (width 0.16) (layer F.Cu) (net 21) (tstamp 56A3DB3D))
+  (segment (start 54.15 41.075) (end 53.6 41.075) (width 0.16) (layer B.Cu) (net 22))
+  (segment (start 51.125 39.875) (end 51.125 37.325) (width 0.16) (layer B.Cu) (net 22) (tstamp 56A3EA3B))
+  (segment (start 51.275 40.025) (end 51.125 39.875) (width 0.16) (layer B.Cu) (net 22) (tstamp 56A3EA3A))
+  (segment (start 52.55 40.025) (end 51.275 40.025) (width 0.16) (layer B.Cu) (net 22) (tstamp 56A3EA38))
+  (segment (start 53.6 41.075) (end 52.55 40.025) (width 0.16) (layer B.Cu) (net 22) (tstamp 56A3EA37))
+  (segment (start 54.15 41.075) (end 54.15 41) (width 0.16) (layer B.Cu) (net 22))
+  (segment (start 61.3 40.875) (end 61.1 41.075) (width 0.16) (layer F.Cu) (net 22) (tstamp 56A3E3E0))
+  (segment (start 61.1 41.075) (end 54.15 41.075) (width 0.16) (layer F.Cu) (net 22) (tstamp 56A3E3E1))
+  (via (at 54.15 41.075) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 22))
+  (segment (start 51.125 37.325) (end 49.175 35.375) (width 0.16) (layer B.Cu) (net 22) (tstamp 56A3EA3E))
+  (segment (start 49.15 34.8) (end 49.175 34.825) (width 0.16) (layer F.Cu) (net 22) (tstamp 56A3E3EC))
+  (via (at 49.175 34.825) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 22))
+  (segment (start 49.175 35.375) (end 49.175 34.825) (width 0.16) (layer B.Cu) (net 22) (tstamp 56A3E3EA))
+  (segment (start 61.3 40.875) (end 61.3 39.475) (width 0.16) (layer F.Cu) (net 22))
+  (segment (start 49.15 34.8) (end 49.15 34.75) (width 0.16) (layer F.Cu) (net 22) (tstamp 56A3E3ED))
+  (segment (start 58.33 39.52) (end 58.55 39.52) (width 0.16) (layer F.Cu) (net 23))
+  (segment (start 57.7 39.52) (end 58.33 39.52) (width 0.16) (layer F.Cu) (net 23))
+  (segment (start 59.48 39.96) (end 59.8 39.64) (width 0.16) (layer F.Cu) (net 23) (tstamp 56A3EAFB))
+  (segment (start 58.99 39.96) (end 59.48 39.96) (width 0.16) (layer F.Cu) (net 23) (tstamp 56A3EAFA))
+  (segment (start 58.55 39.52) (end 58.99 39.96) (width 0.16) (layer F.Cu) (net 23) (tstamp 56A3EAF9))
+  (segment (start 59.8 39.64) (end 59.8 39.4) (width 0.16) (layer F.Cu) (net 23) (tstamp 56A3EAFD))
+  (segment (start 59.8 39.7) (end 59.8 39.4) (width 0.16) (layer F.Cu) (net 23) (tstamp 56A3EAE2))
+  (segment (start 56.45 39.55) (end 56.45 39.875) (width 0.16) (layer F.Cu) (net 24))
+  (segment (start 56.45 39.875) (end 57.075 40.5) (width 0.16) (layer F.Cu) (net 24) (tstamp 56A3EB7F))
+  (segment (start 57.075 40.5) (end 60 40.5) (width 0.16) (layer F.Cu) (net 24) (tstamp 56A3EB82))
+  (segment (start 60.3 39.4) (end 60.3 40.2) (width 0.16) (layer F.Cu) (net 24) (tstamp 56A3EB0C))
+  (segment (start 60 40.5) (end 60.3 40.2) (width 0.16) (layer F.Cu) (net 24) (tstamp 56A3EB08))
 
   (zone (net 1) (net_name /+5V) (layer F.Cu) (tstamp 568751E6) (hatch edge 0.508)
     (connect_pads (clearance 0.3))
diff --git a/hardware/u2f-zero.net b/hardware/u2f-zero.net
index 658cd9a..dc74759 100644
--- a/hardware/u2f-zero.net
+++ b/hardware/u2f-zero.net
@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source C:/Users/Conor/Desktop/u2f-zero/hardware/u2f-zero.sch)
-    (date "1/23/2016 1:01:41 PM")
+    (date "1/23/2016 3:46:20 PM")
     (tool "Eeschema 4.0.1-stable")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -71,16 +71,34 @@
       (tstamp 5686DEFD))
     (comp (ref SW1)
       (value SW_PUSH)
-      (footprint footprints:MJTP1230)
+      (footprint footprints:u2f-button)
       (libsource (lib device) (part SW_PUSH))
       (sheetpath (names /) (tstamps /))
       (tstamp 5685E9F9))
-    (comp (ref DBG1)
-      (value debug-header)
+    (comp (ref TX1)
+      (value debug-pin)
       (footprint footprints:debug)
-      (libsource (lib debug) (part debug-header))
+      (libsource (lib debug) (part debug-pin))
       (sheetpath (names /) (tstamps /))
-      (tstamp 56A3CC65)))
+      (tstamp 56A3F7EB))
+    (comp (ref RX1)
+      (value debug-pin)
+      (footprint footprints:debug)
+      (libsource (lib debug) (part debug-pin))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 56A3F89E))
+    (comp (ref C2CK1)
+      (value debug-pin)
+      (footprint footprints:debug)
+      (libsource (lib debug) (part debug-pin))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 56A3F8D6))
+    (comp (ref C2D1)
+      (value debug-pin)
+      (footprint footprints:debug)
+      (libsource (lib debug) (part debug-pin))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 56A3F90D)))
   (libparts
     (libpart (lib u2f-zero-rescue) (part ATECC508A-RESCUE-u2f-zero)
       (fields
@@ -173,101 +191,98 @@
       (pins
         (pin (num 1) (name 1) (type passive))
         (pin (num 2) (name 2) (type passive))))
-    (libpart (lib debug) (part debug-header)
+    (libpart (lib debug) (part debug-pin)
       (fields
-        (field (name Reference) DBG)
-        (field (name Value) debug-header))
+        (field (name Reference) p)
+        (field (name Value) debug-pin))
       (pins
-        (pin (num 1) (name C2D) (type input))
-        (pin (num 2) (name C2CK) (type input))
-        (pin (num 3) (name RX) (type input))
-        (pin (num 4) (name TX) (type input)))))
+        (pin (num 1) (name p) (type input)))))
   (libraries
-    (library (logical u2f-zero-rescue)
-      (uri C:\Users\Conor\Desktop\u2f-zero\hardware\u2f-zero-rescue.lib))
-    (library (logical device)
-      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\device.lib"))
+    (library (logical siliconlabs)
+      (uri C:\Users\Conor\Desktop\u2f-zero\hardware\library\siliconlabs.lib))
     (library (logical discrete)
       (uri C:\Users\Conor\Desktop\u2f-zero\hardware\library\discrete.lib))
     (library (logical debug)
       (uri C:\Users\Conor\Desktop\u2f-zero\hardware\library\debug.lib))
-    (library (logical siliconlabs)
-      (uri C:\Users\Conor\Desktop\u2f-zero\hardware\library\siliconlabs.lib)))
+    (library (logical u2f-zero-rescue)
+      (uri C:\Users\Conor\Desktop\u2f-zero\hardware\u2f-zero-rescue.lib))
+    (library (logical device)
+      (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\device.lib")))
   (nets
     (net (code 1) (name /+5V)
-      (node (ref E1) (pin 7))
       (node (ref R1) (pin 1))
-      (node (ref Z1) (pin 3))
       (node (ref C3) (pin 1))
-      (node (ref C4) (pin 2)))
+      (node (ref Z1) (pin 3))
+      (node (ref C4) (pin 2))
+      (node (ref E1) (pin 7)))
     (net (code 2) (name GND)
+      (node (ref C2) (pin 2))
       (node (ref C3) (pin 2))
-      (node (ref A1) (pin 4))
       (node (ref C4) (pin 1))
       (node (ref C1) (pin 2))
-      (node (ref E1) (pin 3))
-      (node (ref C2) (pin 2))
+      (node (ref A1) (pin 4))
       (node (ref E1) (pin 12))
+      (node (ref E1) (pin 3))
       (node (ref Z1) (pin 2))
       (node (ref SW1) (pin 2)))
-    (net (code 3) (name "Net-(A1-Pad6)")
-      (node (ref A1) (pin 6))
-      (node (ref E1) (pin 11)))
+    (net (code 3) (name "Net-(Z1-Pad1)")
+      (node (ref Z1) (pin 1)))
     (net (code 4) (name "Net-(A1-Pad5)")
-      (node (ref A1) (pin 5))
-      (node (ref E1) (pin 13)))
+      (node (ref E1) (pin 13))
+      (node (ref A1) (pin 5)))
     (net (code 5) (name /+3.3V)
-      (node (ref E1) (pin 6))
       (node (ref A1) (pin 8))
+      (node (ref E1) (pin 6))
       (node (ref C2) (pin 1))
       (node (ref C1) (pin 1)))
-    (net (code 6) (name "Net-(E1-Pad19)")
-      (node (ref E1) (pin 19)))
-    (net (code 7) (name "Net-(E1-Pad16)")
+    (net (code 6) (name "Net-(E1-Pad14)")
+      (node (ref E1) (pin 14))
+      (node (ref E1) (pin 15))
+      (node (ref SW1) (pin 1)))
+    (net (code 7) (name "Net-(E1-Pad2)")
+      (node (ref RGB1) (pin 2))
+      (node (ref E1) (pin 2)))
+    (net (code 8) (name "Net-(E1-Pad1)")
+      (node (ref E1) (pin 1))
+      (node (ref RGB1) (pin 1)))
+    (net (code 9) (name "Net-(E1-Pad20)")
+      (node (ref E1) (pin 20))
+      (node (ref RGB1) (pin 3)))
+    (net (code 10) (name /C2CK)
+      (node (ref E1) (pin 9))
+      (node (ref C2CK1) (pin 1)))
+    (net (code 11) (name /C2D)
+      (node (ref E1) (pin 10))
+      (node (ref C2D1) (pin 1)))
+    (net (code 12) (name "Net-(E1-Pad16)")
       (node (ref E1) (pin 16)))
-    (net (code 8) (name "Net-(DBG1-Pad4)")
-      (node (ref DBG1) (pin 4))
-      (node (ref E1) (pin 18)))
-    (net (code 9) (name "Net-(R1-Pad2)")
+    (net (code 13) (name "Net-(R1-Pad2)")
       (node (ref RGB1) (pin 4))
       (node (ref R1) (pin 2)))
-    (net (code 10) (name "Net-(DBG1-Pad3)")
-      (node (ref E1) (pin 17))
-      (node (ref DBG1) (pin 3)))
-    (net (code 11) (name "Net-(Z1-Pad1)")
-      (node (ref Z1) (pin 1)))
-    (net (code 12) (name "Net-(E1-Pad14)")
-      (node (ref E1) (pin 15))
-      (node (ref E1) (pin 14))
-      (node (ref SW1) (pin 1)))
-    (net (code 13) (name "Net-(E1-Pad2)")
-      (node (ref RGB1) (pin 3))
-      (node (ref E1) (pin 2)))
-    (net (code 14) (name "Net-(E1-Pad1)")
-      (node (ref E1) (pin 1))
-      (node (ref RGB1) (pin 2)))
-    (net (code 15) (name "Net-(E1-Pad20)")
-      (node (ref E1) (pin 20))
-      (node (ref RGB1) (pin 1)))
-    (net (code 16) (name "Net-(A1-Pad3)")
+    (net (code 14) (name "Net-(E1-Pad19)")
+      (node (ref E1) (pin 19)))
+    (net (code 15) (name /TX)
+      (node (ref TX1) (pin 1))
+      (node (ref E1) (pin 18)))
+    (net (code 16) (name /RX)
+      (node (ref RX1) (pin 1))
+      (node (ref E1) (pin 17)))
+    (net (code 17) (name "Net-(A1-Pad3)")
       (node (ref A1) (pin 3)))
-    (net (code 17) (name "Net-(A1-Pad1)")
+    (net (code 18) (name "Net-(A1-Pad1)")
       (node (ref A1) (pin 1)))
-    (net (code 18) (name "Net-(A1-Pad2)")
+    (net (code 19) (name "Net-(A1-Pad2)")
       (node (ref A1) (pin 2)))
-    (net (code 19) (name "Net-(A1-Pad7)")
+    (net (code 20) (name "Net-(A1-Pad7)")
       (node (ref A1) (pin 7)))
-    (net (code 20) (name /C2D)
-      (node (ref E1) (pin 10))
-      (node (ref DBG1) (pin 1)))
     (net (code 21) (name "Net-(E1-Pad8)")
       (node (ref E1) (pin 8)))
-    (net (code 22) (name /C2CK)
-      (node (ref E1) (pin 9))
-      (node (ref DBG1) (pin 2)))
+    (net (code 22) (name "Net-(A1-Pad6)")
+      (node (ref E1) (pin 11))
+      (node (ref A1) (pin 6)))
     (net (code 23) (name /HD-)
-      (node (ref Z1) (pin 5))
-      (node (ref E1) (pin 4)))
+      (node (ref E1) (pin 4))
+      (node (ref Z1) (pin 5)))
     (net (code 24) (name /HD+)
       (node (ref Z1) (pin 4))
       (node (ref E1) (pin 5)))))
\ No newline at end of file
diff --git a/hardware/u2f-zero.sch b/hardware/u2f-zero.sch
index 4b74931..0b67228 100644
--- a/hardware/u2f-zero.sch
+++ b/hardware/u2f-zero.sch
@@ -265,7 +265,7 @@ U 1 1 5685E9F9
 P 6650 3900
 F 0 "SW1" H 6800 4010 50  0000 C CNN
 F 1 "SW_PUSH" H 6650 3820 50  0000 C CNN
-F 2 "footprints:MJTP1230" H 6650 3900 50  0001 C CNN
+F 2 "footprints:u2f-button" H 6650 3900 50  0001 C CNN
 F 3 "" H 6650 3900 50  0000 C CNN
 	1    6650 3900
 	1    0    0    -1  
@@ -292,41 +292,20 @@ Wire Wire Line
 Connection ~ 6050 4300
 Wire Wire Line
 	7100 3900 6950 3900
-Wire Wire Line
-	4350 4300 4150 4300
-Wire Wire Line
-	4150 4300 4150 3650
 Wire Wire Line
 	4350 4150 4300 4150
-Wire Wire Line
-	4300 4150 4300 3650
-Wire Wire Line
-	4950 3700 4450 3700
-Wire Wire Line
-	4450 3700 4450 3650
 Wire Wire Line
 	5450 2700 5250 2700
 Wire Wire Line
 	4950 2700 4300 2700
 NoConn ~ 5100 3700
 NoConn ~ 5550 3700
-$Comp
-L debug-header DBG1
-U 1 1 56A3CC65
-P 6000 3350
-F 0 "DBG1" H 5650 3100 60  0000 C CNN
-F 1 "debug-header" H 6450 3100 60  0000 C CNN
-F 2 "footprints:debug" H 5350 3200 60  0000 C CNN
-F 3 "" H 6000 3350 60  0000 C CNN
-	1    6000 3350
-	-1   0    0    1   
-$EndComp
 Wire Wire Line
-	5250 3700 5250 3350
+	5250 3700 5250 3300
 Wire Wire Line
-	5250 3350 5900 3350
+	5250 3300 5900 3300
 Wire Wire Line
-	5900 3350 5900 3200
+	5900 3300 5900 3200
 Wire Wire Line
 	5400 3700 5400 3400
 Wire Wire Line
@@ -341,4 +320,70 @@ Text Label 6100 3200 3    60   ~ 0
 C2CK
 Text Label 6200 3200 3    60   ~ 0
 C2D
+Wire Wire Line
+	4450 3650 4450 3900
+Wire Wire Line
+	4300 4150 4300 3900
+Wire Wire Line
+	4300 3900 4450 3900
+Wire Wire Line
+	4950 3700 4150 3700
+Wire Wire Line
+	4150 3700 4150 3650
+Wire Wire Line
+	4350 4300 4250 4300
+Wire Wire Line
+	4250 4300 4250 3800
+Wire Wire Line
+	4250 3800 4300 3800
+Wire Wire Line
+	4300 3800 4300 3650
+$Comp
+L debug-pin TX1
+U 1 1 56A3F7EB
+P 5700 3350
+F 0 "TX1" V 5500 2850 60  0000 C CNN
+F 1 "debug-pin" H 5800 3100 60  0001 C CNN
+F 2 "footprints:debug" H 5700 3350 60  0000 C CNN
+F 3 "" H 5700 3350 60  0000 C CNN
+	1    5700 3350
+	-1   0    0    1   
+$EndComp
+$Comp
+L debug-pin RX1
+U 1 1 56A3F89E
+P 5800 3350
+F 0 "RX1" V 5600 2850 60  0000 C CNN
+F 1 "debug-pin" H 5900 3100 60  0001 C CNN
+F 2 "footprints:debug" H 5800 3350 60  0000 C CNN
+F 3 "" H 5800 3350 60  0000 C CNN
+	1    5800 3350
+	-1   0    0    1   
+$EndComp
+$Comp
+L debug-pin C2CK1
+U 1 1 56A3F8D6
+P 5900 3350
+F 0 "C2CK1" V 5700 2800 60  0000 C CNN
+F 1 "debug-pin" H 6000 3100 60  0001 C CNN
+F 2 "footprints:debug" H 5900 3350 60  0000 C CNN
+F 3 "" H 5900 3350 60  0000 C CNN
+	1    5900 3350
+	-1   0    0    1   
+$EndComp
+$Comp
+L debug-pin C2D1
+U 1 1 56A3F90D
+P 6000 3350
+F 0 "C2D1" V 5800 2800 60  0000 C CNN
+F 1 "debug-pin" H 6100 3100 60  0001 C CNN
+F 2 "footprints:debug" H 6000 3350 60  0000 C CNN
+F 3 "" H 6000 3350 60  0000 C CNN
+	1    6000 3350
+	-1   0    0    1   
+$EndComp
+Text Label 5750 3300 0    60   ~ 0
+TX
+Text Label 5550 3400 0    60   ~ 0
+RX
 $EndSCHEMATC