diff --git a/BOM.csv b/BOM.csv
index 0bbc84a..6b81185 100644
--- a/BOM.csv
+++ b/BOM.csv
@@ -3,18 +3,18 @@ SW1,DNI,Buttons_Switches_SMD:SW_SPST_B3U-1000P,1,Omron Electronics,B3U-1000P,Mou
 C43;C44;C45;C46;C50;C36;C20;C14;C30;C35;C19;C13;C29,100n,Capacitors_SMD:C_0402,13,Vishay / Vitramon,VJ0402V104ZXJCW1BC,Mouser,77-VJ0402V104ZXJCBC
 C49;C39;C16;C18;C4;C32;C42;C38;C15;C17;C3;C31;C37,10n,Capacitors_SMD:C_0402,13,Vishay / Vitramon,VJ0402Y103KXJCW1BC,Mouser,77-VJ0402Y103KXJCBC
 C9;C6,10p,Capacitors_SMD:C_0402,2,Murata Electronics,GRM1555C1E100GA01D,Mouser,81-GRM1555C1E100GA1D
-C52,10u,Capacitors_SMD:C_0402,1,Murata Electronics,GRJ155R60J106ME11D,Mouser,81-GRJ155R60J106ME1D
-C26;C25,15n,Capacitors_SMD:C_0402,2,Murata Electronics,GRM155R71C153KA01D,Mouser,81-GRM155R71C153KA1D
+C52,10u,Capacitors_SMD:C_0402,1,Murata Electronics,GRM155C80J106ME11J,Mouser,81-GRM155C80J106ME1J
+C26;C25,15n,Capacitors_SMD:C_0402,2,Murata Electronics,GRM155R71C153KA01J,Mouser,81-GRM155R71C153KA1J
 C28;C27,1n,Capacitors_SMD:C_0402,2,Murata Electronics,GRM155R60J102KA01D,Mouser,81-GRM155R60J102KA1D
 C40;C41,20p,Capacitors_SMD:C_0402,2,Murata Electronics,GJM1555C1H200FB01D,Mouser,81-GJM1555C1H200FB1D
 C8;C5,220p,Capacitors_SMD:C_0402,2,Murata Electronics,GRM1555C1H221JA01D,Mouser,81-GRM1555C1H221JA01
 C24;C23,22n,Capacitors_SMD:C_0402,2,Murata Electronics,GCM155R71E223KA55D,Mouser,81-GCM155R71E223KA5D
 C34;C33;C53,22p,Capacitors_SMD:C_0402,3,AVX,04025A220GAT2A,Mouser,581-04025A220G
-C22;C21,470p,Capacitors_SMD:C_0402,2,Murata Electronics,GRM155R71H471KA01D,Mouser,81-GRM36X471K50
+C22;C21,470p,Capacitors_SMD:C_0402,2,Murata Electronics,GCG1555G1H471JA01D,Mouser,81-GCG1555G1H471JA1D
 C48;C47,47p,Capacitors_SMD:C_0402,2,Murata Electronics,GRM1555C1H470FA01D,Mouser,81-GRM1555C1H470FA1D
 C10;C7,4p7,Capacitors_SMD:C_0402,2,Murata Electronics,GRM1555C1H4R7CA01D,Mouser,81-GRM1555C1H4R7CA1D
 C12;C2;C11;C1,6p8,Capacitors_SMD:C_0402,4,Murata Electronics,GJM1555C1H6R8BB01D,Mouser,81-GJM1555C1H6R8BB1D
-C51,10u/10V,Capacitors_Tantalum_SMD:CP_Tantalum_Case-A_EIA-3216-18_Reflow,1,AVX,F931A106KAA,Mouser,647-F931A106KAA
+C51,10u/10V,Capacitors_Tantalum_SMD:CP_Tantalum_Case-A_EIA-3216-18_Reflow,1,AVX,TPSA106K010T0900,Mouser,581-TPSA106K010T0900
 P2;P1,SMA,Connectors:SMA_THT_Jack_Straight,2,TE Connectivity,5-1814832-1,Mouser,571-5-1814832-1
 X2;X1,TCXO,Crystals:Crystal_SMD_3225-4pin_3.2x2.5mm,2,ECS,ECS-TXO-3225-147.4-TR,Mouser,520-TXO-3225-14.74T
 Y1,8MHz,Crystals:Crystal_SMD_Abracon_ABM3-2pin_5.0x3.2mm,1,ABRACON,ABM3-8.000MHz-D2Y-T,Mouser,815-ABM3-8-D2Y-T
@@ -26,11 +26,11 @@ L8;L7,13n,Inductors_SMD:L_0402,2,Murata Electronics,LQW15AN13NG80D,Mouser,81-LQW
 L4;L3,20n,Inductors_SMD:L_0402,2,TE Connectivity / Sigma Inductors,36501E20NJTDG,Mouser,279-36501E20NJTDG
 L2;L1,22n,Inductors_SMD:L_0402,2,Murata Electronics,LQW15CA22NJ00D,Mouser,81-LQW15CA22NJ00D
 L6;L5,27n,Inductors_SMD:L_0402,2,Murata Electronics,LQW15AN27NG80D,Mouser,81-LQW15AN27NG80D
-D6,amber,LEDs:LED_0402,1,Kingbright,APG1005SEC-T,Mouser,604-APG1005SECT
-D8,blue,LEDs:LED_0402,1,Kingbright,APHHS1005SURCK,Mouser,604-APHHS1005SURCK
+D6,amber,LEDs:LED_0402,1,Kingbright,APHHS1005SECK,Mouser,604-APHHS1005SECK
+D8,blue,LEDs:LED_0402,1,Kingbright, APHHS1005QBC/D,Mouser,604-APHHS1005QBCD
 D1;D5,green,LEDs:LED_0402,2,Kingbright,APHHS1005CGCK,Mouser,604-APHHS1005CGCK
 D3;D7;D0,red,LEDs:LED_0402,3,Kingbright,APHHS1005SURCK,Mouser,604-APHHS1005SURCK
-D2;D4,yellow,LEDs:LED_0402,2,Kingbright,APG1005SYC-T,Mouser,604-APG1005SYCT
+D2;D4,yellow,LEDs:LED_0402,2,Kingbright,APHHS1005SYCK,Mouser,604-APHHS1005SYCK
 P8,USB_OTG,MMDVM:USB-mini-710-65100516121,1,Wurth Electronics,65100516121,Mouser,710-65100516121
 P4,DISPLAY,Pin_Headers:Pin_Header_Straight_1x04,1,TE Connectivity / AMP,826629-4,Mouser,571-826629-4
 P3,I2C,Pin_Headers:Pin_Header_Straight_1x04,1,TE Connectivity / AMP,826629-4,Mouser,571-826629-4
@@ -38,8 +38,8 @@ P5,STLINK,Pin_Headers:Pin_Header_Straight_1x04,1,TE Connectivity / AMP,826629-4,
 P7,CONN_02X03,Pin_Headers:Pin_Header_Straight_2x03,1,TE Connectivity / AMP, 826632-3,Mouser,571-826632-3
 J1,RPi_GPIO,Pin_Headers:Pin_Header_Straight_2x20,1,Harwin,M20-7832046,Mouser,855-M20-7832046
 R30;R29,100k,Resistors_SMD:R_0402,2,Vishay,CRCW0402100KFKED,Mouser,71-CRCW0402-100K-E3
-R15;R25,10k,Resistors_SMD:R_0402,2,Vishay,CRCW040210K0FKED,Mouser,71-CRCW0402-10K-E3
-R16;R17;R18;R19;R20;R21;R22;R24;R23;R13;R14;R11;R12,1k,Resistors_SMD:R_0402,13,Panasonic,ERJ-PA2D1001X,Mouser,667-ERJ-PA2D1001X
+R15;R25,10k,Resistors_SMD:R_0402,2,Vishay,CRCW040210K0JNEDC,Mouser,71-CRCW040210K0JNEDC
+R16;R17;R18;R19;R20;R21;R22;R24;R23;R13;R14;R11;R12,1k,Resistors_SMD:R_0402,13,Vishay,RCS04021K00JNED,Mouser,71-RCS04021K00JNED
 R2;R1,1k1,Resistors_SMD:R_0402,2,Susumu,RR0510P-112-D,Mouser,754-RR0510P-112D
 R28,1k5,Resistors_SMD:R_0402,1,Panasonic,ERA-2AED152X,Mouser,667-ERA-2AED152X
 R10;R9,270,Resistors_SMD:R_0402,2,Panasonic,ERA-2AEB271X,Mouser,667-ERA-2AEB271X
@@ -47,4 +47,4 @@ R27;R26,27R,Resistors_SMD:R_0402,2,Susumu,RR0510R-270-D,Mouser,754-RR0510R-270D
 R4;R3,3k8,Resistors_SMD:R_0402,2,Susumu,RR0510P-3831-D,Mouser,754-RR0510P-3831D
 R6;R5,3r9,Resistors_SMD:R_0402,2,Vishay,CRCW04023R90JNED,Mouser,71-CRCW0402J-3.9-E3
 R8;R7,560,Resistors_SMD:R_0402,2,Panasonic,ERA-2AEB561X,Mouser,667-ERA-2AEB561X
-U4,LD1117S33TR,TO_SOT_Packages_SMD:SOT-223-3_TabPin2,1,STMicroelectronics,LD1117S33TR,Mouser,511-LD1117S33
+U4,LD1117S33TR,TO_SOT_Packages_SMD:SOT-223-3_TabPin2,1,Microchip Technology,TC2117-3.3VDBTR,Mouser,579-TC2117-3.3VDBTR
diff --git a/BOM.xlsx b/BOM.xlsx
index c4b263c..ea53cc5 100644
Binary files a/BOM.xlsx and b/BOM.xlsx differ
diff --git a/Power.sch b/Power.sch
index 514a282..5147b04 100644
--- a/Power.sch
+++ b/Power.sch
@@ -21,11 +21,11 @@ P 900 850
 F 0 "R15" V 980 850 50 0000 C CNN
 F 1 "10k" V 900 850 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 830 850 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/dcrcwe3-109170.pdf" H 900 850 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/crcwce3-1223726.pdf" H 900 850 50 0001 C CNN
 F 4 "Vishay" H -3900 -1350 50 0001 C CNN "MFR"
-F 5 "CRCW040210K0FKED" H -3900 -1350 50 0001 C CNN "MPN"
+F 5 "CRCW040210K0JNEDC" H -3900 -1350 50 0001 C CNN "MPN"
 F 6 "Mouser" H -3900 -1350 50 0001 C CNN "SPR"
-F 7 "71-CRCW0402-10K-E3" H -3900 -1350 50 0001 C CNN "SPN"
+F 7 "71-CRCW040210K0JNEDC" H -3900 -1350 50 0001 C CNN "SPN"
 F 8 "" H -3900 -1350 50 0001 C CNN "SPURL"
 	1    900  850 
 	0    1    1    0   
@@ -37,7 +37,7 @@ P 1400 1100
 F 0 "C43" H 1425 1200 50 0000 L CNN
 F 1 "100n" H 1425 1000 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 1438 950 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 1400 1100 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 1400 1100 50 0001 C CNN
 F 4 "Vishay / Vitramon" H -3900 -1350 50 0001 C CNN "MFR"
 F 5 "VJ0402V104ZXJCW1BC" H -3900 -1350 50 0001 C CNN "MPN"
 F 6 "Mouser" H -3900 -1350 50 0001 C CNN "SPR"
