diff --git a/blinkey.bak b/blinkey.bak
index 8cb9555..effa564 100644
--- a/blinkey.bak
+++ b/blinkey.bak
@@ -247,11 +247,9 @@ L Device:R R36
 U 1 1 590B507C
 P 4550 4600
 F 0 "R36" V 4630 4600 50  0000 C CNN
-F 1 "1k" V 4550 4600 50  0000 C CNN
+F 1 "1.2k" V 4550 4600 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4480 4600 50  0001 C CNN
 F 3 "" H 4550 4600 50  0000 C CNN
-F 4 "www.yageo.com" V 4550 4600 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 4550 4600 50  0001 C CNN "MPN"
 	1    4550 4600
 	0    1    1    0   
 $EndComp
@@ -296,11 +294,9 @@ L Device:R R37
 U 1 1 590B86FA
 P 5500 5350
 F 0 "R37" V 5580 5350 50  0000 C CNN
-F 1 "1k" V 5500 5350 50  0000 C CNN
+F 1 "1.2k" V 5500 5350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5430 5350 50  0001 C CNN
 F 3 "" H 5500 5350 50  0000 C CNN
-F 4 "www.yageo.com" V 5500 5350 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5500 5350 50  0001 C CNN "MPN"
 	1    5500 5350
 	0    1    1    0   
 $EndComp
@@ -353,11 +349,9 @@ L Device:R R41
 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 1 "1.2k" V 5250 2550 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 2550 50  0001 C CNN
 F 3 "" H 5250 2550 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 2550 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 2550 50  0001 C CNN "MPN"
 	1    5250 2550
 	0    1    1    0   
 $EndComp
@@ -366,11 +360,9 @@ L Device:R R42
 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 1 "1.2k" V 5250 2750 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 2750 50  0001 C CNN
 F 3 "" H 5250 2750 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 2750 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 2750 50  0001 C CNN "MPN"
 	1    5250 2750
 	0    1    1    0   
 $EndComp
@@ -379,11 +371,9 @@ L Device:R R43
 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 1 "1.2k" V 5250 2950 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 2950 50  0001 C CNN
 F 3 "" H 5250 2950 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 2950 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 2950 50  0001 C CNN "MPN"
 	1    5250 2950
 	0    1    1    0   
 $EndComp
@@ -392,11 +382,9 @@ L Device:R R44
 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 1 "1.2k" V 5250 3150 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 3150 50  0001 C CNN
 F 3 "" H 5250 3150 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 3150 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 3150 50  0001 C CNN "MPN"
 	1    5250 3150
 	0    1    1    0   
 $EndComp
@@ -405,11 +393,9 @@ L Device:R R45
 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 1 "1.2k" V 5250 3350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 3350 50  0001 C CNN
 F 3 "" H 5250 3350 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 3350 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 3350 50  0001 C CNN "MPN"
 	1    5250 3350
 	0    1    1    0   
 $EndComp
@@ -418,11 +404,9 @@ L Device:R R46
 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 1 "1.2k" V 5250 3550 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 3550 50  0001 C CNN
 F 3 "" H 5250 3550 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 3550 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 3550 50  0001 C CNN "MPN"
 	1    5250 3550
 	0    1    1    0   
 $EndComp
@@ -431,11 +415,9 @@ L Device:R R47
 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 1 "1.2k" V 5250 3750 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 3750 50  0001 C CNN
 F 3 "" H 5250 3750 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 3750 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 3750 50  0001 C CNN "MPN"
 	1    5250 3750
 	0    1    1    0   
 $EndComp
@@ -444,11 +426,9 @@ L Device:R R48
 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 1 "1.2k" V 5250 3950 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 3950 50  0001 C CNN
 F 3 "" H 5250 3950 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 3950 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 3950 50  0001 C CNN "MPN"
 	1    5250 3950
 	0    1    1    0   
 $EndComp
@@ -548,11 +528,9 @@ L Device:R R62
 U 1 1 5A07AFD8
 P 4550 5850
 F 0 "R62" V 4630 5850 50  0000 C CNN
-F 1 "1k" V 4550 5850 50  0000 C CNN
+F 1 "1.2k" V 4550 5850 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4480 5850 50  0001 C CNN
 F 3 "" H 4550 5850 50  0000 C CNN
-F 4 "www.yageo.com" V 4550 5850 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 4550 5850 50  0001 C CNN "MPN"
 	1    4550 5850
 	0    1    1    0   
 $EndComp
diff --git a/blinkey.sch b/blinkey.sch
index 8cb9555..effa564 100644
--- a/blinkey.sch
+++ b/blinkey.sch
@@ -247,11 +247,9 @@ L Device:R R36
 U 1 1 590B507C
 P 4550 4600
 F 0 "R36" V 4630 4600 50  0000 C CNN
-F 1 "1k" V 4550 4600 50  0000 C CNN
+F 1 "1.2k" V 4550 4600 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4480 4600 50  0001 C CNN
 F 3 "" H 4550 4600 50  0000 C CNN
-F 4 "www.yageo.com" V 4550 4600 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 4550 4600 50  0001 C CNN "MPN"
 	1    4550 4600
 	0    1    1    0   
 $EndComp
@@ -296,11 +294,9 @@ L Device:R R37
 U 1 1 590B86FA
 P 5500 5350
 F 0 "R37" V 5580 5350 50  0000 C CNN
-F 1 "1k" V 5500 5350 50  0000 C CNN
+F 1 "1.2k" V 5500 5350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5430 5350 50  0001 C CNN
 F 3 "" H 5500 5350 50  0000 C CNN
-F 4 "www.yageo.com" V 5500 5350 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5500 5350 50  0001 C CNN "MPN"
 	1    5500 5350
 	0    1    1    0   
 $EndComp
