diff --git a/analog.sch b/analog.sch
index 84d8988..d446b26 100644
--- a/analog.sch
+++ b/analog.sch
@@ -264,7 +264,8 @@ F 0 "U8" H 3250 5800 50  0000 L CNN
 F 1 "MAX11125" H 3100 5700 50  0000 L CNN
 F 2 "Housings_DFN_QFN:QFN-28-1EP_5x5mm_Pitch0.5mm" H 3300 4950 50  0001 C CNN
 F 3 "https://datasheets.maximintegrated.com/en/ds/MAX11120-MAX11128.pdf" H 3300 4950 50  0001 C CNN
-F 4 "www.mouser.com" H 3300 4900 60  0001 C CNN "Distributor1_URL"
+F 4 "MAX11125" H 3300 4900 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 3300 4900 60  0001 C CNN "Distributor1_URL"
 	1    3300 4900
 	1    0    0    -1  
 $EndComp
diff --git a/blinkey.bak b/blinkey.bak
index b60618d..ee086a1 100644
--- a/blinkey.bak
+++ b/blinkey.bak
@@ -115,66 +115,6 @@ F 6 "www.mouser.com" H 3100 2950 60  0001 C CNN "Distributor1_URL"
 	1    3100 2950
 	1    0    0    -1  
 $EndComp
-$Comp
-L CONN_02X01 BTN2
-U 1 1 58D66057
-P 3100 3150
-F 0 "BTN2" H 3100 3250 50  0000 C CNN
-F 1 "FIRE2" H 2600 3150 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 1950 50  0001 C CNN
-F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 1950 50  0001 C CNN
-F 4 "www.mouser.com" H 3100 3150 60  0001 C CNN "Distributor1_URL"
-	1    3100 3150
-	1    0    0    -1  
-$EndComp
-$Comp
-L CONN_02X01 BTN4
-U 1 1 58D66058
-P 3100 3550
-F 0 "BTN4" H 3100 3650 50  0000 C CNN
-F 1 "DOWN" H 2600 3550 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2350 50  0001 C CNN
-F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2350 50  0001 C CNN
-F 4 "www.mouser.com" H 3100 3550 60  0001 C CNN "Distributor1_URL"
-	1    3100 3550
-	1    0    0    -1  
-$EndComp
-$Comp
-L CONN_02X01 BTN3
-U 1 1 58D66059
-P 3100 3350
-F 0 "BTN3" H 3100 3450 50  0000 C CNN
-F 1 "UP" H 2600 3350 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2150 50  0001 C CNN
-F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2150 50  0001 C CNN
-F 4 "www.mouser.com" H 3100 3350 60  0001 C CNN "Distributor1_URL"
-	1    3100 3350
-	1    0    0    -1  
-$EndComp
-$Comp
-L CONN_02X01 BTN5
-U 1 1 58D6605A
-P 3100 3750
-F 0 "BTN5" H 3100 3850 50  0000 C CNN
-F 1 "LEFT" H 2600 3750 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2550 50  0001 C CNN
-F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2550 50  0001 C CNN
-F 4 "www.mouser.com" H 3100 3750 60  0001 C CNN "Distributor1_URL"
-	1    3100 3750
-	1    0    0    -1  
-$EndComp
-$Comp
-L CONN_02X01 BTN6
-U 1 1 58D6605B
-P 3100 3950
-F 0 "BTN6" H 3100 4050 50  0000 C CNN
-F 1 "RIGHT" H 2600 3950 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2750 50  0001 C CNN
-F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2750 50  0001 C CNN
-F 4 "www.mouser.com" H 3100 3950 60  0001 C CNN "Distributor1_URL"
-	1    3100 3950
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	2850 2950 2750 2950
 Wire Wire Line
@@ -318,6 +258,7 @@ F 3 "https://drive.google.com/file/d/0B5lkVYnewKTGRlpxcEdWaXNvWnM/view" H 4750 1
 F 4 "www.displaymodule.com" H 4750 1550 60  0001 C CNN "MFG_URL"
 F 5 "DM-OLEDC095-626" H 4750 1550 60  0001 C CNN "MFG_PN"
 F 6 "www.mouser.com" H 4750 1550 60  0001 C CNN "Distributor1_URL"
+F 7 "Do not install" H 4750 1550 60  0001 C CNN "Note"
 	1    4750 1550
 	0    1    1    0   
 $EndComp
@@ -444,7 +385,7 @@ U 1 1 591E1845
 P 5250 2550
 F 0 "R41" V 5330 2550 50  0000 C CNN
 F 1 "1k" V 5250 2550 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 5180 2550 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5180 2550 50  0001 C CNN
 F 3 "" H 5250 2550 50  0000 C CNN
 	1    5250 2550
 	0    1    1    0   
@@ -455,7 +396,7 @@ U 1 1 591E199B
 P 5250 2750
 F 0 "R42" V 5330 2750 50  0000 C CNN
 F 1 "1k" V 5250 2750 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 5180 2750 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5180 2750 50  0001 C CNN
 F 3 "" H 5250 2750 50  0000 C CNN
 	1    5250 2750
 	0    1    1    0   