@@ -91,7 +91,7 @@ P 2050 1050
 F 0 "C44" H 2075 1150 50 0000 L CNN
 F 1 "100n" H 2075 950 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 2088 900 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2050 1050 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2050 1050 50 0001 C CNN
 F 4 "Vishay / Vitramon" H -7750 -2300 50 0001 C CNN "MFR"
 F 5 "VJ0402V104ZXJCW1BC" H -7750 -2300 50 0001 C CNN "MPN"
 F 6 "Mouser" H -7750 -2300 50 0001 C CNN "SPR"
@@ -107,7 +107,7 @@ P 2300 1050
 F 0 "C45" H 2325 1150 50 0000 L CNN
 F 1 "100n" H 2325 950 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 2338 900 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2300 1050 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2300 1050 50 0001 C CNN
 F 4 "Vishay / Vitramon" H -7750 -2300 50 0001 C CNN "MFR"
 F 5 "VJ0402V104ZXJCW1BC" H -7750 -2300 50 0001 C CNN "MPN"
 F 6 "Mouser" H -7750 -2300 50 0001 C CNN "SPR"
@@ -123,7 +123,7 @@ P 2550 1050
 F 0 "C46" H 2575 1150 50 0000 L CNN
 F 1 "100n" H 2575 950 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 2588 900 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2550 1050 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2550 1050 50 0001 C CNN
 F 4 "Vishay / Vitramon" H -7750 -2300 50 0001 C CNN "MFR"
 F 5 "VJ0402V104ZXJCW1BC" H -7750 -2300 50 0001 C CNN "MPN"
 F 6 "Mouser" H -7750 -2300 50 0001 C CNN "SPR"
@@ -161,11 +161,11 @@ P 5350 4050
 F 0 "R25" V 5430 4050 50 0000 C CNN
 F 1 "10k" V 5350 4050 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 5280 4050 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/dcrcwe3-109170.pdf" H 5350 4050 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/crcwce3-1223726.pdf" H 5350 4050 50 0001 C CNN
 F 4 "Vishay" H 3200 200 50 0001 C CNN "MFR"
-F 5 "CRCW040210K0FKED" H 3200 200 50 0001 C CNN "MPN"
+F 5 "CRCW040210K0JNEDC" H 3200 200 50 0001 C CNN "MPN"
 F 6 "Mouser" H 3200 200 50 0001 C CNN "SPR"
-F 7 "71-CRCW0402-10K-E3" H 3200 200 50 0001 C CNN "SPN"
+F 7 "71-CRCW040210K0JNEDC" H 3200 200 50 0001 C CNN "SPN"
 F 8 "" H 3200 200 50 0001 C CNN "SPURL"
 	1    5350 4050
 	0    1    -1   0   
@@ -193,11 +193,11 @@ P 2050 2700
 F 0 "D2" H 2050 2800 50 0000 C CNN
 F 1 "yellow" H 2050 2600 50 0000 C CNN
 F 2 "LEDs:LED_0402" H 2050 2700 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/216/APG1005SYC-T-315808.pdf" H 2050 2700 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/216/APHHS1005SYCK-76875.pdf" H 2050 2700 50 0001 C CNN
 F 4 "Kingbright" H -8400 -2000 50 0001 C CNN "MFR"
-F 5 "APG1005SYC-T" H -8400 -2000 50 0001 C CNN "MPN"
+F 5 "APHHS1005SYCK" H -8400 -2000 50 0001 C CNN "MPN"
 F 6 "Mouser" H -8400 -2000 50 0001 C CNN "SPR"
-F 7 "604-APG1005SYCT" H -8400 -2000 50 0001 C CNN "SPN"
+F 7 "604-APHHS1005SYCK" H -8400 -2000 50 0001 C CNN "SPN"
 F 8 "" H 0 0 50 0001 C CNN "SPURL"
 	1    2050 2700
 	-1   0    0    1   
@@ -225,11 +225,11 @@ P 2050 3300
 F 0 "D4" H 2050 3400 50 0000 C CNN
 F 1 "yellow" H 2050 3200 50 0000 C CNN
 F 2 "LEDs:LED_0402" H 2050 3300 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/216/APG1005SYC-T-315808.pdf" H 2050 3300 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/216/APHHS1005SYCK-76875.pdf" H 2050 3300 50 0001 C CNN
 F 4 "Kingbright" H -8400 -2000 50 0001 C CNN "MFR"
-F 5 "APG1005SYC-T" H -8400 -2000 50 0001 C CNN "MPN"
+F 5 "APHHS1005SYCK" H -8400 -2000 50 0001 C CNN "MPN"
 F 6 "Mouser" H -8400 -2000 50 0001 C CNN "SPR"
-F 7 "604-APG1005SYCT" H -8400 -2000 50 0001 C CNN "SPN"
+F 7 "604-APHHS1005SYCK" H -8400 -2000 50 0001 C CNN "SPN"
 F 8 "" H 0 0 50 0001 C CNN "SPURL"
 	1    2050 3300
 	-1   0    0    1   
@@ -257,11 +257,11 @@ P 2050 3900
 F 0 "D6" H 2050 4000 50 0000 C CNN
 F 1 "amber" H 2050 3800 50 0000 C CNN
 F 2 "LEDs:LED_0402" H 2050 3900 50 0001 C CNN
-F 3 "https://www.mouser.de/kingbright-minikin-air-leds" H 2050 3900 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/216/APHHS1005SECK-36485.pdf" H 2050 3900 50 0001 C CNN
 F 4 "Kingbright" H -8400 -2000 50 0001 C CNN "MFR"
-F 5 "APG1005SEC-T" H -8400 -2000 50 0001 C CNN "MPN"
+F 5 "APHHS1005SECK" H -8400 -2000 50 0001 C CNN "MPN"
 F 6 "Mouser" H -8400 -2000 50 0001 C CNN "SPR"
-F 7 "604-APG1005SECT" H -8400 -2000 50 0001 C CNN "SPN"
+F 7 "604-APHHS1005SECK" H -8400 -2000 50 0001 C CNN "SPN"
 F 8 "" H 0 0 50 0001 C CNN "SPURL"
 	1    2050 3900
 	-1   0    0    1   
@@ -289,11 +289,11 @@ P 1650 2400
 F 0 "R16" V 1730 2400 50 0000 C CNN
 F 1 "1k" V 1650 2400 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 1580 2400 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/315/AOA0000C291-1101061.pdf" H 1650 2400 50 0001 C CNN
-F 4 "Panasonic" H -9200 -2000 50 0001 C CNN "MFR"
-F 5 "ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "MPN"
+F 3 "https://www.mouser.com/ds/2/427/rcse3-1013761.pdf" H 1650 2400 50 0001 C CNN
+F 4 "Vishay" H -9200 -2000 50 0001 C CNN "MFR"
+F 5 "RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "MPN"
 F 6 "Mouser" H -9200 -2000 50 0001 C CNN "SPR"
-F 7 "667-ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "SPN"
+F 7 "71-RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "SPN"
 F 8 "" H -8800 -2000 50 0001 C CNN "SPURL"
 	1    1650 2400
 	0    1    1    0   
@@ -305,11 +305,11 @@ P 1650 2700
 F 0 "R17" V 1730 2700 50 0000 C CNN
 F 1 "1k" V 1650 2700 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 1580 2700 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/315/AOA0000C291-1101061.pdf" H 1650 2700 50 0001 C CNN
-F 4 "Panasonic" H -9200 -2000 50 0001 C CNN "MFR"
-F 5 "ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "MPN"
+F 3 "https://www.mouser.com/ds/2/427/rcse3-1013761.pdf" H 1650 2700 50 0001 C CNN
+F 4 "Vishay" H -9200 -2000 50 0001 C CNN "MFR"
+F 5 "RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "MPN"
 F 6 "Mouser" H -9200 -2000 50 0001 C CNN "SPR"
-F 7 "667-ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "SPN"
+F 7 "71-RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "SPN"
 F 8 "" H -8800 -2000 50 0001 C CNN "SPURL"
 	1    1650 2700
 	0    1    1    0   
@@ -321,11 +321,11 @@ P 1650 3000
 F 0 "R18" V 1730 3000 50 0000 C CNN
 F 1 "1k" V 1650 3000 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 1580 3000 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/315/AOA0000C291-1101061.pdf" H 1650 3000 50 0001 C CNN
-F 4 "Panasonic" H -9200 -2000 50 0001 C CNN "MFR"
-F 5 "ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "MPN"
+F 3 "https://www.mouser.com/ds/2/427/rcse3-1013761.pdf" H 1650 3000 50 0001 C CNN
+F 4 "Vishay" H -9200 -2000 50 0001 C CNN "MFR"
+F 5 "RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "MPN"
 F 6 "Mouser" H -9200 -2000 50 0001 C CNN "SPR"
-F 7 "667-ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "SPN"
+F 7 "71-RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "SPN"
 F 8 "" H -8800 -2000 50 0001 C CNN "SPURL"
 	1    1650 3000
 	0    1    1    0   
@@ -337,11 +337,11 @@ P 1650 3300
 F 0 "R19" V 1730 3300 50 0000 C CNN
 F 1 "1k" V 1650 3300 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 1580 3300 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/315/AOA0000C291-1101061.pdf" H 1650 3300 50 0001 C CNN
-F 4 "Panasonic" H -9200 -2000 50 0001 C CNN "MFR"
-F 5 "ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "MPN"
+F 3 "https://www.mouser.com/ds/2/427/rcse3-1013761.pdf" H 1650 3300 50 0001 C CNN
+F 4 "Vishay" H -9200 -2000 50 0001 C CNN "MFR"
+F 5 "RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "MPN"
 F 6 "Mouser" H -9200 -2000 50 0001 C CNN "SPR"
-F 7 "667-ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "SPN"
+F 7 "71-RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "SPN"
 F 8 "" H -8800 -2000 50 0001 C CNN "SPURL"
 	1    1650 3300
 	0    1    1    0   
@@ -353,11 +353,11 @@ P 1650 3600
 F 0 "R20" V 1730 3600 50 0000 C CNN
 F 1 "1k" V 1650 3600 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 1580 3600 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/315/AOA0000C291-1101061.pdf" H 1650 3600 50 0001 C CNN
-F 4 "Panasonic" H -9200 -2000 50 0001 C CNN "MFR"
-F 5 "ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "MPN"
+F 3 "https://www.mouser.com/ds/2/427/rcse3-1013761.pdf" H 1650 3600 50 0001 C CNN
+F 4 "Vishay" H -9200 -2000 50 0001 C CNN "MFR"
+F 5 "RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "MPN"
 F 6 "Mouser" H -9200 -2000 50 0001 C CNN "SPR"
-F 7 "667-ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "SPN"
+F 7 "71-RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "SPN"
 F 8 "" H -8800 -2000 50 0001 C CNN "SPURL"
 	1    1650 3600
 	0    1    1    0   
@@ -369,11 +369,11 @@ P 1650 3900
 F 0 "R21" V 1730 3900 50 0000 C CNN
 F 1 "1k" V 1650 3900 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 1580 3900 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/315/AOA0000C291-1101061.pdf" H 1650 3900 50 0001 C CNN
