diff --git a/pcb/diplexer-cache.lib b/pcb/diplexer-cache.lib
index 37d60cc..de4fca7 100644
--- a/pcb/diplexer-cache.lib
+++ b/pcb/diplexer-cache.lib
@@ -66,26 +66,51 @@ X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# device:D
+# device:CP1
 #
-DEF device:D D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "device:D" 0 -100 50 H V C CNN
+DEF device:CP1 C 0 10 N N 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "device:CP1" 25 -100 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- TO-???*
- *SingleDiode
- *_Diode_*
- *SingleDiode*
- D_*
+ CP_*
 $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 N
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
+A 0 -150 128 1287 513 0 1 20 N -80 -50 80 -50
+P 2 0 1 20 -80 30 80 30 N
+P 2 0 1 0 -70 90 -30 90 N
+P 2 0 1 0 -50 70 -50 110 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 130 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# device:D_Bridge_+-AA
+#
+DEF device:D_Bridge_+-AA D 0 50 Y Y 1 F N
+F0 "D" 50 275 50 H V L CNN
+F1 "device:D_Bridge_+-AA" 50 200 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ D?Bridge*
+ D?Rectifier*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -100 150 -50 100 N
+P 2 0 1 0 -50 -100 -100 -150 N
+P 2 0 1 0 100 -50 150 -100 N
+P 2 0 1 0 100 50 150 100 N
+P 4 0 1 0 -150 100 -100 50 -75 125 -150 100 N
+P 4 0 1 0 -100 -50 -150 -100 -75 -125 -100 -50 N
+P 4 0 1 0 50 100 100 150 125 75 50 100 N
+P 4 0 1 0 125 -75 50 -100 100 -150 125 -75 N
+P 5 0 1 0 -200 0 0 -200 200 0 0 200 -200 0 N
+X + 1 300 0 100 L 50 50 1 1 I
+X - 2 -300 0 100 R 50 50 1 1 I
+X ~ 3 0 300 100 D 50 50 1 1 I
+X ~ 4 0 -300 100 U 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
diff --git a/pcb/diplexer.sch b/pcb/diplexer.sch
index d81e9a1..f2815a2 100644
--- a/pcb/diplexer.sch
+++ b/pcb/diplexer.sch
@@ -38,6 +38,7 @@ F 0 "C2" V 2498 5900 50  0000 C CNN
 F 1 "4.7pF" V 2589 5900 50  0000 C CNN
 F 2 "" H 2788 5750 50  0001 C CNN
 F 3 "" H 2750 5900 50  0001 C CNN
+F 4 "NPO 0805ACF 4,7P" V 2750 5900 50  0001 C CNN "Reichelt"
 	1    2750 5900
 	0    1    1    0   
 $EndComp
@@ -49,6 +50,7 @@ F 0 "C5" V 3198 5900 50  0000 C CNN
 F 1 "2.7pF" V 3289 5900 50  0000 C CNN
 F 2 "" H 3488 5750 50  0001 C CNN
 F 3 "" H 3450 5900 50  0001 C CNN
+F 4 "KEM C0G0805 2,7P" V 3450 5900 50  0001 C CNN "Reichelt"
 	1    3450 5900
 	0    1    1    0   
 $EndComp
@@ -60,6 +62,7 @@ F 0 "C6" V 3898 5900 50  0000 C CNN
 F 1 "4.7pF" V 3989 5900 50  0000 C CNN
 F 2 "" H 4188 5750 50  0001 C CNN
 F 3 "" H 4150 5900 50  0001 C CNN
+F 4 "NPO 0805ACF 4,7P" V 4150 5900 50  0001 C CNN "Reichelt"
 	1    4150 5900
 	0    1    1    0   
 $EndComp
@@ -177,6 +180,7 @@ F 0 "C4" H 3415 3646 50  0000 L CNN
 F 1 "18pF" H 3415 3555 50  0000 L CNN
 F 2 "" H 3338 3450 50  0001 C CNN
 F 3 "" H 3300 3600 50  0001 C CNN
+F 4 "NPO 0805 BF 18P" H 3300 3600 50  0001 C CNN "Reichelt"
 	1    3300 3600
 	1    0    0    -1  
 $EndComp
@@ -188,6 +192,7 @@ F 0 "C7" H 4315 3646 50  0000 L CNN
 F 1 "18pF" H 4315 3555 50  0000 L CNN
 F 2 "" H 4238 3450 50  0001 C CNN
 F 3 "" H 4200 3600 50  0001 C CNN
+F 4 "NPO 0805 BF 18P" H 4200 3600 50  0001 C CNN "Reichelt"
 	1    4200 3600
 	1    0    0    -1  
 $EndComp
@@ -235,6 +240,7 @@ F 0 "C9" V 5698 3250 50  0000 C CNN
 F 1 "27pF" V 5789 3250 50  0000 C CNN
 F 2 "" H 5988 3100 50  0001 C CNN
 F 3 "" H 5950 3250 50  0001 C CNN
