diff --git a/blinkey.bak b/blinkey.bak
index 30002f6..43bed76 100644
--- a/blinkey.bak
+++ b/blinkey.bak
@@ -461,7 +461,6 @@ F 1 "150" V 7250 3400 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 7180 3400 50  0001 C CNN
 F 3 "" H 7250 3400 50  0000 C CNN
 F 4 "www.yageo.com" V 7250 3400 50  0001 C CNN "MNF1_URL"
-F 5 "AC0603FR-07150RL" V 7250 3400 50  0001 C CNN "MPN"
 	1    7250 3400
 	0    -1   -1   0   
 $EndComp
diff --git a/flash.bak b/flash.bak
index 4c9494e..d8c6fb4 100644
--- a/flash.bak
+++ b/flash.bak
@@ -479,13 +479,17 @@ Deviation from TN1260 in pullup:\nvalues for BOM simplification.\nCorrect values
 Text GLabel 4850 3400 0    60   Input ~ 0
 PWRBTn
 $Comp
-L Device:D D28
+L Device:D_ALT D28
 U 1 1 5B5DD430
 P 5000 3400
 F 0 "D28" H 5000 3500 50  0000 C CNN
-F 1 "1N4148" H 5400 3400 50  0000 C CNN
+F 1 "1N914" H 5400 3400 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 5000 3400 50  0001 C CNN
 F 3 "~" H 5000 3400 50  0001 C CNN
+F 4 "Leave empty" H 5000 3400 50  0001 C CNN "Note"
+F 5 "MMDL914T1G" H 5000 3400 50  0001 C CNN "EMPTY_MPN"
+F 6 "863-MMDL914T1G" H 5000 3400 50  0001 C CNN "Mouser"
+F 7 "1N4148WXTPMSCT-ND" H 5000 3400 50  0001 C CNN "Digikey"
 	1    5000 3400
 	1    0    0    -1  
 $EndComp
@@ -496,7 +500,7 @@ L Device:D D29
 U 1 1 5B526A74
 P 5000 3550
 F 0 "D29" H 5000 3450 50  0000 C CNN
-F 1 "1N4148" H 5400 3550 50  0000 C CNN
+F 1 "1N914" H 5400 3550 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 5000 3550 50  0001 C CNN
 F 3 "~" H 5000 3550 50  0001 C CNN
 	1    5000 3550
diff --git a/flash.sch b/flash.sch
index 4c9494e..24ff56f 100644
--- a/flash.sch
+++ b/flash.sch
@@ -479,13 +479,18 @@ Deviation from TN1260 in pullup:\nvalues for BOM simplification.\nCorrect values
 Text GLabel 4850 3400 0    60   Input ~ 0
 PWRBTn
 $Comp
-L Device:D D28
+L Device:D_ALT D28
 U 1 1 5B5DD430
 P 5000 3400
 F 0 "D28" H 5000 3500 50  0000 C CNN
-F 1 "1N4148" H 5400 3400 50  0000 C CNN
+F 1 "1N914" H 5400 3400 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 5000 3400 50  0001 C CNN
 F 3 "~" H 5000 3400 50  0001 C CNN
+F 4 "Leave empty" H 5000 3400 50  0001 C CNN "Note"
+F 5 "MMDL914T1G" H 5000 3400 50  0001 C CNN "EMPTY_MPN"
+F 6 "863-MMDL914T1G" H 5000 3400 50  0001 C CNN "Mouser"
+F 7 "1N4148WXTPMSCT-ND" H 5000 3400 50  0001 C CNN "Digikey"
+F 8 "FV001" H 5000 3400 50  0001 C CNN "Koncar"
 	1    5000 3400
 	1    0    0    -1  
 $EndComp
@@ -496,7 +501,7 @@ L Device:D D29
 U 1 1 5B526A74
 P 5000 3550
 F 0 "D29" H 5000 3450 50  0000 C CNN
-F 1 "1N4148" H 5400 3550 50  0000 C CNN
+F 1 "1N914" H 5400 3550 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 5000 3550 50  0001 C CNN
 F 3 "~" H 5000 3550 50  0001 C CNN
 	1    5000 3550