@@ -353,11 +349,9 @@ L Device:R R41
 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 1 "1.2k" V 5250 2550 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 2550 50  0001 C CNN
 F 3 "" H 5250 2550 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 2550 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 2550 50  0001 C CNN "MPN"
 	1    5250 2550
 	0    1    1    0   
 $EndComp
@@ -366,11 +360,9 @@ L Device:R R42
 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 1 "1.2k" V 5250 2750 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 2750 50  0001 C CNN
 F 3 "" H 5250 2750 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 2750 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 2750 50  0001 C CNN "MPN"
 	1    5250 2750
 	0    1    1    0   
 $EndComp
@@ -379,11 +371,9 @@ L Device:R R43
 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 1 "1.2k" V 5250 2950 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 2950 50  0001 C CNN
 F 3 "" H 5250 2950 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 2950 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 2950 50  0001 C CNN "MPN"
 	1    5250 2950
 	0    1    1    0   
 $EndComp
@@ -392,11 +382,9 @@ L Device:R R44
 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 1 "1.2k" V 5250 3150 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 3150 50  0001 C CNN
 F 3 "" H 5250 3150 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 3150 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 3150 50  0001 C CNN "MPN"
 	1    5250 3150
 	0    1    1    0   
 $EndComp
@@ -405,11 +393,9 @@ L Device:R R45
 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 1 "1.2k" V 5250 3350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 3350 50  0001 C CNN
 F 3 "" H 5250 3350 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 3350 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 3350 50  0001 C CNN "MPN"
 	1    5250 3350
 	0    1    1    0   
 $EndComp
@@ -418,11 +404,9 @@ L Device:R R46
 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 1 "1.2k" V 5250 3550 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 3550 50  0001 C CNN
 F 3 "" H 5250 3550 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 3550 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 3550 50  0001 C CNN "MPN"
 	1    5250 3550
 	0    1    1    0   
 $EndComp
@@ -431,11 +415,9 @@ L Device:R R47
 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 1 "1.2k" V 5250 3750 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 3750 50  0001 C CNN
 F 3 "" H 5250 3750 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 3750 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 3750 50  0001 C CNN "MPN"
 	1    5250 3750
 	0    1    1    0   
 $EndComp
@@ -444,11 +426,9 @@ L Device:R R48
 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 1 "1.2k" V 5250 3950 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5180 3950 50  0001 C CNN
 F 3 "" H 5250 3950 50  0000 C CNN
-F 4 "www.yageo.com" V 5250 3950 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 5250 3950 50  0001 C CNN "MPN"
 	1    5250 3950
 	0    1    1    0   
 $EndComp
@@ -548,11 +528,9 @@ L Device:R R62
 U 1 1 5A07AFD8
 P 4550 5850
 F 0 "R62" V 4630 5850 50  0000 C CNN
-F 1 "1k" V 4550 5850 50  0000 C CNN
+F 1 "1.2k" V 4550 5850 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4480 5850 50  0001 C CNN
 F 3 "" H 4550 5850 50  0000 C CNN
-F 4 "www.yageo.com" V 4550 5850 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-071KL" V 4550 5850 50  0001 C CNN "MPN"
 	1    4550 5850
 	0    1    1    0   
 $EndComp
diff --git a/flash.bak b/flash.bak
index 43e7eb0..333170b 100644
--- a/flash.bak
+++ b/flash.bak
@@ -96,11 +96,9 @@ L Device:R R27
 U 1 1 58EC0EFE
 P 3450 2350
 F 0 "R27" V 3530 2350 50  0000 C CNN
-F 1 "10k" V 3450 2350 50  0000 C CNN
+F 1 "12k" V 3450 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 3380 2350 50  0001 C CNN
 F 3 "" H 3450 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 3450 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 3450 2350 50  0001 C CNN "MPN"
 	1    3450 2350
 	1    0    0    -1  
 $EndComp
@@ -124,11 +122,9 @@ L Device:R R28
 U 1 1 58EC0F8E
 P 3650 2350
 F 0 "R28" V 3730 2350 50  0000 C CNN
-F 1 "10k" V 3650 2350 50  0000 C CNN
+F 1 "12k" V 3650 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 3580 2350 50  0001 C CNN
 F 3 "" H 3650 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 3650 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 3650 2350 50  0001 C CNN "MPN"
 	1    3650 2350
 	1    0    0    -1  
 $EndComp
@@ -152,7 +148,7 @@ L Device:R R29
 U 1 1 58EC15E1
 P 3850 2350
 F 0 "R29" V 3930 2350 50  0000 C CNN
-F 1 "1k" V 3850 2350 50  0000 C CNN
+F 1 "1.2k" V 3850 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 3780 2350 50  0001 C CNN
 F 3 "" H 3850 2350 50  0000 C CNN
 F 4 "www.yageo.com" V 3850 2350 50  0001 C CNN "MFG1_URL"
@@ -214,13 +210,9 @@ L Device:R R11
 U 1 1 58EC4E77
 P 3050 2350
 F 0 "R11" V 3130 2350 50  0000 C CNN
-F 1 "10k" V 3050 2350 50  0000 C CNN
+F 1 "12k" V 3050 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 2980 2350 50  0001 C CNN
 F 3 "" H 3050 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 3050 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 3050 2350 50  0001 C CNN "MPN"
-F 6 "603-AC0603FR-0710KL" V 3050 2350 50  0001 C CNN "Mouser"
-F 7 "311-10KLMCT-ND" V 3050 2350 50  0001 C CNN "Digikey"
 	1    3050 2350
 	1    0    0    -1  
 $EndComp
@@ -244,11 +236,9 @@ L Device:R R12
 U 1 1 58EC4E85
 P 3250 2350
 F 0 "R12" V 3330 2350 50  0000 C CNN