+F 4 "NPO 0805 BF 27P" V 5950 3250 50  0001 C CNN "Reichelt"
 	1    5950 3250
 	0    1    1    0   
 $EndComp
@@ -246,6 +252,7 @@ F 0 "C10" V 6398 3250 50  0000 C CNN
 F 1 "27pF" V 6489 3250 50  0000 C CNN
 F 2 "" H 6688 3100 50  0001 C CNN
 F 3 "" H 6650 3250 50  0001 C CNN
+F 4 "NPO 0805 BF 27P" V 6650 3250 50  0001 C CNN "Reichelt"
 	1    6650 3250
 	0    1    1    0   
 $EndComp
@@ -534,6 +541,7 @@ F 0 "C11" V 7598 3250 50  0000 C CNN
 F 1 "1nF" V 7689 3250 50  0000 C CNN
 F 2 "" H 7888 3100 50  0001 C CNN
 F 3 "" H 7850 3250 50  0001 C CNN
+F 4 "X7R 0805 BF 1,0N" V 7850 3250 50  0001 C CNN "Reichelt"
 	1    7850 3250
 	0    1    1    0   
 $EndComp
@@ -543,118 +551,55 @@ Connection ~ 8400 3250
 $Comp
 L conn:Barrel_Jack J1
 U 1 1 5B5B4D98
-P 1350 1500
-F 0 "J1" H 1428 1825 50  0000 C CNN
-F 1 "Barrel_Jack" H 1428 1734 50  0000 C CNN
-F 2 "" H 1400 1460 50  0001 C CNN
-F 3 "~" H 1400 1460 50  0001 C CNN
-	1    1350 1500
+P 900 1500
+F 0 "J1" H 978 1825 50  0000 C CNN
+F 1 "Barrel_Jack" H 978 1734 50  0000 C CNN
+F 2 "" H 950 1460 50  0001 C CNN
+F 3 "~" H 950 1460 50  0001 C CNN
+	1    900  1500
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1850 1600 1850 2100
-Wire Wire Line
-	1650 1600 1850 1600
-$Comp
-L power:GND #PWR01
-U 1 1 5B5B742F
-P 1850 2100
-F 0 "#PWR01" H 1850 1850 50  0001 C CNN
-F 1 "GND" H 1855 1927 50  0000 C CNN
-F 2 "" H 1850 2100 50  0001 C CNN
-F 3 "" H 1850 2100 50  0001 C CNN
-	1    1850 2100
-	1    0    0    -1  
-$EndComp
-$Comp
-L device:D D1
-U 1 1 5B5B9EA9
-P 2200 1400
-F 0 "D1" H 2200 1184 50  0000 C CNN
-F 1 "D" H 2200 1275 50  0000 C CNN
-F 2 "" H 2200 1400 50  0001 C CNN
-F 3 "" H 2200 1400 50  0001 C CNN
-	1    2200 1400
-	-1   0    0    1   
-$EndComp
-Wire Wire Line
-	1650 1400 2050 1400
-Wire Wire Line
-	2350 1400 2550 1400
-Wire Wire Line
-	3150 1400 3150 1100
+	1200 1600 1400 1600
 $Comp
 L power:VCC #PWR04
 U 1 1 5B5BB9CF
-P 3150 1100
-F 0 "#PWR04" H 3150 950 50  0001 C CNN
-F 1 "VCC" H 3167 1273 50  0000 C CNN
-F 2 "" H 3150 1100 50  0001 C CNN
-F 3 "" H 3150 1100 50  0001 C CNN
-	1    3150 1100
-	1    0    0    -1  
-$EndComp
-$Comp
-L device:C C1
-U 1 1 5B5BBB9A
-P 2550 1750
-F 0 "C1" H 2665 1796 50  0000 L CNN
-F 1 "100nF" H 2665 1705 50  0000 L CNN
-F 2 "" H 2588 1600 50  0001 C CNN
-F 3 "" H 2550 1750 50  0001 C CNN
-F 4 "X7R 0805 BF 100N" H 2550 1750 50  0001 C CNN "Reichelt"
-	1    2550 1750
+P 3550 800
+F 0 "#PWR04" H 3550 650 50  0001 C CNN
+F 1 "VCC" H 3567 973 50  0000 C CNN
+F 2 "" H 3550 800 50  0001 C CNN
+F 3 "" H 3550 800 50  0001 C CNN
+	1    3550 800 
 	1    0    0    -1  
 $EndComp
 $Comp
 L device:C C3
 U 1 1 5B5BBC94