-F 4 "Panasonic" H -9200 -2000 50 0001 C CNN "MFR"
-F 5 "ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "MPN"
+F 3 "https://www.mouser.com/ds/2/427/rcse3-1013761.pdf" H 1650 3900 50 0001 C CNN
+F 4 "Vishay" H -9200 -2000 50 0001 C CNN "MFR"
+F 5 "RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "MPN"
 F 6 "Mouser" H -9200 -2000 50 0001 C CNN "SPR"
-F 7 "667-ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "SPN"
+F 7 "71-RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "SPN"
 F 8 "" H -8800 -2000 50 0001 C CNN "SPURL"
 	1    1650 3900
 	0    1    1    0   
@@ -385,11 +385,11 @@ P 1650 4200
 F 0 "R22" V 1730 4200 50 0000 C CNN
 F 1 "1k" V 1650 4200 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 1580 4200 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/315/AOA0000C291-1101061.pdf" H 1650 4200 50 0001 C CNN
-F 4 "Panasonic" H -9200 -2000 50 0001 C CNN "MFR"
-F 5 "ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "MPN"
+F 3 "https://www.mouser.com/ds/2/427/rcse3-1013761.pdf" H 1650 4200 50 0001 C CNN
+F 4 "Vishay" H -9200 -2000 50 0001 C CNN "MFR"
+F 5 "RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "MPN"
 F 6 "Mouser" H -9200 -2000 50 0001 C CNN "SPR"
-F 7 "667-ERJ-PA2D1001X" H -9200 -2000 50 0001 C CNN "SPN"
+F 7 "71-RCS04021K00JNED" H -9200 -2000 50 0001 C CNN "SPN"
 F 8 "" H 0 0 50 0001 C CNN "SPURL"
 	1    1650 4200
 	0    1    1    0   
@@ -483,11 +483,11 @@ P 2050 2000
 F 0 "R24" V 2130 2000 50 0000 C CNN
 F 1 "1k" V 2050 2000 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 1980 2000 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/315/AOA0000C291-1101061.pdf" H 2050 2000 50 0001 C CNN
-F 4 "Panasonic" H -8800 -2400 50 0001 C CNN "MFR"
-F 5 "ERJ-PA2D1001X" H -8800 -2400 50 0001 C CNN "MPN"
+F 3 "https://www.mouser.com/ds/2/427/rcse3-1013761.pdf" H 2050 2000 50 0001 C CNN
+F 4 "Vishay" H -8800 -2400 50 0001 C CNN "MFR"
+F 5 "RCS04021K00JNED" H -8800 -2400 50 0001 C CNN "MPN"
 F 6 "Mouser" H -8800 -2400 50 0001 C CNN "SPR"
-F 7 "667-ERJ-PA2D1001X" H -8800 -2400 50 0001 C CNN "SPN"
+F 7 "71-RCS04021K00JNED" H -8800 -2400 50 0001 C CNN "SPN"
 F 8 "" H -8800 -2000 50 0001 C CNN "SPURL"
 	1    2050 2000
 	0    1    1    0   
@@ -537,11 +537,11 @@ P 2050 4500
 F 0 "D8" H 2050 4600 50 0000 C CNN
 F 1 "blue" H 2050 4400 50 0000 C CNN
 F 2 "LEDs:LED_0402" H 2050 4500 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/216/APHHS1005SURCK-32322.pdf" H 2050 4500 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/216/APHHS1005QBC-D-54846.pdf" H 2050 4500 50 0001 C CNN
 F 4 "Kingbright" H -8400 -1700 50 0001 C CNN "MFR"
-F 5 "APHHS1005SURCK" H -8400 -1700 50 0001 C CNN "MPN"
+F 5 " APHHS1005QBC/D" H -8400 -1700 50 0001 C CNN "MPN"
 F 6 "Mouser" H -8400 -1700 50 0001 C CNN "SPR"
-F 7 "604-APHHS1005SURCK" H -8400 -1700 50 0001 C CNN "SPN"
+F 7 "604-APHHS1005QBCD" H -8400 -1700 50 0001 C CNN "SPN"
 F 8 "" H 0 0 50 0001 C CNN "SPURL"
 	1    2050 4500
 	-1   0    0    1   
@@ -553,11 +553,11 @@ P 1650 4500
 F 0 "R23" V 1730 4500 50 0000 C CNN
 F 1 "1k" V 1650 4500 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 1580 4500 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/315/AOA0000C291-1101061.pdf" H 1650 4500 50 0001 C CNN
-F 4 "Panasonic" H -9200 -1700 50 0001 C CNN "MFR"
-F 5 "ERJ-PA2D1001X" H -9200 -1700 50 0001 C CNN "MPN"
+F 3 "https://www.mouser.com/ds/2/427/rcse3-1013761.pdf" H 1650 4500 50 0001 C CNN
+F 4 "Vishay" H -9200 -1700 50 0001 C CNN "MFR"
+F 5 "RCS04021K00JNED" H -9200 -1700 50 0001 C CNN "MPN"
 F 6 "Mouser" H -9200 -1700 50 0001 C CNN "SPR"
-F 7 "667-ERJ-PA2D1001X" H -9200 -1700 50 0001 C CNN "SPN"
+F 7 "71-RCS04021K00JNED" H -9200 -1700 50 0001 C CNN "SPN"
 F 8 "" H -8800 -1700 50 0001 C CNN "SPURL"
 	1    1650 4500
 	0    1    1    0   
@@ -823,7 +823,7 @@ P 9600 3200
 F 0 "C50" H 9625 3300 50 0000 L CNN
 F 1 "100n" H 9625 3100 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 9638 3050 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 9600 3200 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 9600 3200 50 0001 C CNN
 F 4 "Vishay / Vitramon" H 8800 -850 50 0001 C CNN "MFR"
 F 5 "VJ0402V104ZXJCW1BC" H 8800 -850 50 0001 C CNN "MPN"
 F 6 "Mouser" H 8800 -850 50 0001 C CNN "SPR"
@@ -877,11 +877,11 @@ P 10100 3200
 F 0 "C51" H 10125 3300 50 0000 L CNN
 F 1 "10u/10V" H 10125 3100 50 0000 L CNN
 F 2 "Capacitors_Tantalum_SMD:CP_Tantalum_Case-A_EIA-3216-18_Reflow" H 10138 3050 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/40/f93-776559.pdf" H 10100 3200 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/40/TPS_AUTO-845414.pdf" H 10100 3200 50 0001 C CNN
 F 4 "AVX" H 8800 -850 50 0001 C CNN "MFR"
-F 5 "F931A106KAA" H 8800 -850 50 0001 C CNN "MPN"
+F 5 "TPSA106K010T0900" H 8800 -850 50 0001 C CNN "MPN"
 F 6 "Mouser" H 8800 -850 50 0001 C CNN "SPR"
-F 7 "647-F931A106KAA" H 8800 -850 50 0001 C CNN "SPN"
+F 7 "581-TPSA106K010T0900" H 8800 -850 50 0001 C CNN "SPN"
 F 8 "" H 0 0 50 0001 C CNN "SPURL"
 	1    10100 3200
 	1    0    0    -1  
@@ -904,11 +904,11 @@ P 10600 3200
 F 0 "C52" H 10625 3300 50 0000 L CNN
 F 1 "10u" H 10625 3100 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 10638 3050 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/281/c02e-2905.pdf" H 10600 3200 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/281/Murata%20GJM%20Series-1186094.pdf" H 10600 3200 50 0001 C CNN
 F 4 "Murata Electronics" H 8800 -850 50 0001 C CNN "MFR"
-F 5 "GRJ155R60J106ME11D" H 8800 -850 50 0001 C CNN "MPN"
+F 5 "GRM155C80J106ME11J" H 8800 -850 50 0001 C CNN "MPN"
 F 6 "Mouser" H 8800 -850 50 0001 C CNN "SPR"
-F 7 "81-GRJ155R60J106ME1D" H 8800 -850 50 0001 C CNN "SPN"
+F 7 "81-GRM155C80J106ME1J" H 8800 -850 50 0001 C CNN "SPN"
 F 8 "" H 8800 -850 50 0001 C CNN "SPURL"
 	1    10600 3200
 	1    0    0    -1  
@@ -931,11 +931,11 @@ P 9050 3000
 F 0 "U4" H 9050 3250 50 0000 C CNN
 F 1 "LD1117S33TR" H 9050 3200 50 0000 C CNN
 F 2 "TO_SOT_Packages_SMD:SOT-223-3_TabPin2" H 9050 3100 50 0001 C CNN
-F 3 "https://www.mouser.com/ds/2/389/ld1117-974075.pdf" H 9050 3000 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/268/21665b-63633.pdf" H 9050 3000 50 0001 C CNN
 F 4 "Mouser" H 9050 3000 60 0001 C CNN "SPR"
-F 5 "STMicroelectronics" H 0 0 50 0001 C CNN "MFR"
-F 6 "LD1117S33TR" H 0 0 50 0001 C CNN "MPN"
-F 7 "511-LD1117S33" H 0 0 50 0001 C CNN "SPN"
+F 5 "Microchip Technology" H 0 0 50 0001 C CNN "MFR"
+F 6 "TC2117-3.3VDBTR" H 0 0 50 0001 C CNN "MPN"
+F 7 "579-TC2117-3.3VDBTR" H 0 0 50 0001 C CNN "SPN"
 F 8 "" H 0 0 50 0001 C CNN "SPURL"
 	1    9050 3000
 	1    0    0    -1  
diff --git a/README.md b/README.md
index 85faf20..afdc390 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,4 @@
 Duplex variant of MMDVM_HS_Hat beta
 DB9MAT DF2ET DO7EN
 