-F 1 "10k" V 3250 2350 50  0000 C CNN
+F 1 "12k" V 3250 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 3180 2350 50  0001 C CNN
 F 3 "" H 3250 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 3250 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 3250 2350 50  0001 C CNN "MPN"
 	1    3250 2350
 	1    0    0    -1  
 $EndComp
@@ -317,11 +307,9 @@ L Device:R R31
 U 1 1 58EC68DC
 P 5200 2350
 F 0 "R31" V 5280 2350 50  0000 C CNN
-F 1 "10k" V 5200 2350 50  0000 C CNN
+F 1 "12k" V 5200 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5130 2350 50  0001 C CNN
 F 3 "" H 5200 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 5200 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 5200 2350 50  0001 C CNN "MPN"
 	1    5200 2350
 	1    0    0    -1  
 $EndComp
@@ -345,11 +333,9 @@ L Device:R R32
 U 1 1 58EC68EA
 P 5400 2350
 F 0 "R32" V 5480 2350 50  0000 C CNN
-F 1 "10k" V 5400 2350 50  0000 C CNN
+F 1 "12k" V 5400 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5330 2350 50  0001 C CNN
 F 3 "" H 5400 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 5400 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 5400 2350 50  0001 C CNN "MPN"
 	1    5400 2350
 	1    0    0    -1  
 $EndComp
@@ -377,11 +363,9 @@ L Device:R R33
 U 1 1 58EC72FD
 P 5600 2350
 F 0 "R33" V 5680 2350 50  0000 C CNN
-F 1 "10k" V 5600 2350 50  0000 C CNN
+F 1 "12k" V 5600 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5530 2350 50  0001 C CNN
 F 3 "" H 5600 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 5600 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 5600 2350 50  0001 C CNN "MPN"
 	1    5600 2350
 	1    0    0    -1  
 $EndComp
diff --git a/flash.sch b/flash.sch
index 43e7eb0..333170b 100644
--- a/flash.sch
+++ b/flash.sch
@@ -96,11 +96,9 @@ L Device:R R27
 U 1 1 58EC0EFE
 P 3450 2350
 F 0 "R27" V 3530 2350 50  0000 C CNN
-F 1 "10k" V 3450 2350 50  0000 C CNN
+F 1 "12k" V 3450 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 3380 2350 50  0001 C CNN
 F 3 "" H 3450 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 3450 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 3450 2350 50  0001 C CNN "MPN"
 	1    3450 2350
 	1    0    0    -1  
 $EndComp
@@ -124,11 +122,9 @@ L Device:R R28
 U 1 1 58EC0F8E
 P 3650 2350
 F 0 "R28" V 3730 2350 50  0000 C CNN
-F 1 "10k" V 3650 2350 50  0000 C CNN
+F 1 "12k" V 3650 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 3580 2350 50  0001 C CNN
 F 3 "" H 3650 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 3650 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 3650 2350 50  0001 C CNN "MPN"
 	1    3650 2350
 	1    0    0    -1  
 $EndComp
@@ -152,7 +148,7 @@ L Device:R R29
 U 1 1 58EC15E1
 P 3850 2350
 F 0 "R29" V 3930 2350 50  0000 C CNN
-F 1 "1k" V 3850 2350 50  0000 C CNN
+F 1 "1.2k" V 3850 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 3780 2350 50  0001 C CNN
 F 3 "" H 3850 2350 50  0000 C CNN
 F 4 "www.yageo.com" V 3850 2350 50  0001 C CNN "MFG1_URL"
@@ -214,13 +210,9 @@ L Device:R R11
 U 1 1 58EC4E77
 P 3050 2350
 F 0 "R11" V 3130 2350 50  0000 C CNN
-F 1 "10k" V 3050 2350 50  0000 C CNN
+F 1 "12k" V 3050 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 2980 2350 50  0001 C CNN
 F 3 "" H 3050 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 3050 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 3050 2350 50  0001 C CNN "MPN"
-F 6 "603-AC0603FR-0710KL" V 3050 2350 50  0001 C CNN "Mouser"
-F 7 "311-10KLMCT-ND" V 3050 2350 50  0001 C CNN "Digikey"
 	1    3050 2350
 	1    0    0    -1  
 $EndComp
@@ -244,11 +236,9 @@ L Device:R R12
 U 1 1 58EC4E85
 P 3250 2350
 F 0 "R12" V 3330 2350 50  0000 C CNN
-F 1 "10k" V 3250 2350 50  0000 C CNN
+F 1 "12k" V 3250 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 3180 2350 50  0001 C CNN
 F 3 "" H 3250 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 3250 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 3250 2350 50  0001 C CNN "MPN"
 	1    3250 2350
 	1    0    0    -1  
 $EndComp
@@ -317,11 +307,9 @@ L Device:R R31
 U 1 1 58EC68DC
 P 5200 2350
 F 0 "R31" V 5280 2350 50  0000 C CNN
-F 1 "10k" V 5200 2350 50  0000 C CNN
+F 1 "12k" V 5200 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5130 2350 50  0001 C CNN
 F 3 "" H 5200 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 5200 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 5200 2350 50  0001 C CNN "MPN"
 	1    5200 2350
 	1    0    0    -1  
 $EndComp
@@ -345,11 +333,9 @@ L Device:R R32
 U 1 1 58EC68EA
 P 5400 2350
 F 0 "R32" V 5480 2350 50  0000 C CNN
-F 1 "10k" V 5400 2350 50  0000 C CNN
+F 1 "12k" V 5400 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5330 2350 50  0001 C CNN
 F 3 "" H 5400 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 5400 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 5400 2350 50  0001 C CNN "MPN"
 	1    5400 2350
 	1    0    0    -1  
 $EndComp
@@ -377,11 +363,9 @@ L Device:R R33
 U 1 1 58EC72FD
 P 5600 2350
 F 0 "R33" V 5680 2350 50  0000 C CNN