diff --git a/power.bak b/power.bak
index d9c6465..233c935 100644
--- a/power.bak
+++ b/power.bak
@@ -616,7 +616,7 @@ L Device:D D10
 U 1 1 58D79CB5
 P 4300 4250
 F 0 "D10" H 4300 4350 50  0000 C CNN
-F 1 "1N4148" H 4300 4150 50  0000 C CNN
+F 1 "1N914" H 4300 4150 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 4300 4250 50  0001 C CNN
 F 3 "" H 4300 4250 50  0000 C CNN
 	1    4300 4250
@@ -880,7 +880,7 @@ L Device:D D13
 U 1 1 58DA2DA9
 P 4050 4250
 F 0 "D13" H 4050 4350 50  0000 C CNN
-F 1 "1N4148" H 4050 4150 50  0000 C CNN
+F 1 "1N914" H 4050 4150 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 4050 4250 50  0001 C CNN
 F 3 "" H 4050 4250 50  0000 C CNN
 	1    4050 4250
@@ -915,7 +915,7 @@ L Device:D D14
 U 1 1 58DA55D7
 P 3400 5400
 F 0 "D14" H 3400 5500 50  0000 C CNN
-F 1 "1N4148" H 3400 5300 50  0000 C CNN
+F 1 "1N914" H 3400 5300 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3400 5400 50  0001 C CNN
 F 3 "" H 3400 5400 50  0000 C CNN
 	1    3400 5400
@@ -955,7 +955,7 @@ L Device:D D16
 U 1 1 58E813AE
 P 2900 3950
 F 0 "D16" H 2900 4050 50  0000 C CNN
-F 1 "1N4148" H 2900 3850 50  0000 C CNN
+F 1 "1N914" H 2900 3850 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2900 3950 50  0001 C CNN
 F 3 "https://www.fairchildsemi.com/datasheets/1N/1N4148WS.pdf" H 2900 3950 50  0001 C CNN
 F 4 "www.fairchildsemi.com" H 2900 3950 50  0001 C CNN "MNF1_URL"
@@ -985,7 +985,7 @@ L Device:D D17
 U 1 1 58E82B1D
 P 3150 4150
 F 0 "D17" H 3150 4050 50  0000 C CNN
-F 1 "1N4148" H 3200 4250 50  0000 C CNN
+F 1 "1N914" H 3200 4250 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3150 4150 50  0001 C CNN
 F 3 "" H 3150 4150 50  0000 C CNN
 	1    3150 4150
@@ -3041,7 +3041,7 @@ F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.29x1.40mm_HandSolder" H 900 1850 50  00
 F 3 "" H 900 1850 50  0001 C CNN
 F 4 "www.mouser.com" H 900 1850 60  0001 C CNN "Mouser_URL"
 F 5 "www.yageo.com" H 900 1850 50  0001 C CNN "MNF1_URL"
-F 6 "RC0805JR-070RL" H 900 1850 50  0001 C CNN "EMPTY_PN"
+F 6 "RC0805JR-070RL" H 900 1850 50  0001 C CNN "EMPTY_MPN"
 F 7 "Leave empty" H 900 1850 50  0001 C CNN "Note"
 	1    900  1850
 	0    -1   -1   0   
@@ -3232,7 +3232,7 @@ L Device:D D27
 U 1 1 5B203FA2
 P 2900 3550
 F 0 "D27" H 3100 3600 50  0000 C CNN
-F 1 "1N4148" H 2900 3450 50  0000 C CNN
+F 1 "1N914" H 2900 3450 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2900 3550 50  0001 C CNN
 F 3 "" H 2900 3550 50  0000 C CNN
 F 4 "Leave empty" H 2900 3550 50  0001 C CNN "LowCost"
diff --git a/power.sch b/power.sch
index d9c6465..233c935 100644
--- a/power.sch
+++ b/power.sch
@@ -616,7 +616,7 @@ L Device:D D10
 U 1 1 58D79CB5
 P 4300 4250
 F 0 "D10" H 4300 4350 50  0000 C CNN