@@ -466,7 +407,7 @@ U 1 1 591E1A9D
 P 5250 2950
 F 0 "R43" V 5330 2950 50  0000 C CNN
 F 1 "1k" V 5250 2950 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 5180 2950 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5180 2950 50  0001 C CNN
 F 3 "" H 5250 2950 50  0000 C CNN
 	1    5250 2950
 	0    1    1    0   
@@ -477,7 +418,7 @@ U 1 1 591E1AA3
 P 5250 3150
 F 0 "R44" V 5330 3150 50  0000 C CNN
 F 1 "1k" V 5250 3150 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 5180 3150 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5180 3150 50  0001 C CNN
 F 3 "" H 5250 3150 50  0000 C CNN
 	1    5250 3150
 	0    1    1    0   
@@ -488,7 +429,7 @@ U 1 1 591E1BA5
 P 5250 3350
 F 0 "R45" V 5330 3350 50  0000 C CNN
 F 1 "1k" V 5250 3350 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 5180 3350 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5180 3350 50  0001 C CNN
 F 3 "" H 5250 3350 50  0000 C CNN
 	1    5250 3350
 	0    1    1    0   
@@ -499,7 +440,7 @@ U 1 1 591E1BAB
 P 5250 3550
 F 0 "R46" V 5330 3550 50  0000 C CNN
 F 1 "1k" V 5250 3550 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 5180 3550 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5180 3550 50  0001 C CNN
 F 3 "" H 5250 3550 50  0000 C CNN
 	1    5250 3550
 	0    1    1    0   
@@ -510,7 +451,7 @@ U 1 1 591E1BB1
 P 5250 3750
 F 0 "R47" V 5330 3750 50  0000 C CNN
 F 1 "1k" V 5250 3750 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 5180 3750 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5180 3750 50  0001 C CNN
 F 3 "" H 5250 3750 50  0000 C CNN
 	1    5250 3750
 	0    1    1    0   
@@ -521,7 +462,7 @@ U 1 1 591E1BB7
 P 5250 3950
 F 0 "R48" V 5330 3950 50  0000 C CNN
 F 1 "1k" V 5250 3950 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 5180 3950 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603" V 5180 3950 50  0001 C CNN
 F 3 "" H 5250 3950 50  0000 C CNN
 	1    5250 3950
 	0    1    1    0   
@@ -781,4 +722,74 @@ F 7 "859-LTST-C170KFKT" H 4550 2750 60  0001 C CNN "Distributor1_PN"
 	1    4550 2750
 	1    0    0    -1  
 $EndComp
+$Comp
+L CONN_02X01 BTN2
+U 1 1 5A556C72
+P 3100 3150
+F 0 "BTN2" H 3100 3250 50  0000 C CNN
+F 1 "FIRE2" H 2600 3150 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 1950 50  0001 C CNN
+F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 1950 50  0001 C CNN
+F 4 "www.ckswitches.com" H 3100 3150 60  0001 C CNN "MFG_URL"
+F 5 "PTS645SL50SMTR92 LFS" H 3100 3150 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 3100 3150 60  0001 C CNN "Distributor1_URL"
+	1    3100 3150
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_02X01 BTN3
+U 1 1 5A556E0A
+P 3100 3350
+F 0 "BTN3" H 3100 3450 50  0000 C CNN
+F 1 "UP" H 2600 3350 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2150 50  0001 C CNN
+F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2150 50  0001 C CNN
+F 4 "www.ckswitches.com" H 3100 3350 60  0001 C CNN "MFG_URL"
+F 5 "PTS645SL50SMTR92 LFS" H 3100 3350 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 3100 3350 60  0001 C CNN "Distributor1_URL"
+	1    3100 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_02X01 BTN4
+U 1 1 5A556FAC
+P 3100 3550
+F 0 "BTN4" H 3100 3650 50  0000 C CNN
+F 1 "DOWN" H 2600 3550 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2350 50  0001 C CNN
+F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2350 50  0001 C CNN
+F 4 "www.ckswitches.com" H 3100 3550 60  0001 C CNN "MFG_URL"
+F 5 "PTS645SL50SMTR92 LFS" H 3100 3550 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 3100 3550 60  0001 C CNN "Distributor1_URL"
+	1    3100 3550
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_02X01 BTN5
+U 1 1 5A557167
+P 3100 3750
+F 0 "BTN5" H 3100 3850 50  0000 C CNN
+F 1 "LEFT" H 2600 3750 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2550 50  0001 C CNN
+F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2550 50  0001 C CNN
+F 4 "www.ckswitches.com" H 3100 3750 60  0001 C CNN "MFG_URL"
+F 5 "PTS645SL50SMTR92 LFS" H 3100 3750 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 3100 3750 60  0001 C CNN "Distributor1_URL"
+	1    3100 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_02X01 BTN6
+U 1 1 5A557341
+P 3100 3950
+F 0 "BTN6" H 3100 4050 50  0000 C CNN
+F 1 "RIGHT" H 2600 3950 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2750 50  0001 C CNN
+F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2750 50  0001 C CNN
+F 4 "www.ckswitches.com" H 3100 3950 60  0001 C CNN "MFG_URL"
+F 5 "PTS645SL50SMTR92 LFS" H 3100 3950 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 3100 3950 60  0001 C CNN "Distributor1_URL"
+	1    3100 3950
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/blinkey.sch b/blinkey.sch
index cc45ce9..ee086a1 100644
--- a/blinkey.sch
+++ b/blinkey.sch
@@ -115,66 +115,6 @@ F 6 "www.mouser.com" H 3100 2950 60  0001 C CNN "Distributor1_URL"
 	1    3100 2950
 	1    0    0    -1  
 $EndComp