-F 1 "10k" V 5600 2350 50  0000 C CNN
+F 1 "12k" V 5600 2350 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 5530 2350 50  0001 C CNN
 F 3 "" H 5600 2350 50  0000 C CNN
-F 4 "www.yageo.com" V 5600 2350 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-0710KL" V 5600 2350 50  0001 C CNN "MPN"
 	1    5600 2350
 	1    0    0    -1  
 $EndComp
diff --git a/gpdi.bak b/gpdi.bak
index db427dc..66b1dbc 100644
--- a/gpdi.bak
+++ b/gpdi.bak
@@ -242,7 +242,7 @@ L Device:R R23
 U 1 1 58D92CF9
 P 5050 5200
 F 0 "R23" V 5130 5200 50  0000 C CNN
-F 1 "2.2k" V 5050 5200 50  0000 C CNN
+F 1 "3.3k" V 5050 5200 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4980 5200 50  0001 C CNN
 F 3 "" H 5050 5200 50  0000 C CNN
 F 4 "www.yageo.com" V 5050 5200 50  0001 C CNN "MFG1_URL"
@@ -255,7 +255,7 @@ L Device:R R22
 U 1 1 58D92D93
 P 4900 5200
 F 0 "R22" V 4980 5200 50  0000 C CNN
-F 1 "2.2k" V 4900 5200 50  0000 C CNN
+F 1 "3.3k" V 4900 5200 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4830 5200 50  0001 C CNN
 F 3 "" H 4900 5200 50  0000 C CNN
 F 4 "RC0603FR-072K2L" V 4900 5200 50  0001 C CNN "MPN"
@@ -411,10 +411,9 @@ L Device:R R61
 U 1 1 5A0777ED
 P 1600 2300
 F 0 "R61" V 1680 2300 50  0000 C CNN
-F 1 "470" V 1600 2300 50  0000 C CNN
+F 1 "680" V 1600 2300 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 1530 2300 50  0001 C CNN
 F 3 "" H 1600 2300 50  0000 C CNN
-F 4 "RC0603FR-07470RL" V 1600 2300 50  0001 C CNN "MPN"
 	1    1600 2300
 	0    -1   -1   0   
 $EndComp
diff --git a/gpdi.sch b/gpdi.sch
index db427dc..f11ef26 100644
--- a/gpdi.sch
+++ b/gpdi.sch
@@ -242,11 +242,9 @@ L Device:R R23
 U 1 1 58D92CF9
 P 5050 5200
 F 0 "R23" V 5130 5200 50  0000 C CNN
-F 1 "2.2k" V 5050 5200 50  0000 C CNN
+F 1 "3.3k" V 5050 5200 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4980 5200 50  0001 C CNN
 F 3 "" H 5050 5200 50  0000 C CNN
-F 4 "www.yageo.com" V 5050 5200 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-072K2L" V 5050 5200 50  0001 C CNN "MPN"
 	1    5050 5200
 	1    0    0    -1  
 $EndComp
@@ -255,12 +253,9 @@ L Device:R R22
 U 1 1 58D92D93
 P 4900 5200
 F 0 "R22" V 4980 5200 50  0000 C CNN
-F 1 "2.2k" V 4900 5200 50  0000 C CNN
+F 1 "3.3k" V 4900 5200 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4830 5200 50  0001 C CNN
 F 3 "" H 4900 5200 50  0000 C CNN
-F 4 "RC0603FR-072K2L" V 4900 5200 50  0001 C CNN "MPN"
-F 5 "603-RC0603FR-072K2L" V 4900 5200 50  0001 C CNN "Mouser"
-F 6 "311-2.2KLDCT-ND" V 4900 5200 50  0001 C CNN "Digikey"
 	1    4900 5200
 	1    0    0    -1  
 $EndComp
@@ -411,10 +406,9 @@ L Device:R R61
 U 1 1 5A0777ED
 P 1600 2300
 F 0 "R61" V 1680 2300 50  0000 C CNN
-F 1 "470" V 1600 2300 50  0000 C CNN
+F 1 "680" V 1600 2300 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 1530 2300 50  0001 C CNN
 F 3 "" H 1600 2300 50  0000 C CNN
-F 4 "RC0603FR-07470RL" V 1600 2300 50  0001 C CNN "MPN"
 	1    1600 2300
 	0    -1   -1   0   
 $EndComp
diff --git a/power.bak b/power.bak
index ac65663..157b0a5 100644
--- a/power.bak
+++ b/power.bak
@@ -623,7 +623,7 @@ F 2 "Capacitor_SMD:C_0805_2012Metric" H 4338 3600 50  0001 C CNN
 F 3 "" H 4300 3750 50  0000 C CNN
 F 4 "CC0805MRX5R6BB225" H 4300 3750 50  0001 C CNN "MPN"
 F 5 "603-CC805MRX5R6BB225" H 4300 3750 50  0001 C CNN "Mouser"
-F 6 "1276-2904-1-ND" H 4300 3750 50  0001 C CNN "Digikey"
+F 6 "1276-2903-1-ND" H 4300 3750 50  0001 C CNN "Digikey"
 	1    4300 3750
 	1    0    0    -1  
 $EndComp
@@ -737,12 +737,9 @@ P 3400 3750
 AR Path="/58D7B291" Ref="R6"  Part="1" 
 AR Path="/58D51CAD/58D7B291" Ref="R6"  Part="1" 
 F 0 "R6" V 3480 3750 50  0000 C CNN
-F 1 "1k" V 3400 3750 50  0000 C CNN
+F 1 "1.2k" V 3400 3750 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 3330 3750 50  0001 C CNN
 F 3 "" H 3400 3750 50  0000 C CNN