-F 1 "1N4148" H 4300 4150 50  0000 C CNN
+F 1 "1N914" H 4300 4150 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 4300 4250 50  0001 C CNN
 F 3 "" H 4300 4250 50  0000 C CNN
 	1    4300 4250
@@ -880,7 +880,7 @@ L Device:D D13
 U 1 1 58DA2DA9
 P 4050 4250
 F 0 "D13" H 4050 4350 50  0000 C CNN
-F 1 "1N4148" H 4050 4150 50  0000 C CNN
+F 1 "1N914" H 4050 4150 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 4050 4250 50  0001 C CNN
 F 3 "" H 4050 4250 50  0000 C CNN
 	1    4050 4250
@@ -915,7 +915,7 @@ L Device:D D14
 U 1 1 58DA55D7
 P 3400 5400
 F 0 "D14" H 3400 5500 50  0000 C CNN
-F 1 "1N4148" H 3400 5300 50  0000 C CNN
+F 1 "1N914" H 3400 5300 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3400 5400 50  0001 C CNN
 F 3 "" H 3400 5400 50  0000 C CNN
 	1    3400 5400
@@ -955,7 +955,7 @@ L Device:D D16
 U 1 1 58E813AE
 P 2900 3950
 F 0 "D16" H 2900 4050 50  0000 C CNN
-F 1 "1N4148" H 2900 3850 50  0000 C CNN
+F 1 "1N914" H 2900 3850 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2900 3950 50  0001 C CNN
 F 3 "https://www.fairchildsemi.com/datasheets/1N/1N4148WS.pdf" H 2900 3950 50  0001 C CNN
 F 4 "www.fairchildsemi.com" H 2900 3950 50  0001 C CNN "MNF1_URL"
@@ -985,7 +985,7 @@ L Device:D D17
 U 1 1 58E82B1D
 P 3150 4150
 F 0 "D17" H 3150 4050 50  0000 C CNN
-F 1 "1N4148" H 3200 4250 50  0000 C CNN
+F 1 "1N914" H 3200 4250 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3150 4150 50  0001 C CNN
 F 3 "" H 3150 4150 50  0000 C CNN
 	1    3150 4150
@@ -3041,7 +3041,7 @@ F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.29x1.40mm_HandSolder" H 900 1850 50  00
 F 3 "" H 900 1850 50  0001 C CNN
 F 4 "www.mouser.com" H 900 1850 60  0001 C CNN "Mouser_URL"
 F 5 "www.yageo.com" H 900 1850 50  0001 C CNN "MNF1_URL"
-F 6 "RC0805JR-070RL" H 900 1850 50  0001 C CNN "EMPTY_PN"
+F 6 "RC0805JR-070RL" H 900 1850 50  0001 C CNN "EMPTY_MPN"
 F 7 "Leave empty" H 900 1850 50  0001 C CNN "Note"
 	1    900  1850
 	0    -1   -1   0   
@@ -3232,7 +3232,7 @@ L Device:D D27
 U 1 1 5B203FA2
 P 2900 3550
 F 0 "D27" H 3100 3600 50  0000 C CNN
-F 1 "1N4148" H 2900 3450 50  0000 C CNN
+F 1 "1N914" H 2900 3450 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 2900 3550 50  0001 C CNN
 F 3 "" H 2900 3550 50  0000 C CNN
 F 4 "Leave empty" H 2900 3550 50  0001 C CNN "LowCost"
diff --git a/ulx3s-cache.lib b/ulx3s-cache.lib
index acb4434..6d9bb43 100644
--- a/ulx3s-cache.lib
+++ b/ulx3s-cache.lib
@@ -307,6 +307,28 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Device:D_ALT
+#
+DEF Device:D_ALT D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "Device:D_ALT" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 F
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Device:D_Schottky
 #
 DEF Device:D_Schottky D 0 40 N N 1 F N