-$Comp
-L CONN_02X01 BTN2
-U 1 1 58D66057
-P 3100 3150
-F 0 "BTN2" H 3100 3250 50  0000 C CNN
-F 1 "FIRE2" H 2600 3150 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 1950 50  0001 C CNN
-F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 1950 50  0001 C CNN
-F 4 "www.mouser.com" H 3100 3150 60  0001 C CNN "Distributor1_URL"
-	1    3100 3150
-	1    0    0    -1  
-$EndComp
-$Comp
-L CONN_02X01 BTN4
-U 1 1 58D66058
-P 3100 3550
-F 0 "BTN4" H 3100 3650 50  0000 C CNN
-F 1 "DOWN" H 2600 3550 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2350 50  0001 C CNN
-F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2350 50  0001 C CNN
-F 4 "www.mouser.com" H 3100 3550 60  0001 C CNN "Distributor1_URL"
-	1    3100 3550
-	1    0    0    -1  
-$EndComp
-$Comp
-L CONN_02X01 BTN3
-U 1 1 58D66059
-P 3100 3350
-F 0 "BTN3" H 3100 3450 50  0000 C CNN
-F 1 "UP" H 2600 3350 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2150 50  0001 C CNN
-F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2150 50  0001 C CNN
-F 4 "www.mouser.com" H 3100 3350 60  0001 C CNN "Distributor1_URL"
-	1    3100 3350
-	1    0    0    -1  
-$EndComp
-$Comp
-L CONN_02X01 BTN5
-U 1 1 58D6605A
-P 3100 3750
-F 0 "BTN5" H 3100 3850 50  0000 C CNN
-F 1 "LEFT" H 2600 3750 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2550 50  0001 C CNN
-F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2550 50  0001 C CNN
-F 4 "www.mouser.com" H 3100 3750 60  0001 C CNN "Distributor1_URL"
-	1    3100 3750
-	1    0    0    -1  
-$EndComp
-$Comp
-L CONN_02X01 BTN6
-U 1 1 58D6605B
-P 3100 3950
-F 0 "BTN6" H 3100 4050 50  0000 C CNN
-F 1 "RIGHT" H 2600 3950 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2750 50  0001 C CNN
-F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2750 50  0001 C CNN
-F 4 "www.mouser.com" H 3100 3950 60  0001 C CNN "Distributor1_URL"
-	1    3100 3950
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	2850 2950 2750 2950
 Wire Wire Line
@@ -318,6 +258,7 @@ F 3 "https://drive.google.com/file/d/0B5lkVYnewKTGRlpxcEdWaXNvWnM/view" H 4750 1
 F 4 "www.displaymodule.com" H 4750 1550 60  0001 C CNN "MFG_URL"
 F 5 "DM-OLEDC095-626" H 4750 1550 60  0001 C CNN "MFG_PN"
 F 6 "www.mouser.com" H 4750 1550 60  0001 C CNN "Distributor1_URL"
+F 7 "Do not install" H 4750 1550 60  0001 C CNN "Note"
 	1    4750 1550
 	0    1    1    0   
 $EndComp
@@ -781,4 +722,74 @@ F 7 "859-LTST-C170KFKT" H 4550 2750 60  0001 C CNN "Distributor1_PN"
 	1    4550 2750
 	1    0    0    -1  
 $EndComp