-F 4 "RC0603FR-071KL" V 3400 3750 50  0001 C CNN "MPN"
-F 5 "603-RC0603FR-071KL" V 3400 3750 50  0001 C CNN "Mouser"
-F 6 "311-1.00KHRCT-ND" V 3400 3750 50  0001 C CNN "Digikey"
 	1    3400 3750
 	0    1    1    0   
 $EndComp
@@ -774,7 +771,7 @@ P 4100 5200
 AR Path="/58D8111E" Ref="R8"  Part="1" 
 AR Path="/58D51CAD/58D8111E" Ref="R8"  Part="1" 
 F 0 "R8" V 4180 5200 50  0000 C CNN
-F 1 "1k" V 4100 5200 50  0000 C CNN
+F 1 "1.2k" V 4100 5200 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4030 5200 50  0001 C CNN
 F 3 "" H 4100 5200 50  0000 C CNN
 F 4 "www.yageo.com" V 4100 5200 50  0001 C CNN "MFG1_URL"
@@ -3187,7 +3184,7 @@ L Device:R R65
 U 1 1 5B0A7AE1
 P 1500 2650
 F 0 "R65" V 1580 2650 50  0000 C CNN
-F 1 "1k" V 1500 2650 50  0000 C CNN
+F 1 "680" V 1500 2650 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 1430 2650 50  0001 C CNN
 F 3 "" H 1500 2650 50  0000 C CNN
 F 4 "www.yageo.com" V 1500 2650 50  0001 C CNN "MFG1_URL"
diff --git a/power.sch b/power.sch
index 776e6aa..157b0a5 100644
--- a/power.sch
+++ b/power.sch
@@ -737,12 +737,9 @@ P 3400 3750
 AR Path="/58D7B291" Ref="R6"  Part="1" 
 AR Path="/58D51CAD/58D7B291" Ref="R6"  Part="1" 
 F 0 "R6" V 3480 3750 50  0000 C CNN
-F 1 "1k" V 3400 3750 50  0000 C CNN
+F 1 "1.2k" V 3400 3750 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 3330 3750 50  0001 C CNN
 F 3 "" H 3400 3750 50  0000 C CNN
-F 4 "RC0603FR-071KL" V 3400 3750 50  0001 C CNN "MPN"
-F 5 "603-RC0603FR-071KL" V 3400 3750 50  0001 C CNN "Mouser"
-F 6 "311-1.00KHRCT-ND" V 3400 3750 50  0001 C CNN "Digikey"
 	1    3400 3750
 	0    1    1    0   
 $EndComp
@@ -774,7 +771,7 @@ P 4100 5200
 AR Path="/58D8111E" Ref="R8"  Part="1" 
 AR Path="/58D51CAD/58D8111E" Ref="R8"  Part="1" 
 F 0 "R8" V 4180 5200 50  0000 C CNN
-F 1 "1k" V 4100 5200 50  0000 C CNN
+F 1 "1.2k" V 4100 5200 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4030 5200 50  0001 C CNN
 F 3 "" H 4100 5200 50  0000 C CNN
 F 4 "www.yageo.com" V 4100 5200 50  0001 C CNN "MFG1_URL"
@@ -3187,7 +3184,7 @@ L Device:R R65
 U 1 1 5B0A7AE1
 P 1500 2650
 F 0 "R65" V 1580 2650 50  0000 C CNN
-F 1 "1k" V 1500 2650 50  0000 C CNN
+F 1 "680" V 1500 2650 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 1430 2650 50  0001 C CNN
 F 3 "" H 1500 2650 50  0000 C CNN
 F 4 "www.yageo.com" V 1500 2650 50  0001 C CNN "MFG1_URL"
diff --git a/usb.bak b/usb.bak
index ae4b818..b8151ec 100644
--- a/usb.bak
+++ b/usb.bak
@@ -371,7 +371,7 @@ P 2250 4850
 AR Path="/591C69FB" Ref="R40"  Part="1" 
 AR Path="/58D6BF46/591C69FB" Ref="R40"  Part="1" 
 F 0 "R40" V 2330 4850 50  0000 C CNN
-F 1 "1.5k" V 2250 4850 50  0000 C CNN
+F 1 "1.2k" V 2250 4850 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 2180 4850 50  0001 C CNN
 F 3 "" H 2250 4850 50  0000 C CNN
 F 4 "www.yageo.com" V 2250 4850 50  0001 C CNN "MFG1_URL"
@@ -593,7 +593,7 @@ P 2250 5450
 AR Path="/59D562D0" Ref="R54"  Part="1" 
 AR Path="/58D6BF46/59D562D0" Ref="R54"  Part="1" 
 F 0 "R54" V 2150 5450 50  0000 C CNN
-F 1 "1.5k" V 2250 5450 50  0000 C CNN
+F 1 "1.2k" V 2250 5450 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 2180 5450 50  0001 C CNN
 F 3 "" H 2250 5450 50  0000 C CNN
 F 4 "www.yageo.com" V 2250 5450 50  0001 C CNN "MFG1_URL"
@@ -746,11 +746,13 @@ P 2250 4650
 AR Path="/5A71E38F" Ref="R63"  Part="1" 
 AR Path="/58D6BF46/5A71E38F" Ref="R63"  Part="1" 
 F 0 "R63" V 2330 4650 50  0000 C CNN
-F 1 "15k" V 2250 4650 50  0000 C CNN
+F 1 "12k" V 2250 4650 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 2180 4650 50  0001 C CNN
 F 3 "" H 2250 4650 50  0000 C CNN
 F 4 "www.yageo.com" V 2250 4650 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-1015KL" V 2250 4650 50  0001 C CNN "MPN"
+F 5 "RC0603FR-0712KL" V 2250 4650 50  0001 C CNN "MPN"
+F 6 "603-RC0603FR-0712KL" V 2250 4650 50  0001 C CNN "Mouser"
+F 7 "311-12.0KHRCT-ND" V 2250 4650 50  0001 C CNN "Digikey"
 	1    2250 4650
 	0    -1   -1   0   
 $EndComp
