diff --git a/.gitignore b/.gitignore
index fc651c7..a86357e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 # kicad
 *.bak
 _saved*
+_autosave*
diff --git a/footprints.pretty/EFM8UB1.kicad_mod b/footprints.pretty/EFM8UB1.kicad_mod
new file mode 100644
index 0000000..76c8a02
--- /dev/null
+++ b/footprints.pretty/EFM8UB1.kicad_mod
@@ -0,0 +1,35 @@
+(module EFM8UB1 (layer F.Cu) (tedit 5686C774)
+  (descr 13)
+  (fp_text reference EFM** (at 0 -1.5) (layer F.SilkS)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
+  )
+  (fp_text value EFM8UB1 (at 3 -1.5) (layer F.Fab) hide
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
+  )
+  (fp_circle (center -0.5 -0.5) (end -0.4 -0.6) (layer F.SilkS) (width 0.03))
+  (fp_line (start -1 -1) (end 3.5 -1) (layer F.SilkS) (width 0.03))
+  (fp_line (start 3.5 -1) (end 3.5 3.5) (layer F.SilkS) (width 0.03))
+  (fp_line (start 3.5 3.5) (end -1 3.5) (layer F.SilkS) (width 0.03))
+  (fp_line (start -1 3.5) (end -1 -1) (layer F.SilkS) (width 0.03))
+  (pad 6 smd rect (at 0 2.5) (size 0.3 0.3) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at 0 0) (size 0.3 0.3) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at 0 0.5 90) (size 0.3 0.9) (drill (offset 0 -0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd rect (at 0 1 90) (size 0.3 0.9) (drill (offset 0 -0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 4 smd rect (at 0 1.5 90) (size 0.3 0.9) (drill (offset 0 -0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 5 smd rect (at 0 2 90) (size 0.3 0.9) (drill (offset 0 -0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 7 smd rect (at 0.5 2.5) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 8 smd rect (at 1 2.5) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 9 smd rect (at 1.5 2.5) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 10 smd rect (at 2 2.5) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 11 smd rect (at 2.5 2.5) (size 0.3 0.3) (layers F.Cu F.Paste F.Mask))
+  (pad 12 smd rect (at 2.5 2 90) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 13 smd rect (at 2.5 1.5 90) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 14 smd rect (at 2.5 1 90) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 15 smd rect (at 2.5 0.5 90) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 16 smd rect (at 2.5 0 90) (size 0.3 0.3) (layers F.Cu F.Paste F.Mask))
+  (pad 17 smd rect (at 2 0 180) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 18 smd rect (at 1.5 0 180) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 19 smd rect (at 1 0 180) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 20 smd rect (at 0.5 0 180) (size 0.3 0.9) (drill (offset 0 0.3)) (layers F.Cu F.Paste F.Mask))
+  (pad 21 smd rect (at 1.25 1.25 180) (size 1.8 1.8) (layers F.Cu F.Paste F.Mask))
+)
diff --git a/footprints.pretty/LED-0606.kicad_mod b/footprints.pretty/LED-0606.kicad_mod
new file mode 100644
index 0000000..6fb19b6
--- /dev/null
+++ b/footprints.pretty/LED-0606.kicad_mod
@@ -0,0 +1,16 @@
+(module LED-0606 (layer F.Cu) (tedit 5686CF1E)
+  (fp_text reference RGB** (at 0.50546 -1.18872) (layer F.SilkS)
+    (effects (font (size 0.4 0.4) (thickness 0.1)))
+  )
+  (fp_text value LED-0606 (at 0.4445 2.42824) (layer F.Fab) hide
+    (effects (font (size 0.4 0.4) (thickness 0.1)))
+  )
+  (fp_line (start -0.508 -0.635) (end 1.397 -0.635) (layer F.SilkS) (width 0.03))
+  (fp_line (start 1.397 -0.635) (end 1.397 2.032) (layer F.SilkS) (width 0.03))
+  (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))
+  (pad 2 smd rect (at 0.85 0) (size 0.65 0.85) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd rect (at 0.85 1.45) (size 0.65 0.85) (layers F.Cu F.Paste F.Mask))
+  (pad 4 smd rect (at 0 1.45) (size 0.65 0.85) (layers F.Cu F.Paste F.Mask))
+)
diff --git a/fp-lib-table b/fp-lib-table
new file mode 100644
index 0000000..8c5545e
--- /dev/null
+++ b/fp-lib-table
@@ -0,0 +1,3 @@
+(fp_lib_table
+  (lib (name footprints)(type KiCad)(uri "$(KIPRJMOD)/footprints.pretty")(options "")(descr ""))
+)
diff --git a/u2f-zero.pro b/u2f-zero.pro
index 8eadab5..a8cbb41 100644
--- a/u2f-zero.pro
+++ b/u2f-zero.pro
@@ -1,4 +1,4 @@
-update=Thu 31 Dec 2015 02:13:14 PM EST
+update=Fri 01 Jan 2016 10:32:34 AM EST
 version=1
 last_client=kicad
 [pcbnew]
@@ -20,9 +20,6 @@ SolderMaskMinWidth=0.000000000000
 DrawSegmentWidth=0.200000000000
 BoardOutlineThickness=0.100000000000
 ModuleOutlineThickness=0.150000000000
-[cvpcb]
-version=1
-NetIExt=net
 [general]
 version=1
 [eeschema]
@@ -61,3 +58,6 @@ LibName29=valves
 LibName30=library/siliconlabs
 LibName31=library/atmel_cryptoauth
 LibName32=library/discrete
+[cvpcb]
+version=1
+NetIExt=net
diff --git a/u2f-zero.sch b/u2f-zero.sch
index d2b3107..c8773c6 100644
--- a/u2f-zero.sch
+++ b/u2f-zero.sch
@@ -47,35 +47,35 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L LED_RGB D?
+L LED_RGB D1
 U 1 1 5685729F
 P 6400 3450
-F 0 "D?" H 6400 3875 50  0000 C CNN
+F 0 "D1" H 6400 3875 50  0000 C CNN
 F 1 "LED_RGB" H 6400 3800 50  0000 C CNN
-F 2 "" H 6400 3400 50  0000 C CNN
+F 2 "footprints:LED-0606" H 6400 3400 50  0001 C CNN
 F 3 "" H 6400 3400 50  0000 C CNN
 	1    6400 3450
 	1    0    0    -1  
 $EndComp
 $Comp
-L EFM8UB1 E?
+L EFM8UB1 E1
 U 1 1 56857441
 P 5200 4500
-F 0 "E?" H 4800 5100 60  0000 C CNN
+F 0 "E1" H 4800 5100 60  0000 C CNN
 F 1 "EFM8UB1" H 4650 5200 60  0000 C CNN
-F 2 "" H 4700 5000 60  0000 C CNN
+F 2 "footprints:EFM8UB1" H 4700 5000 60  0001 C CNN
 F 3 "" H 4700 5000 60  0000 C CNN
 	1    5200 4500
 	1    0    0    -1  
 $EndComp
 NoConn ~ 7600 4650
 $Comp
-L ATECC508A A?
+L ATECC508A A1
 U 1 1 56857313
 P 7000 4700
-F 0 "A?" H 7300 5000 60  0000 C CNN
+F 0 "A1" H 7300 5000 60  0000 C CNN
 F 1 "ATECC508A" H 6900 5000 60  0000 C CNN
-F 2 "" H 6600 4950 60  0000 C CNN
+F 2 "SMD_Packages:SOIC-8-N" H 6600 4950 60  0001 C CNN
 F 3 "" H 6600 4950 60  0000 C CNN
 	1    7000 4700
 	-1   0    0    1   
@@ -133,23 +133,23 @@ Wire Wire Line
 Wire Wire Line
 	7350 3450 7350 3600
 $Comp
-L C C?
+L C C3
 U 1 1 56857DEB
 P 5350 5600
-F 0 "C?" H 5375 5700 50  0000 L CNN
+F 0 "C3" H 5375 5700 50  0000 L CNN
 F 1 "0.1uF" H 5375 5500 50  0000 L CNN
-F 2 "" H 5388 5450 50  0000 C CNN
+F 2 "Capacitors_SMD:C_0402" H 5388 5450 50  0001 C CNN
 F 3 "" H 5350 5600 50  0000 C CNN
 	1    5350 5600
 	0    1    1    0   
 $EndComp
 $Comp
-L C C?
+L C C4
 U 1 1 56857E44
 P 5350 5950
-F 0 "C?" H 5375 6050 50  0000 L CNN
+F 0 "C4" H 5375 6050 50  0000 L CNN
 F 1 "4.7uF" H 5375 5850 50  0000 L CNN
-F 2 "" H 5388 5800 50  0000 C CNN
+F 2 "Capacitors_SMD:C_0603" H 5388 5800 50  0001 C CNN
 F 3 "" H 5350 5950 50  0000 C CNN
 	1    5350 5950
 	0    1    1    0   
@@ -167,23 +167,23 @@ Wire Wire Line
 	5750 5950 5750 5600
 Connection ~ 5750 5600
 $Comp
-L C C?
+L C C1
 U 1 1 56858041
 P 4400 5600
-F 0 "C?" H 4425 5700 50  0000 L CNN
+F 0 "C1" H 4425 5700 50  0000 L CNN
 F 1 "0.1uF" H 4425 5500 50  0000 L CNN
-F 2 "" H 4438 5450 50  0000 C CNN
+F 2 "Capacitors_SMD:C_0402" H 4438 5450 50  0001 C CNN
 F 3 "" H 4400 5600 50  0000 C CNN
 	1    4400 5600
 	0    1    1    0   
 $EndComp
 $Comp
-L C C?
+L C C2
 U 1 1 5685809E
 P 4400 5950
-F 0 "C?" H 4425 6050 50  0000 L CNN
+F 0 "C2" H 4425 6050 50  0000 L CNN
 F 1 "4.7uF" H 4425 5850 50  0000 L CNN
-F 2 "" H 4438 5800 50  0000 C CNN
+F 2 "Capacitors_SMD:C_0603" H 4438 5800 50  0001 C CNN
 F 3 "" H 4400 5950 50  0000 C CNN
 	1    4400 5950
 	0    1    1    0   
@@ -213,12 +213,12 @@ NoConn ~ 4950 3700
 NoConn ~ 4350 4150
 NoConn ~ 4350 4300
 $Comp
-L DF5A5.6JE Z?
+L DF5A5.6JE Z1
 U 1 1 56857EAF
 P 3700 5100
-F 0 "Z?" H 3300 5150 60  0000 C CNN
+F 0 "Z1" H 3300 5150 60  0000 C CNN
 F 1 "DF5A5.6JE" H 3150 5250 60  0000 C CNN
-F 2 "" H 3700 5100 60  0000 C CNN
+F 2 "TO_SOT_Packages_SMD:SOT-553" H 3700 5100 60  0001 C CNN
 F 3 "" H 3700 5100 60  0000 C CNN
 	1    3700 5100
 	1    0    0    -1  
@@ -226,10 +226,10 @@ $EndComp
 Wire Wire Line
 	3550 5400 3550 5650
 $Comp
-L GNDREF #PWR?
+L GNDREF #PWR01
 U 1 1 568575A6
 P 6500 5850
-F 0 "#PWR?" H 6500 5600 50  0001 C CNN
+F 0 "#PWR01" H 6500 5600 50  0001 C CNN
 F 1 "GNDREF" H 6500 5700 50  0000 C CNN
 F 2 "" H 6500 5850 50  0000 C CNN
 F 3 "" H 6500 5850 50  0000 C CNN
@@ -241,10 +241,10 @@ Wire Wire Line
 Text Label 6500 5650 0    60   ~ 0
 GND
 $Comp
-L +5V #PWR?
+L +5V #PWR02
 U 1 1 56858241
 P 6850 5850
-F 0 "#PWR?" H 6850 5700 50  0001 C CNN
+F 0 "#PWR02" H 6850 5700 50  0001 C CNN
 F 1 "+5V" H 6850 5990 50  0000 C CNN
 F 2 "" H 6850 5850 50  0000 C CNN
 F 3 "" H 6850 5850 50  0000 C CNN
@@ -281,12 +281,12 @@ HD+
 Text Label 3900 4400 0    60   ~ 0
 HD-
 $Comp
-L SW_PUSH SW?
+L SW_PUSH SW1
 U 1 1 5685E9F9
 P 4800 3400
-F 0 "SW?" H 4950 3510 50  0000 C CNN
+F 0 "SW1" H 4950 3510 50  0000 C CNN
 F 1 "SW_PUSH" H 4800 3320 50  0000 C CNN
-F 2 "" H 4800 3400 50  0000 C CNN
+F 2 "Buttons_Switches_ThroughHole:SW_PUSH_SMALL" H 4800 3400 50  0001 C CNN
 F 3 "" H 4800 3400 50  0000 C CNN
 	1    4800 3400
 	1    0    0    -1  
@@ -298,12 +298,12 @@ Wire Wire Line
 Text Label 4350 3400 2    60   ~ 0
 +3.3V
 $Comp
-L R R?
+L R R1
 U 1 1 56857B9B
 P 7050 3450
-F 0 "R?" V 7130 3450 50  0000 C CNN
+F 0 "R1" V 7130 3450 50  0000 C CNN
 F 1 "100" V 7050 3450 50  0000 C CNN
-F 2 "" V 6980 3450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 6980 3450 50  0001 C CNN
 F 3 "" H 7050 3450 50  0000 C CNN
 	1    7050 3450
 	0    1    1    0   
@@ -311,4 +311,10 @@ $EndComp
 NoConn ~ 5050 5300
 NoConn ~ 5200 5300
 NoConn ~ 5350 5300
+Text Notes 2550 5250 0    60   ~ 0
+Protect from ESD
+Text Notes 3450 4250 0    60   ~ 0
+Host USB data
+Text Notes 6500 4350 0    60   ~ 0
+Secure element for EC
 $EndSCHEMATC