+$Comp
+L CONN_02X01 BTN2
+U 1 1 5A556C72
+P 3100 3150
+F 0 "BTN2" H 3100 3250 50  0000 C CNN
+F 1 "FIRE2" H 2600 3150 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 1950 50  0001 C CNN
+F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 1950 50  0001 C CNN
+F 4 "www.ckswitches.com" H 3100 3150 60  0001 C CNN "MFG_URL"
+F 5 "PTS645SL50SMTR92 LFS" H 3100 3150 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 3100 3150 60  0001 C CNN "Distributor1_URL"
+	1    3100 3150
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_02X01 BTN3
+U 1 1 5A556E0A
+P 3100 3350
+F 0 "BTN3" H 3100 3450 50  0000 C CNN
+F 1 "UP" H 2600 3350 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2150 50  0001 C CNN
+F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2150 50  0001 C CNN
+F 4 "www.ckswitches.com" H 3100 3350 60  0001 C CNN "MFG_URL"
+F 5 "PTS645SL50SMTR92 LFS" H 3100 3350 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 3100 3350 60  0001 C CNN "Distributor1_URL"
+	1    3100 3350
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_02X01 BTN4
+U 1 1 5A556FAC
+P 3100 3550
+F 0 "BTN4" H 3100 3650 50  0000 C CNN
+F 1 "DOWN" H 2600 3550 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2350 50  0001 C CNN
+F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2350 50  0001 C CNN
+F 4 "www.ckswitches.com" H 3100 3550 60  0001 C CNN "MFG_URL"
+F 5 "PTS645SL50SMTR92 LFS" H 3100 3550 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 3100 3550 60  0001 C CNN "Distributor1_URL"
+	1    3100 3550
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_02X01 BTN5
+U 1 1 5A557167
+P 3100 3750
+F 0 "BTN5" H 3100 3850 50  0000 C CNN
+F 1 "LEFT" H 2600 3750 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2550 50  0001 C CNN
+F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2550 50  0001 C CNN
+F 4 "www.ckswitches.com" H 3100 3750 60  0001 C CNN "MFG_URL"
+F 5 "PTS645SL50SMTR92 LFS" H 3100 3750 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 3100 3750 60  0001 C CNN "Distributor1_URL"
+	1    3100 3750
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_02X01 BTN6
+U 1 1 5A557341
+P 3100 3950
+F 0 "BTN6" H 3100 4050 50  0000 C CNN
+F 1 "RIGHT" H 2600 3950 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2750 50  0001 C CNN
+F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2750 50  0001 C CNN
+F 4 "www.ckswitches.com" H 3100 3950 60  0001 C CNN "MFG_URL"
+F 5 "PTS645SL50SMTR92 LFS" H 3100 3950 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 3100 3950 60  0001 C CNN "Distributor1_URL"
+	1    3100 3950
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/gpio.bak b/gpio.bak
index f9824a3..ad95048 100644
--- a/gpio.bak
+++ b/gpio.bak
@@ -85,6 +85,7 @@ F 0 "D51" H 7400 5430 50  0000 L CNN
 F 1 "STPS2L30AF" H 7400 5250 50  0000 L CNN
 F 2 "Diodes_SMD:D_SMA_Handsoldering" V 7450 5350 60  0001 C CNN
 F 3 "" V 7450 5350 60  0000 C CNN
+F 4 "STPS2L30AF" H 7450 5350 60  0001 C CNN "MFG_PN"
 	1    7450 5350
 	1    0    0    -1  
 $EndComp
@@ -98,6 +99,7 @@ F 0 "D52" H 9350 5430 50  0000 L CNN
 F 1 "STPS2L30AF" H 9350 5250 50  0000 L CNN
 F 2 "Diodes_SMD:D_SMA_Handsoldering" V 9400 5350 60  0001 C CNN
 F 3 "" V 9400 5350 60  0000 C CNN
+F 4 "STPS2L30AF" H 9400 5350 60  0001 C CNN "MFG_PN"
 	1    9400 5350
 	1    0    0    -1  
 $EndComp
@@ -144,6 +146,7 @@ F 0 "J2" H 8400 5450 50  0000 C CNN
 F 1 "CONN_02X20" H 8400 3350 50  0000 C CNN
 F 2 "Socket_Strips:Socket_Strip_Angled_2x20" H 8400 3450 50  0001 C CNN
 F 3 "" H 8400 3450 50  0000 C CNN
+F 4 "Do not install" H 8400 4400 60  0001 C CNN "Note"
 	1    8400 4400
 	1    0    0    -1  
 $EndComp
@@ -155,6 +158,7 @@ F 0 "J1" H 1850 5500 50  0000 C CNN
 F 1 "CONN_02X20" H 1850 3400 50  0000 C CNN
 F 2 "Socket_Strips:Socket_Strip_Angled_2x20" H 1850 3500 50  0001 C CNN
 F 3 "" H 1850 3500 50  0000 C CNN
+F 4 "Do not install" H 1850 4450 60  0001 C CNN "Note"
 	1    1850 4450
 	1    0    0    -1  
 $EndComp
diff --git a/gpio.sch b/gpio.sch
index f9824a3..ad95048 100644
--- a/gpio.sch
+++ b/gpio.sch
@@ -85,6 +85,7 @@ F 0 "D51" H 7400 5430 50  0000 L CNN
 F 1 "STPS2L30AF" H 7400 5250 50  0000 L CNN
 F 2 "Diodes_SMD:D_SMA_Handsoldering" V 7450 5350 60  0001 C CNN
 F 3 "" V 7450 5350 60  0000 C CNN
+F 4 "STPS2L30AF" H 7450 5350 60  0001 C CNN "MFG_PN"
 	1    7450 5350
 	1    0    0    -1  
 $EndComp
@@ -98,6 +99,7 @@ F 0 "D52" H 9350 5430 50  0000 L CNN
 F 1 "STPS2L30AF" H 9350 5250 50  0000 L CNN
 F 2 "Diodes_SMD:D_SMA_Handsoldering" V 9400 5350 60  0001 C CNN
 F 3 "" V 9400 5350 60  0000 C CNN
+F 4 "STPS2L30AF" H 9400 5350 60  0001 C CNN "MFG_PN"
 	1    9400 5350
 	1    0    0    -1  
 $EndComp
@@ -144,6 +146,7 @@ F 0 "J2" H 8400 5450 50  0000 C CNN
 F 1 "CONN_02X20" H 8400 3350 50  0000 C CNN
 F 2 "Socket_Strips:Socket_Strip_Angled_2x20" H 8400 3450 50  0001 C CNN
 F 3 "" H 8400 3450 50  0000 C CNN
+F 4 "Do not install" H 8400 4400 60  0001 C CNN "Note"
 	1    8400 4400
 	1    0    0    -1  
 $EndComp
@@ -155,6 +158,7 @@ F 0 "J1" H 1850 5500 50  0000 C CNN
 F 1 "CONN_02X20" H 1850 3400 50  0000 C CNN
 F 2 "Socket_Strips:Socket_Strip_Angled_2x20" H 1850 3500 50  0001 C CNN
 F 3 "" H 1850 3500 50  0000 C CNN
+F 4 "Do not install" H 1850 4450 60  0001 C CNN "Note"
 	1    1850 4450
 	1    0    0    -1  
 $EndComp
diff --git a/power.bak b/power.bak
index 7b14f4f..5cad54f 100644
--- a/power.bak
+++ b/power.bak
@@ -115,7 +115,7 @@ F 3 "" H 7450 3600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C1
+L C C1
 U 1 1 58D598B7
 P 7450 3400
 F 0 "C1" H 7475 3500 50  0000 L CNN
@@ -185,7 +185,7 @@ F 3 "" H 9850 3300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C3
+L C C3
 U 1 1 58D5AE64
 P 9850 3000
 F 0 "C3" H 9875 3100 50  0000 L CNN
@@ -196,7 +196,7 @@ F 3 "" H 9850 3000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C4
+L C C4
 U 1 1 58D5AEB3
 P 10200 3000
 F 0 "C4" H 10225 3100 50  0000 L CNN
@@ -266,7 +266,7 @@ F 3 "" H 7450 6000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C5
+L C C5
 U 1 1 58D6295E
 P 7450 5800
 F 0 "C5" H 7475 5900 50  0000 L CNN
@@ -336,7 +336,7 @@ F 3 "" H 9850 5700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C7
+L C C7
 U 1 1 58D62988
 P 9850 5400
 F 0 "C7" H 9875 5500 50  0000 L CNN
@@ -347,7 +347,7 @@ F 3 "" H 9850 5400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C8
+L C C8
 U 1 1 58D6298E
 P 10200 5400
 F 0 "C8" H 10225 5500 50  0000 L CNN
@@ -419,7 +419,7 @@ F 3 "" H 7450 4800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C9
+L C C9
 U 1 1 58D67BD2
 P 7450 4600
 F 0 "C9" H 7475 4700 50  0000 L CNN
@@ -489,7 +489,7 @@ F 3 "" H 9850 4500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C11
+L C C11
 U 1 1 58D67BF6
 P 9850 4200
 F 0 "C11" H 9875 4300 50  0000 L CNN
@@ -500,7 +500,7 @@ F 3 "" H 9850 4200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C12
+L C C12
 U 1 1 58D67BFC
 P 10200 4200
 F 0 "C12" H 10225 4300 50  0000 L CNN
@@ -609,7 +609,7 @@ U 1 1 58D72202
 P 2700 3800
 F 0 "BAT1" H 2400 3900 50  0000 L CNN
 F 1 "CR1225" H 2300 3800 50  0000 L CNN
-F 2 "Keystone_3000_1x12mm-CoinCell:Keystone_3000_1x12mm-CoinCell" V 2700 3860 50  0001 C CNN
+F 2 "Keystone_3000_2.5x12.5mm-CoinCell:Keystone_3000_1x12mm-CoinCell" V 2700 3860 50  0001 C CNN
 F 3 "http://www.keyelco.com/product-pdf.cfm?p=777" H 2700 3860 50  0001 C CNN
 F 4 "www.keyelco.com" H 2700 3800 60  0001 C CNN "MFG_URL"
 F 5 "3000" H 2700 3800 60  0001 C CNN "MFG_PN"
@@ -951,7 +951,9 @@ F 0 "BTN0" H 2200 4400 50  0000 C CNN
 F 1 "POWER" H 2200 4200 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 2200 3100 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 2200 3100 50  0001 C CNN
-F 4 "www.mouser.com" H 2200 4300 60  0001 C CNN "Distributor1_URL"
+F 4 "www.ckswitches.com" H 2200 4300 60  0001 C CNN "MFG_URL"
+F 5 "PTS645SL50SMTR92 LFS" H 2200 4300 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 2200 4300 60  0001 C CNN "Distributor1_URL"
 	1    2200 4300
 	-1   0    0    1   
 $EndComp
@@ -1707,6 +1709,7 @@ F 0 "JP1" H 10750 2880 50  0000 C CNN
 F 1 "1.2" H 10800 2750 50  0000 C CNN
 F 2 "jumper:SOLDER-JUMPER_1-WAY" H 10750 2800 50  0001 C CNN
 F 3 "" H 10750 2800 50  0001 C CNN
+F 4 "Do not install" H 10750 2800 60  0001 C CNN "Note"
 	1    10750 2800
 	1    0    0    -1  
 $EndComp