-P 3150 1750
-F 0 "C3" H 3265 1796 50  0000 L CNN
-F 1 "100nF" H 3265 1705 50  0000 L CNN
-F 2 "" H 3188 1600 50  0001 C CNN
-F 3 "" H 3150 1750 50  0001 C CNN
-F 4 "X7R 0805 BF 100N" H 3150 1750 50  0001 C CNN "Reichelt"
-	1    3150 1750
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GND #PWR02
-U 1 1 5B5BC9F6
-P 2550 2100
-F 0 "#PWR02" H 2550 1850 50  0001 C CNN
-F 1 "GND" H 2555 1927 50  0000 C CNN
-F 2 "" H 2550 2100 50  0001 C CNN
-F 3 "" H 2550 2100 50  0001 C CNN
-	1    2550 2100
+P 3550 1350
+F 0 "C3" H 3665 1396 50  0000 L CNN
+F 1 "100nF" H 3665 1305 50  0000 L CNN
+F 2 "" H 3588 1200 50  0001 C CNN
+F 3 "" H 3550 1350 50  0001 C CNN
+F 4 "X7R 0805 BF 100N" H 3550 1350 50  0001 C CNN "Reichelt"
+	1    3550 1350
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR05
 U 1 1 5B5BCA69
-P 3150 2100
-F 0 "#PWR05" H 3150 1850 50  0001 C CNN
-F 1 "GND" H 3155 1927 50  0000 C CNN
-F 2 "" H 3150 2100 50  0001 C CNN
-F 3 "" H 3150 2100 50  0001 C CNN
-	1    3150 2100
+P 3550 2100
+F 0 "#PWR05" H 3550 1850 50  0001 C CNN
+F 1 "GND" H 3555 1927 50  0000 C CNN
+F 2 "" H 3550 2100 50  0001 C CNN
+F 3 "" H 3550 2100 50  0001 C CNN
+	1    3550 2100
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3150 1600 3150 1400
-Connection ~ 3150 1400
+	3550 2100 3550 1500
 Wire Wire Line
-	2550 1600 2550 1400
-Connection ~ 2550 1400
-Wire Wire Line
-	2550 1400 3150 1400
-Wire Wire Line
-	2550 2100 2550 1900
-Wire Wire Line
-	3150 2100 3150 1900
-Wire Wire Line
-	1650 1500 1650 1600
-Connection ~ 1650 1600
+	1200 1500 1200 1600
+Connection ~ 1200 1600
 Text Notes 5500 2700 0    50   ~ 0
 Highpass 120MHz
 Wire Notes Line
@@ -685,4 +630,78 @@ Wire Notes Line
 	4400 7000 2500 7000
 Text Notes 2600 5450 0    50   ~ 0
 Highpass 420MHz
+$Comp
+L device:D_Bridge_+-AA D?
+U 1 1 5B5B67EB
+P 1700 1400
+F 0 "D?" V 1746 1059 50  0000 R CNN
+F 1 "D_Bridge_+-AA" V 1655 1059 50  0000 R CNN
+F 2 "" H 1700 1400 50  0001 C CNN
+F 3 "" H 1700 1400 50  0001 C CNN
+F 4 "SMD DB1A70" V 1700 1400 50  0001 C CNN "Reichelt"
+	1    1700 1400
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	2100 1400 2100 1900
+Wire Wire Line
+	2100 1900 1400 1900
+Wire Wire Line
+	1400 1600 1400 1900
+Wire Wire Line
+	2000 1400 2100 1400
+Wire Wire Line
+	1200 1400 1400 1400
+Wire Wire Line
+	1700 1700 1700 2100
+$Comp
+L power:GND #PWR?
+U 1 1 5B5BF0B4
+P 1700 2100
+F 0 "#PWR?" H 1700 1850 50  0001 C CNN
+F 1 "GND" H 1705 1927 50  0000 C CNN
+F 2 "" H 1700 2100 50  0001 C CNN
+F 3 "" H 1700 2100 50  0001 C CNN
+	1    1700 2100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1700 1100 1700 1000
+Wire Wire Line
+	1700 1000 3000 1000
+$Comp
+L device:CP1 C?
+U 1 1 5B5CF05F
+P 3000 1350
+F 0 "C?" H 3115 1396 50  0000 L CNN
+F 1 "47uF" H 3115 1305 50  0000 L CNN
+F 2 "" H 3000 1350 50  0001 C CNN
+F 3 "" H 3000 1350 50  0001 C CNN
+F 4 "SMD ELKO 47/16" H 3000 1350 50  0001 C CNN "Reichelt"
+	1    3000 1350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3000 1000 3000 1200
+Wire Wire Line
+	3000 1500 3000 2100
+Connection ~ 3000 1000
+Connection ~ 3550 1000
+Wire Wire Line
+	3550 1200 3550 1000
+Wire Wire Line
+	3550 1000 3550 800 
+Wire Wire Line
+	3000 1000 3550 1000
+$Comp
+L power:GND #PWR?
+U 1 1 5B5D36EF
+P 3000 2100
+F 0 "#PWR?" H 3000 1850 50  0001 C CNN
+F 1 "GND" H 3005 1927 50  0000 C CNN
+F 2 "" H 3000 2100 50  0001 C CNN
+F 3 "" H 3000 2100 50  0001 C CNN
+	1    3000 2100
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC