diff --git a/analog.bak b/analog.bak
index 2e9b582..caa0dd2 100644
--- a/analog.bak
+++ b/analog.bak
@@ -22,11 +22,12 @@ F 0 "AUDIO1" H 2550 2750 50  0000 C CNN
 F 1 "JACK_TRS_6PINS" H 2500 2050 50  0000 C CNN
 F 2 "audio-jack:CUI_SJ-43516-SMT" H 2650 2200 50  0001 C CNN
 F 3 "http://www.cui.com/product/resource/sj-4351x-smt-series.pdf" H 2650 2200 50  0001 C CNN
-F 4 "www.cui.com" H 2550 2350 60  0001 C CNN "MFG1_URL"
-F 5 "SJ-43516-SMT-TR" H 2550 2350 60  0001 C CNN "MPN"
-F 6 "www.mouser.com" H 2550 2350 60  0001 C CNN "Mouser_URL"
-F 7 "490-SJ-43516-SMT-TR " H 2550 2350 60  0001 C CNN "Mouser"
-F 8 "CP-43516SJCT-ND" H 2550 2350 50  0001 C CNN "Digikey"
+F 4 "www.cui.com" H 2550 2350 60  0001 C CNN "MNF1_URL"
+F 5 "CUI" H 2550 2350 50  0001 C CNN "MFG1"
+F 6 "SJ-43516-SMT-TR" H 2550 2350 60  0001 C CNN "MPN"
+F 7 "www.mouser.com" H 2550 2350 60  0001 C CNN "Mouser_URL"
+F 8 "490-SJ-43516-SMT-TR " H 2550 2350 60  0001 C CNN "Mouser"
+F 9 "CP-43516SJCT-ND" H 2550 2350 50  0001 C CNN "Digikey"
 	1    2550 2350
 	1    0    0    -1  
 $EndComp
diff --git a/analog.sch b/analog.sch
index 2e9b582..caa0dd2 100644
--- a/analog.sch
+++ b/analog.sch
@@ -22,11 +22,12 @@ F 0 "AUDIO1" H 2550 2750 50  0000 C CNN
 F 1 "JACK_TRS_6PINS" H 2500 2050 50  0000 C CNN
 F 2 "audio-jack:CUI_SJ-43516-SMT" H 2650 2200 50  0001 C CNN
 F 3 "http://www.cui.com/product/resource/sj-4351x-smt-series.pdf" H 2650 2200 50  0001 C CNN
-F 4 "www.cui.com" H 2550 2350 60  0001 C CNN "MFG1_URL"
-F 5 "SJ-43516-SMT-TR" H 2550 2350 60  0001 C CNN "MPN"
-F 6 "www.mouser.com" H 2550 2350 60  0001 C CNN "Mouser_URL"
-F 7 "490-SJ-43516-SMT-TR " H 2550 2350 60  0001 C CNN "Mouser"
-F 8 "CP-43516SJCT-ND" H 2550 2350 50  0001 C CNN "Digikey"
+F 4 "www.cui.com" H 2550 2350 60  0001 C CNN "MNF1_URL"
+F 5 "CUI" H 2550 2350 50  0001 C CNN "MFG1"
+F 6 "SJ-43516-SMT-TR" H 2550 2350 60  0001 C CNN "MPN"
+F 7 "www.mouser.com" H 2550 2350 60  0001 C CNN "Mouser_URL"
+F 8 "490-SJ-43516-SMT-TR " H 2550 2350 60  0001 C CNN "Mouser"
+F 9 "CP-43516SJCT-ND" H 2550 2350 50  0001 C CNN "Digikey"
 	1    2550 2350
 	1    0    0    -1  
 $EndComp
diff --git a/power.bak b/power.bak
index 1f5b9ec..e492d6a 100644
--- a/power.bak
+++ b/power.bak
@@ -69,7 +69,7 @@ F 1 "22uF" H 7425 3600 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric" H 7438 3550 50  0001 C CNN
 F 3 "" H 7400 3700 50  0000 C CNN
 F 4 "CC0805ZKY5V5BB226 " H 7400 3700 50  0001 C CNN "MPN"
-F 5 "80-C0805C226M9PACLR" H 7400 3700 50  0001 C CNN "Mouser"
+F 5 "81-GRM188C60J226ME0J" H 7400 3700 50  0001 C CNN "Mouser"
 F 6 "1276-2412-1-ND" H 7400 3700 50  0001 C CNN "Digikey"
 	1    7400 3700
 	1    0    0    -1  
@@ -749,14 +749,16 @@ F 0 "D12" H 3800 5050 50  0000 C CNN
 F 1 "BAT54W" H 3800 4850 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3800 4950 50  0001 C CNN
 F 3 "https://www.diodes.com/assets/Datasheets/ds30065.pdf" H 3800 4950 50  0001 C CNN
-F 4 "www.onsemi.com" H 3800 4950 50  0001 C CNN "MFG1_URL"
-F 5 "NSR0530HT1G " H 3800 4950 50  0001 C CNN "MPN"
-F 6 "www.diodes.com" H 3800 4950 50  0001 C CNN "MFG2_URL"
-F 7 "BAT54WSQ-7-F " H 3800 4950 50  0001 C CNN "MPN2"
-F 8 "www.mouser.com" H 3800 4950 50  0001 C CNN "Mouser_URL"
-F 9 "863-NSR0530HT1G " H 3800 4950 50  0001 C CNN "Mouser"
-F 10 "621-BAT54WSQ-7-F " H 3800 4950 50  0001 C CNN "Mouser2"
-F 11 "NSR0530HT1GOSCT-ND" H 3800 4950 50  0001 C CNN "Digikey"
+F 4 "www.onsemi.com" H 3800 4950 50  0001 C CNN "MNF1_URL"
+F 5 "ON semiconductor" H 3800 4950 50  0001 C CNN "MFG1"
+F 6 "NSR0530HT1G " H 3800 4950 50  0001 C CNN "MPN"
+F 7 "www.diodes.com" H 3800 4950 50  0001 C CNN "MNF2_URL"
+F 8 "Diodes inc." H 3800 4950 50  0001 C CNN "MFG2"
+F 9 "BAT54WSQ-7-F " H 3800 4950 50  0001 C CNN "MPN2"
+F 10 "www.mouser.com" H 3800 4950 50  0001 C CNN "Mouser_URL"
+F 11 "863-NSR0530HT1G " H 3800 4950 50  0001 C CNN "Mouser"
+F 12 "621-BAT54WSQ-7-F " H 3800 4950 50  0001 C CNN "Mouser2"
+F 13 "NSR0530HT1GOSCT-ND" H 3800 4950 50  0001 C CNN "Digikey"
 	1    3800 4950
 	-1   0    0    1   
 $EndComp
@@ -3139,13 +3141,8 @@ F 0 "D15" H 3100 5700 50  0000 C CNN
 F 1 "BAT54W" H 3100 5500 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3100 5600 50  0001 C CNN
 F 3 "https://www.diodes.com/assets/Datasheets/ds30065.pdf" H 3100 5600 50  0001 C CNN
-F 4 "www.onsemi.com" H 3100 5600 50  0001 C CNN "MFG1_URL"
-F 5 "NSR0530HT1G " H 3100 5600 50  0001 C CNN "MPN"
-F 6 "www.diodes.com" H 3100 5600 50  0001 C CNN "MFG2_URL"
-F 7 "BAT54WSQ-7-F " H 3100 5600 50  0001 C CNN "MPN2"
-F 8 "www.mouser.com" H 3100 5600 50  0001 C CNN "Mouser_URL"
-F 9 "863-NSR0530HT1G " H 3100 5600 50  0001 C CNN "Mouser"
-F 10 "621-BAT54WSQ-7-F " H 3100 5600 50  0001 C CNN "Mouser2"
+F 4 "NSR0530HT1G " H 3100 5600 50  0001 C CNN "MPN"
+F 5 "BAT54WSQ-7-F " H 3100 5600 50  0001 C CNN "MPN2"
 	1    3100 5600
 	-1   0    0    1   
 $EndComp
diff --git a/power.sch b/power.sch
index 12b554b..e492d6a 100644
--- a/power.sch
+++ b/power.sch
@@ -749,14 +749,16 @@ F 0 "D12" H 3800 5050 50  0000 C CNN
 F 1 "BAT54W" H 3800 4850 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3800 4950 50  0001 C CNN
 F 3 "https://www.diodes.com/assets/Datasheets/ds30065.pdf" H 3800 4950 50  0001 C CNN
-F 4 "www.onsemi.com" H 3800 4950 50  0001 C CNN "MFG1_URL"
-F 5 "NSR0530HT1G " H 3800 4950 50  0001 C CNN "MPN"
-F 6 "www.diodes.com" H 3800 4950 50  0001 C CNN "MFG2_URL"
-F 7 "BAT54WSQ-7-F " H 3800 4950 50  0001 C CNN "MPN2"
-F 8 "www.mouser.com" H 3800 4950 50  0001 C CNN "Mouser_URL"
-F 9 "863-NSR0530HT1G " H 3800 4950 50  0001 C CNN "Mouser"
-F 10 "621-BAT54WSQ-7-F " H 3800 4950 50  0001 C CNN "Mouser2"
-F 11 "NSR0530HT1GOSCT-ND" H 3800 4950 50  0001 C CNN "Digikey"
+F 4 "www.onsemi.com" H 3800 4950 50  0001 C CNN "MNF1_URL"
+F 5 "ON semiconductor" H 3800 4950 50  0001 C CNN "MFG1"
+F 6 "NSR0530HT1G " H 3800 4950 50  0001 C CNN "MPN"
+F 7 "www.diodes.com" H 3800 4950 50  0001 C CNN "MNF2_URL"
+F 8 "Diodes inc." H 3800 4950 50  0001 C CNN "MFG2"
+F 9 "BAT54WSQ-7-F " H 3800 4950 50  0001 C CNN "MPN2"
+F 10 "www.mouser.com" H 3800 4950 50  0001 C CNN "Mouser_URL"
+F 11 "863-NSR0530HT1G " H 3800 4950 50  0001 C CNN "Mouser"
+F 12 "621-BAT54WSQ-7-F " H 3800 4950 50  0001 C CNN "Mouser2"
+F 13 "NSR0530HT1GOSCT-ND" H 3800 4950 50  0001 C CNN "Digikey"
 	1    3800 4950
 	-1   0    0    1   
 $EndComp
@@ -3139,13 +3141,8 @@ F 0 "D15" H 3100 5700 50  0000 C CNN
 F 1 "BAT54W" H 3100 5500 50  0000 C CNN
 F 2 "Diode_SMD:D_SOD-323_HandSoldering" H 3100 5600 50  0001 C CNN
 F 3 "https://www.diodes.com/assets/Datasheets/ds30065.pdf" H 3100 5600 50  0001 C CNN
-F 4 "www.onsemi.com" H 3100 5600 50  0001 C CNN "MFG1_URL"
-F 5 "NSR0530HT1G " H 3100 5600 50  0001 C CNN "MPN"
-F 6 "www.diodes.com" H 3100 5600 50  0001 C CNN "MFG2_URL"
-F 7 "BAT54WSQ-7-F " H 3100 5600 50  0001 C CNN "MPN2"
-F 8 "www.mouser.com" H 3100 5600 50  0001 C CNN "Mouser_URL"
-F 9 "863-NSR0530HT1G " H 3100 5600 50  0001 C CNN "Mouser"
-F 10 "621-BAT54WSQ-7-F " H 3100 5600 50  0001 C CNN "Mouser2"
+F 4 "NSR0530HT1G " H 3100 5600 50  0001 C CNN "MPN"
+F 5 "BAT54WSQ-7-F " H 3100 5600 50  0001 C CNN "MPN2"
 	1    3100 5600
 	-1   0    0    1   
 $EndComp