@@ -1718,6 +1721,7 @@ F 0 "JP2" H 10750 4080 50  0000 C CNN
 F 1 "2.5" H 10800 3950 50  0000 C CNN
 F 2 "jumper:SOLDER-JUMPER_1-WAY" H 10750 4000 50  0001 C CNN
 F 3 "" H 10750 4000 50  0001 C CNN
+F 4 "Do not install" H 10750 4000 60  0001 C CNN "Note"
 	1    10750 4000
 	1    0    0    -1  
 $EndComp
@@ -1729,6 +1733,7 @@ F 0 "JP3" H 10750 5280 50  0000 C CNN
 F 1 "3.3" H 10800 5150 50  0000 C CNN
 F 2 "jumper:SOLDER-JUMPER_1-WAY" H 10750 5200 50  0001 C CNN
 F 3 "" H 10750 5200 50  0001 C CNN
+F 4 "Do not install" H 10750 5200 60  0001 C CNN "Note"
 	1    10750 5200
 	1    0    0    -1  
 $EndComp
diff --git a/power.sch b/power.sch
index 7b14f4f..5cad54f 100644
--- a/power.sch
+++ b/power.sch
@@ -115,7 +115,7 @@ F 3 "" H 7450 3600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C1
+L C C1
 U 1 1 58D598B7
 P 7450 3400
 F 0 "C1" H 7475 3500 50  0000 L CNN
@@ -185,7 +185,7 @@ F 3 "" H 9850 3300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C3
+L C C3
 U 1 1 58D5AE64
 P 9850 3000
 F 0 "C3" H 9875 3100 50  0000 L CNN
@@ -196,7 +196,7 @@ F 3 "" H 9850 3000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C4
+L C C4
 U 1 1 58D5AEB3
 P 10200 3000
 F 0 "C4" H 10225 3100 50  0000 L CNN
@@ -266,7 +266,7 @@ F 3 "" H 7450 6000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C5
+L C C5
 U 1 1 58D6295E
 P 7450 5800
 F 0 "C5" H 7475 5900 50  0000 L CNN
@@ -336,7 +336,7 @@ F 3 "" H 9850 5700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C7
+L C C7
 U 1 1 58D62988
 P 9850 5400
 F 0 "C7" H 9875 5500 50  0000 L CNN
@@ -347,7 +347,7 @@ F 3 "" H 9850 5400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C8
+L C C8
 U 1 1 58D6298E
 P 10200 5400
 F 0 "C8" H 10225 5500 50  0000 L CNN
@@ -419,7 +419,7 @@ F 3 "" H 7450 4800 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C9
+L C C9
 U 1 1 58D67BD2
 P 7450 4600
 F 0 "C9" H 7475 4700 50  0000 L CNN
@@ -489,7 +489,7 @@ F 3 "" H 9850 4500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C11
+L C C11
 U 1 1 58D67BF6
 P 9850 4200
 F 0 "C11" H 9875 4300 50  0000 L CNN
@@ -500,7 +500,7 @@ F 3 "" H 9850 4200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C12
+L C C12
 U 1 1 58D67BFC
 P 10200 4200
 F 0 "C12" H 10225 4300 50  0000 L CNN
@@ -609,7 +609,7 @@ U 1 1 58D72202
 P 2700 3800
 F 0 "BAT1" H 2400 3900 50  0000 L CNN
 F 1 "CR1225" H 2300 3800 50  0000 L CNN
-F 2 "Keystone_3000_1x12mm-CoinCell:Keystone_3000_1x12mm-CoinCell" V 2700 3860 50  0001 C CNN
+F 2 "Keystone_3000_2.5x12.5mm-CoinCell:Keystone_3000_1x12mm-CoinCell" V 2700 3860 50  0001 C CNN
 F 3 "http://www.keyelco.com/product-pdf.cfm?p=777" H 2700 3860 50  0001 C CNN
 F 4 "www.keyelco.com" H 2700 3800 60  0001 C CNN "MFG_URL"
 F 5 "3000" H 2700 3800 60  0001 C CNN "MFG_PN"
@@ -951,7 +951,9 @@ F 0 "BTN0" H 2200 4400 50  0000 C CNN
 F 1 "POWER" H 2200 4200 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 2200 3100 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 2200 3100 50  0001 C CNN
-F 4 "www.mouser.com" H 2200 4300 60  0001 C CNN "Distributor1_URL"
+F 4 "www.ckswitches.com" H 2200 4300 60  0001 C CNN "MFG_URL"
+F 5 "PTS645SL50SMTR92 LFS" H 2200 4300 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 2200 4300 60  0001 C CNN "Distributor1_URL"
 	1    2200 4300
 	-1   0    0    1   
 $EndComp
@@ -1707,6 +1709,7 @@ F 0 "JP1" H 10750 2880 50  0000 C CNN
 F 1 "1.2" H 10800 2750 50  0000 C CNN
 F 2 "jumper:SOLDER-JUMPER_1-WAY" H 10750 2800 50  0001 C CNN
 F 3 "" H 10750 2800 50  0001 C CNN
+F 4 "Do not install" H 10750 2800 60  0001 C CNN "Note"
 	1    10750 2800
 	1    0    0    -1  
 $EndComp
@@ -1718,6 +1721,7 @@ F 0 "JP2" H 10750 4080 50  0000 C CNN
 F 1 "2.5" H 10800 3950 50  0000 C CNN
 F 2 "jumper:SOLDER-JUMPER_1-WAY" H 10750 4000 50  0001 C CNN
 F 3 "" H 10750 4000 50  0001 C CNN
+F 4 "Do not install" H 10750 4000 60  0001 C CNN "Note"
 	1    10750 4000
 	1    0    0    -1  
 $EndComp
@@ -1729,6 +1733,7 @@ F 0 "JP3" H 10750 5280 50  0000 C CNN
 F 1 "3.3" H 10800 5150 50  0000 C CNN
 F 2 "jumper:SOLDER-JUMPER_1-WAY" H 10750 5200 50  0001 C CNN
 F 3 "" H 10750 5200 50  0001 C CNN
+F 4 "Do not install" H 10750 5200 60  0001 C CNN "Note"
 	1    10750 5200
 	1    0    0    -1  
 $EndComp
diff --git a/usb.bak b/usb.bak
index d64f9ff..1a7db8e 100644
--- a/usb.bak
+++ b/usb.bak
@@ -63,6 +63,7 @@ F 0 "D8" H 2350 1650 50  0000 L CNN
 F 1 "STPS2L30AF" H 1800 1650 50  0000 L CNN
 F 2 "Diodes_SMD:D_SMA_Handsoldering" V 2300 1700 60  0001 C CNN
 F 3 "" V 2300 1700 60  0000 C CNN
+F 4 "STPS2L30AF" H 2300 1700 60  0001 C CNN "MFG_PN"
 	1    2300 1700
 	-1   0    0    1   
 $EndComp
@@ -85,6 +86,7 @@ F 0 "D9" H 2450 2700 50  0000 L CNN
 F 1 "STPS2L30AF" H 2650 2700 50  0000 L CNN
 F 2 "Diodes_SMD:D_SMA_Handsoldering" V 2600 2650 60  0001 C CNN
 F 3 "" V 2600 2650 60  0000 C CNN
+F 4 "STPS2L30AF" H 2600 2650 60  0001 C CNN "MFG_PN"
 	1    2600 2650
 	1    0    0    -1  
 $EndComp
@@ -422,6 +424,7 @@ F 0 "J4" H 9400 5200 50  0000 C CNN
 F 1 "CONN_02X03" H 9400 4800 50  0000 C CNN
 F 2 "Socket_Strips:Socket_Strip_Straight_2x03" H 9400 3800 50  0001 C CNN
 F 3 "" H 9400 3800 50  0000 C CNN
+F 4 "Do not install" H 9400 5000 60  0001 C CNN "Note"
 	1    9400 5000
 	1    0    0    -1  
 $EndComp
@@ -581,6 +584,7 @@ F 0 "AE1" H 10875 1425 50  0000 R CNN
 F 1 "433MHz" H 10875 1350 50  0000 R CNN
 F 2 "SMD_Packages:1Pin" H 10950 1350 50  0001 C CNN
 F 3 "" H 10950 1350 50  0001 C CNN
+F 4 "Do not install" H 10950 1350 60  0001 C CNN "Note"
 	1    10950 1350
 	0    1    1    0   
 $EndComp
@@ -598,6 +602,7 @@ F 0 "R54" V 2200 2450 50  0000 C CNN
 F 1 "1.5k" V 2300 2450 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 2230 2450 50  0001 C CNN
 F 3 "" H 2300 2450 50  0000 C CNN
+F 4 "Do not install" H 2300 2450 60  0001 C CNN "Note"
 	1    2300 2450
 	-1   0    0    1   
 $EndComp
@@ -624,6 +629,7 @@ F 0 "R56" V 6530 4250 50  0000 C CNN
 F 1 "0" V 6450 4250 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 6380 4250 50  0001 C CNN
 F 3 "" H 6450 4250 50  0000 C CNN
+F 4 "Do not install" H 6450 4250 60  0001 C CNN "Note"
 	1    6450 4250
 	-1   0    0    1   
 $EndComp
diff --git a/usb.sch b/usb.sch
index d64f9ff..1a7db8e 100644
--- a/usb.sch
+++ b/usb.sch
@@ -63,6 +63,7 @@ F 0 "D8" H 2350 1650 50  0000 L CNN
 F 1 "STPS2L30AF" H 1800 1650 50  0000 L CNN
 F 2 "Diodes_SMD:D_SMA_Handsoldering" V 2300 1700 60  0001 C CNN
 F 3 "" V 2300 1700 60  0000 C CNN
+F 4 "STPS2L30AF" H 2300 1700 60  0001 C CNN "MFG_PN"
 	1    2300 1700
 	-1   0    0    1   
 $EndComp
@@ -85,6 +86,7 @@ F 0 "D9" H 2450 2700 50  0000 L CNN
 F 1 "STPS2L30AF" H 2650 2700 50  0000 L CNN
 F 2 "Diodes_SMD:D_SMA_Handsoldering" V 2600 2650 60  0001 C CNN
 F 3 "" V 2600 2650 60  0000 C CNN