@@ -761,7 +763,7 @@ P 2250 5250
 AR Path="/5A71E566" Ref="R64"  Part="1" 
 AR Path="/58D6BF46/5A71E566" Ref="R64"  Part="1" 
 F 0 "R64" V 2330 5250 50  0000 C CNN
-F 1 "15k" V 2250 5250 50  0000 C CNN
+F 1 "12k" V 2250 5250 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 2180 5250 50  0001 C CNN
 F 3 "" H 2250 5250 50  0000 C CNN
 F 4 "www.yageo.com" V 2250 5250 50  0001 C CNN "MFG1_URL"
@@ -776,20 +778,14 @@ Wire Wire Line
 Text Notes 650  4450 0    60   ~ 0
 USB pull lines connected to\nBANK0 on "gpio" sheet
 $Comp
-L Device:D_Schottky D23
+L Device:D D23
 U 1 1 5A720D44
 P 1950 4650
 F 0 "D23" H 1650 4750 50  0000 C CNN
-F 1 "BAT54W" H 1900 4750 50  0000 C CNN
+F 1 "1N4148" H 1900 4750 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" V 1950 4650 50  0001 C CNN
 F 3 "https://www.diodes.com/assets/Datasheets/ds30065.pdf" V 1950 4650 50  0001 C CNN
-F 4 "www.onsemi.com" H 1950 4650 50  0001 C CNN "MFG1_URL"
-F 5 "NSR0530HT1G " H 1950 4650 50  0001 C CNN "MPN"
-F 6 "www.diodes.com" H 1950 4650 50  0001 C CNN "MFG2_URL"
-F 7 "BAT54WSQ-7-F" H 1950 4650 50  0001 C CNN "MPN2"
-F 8 "www.mouser.com" H 1950 4650 50  0001 C CNN "Mouser_URL"
-F 9 "863-NSR0530HT1G " H 1950 4650 50  0001 C CNN "Mouser"
-F 10 "621-BAT54WSQ-7-F" H 1950 4650 50  0001 C CNN "Mouser2"
+F 4 "1N4148WS" H 1950 4650 50  0001 C CNN "MPN"
 	1    1950 4650
 	1    0    0    -1  
 $EndComp
@@ -852,56 +848,38 @@ Wire Wire Line
 Wire Wire Line
 	1700 5250 1800 5250
 $Comp
-L Device:D_Schottky D25
+L Device:D D25
 U 1 1 5AF760EE
 P 1950 5250
 F 0 "D25" H 1650 5350 50  0000 C CNN
-F 1 "BAT54W" H 1900 5350 50  0000 C CNN
+F 1 "1N4148" H 1900 5350 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" V 1950 5250 50  0001 C CNN
 F 3 "https://www.diodes.com/assets/Datasheets/ds30065.pdf" V 1950 5250 50  0001 C CNN
-F 4 "www.onsemi.com" H 1950 5250 50  0001 C CNN "MFG1_URL"
-F 5 "NSR0530HT1G " H 1950 5250 50  0001 C CNN "MPN"
-F 6 "www.diodes.com" H 1950 5250 50  0001 C CNN "MFG2_URL"
-F 7 "BAT54WSQ-7-F" H 1950 5250 50  0001 C CNN "MPN2"
-F 8 "www.mouser.com" H 1950 5250 50  0001 C CNN "Mouser_URL"
-F 9 "863-NSR0530HT1G " H 1950 5250 50  0001 C CNN "Mouser"
-F 10 "621-BAT54WSQ-7-F" H 1950 5250 50  0001 C CNN "Mouser2"
+F 4 "1N4148WS" H 1950 5250 50  0001 C CNN "MPN"
 	1    1950 5250
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:D_Schottky D24
+L Device:D D24
 U 1 1 5AF79ABE
 P 1950 4850
 F 0 "D24" H 2250 4950 50  0000 C CNN
-F 1 "BAT54W" H 1900 4950 50  0000 C CNN
+F 1 "1N4148" H 1900 4950 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" V 1950 4850 50  0001 C CNN
 F 3 "https://www.diodes.com/assets/Datasheets/ds30065.pdf" V 1950 4850 50  0001 C CNN
-F 4 "www.onsemi.com" H 1950 4850 50  0001 C CNN "MFG1_URL"
-F 5 "NSR0530HT1G " H 1950 4850 50  0001 C CNN "MPN"
-F 6 "www.diodes.com" H 1950 4850 50  0001 C CNN "MFG2_URL"
-F 7 "BAT54WSQ-7-F" H 1950 4850 50  0001 C CNN "MPN2"
-F 8 "www.mouser.com" H 1950 4850 50  0001 C CNN "Mouser_URL"
-F 9 "863-NSR0530HT1G " H 1950 4850 50  0001 C CNN "Mouser"
-F 10 "621-BAT54WSQ-7-F" H 1950 4850 50  0001 C CNN "Mouser2"
+F 4 "1N4148WS" H 1950 4850 50  0001 C CNN "MPN"
 	1    1950 4850
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:D_Schottky D26
+L Device:D D26
 U 1 1 5AF7B2B2
 P 1950 5450
 F 0 "D26" H 2250 5550 50  0000 C CNN
-F 1 "BAT54W" H 1900 5550 50  0000 C CNN
+F 1 "1N4148" H 1900 5550 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" V 1950 5450 50  0001 C CNN
 F 3 "https://www.diodes.com/assets/Datasheets/ds30065.pdf" V 1950 5450 50  0001 C CNN
-F 4 "www.onsemi.com" H 1950 5450 50  0001 C CNN "MFG1_URL"
-F 5 "NSR0530HT1G " H 1950 5450 50  0001 C CNN "MPN"
-F 6 "www.diodes.com" H 1950 5450 50  0001 C CNN "MFG2_URL"
-F 7 "BAT54WSQ-7-F" H 1950 5450 50  0001 C CNN "MPN2"
-F 8 "www.mouser.com" H 1950 5450 50  0001 C CNN "Mouser_URL"
-F 9 "863-NSR0530HT1G " H 1950 5450 50  0001 C CNN "Mouser"
-F 10 "621-BAT54WSQ-7-F" H 1950 5450 50  0001 C CNN "Mouser2"
+F 4 "1N4148WS" H 1950 5450 50  0001 C CNN "MPN"
 	1    1950 5450
 	-1   0    0    1   
 $EndComp
diff --git a/usb.sch b/usb.sch
index ae4b818..b8151ec 100644
--- a/usb.sch
+++ b/usb.sch
@@ -371,7 +371,7 @@ P 2250 4850
 AR Path="/591C69FB" Ref="R40"  Part="1" 
 AR Path="/58D6BF46/591C69FB" Ref="R40"  Part="1" 
 F 0 "R40" V 2330 4850 50  0000 C CNN
-F 1 "1.5k" V 2250 4850 50  0000 C CNN
+F 1 "1.2k" V 2250 4850 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 2180 4850 50  0001 C CNN
 F 3 "" H 2250 4850 50  0000 C CNN
 F 4 "www.yageo.com" V 2250 4850 50  0001 C CNN "MFG1_URL"
@@ -593,7 +593,7 @@ P 2250 5450
 AR Path="/59D562D0" Ref="R54"  Part="1" 
 AR Path="/58D6BF46/59D562D0" Ref="R54"  Part="1" 
 F 0 "R54" V 2150 5450 50  0000 C CNN
-F 1 "1.5k" V 2250 5450 50  0000 C CNN
+F 1 "1.2k" V 2250 5450 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 2180 5450 50  0001 C CNN
 F 3 "" H 2250 5450 50  0000 C CNN
 F 4 "www.yageo.com" V 2250 5450 50  0001 C CNN "MFG1_URL"
@@ -746,11 +746,13 @@ P 2250 4650
 AR Path="/5A71E38F" Ref="R63"  Part="1" 
 AR Path="/58D6BF46/5A71E38F" Ref="R63"  Part="1" 
 F 0 "R63" V 2330 4650 50  0000 C CNN
-F 1 "15k" V 2250 4650 50  0000 C CNN
+F 1 "12k" V 2250 4650 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 2180 4650 50  0001 C CNN
 F 3 "" H 2250 4650 50  0000 C CNN
 F 4 "www.yageo.com" V 2250 4650 50  0001 C CNN "MFG1_URL"
-F 5 "AC0603FR-1015KL" V 2250 4650 50  0001 C CNN "MPN"
+F 5 "RC0603FR-0712KL" V 2250 4650 50  0001 C CNN "MPN"
+F 6 "603-RC0603FR-0712KL" V 2250 4650 50  0001 C CNN "Mouser"
+F 7 "311-12.0KHRCT-ND" V 2250 4650 50  0001 C CNN "Digikey"
 	1    2250 4650
 	0    -1   -1   0   
 $EndComp
@@ -761,7 +763,7 @@ P 2250 5250
 AR Path="/5A71E566" Ref="R64"  Part="1" 
 AR Path="/58D6BF46/5A71E566" Ref="R64"  Part="1" 
 F 0 "R64" V 2330 5250 50  0000 C CNN
-F 1 "15k" V 2250 5250 50  0000 C CNN
+F 1 "12k" V 2250 5250 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 2180 5250 50  0001 C CNN
 F 3 "" H 2250 5250 50  0000 C CNN
 F 4 "www.yageo.com" V 2250 5250 50  0001 C CNN "MFG1_URL"
@@ -776,20 +778,14 @@ Wire Wire Line
 Text Notes 650  4450 0    60   ~ 0
 USB pull lines connected to\nBANK0 on "gpio" sheet
 $Comp
-L Device:D_Schottky D23
+L Device:D D23
 U 1 1 5A720D44
 P 1950 4650
 F 0 "D23" H 1650 4750 50  0000 C CNN
-F 1 "BAT54W" H 1900 4750 50  0000 C CNN
+F 1 "1N4148" H 1900 4750 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" V 1950 4650 50  0001 C CNN
 F 3 "https://www.diodes.com/assets/Datasheets/ds30065.pdf" V 1950 4650 50  0001 C CNN
-F 4 "www.onsemi.com" H 1950 4650 50  0001 C CNN "MFG1_URL"
-F 5 "NSR0530HT1G " H 1950 4650 50  0001 C CNN "MPN"
-F 6 "www.diodes.com" H 1950 4650 50  0001 C CNN "MFG2_URL"
-F 7 "BAT54WSQ-7-F" H 1950 4650 50  0001 C CNN "MPN2"
-F 8 "www.mouser.com" H 1950 4650 50  0001 C CNN "Mouser_URL"
-F 9 "863-NSR0530HT1G " H 1950 4650 50  0001 C CNN "Mouser"
-F 10 "621-BAT54WSQ-7-F" H 1950 4650 50  0001 C CNN "Mouser2"
+F 4 "1N4148WS" H 1950 4650 50  0001 C CNN "MPN"
 	1    1950 4650
 	1    0    0    -1  
 $EndComp
@@ -852,56 +848,38 @@ Wire Wire Line
 Wire Wire Line
 	1700 5250 1800 5250
 $Comp
-L Device:D_Schottky D25
+L Device:D D25
 U 1 1 5AF760EE
 P 1950 5250
 F 0 "D25" H 1650 5350 50  0000 C CNN
-F 1 "BAT54W" H 1900 5350 50  0000 C CNN
+F 1 "1N4148" H 1900 5350 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" V 1950 5250 50  0001 C CNN
 F 3 "https://www.diodes.com/assets/Datasheets/ds30065.pdf" V 1950 5250 50  0001 C CNN
-F 4 "www.onsemi.com" H 1950 5250 50  0001 C CNN "MFG1_URL"
-F 5 "NSR0530HT1G " H 1950 5250 50  0001 C CNN "MPN"
-F 6 "www.diodes.com" H 1950 5250 50  0001 C CNN "MFG2_URL"
-F 7 "BAT54WSQ-7-F" H 1950 5250 50  0001 C CNN "MPN2"
-F 8 "www.mouser.com" H 1950 5250 50  0001 C CNN "Mouser_URL"
-F 9 "863-NSR0530HT1G " H 1950 5250 50  0001 C CNN "Mouser"
-F 10 "621-BAT54WSQ-7-F" H 1950 5250 50  0001 C CNN "Mouser2"
+F 4 "1N4148WS" H 1950 5250 50  0001 C CNN "MPN"
 	1    1950 5250
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:D_Schottky D24
+L Device:D D24
 U 1 1 5AF79ABE
 P 1950 4850
 F 0 "D24" H 2250 4950 50  0000 C CNN
-F 1 "BAT54W" H 1900 4950 50  0000 C CNN
+F 1 "1N4148" H 1900 4950 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" V 1950 4850 50  0001 C CNN
 F 3 "https://www.diodes.com/assets/Datasheets/ds30065.pdf" V 1950 4850 50  0001 C CNN
-F 4 "www.onsemi.com" H 1950 4850 50  0001 C CNN "MFG1_URL"
-F 5 "NSR0530HT1G " H 1950 4850 50  0001 C CNN "MPN"
-F 6 "www.diodes.com" H 1950 4850 50  0001 C CNN "MFG2_URL"
-F 7 "BAT54WSQ-7-F" H 1950 4850 50  0001 C CNN "MPN2"
-F 8 "www.mouser.com" H 1950 4850 50  0001 C CNN "Mouser_URL"
-F 9 "863-NSR0530HT1G " H 1950 4850 50  0001 C CNN "Mouser"
-F 10 "621-BAT54WSQ-7-F" H 1950 4850 50  0001 C CNN "Mouser2"
+F 4 "1N4148WS" H 1950 4850 50  0001 C CNN "MPN"
 	1    1950 4850
 	-1   0    0    1   
 $EndComp
 $Comp
-L Device:D_Schottky D26
+L Device:D D26
 U 1 1 5AF7B2B2
 P 1950 5450
 F 0 "D26" H 2250 5550 50  0000 C CNN
-F 1 "BAT54W" H 1900 5550 50  0000 C CNN
+F 1 "1N4148" H 1900 5550 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" V 1950 5450 50  0001 C CNN
 F 3 "https://www.diodes.com/assets/Datasheets/ds30065.pdf" V 1950 5450 50  0001 C CNN
-F 4 "www.onsemi.com" H 1950 5450 50  0001 C CNN "MFG1_URL"
-F 5 "NSR0530HT1G " H 1950 5450 50  0001 C CNN "MPN"
-F 6 "www.diodes.com" H 1950 5450 50  0001 C CNN "MFG2_URL"
-F 7 "BAT54WSQ-7-F" H 1950 5450 50  0001 C CNN "MPN2"
-F 8 "www.mouser.com" H 1950 5450 50  0001 C CNN "Mouser_URL"
-F 9 "863-NSR0530HT1G " H 1950 5450 50  0001 C CNN "Mouser"
-F 10 "621-BAT54WSQ-7-F" H 1950 5450 50  0001 C CNN "Mouser2"
+F 4 "1N4148WS" H 1950 5450 50  0001 C CNN "MPN"
 	1    1950 5450
 	-1   0    0    1   
 $EndComp
diff --git a/wifi.bak b/wifi.bak
index cd7a6d0..534cc5d 100644
--- a/wifi.bak
+++ b/wifi.bak
@@ -143,13 +143,9 @@ L Device:R R35
 U 1 1 58FD4C5D
 P 4550 2750
 F 0 "R35" V 4630 2750 50  0000 C CNN
-F 1 "470" V 4550 2750 50  0000 C CNN
+F 1 "680" V 4550 2750 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4480 2750 50  0001 C CNN
 F 3 "" H 4550 2750 50  0000 C CNN
-F 4 "www.yageo.com" V 4550 2750 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-07470RL" V 4550 2750 50  0001 C CNN "MPN"
-F 6 "603-RC0603FR-07470RL" V 4550 2750 50  0001 C CNN "Mouser"
-F 7 "311-470HRCT-ND" V 4550 2750 50  0001 C CNN "Digikey"
 	1    4550 2750
 	1    0    0    -1  
 $EndComp
diff --git a/wifi.sch b/wifi.sch
index cd7a6d0..534cc5d 100644
--- a/wifi.sch
+++ b/wifi.sch
@@ -143,13 +143,9 @@ L Device:R R35
 U 1 1 58FD4C5D
 P 4550 2750
 F 0 "R35" V 4630 2750 50  0000 C CNN
-F 1 "470" V 4550 2750 50  0000 C CNN
+F 1 "680" V 4550 2750 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4480 2750 50  0001 C CNN
 F 3 "" H 4550 2750 50  0000 C CNN
-F 4 "www.yageo.com" V 4550 2750 50  0001 C CNN "MFG1_URL"
-F 5 "RC0603FR-07470RL" V 4550 2750 50  0001 C CNN "MPN"
-F 6 "603-RC0603FR-07470RL" V 4550 2750 50  0001 C CNN "Mouser"
-F 7 "311-470HRCT-ND" V 4550 2750 50  0001 C CNN "Digikey"
 	1    4550 2750
 	1    0    0    -1  
 $EndComp