diff --git a/usb.bak b/usb.bak
index e8718b1..fc7e31f 100644
--- a/usb.bak
+++ b/usb.bak
@@ -623,7 +623,7 @@ F 2 "Resistor_SMD:R_0603_1608Metric" V 6380 4250 50  0001 C CNN
 F 3 "" H 6450 4250 50  0000 C CNN
 F 4 "Leave empty" H 6450 4250 60  0001 C CNN "Note"
 F 5 "www.yageo.com" V 6450 4250 50  0001 C CNN "MNF1_URL"
-F 6 "RC0603JR-070RL" V 6450 4250 50  0001 C CNN "EMPTY_PN"
+F 6 "RC0603JR-070RL" V 6450 4250 50  0001 C CNN "EMPTY_MPN"
 	1    6450 4250
 	-1   0    0    1   
 $EndComp
@@ -784,7 +784,7 @@ L Device:D D23
 U 1 1 5A720D44
 P 1950 4850
 F 0 "D23" H 1650 4950 50  0000 C CNN
-F 1 "1N4148" H 1900 4950 50  0000 C CNN
+F 1 "1N914" 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
 	1    1950 4850
@@ -853,7 +853,7 @@ L Device:D D25
 U 1 1 5AF760EE
 P 1950 5450
 F 0 "D25" H 1650 5550 50  0000 C CNN
-F 1 "1N4148" H 1900 5550 50  0000 C CNN
+F 1 "1N914" 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
 	1    1950 5450
@@ -864,7 +864,7 @@ L Device:D D24
 U 1 1 5AF79ABE
 P 1950 4650
 F 0 "D24" H 2250 4750 50  0000 C CNN
-F 1 "1N4148" H 1900 4750 50  0000 C CNN
+F 1 "1N914" 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
 	1    1950 4650
@@ -875,7 +875,7 @@ L Device:D D26
 U 1 1 5AF7B2B2
 P 1950 5250
 F 0 "D26" H 2250 5350 50  0000 C CNN
-F 1 "1N4148" H 1900 5350 50  0000 C CNN
+F 1 "1N914" 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 "1N4148WS" H 1950 5250 50  0001 C CNN "MPN"
diff --git a/usb.sch b/usb.sch
index e8718b1..fc7e31f 100644
--- a/usb.sch
+++ b/usb.sch
@@ -623,7 +623,7 @@ F 2 "Resistor_SMD:R_0603_1608Metric" V 6380 4250 50  0001 C CNN
 F 3 "" H 6450 4250 50  0000 C CNN
 F 4 "Leave empty" H 6450 4250 60  0001 C CNN "Note"
 F 5 "www.yageo.com" V 6450 4250 50  0001 C CNN "MNF1_URL"
-F 6 "RC0603JR-070RL" V 6450 4250 50  0001 C CNN "EMPTY_PN"
+F 6 "RC0603JR-070RL" V 6450 4250 50  0001 C CNN "EMPTY_MPN"
 	1    6450 4250
 	-1   0    0    1   
 $EndComp
@@ -784,7 +784,7 @@ L Device:D D23
 U 1 1 5A720D44
 P 1950 4850
 F 0 "D23" H 1650 4950 50  0000 C CNN
-F 1 "1N4148" H 1900 4950 50  0000 C CNN
+F 1 "1N914" 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
 	1    1950 4850
@@ -853,7 +853,7 @@ L Device:D D25
 U 1 1 5AF760EE
 P 1950 5450
 F 0 "D25" H 1650 5550 50  0000 C CNN
-F 1 "1N4148" H 1900 5550 50  0000 C CNN
+F 1 "1N914" 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
 	1    1950 5450
@@ -864,7 +864,7 @@ L Device:D D24
 U 1 1 5AF79ABE
 P 1950 4650
 F 0 "D24" H 2250 4750 50  0000 C CNN
-F 1 "1N4148" H 1900 4750 50  0000 C CNN
+F 1 "1N914" 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
 	1    1950 4650
@@ -875,7 +875,7 @@ L Device:D D26
 U 1 1 5AF7B2B2
 P 1950 5250
 F 0 "D26" H 2250 5350 50  0000 C CNN
-F 1 "1N4148" H 1900 5350 50  0000 C CNN
+F 1 "1N914" 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 "1N4148WS" H 1950 5250 50  0001 C CNN "MPN"