+Mouser cart for rev0.1 is [here](https://www.mouser.com/ProjectManager/ProjectDetail.aspx?AccessID=d7670cc8a6).
diff --git a/mmdvm_hs_dual_hat.sch b/mmdvm_hs_dual_hat.sch
index 6dc035a..a330b32 100644
--- a/mmdvm_hs_dual_hat.sch
+++ b/mmdvm_hs_dual_hat.sch
@@ -33,11 +33,11 @@ P 5400 6050
 F 0 "R13" V 5350 5850 50 0000 C CNN
 F 1 "1k" V 5400 6050 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 5330 6050 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/315/AOA0000C291-1101061.pdf" H 5400 6050 50 0001 C CNN
-F 4 "Panasonic" H -850 150 50 0001 C CNN "MFR"
-F 5 "ERJ-PA2D1001X" H -850 150 50 0001 C CNN "MPN"
+F 3 "https://www.mouser.com/ds/2/427/rcse3-1013761.pdf" H 5400 6050 50 0001 C CNN
+F 4 "Vishay" H -850 150 50 0001 C CNN "MFR"
+F 5 "RCS04021K00JNED" H -850 150 50 0001 C CNN "MPN"
 F 6 "Mouser" H -850 150 50 0001 C CNN "SPR"
-F 7 "667-ERJ-PA2D1001X" H -850 150 50 0001 C CNN "SPN"
+F 7 "71-RCS04021K00JNED" H -850 150 50 0001 C CNN "SPN"
 F 8 "" H -850 150 50 0001 C CNN "SPURL"
 	1    5400 6050
 	0    1    1    0   
@@ -49,11 +49,11 @@ P 5400 6150
 F 0 "R14" V 5350 5950 50 0000 C CNN
 F 1 "1k" V 5400 6150 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 5330 6150 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/315/AOA0000C291-1101061.pdf" H 5400 6150 50 0001 C CNN
-F 4 "Panasonic" H -850 150 50 0001 C CNN "MFR"
-F 5 "ERJ-PA2D1001X" H -850 150 50 0001 C CNN "MPN"
+F 3 "https://www.mouser.com/ds/2/427/rcse3-1013761.pdf" H 5400 6150 50 0001 C CNN
+F 4 "Vishay" H -850 150 50 0001 C CNN "MFR"
+F 5 "RCS04021K00JNED" H -850 150 50 0001 C CNN "MPN"
 F 6 "Mouser" H -850 150 50 0001 C CNN "SPR"
-F 7 "667-ERJ-PA2D1001X" H -850 150 50 0001 C CNN "SPN"
+F 7 "71-RCS04021K00JNED" H -850 150 50 0001 C CNN "SPN"
 F 8 "" H -850 150 50 0001 C CNN "SPURL"
 	1    5400 6150
 	0    1    1    0   
@@ -87,7 +87,7 @@ P 5400 6450
 F 0 "C36" H 5425 6550 50 0000 L CNN
 F 1 "100n" V 5550 6350 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 5438 6300 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 5400 6450 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 5400 6450 50 0001 C CNN
 F 4 "Vishay / Vitramon" H -850 150 50 0001 C CNN "MFR"
 F 5 "VJ0402V104ZXJCW1BC" H -850 150 50 0001 C CNN "MPN"
 F 6 "Mouser" H -850 150 50 0001 C CNN "SPR"
@@ -163,7 +163,7 @@ P 2700 7250
 F 0 "C20" H 2725 7350 50 0000 L CNN
 F 1 "100n" H 2725 7150 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 2738 7100 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2700 7250 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2700 7250 50 0001 C CNN
 F 4 "Vishay / Vitramon" H -750 200 50 0001 C CNN "MFR"
 F 5 "VJ0402V104ZXJCW1BC" H -750 200 50 0001 C CNN "MPN"
 F 6 "Mouser" H -750 200 50 0001 C CNN "SPR"
@@ -529,7 +529,7 @@ P 2200 5300
 F 0 "C14" H 2225 5400 50 0000 L CNN
 F 1 "100n" H 2225 5200 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 2238 5150 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2200 5300 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2200 5300 50 0001 C CNN
 F 4 "Vishay / Vitramon" H -800 500 50 0001 C CNN "MFR"
 F 5 "VJ0402V104ZXJCW1BC" H -800 500 50 0001 C CNN "MPN"
 F 6 "Mouser" H -800 500 50 0001 C CNN "SPR"
@@ -615,11 +615,11 @@ P 3150 4850
 F 0 "C22" H 3175 4950 50 0000 L CNN
 F 1 "470p" H 3175 4750 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 3188 4700 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/281/c02e-2905.pdf" H 3150 4850 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/281/c03e-516224.pdf" H 3150 4850 50 0001 C CNN
 F 4 "Murata Electronics" H -1150 650 50 0001 C CNN "MFR"
-F 5 "GRM155R71H471KA01D" H -1150 650 50 0001 C CNN "MPN"
+F 5 "GCG1555G1H471JA01D" H -1150 650 50 0001 C CNN "MPN"
 F 6 "Mouser" H -1150 650 50 0001 C CNN "SPR"
-F 7 "81-GRM36X471K50" H -1150 650 50 0001 C CNN "SPN"
+F 7 "81-GCG1555G1H471JA1D" H -1150 650 50 0001 C CNN "SPN"
 F 8 "" H -1150 650 50 0001 C CNN "SPURL"
 	1    3150 4850
 	1    0    0    -1  
@@ -631,11 +631,11 @@ P 3350 4850
 F 0 "C26" H 3375 4950 50 0000 L CNN
 F 1 "15n" H 3375 4750 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 3388 4700 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/281/c02e-2905.pdf" H 3350 4850 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/281/c02e-2905.pdf" H 3350 4850 50 0001 C CNN
 F 4 "Murata Electronics" H -1150 650 50 0001 C CNN "MFR"
-F 5 "GRM155R71C153KA01D" H -1150 650 50 0001 C CNN "MPN"
+F 5 "GRM155R71C153KA01J" H -1150 650 50 0001 C CNN "MPN"
 F 6 "Mouser" H -1150 650 50 0001 C CNN "SPR"
-F 7 "81-GRM155R71C153KA1D" H -1150 650 50 0001 C CNN "SPN"
+F 7 "81-GRM155R71C153KA1J" H -1150 650 50 0001 C CNN "SPN"
 F 8 "" H -1150 650 50 0001 C CNN "SPURL"
 	1    3350 4850
 	1    0    0    -1  
@@ -690,7 +690,7 @@ P 4250 5100
 F 0 "C30" V 4300 5150 50 0000 L CNN
 F 1 "100n" V 4300 4850 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 4288 4950 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 4250 5100 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 4250 5100 50 0001 C CNN
 F 4 "Vishay / Vitramon" H -850 150 50 0001 C CNN "MFR"
 F 5 "VJ0402V104ZXJCW1BC" H -850 150 50 0001 C CNN "MPN"
 F 6 "Mouser" H -850 150 50 0001 C CNN "SPR"
@@ -841,11 +841,11 @@ P 5450 2250
 F 0 "R11" V 5400 2050 50 0000 C CNN
 F 1 "1k" V 5450 2250 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 5380 2250 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/315/AOA0000C291-1101061.pdf" H 5450 2250 50 0001 C CNN
-F 4 "Panasonic" H -800 -3650 50 0001 C CNN "MFR"
-F 5 "ERJ-PA2D1001X" H -800 -3650 50 0001 C CNN "MPN"
+F 3 "https://www.mouser.com/ds/2/427/rcse3-1013761.pdf" H 5450 2250 50 0001 C CNN
+F 4 "Vishay" H -800 -3650 50 0001 C CNN "MFR"
+F 5 "RCS04021K00JNED" H -800 -3650 50 0001 C CNN "MPN"
 F 6 "Mouser" H -800 -3650 50 0001 C CNN "SPR"
-F 7 "667-ERJ-PA2D1001X" H -800 -3650 50 0001 C CNN "SPN"
+F 7 "71-RCS04021K00JNED" H -800 -3650 50 0001 C CNN "SPN"
 F 8 "" H -800 -3650 50 0001 C CNN "SPURL"
 	1    5450 2250
 	0    1    1    0   
@@ -857,11 +857,11 @@ P 5450 2350
 F 0 "R12" V 5400 2150 50 0000 C CNN
 F 1 "1k" V 5450 2350 50 0000 C CNN
 F 2 "Resistors_SMD:R_0402" V 5380 2350 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/315/AOA0000C291-1101061.pdf" H 5450 2350 50 0001 C CNN
-F 4 "Panasonic" H -800 -3650 50 0001 C CNN "MFR"
-F 5 "ERJ-PA2D1001X" H -800 -3650 50 0001 C CNN "MPN"
+F 3 "https://www.mouser.com/ds/2/427/rcse3-1013761.pdf" H 5450 2350 50 0001 C CNN
+F 4 "Vishay" H -800 -3650 50 0001 C CNN "MFR"
+F 5 "RCS04021K00JNED" H -800 -3650 50 0001 C CNN "MPN"
 F 6 "Mouser" H -800 -3650 50 0001 C CNN "SPR"
-F 7 "667-ERJ-PA2D1001X" H -800 -3650 50 0001 C CNN "SPN"
+F 7 "71-RCS04021K00JNED" H -800 -3650 50 0001 C CNN "SPN"
 F 8 "" H -800 -3650 50 0001 C CNN "SPURL"
 	1    5450 2350
 	0    1    1    0   
@@ -895,7 +895,7 @@ P 5450 2650
 F 0 "C35" H 5475 2750 50 0000 L CNN
 F 1 "100n" V 5600 2550 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 5488 2500 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 5450 2650 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 5450 2650 50 0001 C CNN
 F 4 "Vishay / Vitramon" H -800 -3650 50 0001 C CNN "MFR"
 F 5 "VJ0402V104ZXJCW1BC" H -800 -3650 50 0001 C CNN "MPN"
 F 6 "Mouser" H -800 -3650 50 0001 C CNN "SPR"
@@ -971,7 +971,7 @@ P 2750 3450
 F 0 "C19" H 2775 3550 50 0000 L CNN
 F 1 "100n" H 2775 3350 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 2788 3300 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2750 3450 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2750 3450 50 0001 C CNN
 F 4 "Vishay / Vitramon" H -700 -3600 50 0001 C CNN "MFR"
 F 5 "VJ0402V104ZXJCW1BC" H -700 -3600 50 0001 C CNN "MPN"
 F 6 "Mouser" H -700 -3600 50 0001 C CNN "SPR"
@@ -1337,7 +1337,7 @@ P 2250 1500
 F 0 "C13" H 2275 1600 50 0000 L CNN
 F 1 "100n" H 2275 1400 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 2288 1350 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2250 1500 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 2250 1500 50 0001 C CNN
 F 4 "Vishay / Vitramon" H -750 -3300 50 0001 C CNN "MFR"
 F 5 "VJ0402V104ZXJCW1BC" H -750 -3300 50 0001 C CNN "MPN"
 F 6 "Mouser" H -750 -3300 50 0001 C CNN "SPR"
@@ -1423,11 +1423,11 @@ P 3200 1050
 F 0 "C21" H 3225 1150 50 0000 L CNN
 F 1 "470p" H 3225 950 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 3238 900 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/281/c02e-2905.pdf" H 3200 1050 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/281/c03e-516224.pdf" H 3200 1050 50 0001 C CNN
 F 4 "Murata Electronics" H -1100 -3150 50 0001 C CNN "MFR"
-F 5 "GRM155R71H471KA01D" H -1100 -3150 50 0001 C CNN "MPN"
+F 5 "GCG1555G1H471JA01D" H -1100 -3150 50 0001 C CNN "MPN"
 F 6 "Mouser" H -1100 -3150 50 0001 C CNN "SPR"
-F 7 "81-GRM36X471K50" H -1100 -3150 50 0001 C CNN "SPN"
+F 7 "81-GCG1555G1H471JA1D" H -1100 -3150 50 0001 C CNN "SPN"
 F 8 "" H -1100 -3150 50 0001 C CNN "SPURL"
 	1    3200 1050
 	1    0    0    -1  
@@ -1439,11 +1439,11 @@ P 3400 1050
 F 0 "C25" H 3425 1150 50 0000 L CNN
 F 1 "15n" H 3425 950 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 3438 900 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/281/c02e-2905.pdf" H 3400 1050 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/281/c02e-2905.pdf" H 3400 1050 50 0001 C CNN
 F 4 "Murata Electronics" H -1100 -3150 50 0001 C CNN "MFR"
-F 5 "GRM155R71C153KA01D" H -1100 -3150 50 0001 C CNN "MPN"
+F 5 "GRM155R71C153KA01J" H -1100 -3150 50 0001 C CNN "MPN"
 F 6 "Mouser" H -1100 -3150 50 0001 C CNN "SPR"
-F 7 "81-GRM155R71C153KA1D" H -1100 -3150 50 0001 C CNN "SPN"
+F 7 "81-GRM155R71C153KA1J" H -1100 -3150 50 0001 C CNN "SPN"
 F 8 "" H -1100 -3150 50 0001 C CNN "SPURL"
 	1    3400 1050
 	1    0    0    -1  
@@ -1498,7 +1498,7 @@ P 4300 1300
 F 0 "C29" V 4350 1350 50 0000 L CNN
 F 1 "100n" V 4350 1050 50 0000 L CNN
 F 2 "Capacitors_SMD:C_0402" H 4338 1150 50 0001 C CNN
-F 3 "http://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 4300 1300 50 0001 C CNN
+F 3 "https://www.mouser.com/ds/2/427/vjw1bcbascomseries-223529.pdf" H 4300 1300 50 0001 C CNN
 F 4 "Vishay / Vitramon" H -800 -3650 50 0001 C CNN "MFR"
 F 5 "VJ0402V104ZXJCW1BC" H -800 -3650 50 0001 C CNN "MPN"
 F 6 "Mouser" H -800 -3650 50 0001 C CNN "SPR"
diff --git a/mmdvm_hs_dual_hat.xml b/mmdvm_hs_dual_hat.xml
index 6d5eafe..e216de4 100644
--- a/mmdvm_hs_dual_hat.xml
+++ b/mmdvm_hs_dual_hat.xml
@@ -2,8 +2,8 @@
 <export version="D">
   <design>
     <source>/opt/MMDVM_HS_Dual_Hat/mmdvm_hs_dual_hat.sch</source>
-    <date>Wed 14 Feb 2018 04:03:50 PM CET</date>
-    <tool>Eeschema no-vcs-found-ac9fc94~61~ubuntu17.10.1</tool>
+    <date>Thu 15 Feb 2018 04:56:53 PM CET</date>
+    <tool>Eeschema no-vcs-found-104b606~61~ubuntu17.10.1</tool>
     <sheet number="1" name="/" tstamps="/">
       <title_block>
         <title>MMDVM_HS_Dual_Hat</title>
@@ -1616,12 +1616,12 @@
     <comp ref="R30">
       <value>100k</value>
       <footprint>Resistors_SMD:R_0402</footprint>
-      <datasheet>https://www.mouser.com/ds/2/392/susumu_RR_Data_Sheet-1206438.pdf</datasheet>
+      <datasheet>https://www.mouser.com/ds/2/427/dcrcwe3-109170.pdf</datasheet>
       <fields>
-        <field name="MFR">Susumu</field>
-        <field name="MPN">RR0510R-270-D</field>
+        <field name="MFR">Vishay</field>
+        <field name="MPN">CRCW0402100KFKED</field>
         <field name="SPR">Mouser</field>
-        <field name="SPN">754-RR0510R-270D</field>
+        <field name="SPN">71-CRCW0402-100K-E3</field>
       </fields>
       <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
@@ -1630,12 +1630,12 @@
     <comp ref="R29">
       <value>100k</value>
       <footprint>Resistors_SMD:R_0402</footprint>
-      <datasheet>https://www.mouser.com/ds/2/392/susumu_RR_Data_Sheet-1206438.pdf</datasheet>
+      <datasheet>https://www.mouser.com/ds/2/427/dcrcwe3-109170.pdf</datasheet>
       <fields>
-        <field name="MFR">Susumu</field>
-        <field name="MPN">RR0510R-270-D</field>
+        <field name="MFR">Vishay</field>
+        <field name="MPN">CRCW0402100KFKED</field>
         <field name="SPR">Mouser</field>
-        <field name="SPN">754-RR0510R-270D</field>
+        <field name="SPN">71-CRCW0402-100K-E3</field>
       </fields>
       <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
@@ -2067,9 +2067,9 @@
   </libraries>
   <nets>
     <net code="1" name="Net-(C28-Pad1)">
-      <node ref="C28" pin="1"/>
       <node ref="U1" pin="42"/>
       <node ref="R10" pin="1"/>
+      <node ref="C28" pin="1"/>
       <node ref="R8" pin="1"/>
     </net>
     <net code="2" name="Net-(C22-Pad1)">
@@ -2078,8 +2078,8 @@
       <node ref="U1" pin="1"/>
     </net>
     <net code="3" name="Net-(C6-Pad1)">
-      <node ref="C6" pin="1"/>
       <node ref="L7" pin="1"/>
+      <node ref="C6" pin="1"/>
       <node ref="U2" pin="4"/>
     </net>
     <net code="4" name="Net-(R4-Pad1)">
@@ -2091,27 +2091,27 @@
       <node ref="U1" pin="8"/>
     </net>
     <net code="6" name="Net-(C10-Pad1)">
+      <node ref="C10" pin="1"/>
       <node ref="L6" pin="2"/>
       <node ref="U1" pin="6"/>
-      <node ref="C10" pin="1"/>
     </net>
     <net code="7" name="Net-(C24-Pad1)">
       <node ref="U1" pin="48"/>
       <node ref="C24" pin="1"/>
     </net>
     <net code="8" name="Net-(C24-Pad2)">
-      <node ref="C24" pin="2"/>
-      <node ref="R6" pin="1"/>
       <node ref="U1" pin="2"/>
+      <node ref="R6" pin="1"/>
+      <node ref="C24" pin="2"/>
     </net>
     <net code="9" name="Net-(C14-Pad1)">
-      <node ref="C14" pin="1"/>
       <node ref="R6" pin="2"/>
+      <node ref="C14" pin="1"/>
     </net>
     <net code="10" name="Net-(C11-Pad1)">
       <node ref="C11" pin="1"/>
-      <node ref="U2" pin="7"/>
       <node ref="L5" pin="1"/>
+      <node ref="U2" pin="7"/>
     </net>
     <net code="11" name="Net-(C7-Pad1)">
       <node ref="L5" pin="2"/>
@@ -2119,9 +2119,9 @@
       <node ref="C7" pin="1"/>
     </net>
     <net code="12" name="Net-(C1-Pad1)">
+      <node ref="C1" pin="1"/>
       <node ref="L3" pin="1"/>
       <node ref="L1" pin="2"/>
-      <node ref="C1" pin="1"/>
     </net>
     <net code="13" name="Net-(C29-Pad2)">
       <node ref="U2" pin="41"/>
@@ -2136,257 +2136,234 @@
       <node ref="U3" pin="14"/>
     </net>
     <net code="16" name="Net-(C6-Pad2)">
-      <node ref="L3" pin="2"/>
-      <node ref="C6" pin="2"/>
       <node ref="C7" pin="2"/>
+      <node ref="C6" pin="2"/>
+      <node ref="L3" pin="2"/>
     </net>
     <net code="17" name="Net-(R11-Pad2)">
       <node ref="R11" pin="2"/>
       <node ref="U2" pin="35"/>
     </net>
     <net code="18" name="Net-(R12-Pad2)">
-      <node ref="U2" pin="34"/>
       <node ref="R12" pin="2"/>
+      <node ref="U2" pin="34"/>
     </net>
     <net code="19" name="SCLK">
       <node ref="U2" pin="28"/>
-      <node ref="U3" pin="41"/>
       <node ref="U1" pin="28"/>
+      <node ref="U3" pin="41"/>
     </net>
     <net code="20" name="SREAD">
-      <node ref="U2" pin="27"/>
       <node ref="U1" pin="27"/>
       <node ref="U3" pin="43"/>
+      <node ref="U2" pin="27"/>
     </net>
     <net code="21" name="SDATA">
-      <node ref="U2" pin="26"/>
-      <node ref="U1" pin="26"/>
       <node ref="U3" pin="42"/>
+      <node ref="U1" pin="26"/>
+      <node ref="U2" pin="26"/>
     </net>
     <net code="22" name="SLE2">
       <node ref="U2" pin="25"/>
       <node ref="U3" pin="16"/>
     </net>
     <net code="23" name="Net-(C20-Pad1)">
-      <node ref="C20" pin="1"/>
       <node ref="U1" pin="11"/>
+      <node ref="C20" pin="1"/>
     </net>
     <net code="24" name="Net-(C35-Pad2)">
-      <node ref="U2" pin="31"/>
       <node ref="C35" pin="2"/>
+      <node ref="U2" pin="31"/>
     </net>
     <net code="25" name="Net-(C9-Pad1)">
-      <node ref="L8" pin="1"/>
-      <node ref="C9" pin="1"/>
       <node ref="U1" pin="4"/>
+      <node ref="C9" pin="1"/>
+      <node ref="L8" pin="1"/>
     </net>
     <net code="26" name="DATA1">
-      <node ref="U3" pin="40"/>
       <node ref="R14" pin="1"/>
+      <node ref="U3" pin="40"/>
     </net>
     <net code="27" name="DCLK1">
-      <node ref="R13" pin="1"/>
       <node ref="U3" pin="39"/>
+      <node ref="R13" pin="1"/>
     </net>
     <net code="28" name="CE">
+      <node ref="U1" pin="24"/>
       <node ref="U3" pin="3"/>
       <node ref="U2" pin="24"/>
-      <node ref="U1" pin="24"/>
     </net>
     <net code="29" name="SLE1">
-      <node ref="U1" pin="25"/>
       <node ref="U3" pin="45"/>
+      <node ref="U1" pin="25"/>
     </net>
     <net code="30" name="Net-(C10-Pad2)">
-      <node ref="C10" pin="2"/>
       <node ref="C9" pin="2"/>
       <node ref="L4" pin="2"/>
+      <node ref="C10" pin="2"/>
     </net>
     <net code="31" name="Net-(X1-Pad1)">
       <node ref="X1" pin="1"/>
     </net>
     <net code="32" name="Net-(C34-Pad2)">
-      <node ref="X1" pin="3"/>
       <node ref="C34" pin="2"/>
+      <node ref="X1" pin="3"/>
     </net>
     <net code="33" name="Net-(R13-Pad2)">
-      <node ref="R13" pin="2"/>
       <node ref="U1" pin="35"/>
+      <node ref="R13" pin="2"/>
     </net>
     <net code="34" name="GND">
-      <node ref="C45" pin="2"/>
-      <node ref="J1" pin="25"/>
-      <node ref="J1" pin="30"/>
-      <node ref="C44" pin="2"/>
-      <node ref="J1" pin="34"/>
-      <node ref="U1" pin="47"/>
       <node ref="U1" pin="22"/>
-      <node ref="C13" pin="2"/>
-      <node ref="D1" pin="1"/>
-      <node ref="D2" pin="1"/>
-      <node ref="D3" pin="1"/>
       <node ref="C3" pin="2"/>
-      <node ref="C46" pin="2"/>
+      <node ref="J1" pin="14"/>
+      <node ref="C26" pin="2"/>
+      <node ref="J1" pin="20"/>
+      <node ref="J1" pin="6"/>
+      <node ref="J1" pin="9"/>
+      <node ref="C13" pin="2"/>
+      <node ref="J1" pin="39"/>
+      <node ref="C44" pin="2"/>
       <node ref="C39" pin="1"/>
       <node ref="U1" pin="5"/>
-      <node ref="D7" pin="1"/>
-      <node ref="U3" pin="35"/>
       <node ref="R2" pin="2"/>
       <node ref="C16" pin="2"/>
-      <node ref="D6" pin="1"/>
       <node ref="R4" pin="2"/>
       <node ref="C20" pin="2"/>
       <node ref="X2" pin="2"/>
-      <node ref="D5" pin="1"/>
+      <node ref="C30" pin="1"/>
+      <node ref="U1" pin="49"/>
+      <node ref="SW1" pin="2"/>
+      <node ref="C28" pin="2"/>
+      <node ref="U1" pin="45"/>
+      <node ref="J1" pin="34"/>
+      <node ref="J1" pin="30"/>
+      <node ref="J1" pin="25"/>
       <node ref="U1" pin="12"/>
+      <node ref="C45" pin="2"/>
       <node ref="U1" pin="29"/>
       <node ref="U1" pin="19"/>
-      <node ref="SW1" pin="2"/>
-      <node ref="C43" pin="2"/>
-      <node ref="U1" pin="45"/>
+      <node ref="D3" pin="1"/>
+      <node ref="D2" pin="1"/>
+      <node ref="U1" pin="47"/>
+      <node ref="D1" pin="1"/>
+      <node ref="C46" pin="2"/>
       <node ref="C36" pin="1"/>
-      <node ref="U2" pin="29"/>
-      <node ref="U2" pin="19"/>
-      <node ref="U2" pin="47"/>
-      <node ref="U2" pin="45"/>
-      <node ref="U2" pin="49"/>
-      <node ref="C19" pin="2"/>
-      <node ref="C38" pin="1"/>
-      <node ref="C35" pin="1"/>
-      <node ref="U2" pin="22"/>
       <node ref="U2" pin="12"/>
+      <node ref="U2" pin="22"/>
       <node ref="C11" pin="2"/>
-      <node ref="C31" pin="2"/>
-      <node ref="C27" pin="2"/>
-      <node ref="C25" pin="2"/>
-      <node ref="C21" pin="2"/>
-      <node ref="J1" pin="20"/>
-      <node ref="J1" pin="14"/>
+      <node ref="U2" pin="45"/>
+      <node ref="U2" pin="47"/>
+      <node ref="U2" pin="19"/>
+      <node ref="U2" pin="29"/>
+      <node ref="U2" pin="49"/>
       <node ref="P1" pin="2"/>
-      <node ref="C17" pin="2"/>
+      <node ref="C21" pin="2"/>
+      <node ref="C25" pin="2"/>
+      <node ref="C27" pin="2"/>
+      <node ref="C31" pin="2"/>
+      <node ref="C1" pin="2"/>
+      <node ref="C29" pin="1"/>
       <node ref="C5" pin="2"/>
-      <node ref="J1" pin="9"/>
-      <node ref="J1" pin="6"/>
-      <node ref="J1" pin="39"/>
+      <node ref="C17" pin="2"/>
       <node ref="U2" pin="5"/>
-      <node ref="R3" pin="2"/>
-      <node ref="C1" pin="2"/>
-      <node ref="R1" pin="2"/>
+      <node ref="C35" pin="1"/>
+      <node ref="C38" pin="1"/>
+      <node ref="C19" pin="2"/>
       <node ref="C15" pin="2"/>
-      <node ref="C29" pin="1"/>
+      <node ref="R1" pin="2"/>
+      <node ref="R3" pin="2"/>
       <node ref="C49" pin="1"/>
-      <node ref="D8" pin="1"/>
-      <node ref="P5" pin="2"/>
-      <node ref="C37" pin="2"/>
-      <node ref="P7" pin="6"/>
-      <node ref="P7" pin="5"/>
-      <node ref="C41" pin="2"/>
-      <node ref="C40" pin="2"/>
-      <node ref="U3" pin="8"/>
       <node ref="C50" pin="2"/>
       <node ref="P8" pin="6"/>
       <node ref="P8" pin="5"/>
-      <node ref="X1" pin="2"/>
       <node ref="C48" pin="1"/>
       <node ref="C47" pin="2"/>
-      <node ref="C2" pin="2"/>
+      <node ref="P7" pin="6"/>
+      <node ref="P7" pin="5"/>
+      <node ref="U3" pin="47"/>
+      <node ref="U3" pin="8"/>
+      <node ref="C37" pin="2"/>
+      <node ref="C40" pin="2"/>
+      <node ref="C41" pin="2"/>
+      <node ref="X1" pin="2"/>
       <node ref="C12" pin="2"/>
-      <node ref="C22" pin="2"/>
-      <node ref="C30" pin="1"/>
-      <node ref="U1" pin="49"/>
+      <node ref="C4" pin="2"/>
+      <node ref="C14" pin="2"/>
+      <node ref="D7" pin="1"/>
+      <node ref="C18" pin="2"/>
+      <node ref="D6" pin="1"/>
+      <node ref="C8" pin="2"/>
+      <node ref="U3" pin="35"/>
+      <node ref="D5" pin="1"/>
       <node ref="D4" pin="1"/>
-      <node ref="C28" pin="2"/>
-      <node ref="C26" pin="2"/>
-      <node ref="P3" pin="2"/>
+      <node ref="C22" pin="2"/>
       <node ref="C32" pin="2"/>
+      <node ref="C43" pin="2"/>
       <node ref="P2" pin="2"/>
-      <node ref="P4" pin="4"/>
       <node ref="C42" pin="2"/>
-      <node ref="C52" pin="2"/>
-      <node ref="C18" pin="2"/>
-      <node ref="U3" pin="47"/>
-      <node ref="C8" pin="2"/>
+      <node ref="C2" pin="2"/>
       <node ref="U3" pin="23"/>
-      <node ref="C51" pin="2"/>
-      <node ref="C14" pin="2"/>
-      <node ref="C4" pin="2"/>
       <node ref="U4" pin="1"/>
+      <node ref="P3" pin="2"/>
+      <node ref="C52" pin="2"/>
+      <node ref="C51" pin="2"/>
+      <node ref="P4" pin="4"/>
+      <node ref="D8" pin="1"/>
+      <node ref="P5" pin="2"/>
     </net>
-    <net code="35" name="Net-(C34-Pad1)">
-      <node ref="C34" pin="1"/>
-      <node ref="U1" pin="39"/>
-      <node ref="C53" pin="1"/>
-    </net>
-    <net code="36" name="Net-(C2-Pad1)">
-      <node ref="C2" pin="1"/>
+    <net code="35" name="Net-(C2-Pad1)">
       <node ref="L4" pin="1"/>
+      <node ref="C2" pin="1"/>
       <node ref="L2" pin="2"/>
     </net>
-    <net code="37" name="Net-(C30-Pad2)">
+    <net code="36" name="Net-(C30-Pad2)">
       <node ref="C30" pin="2"/>
       <node ref="U1" pin="41"/>
     </net>
-    <net code="38" name="Net-(R14-Pad2)">
-      <node ref="R14" pin="2"/>
+    <net code="37" name="Net-(R14-Pad2)">
       <node ref="U1" pin="34"/>
+      <node ref="R14" pin="2"/>
     </net>
-    <net code="39" name="Net-(C36-Pad2)">
+    <net code="38" name="Net-(C36-Pad2)">
       <node ref="C36" pin="2"/>
       <node ref="U1" pin="31"/>
     </net>
-    <net code="40" name="Net-(C19-Pad1)">
+    <net code="39" name="Net-(C19-Pad1)">
       <node ref="U2" pin="11"/>
       <node ref="C19" pin="1"/>
     </net>
-    <net code="41" name="Net-(C12-Pad1)">
-      <node ref="C12" pin="1"/>
+    <net code="40" name="Net-(C12-Pad1)">
       <node ref="L6" pin="1"/>
+      <node ref="C12" pin="1"/>
       <node ref="U1" pin="7"/>
     </net>
-    <net code="42" name="Net-(U1-Pad30)">
-      <node ref="U1" pin="30"/>
-    </net>
-    <net code="43" name="Net-(U1-Pad23)">
-      <node ref="U1" pin="23"/>
-    </net>
-    <net code="44" name="Net-(U1-Pad21)">
-      <node ref="U1" pin="21"/>
-    </net>
-    <net code="45" name="Net-(U1-Pad20)">
-      <node ref="U1" pin="20"/>
-    </net>
-    <net code="46" name="Net-(C33-Pad1)">
-      <node ref="C53" pin="2"/>
+    <net code="41" name="Net-(C33-Pad1)">
       <node ref="C33" pin="1"/>
+      <node ref="C53" pin="2"/>
       <node ref="X2" pin="3"/>
     </net>
-    <net code="47" name="Net-(U1-Pad18)">
-      <node ref="U1" pin="18"/>
-    </net>
-    <net code="48" name="+3V3">
+    <net code="42" name="+3V3">
+      <node ref="U3" pin="48"/>
+      <node ref="U3" pin="24"/>
+      <node ref="U3" pin="36"/>
+      <node ref="P5" pin="4"/>
+      <node ref="R24" pin="1"/>
+      <node ref="P7" pin="2"/>
+      <node ref="P7" pin="1"/>
+      <node ref="R15" pin="2"/>
       <node ref="C44" pin="1"/>
+      <node ref="R16" pin="2"/>
       <node ref="C45" pin="1"/>
       <node ref="C46" pin="1"/>
-      <node ref="C52" pin="1"/>
-      <node ref="U3" pin="1"/>
-      <node ref="C51" pin="1"/>
-      <node ref="U3" pin="36"/>
       <node ref="P3" pin="1"/>
-      <node ref="U3" pin="24"/>
-      <node ref="R16" pin="2"/>
-      <node ref="U3" pin="48"/>
-      <node ref="R15" pin="2"/>
       <node ref="L10" pin="2"/>
-      <node ref="R24" pin="1"/>
+      <node ref="C52" pin="1"/>
+      <node ref="C51" pin="1"/>
+      <node ref="U3" pin="1"/>
       <node ref="U3" pin="9"/>
-      <node ref="P7" pin="1"/>
-      <node ref="P5" pin="4"/>
-      <node ref="P7" pin="2"/>
-      <node ref="C31" pin="1"/>
-      <node ref="C38" pin="2"/>
-      <node ref="U2" pin="9"/>
-      <node ref="U2" pin="3"/>
-      <node ref="C15" pin="1"/>
+      <node ref="U1" pin="3"/>
+      <node ref="C16" pin="1"/>
       <node ref="C32" pin="1"/>
       <node ref="X2" pin="4"/>
       <node ref="C42" pin="1"/>
@@ -2394,8 +2371,9 @@
       <node ref="C4" pin="1"/>
       <node ref="C8" pin="1"/>
       <node ref="C18" pin="1"/>
-      <node ref="C16" pin="1"/>
-      <node ref="U1" pin="9"/>
+      <node ref="C39" pin="2"/>
+      <node ref="C15" pin="1"/>
+      <node ref="C31" pin="1"/>
       <node ref="C17" pin="1"/>
       <node ref="C5" pin="1"/>
       <node ref="L7" pin="2"/>
@@ -2403,116 +2381,138 @@
       <node ref="U1" pin="43"/>
       <node ref="U1" pin="32"/>
       <node ref="U1" pin="40"/>
-      <node ref="C39" pin="2"/>
-      <node ref="U1" pin="3"/>
-      <node ref="U2" pin="32"/>
-      <node ref="U2" pin="43"/>
+      <node ref="U1" pin="9"/>
       <node ref="C37" pin="1"/>
       <node ref="X1" pin="4"/>
+      <node ref="U2" pin="43"/>
       <node ref="U2" pin="40"/>
+      <node ref="C38" pin="2"/>
+      <node ref="U2" pin="32"/>
+      <node ref="U2" pin="3"/>
+      <node ref="U2" pin="9"/>
     </net>
-    <net code="49" name="Net-(U2-Pad46)">
+    <net code="43" name="Net-(U2-Pad14)">
+      <node ref="U2" pin="14"/>
+    </net>
+    <net code="44" name="Net-(U1-Pad33)">
+      <node ref="U1" pin="33"/>
+    </net>
+    <net code="45" name="Net-(X2-Pad1)">
+      <node ref="X2" pin="1"/>
+    </net>
+    <net code="46" name="Net-(U2-Pad30)">
+      <node ref="U2" pin="30"/>
+    </net>
+    <net code="47" name="Net-(U2-Pad23)">
+      <node ref="U2" pin="23"/>
+    </net>
+    <net code="48" name="Net-(U2-Pad21)">
+      <node ref="U2" pin="21"/>
+    </net>
+    <net code="49" name="Net-(U2-Pad20)">
+      <node ref="U2" pin="20"/>
+    </net>
+    <net code="50" name="Net-(U2-Pad18)">
+      <node ref="U2" pin="18"/>
+    </net>
+    <net code="51" name="Net-(U2-Pad17)">
+      <node ref="U2" pin="17"/>
+    </net>
+    <net code="52" name="Net-(U2-Pad16)">
+      <node ref="U2" pin="16"/>
+    </net>
+    <net code="53" name="Net-(U2-Pad15)">
+      <node ref="U2" pin="15"/>
+    </net>
+    <net code="54" name="Net-(U1-Pad37)">
+      <node ref="U1" pin="37"/>
+    </net>
+    <net code="55" name="Net-(U2-Pad13)">
+      <node ref="U2" pin="13"/>
+    </net>
+    <net code="56" name="Net-(U2-Pad46)">
       <node ref="U2" pin="46"/>
     </net>
-    <net code="50" name="Net-(U2-Pad44)">
+    <net code="57" name="Net-(U2-Pad44)">
       <node ref="U2" pin="44"/>
     </net>
-    <net code="51" name="Net-(U2-Pad38)">
+    <net code="58" name="Net-(U2-Pad38)">
       <node ref="U2" pin="38"/>
     </net>
-    <net code="52" name="Net-(U2-Pad37)">
+    <net code="59" name="Net-(U2-Pad37)">
       <node ref="U2" pin="37"/>
     </net>
-    <net code="53" name="Net-(U2-Pad33)">
+    <net code="60" name="Net-(U2-Pad33)">
       <node ref="U2" pin="33"/>
     </net>
-    <net code="54" name="Net-(U2-Pad36)">
+    <net code="61" name="Net-(U2-Pad36)">
       <node ref="U2" pin="36"/>
     </net>
-    <net code="55" name="Net-(U1-Pad36)">
+    <net code="62" name="Net-(U1-Pad36)">
       <node ref="U1" pin="36"/>
     </net>
-    <net code="56" name="Net-(U2-Pad13)">
-      <node ref="U2" pin="13"/>
+    <net code="63" name="Net-(U1-Pad20)">
+      <node ref="U1" pin="20"/>
     </net>
-    <net code="57" name="Net-(X2-Pad1)">
-      <node ref="X2" pin="1"/>
+    <net code="64" name="Net-(C34-Pad1)">
+      <node ref="C34" pin="1"/>
+      <node ref="U1" pin="39"/>
+      <node ref="C53" pin="1"/>
+    </net>
+    <net code="65" name="Net-(U1-Pad30)">
+      <node ref="U1" pin="30"/>
+    </net>
+    <net code="66" name="Net-(U1-Pad23)">
+      <node ref="U1" pin="23"/>
     </net>
-    <net code="58" name="Net-(U1-Pad17)">
+    <net code="67" name="Net-(U1-Pad21)">
+      <node ref="U1" pin="21"/>
+    </net>
+    <net code="68" name="Net-(U1-Pad18)">
+      <node ref="U1" pin="18"/>
+    </net>
+    <net code="69" name="Net-(U1-Pad17)">
       <node ref="U1" pin="17"/>
     </net>
-    <net code="59" name="Net-(U1-Pad16)">
+    <net code="70" name="Net-(U1-Pad16)">
       <node ref="U1" pin="16"/>
     </net>
-    <net code="60" name="Net-(U1-Pad15)">
+    <net code="71" name="Net-(U1-Pad15)">
       <node ref="U1" pin="15"/>
     </net>
-    <net code="61" name="Net-(U1-Pad14)">
+    <net code="72" name="Net-(U1-Pad14)">
       <node ref="U1" pin="14"/>
     </net>
-    <net code="62" name="Net-(U1-Pad13)">
+    <net code="73" name="Net-(U1-Pad13)">
       <node ref="U1" pin="13"/>
     </net>
-    <net code="63" name="Net-(U1-Pad46)">
+    <net code="74" name="Net-(U1-Pad46)">
       <node ref="U1" pin="46"/>
     </net>
-    <net code="64" name="Net-(U1-Pad44)">
+    <net code="75" name="Net-(U1-Pad44)">
       <node ref="U1" pin="44"/>
     </net>
-    <net code="65" name="Net-(U1-Pad38)">
+    <net code="76" name="Net-(U1-Pad38)">
       <node ref="U1" pin="38"/>
     </net>
-    <net code="66" name="Net-(U1-Pad37)">
-      <node ref="U1" pin="37"/>
-    </net>
-    <net code="67" name="Net-(U1-Pad33)">
-      <node ref="U1" pin="33"/>
-    </net>
-    <net code="68" name="Net-(U2-Pad30)">
-      <node ref="U2" pin="30"/>
-    </net>
-    <net code="69" name="Net-(U2-Pad23)">
-      <node ref="U2" pin="23"/>
-    </net>
-    <net code="70" name="Net-(U2-Pad21)">
-      <node ref="U2" pin="21"/>
-    </net>
-    <net code="71" name="Net-(U2-Pad20)">
-      <node ref="U2" pin="20"/>
-    </net>
-    <net code="72" name="Net-(U2-Pad18)">
-      <node ref="U2" pin="18"/>
-    </net>
-    <net code="73" name="Net-(U2-Pad17)">
-      <node ref="U2" pin="17"/>
-    </net>
-    <net code="74" name="Net-(U2-Pad16)">
-      <node ref="U2" pin="16"/>
-    </net>
-    <net code="75" name="Net-(U2-Pad15)">
-      <node ref="U2" pin="15"/>
-    </net>
-    <net code="76" name="Net-(U2-Pad14)">
-      <node ref="U2" pin="14"/>
-    </net>
     <net code="77" name="Net-(C21-Pad1)">
       <node ref="U2" pin="1"/>
-      <node ref="C21" pin="1"/>
       <node ref="R7" pin="2"/>
+      <node ref="C21" pin="1"/>
     </net>
     <net code="78" name="Net-(C27-Pad1)">
-      <node ref="R7" pin="1"/>
-      <node ref="R9" pin="1"/>
       <node ref="U2" pin="42"/>
       <node ref="C27" pin="1"/>
+      <node ref="R7" pin="1"/>
+      <node ref="R9" pin="1"/>
     </net>
     <net code="79" name="Net-(R3-Pad1)">
-      <node ref="U2" pin="10"/>
       <node ref="R3" pin="1"/>
+      <node ref="U2" pin="10"/>
     </net>
     <net code="80" name="Net-(R1-Pad1)">
-      <node ref="U2" pin="8"/>
       <node ref="R1" pin="1"/>
+      <node ref="U2" pin="8"/>
     </net>
     <net code="81" name="Net-(C23-Pad1)">
       <node ref="C23" pin="1"/>
@@ -2524,20 +2524,20 @@
       <node ref="R5" pin="1"/>
     </net>
     <net code="83" name="Net-(C13-Pad1)">
-      <node ref="C13" pin="1"/>
       <node ref="R5" pin="2"/>
+      <node ref="C13" pin="1"/>
     </net>
     <net code="84" name="Net-(C33-Pad2)">
       <node ref="C33" pin="2"/>
       <node ref="U2" pin="39"/>
     </net>
     <net code="85" name="Net-(L2-Pad1)">
-      <node ref="P1" pin="1"/>
       <node ref="L2" pin="1"/>
+      <node ref="P1" pin="1"/>
     </net>
     <net code="86" name="Net-(L1-Pad1)">
-      <node ref="L1" pin="1"/>
       <node ref="P2" pin="1"/>
+      <node ref="L1" pin="1"/>
     </net>
     <net code="87" name="Net-(C26-Pad1)">
       <node ref="R10" pin="2"/>
@@ -2572,112 +2572,112 @@
       <node ref="U3" pin="28"/>
     </net>
     <net code="95" name="Net-(D3-Pad2)">
-      <node ref="D3" pin="2"/>
       <node ref="R18" pin="1"/>
+      <node ref="D3" pin="2"/>
     </net>
     <net code="96" name="PTT_LED">
       <node ref="R18" pin="2"/>
       <node ref="U3" pin="27"/>
     </net>
     <net code="97" name="DMR_LED">
-      <node ref="R19" pin="2"/>
       <node ref="U3" pin="26"/>
+      <node ref="R19" pin="2"/>
     </net>
     <net code="98" name="Net-(D5-Pad2)">
-      <node ref="R20" pin="1"/>
       <node ref="D5" pin="2"/>
+      <node ref="R20" pin="1"/>
     </net>
-    <net code="99" name="RXD">
-      <node ref="U3" pin="31"/>
-      <node ref="J1" pin="8"/>
+    <net code="99" name="Net-(D4-Pad2)">
+      <node ref="D4" pin="2"/>
+      <node ref="R19" pin="1"/>
+    </net>
+    <net code="100" name="DSTAR_LED">
+      <node ref="U3" pin="25"/>
+      <node ref="R20" pin="2"/>
     </net>
-    <net code="100" name="Net-(C49-Pad2)">
+    <net code="101" name="YSF_LED">
+      <node ref="R21" pin="2"/>
+      <node ref="U3" pin="19"/>
+    </net>
+    <net code="102" name="Net-(D6-Pad2)">
+      <node ref="R21" pin="1"/>
+      <node ref="D6" pin="2"/>
+    </net>
+    <net code="103" name="+5V">
+      <node ref="L9" pin="1"/>
+      <node ref="R28" pin="1"/>
+      <node ref="J1" pin="2"/>
+      <node ref="J1" pin="4"/>
+      <node ref="P4" pin="1"/>
+      <node ref="U4" pin="3"/>
+    </net>
+    <net code="104" name="Net-(C49-Pad2)">
       <node ref="C49" pin="2"/>
       <node ref="L9" pin="2"/>
       <node ref="P8" pin="1"/>
     </net>
-    <net code="101" name="Net-(C48-Pad2)">
+    <net code="105" name="Net-(C48-Pad2)">
+      <node ref="R27" pin="1"/>
       <node ref="C48" pin="2"/>
       <node ref="P8" pin="3"/>
-      <node ref="R27" pin="1"/>
       <node ref="R28" pin="2"/>
     </net>
-    <net code="102" name="Net-(C47-Pad1)">
+    <net code="106" name="Net-(C47-Pad1)">
+      <node ref="P8" pin="2"/>
       <node ref="C47" pin="1"/>
       <node ref="R26" pin="1"/>
-      <node ref="P8" pin="2"/>
     </net>
-    <net code="103" name="NRST">
+    <net code="107" name="NRST">
       <node ref="U3" pin="7"/>
+      <node ref="J1" pin="40"/>
       <node ref="R15" pin="1"/>
       <node ref="C43" pin="1"/>
       <node ref="SW1" pin="1"/>
-      <node ref="J1" pin="40"/>
     </net>
-    <net code="104" name="+5V">
-      <node ref="J1" pin="2"/>
-      <node ref="J1" pin="4"/>
-      <node ref="U4" pin="3"/>
-      <node ref="L9" pin="1"/>
-      <node ref="P4" pin="1"/>
-      <node ref="R28" pin="1"/>
+    <net code="108" name="RXD">
+      <node ref="J1" pin="8"/>
+      <node ref="U3" pin="31"/>
     </net>
-    <net code="105" name="SWCLK">
+    <net code="109" name="SWCLK">
       <node ref="U3" pin="37"/>
       <node ref="P5" pin="3"/>
     </net>
-    <net code="106" name="SWDIO">
-      <node ref="U3" pin="34"/>
+    <net code="110" name="SWDIO">
       <node ref="P5" pin="1"/>
+      <node ref="U3" pin="34"/>
     </net>
-    <net code="107" name="SCL">
-      <node ref="P3" pin="3"/>
+    <net code="111" name="SCL">
       <node ref="J1" pin="5"/>
+      <node ref="P3" pin="3"/>
     </net>
-    <net code="108" name="SDA">
-      <node ref="J1" pin="3"/>
+    <net code="112" name="SDA">
       <node ref="P3" pin="4"/>
+      <node ref="J1" pin="3"/>
     </net>
-    <net code="109" name="DISP_RXD">
-      <node ref="P4" pin="3"/>
+    <net code="113" name="DISP_RXD">
       <node ref="U3" pin="13"/>
+      <node ref="P4" pin="3"/>
     </net>
-    <net code="110" name="DISP_TXD">
-      <node ref="U3" pin="12"/>
+    <net code="114" name="DISP_TXD">
       <node ref="P4" pin="2"/>
+      <node ref="U3" pin="12"/>
     </net>
-    <net code="111" name="D-">
-      <node ref="R26" pin="2"/>
+    <net code="115" name="D-">
       <node ref="U3" pin="32"/>
+      <node ref="R26" pin="2"/>
     </net>
-    <net code="112" name="D+">
-      <node ref="U3" pin="33"/>
+    <net code="116" name="D+">
       <node ref="R27" pin="2"/>
+      <node ref="U3" pin="33"/>
     </net>
-    <net code="113" name="BOOT0">
-      <node ref="R25" pin="1"/>
+    <net code="117" name="BOOT0">
       <node ref="R29" pin="2"/>
       <node ref="U3" pin="44"/>
+      <node ref="R25" pin="1"/>
     </net>
-    <net code="114" name="SERVICE">
-      <node ref="U3" pin="2"/>
-      <node ref="D0" pin="1"/>
-    </net>
-    <net code="115" name="DSTAR_LED">
-      <node ref="U3" pin="25"/>
-      <node ref="R20" pin="2"/>
-    </net>
-    <net code="116" name="YSF_LED">
-      <node ref="R21" pin="2"/>
-      <node ref="U3" pin="19"/>
-    </net>
-    <net code="117" name="Net-(D6-Pad2)">
-      <node ref="R21" pin="1"/>
-      <node ref="D6" pin="2"/>
-    </net>
-    <net code="118" name="P25_LED">
-      <node ref="U3" pin="18"/>
-      <node ref="R22" pin="2"/>
+    <net code="118" name="BOOT1">
+      <node ref="R30" pin="1"/>
+      <node ref="U3" pin="20"/>
     </net>
     <net code="119" name="Net-(D7-Pad2)">
       <node ref="D7" pin="2"/>
@@ -2687,114 +2687,114 @@
       <node ref="D0" pin="2"/>
       <node ref="R24" pin="2"/>
     </net>
-    <net code="121" name="Net-(D4-Pad2)">
-      <node ref="R19" pin="1"/>
-      <node ref="D4" pin="2"/>
-    </net>
-    <net code="122" name="Net-(J1-Pad15)">
-      <node ref="J1" pin="15"/>
-    </net>
-    <net code="123" name="Net-(J1-Pad13)">
-      <node ref="J1" pin="13"/>
-    </net>
-    <net code="124" name="Net-(J1-Pad11)">
-      <node ref="J1" pin="11"/>
+    <net code="121" name="SERVICE">
+      <node ref="U3" pin="2"/>
+      <node ref="D0" pin="1"/>
     </net>
-    <net code="125" name="Net-(J1-Pad7)">
-      <node ref="J1" pin="7"/>
+    <net code="122" name="P25_LED">
+      <node ref="R22" pin="2"/>
+      <node ref="U3" pin="18"/>
     </net>
-    <net code="126" name="Net-(C50-Pad1)">
+    <net code="123" name="Net-(C50-Pad1)">
       <node ref="U4" pin="2"/>
       <node ref="C50" pin="1"/>
       <node ref="L10" pin="1"/>
     </net>
-    <net code="127" name="Net-(J1-Pad19)">
-      <node ref="J1" pin="19"/>
-    </net>
-    <net code="128" name="Net-(J1-Pad22)">
-      <node ref="J1" pin="22"/>
-    </net>
-    <net code="129" name="BOOT1">
-      <node ref="R30" pin="1"/>
-      <node ref="U3" pin="20"/>
-    </net>
-    <net code="130" name="Net-(P7-Pad3)">
-      <node ref="P7" pin="3"/>
-      <node ref="R29" pin="1"/>
-    </net>
-    <net code="131" name="Net-(P7-Pad4)">
-      <node ref="P7" pin="4"/>
-      <node ref="R30" pin="2"/>
+    <net code="124" name="Net-(J1-Pad35)">
+      <node ref="J1" pin="35"/>
     </net>
-    <net code="132" name="Net-(P8-Pad4)">
+    <net code="125" name="Net-(P8-Pad4)">
       <node ref="P8" pin="4"/>
     </net>
-    <net code="133" name="Net-(J1-Pad17)">
+    <net code="126" name="Net-(J1-Pad17)">
       <node ref="J1" pin="17"/>
     </net>
-    <net code="134" name="Net-(J1-Pad1)">
+    <net code="127" name="Net-(J1-Pad1)">
       <node ref="J1" pin="1"/>
     </net>
-    <net code="135" name="Net-(J1-Pad12)">
+    <net code="128" name="Net-(J1-Pad12)">
       <node ref="J1" pin="12"/>
     </net>
-    <net code="136" name="Net-(J1-Pad16)">
+    <net code="129" name="Net-(J1-Pad16)">
       <node ref="J1" pin="16"/>
     </net>
-    <net code="137" name="Net-(J1-Pad18)">
+    <net code="130" name="Net-(J1-Pad18)">
       <node ref="J1" pin="18"/>
     </net>
-    <net code="138" name="Net-(J1-Pad24)">
+    <net code="131" name="Net-(J1-Pad22)">
+      <node ref="J1" pin="22"/>
+    </net>
+    <net code="132" name="Net-(J1-Pad24)">
       <node ref="J1" pin="24"/>
     </net>
-    <net code="139" name="Net-(J1-Pad26)">
+    <net code="133" name="Net-(J1-Pad26)">
       <node ref="J1" pin="26"/>
     </net>
-    <net code="140" name="Net-(J1-Pad28)">
+    <net code="134" name="Net-(J1-Pad28)">
       <node ref="J1" pin="28"/>
     </net>
-    <net code="141" name="Net-(J1-Pad32)">
+    <net code="135" name="Net-(J1-Pad32)">
       <node ref="J1" pin="32"/>
     </net>
-    <net code="142" name="Net-(J1-Pad36)">
+    <net code="136" name="Net-(J1-Pad36)">
       <node ref="J1" pin="36"/>
     </net>
-    <net code="143" name="Net-(J1-Pad37)">
+    <net code="137" name="Net-(J1-Pad37)">
       <node ref="J1" pin="37"/>
     </net>
-    <net code="144" name="Net-(J1-Pad35)">
-      <node ref="J1" pin="35"/>
-    </net>
-    <net code="145" name="Net-(J1-Pad33)">
+    <net code="138" name="Net-(J1-Pad33)">
       <node ref="J1" pin="33"/>
     </net>
-    <net code="146" name="Net-(J1-Pad31)">
+    <net code="139" name="Net-(J1-Pad31)">
       <node ref="J1" pin="31"/>
     </net>
-    <net code="147" name="Net-(J1-Pad29)">
+    <net code="140" name="Net-(J1-Pad29)">
       <node ref="J1" pin="29"/>
     </net>
-    <net code="148" name="Net-(J1-Pad27)">
+    <net code="141" name="Net-(J1-Pad27)">
       <node ref="J1" pin="27"/>
     </net>
-    <net code="149" name="Net-(J1-Pad23)">
+    <net code="142" name="Net-(J1-Pad23)">
       <node ref="J1" pin="23"/>
     </net>
-    <net code="150" name="Net-(J1-Pad21)">
+    <net code="143" name="Net-(J1-Pad21)">
       <node ref="J1" pin="21"/>
     </net>
+    <net code="144" name="Net-(J1-Pad19)">
+      <node ref="J1" pin="19"/>
+    </net>
+    <net code="145" name="Net-(J1-Pad15)">
+      <node ref="J1" pin="15"/>
+    </net>
+    <net code="146" name="Net-(J1-Pad13)">
+      <node ref="J1" pin="13"/>
+    </net>
+    <net code="147" name="Net-(J1-Pad11)">
+      <node ref="J1" pin="11"/>
+    </net>
+    <net code="148" name="Net-(J1-Pad7)">
+      <node ref="J1" pin="7"/>
+    </net>
+    <net code="149" name="Net-(P7-Pad3)">
+      <node ref="P7" pin="3"/>
+      <node ref="R29" pin="1"/>
+    </net>
+    <net code="150" name="Net-(P7-Pad4)">
+      <node ref="R30" pin="2"/>
+      <node ref="P7" pin="4"/>
+    </net>
     <net code="151" name="Net-(D2-Pad2)">
-      <node ref="R17" pin="1"/>
       <node ref="D2" pin="2"/>
+      <node ref="R17" pin="1"/>
     </net>
     <net code="152" name="Net-(C41-Pad1)">
+      <node ref="U3" pin="6"/>
       <node ref="C41" pin="1"/>
       <node ref="Y1" pin="2"/>
-      <node ref="U3" pin="6"/>
     </net>
     <net code="153" name="Net-(C40-Pad1)">
-      <node ref="Y1" pin="1"/>
       <node ref="C40" pin="1"/>
+      <node ref="Y1" pin="1"/>
       <node ref="U3" pin="5"/>
     </net>
     <net code="154" name="Net-(U3-Pad10)">