+F 4 "STPS2L30AF" H 2600 2650 60  0001 C CNN "MFG_PN"
 	1    2600 2650
 	1    0    0    -1  
 $EndComp
@@ -422,6 +424,7 @@ F 0 "J4" H 9400 5200 50  0000 C CNN
 F 1 "CONN_02X03" H 9400 4800 50  0000 C CNN
 F 2 "Socket_Strips:Socket_Strip_Straight_2x03" H 9400 3800 50  0001 C CNN
 F 3 "" H 9400 3800 50  0000 C CNN
+F 4 "Do not install" H 9400 5000 60  0001 C CNN "Note"
 	1    9400 5000
 	1    0    0    -1  
 $EndComp
@@ -581,6 +584,7 @@ F 0 "AE1" H 10875 1425 50  0000 R CNN
 F 1 "433MHz" H 10875 1350 50  0000 R CNN
 F 2 "SMD_Packages:1Pin" H 10950 1350 50  0001 C CNN
 F 3 "" H 10950 1350 50  0001 C CNN
+F 4 "Do not install" H 10950 1350 60  0001 C CNN "Note"
 	1    10950 1350
 	0    1    1    0   
 $EndComp
@@ -598,6 +602,7 @@ F 0 "R54" V 2200 2450 50  0000 C CNN
 F 1 "1.5k" V 2300 2450 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 2230 2450 50  0001 C CNN
 F 3 "" H 2300 2450 50  0000 C CNN
+F 4 "Do not install" H 2300 2450 60  0001 C CNN "Note"
 	1    2300 2450
 	-1   0    0    1   
 $EndComp
@@ -624,6 +629,7 @@ F 0 "R56" V 6530 4250 50  0000 C CNN
 F 1 "0" V 6450 4250 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 6380 4250 50  0001 C CNN
 F 3 "" H 6450 4250 50  0000 C CNN
+F 4 "Do not install" H 6450 4250 60  0001 C CNN "Note"
 	1    6450 4250
 	-1   0    0    1   
 $EndComp
diff --git a/wifi.bak b/wifi.bak
index 1cb7b12..9107dc6 100644
--- a/wifi.bak
+++ b/wifi.bak
@@ -92,6 +92,7 @@ F 3 "http://espressif.com/sites/default/files/documentation/esp32_datasheet_en.p
 F 4 "espressif.com" H 6850 4800 60  0001 C CNN "MFG_URL"
 F 5 "ESP-WROOM-32" H 6850 4800 60  0001 C CNN "MFG_PN"
 F 6 "www.mouser.com" H 6850 4800 60  0001 C CNN "Distributor1_URL"
+F 7 "Do not install" H 6850 4800 60  0001 C CNN "Note"
 	1    6850 4800
 	1    0    0    -1  
 $EndComp
@@ -169,6 +170,7 @@ F 0 "J3" H 4750 4700 50  0000 C CNN
 F 1 "WIFI_OFF" H 4750 4500 50  0000 C CNN
 F 2 "Socket_Strips:Socket_Strip_Straight_2x01" H 4750 3400 50  0001 C CNN
 F 3 "" H 4750 3400 50  0000 C CNN
+F 4 "Do not install" H 4750 4600 60  0001 C CNN "Note"
 	1    4750 4600
 	0    1    1    0   
 $EndComp
@@ -186,7 +188,7 @@ F 3 "" H 4750 4100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C21
+L C C21
 U 1 1 5924A09B
 P 3850 4450
 F 0 "C21" H 3875 4550 50  0000 L CNN
diff --git a/wifi.sch b/wifi.sch
index 1cb7b12..9107dc6 100644
--- a/wifi.sch
+++ b/wifi.sch
@@ -92,6 +92,7 @@ F 3 "http://espressif.com/sites/default/files/documentation/esp32_datasheet_en.p
 F 4 "espressif.com" H 6850 4800 60  0001 C CNN "MFG_URL"
 F 5 "ESP-WROOM-32" H 6850 4800 60  0001 C CNN "MFG_PN"
 F 6 "www.mouser.com" H 6850 4800 60  0001 C CNN "Distributor1_URL"
+F 7 "Do not install" H 6850 4800 60  0001 C CNN "Note"
 	1    6850 4800
 	1    0    0    -1  
 $EndComp
@@ -169,6 +170,7 @@ F 0 "J3" H 4750 4700 50  0000 C CNN
 F 1 "WIFI_OFF" H 4750 4500 50  0000 C CNN
 F 2 "Socket_Strips:Socket_Strip_Straight_2x01" H 4750 3400 50  0001 C CNN
 F 3 "" H 4750 3400 50  0000 C CNN
+F 4 "Do not install" H 4750 4600 60  0001 C CNN "Note"
 	1    4750 4600
 	0    1    1    0   
 $EndComp
@@ -186,7 +188,7 @@ F 3 "" H 4750 4100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C21
+L C C21
 U 1 1 5924A09B
 P 3850 4450
 F 0 "C21" H 3875 4550 50  0000 L CNN