diff --git a/pcb/discrete/discrete-rf-board/diode_mixer.sch b/pcb/discrete/discrete-rf-board/diode_mixer.sch
index d1495ed..5b9f6a4 100644
--- a/pcb/discrete/discrete-rf-board/diode_mixer.sch
+++ b/pcb/discrete/discrete-rf-board/diode_mixer.sch
@@ -4,7 +4,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 19 19
+Sheet 11 19
 Title ""
 Date ""
 Rev ""
@@ -22,7 +22,7 @@ AR Path="/5CA6B0AA/5CC1CC09/5CC1E322" Ref="U302"  Part="1"
 AR Path="/5CA6B0AA/5CC4015A/5CC1E322" Ref="U502"  Part="1" 
 F 0 "U502" H 5900 3900 50  0000 C CNN
 F 1 "BAT15-099R" H 5900 3300 50  0000 C CNN
-F 2 "" H 5900 3900 50  0001 C CNN
+F 2 "discrete_footprints:Infineon_SOT143" H 5900 3900 50  0001 C CNN
 F 3 "" H 5900 3900 50  0001 C CNN
 F 4 "726-BAT15099RE6327" H 5900 3200 50  0000 C CNN "Mouser"
 	1    5900 3600
diff --git a/pcb/discrete/discrete-rf-board/diode_mixer.sch-bak b/pcb/discrete/discrete-rf-board/diode_mixer.sch-bak
index d1495ed..0f0feb1 100644
--- a/pcb/discrete/discrete-rf-board/diode_mixer.sch-bak
+++ b/pcb/discrete/discrete-rf-board/diode_mixer.sch-bak
@@ -20,7 +20,7 @@ U 1 1 5CC1E322
 P 5900 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC1E322" Ref="U302"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC1E322" Ref="U502"  Part="1" 
-F 0 "U502" H 5900 3900 50  0000 C CNN
+F 0 "U302" H 5900 3900 50  0000 C CNN
 F 1 "BAT15-099R" H 5900 3300 50  0000 C CNN
 F 2 "" H 5900 3900 50  0001 C CNN
 F 3 "" H 5900 3900 50  0001 C CNN
@@ -34,7 +34,7 @@ U 1 1 5CC1F89D
 P 6500 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC1F89D" Ref="C304"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC1F89D" Ref="C504"  Part="1" 
-F 0 "C504" H 6510 3670 50  0000 L CNN
+F 0 "C304" H 6510 3670 50  0000 L CNN
 F 1 "1.1 pF" H 6510 3520 50  0000 L CNN
 F 2 "" H 6500 3600 50  0001 C CNN
 F 3 "~" H 6500 3600 50  0001 C CNN
@@ -47,7 +47,7 @@ U 1 1 5CC20238
 P 7100 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC20238" Ref="C305"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC20238" Ref="C505"  Part="1" 
-F 0 "C505" H 7110 3670 50  0000 L CNN
+F 0 "C305" H 7110 3670 50  0000 L CNN
 F 1 "2.5 pF" H 7110 3520 50  0000 L CNN
 F 2 "" H 7100 3600 50  0001 C CNN
 F 3 "~" H 7100 3600 50  0001 C CNN
@@ -60,7 +60,7 @@ U 1 1 5CC208EE
 P 6850 3750
 AR Path="/5CA6B0AA/5CC1CC09/5CC208EE" Ref="L304"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC208EE" Ref="L504"  Part="1" 
-F 0 "L504" H 6880 3790 50  0000 L CNN
+F 0 "L304" H 6880 3790 50  0000 L CNN
 F 1 "14 nH" H 6880 3710 50  0000 L CNN
 F 2 "" H 6850 3750 50  0001 C CNN
 F 3 "~" H 6850 3750 50  0001 C CNN
@@ -73,7 +73,7 @@ U 1 1 5CC2101C
 P 6850 3450
 AR Path="/5CA6B0AA/5CC1CC09/5CC2101C" Ref="L303"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC2101C" Ref="L503"  Part="1" 
-F 0 "L503" H 6880 3490 50  0000 L CNN
+F 0 "L303" H 6880 3490 50  0000 L CNN
 F 1 "14 nH" H 6880 3410 50  0000 L CNN
 F 2 "" H 6850 3450 50  0001 C CNN
 F 3 "~" H 6850 3450 50  0001 C CNN
@@ -106,7 +106,7 @@ U 1 1 5CC289D9
 P 8300 4100
 AR Path="/5CA6B0AA/5CC1CC09/5CC289D9" Ref="L305"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC289D9" Ref="L505"  Part="1" 
-F 0 "L505" H 8330 4140 50  0000 L CNN
+F 0 "L305" H 8330 4140 50  0000 L CNN
 F 1 "220 nH" H 8330 4060 50  0000 L CNN
 F 2 "" H 8300 4100 50  0001 C CNN
 F 3 "~" H 8300 4100 50  0001 C CNN
@@ -123,7 +123,7 @@ U 1 1 5CC29B4E
 P 8300 4450
 AR Path="/5CA6B0AA/5CC1CC09/5CC29B4E" Ref="R305"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC29B4E" Ref="R505"  Part="1" 
-F 0 "R505" H 8330 4470 50  0000 L CNN
+F 0 "R305" H 8330 4470 50  0000 L CNN
 F 1 "200R" H 8330 4410 50  0000 L CNN
 F 2 "" H 8300 4450 50  0001 C CNN
 F 3 "~" H 8300 4450 50  0001 C CNN
@@ -136,7 +136,7 @@ U 1 1 5CC29F9D
 P 8550 4300
 AR Path="/5CA6B0AA/5CC1CC09/5CC29F9D" Ref="R306"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC29F9D" Ref="R506"  Part="1" 
-F 0 "R506" H 8580 4320 50  0000 L CNN
+F 0 "R306" H 8580 4320 50  0000 L CNN
 F 1 "100R" H 8580 4260 50  0000 L CNN
 F 2 "" H 8550 4300 50  0001 C CNN
 F 3 "~" H 8550 4300 50  0001 C CNN
@@ -149,7 +149,7 @@ U 1 1 5CC2B0AC
 P 8750 4450
 AR Path="/5CA6B0AA/5CC1CC09/5CC2B0AC" Ref="C307"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC2B0AC" Ref="C507"  Part="1" 
-F 0 "C507" H 8760 4520 50  0000 L CNN
+F 0 "C307" H 8760 4520 50  0000 L CNN
 F 1 "47 pF" H 8760 4370 50  0000 L CNN
 F 2 "" H 8750 4450 50  0001 C CNN
 F 3 "~" H 8750 4450 50  0001 C CNN
@@ -173,7 +173,7 @@ U 1 1 5CC2FA5E
 P 2750 3950
 AR Path="/5CA6B0AA/5CC1CC09/5CC2FA5E" Ref="#PWR0302"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC2FA5E" Ref="#PWR0502"  Part="1" 
-F 0 "#PWR0502" H 2750 3700 50  0001 C CNN
+F 0 "#PWR0302" H 2750 3700 50  0001 C CNN
 F 1 "GND" H 2750 3800 50  0000 C CNN
 F 2 "" H 2750 3950 50  0001 C CNN
 F 3 "" H 2750 3950 50  0001 C CNN
@@ -186,7 +186,7 @@ U 1 1 5CC3011D
 P 9150 3950
 AR Path="/5CA6B0AA/5CC1CC09/5CC3011D" Ref="#PWR0303"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC3011D" Ref="#PWR0503"  Part="1" 
-F 0 "#PWR0503" H 9150 3700 50  0001 C CNN
+F 0 "#PWR0303" H 9150 3700 50  0001 C CNN
 F 1 "GND" H 9150 3800 50  0000 C CNN
 F 2 "" H 9150 3950 50  0001 C CNN
 F 3 "" H 9150 3950 50  0001 C CNN
@@ -199,7 +199,7 @@ U 1 1 5CC30B27
 P 2450 2900
 AR Path="/5CA6B0AA/5CC1CC09/5CC30B27" Ref="J301"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC30B27" Ref="J501"  Part="1" 
-F 0 "J501" H 2460 3020 50  0000 C CNN
+F 0 "J301" H 2460 3020 50  0000 C CNN
 F 1 "UFL" V 2565 2900 50  0000 C CNN
 F 2 "" H 2450 2900 50  0001 C CNN
 F 3 " ~" H 2450 2900 50  0001 C CNN
@@ -212,7 +212,7 @@ U 1 1 5CC31787
 P 9600 3000
 AR Path="/5CA6B0AA/5CC1CC09/5CC31787" Ref="J302"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC31787" Ref="J502"  Part="1" 
-F 0 "J502" H 9610 3120 50  0000 C CNN
+F 0 "J302" H 9610 3120 50  0000 C CNN
 F 1 "UFL" V 9715 3000 50  0000 C CNN
 F 2 "" H 9600 3000 50  0001 C CNN
 F 3 " ~" H 9600 3000 50  0001 C CNN
@@ -225,7 +225,7 @@ U 1 1 5CC33186
 P 9600 3250
 AR Path="/5CA6B0AA/5CC1CC09/5CC33186" Ref="#PWR0304"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC33186" Ref="#PWR0504"  Part="1" 
-F 0 "#PWR0504" H 9600 3000 50  0001 C CNN
+F 0 "#PWR0304" H 9600 3000 50  0001 C CNN
 F 1 "GND" H 9600 3100 50  0000 C CNN
 F 2 "" H 9600 3250 50  0001 C CNN
 F 3 "" H 9600 3250 50  0001 C CNN
@@ -238,7 +238,7 @@ U 1 1 5CC33A73
 P 2450 3200
 AR Path="/5CA6B0AA/5CC1CC09/5CC33A73" Ref="#PWR0301"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC33A73" Ref="#PWR0501"  Part="1" 
-F 0 "#PWR0501" H 2450 2950 50  0001 C CNN
+F 0 "#PWR0301" H 2450 2950 50  0001 C CNN
 F 1 "GND" H 2450 3050 50  0000 C CNN
 F 2 "" H 2450 3200 50  0001 C CNN
 F 3 "" H 2450 3200 50  0001 C CNN
@@ -289,7 +289,7 @@ U 1 1 5CC5AE0B
 P 8300 4750
 AR Path="/5CA6B0AA/5CC1CC09/5CC5AE0B" Ref="L306"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC5AE0B" Ref="L506"  Part="1" 
-F 0 "L506" H 8330 4790 50  0000 L CNN
+F 0 "L306" H 8330 4790 50  0000 L CNN
 F 1 "220 nH" H 8330 4710 50  0000 L CNN
 F 2 "" H 8300 4750 50  0001 C CNN
 F 3 "~" H 8300 4750 50  0001 C CNN
@@ -306,7 +306,7 @@ U 1 1 5CC5DD55
 P 8550 4600
 AR Path="/5CA6B0AA/5CC1CC09/5CC5DD55" Ref="R307"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC5DD55" Ref="R507"  Part="1" 
-F 0 "R507" H 8580 4620 50  0000 L CNN
+F 0 "R307" H 8580 4620 50  0000 L CNN
 F 1 "100R" H 8580 4560 50  0000 L CNN
 F 2 "" H 8550 4600 50  0001 C CNN
 F 3 "~" H 8550 4600 50  0001 C CNN
@@ -343,7 +343,7 @@ U 1 1 5CC22010
 P 5000 3750
 AR Path="/5CA6B0AA/5CC1CC09/5CC22010" Ref="L302"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC22010" Ref="L502"  Part="1" 
-F 0 "L502" H 5030 3790 50  0000 L CNN
+F 0 "L302" H 5030 3790 50  0000 L CNN
 F 1 "12 nH" H 5030 3710 50  0000 L CNN
 F 2 "" H 5000 3750 50  0001 C CNN
 F 3 "~" H 5000 3750 50  0001 C CNN
@@ -356,7 +356,7 @@ U 1 1 5CC1F7BA
 P 4750 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC1F7BA" Ref="C302"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC1F7BA" Ref="C502"  Part="1" 
-F 0 "C502" H 4760 3670 50  0000 L CNN
+F 0 "C302" H 4760 3670 50  0000 L CNN
 F 1 "3.3 pF" H 4760 3520 50  0000 L CNN
 F 2 "" H 4750 3600 50  0001 C CNN
 F 3 "~" H 4750 3600 50  0001 C CNN
@@ -369,7 +369,7 @@ U 1 1 5CC1E94D
 P 5200 3600
 AR Path="/5CA6B0AA/5CC1CC09/5CC1E94D" Ref="C303"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC1E94D" Ref="C503"  Part="1" 
-F 0 "C503" H 5210 3670 50  0000 L CNN
+F 0 "C303" H 5210 3670 50  0000 L CNN
 F 1 "1.3 pF" H 5210 3520 50  0000 L CNN
 F 2 "" H 5200 3600 50  0001 C CNN
 F 3 "~" H 5200 3600 50  0001 C CNN
@@ -391,7 +391,7 @@ U 1 1 5CC22016
 P 5000 3450
 AR Path="/5CA6B0AA/5CC1CC09/5CC22016" Ref="L301"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5CC22016" Ref="L501"  Part="1" 
-F 0 "L501" H 5030 3490 50  0000 L CNN
+F 0 "L301" H 5030 3490 50  0000 L CNN
 F 1 "12 nH" H 5030 3410 50  0000 L CNN
 F 2 "" H 5000 3450 50  0001 C CNN
 F 3 "~" H 5000 3450 50  0001 C CNN
@@ -412,7 +412,7 @@ U 1 1 5D51EF09
 P 4150 3600
 AR Path="/5CA6B0AA/5CC1CC09/5D51EF09" Ref="C301"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D51EF09" Ref="C501"  Part="1" 
-F 0 "C501" H 4160 3670 50  0000 L CNN
+F 0 "C301" H 4160 3670 50  0000 L CNN
 F 1 "DNP" H 4160 3520 50  0000 L CNN
 F 2 "" H 4150 3600 50  0001 C CNN
 F 3 "~" H 4150 3600 50  0001 C CNN
@@ -425,7 +425,7 @@ U 1 1 5D51FC82
 P 4400 3450
 AR Path="/5CA6B0AA/5CC1CC09/5D51FC82" Ref="R301"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D51FC82" Ref="R501"  Part="1" 
-F 0 "R501" H 4430 3470 50  0000 L CNN
+F 0 "R301" H 4430 3470 50  0000 L CNN
 F 1 "0R" H 4430 3410 50  0000 L CNN
 F 2 "" H 4400 3450 50  0001 C CNN
 F 3 "~" H 4400 3450 50  0001 C CNN
@@ -438,7 +438,7 @@ U 1 1 5D5221DB
 P 4400 3750
 AR Path="/5CA6B0AA/5CC1CC09/5D5221DB" Ref="R302"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D5221DB" Ref="R502"  Part="1" 
-F 0 "R502" H 4430 3770 50  0000 L CNN
+F 0 "R302" H 4430 3770 50  0000 L CNN
 F 1 "0R" H 4430 3710 50  0000 L CNN
 F 2 "" H 4400 3750 50  0001 C CNN
 F 3 "~" H 4400 3750 50  0001 C CNN
@@ -459,7 +459,7 @@ U 1 1 5D52D7BD
 P 7750 3600
 AR Path="/5CA6B0AA/5CC1CC09/5D52D7BD" Ref="C306"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D52D7BD" Ref="C506"  Part="1" 
-F 0 "C506" H 7760 3670 50  0000 L CNN
+F 0 "C306" H 7760 3670 50  0000 L CNN
 F 1 "DNP" H 7760 3520 50  0000 L CNN
 F 2 "" H 7750 3600 50  0001 C CNN
 F 3 "~" H 7750 3600 50  0001 C CNN
@@ -472,7 +472,7 @@ U 1 1 5D52D7C3
 P 7500 3450
 AR Path="/5CA6B0AA/5CC1CC09/5D52D7C3" Ref="R303"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D52D7C3" Ref="R503"  Part="1" 
-F 0 "R503" H 7530 3470 50  0000 L CNN
+F 0 "R303" H 7530 3470 50  0000 L CNN
 F 1 "0R" H 7530 3410 50  0000 L CNN
 F 2 "" H 7500 3450 50  0001 C CNN
 F 3 "~" H 7500 3450 50  0001 C CNN
@@ -485,7 +485,7 @@ U 1 1 5D52D7C9
 P 7500 3750
 AR Path="/5CA6B0AA/5CC1CC09/5D52D7C9" Ref="R304"  Part="1" 
 AR Path="/5CA6B0AA/5CC4015A/5D52D7C9" Ref="R504"  Part="1" 
-F 0 "R504" H 7530 3770 50  0000 L CNN
+F 0 "R304" H 7530 3770 50  0000 L CNN
 F 1 "0R" H 7530 3710 50  0000 L CNN
 F 2 "" H 7500 3750 50  0001 C CNN
 F 3 "~" H 7500 3750 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/discrete-parts.lib b/pcb/discrete/discrete-rf-board/discrete-parts.lib
index 75f1fd6..4e94ec2 100644
--- a/pcb/discrete/discrete-rf-board/discrete-parts.lib
+++ b/pcb/discrete/discrete-rf-board/discrete-parts.lib
@@ -8,6 +8,7 @@ F0 "U" 0 450 50 H V C CNN
 F1 "ADF4360-7BCPZRL7" 0 300 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+F4 "584-ADF4360-7BCPZR7" 0 0 50 H V C CNN "Mouser"
 ALIAS ADF4360-7BCPZ ADF4360-7BCPZRL
 DRAW
 S -700 400 700 -1300 0 1 0 f
@@ -35,7 +36,7 @@ X VTUNE 7 800 -400 100 L 50 50 1 1 I
 X AGND 8 0 -1400 100 U 50 50 1 1 P
 X L1 9 -800 -700 100 R 50 50 1 1 P
 X 24 CP 800 -850 100 L 50 50 1 1 O
-X 25 EP 400 -1400 100 U 50 50 1 1 P
+X 0 EP 400 -1400 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/pcb/discrete/discrete-rf-board/discrete-rf-board-cache.lib b/pcb/discrete/discrete-rf-board/discrete-rf-board-cache.lib
index fe7f24f..8108ec4 100644
--- a/pcb/discrete/discrete-rf-board/discrete-rf-board-cache.lib
+++ b/pcb/discrete/discrete-rf-board/discrete-rf-board-cache.lib
@@ -26,17 +26,18 @@ X Ext 2 0 -200 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_Generic_Conn_01x08
+# Connector_Generic_Conn_01x11
 #
-DEF Connector_Generic_Conn_01x08 J 0 40 Y N 1 F N
-F0 "J" 0 400 50 H V C CNN
-F1 "Connector_Generic_Conn_01x08" 0 -500 50 H V C CNN
+DEF Connector_Generic_Conn_01x11 J 0 40 Y N 1 F N
+F0 "J" 0 600 50 H V C CNN
+F1 "Connector_Generic_Conn_01x11" 0 -600 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  Connector*:*_1x??_*
 $ENDFPLIST
 DRAW
+S -50 -495 0 -505 1 1 6 N
 S -50 -395 0 -405 1 1 6 N
 S -50 -295 0 -305 1 1 6 N
 S -50 -195 0 -205 1 1 6 N
@@ -45,29 +46,36 @@ S -50 5 0 -5 1 1 6 N
 S -50 105 0 95 1 1 6 N
 S -50 205 0 195 1 1 6 N
 S -50 305 0 295 1 1 6 N
-S -50 350 50 -450 1 1 10 f
-X Pin_1 1 -200 300 150 R 50 50 1 1 P
-X Pin_2 2 -200 200 150 R 50 50 1 1 P
-X Pin_3 3 -200 100 150 R 50 50 1 1 P
-X Pin_4 4 -200 0 150 R 50 50 1 1 P
-X Pin_5 5 -200 -100 150 R 50 50 1 1 P
-X Pin_6 6 -200 -200 150 R 50 50 1 1 P
-X Pin_7 7 -200 -300 150 R 50 50 1 1 P
-X Pin_8 8 -200 -400 150 R 50 50 1 1 P
+S -50 405 0 395 1 1 6 N
+S -50 505 0 495 1 1 6 N
+S -50 550 50 -550 1 1 10 f
+X Pin_1 1 -200 500 150 R 50 50 1 1 P
+X Pin_10 10 -200 -400 150 R 50 50 1 1 P
+X Pin_11 11 -200 -500 150 R 50 50 1 1 P
+X Pin_2 2 -200 400 150 R 50 50 1 1 P
+X Pin_3 3 -200 300 150 R 50 50 1 1 P
+X Pin_4 4 -200 200 150 R 50 50 1 1 P
+X Pin_5 5 -200 100 150 R 50 50 1 1 P
+X Pin_6 6 -200 0 150 R 50 50 1 1 P
+X Pin_7 7 -200 -100 150 R 50 50 1 1 P
+X Pin_8 8 -200 -200 150 R 50 50 1 1 P
+X Pin_9 9 -200 -300 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_Generic_Conn_01x23
+# Connector_Generic_Conn_01x26
 #
-DEF Connector_Generic_Conn_01x23 J 0 40 Y N 1 F N
-F0 "J" 0 1200 50 H V C CNN
-F1 "Connector_Generic_Conn_01x23" 0 -1200 50 H V C CNN
+DEF Connector_Generic_Conn_01x26 J 0 40 Y N 1 F N
+F0 "J" 0 1300 50 H V C CNN
+F1 "Connector_Generic_Conn_01x26" 0 -1400 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  Connector*:*_1x??_*
 $ENDFPLIST
 DRAW
+S -50 -1295 0 -1305 1 1 6 N
+S -50 -1195 0 -1205 1 1 6 N
 S -50 -1095 0 -1105 1 1 6 N
 S -50 -995 0 -1005 1 1 6 N
 S -50 -895 0 -905 1 1 6 N
@@ -91,30 +99,34 @@ S -50 805 0 795 1 1 6 N
 S -50 905 0 895 1 1 6 N
 S -50 1005 0 995 1 1 6 N
 S -50 1105 0 1095 1 1 6 N
-S -50 1150 50 -1150 1 1 10 f
-X Pin_1 1 -200 1100 150 R 50 50 1 1 P
-X Pin_10 10 -200 200 150 R 50 50 1 1 P
-X Pin_11 11 -200 100 150 R 50 50 1 1 P
-X Pin_12 12 -200 0 150 R 50 50 1 1 P
-X Pin_13 13 -200 -100 150 R 50 50 1 1 P
-X Pin_14 14 -200 -200 150 R 50 50 1 1 P
-X Pin_15 15 -200 -300 150 R 50 50 1 1 P
-X Pin_16 16 -200 -400 150 R 50 50 1 1 P
-X Pin_17 17 -200 -500 150 R 50 50 1 1 P
-X Pin_18 18 -200 -600 150 R 50 50 1 1 P
-X Pin_19 19 -200 -700 150 R 50 50 1 1 P
-X Pin_2 2 -200 1000 150 R 50 50 1 1 P
-X Pin_20 20 -200 -800 150 R 50 50 1 1 P
-X Pin_21 21 -200 -900 150 R 50 50 1 1 P
-X Pin_22 22 -200 -1000 150 R 50 50 1 1 P
-X Pin_23 23 -200 -1100 150 R 50 50 1 1 P
-X Pin_3 3 -200 900 150 R 50 50 1 1 P
-X Pin_4 4 -200 800 150 R 50 50 1 1 P
-X Pin_5 5 -200 700 150 R 50 50 1 1 P
-X Pin_6 6 -200 600 150 R 50 50 1 1 P
-X Pin_7 7 -200 500 150 R 50 50 1 1 P
-X Pin_8 8 -200 400 150 R 50 50 1 1 P
-X Pin_9 9 -200 300 150 R 50 50 1 1 P
+S -50 1205 0 1195 1 1 6 N
+S -50 1250 50 -1350 1 1 10 f
+X Pin_1 1 -200 1200 150 R 50 50 1 1 P
+X Pin_10 10 -200 300 150 R 50 50 1 1 P
+X Pin_11 11 -200 200 150 R 50 50 1 1 P
+X Pin_12 12 -200 100 150 R 50 50 1 1 P
+X Pin_13 13 -200 0 150 R 50 50 1 1 P
+X Pin_14 14 -200 -100 150 R 50 50 1 1 P
+X Pin_15 15 -200 -200 150 R 50 50 1 1 P
+X Pin_16 16 -200 -300 150 R 50 50 1 1 P
+X Pin_17 17 -200 -400 150 R 50 50 1 1 P
+X Pin_18 18 -200 -500 150 R 50 50 1 1 P
+X Pin_19 19 -200 -600 150 R 50 50 1 1 P
+X Pin_2 2 -200 1100 150 R 50 50 1 1 P
+X Pin_20 20 -200 -700 150 R 50 50 1 1 P
+X Pin_21 21 -200 -800 150 R 50 50 1 1 P
+X Pin_22 22 -200 -900 150 R 50 50 1 1 P
+X Pin_23 23 -200 -1000 150 R 50 50 1 1 P
+X Pin_24 24 -200 -1100 150 R 50 50 1 1 P
+X Pin_25 25 -200 -1200 150 R 50 50 1 1 P
+X Pin_26 26 -200 -1300 150 R 50 50 1 1 P
+X Pin_3 3 -200 1000 150 R 50 50 1 1 P
+X Pin_4 4 -200 900 150 R 50 50 1 1 P
+X Pin_5 5 -200 800 150 R 50 50 1 1 P
+X Pin_6 6 -200 700 150 R 50 50 1 1 P
+X Pin_7 7 -200 600 150 R 50 50 1 1 P
+X Pin_8 8 -200 500 150 R 50 50 1 1 P
+X Pin_9 9 -200 400 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -363,6 +375,7 @@ F0 "U" 0 450 50 H V C CNN
 F1 "discrete-parts_ADF4360-7BCPZRL7" 0 300 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+F4 "584-ADF4360-7BCPZR7" 0 0 50 H V C CNN "Mouser"
 ALIAS ADF4360-7BCPZ ADF4360-7BCPZRL
 DRAW
 S -700 400 700 -1300 0 1 0 f
@@ -390,7 +403,7 @@ X VTUNE 7 800 -400 100 L 50 50 1 1 I
 X AGND 8 0 -1400 100 U 50 50 1 1 P
 X L1 9 -800 -700 100 R 50 50 1 1 P
 X 24 CP 800 -850 100 L 50 50 1 1 O
-X 25 EP 400 -1400 100 U 50 50 1 1 P
+X 0 EP 400 -1400 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/pcb/discrete/discrete-rf-board/discrete-rf-board.sch b/pcb/discrete/discrete-rf-board/discrete-rf-board.sch
index f71c181..f3ceb68 100644
--- a/pcb/discrete/discrete-rf-board/discrete-rf-board.sch
+++ b/pcb/discrete/discrete-rf-board/discrete-rf-board.sch
@@ -344,8 +344,6 @@ Text Label 3750 3550 3    50   ~ 0
 LO_SW_CTRL_3V3
 Wire Wire Line
 	3750 3550 3850 3550
-Text Label 9000 3450 3    50   ~ 0
-RF_SW_CTRL
 Wire Wire Line
 	9000 3450 8800 3450
 Text Label 2550 1900 0    50   ~ 0
@@ -896,21 +894,21 @@ Wire Wire Line
 	7100 2250 7250 2250
 Wire Wire Line
 	7250 2350 7100 2350
-Text Label 1500 5700 0    50   ~ 0
+Text Label 1250 5650 0    50   ~ 0
 PLL_5V0
-Text Label 1500 5800 0    50   ~ 0
+Text Label 1250 5750 0    50   ~ 0
 PLL_3V3
-Text Label 1500 5900 0    50   ~ 0
+Text Label 1250 5850 0    50   ~ 0
 PLL_DATA
-Text Label 1500 6000 0    50   ~ 0
+Text Label 1250 5950 0    50   ~ 0
 PLL_CLK
-Text Label 1500 6100 0    50   ~ 0
+Text Label 1250 6050 0    50   ~ 0
 PLL_CE
-Text Label 1500 6200 0    50   ~ 0
+Text Label 1250 6150 0    50   ~ 0
 PLL_LE
-Text Label 1500 6300 0    50   ~ 0
+Text Label 1250 6250 0    50   ~ 0
 PLL_MUXOUT
-Text Label 1500 6400 0    50   ~ 0
+Text Label 1250 6350 0    50   ~ 0
 PLL_GND
 Text Label 2450 5100 0    50   ~ 0
 TX_I_DAC_GND
@@ -1018,33 +1016,22 @@ Text Label 3750 6050 0    50   ~ 0
 RX_LNA_BYP1
 Text Label 3750 6150 0    50   ~ 0
 RX_LNA_BYP2
-$Comp
-L Connector_Generic:Conn_01x08 J?
-U 1 1 5DA33260
-P 1200 6000
-F 0 "J?" H 1200 6400 50  0000 C CNN
-F 1 "Conn_01x08" H 1200 5500 50  0000 C CNN
-F 2 "" H 1200 6000 50  0001 C CNN
-F 3 "~" H 1200 6000 50  0001 C CNN
-	1    1200 6000
-	-1   0    0    -1  
-$EndComp
 Wire Wire Line
-	1400 5700 1500 5700
+	1150 5650 1250 5650
 Wire Wire Line
-	1500 5800 1400 5800
+	1250 5750 1150 5750
 Wire Wire Line
-	1400 5900 1500 5900
+	1150 5850 1250 5850
 Wire Wire Line
-	1500 6000 1400 6000
+	1250 5950 1150 5950
 Wire Wire Line
-	1400 6100 1500 6100
+	1150 6050 1250 6050
 Wire Wire Line
-	1500 6200 1400 6200
+	1250 6150 1150 6150
 Wire Wire Line
-	1400 6300 1500 6300
+	1150 6250 1250 6250
 Wire Wire Line
-	1400 6400 1500 6400
+	1150 6350 1250 6350
 Wire Wire Line
 	2450 5100 2300 5100
 Wire Wire Line
@@ -1092,17 +1079,6 @@ Wire Wire Line
 Wire Wire Line
 	2300 6300 2450 6300
 $Comp
-L Connector_Generic:Conn_01x23 J?
-U 1 1 5DAC4901
-P 2100 6200
-F 0 "J?" H 2100 7400 50  0000 C CNN
-F 1 "Conn_01x23" H 2100 5000 50  0000 C CNN
-F 2 "" H 2100 6200 50  0001 C CNN
-F 3 "~" H 2100 6200 50  0001 C CNN
-	1    2100 6200
-	-1   0    0    -1  
-$EndComp
-$Comp
 L Connector_Generic:Conn_01x30 J?
 U 1 1 5DAC6938
 P 3400 6150
@@ -1173,4 +1149,82 @@ Wire Wire Line
 	3600 7650 3750 7650
 Wire Wire Line
 	3600 7450 3750 7450
+Text Label 2450 5000 0    50   ~ 0
+RF_SW_VDD_5V
+Text Label 1250 5550 0    50   ~ 0
+LO_SW_VDD_5V
+Wire Wire Line
+	1150 5550 1250 5550
+Text Label 8300 1850 0    50   ~ 0
+RF_SW_GND
+$Comp
+L power:GND #PWR?
+U 1 1 5DB60E45
+P 8200 1850
+F 0 "#PWR?" H 8200 1600 50  0001 C CNN
+F 1 "GND" H 8200 1700 50  0000 C CNN
+F 2 "" H 8200 1850 50  0001 C CNN
+F 3 "" H 8200 1850 50  0001 C CNN
+	1    8200 1850
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	8200 1850 8300 1850
+Text Label 2450 4900 0    50   ~ 0
+RF_SW_GND
+Wire Wire Line
+	2300 5000 2450 5000
+Wire Wire Line
+	2450 4900 2300 4900
+Text Label 2550 1650 0    50   ~ 0
+LO_SW_GND
+$Comp
+L power:GND #PWR?
+U 1 1 5DB9787B
+P 2450 1650
+F 0 "#PWR?" H 2450 1400 50  0001 C CNN
+F 1 "GND" H 2450 1500 50  0000 C CNN
+F 2 "" H 2450 1650 50  0001 C CNN
+F 3 "" H 2450 1650 50  0001 C CNN
+	1    2450 1650
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	2450 1650 2550 1650
+Text Label 1250 5450 0    50   ~ 0
+LO_SW_GND
+Wire Wire Line
+	1150 5450 1250 5450
+Text Label 1250 5350 0    50   ~ 0
+LO_SW_CTRL_3V3
+Text Label 9000 3450 3    50   ~ 0
+RF_SW_CTRL
+Text Label 2450 4800 0    50   ~ 0
+RF_SW_CTRL
+$Comp
+L Connector_Generic:Conn_01x11 J?
+U 1 1 5DBBF0DF
+P 950 5850
+F 0 "J?" H 950 6450 50  0000 C CNN
+F 1 "Conn_01x11" H 950 5250 50  0000 C CNN
+F 2 "" H 950 5850 50  0001 C CNN
+F 3 "~" H 950 5850 50  0001 C CNN
+	1    950  5850
+	-1   0    0    -1  
+$EndComp
+$Comp
+L Connector_Generic:Conn_01x26 J?
+U 1 1 5DBC1FAA
+P 2100 6000
+F 0 "J?" H 2100 7300 50  0000 C CNN
+F 1 "Conn_01x26" H 2100 4600 50  0000 C CNN
+F 2 "" H 2100 6000 50  0001 C CNN
+F 3 "~" H 2100 6000 50  0001 C CNN
+	1    2100 6000
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	2300 4800 2450 4800
+Wire Wire Line
+	1150 5350 1250 5350
 $EndSCHEMATC
diff --git a/pcb/discrete/discrete-rf-board/discrete-rf-board.sch-bak b/pcb/discrete/discrete-rf-board/discrete-rf-board.sch-bak
index f71c181..f3ceb68 100644
--- a/pcb/discrete/discrete-rf-board/discrete-rf-board.sch-bak
+++ b/pcb/discrete/discrete-rf-board/discrete-rf-board.sch-bak
@@ -344,8 +344,6 @@ Text Label 3750 3550 3    50   ~ 0
 LO_SW_CTRL_3V3
 Wire Wire Line
 	3750 3550 3850 3550
-Text Label 9000 3450 3    50   ~ 0
-RF_SW_CTRL
 Wire Wire Line
 	9000 3450 8800 3450
 Text Label 2550 1900 0    50   ~ 0
@@ -896,21 +894,21 @@ Wire Wire Line
 	7100 2250 7250 2250
 Wire Wire Line
 	7250 2350 7100 2350
-Text Label 1500 5700 0    50   ~ 0
+Text Label 1250 5650 0    50   ~ 0
 PLL_5V0
-Text Label 1500 5800 0    50   ~ 0
+Text Label 1250 5750 0    50   ~ 0
 PLL_3V3
-Text Label 1500 5900 0    50   ~ 0
+Text Label 1250 5850 0    50   ~ 0
 PLL_DATA
-Text Label 1500 6000 0    50   ~ 0
+Text Label 1250 5950 0    50   ~ 0
 PLL_CLK
-Text Label 1500 6100 0    50   ~ 0
+Text Label 1250 6050 0    50   ~ 0
 PLL_CE
-Text Label 1500 6200 0    50   ~ 0
+Text Label 1250 6150 0    50   ~ 0
 PLL_LE
-Text Label 1500 6300 0    50   ~ 0
+Text Label 1250 6250 0    50   ~ 0
 PLL_MUXOUT
-Text Label 1500 6400 0    50   ~ 0
+Text Label 1250 6350 0    50   ~ 0
 PLL_GND
 Text Label 2450 5100 0    50   ~ 0
 TX_I_DAC_GND
@@ -1018,33 +1016,22 @@ Text Label 3750 6050 0    50   ~ 0
 RX_LNA_BYP1
 Text Label 3750 6150 0    50   ~ 0
 RX_LNA_BYP2
-$Comp
-L Connector_Generic:Conn_01x08 J?
-U 1 1 5DA33260
-P 1200 6000
-F 0 "J?" H 1200 6400 50  0000 C CNN
-F 1 "Conn_01x08" H 1200 5500 50  0000 C CNN
-F 2 "" H 1200 6000 50  0001 C CNN
-F 3 "~" H 1200 6000 50  0001 C CNN
-	1    1200 6000
-	-1   0    0    -1  
-$EndComp
 Wire Wire Line
-	1400 5700 1500 5700
+	1150 5650 1250 5650
 Wire Wire Line
-	1500 5800 1400 5800
+	1250 5750 1150 5750
 Wire Wire Line
-	1400 5900 1500 5900
+	1150 5850 1250 5850
 Wire Wire Line
-	1500 6000 1400 6000
+	1250 5950 1150 5950
 Wire Wire Line
-	1400 6100 1500 6100
+	1150 6050 1250 6050
 Wire Wire Line
-	1500 6200 1400 6200
+	1250 6150 1150 6150
 Wire Wire Line
-	1400 6300 1500 6300
+	1150 6250 1250 6250
 Wire Wire Line
-	1400 6400 1500 6400
+	1150 6350 1250 6350
 Wire Wire Line
 	2450 5100 2300 5100
 Wire Wire Line
@@ -1092,17 +1079,6 @@ Wire Wire Line
 Wire Wire Line
 	2300 6300 2450 6300
 $Comp
-L Connector_Generic:Conn_01x23 J?
-U 1 1 5DAC4901
-P 2100 6200
-F 0 "J?" H 2100 7400 50  0000 C CNN
-F 1 "Conn_01x23" H 2100 5000 50  0000 C CNN
-F 2 "" H 2100 6200 50  0001 C CNN
-F 3 "~" H 2100 6200 50  0001 C CNN
-	1    2100 6200
-	-1   0    0    -1  
-$EndComp
-$Comp
 L Connector_Generic:Conn_01x30 J?
 U 1 1 5DAC6938
 P 3400 6150
@@ -1173,4 +1149,82 @@ Wire Wire Line
 	3600 7650 3750 7650
 Wire Wire Line
 	3600 7450 3750 7450
+Text Label 2450 5000 0    50   ~ 0
+RF_SW_VDD_5V
+Text Label 1250 5550 0    50   ~ 0
+LO_SW_VDD_5V
+Wire Wire Line
+	1150 5550 1250 5550
+Text Label 8300 1850 0    50   ~ 0
+RF_SW_GND
+$Comp
+L power:GND #PWR?
+U 1 1 5DB60E45
+P 8200 1850
+F 0 "#PWR?" H 8200 1600 50  0001 C CNN
+F 1 "GND" H 8200 1700 50  0000 C CNN
+F 2 "" H 8200 1850 50  0001 C CNN
+F 3 "" H 8200 1850 50  0001 C CNN
+	1    8200 1850
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	8200 1850 8300 1850
+Text Label 2450 4900 0    50   ~ 0
+RF_SW_GND
+Wire Wire Line
+	2300 5000 2450 5000
+Wire Wire Line
+	2450 4900 2300 4900
+Text Label 2550 1650 0    50   ~ 0
+LO_SW_GND
+$Comp
+L power:GND #PWR?
+U 1 1 5DB9787B
+P 2450 1650
+F 0 "#PWR?" H 2450 1400 50  0001 C CNN
+F 1 "GND" H 2450 1500 50  0000 C CNN
+F 2 "" H 2450 1650 50  0001 C CNN
+F 3 "" H 2450 1650 50  0001 C CNN
+	1    2450 1650
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	2450 1650 2550 1650
+Text Label 1250 5450 0    50   ~ 0
+LO_SW_GND
+Wire Wire Line
+	1150 5450 1250 5450
+Text Label 1250 5350 0    50   ~ 0
+LO_SW_CTRL_3V3
+Text Label 9000 3450 3    50   ~ 0
+RF_SW_CTRL
+Text Label 2450 4800 0    50   ~ 0
+RF_SW_CTRL
+$Comp
+L Connector_Generic:Conn_01x11 J?
+U 1 1 5DBBF0DF
+P 950 5850
+F 0 "J?" H 950 6450 50  0000 C CNN
+F 1 "Conn_01x11" H 950 5250 50  0000 C CNN
+F 2 "" H 950 5850 50  0001 C CNN
+F 3 "~" H 950 5850 50  0001 C CNN
+	1    950  5850
+	-1   0    0    -1  
+$EndComp
+$Comp
+L Connector_Generic:Conn_01x26 J?
+U 1 1 5DBC1FAA
+P 2100 6000
+F 0 "J?" H 2100 7300 50  0000 C CNN
+F 1 "Conn_01x26" H 2100 4600 50  0000 C CNN
+F 2 "" H 2100 6000 50  0001 C CNN
+F 3 "~" H 2100 6000 50  0001 C CNN
+	1    2100 6000
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	2300 4800 2450 4800
+Wire Wire Line
+	1150 5350 1250 5350
 $EndSCHEMATC
diff --git a/pcb/discrete/discrete-rf-board/discrete_footprints.pretty/Analog_CP-24-14.kicad_mod b/pcb/discrete/discrete-rf-board/discrete_footprints.pretty/Analog_CP-24-14.kicad_mod
new file mode 100644
index 0000000..9912202
--- /dev/null
+++ b/pcb/discrete/discrete-rf-board/discrete_footprints.pretty/Analog_CP-24-14.kicad_mod
@@ -0,0 +1,87 @@
+(module Analog-CP-24-14 (layer F.Cu) (tedit 5D80C84C)
+  (fp_text reference REF** (at 0.0 0.0) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user %R (at 0.0 0.0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value %V (at 0 -0.5) (layer F.Fab) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+
+  (fp_line (start -2.2 -1.625) (end -1.625 -2.2) (layer F.SilkS) (width 0.15))
+  (fp_line (start -2.2 2.2) (end -2.2 1.625) (layer F.SilkS) (width 0.15))
+  (fp_line (start -1.625 2.2) (end -2.2 2.2) (layer F.SilkS) (width 0.15))
+  (fp_line (start 1.625 2.2) (end 2.2 2.2) (layer F.SilkS) (width 0.15))
+  (fp_line (start 2.2 2.2) (end 2.2 1.625) (layer F.SilkS) (width 0.15))
+  (fp_line (start 2.2 -1.625) (end 2.2 -2.2) (layer F.SilkS) (width 0.15))
+  (fp_line (start 2.2 -2.2) (end 1.625 -2.2) (layer F.SilkS) (width 0.15))
+  (fp_circle (center -2.2 -2.2) (end -2.2 -2.35) (layer F.SilkS) (width 0.15))
+  (fp_line (start -1.7499999999999998 -2.05) (end -2.05 -1.7499999999999998) (layer F.Fab) (width 0.15))
+  (fp_line (start 2.05 -2.05) (end -1.7499999999999998 -2.05) (layer F.Fab) (width 0.15))
+  (fp_line (start 2.05 2.05) (end 2.05 -2.05) (layer F.Fab) (width 0.15))
+  (fp_line (start -2.05 2.05) (end 2.05 2.05) (layer F.Fab) (width 0.15))
+  (fp_line (start -2.05 -1.7499999999999998) (end -2.05 2.05) (layer F.Fab) (width 0.15))
+  (fp_line (start -2.3 -1.525) (end -2.3 -2.3) (layer F.CrtYd) (width 0.15))
+  (fp_line (start -2.3 -2.3) (end 2.3 -2.3) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 2.3 -2.3) (end 2.3 -1.525) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 2.3 -1.525) (end 2.1999999999999997 -1.525) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 2.1999999999999997 -1.525) (end 2.1999999999999997 1.525) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 2.1999999999999997 1.525) (end 2.3 1.525) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 2.3 1.525) (end 2.3 2.3) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 2.3 2.3) (end -2.3 2.3) (layer F.CrtYd) (width 0.15))
+  (fp_line (start -2.3 2.3) (end -2.3 1.525) (layer F.CrtYd) (width 0.15))
+  (fp_line (start -2.3 1.525) (end -2.1999999999999997 1.525) (layer F.CrtYd) (width 0.15))
+  (fp_line (start -2.1999999999999997 1.525) (end -2.1999999999999997 -1.525) (layer F.CrtYd) (width 0.15))
+  (fp_line (start -2.1999999999999997 -1.525) (end -2.3 -1.525) (layer F.CrtYd) (width 0.15))
+  (pad 1 smd rect (at -1.7999999999999998 -1.25) (size 0.4999999999999998 0.35) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 2 smd rect (at -1.7999999999999998 -0.75) (size 0.4999999999999998 0.35) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 3 smd rect (at -1.7999999999999998 -0.25) (size 0.4999999999999998 0.35) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 4 smd rect (at -1.7999999999999998 0.25) (size 0.4999999999999998 0.35) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 5 smd rect (at -1.7999999999999998 0.75) (size 0.4999999999999998 0.35) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 6 smd rect (at -1.7999999999999998 1.25) (size 0.4999999999999998 0.35) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 7 smd rect (at -1.25 1.7999999999999998) (size 0.35 0.4999999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 8 smd rect (at -0.75 1.7999999999999998) (size 0.35 0.4999999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 9 smd rect (at -0.25 1.7999999999999998) (size 0.35 0.4999999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 10 smd rect (at 0.25 1.7999999999999998) (size 0.35 0.4999999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 11 smd rect (at 0.75 1.7999999999999998) (size 0.35 0.4999999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 12 smd rect (at 1.25 1.7999999999999998) (size 0.35 0.4999999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 13 smd rect (at 1.7999999999999998 1.25) (size 0.4999999999999998 0.35) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 14 smd rect (at 1.7999999999999998 0.75) (size 0.4999999999999998 0.35) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 15 smd rect (at 1.7999999999999998 0.25) (size 0.4999999999999998 0.35) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 16 smd rect (at 1.7999999999999998 -0.25) (size 0.4999999999999998 0.35) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 17 smd rect (at 1.7999999999999998 -0.75) (size 0.4999999999999998 0.35) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 18 smd rect (at 1.7999999999999998 -1.25) (size 0.4999999999999998 0.35) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 19 smd rect (at 1.25 -1.7999999999999998) (size 0.35 0.4999999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 20 smd rect (at 0.75 -1.7999999999999998) (size 0.35 0.4999999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 21 smd rect (at 0.25 -1.7999999999999998) (size 0.35 0.4999999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 22 smd rect (at -0.25 -1.7999999999999998) (size 0.35 0.4999999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 23 smd rect (at -0.75 -1.7999999999999998) (size 0.35 0.4999999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 24 smd rect (at -1.25 -1.7999999999999998) (size 0.35 0.4999999999999998) (layers F.Cu F.Paste F.Mask)
+     (solder_mask_margin 0.05))
+  (pad 0 smd rect (at 0 0) (size 2.44 2.44) (layers F.Cu F.Paste F.Mask)
+      (solder_mask_margin 0.05))
+)
diff --git a/pcb/discrete/discrete-rf-board/discrete_footprints.pretty/Infineon_SOT143.kicad_mod b/pcb/discrete/discrete-rf-board/discrete_footprints.pretty/Infineon_SOT143.kicad_mod
new file mode 100644
index 0000000..c2edbcc
--- /dev/null
+++ b/pcb/discrete/discrete-rf-board/discrete_footprints.pretty/Infineon_SOT143.kicad_mod
@@ -0,0 +1,44 @@
+(module Infineon_SOT143 (layer F.Cu) (tedit 5D80D435)
+  (fp_text reference REF** (at 0 -0.00508) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value Infineon_SOT143 (at 0 -0.5) (layer F.Fab) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user %R (at 0 -0.04064) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.45 -0.65) (end -1.45 0.65) (layer F.Fab) (width 0.12))
+  (fp_line (start -1.45 0.65) (end 1.45 0.65) (layer F.Fab) (width 0.12))
+  (fp_line (start 1.45 0.65) (end 1.45 -0.65) (layer F.Fab) (width 0.12))
+  (fp_line (start 1.45 -0.65) (end -1.45 -0.65) (layer F.Fab) (width 0.12))
+  (fp_line (start -1.55 -0.7) (end -1.55 0.7) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.55 0.7) (end -1.5 0.7) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.5 -0.65) (end 1.5 0.7) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.55 -0.7) (end 0.55 -0.7) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.1 0.7) (end 0.5 0.7) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.5 -0.8) (end -1.5 -1.55) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -1.5 -1.55) (end -0.5 -1.55) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -0.5 -1.55) (end -0.5 -0.8) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -0.5 -0.8) (end 0.5 -0.8) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 0.5 -0.8) (end 0.5 -1.55) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 0.5 -1.55) (end 1.5 -1.55) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 1.5 -1.55) (end 1.5 -0.8) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 1.5 -0.8) (end 1.65 -0.8) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 1.65 -0.8) (end 1.65 0.85) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 1.65 0.85) (end 1.5 0.85) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 1.5 0.85) (end 1.5 1.55) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 1.5 1.55) (end 0.5 1.55) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 0.5 1.55) (end 0.5 0.85) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 0.5 0.85) (end -0.1 0.85) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -0.1 0.85) (end -0.1 1.55) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -0.1 1.55) (end -1.5 1.55) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -1.5 1.55) (end -1.5 0.9) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -1.5 0.9) (end -1.7 0.9) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -1.7 0.9) (end -1.7 -0.8) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -1.7 -0.8) (end -1.5 -0.8) (layer F.CrtYd) (width 0.12))
+  (pad 1 smd rect (at -0.8 1) (size 1.2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at 1 1) (size 0.8 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd rect (at 1 -1) (size 0.8 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at -1 -1) (size 0.8 0.9) (layers F.Cu F.Paste F.Mask))
+)
diff --git a/pcb/discrete/discrete-rf-board/discrete_footprints.pretty/Infineon_TSLP-6-4.kicad_mod b/pcb/discrete/discrete-rf-board/discrete_footprints.pretty/Infineon_TSLP-6-4.kicad_mod
new file mode 100644
index 0000000..b216a85
--- /dev/null
+++ b/pcb/discrete/discrete-rf-board/discrete_footprints.pretty/Infineon_TSLP-6-4.kicad_mod
@@ -0,0 +1,40 @@
+(module Infineon-TSLP6-4 (layer F.Cu) (tedit 5D80D946)
+  (fp_text reference REF** (at 0.0 0.0) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user %R (at 0.0 0.0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value %V (at 0 -0.5) (layer F.Fab) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+
+  (fp_line (start -0.55 -0.7250000000000001) (end -0.5250000000000001 -0.75) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.5250000000000001 -0.75) (end 0.55 -0.75) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0.55 -0.75) (end 0.55 -0.7250000000000001) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0.55 0.7250000000000001) (end 0.55 0.75) (layer F.SilkS) (width 0.15))
+  (fp_line (start 0.55 0.75) (end -0.55 0.75) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.55 0.75) (end -0.55 0.7250000000000001) (layer F.SilkS) (width 0.15))
+  (fp_circle (center -0.2 -1.125) (end -0.2 -0.975) (layer F.SilkS) (width 0.15))
+  (fp_line (start -0.09999999999999998 -0.6000000000000001) (end -0.39999999999999997 -0.3000000000000001) (layer F.Fab) (width 0.15))
+  (fp_line (start 0.39999999999999997 -0.6000000000000001) (end -0.09999999999999998 -0.6000000000000001) (layer F.Fab) (width 0.15))
+  (fp_line (start 0.39999999999999997 0.6000000000000001) (end 0.39999999999999997 -0.6000000000000001) (layer F.Fab) (width 0.15))
+  (fp_line (start -0.39999999999999997 0.6000000000000001) (end 0.39999999999999997 0.6000000000000001) (layer F.Fab) (width 0.15))
+  (fp_line (start -0.39999999999999997 -0.3000000000000001) (end -0.39999999999999997 0.6000000000000001) (layer F.Fab) (width 0.15))
+  (fp_line (start 0.42500000000000004 -0.75) (end -0.42500000000000004 -0.75) (layer F.CrtYd) (width 0.15))
+  (fp_line (start -0.42500000000000004 -0.75) (end -0.42500000000000004 0.75) (layer F.CrtYd) (width 0.15))
+  (fp_line (start -0.42500000000000004 0.75) (end 0.42500000000000004 0.75) (layer F.CrtYd) (width 0.15))
+  (fp_line (start 0.42500000000000004 0.75) (end 0.42500000000000004 -0.75) (layer F.CrtYd) (width 0.15))
+  (pad 1 smd rect (at -0.2 -0.4) (size 0.25 0.25) (layers F.Cu F.Paste F.Mask)
+      (solder_mask_margin 0.05))
+  (pad 2 smd rect (at -0.2 0.0) (size 0.25 0.25) (layers F.Cu F.Paste F.Mask)
+      (solder_mask_margin 0.05))
+  (pad 3 smd rect (at -0.2 0.4) (size 0.25 0.25) (layers F.Cu F.Paste F.Mask)
+      (solder_mask_margin 0.05))
+  (pad 4 smd rect (at 0.2 0.4) (size 0.25 0.25) (layers F.Cu F.Paste F.Mask)
+      (solder_mask_margin 0.05))
+  (pad 5 smd rect (at 0.2 -0.0) (size 0.25 0.25) (layers F.Cu F.Paste F.Mask)
+      (solder_mask_margin 0.05))
+  (pad 6 smd rect (at 0.2 -0.4) (size 0.25 0.25) (layers F.Cu F.Paste F.Mask)
+      (solder_mask_margin 0.05))
+)
diff --git a/pcb/discrete/discrete-rf-board/discrete_footprints.pretty/Murata_SM2016-4.kicad_mod b/pcb/discrete/discrete-rf-board/discrete_footprints.pretty/Murata_SM2016-4.kicad_mod
new file mode 100644
index 0000000..87c12e5
--- /dev/null
+++ b/pcb/discrete/discrete-rf-board/discrete_footprints.pretty/Murata_SM2016-4.kicad_mod
@@ -0,0 +1,34 @@
+(module Murata_SM2016-4 (layer F.Cu) (tedit 5D80D64E)
+  (fp_text reference REF** (at 0 0.5) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value Murata_SM2016-4 (at 0 -0.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -1.25 1) (end -1.25 0.6) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.25 0.6) (end -1.25 1) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.25 1) (end -0.85 1) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0.9 1) (end 1.2 1) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.2 1) (end 1.2 0.7) (layer F.SilkS) (width 0.12))
+  (fp_line (start 0.9 -1) (end 1.2 -1) (layer F.SilkS) (width 0.12))
+  (fp_line (start 1.2 -1) (end 1.2 -0.7) (layer F.SilkS) (width 0.12))
+  (fp_circle (center -1.4 1.1) (end -1.3 1.15) (layer F.SilkS) (width 0.12))
+  (fp_line (start -0.9 -1) (end -1.2 -1) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.2 -1) (end -1.2 -0.7) (layer F.SilkS) (width 0.12))
+  (fp_line (start -1.25 -1.05) (end -1.3 1.05) (layer F.Fab) (width 0.12))
+  (fp_line (start -1.3 1.05) (end 1.25 1.05) (layer F.Fab) (width 0.12))
+  (fp_line (start 1.25 1.05) (end 1.25 -1.05) (layer F.Fab) (width 0.12))
+  (fp_line (start 1.25 -1.05) (end -1.25 -1.05) (layer F.Fab) (width 0.12))
+  (fp_line (start -1.3 0.8) (end -1.05 1.05) (layer F.Fab) (width 0.12))
+  (fp_line (start -1.1 -0.9) (end -1.1 0.9) (layer F.CrtYd) (width 0.12))
+  (fp_line (start -1.1 0.9) (end 1.1 0.9) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 1.1 0.9) (end 1.1 -0.9) (layer F.CrtYd) (width 0.12))
+  (fp_line (start 1.1 -0.9) (end -1.1 -0.9) (layer F.CrtYd) (width 0.12))
+  (pad 1 smd rect (at -0.7 0.6) (size 0.8 0.6) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at 0.7 0.6) (size 0.8 0.6) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd rect (at 0.7 -0.6) (size 0.8 0.6) (layers F.Cu F.Paste F.Mask))
+  (pad 4 smd rect (at -0.7 -0.6) (size 0.8 0.6) (layers F.Cu F.Paste F.Mask))
+)
diff --git a/pcb/discrete/discrete-rf-board/fp-info-cache b/pcb/discrete/discrete-rf-board/fp-info-cache
new file mode 100644
index 0000000..c73c48c
--- /dev/null
+++ b/pcb/discrete/discrete-rf-board/fp-info-cache
@@ -0,0 +1,22 @@
+4706169556058
+discrete_footprints
+Analog_CP-24-14
+
+
+0
+25
+25
+discrete_footprints
+Infineon_SOT143
+
+
+0
+4
+3
+discrete_footprints
+Murata_SM2016-4
+
+
+0
+4
+4
diff --git a/pcb/discrete/discrete-rf-board/fp-lib-table b/pcb/discrete/discrete-rf-board/fp-lib-table
new file mode 100644
index 0000000..e5ed717
--- /dev/null
+++ b/pcb/discrete/discrete-rf-board/fp-lib-table
@@ -0,0 +1,3 @@
+(fp_lib_table
+  (lib (name discrete_footprints)(type KiCad)(uri ${KIPRJMOD}/discrete_footprints.pretty)(options "")(descr ""))
+)
diff --git a/pcb/discrete/discrete-rf-board/gen_analog_cp24_14.py b/pcb/discrete/discrete-rf-board/gen_analog_cp24_14.py
new file mode 100644
index 0000000..183a325
--- /dev/null
+++ b/pcb/discrete/discrete-rf-board/gen_analog_cp24_14.py
@@ -0,0 +1,280 @@
+#!/usr/bin/env python3
+
+# QFN/QFP-style packages with ground plane
+# version 0.0.6
+
+# added solder mask parameter
+# added optional indicator circle
+# added ground pad
+# made ground pad optional
+# fix silkscreen pin 1 marker
+# added rounded pads option
+# added reference designator to fab layer
+# make fab layer pin drawing optional
+# added TI's weird ground pad extensions
+# v0.0.5
+# added indicator marker to fab layer
+# v0.0.6
+# removed TI extensions
+# converted for use in QFN/QFP packages
+# - add pads for QFN/QFP
+# - add fab pad drawings for QFN/QFP
+# - fix silkscreen
+
+PARTNAME = "Analog-CP-24-14"
+
+total_pins = 24
+num_per_edge = total_pins // 4
+
+M1 = 0.2 # silkscreen margin
+M2 = 0.05 # fab outline margin
+M3 = 0.3 # courtyard margin
+
+Z = 4.0 + 0.1 # distance across outer edges of pads
+G = 4.0 - 2*0.40 - 0.1  # distance across inner edges of pads
+
+X = (Z+G)/2. # distance between pad centers
+C = 0.5 # footprint pad spacing
+w = 0.30 + 0.05 # footprint pad width
+h = (Z-G)/2. # footprint pad length
+
+show_fab_pads = False
+H = 4.0 # distance from physical pad end to opposite pad end
+e = C    # physical pad spacing, same as above
+b = 0.25 # physical pad width
+L1 = -0.40 # physical pad length
+
+D1 = 4.0 # package width
+E1 = 4.0 # package height
+
+has_ground_pad = True
+G1 = 2.44  # ground pad width
+H1 = 2.44  # ground pad height
+ground_pad_num = 0
+
+# NOTE: need to test with SMD footprints
+# need to make sure pad size adjustment works
+# nsmd = positive
+solder_mask_margin = 0.05
+indicator_circle_dia = 0.3
+
+pad_radius = None
+
+if solder_mask_margin < 0.0:
+  w -= 2.0*solder_mask_margin
+  h -= 2.0*solder_mask_margin
+  G1 -= 2.0*solder_mask_margin
+  H1 -= 2.0*solder_mask_margin
+
+import math
+
+import time
+gen_time = hex(int(time.time()))[2:].upper()
+
+
+prologue = """(module {} (layer F.Cu) (tedit {})
+  (fp_text reference REF** (at 0.0 0.0) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user %R (at 0.0 0.0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value %V (at 0 -0.5) (layer F.Fab) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+"""
+
+prologue = prologue.format(PARTNAME, gen_time, PARTNAME)
+epilogue = """)"""
+
+print(prologue)
+
+# print silkscreen outline
+inner_edge = C*(num_per_edge/2 - 0.5) + w/2 + M1
+x = D1/2 + M1
+y = E1/2 + M1
+for x, y, nx, ny in [
+    (-x, -inner_edge, -inner_edge, -y),
+
+    (-x, y, -x, inner_edge), (-inner_edge, y, -x, y), 
+    (inner_edge, y, x, y), (x, y, x, inner_edge),
+    (x, -inner_edge, x, -y), (x, -y, inner_edge, -y)]:
+  print("""  (fp_line (start {} {}) (end {} {}) (layer F.SilkS) (width 0.15))""".
+      format(x, y, nx, ny))
+
+if indicator_circle_dia is not None:
+  x = D1/2 + M1 #+ 0.5*indicator_circle_dia
+  y = E1/2 + M1 #+ 0.5*indicator_circle_dia
+  # add indicator circle
+  print("""  (fp_circle (center {} {}) (end {} {}) (layer F.SilkS) (width 0.15))""".
+      format(-x, -y, -x, -y - indicator_circle_dia/2.0))
+
+
+# draw package outline in fab layer
+FC = 0.3
+fab_points = [(-D1/2 - M2 + FC, -E1/2 - M2),
+              (D1/2 + M2, -E1/2 - M2),
+              (D1/2 + M2, E1/2 + M2),
+              (-D1/2 + -M2, E1/2 + M2),
+              (-D1/2 + -M2, -E1/2 - M2 + FC)]
+ 
+nx, ny = fab_points[-1]
+for x, y in fab_points:
+  print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+      format(x, y, nx, ny))
+  nx, ny = x, y
+
+if show_fab_pads:
+  for i in range(num_per_edge):
+    x_pos = -D1/2 - M2
+    y_pos = C*(i-(num_per_edge/2-0.5))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos, y_pos - b/2 - M2, x_pos - L1, y_pos - b/2 - M2))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos - L1, y_pos - b/2 - M2, x_pos - L1, y_pos + b/2 + M2))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos - L1, y_pos + b/2 + M2, x_pos, y_pos + b/2 + M2))
+
+  for i in range(num_per_edge):
+    x_pos = C*(i-(num_per_edge/2-0.5))
+    y_pos = E1/2 + M2
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos - b/2 - M2, y_pos, x_pos - b/2 - M2, y_pos + L1))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos - b/2 - M2, y_pos + L1, x_pos + b/2 + M2, y_pos + L1))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos + b/2 + M2, y_pos + L1, x_pos + b/2 + M2, y_pos))
+
+  for i in range(num_per_edge):
+    x_pos = D1/2 + M2
+    y_pos = -C*(i-(num_per_edge/2-0.5))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos, y_pos + b/2 + M2, x_pos + L1, y_pos + b/2 + M2))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos + L1, y_pos + b/2 + M2, x_pos + L1, y_pos - b/2 - M2))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos + L1, y_pos - b/2 - M2, x_pos, y_pos - b/2 - M2))
+
+  for i in range(num_per_edge):
+    x_pos = -C*(i-(num_per_edge/2-0.5))
+    y_pos = -E1/2 - M2
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos + b/2 + M2, y_pos, x_pos + b/2 + M2, y_pos - L1))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos + b/2 + M2, y_pos - L1, x_pos - b/2 - M2, y_pos - L1))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos - b/2 - M2, y_pos - L1, x_pos - b/2 - M2, y_pos))
+
+
+# print courtyard outline
+inner_x = D1/2 + M3
+outer_x = X/2 + h/2 + M3/2
+inner_y = C*(num_per_edge/2-0.5) + b/2 + M3/2
+outer_y = E1/2 + M3
+pts = [
+    (-inner_x, -outer_y),
+    (inner_x, -outer_y),
+    (inner_x, -inner_y),
+    (outer_x, -inner_y),
+    (outer_x, inner_y),
+    (inner_x, inner_y),
+    (inner_x, outer_y),
+    (-inner_x, outer_y),
+    (-inner_x, inner_y),
+    (-outer_x, inner_y),
+    (-outer_x, -inner_y),
+    (-inner_x, -inner_y)
+    ]
+nx, ny = pts[-1]
+for px, py in pts:
+  x, y, nx, ny = nx, ny, px, py
+  print("""  (fp_line (start {} {}) (end {} {}) (layer F.CrtYd) (width 0.15))""".
+      format(x, y, nx, ny))
+
+
+padtype = "rect"
+padext = ""
+if pad_radius is not None:
+  padtype = "roundrect"
+  padext = "(roundrect_rratio {})".format(pad_radius/min(h, w))
+
+for i in range(0, num_per_edge):
+  print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+    {} (solder_mask_margin {}))""".
+        format(
+            i+1,
+            padtype,
+            -X/2,
+            C*(i-(num_per_edge/2-0.5)),
+            h,
+            w,
+            padext,
+            solder_mask_margin))
+
+for i in range(0, num_per_edge):
+  print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+    {} (solder_mask_margin {}))""".
+        format(
+          i+1+1*num_per_edge,
+          padtype,
+          C*(i-(num_per_edge/2-0.5)),
+          X/2,
+          w,
+          h,
+          padext,
+          solder_mask_margin))
+
+for i in range(0, num_per_edge):
+  print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+    {} (solder_mask_margin {}))""".
+        format(
+          i+1+2*num_per_edge,
+          padtype,
+          X/2,
+          -C*(i-(num_per_edge/2-0.5)),
+          h,
+          w,
+          padext,
+          solder_mask_margin))
+
+for i in range(0, num_per_edge):
+  print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+    {} (solder_mask_margin {}))""".
+        format(
+          i+1+3*num_per_edge,
+          padtype,
+          -C*(i-(num_per_edge/2-0.5)),
+          -X/2,
+          w,
+          h,
+          padext,
+          solder_mask_margin))
+
+
+if has_ground_pad: 
+  if pad_radius is None:
+    # add ground pad
+    print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+      (solder_mask_margin {}))""".
+          format(
+              ground_pad_num,
+              "rect",
+              0,
+              0,
+              G1,
+              H1,
+              solder_mask_margin))
+  else:
+    print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+      (roundrect_rratio {}) (solder_mask_margin {}))""".
+          format(
+              ground_pad_num,
+              "roundrect",
+              0,
+              0,
+              G1,
+              H1,
+              pad_radius/min(G1, H1),
+              solder_mask_margin))
+
+print(epilogue)
diff --git a/pcb/discrete/discrete-rf-board/gen_infineon_tslp-6-4.py b/pcb/discrete/discrete-rf-board/gen_infineon_tslp-6-4.py
new file mode 100644
index 0000000..2a9e340
--- /dev/null
+++ b/pcb/discrete/discrete-rf-board/gen_infineon_tslp-6-4.py
@@ -0,0 +1,270 @@
+#!/usr/bin/env python3
+
+# dual-row, TSSOP-, SOIC-, SO-style packages with ground plane
+# version 0.0.5-ti_oval
+
+# using diagram on page 28 of http://www.ti.com/lit/ds/symlink/tps61200.pdf
+
+# added solder mask parameter
+# added optional indicator circle
+# added ground pad
+# made ground pad optional
+# fix silkscreen pin 1 marker
+# added rounded pads option
+# added reference designator to fab layer
+# make fab layer pin drawing optional
+# added TI's weird ground pad extensions
+# v0.0.5
+# added indicator marker to fab layer
+
+PARTNAME = "Infineon-TSLP6-4"
+
+total_pins = 6
+num_per_edge = total_pins // 2
+
+M1 = 0.2 # silkscreen margin
+M2 = 0.05 # fab outline margin
+M3 = 0.2 # courtyard margin
+
+Z = 0.25 + 0.4 # distance across outer edges of pads
+G = 0.4 - 0.25 # distance across inner edges of pads
+
+X = (Z+G)/2. # distance between pad centers
+C = 0.4 # footprint pad spacing
+w = 0.25 # footprint pad width
+h = (Z-G)/2. # footprint pad length
+
+show_fab_pads = False
+H = 0.7 - 0.05*2 # distance from physical pad end to opposite pad end
+e = C    # physical pad spacing, same as above
+b = 0.2 # physical pad width
+L1 = -0.2 # physical pad length
+
+D1 = 0.7 # package width
+E1 = 1.1 # package height
+
+has_ground_pad = False
+G1 = 1.65  # ground pad width
+H1 = 2.4  # ground pad height
+ground_pad_num = 0
+
+# NOTE: need to test with SMD footprints
+# need to make sure pad size adjustment works
+# nsmd = positive
+solder_mask_margin = 0.05
+indicator_circle_dia = 0.3
+
+pad_radius = None
+
+add_ti_ground_extensions = False
+ti_gnd_ext_spacing = 0.5
+ti_gnd_ext_len = (3.4 - 2.4)/2
+ti_gnd_ext_width = 0.25
+
+if solder_mask_margin < 0.0:
+  w -= 2.0*solder_mask_margin
+  h -= 2.0*solder_mask_margin
+  G1 -= 2.0*solder_mask_margin
+  H1 -= 2.0*solder_mask_margin
+
+import math
+
+import time
+gen_time = hex(int(time.time()))[2:].upper()
+
+
+prologue = """(module {} (layer F.Cu) (tedit {})
+  (fp_text reference REF** (at 0.0 0.0) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user %R (at 0.0 0.0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value %V (at 0 -0.5) (layer F.Fab) hide
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+"""
+
+prologue = prologue.format(PARTNAME, gen_time, PARTNAME)
+epilogue = """)"""
+
+print(prologue)
+
+# print silkscreen outline
+inner_edge = C*(num_per_edge/2 - 0.5) + w/2 + M1
+x = D1/2 + M1
+y = E1/2 + M1
+for x, y, nx, ny in [
+    (-x, -inner_edge, -x+(y-inner_edge), -y),
+    (-x+(y-inner_edge), -y, x, -y), (x, -y, x, -inner_edge),
+
+    (x, inner_edge, x, y), (x, y, -x, y),
+    (-x, y, -x, inner_edge)]:
+  print("""  (fp_line (start {} {}) (end {} {}) (layer F.SilkS) (width 0.15))""".
+      format(x, y, nx, ny))
+
+if indicator_circle_dia is not None:
+  x = X/2
+  y = E1/2 + M1 + 0.75*indicator_circle_dia
+  # add indicator circle
+  print("""  (fp_circle (center {} {}) (end {} {}) (layer F.SilkS) (width 0.15))""".
+      format(-x, -y - indicator_circle_dia/2., -x, -y))
+
+
+# draw package outline in fab layer
+FC = 0.3
+fab_points = [(-D1/2 - M2 + FC, -E1/2 - M2),
+              (D1/2 + M2, -E1/2 - M2),
+              (D1/2 + M2, E1/2 + M2),
+              (-D1/2 + -M2, E1/2 + M2),
+              (-D1/2 + -M2, -E1/2 - M2 + FC)]
+ 
+nx, ny = fab_points[-1]
+for x, y in fab_points:
+  print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+      format(x, y, nx, ny))
+  nx, ny = x, y
+
+if show_fab_pads:
+  for i in range(num_per_edge):
+    x_pos = -D1/2 - M2
+    y_pos = C*(i-(num_per_edge/2-0.5))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos, y_pos - b/2 - M2, x_pos - L1, y_pos - b/2 - M2))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos - L1, y_pos - b/2 - M2, x_pos - L1, y_pos + b/2 + M2))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos - L1, y_pos + b/2 + M2, x_pos, y_pos + b/2 + M2))
+
+  for i in range(num_per_edge):
+    x_pos = D1/2 + M2
+    y_pos = -C*(i-(num_per_edge/2-0.5))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos, y_pos + b/2 + M2, x_pos + L1, y_pos + b/2 + M2))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos + L1, y_pos + b/2 + M2, x_pos + L1, y_pos - b/2 - M2))
+    print("""  (fp_line (start {} {}) (end {} {}) (layer F.Fab) (width 0.15))""".
+        format(x_pos + L1, y_pos - b/2 - M2, x_pos, y_pos - b/2 - M2))
+
+
+# print courtyard outline
+inner_x = D1/2 + M3
+outer_x = X/2 + h/2 + M3/2
+inner_y = C*(num_per_edge/2-0.5) + b/2 + M3/2
+outer_y = E1/2 + M3
+if L1 > 0:
+  pts = [
+      (-inner_x, -outer_y),
+      (inner_x, -outer_y),
+      (inner_x, -inner_y),
+      (outer_x, -inner_y),
+      (outer_x, inner_y),
+      (inner_x, inner_y),
+      (inner_x, outer_y),
+      (-inner_x, outer_y),
+      (-inner_x, inner_y),
+      (-outer_x, inner_y),
+      (-outer_x, -inner_y),
+      (-inner_x, -inner_y)
+      ]
+else:
+  pts = [
+      (-outer_x, -outer_y),
+      (-outer_x, outer_y),
+      (outer_x, outer_y),
+      (outer_x, -outer_y)
+      ]
+nx, ny = pts[-1]
+for px, py in pts:
+  x, y, nx, ny = nx, ny, px, py
+  print("""  (fp_line (start {} {}) (end {} {}) (layer F.CrtYd) (width 0.15))""".
+      format(x, y, nx, ny))
+
+
+for i in range(0, num_per_edge):
+  if pad_radius is None:
+    print("""  (pad {} smd rect (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+      (solder_mask_margin {}))""".
+          format(
+              i+1,
+              -X/2,
+              C*(i-(num_per_edge/2-0.5)),
+              h,
+              w,
+              solder_mask_margin))
+  else:
+    print("""  (pad {} smd roundrect (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+      (roundrect_rratio {}) (solder_mask_margin {}))""".
+          format(
+              i+1,
+              -X/2,
+              C*(i-(num_per_edge/2-0.5)),
+              h,
+              w,
+              pad_radius/min(h, w),
+              solder_mask_margin))
+
+for i in range(0, num_per_edge):
+  if pad_radius is None:
+    print("""  (pad {} smd rect (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+      (solder_mask_margin {}))""".
+          format(
+              i+1+1*num_per_edge,
+              X/2,
+              -C*(i-(num_per_edge/2-0.5)),
+              h,
+              w,
+              solder_mask_margin))
+  else:
+    print("""  (pad {} smd roundrect (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+      (roundrect_rratio {}) (solder_mask_margin {}))""".
+          format(
+              i+1+1*num_per_edge,
+              X/2,
+              -C*(i-(num_per_edge/2-0.5)),
+              h,
+              w,
+              pad_radius/min(h, w),
+              solder_mask_margin))
+
+if has_ground_pad: 
+  if pad_radius is None:
+    # add ground pad
+    print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+      (solder_mask_margin {}))""".
+          format(
+              ground_pad_num,
+              "rect",
+              0,
+              0,
+              G1,
+              H1,
+              solder_mask_margin))
+  else:
+    print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+      (roundrect_rratio {}) (solder_mask_margin {}))""".
+          format(
+              ground_pad_num,
+              "roundrect",
+              0,
+              0,
+              G1,
+              H1,
+              pad_radius/min(G1, H1),
+              solder_mask_margin))
+
+if add_ti_ground_extensions:
+  for i in [-1, 1]:
+    for j in [-1, 1]:
+      print("""  (pad {} smd {} (at {} {}) (size {} {}) (layers F.Cu F.Paste F.Mask)
+        (solder_mask_margin {}))""".
+            format(
+                ground_pad_num,
+                "rect",
+                i*ti_gnd_ext_spacing/2,
+                j*(H1 + ti_gnd_ext_len)/2.,
+                ti_gnd_ext_width,
+                ti_gnd_ext_len,
+                solder_mask_margin))
+
+print(epilogue)
diff --git a/pcb/discrete/discrete-rf-board/if_amp.sch b/pcb/discrete/discrete-rf-board/if_amp.sch
index 49201ef..208f5fa 100644
--- a/pcb/discrete/discrete-rf-board/if_amp.sch
+++ b/pcb/discrete/discrete-rf-board/if_amp.sch
@@ -1382,4 +1382,6 @@ Text Notes 1300 3600 0    50   ~ 0
 1.4 V max
 Text Notes 2500 3950 0    50   ~ 0
 0.7 V max\n30 mA max
+Text Notes 3200 1100 0    50   ~ 0
+TODO figure out shunt cap values
 $EndSCHEMATC
diff --git a/pcb/discrete/discrete-rf-board/if_amp.sch-bak b/pcb/discrete/discrete-rf-board/if_amp.sch-bak
index 49201ef..208f5fa 100644
--- a/pcb/discrete/discrete-rf-board/if_amp.sch-bak
+++ b/pcb/discrete/discrete-rf-board/if_amp.sch-bak
@@ -1382,4 +1382,6 @@ Text Notes 1300 3600 0    50   ~ 0
 1.4 V max
 Text Notes 2500 3950 0    50   ~ 0
 0.7 V max\n30 mA max
+Text Notes 3200 1100 0    50   ~ 0
+TODO figure out shunt cap values
 $EndSCHEMATC
diff --git a/pcb/discrete/discrete-rf-board/lna_gain_block.sch b/pcb/discrete/discrete-rf-board/lna_gain_block.sch
index 4b7af4f..7f3ec8e 100644
--- a/pcb/discrete/discrete-rf-board/lna_gain_block.sch
+++ b/pcb/discrete/discrete-rf-board/lna_gain_block.sch
@@ -24,7 +24,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF638" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF638" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF638" Ref="R903"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF638" Ref="R1003"  Part="1" 
-F 0 "R803" H 6041 3404 50  0000 R CNN
+F 0 "R1003" H 6041 3404 50  0000 R CNN
 F 1 "75R" H 6041 3495 50  0000 R CNN
 F 2 "" H 6100 3450 50  0001 C CNN
 F 3 "~" H 6100 3450 50  0001 C CNN
@@ -43,7 +43,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF640" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF640" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF640" Ref="C910"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF640" Ref="C1010"  Part="1" 
-F 0 "C810" V 7129 3250 50  0000 C CNN
+F 0 "C1010" V 7129 3250 50  0000 C CNN
 F 1 "100 pF RF" V 7038 3250 50  0000 C CNN
 F 2 "" H 6900 3250 50  0001 C CNN
 F 3 "~" H 6900 3250 50  0001 C CNN
@@ -65,7 +65,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF649" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF649" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF649" Ref="#PWR0903"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF649" Ref="#PWR01003"  Part="1" 
-F 0 "#PWR0803" H 4500 3800 50  0001 C CNN
+F 0 "#PWR01003" H 4500 3800 50  0001 C CNN
 F 1 "GND" H 4505 3877 50  0000 C CNN
 F 2 "" H 4500 4050 50  0001 C CNN
 F 3 "" H 4500 4050 50  0001 C CNN
@@ -84,7 +84,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF650" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF650" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF650" Ref="#PWR0910"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF650" Ref="#PWR01010"  Part="1" 
-F 0 "#PWR0810" H 6700 3550 50  0001 C CNN
+F 0 "#PWR01010" H 6700 3550 50  0001 C CNN
 F 1 "GND" H 6705 3627 50  0000 C CNN
 F 2 "" H 6700 3800 50  0001 C CNN
 F 3 "" H 6700 3800 50  0001 C CNN
@@ -103,7 +103,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF659" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF659" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF659" Ref="R901"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF659" Ref="R1001"  Part="1" 
-F 0 "R801" H 4441 3354 50  0000 R CNN
+F 0 "R1001" H 4441 3354 50  0000 R CNN
 F 1 "8k2R" H 4441 3445 50  0000 R CNN
 F 2 "" H 4500 3400 50  0001 C CNN
 F 3 "~" H 4500 3400 50  0001 C CNN
@@ -125,7 +125,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF668" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF668" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF668" Ref="C909"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF668" Ref="C1009"  Part="1" 
-F 0 "C809" H 6792 3696 50  0000 L CNN
+F 0 "C1009" H 6792 3696 50  0000 L CNN
 F 1 "3.0 pF RF" H 6792 3605 50  0000 L CNN
 F 2 "" H 6700 3650 50  0001 C CNN
 F 3 "~" H 6700 3650 50  0001 C CNN
@@ -144,7 +144,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF670" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF670" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF670" Ref="L903"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF670" Ref="L1003"  Part="1" 
-F 0 "L803" V 6485 3250 50  0000 C CNN
+F 0 "L1003" V 6485 3250 50  0000 C CNN
 F 1 "10.0 nH" V 6394 3250 50  0000 C CNN
 F 2 "" H 6300 3250 50  0001 C CNN
 F 3 "~" H 6300 3250 50  0001 C CNN
@@ -161,7 +161,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF693" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF693" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF693" Ref="C902"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF693" Ref="C1002"  Part="1" 
-F 0 "C802" V 4529 3700 50  0000 C CNN
+F 0 "C1002" V 4529 3700 50  0000 C CNN
 F 1 "100 pF RF" V 4438 3700 50  0000 C CNN
 F 2 "" H 4300 3700 50  0001 C CNN
 F 3 "~" H 4300 3700 50  0001 C CNN
@@ -178,7 +178,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF699" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF699" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF699" Ref="L901"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF699" Ref="L1001"  Part="1" 
-F 0 "L801" V 4885 3700 50  0000 C CNN
+F 0 "L1001" V 4885 3700 50  0000 C CNN
 F 1 "9.5 nH" V 4794 3700 50  0000 C CNN
 F 2 "" H 4700 3700 50  0001 C CNN
 F 3 "~" H 4700 3700 50  0001 C CNN
@@ -195,7 +195,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF69F" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF69F" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF69F" Ref="C904"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF69F" Ref="C1004"  Part="1" 
-F 0 "C804" H 4592 3946 50  0000 L CNN
+F 0 "C1004" H 4592 3946 50  0000 L CNN
 F 1 "5.45 pF RF" H 4592 3855 50  0000 L CNN
 F 2 "" H 4500 3900 50  0001 C CNN
 F 3 "~" H 4500 3900 50  0001 C CNN
@@ -212,7 +212,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF6A6" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF6A6" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF6A6" Ref="#PWR0909"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF6A6" Ref="#PWR01009"  Part="1" 
-F 0 "#PWR0809" H 5550 3950 50  0001 C CNN
+F 0 "#PWR01009" H 5550 3950 50  0001 C CNN
 F 1 "GND" H 5555 4027 50  0000 C CNN
 F 2 "" H 5550 4200 50  0001 C CNN
 F 3 "" H 5550 4200 50  0001 C CNN
@@ -229,7 +229,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B01" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B01" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B01" Ref="C903"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B01" Ref="C1003"  Part="1" 
-F 0 "C803" H 4410 2620 50  0000 L CNN
+F 0 "C1003" H 4410 2620 50  0000 L CNN
 F 1 "1 nF" H 4410 2470 50  0000 L CNN
 F 2 "" H 4400 2550 50  0001 C CNN
 F 3 "~" H 4400 2550 50  0001 C CNN
@@ -246,7 +246,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B07" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B07" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B07" Ref="C906"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B07" Ref="C1006"  Part="1" 
-F 0 "C806" H 4810 2620 50  0000 L CNN
+F 0 "C1006" H 4810 2620 50  0000 L CNN
 F 1 "100 pF RF" H 4810 2470 50  0000 L CNN
 F 2 "" H 4800 2550 50  0001 C CNN
 F 3 "~" H 4800 2550 50  0001 C CNN
@@ -263,7 +263,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B0D" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B0D" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B0D" Ref="C908"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B0D" Ref="C1008"  Part="1" 
-F 0 "C808" H 5210 2620 50  0000 L CNN
+F 0 "C1008" H 5210 2620 50  0000 L CNN
 F 1 "100 pF RF" H 5210 2470 50  0000 L CNN
 F 2 "" H 5200 2550 50  0001 C CNN
 F 3 "~" H 5200 2550 50  0001 C CNN
@@ -280,7 +280,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B13" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B13" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B13" Ref="#PWR0902"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B13" Ref="#PWR01002"  Part="1" 
-F 0 "#PWR0802" H 4400 2500 50  0001 C CNN
+F 0 "#PWR01002" H 4400 2500 50  0001 C CNN
 F 1 "GND" H 4400 2600 50  0000 C CNN
 F 2 "" H 4400 2750 50  0001 C CNN
 F 3 "" H 4400 2750 50  0001 C CNN
@@ -297,7 +297,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B19" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B19" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B19" Ref="#PWR0905"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B19" Ref="#PWR01005"  Part="1" 
-F 0 "#PWR0805" H 4800 2500 50  0001 C CNN
+F 0 "#PWR01005" H 4800 2500 50  0001 C CNN
 F 1 "GND" H 4800 2600 50  0000 C CNN
 F 2 "" H 4800 2750 50  0001 C CNN
 F 3 "" H 4800 2750 50  0001 C CNN
@@ -314,7 +314,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B1F" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B1F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B1F" Ref="#PWR0908"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B1F" Ref="#PWR01008"  Part="1" 
-F 0 "#PWR0808" H 5200 2500 50  0001 C CNN
+F 0 "#PWR01008" H 5200 2500 50  0001 C CNN
 F 1 "GND" H 5200 2600 50  0000 C CNN
 F 2 "" H 5200 2750 50  0001 C CNN
 F 3 "" H 5200 2750 50  0001 C CNN
@@ -331,7 +331,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B25" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B25" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B25" Ref="C907"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B25" Ref="C1007"  Part="1" 
-F 0 "C807" H 5160 1920 50  0000 L CNN
+F 0 "C1007" H 5160 1920 50  0000 L CNN
 F 1 "100 pF RF" H 5160 1770 50  0000 L CNN
 F 2 "" H 5150 1850 50  0001 C CNN
 F 3 "~" H 5150 1850 50  0001 C CNN
@@ -348,7 +348,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B2B" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B2B" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B2B" Ref="#PWR0907"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B2B" Ref="#PWR01007"  Part="1" 
-F 0 "#PWR0807" H 5150 1800 50  0001 C CNN
+F 0 "#PWR01007" H 5150 1800 50  0001 C CNN
 F 1 "GND" H 5150 1900 50  0000 C CNN
 F 2 "" H 5150 2050 50  0001 C CNN
 F 3 "" H 5150 2050 50  0001 C CNN
@@ -365,7 +365,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B31" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B31" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B31" Ref="C905"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B31" Ref="C1005"  Part="1" 
-F 0 "C805" H 4760 1920 50  0000 L CNN
+F 0 "C1005" H 4760 1920 50  0000 L CNN
 F 1 "1 nF" H 4760 1770 50  0000 L CNN
 F 2 "" H 4750 1850 50  0001 C CNN
 F 3 "~" H 4750 1850 50  0001 C CNN
@@ -382,7 +382,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B37" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B37" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B37" Ref="#PWR0904"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B37" Ref="#PWR01004"  Part="1" 
-F 0 "#PWR0804" H 4750 1800 50  0001 C CNN
+F 0 "#PWR01004" H 4750 1800 50  0001 C CNN
 F 1 "GND" H 4750 1900 50  0000 C CNN
 F 2 "" H 4750 2050 50  0001 C CNN
 F 3 "" H 4750 2050 50  0001 C CNN
@@ -441,7 +441,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3F1C48" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3F1C48" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3F1C48" Ref="R904"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3F1C48" Ref="R1004"  Part="1" 
-F 0 "R804" H 5580 2120 50  0000 L CNN
+F 0 "R1004" H 5580 2120 50  0000 L CNN
 F 1 "22R" H 5580 2060 50  0000 L CNN
 F 2 "" H 5550 2100 50  0001 C CNN
 F 3 "~" H 5550 2100 50  0001 C CNN
@@ -466,7 +466,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3FEB6E" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3FEB6E" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3FEB6E" Ref="C901"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB6E" Ref="C1001"  Part="1" 
-F 0 "C801" H 4010 2620 50  0000 L CNN
+F 0 "C1001" H 4010 2620 50  0000 L CNN
 F 1 "1 nF" H 4010 2470 50  0000 L CNN
 F 2 "" H 4000 2550 50  0001 C CNN
 F 3 "~" H 4000 2550 50  0001 C CNN
@@ -483,7 +483,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3FEB74" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3FEB74" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3FEB74" Ref="#PWR0901"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB74" Ref="#PWR01001"  Part="1" 
-F 0 "#PWR0801" H 4000 2500 50  0001 C CNN
+F 0 "#PWR01001" H 4000 2500 50  0001 C CNN
 F 1 "GND" H 4000 2600 50  0000 C CNN
 F 2 "" H 4000 2750 50  0001 C CNN
 F 3 "" H 4000 2750 50  0001 C CNN
@@ -503,7 +503,7 @@ P 5550 3050
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D40D244" Ref="L802"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D40D244" Ref="L902"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D40D244" Ref="L1002"  Part="1" 
-F 0 "L802" H 5580 3090 50  0000 L CNN
+F 0 "L1002" H 5580 3090 50  0000 L CNN
 F 1 "220 nH" H 5580 3010 50  0000 L CNN
 F 2 "" H 5550 3050 50  0001 C CNN
 F 3 "~" H 5550 3050 50  0001 C CNN
@@ -534,7 +534,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D435867" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D435867" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D435867" Ref="R902"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D435867" Ref="R1002"  Part="1" 
-F 0 "R802" H 4941 3254 50  0000 R CNN
+F 0 "R1002" H 4941 3254 50  0000 R CNN
 F 1 "1k8R" H 4941 3345 50  0000 R CNN
 F 2 "" H 5000 3300 50  0001 C CNN
 F 3 "~" H 5000 3300 50  0001 C CNN
@@ -548,7 +548,7 @@ P 5000 3500
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D43681D" Ref="#PWR01006"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D43681D" Ref="#PWR0806"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D43681D" Ref="#PWR0906"  Part="1" 
-F 0 "#PWR0806" H 5000 3250 50  0001 C CNN
+F 0 "#PWR01006" H 5000 3250 50  0001 C CNN
 F 1 "GND" H 5000 3350 50  0000 C CNN
 F 2 "" H 5000 3500 50  0001 C CNN
 F 3 "" H 5000 3500 50  0001 C CNN
@@ -572,7 +572,7 @@ P 5500 3700
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D191C23" Ref="Q801"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D191C23" Ref="Q901"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D191C23" Ref="Q1001"  Part="1" 
-F 0 "Q801" H 5800 3700 50  0000 C CNN
+F 0 "Q1001" H 5800 3700 50  0000 C CNN
 F 1 "Q_NPN_BCEE" H 5700 3600 50  0000 L CNN
 F 2 "" H 5500 3700 50  0001 C CNN
 F 3 "" H 5500 3700 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/lna_gain_block.sch-bak b/pcb/discrete/discrete-rf-board/lna_gain_block.sch-bak
index 4b7af4f..7f3ec8e 100644
--- a/pcb/discrete/discrete-rf-board/lna_gain_block.sch-bak
+++ b/pcb/discrete/discrete-rf-board/lna_gain_block.sch-bak
@@ -24,7 +24,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF638" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF638" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF638" Ref="R903"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF638" Ref="R1003"  Part="1" 
-F 0 "R803" H 6041 3404 50  0000 R CNN
+F 0 "R1003" H 6041 3404 50  0000 R CNN
 F 1 "75R" H 6041 3495 50  0000 R CNN
 F 2 "" H 6100 3450 50  0001 C CNN
 F 3 "~" H 6100 3450 50  0001 C CNN
@@ -43,7 +43,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF640" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF640" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF640" Ref="C910"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF640" Ref="C1010"  Part="1" 
-F 0 "C810" V 7129 3250 50  0000 C CNN
+F 0 "C1010" V 7129 3250 50  0000 C CNN
 F 1 "100 pF RF" V 7038 3250 50  0000 C CNN
 F 2 "" H 6900 3250 50  0001 C CNN
 F 3 "~" H 6900 3250 50  0001 C CNN
@@ -65,7 +65,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF649" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF649" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF649" Ref="#PWR0903"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF649" Ref="#PWR01003"  Part="1" 
-F 0 "#PWR0803" H 4500 3800 50  0001 C CNN
+F 0 "#PWR01003" H 4500 3800 50  0001 C CNN
 F 1 "GND" H 4505 3877 50  0000 C CNN
 F 2 "" H 4500 4050 50  0001 C CNN
 F 3 "" H 4500 4050 50  0001 C CNN
@@ -84,7 +84,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF650" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF650" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF650" Ref="#PWR0910"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF650" Ref="#PWR01010"  Part="1" 
-F 0 "#PWR0810" H 6700 3550 50  0001 C CNN
+F 0 "#PWR01010" H 6700 3550 50  0001 C CNN
 F 1 "GND" H 6705 3627 50  0000 C CNN
 F 2 "" H 6700 3800 50  0001 C CNN
 F 3 "" H 6700 3800 50  0001 C CNN
@@ -103,7 +103,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF659" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF659" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF659" Ref="R901"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF659" Ref="R1001"  Part="1" 
-F 0 "R801" H 4441 3354 50  0000 R CNN
+F 0 "R1001" H 4441 3354 50  0000 R CNN
 F 1 "8k2R" H 4441 3445 50  0000 R CNN
 F 2 "" H 4500 3400 50  0001 C CNN
 F 3 "~" H 4500 3400 50  0001 C CNN
@@ -125,7 +125,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF668" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF668" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF668" Ref="C909"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF668" Ref="C1009"  Part="1" 
-F 0 "C809" H 6792 3696 50  0000 L CNN
+F 0 "C1009" H 6792 3696 50  0000 L CNN
 F 1 "3.0 pF RF" H 6792 3605 50  0000 L CNN
 F 2 "" H 6700 3650 50  0001 C CNN
 F 3 "~" H 6700 3650 50  0001 C CNN
@@ -144,7 +144,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF670" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF670" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF670" Ref="L903"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF670" Ref="L1003"  Part="1" 
-F 0 "L803" V 6485 3250 50  0000 C CNN
+F 0 "L1003" V 6485 3250 50  0000 C CNN
 F 1 "10.0 nH" V 6394 3250 50  0000 C CNN
 F 2 "" H 6300 3250 50  0001 C CNN
 F 3 "~" H 6300 3250 50  0001 C CNN
@@ -161,7 +161,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF693" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF693" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF693" Ref="C902"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF693" Ref="C1002"  Part="1" 
-F 0 "C802" V 4529 3700 50  0000 C CNN
+F 0 "C1002" V 4529 3700 50  0000 C CNN
 F 1 "100 pF RF" V 4438 3700 50  0000 C CNN
 F 2 "" H 4300 3700 50  0001 C CNN
 F 3 "~" H 4300 3700 50  0001 C CNN
@@ -178,7 +178,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF699" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF699" Ref="L?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF699" Ref="L901"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF699" Ref="L1001"  Part="1" 
-F 0 "L801" V 4885 3700 50  0000 C CNN
+F 0 "L1001" V 4885 3700 50  0000 C CNN
 F 1 "9.5 nH" V 4794 3700 50  0000 C CNN
 F 2 "" H 4700 3700 50  0001 C CNN
 F 3 "~" H 4700 3700 50  0001 C CNN
@@ -195,7 +195,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF69F" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF69F" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF69F" Ref="C904"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF69F" Ref="C1004"  Part="1" 
-F 0 "C804" H 4592 3946 50  0000 L CNN
+F 0 "C1004" H 4592 3946 50  0000 L CNN
 F 1 "5.45 pF RF" H 4592 3855 50  0000 L CNN
 F 2 "" H 4500 3900 50  0001 C CNN
 F 3 "~" H 4500 3900 50  0001 C CNN
@@ -212,7 +212,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3CF6A6" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3CF6A6" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3CF6A6" Ref="#PWR0909"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3CF6A6" Ref="#PWR01009"  Part="1" 
-F 0 "#PWR0809" H 5550 3950 50  0001 C CNN
+F 0 "#PWR01009" H 5550 3950 50  0001 C CNN
 F 1 "GND" H 5555 4027 50  0000 C CNN
 F 2 "" H 5550 4200 50  0001 C CNN
 F 3 "" H 5550 4200 50  0001 C CNN
@@ -229,7 +229,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B01" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B01" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B01" Ref="C903"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B01" Ref="C1003"  Part="1" 
-F 0 "C803" H 4410 2620 50  0000 L CNN
+F 0 "C1003" H 4410 2620 50  0000 L CNN
 F 1 "1 nF" H 4410 2470 50  0000 L CNN
 F 2 "" H 4400 2550 50  0001 C CNN
 F 3 "~" H 4400 2550 50  0001 C CNN
@@ -246,7 +246,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B07" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B07" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B07" Ref="C906"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B07" Ref="C1006"  Part="1" 
-F 0 "C806" H 4810 2620 50  0000 L CNN
+F 0 "C1006" H 4810 2620 50  0000 L CNN
 F 1 "100 pF RF" H 4810 2470 50  0000 L CNN
 F 2 "" H 4800 2550 50  0001 C CNN
 F 3 "~" H 4800 2550 50  0001 C CNN
@@ -263,7 +263,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B0D" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B0D" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B0D" Ref="C908"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B0D" Ref="C1008"  Part="1" 
-F 0 "C808" H 5210 2620 50  0000 L CNN
+F 0 "C1008" H 5210 2620 50  0000 L CNN
 F 1 "100 pF RF" H 5210 2470 50  0000 L CNN
 F 2 "" H 5200 2550 50  0001 C CNN
 F 3 "~" H 5200 2550 50  0001 C CNN
@@ -280,7 +280,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B13" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B13" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B13" Ref="#PWR0902"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B13" Ref="#PWR01002"  Part="1" 
-F 0 "#PWR0802" H 4400 2500 50  0001 C CNN
+F 0 "#PWR01002" H 4400 2500 50  0001 C CNN
 F 1 "GND" H 4400 2600 50  0000 C CNN
 F 2 "" H 4400 2750 50  0001 C CNN
 F 3 "" H 4400 2750 50  0001 C CNN
@@ -297,7 +297,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B19" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B19" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B19" Ref="#PWR0905"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B19" Ref="#PWR01005"  Part="1" 
-F 0 "#PWR0805" H 4800 2500 50  0001 C CNN
+F 0 "#PWR01005" H 4800 2500 50  0001 C CNN
 F 1 "GND" H 4800 2600 50  0000 C CNN
 F 2 "" H 4800 2750 50  0001 C CNN
 F 3 "" H 4800 2750 50  0001 C CNN
@@ -314,7 +314,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B1F" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B1F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B1F" Ref="#PWR0908"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B1F" Ref="#PWR01008"  Part="1" 
-F 0 "#PWR0808" H 5200 2500 50  0001 C CNN
+F 0 "#PWR01008" H 5200 2500 50  0001 C CNN
 F 1 "GND" H 5200 2600 50  0000 C CNN
 F 2 "" H 5200 2750 50  0001 C CNN
 F 3 "" H 5200 2750 50  0001 C CNN
@@ -331,7 +331,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B25" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B25" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B25" Ref="C907"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B25" Ref="C1007"  Part="1" 
-F 0 "C807" H 5160 1920 50  0000 L CNN
+F 0 "C1007" H 5160 1920 50  0000 L CNN
 F 1 "100 pF RF" H 5160 1770 50  0000 L CNN
 F 2 "" H 5150 1850 50  0001 C CNN
 F 3 "~" H 5150 1850 50  0001 C CNN
@@ -348,7 +348,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B2B" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B2B" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B2B" Ref="#PWR0907"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B2B" Ref="#PWR01007"  Part="1" 
-F 0 "#PWR0807" H 5150 1800 50  0001 C CNN
+F 0 "#PWR01007" H 5150 1800 50  0001 C CNN
 F 1 "GND" H 5150 1900 50  0000 C CNN
 F 2 "" H 5150 2050 50  0001 C CNN
 F 3 "" H 5150 2050 50  0001 C CNN
@@ -365,7 +365,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B31" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B31" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B31" Ref="C905"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B31" Ref="C1005"  Part="1" 
-F 0 "C805" H 4760 1920 50  0000 L CNN
+F 0 "C1005" H 4760 1920 50  0000 L CNN
 F 1 "1 nF" H 4760 1770 50  0000 L CNN
 F 2 "" H 4750 1850 50  0001 C CNN
 F 3 "~" H 4750 1850 50  0001 C CNN
@@ -382,7 +382,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3E5B37" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3E5B37" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3E5B37" Ref="#PWR0904"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3E5B37" Ref="#PWR01004"  Part="1" 
-F 0 "#PWR0804" H 4750 1800 50  0001 C CNN
+F 0 "#PWR01004" H 4750 1800 50  0001 C CNN
 F 1 "GND" H 4750 1900 50  0000 C CNN
 F 2 "" H 4750 2050 50  0001 C CNN
 F 3 "" H 4750 2050 50  0001 C CNN
@@ -441,7 +441,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3F1C48" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3F1C48" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3F1C48" Ref="R904"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3F1C48" Ref="R1004"  Part="1" 
-F 0 "R804" H 5580 2120 50  0000 L CNN
+F 0 "R1004" H 5580 2120 50  0000 L CNN
 F 1 "22R" H 5580 2060 50  0000 L CNN
 F 2 "" H 5550 2100 50  0001 C CNN
 F 3 "~" H 5550 2100 50  0001 C CNN
@@ -466,7 +466,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3FEB6E" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3FEB6E" Ref="C?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3FEB6E" Ref="C901"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB6E" Ref="C1001"  Part="1" 
-F 0 "C801" H 4010 2620 50  0000 L CNN
+F 0 "C1001" H 4010 2620 50  0000 L CNN
 F 1 "1 nF" H 4010 2470 50  0000 L CNN
 F 2 "" H 4000 2550 50  0001 C CNN
 F 3 "~" H 4000 2550 50  0001 C CNN
@@ -483,7 +483,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D3FEB74" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D3FEB74" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D3FEB74" Ref="#PWR0901"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D3FEB74" Ref="#PWR01001"  Part="1" 
-F 0 "#PWR0801" H 4000 2500 50  0001 C CNN
+F 0 "#PWR01001" H 4000 2500 50  0001 C CNN
 F 1 "GND" H 4000 2600 50  0000 C CNN
 F 2 "" H 4000 2750 50  0001 C CNN
 F 3 "" H 4000 2750 50  0001 C CNN
@@ -503,7 +503,7 @@ P 5550 3050
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D40D244" Ref="L802"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D40D244" Ref="L902"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D40D244" Ref="L1002"  Part="1" 
-F 0 "L802" H 5580 3090 50  0000 L CNN
+F 0 "L1002" H 5580 3090 50  0000 L CNN
 F 1 "220 nH" H 5580 3010 50  0000 L CNN
 F 2 "" H 5550 3050 50  0001 C CNN
 F 3 "~" H 5550 3050 50  0001 C CNN
@@ -534,7 +534,7 @@ AR Path="/5CA6B0AA/5CE74EBE/5D407D69/5D435867" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D407DF5/5D435867" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D435867" Ref="R902"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D435867" Ref="R1002"  Part="1" 
-F 0 "R802" H 4941 3254 50  0000 R CNN
+F 0 "R1002" H 4941 3254 50  0000 R CNN
 F 1 "1k8R" H 4941 3345 50  0000 R CNN
 F 2 "" H 5000 3300 50  0001 C CNN
 F 3 "~" H 5000 3300 50  0001 C CNN
@@ -548,7 +548,7 @@ P 5000 3500
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D43681D" Ref="#PWR01006"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D43681D" Ref="#PWR0806"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D43681D" Ref="#PWR0906"  Part="1" 
-F 0 "#PWR0806" H 5000 3250 50  0001 C CNN
+F 0 "#PWR01006" H 5000 3250 50  0001 C CNN
 F 1 "GND" H 5000 3350 50  0000 C CNN
 F 2 "" H 5000 3500 50  0001 C CNN
 F 3 "" H 5000 3500 50  0001 C CNN
@@ -572,7 +572,7 @@ P 5500 3700
 AR Path="/5CA6B0AA/5CE74EBE/5D3C8D48/5D191C23" Ref="Q801"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4104E7/5D191C23" Ref="Q901"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D191C23" Ref="Q1001"  Part="1" 
-F 0 "Q801" H 5800 3700 50  0000 C CNN
+F 0 "Q1001" H 5800 3700 50  0000 C CNN
 F 1 "Q_NPN_BCEE" H 5700 3600 50  0000 L CNN
 F 2 "" H 5500 3700 50  0001 C CNN
 F 3 "" H 5500 3700 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/lo.sch b/pcb/discrete/discrete-rf-board/lo.sch
index 9a6d73b..f3c6f3f 100644
--- a/pcb/discrete/discrete-rf-board/lo.sch
+++ b/pcb/discrete/discrete-rf-board/lo.sch
@@ -20,8 +20,9 @@ U 1 1 5CA8911B
 P 3950 3550
 F 0 "U1601" H 3950 4000 50  0000 C CNN
 F 1 "ADF4360-7BCPZRL7" H 3950 3850 50  0000 C CNN
-F 2 "" H 3950 3550 50  0001 C CNN
+F 2 "discrete_footprints:Analog_CP-24-14" H 3950 3550 50  0001 C CNN
 F 3 "" H 3950 3550 50  0001 C CNN
+F 4 " 584-ADF4360-7BCPZR7 " H 3950 3550 50  0001 C CNN "Mouser"
 	1    3950 3550
 	1    0    0    -1  
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/lo.sch-bak b/pcb/discrete/discrete-rf-board/lo.sch-bak
index 9a6d73b..f3c6f3f 100644
--- a/pcb/discrete/discrete-rf-board/lo.sch-bak
+++ b/pcb/discrete/discrete-rf-board/lo.sch-bak
@@ -20,8 +20,9 @@ U 1 1 5CA8911B
 P 3950 3550
 F 0 "U1601" H 3950 4000 50  0000 C CNN
 F 1 "ADF4360-7BCPZRL7" H 3950 3850 50  0000 C CNN
-F 2 "" H 3950 3550 50  0001 C CNN
+F 2 "discrete_footprints:Analog_CP-24-14" H 3950 3550 50  0001 C CNN
 F 3 "" H 3950 3550 50  0001 C CNN
+F 4 " 584-ADF4360-7BCPZR7 " H 3950 3550 50  0001 C CNN "Mouser"
 	1    3950 3550
 	1    0    0    -1  
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/mixer.sch b/pcb/discrete/discrete-rf-board/mixer.sch
index 3f37cc4..fbe7731 100644
--- a/pcb/discrete/discrete-rf-board/mixer.sch
+++ b/pcb/discrete/discrete-rf-board/mixer.sch
@@ -32,7 +32,7 @@ U 1 1 5D0F3E9F
 P 7350 3950
 AR Path="/5CA6B0B3/5CC199E0/5D0F3E9F" Ref="C1413"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0F3E9F" Ref="C1513"  Part="1" 
-F 0 "C1413" H 7258 3904 50  0000 R CNN
+F 0 "C1513" H 7258 3904 50  0000 R CNN
 F 1 "100 pF RF" H 7258 3995 50  0000 R CNN
 F 2 "" H 7350 3950 50  0001 C CNN
 F 3 "~" H 7350 3950 50  0001 C CNN
@@ -45,7 +45,7 @@ U 1 1 5D0F4BFE
 P 7350 4150
 AR Path="/5CA6B0B3/5CC199E0/5D0F4BFE" Ref="#PWR01413"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0F4BFE" Ref="#PWR01513"  Part="1" 
-F 0 "#PWR01413" H 7350 3900 50  0001 C CNN
+F 0 "#PWR01513" H 7350 3900 50  0001 C CNN
 F 1 "GND" H 7355 3977 50  0000 C CNN
 F 2 "" H 7350 4150 50  0001 C CNN
 F 3 "" H 7350 4150 50  0001 C CNN
@@ -60,7 +60,7 @@ U 1 1 5D0F5E6D
 P 5500 2950
 AR Path="/5CA6B0B3/5CC199E0/5D0F5E6D" Ref="C1410"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0F5E6D" Ref="C1510"  Part="1" 
-F 0 "C1410" H 5408 2996 50  0000 R CNN
+F 0 "C1510" H 5408 2996 50  0000 R CNN
 F 1 "100 pF RF" H 5408 2905 50  0000 R CNN
 F 2 "" H 5500 2950 50  0001 C CNN
 F 3 "~" H 5500 2950 50  0001 C CNN
@@ -77,7 +77,7 @@ U 1 1 5D101264
 P 6300 3200
 AR Path="/5CA6B0B3/5CC199E0/5D101264" Ref="C1412"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D101264" Ref="C1512"  Part="1" 
-F 0 "C1412" H 6310 3270 50  0000 L CNN
+F 0 "C1512" H 6310 3270 50  0000 L CNN
 F 1 "DNP 0402" H 6310 3120 50  0000 L CNN
 F 2 "" H 6300 3200 50  0001 C CNN
 F 3 "~" H 6300 3200 50  0001 C CNN
@@ -90,7 +90,7 @@ U 1 1 5D1017A0
 P 6050 2950
 AR Path="/5CA6B0B3/5CC199E0/5D1017A0" Ref="L1401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1017A0" Ref="L1501"  Part="1" 
-F 0 "L1401" H 6080 2990 50  0000 L CNN
+F 0 "L1501" H 6080 2990 50  0000 L CNN
 F 1 "6.8 nH" H 6080 2910 50  0000 L CNN
 F 2 "" H 6050 2950 50  0001 C CNN
 F 3 "~" H 6050 2950 50  0001 C CNN
@@ -103,7 +103,7 @@ U 1 1 5D101EA1
 P 5750 3450
 AR Path="/5CA6B0B3/5CC199E0/5D101EA1" Ref="#PWR01410"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D101EA1" Ref="#PWR01510"  Part="1" 
-F 0 "#PWR01410" H 5750 3200 50  0001 C CNN
+F 0 "#PWR01510" H 5750 3200 50  0001 C CNN
 F 1 "GND" H 5750 3300 50  0000 C CNN
 F 2 "" H 5750 3450 50  0001 C CNN
 F 3 "" H 5750 3450 50  0001 C CNN
@@ -116,7 +116,7 @@ U 1 1 5D1020F7
 P 6300 3450
 AR Path="/5CA6B0B3/5CC199E0/5D1020F7" Ref="#PWR01411"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1020F7" Ref="#PWR01511"  Part="1" 
-F 0 "#PWR01411" H 6300 3200 50  0001 C CNN
+F 0 "#PWR01511" H 6300 3200 50  0001 C CNN
 F 1 "GND" H 6300 3300 50  0000 C CNN
 F 2 "" H 6300 3450 50  0001 C CNN
 F 3 "" H 6300 3450 50  0001 C CNN
@@ -150,7 +150,7 @@ AR Path="/5CA6B0AA/5CB33251/5CC489AE" Ref="J?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CC489AE" Ref="J?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CC489AE" Ref="J1401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CC489AE" Ref="J1501"  Part="1" 
-F 0 "J1401" H 9810 4170 50  0000 C CNN
+F 0 "J1501" H 9810 4170 50  0000 C CNN
 F 1 "UFL" V 9915 4050 50  0000 C CNN
 F 2 "" H 9800 4050 50  0001 C CNN
 F 3 " ~" H 9800 4050 50  0001 C CNN
@@ -165,7 +165,7 @@ AR Path="/5CA6B0AA/5CB33251/5CC49A0F" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CC49A0F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CC49A0F" Ref="#PWR01420"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CC49A0F" Ref="#PWR01520"  Part="1" 
-F 0 "#PWR01420" H 9800 4100 50  0001 C CNN
+F 0 "#PWR01520" H 9800 4100 50  0001 C CNN
 F 1 "GND" H 9800 4200 50  0000 C CNN
 F 2 "" H 9800 4350 50  0001 C CNN
 F 3 "" H 9800 4350 50  0001 C CNN
@@ -197,7 +197,7 @@ AR Path="/5CA6B0AA/5CB33251/5CBC9FE3" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CBC9FE3" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CBC9FE3" Ref="#PWR01417"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CBC9FE3" Ref="#PWR01517"  Part="1" 
-F 0 "#PWR01417" H 9050 4700 50  0001 C CNN
+F 0 "#PWR01517" H 9050 4700 50  0001 C CNN
 F 1 "GND" H 9050 4800 50  0000 C CNN
 F 2 "" H 9050 4950 50  0001 C CNN
 F 3 "" H 9050 4950 50  0001 C CNN
@@ -218,7 +218,7 @@ U 1 1 5D125BFA
 P 7750 5450
 AR Path="/5CA6B0B3/5CC199E0/5D125BFA" Ref="#PWR01414"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D125BFA" Ref="#PWR01514"  Part="1" 
-F 0 "#PWR01414" H 7750 5200 50  0001 C CNN
+F 0 "#PWR01514" H 7750 5200 50  0001 C CNN
 F 1 "GND" H 7750 5300 50  0000 C CNN
 F 2 "" H 7750 5450 50  0001 C CNN
 F 3 "" H 7750 5450 50  0001 C CNN
@@ -231,7 +231,7 @@ U 1 1 5D125420
 P 7750 5250
 AR Path="/5CA6B0B3/5CC199E0/5D125420" Ref="C1414"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D125420" Ref="C1514"  Part="1" 
-F 0 "C1414" H 7760 5320 50  0000 L CNN
+F 0 "C1514" H 7760 5320 50  0000 L CNN
 F 1 "1 nF" H 7760 5170 50  0000 L CNN
 F 2 "" H 7750 5250 50  0001 C CNN
 F 3 "~" H 7750 5250 50  0001 C CNN
@@ -250,7 +250,7 @@ U 1 1 5D0D0BEF
 P 6450 5150
 AR Path="/5CA6B0B3/5CC199E0/5D0D0BEF" Ref="#PWR01412"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0D0BEF" Ref="#PWR01512"  Part="1" 
-F 0 "#PWR01412" H 6450 4900 50  0001 C CNN
+F 0 "#PWR01512" H 6450 4900 50  0001 C CNN
 F 1 "GND" H 6455 4977 50  0000 C CNN
 F 2 "" H 6450 5150 50  0001 C CNN
 F 3 "" H 6450 5150 50  0001 C CNN
@@ -263,7 +263,7 @@ U 1 1 5D01A78D
 P 7050 4750
 AR Path="/5CA6B0B3/5CC199E0/5D01A78D" Ref="U1401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D01A78D" Ref="U1501"  Part="1" 
-F 0 "U1401" H 7050 4200 50  0000 C CNN
+F 0 "U1501" H 7050 4200 50  0000 C CNN
 F 1 "LT5560EDD#PBF" H 7050 4100 50  0000 C CNN
 F 2 "" H 7050 4200 50  0001 C CNN
 F 3 "" H 7050 4200 50  0001 C CNN
@@ -317,7 +317,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6E137" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6E137" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6E137" Ref="#PWR01419"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6E137" Ref="#PWR01519"  Part="1" 
-F 0 "#PWR01419" H 9450 3000 50  0001 C CNN
+F 0 "#PWR01519" H 9450 3000 50  0001 C CNN
 F 1 "GND" H 9450 3100 50  0000 C CNN
 F 2 "" H 9450 3250 50  0001 C CNN
 F 3 "" H 9450 3250 50  0001 C CNN
@@ -332,7 +332,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6DF60" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6DF60" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6DF60" Ref="#PWR01418"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6DF60" Ref="#PWR01518"  Part="1" 
-F 0 "#PWR01418" H 9100 3000 50  0001 C CNN
+F 0 "#PWR01518" H 9100 3000 50  0001 C CNN
 F 1 "GND" H 9100 3100 50  0000 C CNN
 F 2 "" H 9100 3250 50  0001 C CNN
 F 3 "" H 9100 3250 50  0001 C CNN
@@ -347,7 +347,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6DBAF" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6DBAF" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6DBAF" Ref="#PWR01416"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6DBAF" Ref="#PWR01516"  Part="1" 
-F 0 "#PWR01416" H 8700 3000 50  0001 C CNN
+F 0 "#PWR01516" H 8700 3000 50  0001 C CNN
 F 1 "GND" H 8700 3100 50  0000 C CNN
 F 2 "" H 8700 3250 50  0001 C CNN
 F 3 "" H 8700 3250 50  0001 C CNN
@@ -362,7 +362,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6D892" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6D892" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6D892" Ref="#PWR01415"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6D892" Ref="#PWR01515"  Part="1" 
-F 0 "#PWR01415" H 8350 3000 50  0001 C CNN
+F 0 "#PWR01515" H 8350 3000 50  0001 C CNN
 F 1 "GND" H 8350 3100 50  0000 C CNN
 F 2 "" H 8350 3250 50  0001 C CNN
 F 3 "" H 8350 3250 50  0001 C CNN
@@ -377,7 +377,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6B125" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6B125" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6B125" Ref="C1419"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6B125" Ref="C1519"  Part="1" 
-F 0 "C1419" H 9460 3120 50  0000 L CNN
+F 0 "C1519" H 9460 3120 50  0000 L CNN
 F 1 "1 nF" H 9460 2970 50  0000 L CNN
 F 2 "" H 9450 3050 50  0001 C CNN
 F 3 "~" H 9450 3050 50  0001 C CNN
@@ -392,7 +392,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6AE2E" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6AE2E" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6AE2E" Ref="C1418"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6AE2E" Ref="C1518"  Part="1" 
-F 0 "C1418" H 9110 3120 50  0000 L CNN
+F 0 "C1518" H 9110 3120 50  0000 L CNN
 F 1 "100 pF" H 9110 2970 50  0000 L CNN
 F 2 "" H 9100 3050 50  0001 C CNN
 F 3 "~" H 9100 3050 50  0001 C CNN
@@ -407,7 +407,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6AABA" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6AABA" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6AABA" Ref="C1416"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6AABA" Ref="C1516"  Part="1" 
-F 0 "C1416" H 8710 3120 50  0000 L CNN
+F 0 "C1516" H 8710 3120 50  0000 L CNN
 F 1 "100 pF" H 8710 2970 50  0000 L CNN
 F 2 "" H 8700 3050 50  0001 C CNN
 F 3 "~" H 8700 3050 50  0001 C CNN
@@ -422,7 +422,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6A8A7" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6A8A7" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6A8A7" Ref="C1415"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6A8A7" Ref="C1515"  Part="1" 
-F 0 "C1415" H 8360 3120 50  0000 L CNN
+F 0 "C1515" H 8360 3120 50  0000 L CNN
 F 1 "100 pF" H 8360 2970 50  0000 L CNN
 F 2 "" H 8350 3050 50  0001 C CNN
 F 3 "~" H 8350 3050 50  0001 C CNN
@@ -439,7 +439,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB40E92" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB40E92" Ref="R?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB40E92" Ref="R1414"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB40E92" Ref="R1514"  Part="1" 
-F 0 "R1414" H 7530 3220 50  0000 L CNN
+F 0 "R1514" H 7530 3220 50  0000 L CNN
 F 1 "10R" H 7530 3160 50  0000 L CNN
 F 2 "" H 7500 3200 50  0001 C CNN
 F 3 "~" H 7500 3200 50  0001 C CNN
@@ -454,7 +454,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB3C1D2" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB3C1D2" Ref="L?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB3C1D2" Ref="L1402"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB3C1D2" Ref="L1502"  Part="1" 
-F 0 "L1402" H 8080 3540 50  0000 L CNN
+F 0 "L1502" H 8080 3540 50  0000 L CNN
 F 1 "330 nH" H 8080 3460 50  0000 L CNN
 F 2 "" H 8050 3500 50  0001 C CNN
 F 3 "~" H 8050 3500 50  0001 C CNN
@@ -476,7 +476,7 @@ U 1 1 5D15BCFB
 P 8150 4800
 AR Path="/5CA6B0B3/5CC199E0/5D15BCFB" Ref="L1404"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D15BCFB" Ref="L1504"  Part="1" 
-F 0 "L1404" H 8180 4840 50  0000 L CNN
+F 0 "L1504" H 8180 4840 50  0000 L CNN
 F 1 "27 nH" H 8180 4760 50  0000 L CNN
 F 2 "" H 8150 4800 50  0001 C CNN
 F 3 "~" H 8150 4800 50  0001 C CNN
@@ -489,7 +489,7 @@ U 1 1 5D15EADF
 P 8150 4500
 AR Path="/5CA6B0B3/5CC199E0/5D15EADF" Ref="L1403"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D15EADF" Ref="L1503"  Part="1" 
-F 0 "L1403" H 8180 4540 50  0000 L CNN
+F 0 "L1503" H 8180 4540 50  0000 L CNN
 F 1 "27 nH" H 8180 4460 50  0000 L CNN
 F 2 "" H 8150 4500 50  0001 C CNN
 F 3 "~" H 8150 4500 50  0001 C CNN
@@ -512,7 +512,7 @@ U 1 1 5D169258
 P 9050 4650
 AR Path="/5CA6B0B3/5CC199E0/5D169258" Ref="C1417"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D169258" Ref="C1517"  Part="1" 
-F 0 "C1417" H 9060 4720 50  0000 L CNN
+F 0 "C1517" H 9060 4720 50  0000 L CNN
 F 1 "2.2 pF RF" H 9060 4570 50  0000 L CNN
 F 2 "" H 9050 4650 50  0001 C CNN
 F 3 "~" H 9050 4650 50  0001 C CNN
@@ -533,7 +533,7 @@ U 1 1 5D170BC5
 P 6000 5550
 AR Path="/5CA6B0B3/5CC199E0/5D170BC5" Ref="Q1407"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D170BC5" Ref="Q1507"  Part="1" 
-F 0 "Q1407" H 6200 5600 50  0000 L CNN
+F 0 "Q1507" H 6200 5600 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 6200 5500 50  0000 L CNN
 F 2 "" H 6200 5650 50  0001 C CNN
 F 3 "~" H 6000 5550 50  0001 C CNN
@@ -546,7 +546,7 @@ U 1 1 5D1710F5
 P 5300 5550
 AR Path="/5CA6B0B3/5CC199E0/5D1710F5" Ref="Q1406"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1710F5" Ref="Q1506"  Part="1" 
-F 0 "Q1406" H 5500 5600 50  0000 L CNN
+F 0 "Q1506" H 5500 5600 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 5500 5500 50  0000 L CNN
 F 2 "" H 5500 5650 50  0001 C CNN
 F 3 "~" H 5300 5550 50  0001 C CNN
@@ -569,7 +569,7 @@ U 1 1 5D18C9DE
 P 4950 4700
 AR Path="/5CA6B0B3/5CC199E0/5D18C9DE" Ref="R1412"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D18C9DE" Ref="R1512"  Part="1" 
-F 0 "R1412" H 4980 4720 50  0000 L CNN
+F 0 "R1512" H 4980 4720 50  0000 L CNN
 F 1 "100k" H 4980 4660 50  0000 L CNN
 F 2 "" H 4950 4700 50  0001 C CNN
 F 3 "~" H 4950 4700 50  0001 C CNN
@@ -582,7 +582,7 @@ U 1 1 5D18CEC8
 P 4950 4800
 AR Path="/5CA6B0B3/5CC199E0/5D18CEC8" Ref="R1413"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D18CEC8" Ref="R1513"  Part="1" 
-F 0 "R1413" H 4980 4820 50  0000 L CNN
+F 0 "R1513" H 4980 4820 50  0000 L CNN
 F 1 "100k" H 4980 4760 50  0000 L CNN
 F 2 "" H 4950 4800 50  0001 C CNN
 F 3 "~" H 4950 4800 50  0001 C CNN
@@ -599,7 +599,7 @@ U 1 1 5D19065F
 P 4600 5050
 AR Path="/5CA6B0B3/5CC199E0/5D19065F" Ref="C1409"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D19065F" Ref="C1509"  Part="1" 
-F 0 "C1409" H 4610 5120 50  0000 L CNN
+F 0 "C1509" H 4610 5120 50  0000 L CNN
 F 1 "1 nF" H 4610 4970 50  0000 L CNN
 F 2 "" H 4600 5050 50  0001 C CNN
 F 3 "~" H 4600 5050 50  0001 C CNN
@@ -621,7 +621,7 @@ U 1 1 5D193951
 P 4600 5250
 AR Path="/5CA6B0B3/5CC199E0/5D193951" Ref="#PWR01409"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D193951" Ref="#PWR01509"  Part="1" 
-F 0 "#PWR01409" H 4600 5000 50  0001 C CNN
+F 0 "#PWR01509" H 4600 5000 50  0001 C CNN
 F 1 "GND" H 4600 5100 50  0000 C CNN
 F 2 "" H 4600 5250 50  0001 C CNN
 F 3 "" H 4600 5250 50  0001 C CNN
@@ -645,7 +645,7 @@ U 1 1 5D1A535B
 P 3300 4950
 AR Path="/5CA6B0B3/5CC199E0/5D1A535B" Ref="Q1404"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A535B" Ref="Q1504"  Part="1" 
-F 0 "Q1404" H 3500 5000 50  0000 L CNN
+F 0 "Q1504" H 3500 5000 50  0000 L CNN
 F 1 "Q_PNP_BCE" H 3500 4900 50  0000 L CNN
 F 2 "" H 3500 5050 50  0001 C CNN
 F 3 "~" H 3300 4950 50  0001 C CNN
@@ -658,7 +658,7 @@ U 1 1 5D1B0006
 P 4250 4700
 AR Path="/5CA6B0B3/5CC199E0/5D1B0006" Ref="Q1405"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1B0006" Ref="Q1505"  Part="1" 
-F 0 "Q1405" H 4450 4750 50  0000 L CNN
+F 0 "Q1505" H 4450 4750 50  0000 L CNN
 F 1 "Q_PNP_BCE" H 4450 4650 50  0000 L CNN
 F 2 "" H 4450 4800 50  0001 C CNN
 F 3 "~" H 4250 4700 50  0001 C CNN
@@ -671,7 +671,7 @@ U 1 1 5D1B2EB0
 P 3000 5000
 AR Path="/5CA6B0B3/5CC199E0/5D1B2EB0" Ref="#PWR01404"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1B2EB0" Ref="#PWR01504"  Part="1" 
-F 0 "#PWR01404" H 3000 4750 50  0001 C CNN
+F 0 "#PWR01504" H 3000 4750 50  0001 C CNN
 F 1 "GND" H 3000 4850 50  0000 C CNN
 F 2 "" H 3000 5000 50  0001 C CNN
 F 3 "" H 3000 5000 50  0001 C CNN
@@ -691,7 +691,7 @@ U 1 1 5D1B6E50
 P 3700 4100
 AR Path="/5CA6B0B3/5CC199E0/5D1B6E50" Ref="R1411"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1B6E50" Ref="R1511"  Part="1" 
-F 0 "R1411" H 3730 4120 50  0000 L CNN
+F 0 "R1511" H 3730 4120 50  0000 L CNN
 F 1 "10kR" H 3730 4060 50  0000 L CNN
 F 2 "" H 3700 4100 50  0001 C CNN
 F 3 "~" H 3700 4100 50  0001 C CNN
@@ -715,7 +715,7 @@ U 1 1 5D1CE967
 P 3400 5450
 AR Path="/5CA6B0B3/5CC199E0/5D1CE967" Ref="R1410"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1CE967" Ref="R1510"  Part="1" 
-F 0 "R1410" H 3430 5470 50  0000 L CNN
+F 0 "R1510" H 3430 5470 50  0000 L CNN
 F 1 "4k7R" H 3430 5410 50  0000 L CNN
 F 2 "" H 3400 5450 50  0001 C CNN
 F 3 "~" H 3400 5450 50  0001 C CNN
@@ -764,7 +764,7 @@ U 1 1 5D1EB863
 P 3500 6400
 AR Path="/5CA6B0B3/5CC199E0/5D1EB863" Ref="C1406"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1EB863" Ref="C1506"  Part="1" 
-F 0 "C1406" H 3510 6470 50  0000 L CNN
+F 0 "C1506" H 3510 6470 50  0000 L CNN
 F 1 "C_Small" H 3510 6320 50  0000 L CNN
 F 2 "" H 3500 6400 50  0001 C CNN
 F 3 "~" H 3500 6400 50  0001 C CNN
@@ -777,7 +777,7 @@ U 1 1 5D1EBDD5
 P 3850 6400
 AR Path="/5CA6B0B3/5CC199E0/5D1EBDD5" Ref="C1407"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1EBDD5" Ref="C1507"  Part="1" 
-F 0 "C1407" H 3860 6470 50  0000 L CNN
+F 0 "C1507" H 3860 6470 50  0000 L CNN
 F 1 "C_Small" H 3860 6320 50  0000 L CNN
 F 2 "" H 3850 6400 50  0001 C CNN
 F 3 "~" H 3850 6400 50  0001 C CNN
@@ -790,7 +790,7 @@ U 1 1 5D1EC2AA
 P 4250 6400
 AR Path="/5CA6B0B3/5CC199E0/5D1EC2AA" Ref="C1408"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1EC2AA" Ref="C1508"  Part="1" 
-F 0 "C1408" H 4260 6470 50  0000 L CNN
+F 0 "C1508" H 4260 6470 50  0000 L CNN
 F 1 "C_Small" H 4260 6320 50  0000 L CNN
 F 2 "" H 4250 6400 50  0001 C CNN
 F 3 "~" H 4250 6400 50  0001 C CNN
@@ -803,7 +803,7 @@ U 1 1 5D1F5C64
 P 4250 6600
 AR Path="/5CA6B0B3/5CC199E0/5D1F5C64" Ref="#PWR01408"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1F5C64" Ref="#PWR01508"  Part="1" 
-F 0 "#PWR01408" H 4250 6350 50  0001 C CNN
+F 0 "#PWR01508" H 4250 6350 50  0001 C CNN
 F 1 "GND" H 4250 6450 50  0000 C CNN
 F 2 "" H 4250 6600 50  0001 C CNN
 F 3 "" H 4250 6600 50  0001 C CNN
@@ -816,7 +816,7 @@ U 1 1 5D1F5F88
 P 3850 6600
 AR Path="/5CA6B0B3/5CC199E0/5D1F5F88" Ref="#PWR01407"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1F5F88" Ref="#PWR01507"  Part="1" 
-F 0 "#PWR01407" H 3850 6350 50  0001 C CNN
+F 0 "#PWR01507" H 3850 6350 50  0001 C CNN
 F 1 "GND" H 3850 6450 50  0000 C CNN
 F 2 "" H 3850 6600 50  0001 C CNN
 F 3 "" H 3850 6600 50  0001 C CNN
@@ -829,7 +829,7 @@ U 1 1 5D1F629A
 P 3500 6600
 AR Path="/5CA6B0B3/5CC199E0/5D1F629A" Ref="#PWR01406"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1F629A" Ref="#PWR01506"  Part="1" 
-F 0 "#PWR01406" H 3500 6350 50  0001 C CNN
+F 0 "#PWR01506" H 3500 6350 50  0001 C CNN
 F 1 "GND" H 3500 6450 50  0000 C CNN
 F 2 "" H 3500 6600 50  0001 C CNN
 F 3 "" H 3500 6600 50  0001 C CNN
@@ -864,7 +864,7 @@ U 1 1 5D111EFA
 P 1700 2550
 AR Path="/5CA6B0B3/5CC199E0/5D111EFA" Ref="Q1401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D111EFA" Ref="Q1501"  Part="1" 
-F 0 "Q1401" H 1891 2596 50  0000 L CNN
+F 0 "Q1501" H 1891 2596 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 1891 2505 50  0000 L CNN
 F 2 "" H 1900 2650 50  0001 C CNN
 F 3 "~" H 1700 2550 50  0001 C CNN
@@ -877,7 +877,7 @@ U 1 1 5D11BA3B
 P 2850 2450
 AR Path="/5CA6B0B3/5CC199E0/5D11BA3B" Ref="Q1403"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D11BA3B" Ref="Q1503"  Part="1" 
-F 0 "Q1403" H 3041 2496 50  0000 L CNN
+F 0 "Q1503" H 3041 2496 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 3041 2405 50  0000 L CNN
 F 2 "" H 3050 2550 50  0001 C CNN
 F 3 "~" H 2850 2450 50  0001 C CNN
@@ -890,7 +890,7 @@ U 1 1 5D11C60F
 P 2050 3450
 AR Path="/5CA6B0B3/5CC199E0/5D11C60F" Ref="Q1402"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D11C60F" Ref="Q1502"  Part="1" 
-F 0 "Q1402" H 2241 3496 50  0000 L CNN
+F 0 "Q1502" H 2241 3496 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 2241 3405 50  0000 L CNN
 F 2 "" H 2250 3550 50  0001 C CNN
 F 3 "~" H 2050 3450 50  0001 C CNN
@@ -903,7 +903,7 @@ U 1 1 5D1A4BF9
 P 1800 2950
 AR Path="/5CA6B0B3/5CC199E0/5D1A4BF9" Ref="R1405"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A4BF9" Ref="R1505"  Part="1" 
-F 0 "R1405" H 1859 2996 50  0000 L CNN
+F 0 "R1505" H 1859 2996 50  0000 L CNN
 F 1 "22R" H 1859 2905 50  0000 L CNN
 F 2 "" H 1800 2950 50  0001 C CNN
 F 3 "~" H 1800 2950 50  0001 C CNN
@@ -916,7 +916,7 @@ U 1 1 5D1A519D
 P 2750 2900
 AR Path="/5CA6B0B3/5CC199E0/5D1A519D" Ref="R1408"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A519D" Ref="R1508"  Part="1" 
-F 0 "R1408" H 2809 2946 50  0000 L CNN
+F 0 "R1508" H 2809 2946 50  0000 L CNN
 F 1 "22R" H 2809 2855 50  0000 L CNN
 F 2 "" H 2750 2900 50  0001 C CNN
 F 3 "~" H 2750 2900 50  0001 C CNN
@@ -929,7 +929,7 @@ U 1 1 5D1A606E
 P 1400 2250
 AR Path="/5CA6B0B3/5CC199E0/5D1A606E" Ref="R1403"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A606E" Ref="R1503"  Part="1" 
-F 0 "R1403" H 1459 2296 50  0000 L CNN
+F 0 "R1503" H 1459 2296 50  0000 L CNN
 F 1 "4k7R" H 1459 2205 50  0000 L CNN
 F 2 "" H 1400 2250 50  0001 C CNN
 F 3 "~" H 1400 2250 50  0001 C CNN
@@ -942,7 +942,7 @@ U 1 1 5D1A670A
 P 3200 2200
 AR Path="/5CA6B0B3/5CC199E0/5D1A670A" Ref="R1409"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A670A" Ref="R1509"  Part="1" 
-F 0 "R1409" H 3259 2246 50  0000 L CNN
+F 0 "R1509" H 3259 2246 50  0000 L CNN
 F 1 "4k7R" H 3259 2155 50  0000 L CNN
 F 2 "" H 3200 2200 50  0001 C CNN
 F 3 "~" H 3200 2200 50  0001 C CNN
@@ -955,7 +955,7 @@ U 1 1 5D1A740A
 P 2150 3900
 AR Path="/5CA6B0B3/5CC199E0/5D1A740A" Ref="R1406"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A740A" Ref="R1506"  Part="1" 
-F 0 "R1406" H 2209 3946 50  0000 L CNN
+F 0 "R1506" H 2209 3946 50  0000 L CNN
 F 1 "25R" H 2209 3855 50  0000 L CNN
 F 2 "" H 2150 3900 50  0001 C CNN
 F 3 "~" H 2150 3900 50  0001 C CNN
@@ -968,7 +968,7 @@ U 1 1 5D1A78D7
 P 1250 3250
 AR Path="/5CA6B0B3/5CC199E0/5D1A78D7" Ref="R1401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A78D7" Ref="R1501"  Part="1" 
-F 0 "R1401" H 1309 3296 50  0000 L CNN
+F 0 "R1501" H 1309 3296 50  0000 L CNN
 F 1 "2k5R" H 1309 3205 50  0000 L CNN
 F 2 "" H 1250 3250 50  0001 C CNN
 F 3 "~" H 1250 3250 50  0001 C CNN
@@ -981,7 +981,7 @@ U 1 1 5D1A7E71
 P 1250 3700
 AR Path="/5CA6B0B3/5CC199E0/5D1A7E71" Ref="R1402"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A7E71" Ref="R1502"  Part="1" 
-F 0 "R1402" H 1309 3746 50  0000 L CNN
+F 0 "R1502" H 1309 3746 50  0000 L CNN
 F 1 "1kR" H 1309 3655 50  0000 L CNN
 F 2 "" H 1250 3700 50  0001 C CNN
 F 3 "~" H 1250 3700 50  0001 C CNN
@@ -994,7 +994,7 @@ U 1 1 5D1A89A5
 P 2150 4100
 AR Path="/5CA6B0B3/5CC199E0/5D1A89A5" Ref="#PWR01403"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A89A5" Ref="#PWR01503"  Part="1" 
-F 0 "#PWR01403" H 2150 3850 50  0001 C CNN
+F 0 "#PWR01503" H 2150 3850 50  0001 C CNN
 F 1 "GND" H 2155 3927 50  0000 C CNN
 F 2 "" H 2150 4100 50  0001 C CNN
 F 3 "" H 2150 4100 50  0001 C CNN
@@ -1007,7 +1007,7 @@ U 1 1 5D1A9311
 P 1250 3900
 AR Path="/5CA6B0B3/5CC199E0/5D1A9311" Ref="#PWR01401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A9311" Ref="#PWR01501"  Part="1" 
-F 0 "#PWR01401" H 1250 3650 50  0001 C CNN
+F 0 "#PWR01501" H 1250 3650 50  0001 C CNN
 F 1 "GND" H 1255 3727 50  0000 C CNN
 F 2 "" H 1250 3900 50  0001 C CNN
 F 3 "" H 1250 3900 50  0001 C CNN
@@ -1020,7 +1020,7 @@ U 1 1 5D1ABF37
 P 1750 3900
 AR Path="/5CA6B0B3/5CC199E0/5D1ABF37" Ref="#PWR01402"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1ABF37" Ref="#PWR01502"  Part="1" 
-F 0 "#PWR01402" H 1750 3650 50  0001 C CNN
+F 0 "#PWR01502" H 1750 3650 50  0001 C CNN
 F 1 "GND" H 1755 3727 50  0000 C CNN
 F 2 "" H 1750 3900 50  0001 C CNN
 F 3 "" H 1750 3900 50  0001 C CNN
@@ -1033,7 +1033,7 @@ U 1 1 5D1AC551
 P 1750 3700
 AR Path="/5CA6B0B3/5CC199E0/5D1AC551" Ref="C1403"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1AC551" Ref="C1503"  Part="1" 
-F 0 "C1403" H 1760 3770 50  0000 L CNN
+F 0 "C1503" H 1760 3770 50  0000 L CNN
 F 1 "0.1 uF" H 1760 3620 50  0000 L CNN
 F 2 "" H 1750 3700 50  0001 C CNN
 F 3 "~" H 1750 3700 50  0001 C CNN
@@ -1046,7 +1046,7 @@ U 1 1 5D1AD1B8
 P 1200 2550
 AR Path="/5CA6B0B3/5CC199E0/5D1AD1B8" Ref="C1402"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1AD1B8" Ref="C1502"  Part="1" 
-F 0 "C1402" V 971 2550 50  0000 C CNN
+F 0 "C1502" V 971 2550 50  0000 C CNN
 F 1 "0.1 uF" V 1062 2550 50  0000 C CNN
 F 2 "" H 1200 2550 50  0001 C CNN
 F 3 "~" H 1200 2550 50  0001 C CNN
@@ -1059,7 +1059,7 @@ U 1 1 5D1ADA21
 P 3200 2650
 AR Path="/5CA6B0B3/5CC199E0/5D1ADA21" Ref="C1404"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1ADA21" Ref="C1504"  Part="1" 
-F 0 "C1404" H 3108 2604 50  0000 R CNN
+F 0 "C1504" H 3108 2604 50  0000 R CNN
 F 1 "0.1 uF" H 3108 2695 50  0000 R CNN
 F 2 "" H 3200 2650 50  0001 C CNN
 F 3 "~" H 3200 2650 50  0001 C CNN
@@ -1072,7 +1072,7 @@ U 1 1 5D1AE084
 P 3200 2850
 AR Path="/5CA6B0B3/5CC199E0/5D1AE084" Ref="#PWR01405"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1AE084" Ref="#PWR01505"  Part="1" 
-F 0 "#PWR01405" H 3200 2600 50  0001 C CNN
+F 0 "#PWR01505" H 3200 2600 50  0001 C CNN
 F 1 "GND" H 3205 2677 50  0000 C CNN
 F 2 "" H 3200 2850 50  0001 C CNN
 F 3 "" H 3200 2850 50  0001 C CNN
@@ -1164,7 +1164,7 @@ U 1 1 5D271283
 P 1200 2000
 AR Path="/5CA6B0B3/5CC199E0/5D271283" Ref="C1401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D271283" Ref="C1501"  Part="1" 
-F 0 "C1401" V 971 2000 50  0000 C CNN
+F 0 "C1501" V 971 2000 50  0000 C CNN
 F 1 "0.1 uF" V 1062 2000 50  0000 C CNN
 F 2 "" H 1200 2000 50  0001 C CNN
 F 3 "~" H 1200 2000 50  0001 C CNN
@@ -1177,7 +1177,7 @@ U 1 1 5D271572
 P 3450 2000
 AR Path="/5CA6B0B3/5CC199E0/5D271572" Ref="C1405"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D271572" Ref="C1505"  Part="1" 
-F 0 "C1405" V 3221 2000 50  0000 C CNN
+F 0 "C1505" V 3221 2000 50  0000 C CNN
 F 1 "0.1 uF" V 3312 2000 50  0000 C CNN
 F 2 "" H 3450 2000 50  0001 C CNN
 F 3 "~" H 3450 2000 50  0001 C CNN
@@ -1314,7 +1314,7 @@ U 1 1 5D100E2B
 P 5750 3200
 AR Path="/5CA6B0B3/5CC199E0/5D100E2B" Ref="C1411"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D100E2B" Ref="C1511"  Part="1" 
-F 0 "C1411" H 5760 3270 50  0000 L CNN
+F 0 "C1511" H 5760 3270 50  0000 L CNN
 F 1 "DNP 0402" H 5760 3120 50  0000 L CNN
 F 2 "" H 5750 3200 50  0001 C CNN
 F 3 "~" H 5750 3200 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/mixer.sch-bak b/pcb/discrete/discrete-rf-board/mixer.sch-bak
index 3f37cc4..fbe7731 100644
--- a/pcb/discrete/discrete-rf-board/mixer.sch-bak
+++ b/pcb/discrete/discrete-rf-board/mixer.sch-bak
@@ -32,7 +32,7 @@ U 1 1 5D0F3E9F
 P 7350 3950
 AR Path="/5CA6B0B3/5CC199E0/5D0F3E9F" Ref="C1413"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0F3E9F" Ref="C1513"  Part="1" 
-F 0 "C1413" H 7258 3904 50  0000 R CNN
+F 0 "C1513" H 7258 3904 50  0000 R CNN
 F 1 "100 pF RF" H 7258 3995 50  0000 R CNN
 F 2 "" H 7350 3950 50  0001 C CNN
 F 3 "~" H 7350 3950 50  0001 C CNN
@@ -45,7 +45,7 @@ U 1 1 5D0F4BFE
 P 7350 4150
 AR Path="/5CA6B0B3/5CC199E0/5D0F4BFE" Ref="#PWR01413"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0F4BFE" Ref="#PWR01513"  Part="1" 
-F 0 "#PWR01413" H 7350 3900 50  0001 C CNN
+F 0 "#PWR01513" H 7350 3900 50  0001 C CNN
 F 1 "GND" H 7355 3977 50  0000 C CNN
 F 2 "" H 7350 4150 50  0001 C CNN
 F 3 "" H 7350 4150 50  0001 C CNN
@@ -60,7 +60,7 @@ U 1 1 5D0F5E6D
 P 5500 2950
 AR Path="/5CA6B0B3/5CC199E0/5D0F5E6D" Ref="C1410"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0F5E6D" Ref="C1510"  Part="1" 
-F 0 "C1410" H 5408 2996 50  0000 R CNN
+F 0 "C1510" H 5408 2996 50  0000 R CNN
 F 1 "100 pF RF" H 5408 2905 50  0000 R CNN
 F 2 "" H 5500 2950 50  0001 C CNN
 F 3 "~" H 5500 2950 50  0001 C CNN
@@ -77,7 +77,7 @@ U 1 1 5D101264
 P 6300 3200
 AR Path="/5CA6B0B3/5CC199E0/5D101264" Ref="C1412"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D101264" Ref="C1512"  Part="1" 
-F 0 "C1412" H 6310 3270 50  0000 L CNN
+F 0 "C1512" H 6310 3270 50  0000 L CNN
 F 1 "DNP 0402" H 6310 3120 50  0000 L CNN
 F 2 "" H 6300 3200 50  0001 C CNN
 F 3 "~" H 6300 3200 50  0001 C CNN
@@ -90,7 +90,7 @@ U 1 1 5D1017A0
 P 6050 2950
 AR Path="/5CA6B0B3/5CC199E0/5D1017A0" Ref="L1401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1017A0" Ref="L1501"  Part="1" 
-F 0 "L1401" H 6080 2990 50  0000 L CNN
+F 0 "L1501" H 6080 2990 50  0000 L CNN
 F 1 "6.8 nH" H 6080 2910 50  0000 L CNN
 F 2 "" H 6050 2950 50  0001 C CNN
 F 3 "~" H 6050 2950 50  0001 C CNN
@@ -103,7 +103,7 @@ U 1 1 5D101EA1
 P 5750 3450
 AR Path="/5CA6B0B3/5CC199E0/5D101EA1" Ref="#PWR01410"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D101EA1" Ref="#PWR01510"  Part="1" 
-F 0 "#PWR01410" H 5750 3200 50  0001 C CNN
+F 0 "#PWR01510" H 5750 3200 50  0001 C CNN
 F 1 "GND" H 5750 3300 50  0000 C CNN
 F 2 "" H 5750 3450 50  0001 C CNN
 F 3 "" H 5750 3450 50  0001 C CNN
@@ -116,7 +116,7 @@ U 1 1 5D1020F7
 P 6300 3450
 AR Path="/5CA6B0B3/5CC199E0/5D1020F7" Ref="#PWR01411"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1020F7" Ref="#PWR01511"  Part="1" 
-F 0 "#PWR01411" H 6300 3200 50  0001 C CNN
+F 0 "#PWR01511" H 6300 3200 50  0001 C CNN
 F 1 "GND" H 6300 3300 50  0000 C CNN
 F 2 "" H 6300 3450 50  0001 C CNN
 F 3 "" H 6300 3450 50  0001 C CNN
@@ -150,7 +150,7 @@ AR Path="/5CA6B0AA/5CB33251/5CC489AE" Ref="J?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CC489AE" Ref="J?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CC489AE" Ref="J1401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CC489AE" Ref="J1501"  Part="1" 
-F 0 "J1401" H 9810 4170 50  0000 C CNN
+F 0 "J1501" H 9810 4170 50  0000 C CNN
 F 1 "UFL" V 9915 4050 50  0000 C CNN
 F 2 "" H 9800 4050 50  0001 C CNN
 F 3 " ~" H 9800 4050 50  0001 C CNN
@@ -165,7 +165,7 @@ AR Path="/5CA6B0AA/5CB33251/5CC49A0F" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CC49A0F" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CC49A0F" Ref="#PWR01420"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CC49A0F" Ref="#PWR01520"  Part="1" 
-F 0 "#PWR01420" H 9800 4100 50  0001 C CNN
+F 0 "#PWR01520" H 9800 4100 50  0001 C CNN
 F 1 "GND" H 9800 4200 50  0000 C CNN
 F 2 "" H 9800 4350 50  0001 C CNN
 F 3 "" H 9800 4350 50  0001 C CNN
@@ -197,7 +197,7 @@ AR Path="/5CA6B0AA/5CB33251/5CBC9FE3" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CBC9FE3" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CBC9FE3" Ref="#PWR01417"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CBC9FE3" Ref="#PWR01517"  Part="1" 
-F 0 "#PWR01417" H 9050 4700 50  0001 C CNN
+F 0 "#PWR01517" H 9050 4700 50  0001 C CNN
 F 1 "GND" H 9050 4800 50  0000 C CNN
 F 2 "" H 9050 4950 50  0001 C CNN
 F 3 "" H 9050 4950 50  0001 C CNN
@@ -218,7 +218,7 @@ U 1 1 5D125BFA
 P 7750 5450
 AR Path="/5CA6B0B3/5CC199E0/5D125BFA" Ref="#PWR01414"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D125BFA" Ref="#PWR01514"  Part="1" 
-F 0 "#PWR01414" H 7750 5200 50  0001 C CNN
+F 0 "#PWR01514" H 7750 5200 50  0001 C CNN
 F 1 "GND" H 7750 5300 50  0000 C CNN
 F 2 "" H 7750 5450 50  0001 C CNN
 F 3 "" H 7750 5450 50  0001 C CNN
@@ -231,7 +231,7 @@ U 1 1 5D125420
 P 7750 5250
 AR Path="/5CA6B0B3/5CC199E0/5D125420" Ref="C1414"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D125420" Ref="C1514"  Part="1" 
-F 0 "C1414" H 7760 5320 50  0000 L CNN
+F 0 "C1514" H 7760 5320 50  0000 L CNN
 F 1 "1 nF" H 7760 5170 50  0000 L CNN
 F 2 "" H 7750 5250 50  0001 C CNN
 F 3 "~" H 7750 5250 50  0001 C CNN
@@ -250,7 +250,7 @@ U 1 1 5D0D0BEF
 P 6450 5150
 AR Path="/5CA6B0B3/5CC199E0/5D0D0BEF" Ref="#PWR01412"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D0D0BEF" Ref="#PWR01512"  Part="1" 
-F 0 "#PWR01412" H 6450 4900 50  0001 C CNN
+F 0 "#PWR01512" H 6450 4900 50  0001 C CNN
 F 1 "GND" H 6455 4977 50  0000 C CNN
 F 2 "" H 6450 5150 50  0001 C CNN
 F 3 "" H 6450 5150 50  0001 C CNN
@@ -263,7 +263,7 @@ U 1 1 5D01A78D
 P 7050 4750
 AR Path="/5CA6B0B3/5CC199E0/5D01A78D" Ref="U1401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D01A78D" Ref="U1501"  Part="1" 
-F 0 "U1401" H 7050 4200 50  0000 C CNN
+F 0 "U1501" H 7050 4200 50  0000 C CNN
 F 1 "LT5560EDD#PBF" H 7050 4100 50  0000 C CNN
 F 2 "" H 7050 4200 50  0001 C CNN
 F 3 "" H 7050 4200 50  0001 C CNN
@@ -317,7 +317,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6E137" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6E137" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6E137" Ref="#PWR01419"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6E137" Ref="#PWR01519"  Part="1" 
-F 0 "#PWR01419" H 9450 3000 50  0001 C CNN
+F 0 "#PWR01519" H 9450 3000 50  0001 C CNN
 F 1 "GND" H 9450 3100 50  0000 C CNN
 F 2 "" H 9450 3250 50  0001 C CNN
 F 3 "" H 9450 3250 50  0001 C CNN
@@ -332,7 +332,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6DF60" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6DF60" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6DF60" Ref="#PWR01418"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6DF60" Ref="#PWR01518"  Part="1" 
-F 0 "#PWR01418" H 9100 3000 50  0001 C CNN
+F 0 "#PWR01518" H 9100 3000 50  0001 C CNN
 F 1 "GND" H 9100 3100 50  0000 C CNN
 F 2 "" H 9100 3250 50  0001 C CNN
 F 3 "" H 9100 3250 50  0001 C CNN
@@ -347,7 +347,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6DBAF" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6DBAF" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6DBAF" Ref="#PWR01416"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6DBAF" Ref="#PWR01516"  Part="1" 
-F 0 "#PWR01416" H 8700 3000 50  0001 C CNN
+F 0 "#PWR01516" H 8700 3000 50  0001 C CNN
 F 1 "GND" H 8700 3100 50  0000 C CNN
 F 2 "" H 8700 3250 50  0001 C CNN
 F 3 "" H 8700 3250 50  0001 C CNN
@@ -362,7 +362,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6D892" Ref="#PWR?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6D892" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6D892" Ref="#PWR01415"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6D892" Ref="#PWR01515"  Part="1" 
-F 0 "#PWR01415" H 8350 3000 50  0001 C CNN
+F 0 "#PWR01515" H 8350 3000 50  0001 C CNN
 F 1 "GND" H 8350 3100 50  0000 C CNN
 F 2 "" H 8350 3250 50  0001 C CNN
 F 3 "" H 8350 3250 50  0001 C CNN
@@ -377,7 +377,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6B125" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6B125" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6B125" Ref="C1419"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6B125" Ref="C1519"  Part="1" 
-F 0 "C1419" H 9460 3120 50  0000 L CNN
+F 0 "C1519" H 9460 3120 50  0000 L CNN
 F 1 "1 nF" H 9460 2970 50  0000 L CNN
 F 2 "" H 9450 3050 50  0001 C CNN
 F 3 "~" H 9450 3050 50  0001 C CNN
@@ -392,7 +392,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6AE2E" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6AE2E" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6AE2E" Ref="C1418"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6AE2E" Ref="C1518"  Part="1" 
-F 0 "C1418" H 9110 3120 50  0000 L CNN
+F 0 "C1518" H 9110 3120 50  0000 L CNN
 F 1 "100 pF" H 9110 2970 50  0000 L CNN
 F 2 "" H 9100 3050 50  0001 C CNN
 F 3 "~" H 9100 3050 50  0001 C CNN
@@ -407,7 +407,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6AABA" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6AABA" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6AABA" Ref="C1416"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6AABA" Ref="C1516"  Part="1" 
-F 0 "C1416" H 8710 3120 50  0000 L CNN
+F 0 "C1516" H 8710 3120 50  0000 L CNN
 F 1 "100 pF" H 8710 2970 50  0000 L CNN
 F 2 "" H 8700 3050 50  0001 C CNN
 F 3 "~" H 8700 3050 50  0001 C CNN
@@ -422,7 +422,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB6A8A7" Ref="C?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB6A8A7" Ref="C?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB6A8A7" Ref="C1415"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB6A8A7" Ref="C1515"  Part="1" 
-F 0 "C1415" H 8360 3120 50  0000 L CNN
+F 0 "C1515" H 8360 3120 50  0000 L CNN
 F 1 "100 pF" H 8360 2970 50  0000 L CNN
 F 2 "" H 8350 3050 50  0001 C CNN
 F 3 "~" H 8350 3050 50  0001 C CNN
@@ -439,7 +439,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB40E92" Ref="R?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB40E92" Ref="R?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB40E92" Ref="R1414"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB40E92" Ref="R1514"  Part="1" 
-F 0 "R1414" H 7530 3220 50  0000 L CNN
+F 0 "R1514" H 7530 3220 50  0000 L CNN
 F 1 "10R" H 7530 3160 50  0000 L CNN
 F 2 "" H 7500 3200 50  0001 C CNN
 F 3 "~" H 7500 3200 50  0001 C CNN
@@ -454,7 +454,7 @@ AR Path="/5CA6B0AA/5CB33251/5CB3C1D2" Ref="L?"  Part="1"
 AR Path="/5CA6B0AA/5CCECB6F/5CB3C1D2" Ref="L?"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E0/5CB3C1D2" Ref="L1402"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5CB3C1D2" Ref="L1502"  Part="1" 
-F 0 "L1402" H 8080 3540 50  0000 L CNN
+F 0 "L1502" H 8080 3540 50  0000 L CNN
 F 1 "330 nH" H 8080 3460 50  0000 L CNN
 F 2 "" H 8050 3500 50  0001 C CNN
 F 3 "~" H 8050 3500 50  0001 C CNN
@@ -476,7 +476,7 @@ U 1 1 5D15BCFB
 P 8150 4800
 AR Path="/5CA6B0B3/5CC199E0/5D15BCFB" Ref="L1404"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D15BCFB" Ref="L1504"  Part="1" 
-F 0 "L1404" H 8180 4840 50  0000 L CNN
+F 0 "L1504" H 8180 4840 50  0000 L CNN
 F 1 "27 nH" H 8180 4760 50  0000 L CNN
 F 2 "" H 8150 4800 50  0001 C CNN
 F 3 "~" H 8150 4800 50  0001 C CNN
@@ -489,7 +489,7 @@ U 1 1 5D15EADF
 P 8150 4500
 AR Path="/5CA6B0B3/5CC199E0/5D15EADF" Ref="L1403"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D15EADF" Ref="L1503"  Part="1" 
-F 0 "L1403" H 8180 4540 50  0000 L CNN
+F 0 "L1503" H 8180 4540 50  0000 L CNN
 F 1 "27 nH" H 8180 4460 50  0000 L CNN
 F 2 "" H 8150 4500 50  0001 C CNN
 F 3 "~" H 8150 4500 50  0001 C CNN
@@ -512,7 +512,7 @@ U 1 1 5D169258
 P 9050 4650
 AR Path="/5CA6B0B3/5CC199E0/5D169258" Ref="C1417"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D169258" Ref="C1517"  Part="1" 
-F 0 "C1417" H 9060 4720 50  0000 L CNN
+F 0 "C1517" H 9060 4720 50  0000 L CNN
 F 1 "2.2 pF RF" H 9060 4570 50  0000 L CNN
 F 2 "" H 9050 4650 50  0001 C CNN
 F 3 "~" H 9050 4650 50  0001 C CNN
@@ -533,7 +533,7 @@ U 1 1 5D170BC5
 P 6000 5550
 AR Path="/5CA6B0B3/5CC199E0/5D170BC5" Ref="Q1407"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D170BC5" Ref="Q1507"  Part="1" 
-F 0 "Q1407" H 6200 5600 50  0000 L CNN
+F 0 "Q1507" H 6200 5600 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 6200 5500 50  0000 L CNN
 F 2 "" H 6200 5650 50  0001 C CNN
 F 3 "~" H 6000 5550 50  0001 C CNN
@@ -546,7 +546,7 @@ U 1 1 5D1710F5
 P 5300 5550
 AR Path="/5CA6B0B3/5CC199E0/5D1710F5" Ref="Q1406"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1710F5" Ref="Q1506"  Part="1" 
-F 0 "Q1406" H 5500 5600 50  0000 L CNN
+F 0 "Q1506" H 5500 5600 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 5500 5500 50  0000 L CNN
 F 2 "" H 5500 5650 50  0001 C CNN
 F 3 "~" H 5300 5550 50  0001 C CNN
@@ -569,7 +569,7 @@ U 1 1 5D18C9DE
 P 4950 4700
 AR Path="/5CA6B0B3/5CC199E0/5D18C9DE" Ref="R1412"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D18C9DE" Ref="R1512"  Part="1" 
-F 0 "R1412" H 4980 4720 50  0000 L CNN
+F 0 "R1512" H 4980 4720 50  0000 L CNN
 F 1 "100k" H 4980 4660 50  0000 L CNN
 F 2 "" H 4950 4700 50  0001 C CNN
 F 3 "~" H 4950 4700 50  0001 C CNN
@@ -582,7 +582,7 @@ U 1 1 5D18CEC8
 P 4950 4800
 AR Path="/5CA6B0B3/5CC199E0/5D18CEC8" Ref="R1413"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D18CEC8" Ref="R1513"  Part="1" 
-F 0 "R1413" H 4980 4820 50  0000 L CNN
+F 0 "R1513" H 4980 4820 50  0000 L CNN
 F 1 "100k" H 4980 4760 50  0000 L CNN
 F 2 "" H 4950 4800 50  0001 C CNN
 F 3 "~" H 4950 4800 50  0001 C CNN
@@ -599,7 +599,7 @@ U 1 1 5D19065F
 P 4600 5050
 AR Path="/5CA6B0B3/5CC199E0/5D19065F" Ref="C1409"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D19065F" Ref="C1509"  Part="1" 
-F 0 "C1409" H 4610 5120 50  0000 L CNN
+F 0 "C1509" H 4610 5120 50  0000 L CNN
 F 1 "1 nF" H 4610 4970 50  0000 L CNN
 F 2 "" H 4600 5050 50  0001 C CNN
 F 3 "~" H 4600 5050 50  0001 C CNN
@@ -621,7 +621,7 @@ U 1 1 5D193951
 P 4600 5250
 AR Path="/5CA6B0B3/5CC199E0/5D193951" Ref="#PWR01409"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D193951" Ref="#PWR01509"  Part="1" 
-F 0 "#PWR01409" H 4600 5000 50  0001 C CNN
+F 0 "#PWR01509" H 4600 5000 50  0001 C CNN
 F 1 "GND" H 4600 5100 50  0000 C CNN
 F 2 "" H 4600 5250 50  0001 C CNN
 F 3 "" H 4600 5250 50  0001 C CNN
@@ -645,7 +645,7 @@ U 1 1 5D1A535B
 P 3300 4950
 AR Path="/5CA6B0B3/5CC199E0/5D1A535B" Ref="Q1404"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A535B" Ref="Q1504"  Part="1" 
-F 0 "Q1404" H 3500 5000 50  0000 L CNN
+F 0 "Q1504" H 3500 5000 50  0000 L CNN
 F 1 "Q_PNP_BCE" H 3500 4900 50  0000 L CNN
 F 2 "" H 3500 5050 50  0001 C CNN
 F 3 "~" H 3300 4950 50  0001 C CNN
@@ -658,7 +658,7 @@ U 1 1 5D1B0006
 P 4250 4700
 AR Path="/5CA6B0B3/5CC199E0/5D1B0006" Ref="Q1405"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1B0006" Ref="Q1505"  Part="1" 
-F 0 "Q1405" H 4450 4750 50  0000 L CNN
+F 0 "Q1505" H 4450 4750 50  0000 L CNN
 F 1 "Q_PNP_BCE" H 4450 4650 50  0000 L CNN
 F 2 "" H 4450 4800 50  0001 C CNN
 F 3 "~" H 4250 4700 50  0001 C CNN
@@ -671,7 +671,7 @@ U 1 1 5D1B2EB0
 P 3000 5000
 AR Path="/5CA6B0B3/5CC199E0/5D1B2EB0" Ref="#PWR01404"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1B2EB0" Ref="#PWR01504"  Part="1" 
-F 0 "#PWR01404" H 3000 4750 50  0001 C CNN
+F 0 "#PWR01504" H 3000 4750 50  0001 C CNN
 F 1 "GND" H 3000 4850 50  0000 C CNN
 F 2 "" H 3000 5000 50  0001 C CNN
 F 3 "" H 3000 5000 50  0001 C CNN
@@ -691,7 +691,7 @@ U 1 1 5D1B6E50
 P 3700 4100
 AR Path="/5CA6B0B3/5CC199E0/5D1B6E50" Ref="R1411"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1B6E50" Ref="R1511"  Part="1" 
-F 0 "R1411" H 3730 4120 50  0000 L CNN
+F 0 "R1511" H 3730 4120 50  0000 L CNN
 F 1 "10kR" H 3730 4060 50  0000 L CNN
 F 2 "" H 3700 4100 50  0001 C CNN
 F 3 "~" H 3700 4100 50  0001 C CNN
@@ -715,7 +715,7 @@ U 1 1 5D1CE967
 P 3400 5450
 AR Path="/5CA6B0B3/5CC199E0/5D1CE967" Ref="R1410"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1CE967" Ref="R1510"  Part="1" 
-F 0 "R1410" H 3430 5470 50  0000 L CNN
+F 0 "R1510" H 3430 5470 50  0000 L CNN
 F 1 "4k7R" H 3430 5410 50  0000 L CNN
 F 2 "" H 3400 5450 50  0001 C CNN
 F 3 "~" H 3400 5450 50  0001 C CNN
@@ -764,7 +764,7 @@ U 1 1 5D1EB863
 P 3500 6400
 AR Path="/5CA6B0B3/5CC199E0/5D1EB863" Ref="C1406"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1EB863" Ref="C1506"  Part="1" 
-F 0 "C1406" H 3510 6470 50  0000 L CNN
+F 0 "C1506" H 3510 6470 50  0000 L CNN
 F 1 "C_Small" H 3510 6320 50  0000 L CNN
 F 2 "" H 3500 6400 50  0001 C CNN
 F 3 "~" H 3500 6400 50  0001 C CNN
@@ -777,7 +777,7 @@ U 1 1 5D1EBDD5
 P 3850 6400
 AR Path="/5CA6B0B3/5CC199E0/5D1EBDD5" Ref="C1407"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1EBDD5" Ref="C1507"  Part="1" 
-F 0 "C1407" H 3860 6470 50  0000 L CNN
+F 0 "C1507" H 3860 6470 50  0000 L CNN
 F 1 "C_Small" H 3860 6320 50  0000 L CNN
 F 2 "" H 3850 6400 50  0001 C CNN
 F 3 "~" H 3850 6400 50  0001 C CNN
@@ -790,7 +790,7 @@ U 1 1 5D1EC2AA
 P 4250 6400
 AR Path="/5CA6B0B3/5CC199E0/5D1EC2AA" Ref="C1408"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1EC2AA" Ref="C1508"  Part="1" 
-F 0 "C1408" H 4260 6470 50  0000 L CNN
+F 0 "C1508" H 4260 6470 50  0000 L CNN
 F 1 "C_Small" H 4260 6320 50  0000 L CNN
 F 2 "" H 4250 6400 50  0001 C CNN
 F 3 "~" H 4250 6400 50  0001 C CNN
@@ -803,7 +803,7 @@ U 1 1 5D1F5C64
 P 4250 6600
 AR Path="/5CA6B0B3/5CC199E0/5D1F5C64" Ref="#PWR01408"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1F5C64" Ref="#PWR01508"  Part="1" 
-F 0 "#PWR01408" H 4250 6350 50  0001 C CNN
+F 0 "#PWR01508" H 4250 6350 50  0001 C CNN
 F 1 "GND" H 4250 6450 50  0000 C CNN
 F 2 "" H 4250 6600 50  0001 C CNN
 F 3 "" H 4250 6600 50  0001 C CNN
@@ -816,7 +816,7 @@ U 1 1 5D1F5F88
 P 3850 6600
 AR Path="/5CA6B0B3/5CC199E0/5D1F5F88" Ref="#PWR01407"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1F5F88" Ref="#PWR01507"  Part="1" 
-F 0 "#PWR01407" H 3850 6350 50  0001 C CNN
+F 0 "#PWR01507" H 3850 6350 50  0001 C CNN
 F 1 "GND" H 3850 6450 50  0000 C CNN
 F 2 "" H 3850 6600 50  0001 C CNN
 F 3 "" H 3850 6600 50  0001 C CNN
@@ -829,7 +829,7 @@ U 1 1 5D1F629A
 P 3500 6600
 AR Path="/5CA6B0B3/5CC199E0/5D1F629A" Ref="#PWR01406"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1F629A" Ref="#PWR01506"  Part="1" 
-F 0 "#PWR01406" H 3500 6350 50  0001 C CNN
+F 0 "#PWR01506" H 3500 6350 50  0001 C CNN
 F 1 "GND" H 3500 6450 50  0000 C CNN
 F 2 "" H 3500 6600 50  0001 C CNN
 F 3 "" H 3500 6600 50  0001 C CNN
@@ -864,7 +864,7 @@ U 1 1 5D111EFA
 P 1700 2550
 AR Path="/5CA6B0B3/5CC199E0/5D111EFA" Ref="Q1401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D111EFA" Ref="Q1501"  Part="1" 
-F 0 "Q1401" H 1891 2596 50  0000 L CNN
+F 0 "Q1501" H 1891 2596 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 1891 2505 50  0000 L CNN
 F 2 "" H 1900 2650 50  0001 C CNN
 F 3 "~" H 1700 2550 50  0001 C CNN
@@ -877,7 +877,7 @@ U 1 1 5D11BA3B
 P 2850 2450
 AR Path="/5CA6B0B3/5CC199E0/5D11BA3B" Ref="Q1403"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D11BA3B" Ref="Q1503"  Part="1" 
-F 0 "Q1403" H 3041 2496 50  0000 L CNN
+F 0 "Q1503" H 3041 2496 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 3041 2405 50  0000 L CNN
 F 2 "" H 3050 2550 50  0001 C CNN
 F 3 "~" H 2850 2450 50  0001 C CNN
@@ -890,7 +890,7 @@ U 1 1 5D11C60F
 P 2050 3450
 AR Path="/5CA6B0B3/5CC199E0/5D11C60F" Ref="Q1402"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D11C60F" Ref="Q1502"  Part="1" 
-F 0 "Q1402" H 2241 3496 50  0000 L CNN
+F 0 "Q1502" H 2241 3496 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 2241 3405 50  0000 L CNN
 F 2 "" H 2250 3550 50  0001 C CNN
 F 3 "~" H 2050 3450 50  0001 C CNN
@@ -903,7 +903,7 @@ U 1 1 5D1A4BF9
 P 1800 2950
 AR Path="/5CA6B0B3/5CC199E0/5D1A4BF9" Ref="R1405"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A4BF9" Ref="R1505"  Part="1" 
-F 0 "R1405" H 1859 2996 50  0000 L CNN
+F 0 "R1505" H 1859 2996 50  0000 L CNN
 F 1 "22R" H 1859 2905 50  0000 L CNN
 F 2 "" H 1800 2950 50  0001 C CNN
 F 3 "~" H 1800 2950 50  0001 C CNN
@@ -916,7 +916,7 @@ U 1 1 5D1A519D
 P 2750 2900
 AR Path="/5CA6B0B3/5CC199E0/5D1A519D" Ref="R1408"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A519D" Ref="R1508"  Part="1" 
-F 0 "R1408" H 2809 2946 50  0000 L CNN
+F 0 "R1508" H 2809 2946 50  0000 L CNN
 F 1 "22R" H 2809 2855 50  0000 L CNN
 F 2 "" H 2750 2900 50  0001 C CNN
 F 3 "~" H 2750 2900 50  0001 C CNN
@@ -929,7 +929,7 @@ U 1 1 5D1A606E
 P 1400 2250
 AR Path="/5CA6B0B3/5CC199E0/5D1A606E" Ref="R1403"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A606E" Ref="R1503"  Part="1" 
-F 0 "R1403" H 1459 2296 50  0000 L CNN
+F 0 "R1503" H 1459 2296 50  0000 L CNN
 F 1 "4k7R" H 1459 2205 50  0000 L CNN
 F 2 "" H 1400 2250 50  0001 C CNN
 F 3 "~" H 1400 2250 50  0001 C CNN
@@ -942,7 +942,7 @@ U 1 1 5D1A670A
 P 3200 2200
 AR Path="/5CA6B0B3/5CC199E0/5D1A670A" Ref="R1409"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A670A" Ref="R1509"  Part="1" 
-F 0 "R1409" H 3259 2246 50  0000 L CNN
+F 0 "R1509" H 3259 2246 50  0000 L CNN
 F 1 "4k7R" H 3259 2155 50  0000 L CNN
 F 2 "" H 3200 2200 50  0001 C CNN
 F 3 "~" H 3200 2200 50  0001 C CNN
@@ -955,7 +955,7 @@ U 1 1 5D1A740A
 P 2150 3900
 AR Path="/5CA6B0B3/5CC199E0/5D1A740A" Ref="R1406"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A740A" Ref="R1506"  Part="1" 
-F 0 "R1406" H 2209 3946 50  0000 L CNN
+F 0 "R1506" H 2209 3946 50  0000 L CNN
 F 1 "25R" H 2209 3855 50  0000 L CNN
 F 2 "" H 2150 3900 50  0001 C CNN
 F 3 "~" H 2150 3900 50  0001 C CNN
@@ -968,7 +968,7 @@ U 1 1 5D1A78D7
 P 1250 3250
 AR Path="/5CA6B0B3/5CC199E0/5D1A78D7" Ref="R1401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A78D7" Ref="R1501"  Part="1" 
-F 0 "R1401" H 1309 3296 50  0000 L CNN
+F 0 "R1501" H 1309 3296 50  0000 L CNN
 F 1 "2k5R" H 1309 3205 50  0000 L CNN
 F 2 "" H 1250 3250 50  0001 C CNN
 F 3 "~" H 1250 3250 50  0001 C CNN
@@ -981,7 +981,7 @@ U 1 1 5D1A7E71
 P 1250 3700
 AR Path="/5CA6B0B3/5CC199E0/5D1A7E71" Ref="R1402"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A7E71" Ref="R1502"  Part="1" 
-F 0 "R1402" H 1309 3746 50  0000 L CNN
+F 0 "R1502" H 1309 3746 50  0000 L CNN
 F 1 "1kR" H 1309 3655 50  0000 L CNN
 F 2 "" H 1250 3700 50  0001 C CNN
 F 3 "~" H 1250 3700 50  0001 C CNN
@@ -994,7 +994,7 @@ U 1 1 5D1A89A5
 P 2150 4100
 AR Path="/5CA6B0B3/5CC199E0/5D1A89A5" Ref="#PWR01403"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A89A5" Ref="#PWR01503"  Part="1" 
-F 0 "#PWR01403" H 2150 3850 50  0001 C CNN
+F 0 "#PWR01503" H 2150 3850 50  0001 C CNN
 F 1 "GND" H 2155 3927 50  0000 C CNN
 F 2 "" H 2150 4100 50  0001 C CNN
 F 3 "" H 2150 4100 50  0001 C CNN
@@ -1007,7 +1007,7 @@ U 1 1 5D1A9311
 P 1250 3900
 AR Path="/5CA6B0B3/5CC199E0/5D1A9311" Ref="#PWR01401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1A9311" Ref="#PWR01501"  Part="1" 
-F 0 "#PWR01401" H 1250 3650 50  0001 C CNN
+F 0 "#PWR01501" H 1250 3650 50  0001 C CNN
 F 1 "GND" H 1255 3727 50  0000 C CNN
 F 2 "" H 1250 3900 50  0001 C CNN
 F 3 "" H 1250 3900 50  0001 C CNN
@@ -1020,7 +1020,7 @@ U 1 1 5D1ABF37
 P 1750 3900
 AR Path="/5CA6B0B3/5CC199E0/5D1ABF37" Ref="#PWR01402"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1ABF37" Ref="#PWR01502"  Part="1" 
-F 0 "#PWR01402" H 1750 3650 50  0001 C CNN
+F 0 "#PWR01502" H 1750 3650 50  0001 C CNN
 F 1 "GND" H 1755 3727 50  0000 C CNN
 F 2 "" H 1750 3900 50  0001 C CNN
 F 3 "" H 1750 3900 50  0001 C CNN
@@ -1033,7 +1033,7 @@ U 1 1 5D1AC551
 P 1750 3700
 AR Path="/5CA6B0B3/5CC199E0/5D1AC551" Ref="C1403"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1AC551" Ref="C1503"  Part="1" 
-F 0 "C1403" H 1760 3770 50  0000 L CNN
+F 0 "C1503" H 1760 3770 50  0000 L CNN
 F 1 "0.1 uF" H 1760 3620 50  0000 L CNN
 F 2 "" H 1750 3700 50  0001 C CNN
 F 3 "~" H 1750 3700 50  0001 C CNN
@@ -1046,7 +1046,7 @@ U 1 1 5D1AD1B8
 P 1200 2550
 AR Path="/5CA6B0B3/5CC199E0/5D1AD1B8" Ref="C1402"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1AD1B8" Ref="C1502"  Part="1" 
-F 0 "C1402" V 971 2550 50  0000 C CNN
+F 0 "C1502" V 971 2550 50  0000 C CNN
 F 1 "0.1 uF" V 1062 2550 50  0000 C CNN
 F 2 "" H 1200 2550 50  0001 C CNN
 F 3 "~" H 1200 2550 50  0001 C CNN
@@ -1059,7 +1059,7 @@ U 1 1 5D1ADA21
 P 3200 2650
 AR Path="/5CA6B0B3/5CC199E0/5D1ADA21" Ref="C1404"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1ADA21" Ref="C1504"  Part="1" 
-F 0 "C1404" H 3108 2604 50  0000 R CNN
+F 0 "C1504" H 3108 2604 50  0000 R CNN
 F 1 "0.1 uF" H 3108 2695 50  0000 R CNN
 F 2 "" H 3200 2650 50  0001 C CNN
 F 3 "~" H 3200 2650 50  0001 C CNN
@@ -1072,7 +1072,7 @@ U 1 1 5D1AE084
 P 3200 2850
 AR Path="/5CA6B0B3/5CC199E0/5D1AE084" Ref="#PWR01405"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D1AE084" Ref="#PWR01505"  Part="1" 
-F 0 "#PWR01405" H 3200 2600 50  0001 C CNN
+F 0 "#PWR01505" H 3200 2600 50  0001 C CNN
 F 1 "GND" H 3205 2677 50  0000 C CNN
 F 2 "" H 3200 2850 50  0001 C CNN
 F 3 "" H 3200 2850 50  0001 C CNN
@@ -1164,7 +1164,7 @@ U 1 1 5D271283
 P 1200 2000
 AR Path="/5CA6B0B3/5CC199E0/5D271283" Ref="C1401"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D271283" Ref="C1501"  Part="1" 
-F 0 "C1401" V 971 2000 50  0000 C CNN
+F 0 "C1501" V 971 2000 50  0000 C CNN
 F 1 "0.1 uF" V 1062 2000 50  0000 C CNN
 F 2 "" H 1200 2000 50  0001 C CNN
 F 3 "~" H 1200 2000 50  0001 C CNN
@@ -1177,7 +1177,7 @@ U 1 1 5D271572
 P 3450 2000
 AR Path="/5CA6B0B3/5CC199E0/5D271572" Ref="C1405"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D271572" Ref="C1505"  Part="1" 
-F 0 "C1405" V 3221 2000 50  0000 C CNN
+F 0 "C1505" V 3221 2000 50  0000 C CNN
 F 1 "0.1 uF" V 3312 2000 50  0000 C CNN
 F 2 "" H 3450 2000 50  0001 C CNN
 F 3 "~" H 3450 2000 50  0001 C CNN
@@ -1314,7 +1314,7 @@ U 1 1 5D100E2B
 P 5750 3200
 AR Path="/5CA6B0B3/5CC199E0/5D100E2B" Ref="C1411"  Part="1" 
 AR Path="/5CA6B0B3/5CC199E2/5D100E2B" Ref="C1511"  Part="1" 
-F 0 "C1411" H 5760 3270 50  0000 L CNN
+F 0 "C1511" H 5760 3270 50  0000 L CNN
 F 1 "DNP 0402" H 5760 3120 50  0000 L CNN
 F 2 "" H 5750 3200 50  0001 C CNN
 F 3 "~" H 5750 3200 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/switchable-attenuator.sch b/pcb/discrete/discrete-rf-board/switchable-attenuator.sch
index ff91323..b74e68b 100644
--- a/pcb/discrete/discrete-rf-board/switchable-attenuator.sch
+++ b/pcb/discrete/discrete-rf-board/switchable-attenuator.sch
@@ -4,7 +4,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 17 19
+Sheet 18 19
 Title ""
 Date ""
 Rev ""
@@ -22,7 +22,7 @@ AR Path="/5D4B1FC3" Ref="U?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FC3" Ref="U?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FC3" Ref="U1101"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FC3" Ref="U1201"  Part="1" 
-F 0 "U1101" H 4000 3750 50  0000 C CNN
+F 0 "U1201" H 4000 3750 50  0000 C CNN
 F 1 "BGS12PL6E6327XTSA1" H 4400 2850 50  0000 C CNN
 F 2 "" H 3950 3300 50  0001 C CNN
 F 3 "" H 3950 3300 50  0001 C CNN
@@ -37,7 +37,7 @@ P 4850 3300
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FCA" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FCA" Ref="R1101"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FCA" Ref="R1201"  Part="1" 
-F 0 "R1101" H 4880 3320 50  0000 L CNN
+F 0 "R1201" H 4880 3320 50  0000 L CNN
 F 1 "R_Small" H 4880 3260 50  0000 L CNN
 F 2 "" H 4850 3300 50  0001 C CNN
 F 3 "~" H 4850 3300 50  0001 C CNN
@@ -51,7 +51,7 @@ P 5200 3300
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FD0" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD0" Ref="R1103"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD0" Ref="R1203"  Part="1" 
-F 0 "R1103" H 5230 3320 50  0000 L CNN
+F 0 "R1203" H 5230 3320 50  0000 L CNN
 F 1 "R_Small" H 5230 3260 50  0000 L CNN
 F 2 "" H 5200 3300 50  0001 C CNN
 F 3 "~" H 5200 3300 50  0001 C CNN
@@ -65,7 +65,7 @@ P 5050 3700
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FD6" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD6" Ref="R1102"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD6" Ref="R1202"  Part="1" 
-F 0 "R1102" H 5080 3720 50  0000 L CNN
+F 0 "R1202" H 5080 3720 50  0000 L CNN
 F 1 "R_Small" H 5080 3660 50  0000 L CNN
 F 2 "" H 5050 3700 50  0001 C CNN
 F 3 "~" H 5050 3700 50  0001 C CNN
@@ -81,7 +81,7 @@ P 3950 3900
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FDD" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FDD" Ref="#PWR01101"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FDD" Ref="#PWR01201"  Part="1" 
-F 0 "#PWR01101" H 3950 3650 50  0001 C CNN
+F 0 "#PWR01201" H 3950 3650 50  0001 C CNN
 F 1 "GND" H 3950 3750 50  0000 C CNN
 F 2 "" H 3950 3900 50  0001 C CNN
 F 3 "" H 3950 3900 50  0001 C CNN
@@ -99,7 +99,7 @@ P 5050 3900
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FE5" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FE5" Ref="#PWR01105"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FE5" Ref="#PWR01205"  Part="1" 
-F 0 "#PWR01105" H 5050 3650 50  0001 C CNN
+F 0 "#PWR01205" H 5050 3650 50  0001 C CNN
 F 1 "GND" H 5050 3750 50  0000 C CNN
 F 2 "" H 5050 3900 50  0001 C CNN
 F 3 "" H 5050 3900 50  0001 C CNN
@@ -126,7 +126,7 @@ P 6000 3900
 AR Path="/5CA6B0AA/5CE74EBE/5D4B2001" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B2001" Ref="#PWR01106"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B2001" Ref="#PWR01206"  Part="1" 
-F 0 "#PWR01106" H 6000 3650 50  0001 C CNN
+F 0 "#PWR01206" H 6000 3650 50  0001 C CNN
 F 1 "GND" H 6000 3750 50  0000 C CNN
 F 2 "" H 6000 3900 50  0001 C CNN
 F 3 "" H 6000 3900 50  0001 C CNN
@@ -143,7 +143,7 @@ AR Path="/5D4B1FF8" Ref="U?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FF8" Ref="U?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FF8" Ref="U1102"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FF8" Ref="U1202"  Part="1" 
-F 0 "U1102" H 6050 3750 50  0000 C CNN
+F 0 "U1202" H 6050 3750 50  0000 C CNN
 F 1 "BGS12PL6E6327XTSA1" H 6450 2850 50  0000 C CNN
 F 2 "" H 6000 3300 50  0001 C CNN
 F 3 "" H 6000 3300 50  0001 C CNN
@@ -188,7 +188,7 @@ U 1 1 5D4BC42E
 P 4200 2150
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BC42E" Ref="C1101"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BC42E" Ref="C1201"  Part="1" 
-F 0 "C1101" H 4210 2220 50  0000 L CNN
+F 0 "C1201" H 4210 2220 50  0000 L CNN
 F 1 "C_Small" H 4210 2070 50  0000 L CNN
 F 2 "" H 4200 2150 50  0001 C CNN
 F 3 "~" H 4200 2150 50  0001 C CNN
@@ -201,7 +201,7 @@ U 1 1 5D4BC853
 P 4550 2150
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BC853" Ref="C1102"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BC853" Ref="C1202"  Part="1" 
-F 0 "C1102" H 4560 2220 50  0000 L CNN
+F 0 "C1202" H 4560 2220 50  0000 L CNN
 F 1 "C_Small" H 4560 2070 50  0000 L CNN
 F 2 "" H 4550 2150 50  0001 C CNN
 F 3 "~" H 4550 2150 50  0001 C CNN
@@ -214,7 +214,7 @@ U 1 1 5D4BCC70
 P 4900 2150
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BCC70" Ref="C1103"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BCC70" Ref="C1203"  Part="1" 
-F 0 "C1103" H 4910 2220 50  0000 L CNN
+F 0 "C1203" H 4910 2220 50  0000 L CNN
 F 1 "C_Small" H 4910 2070 50  0000 L CNN
 F 2 "" H 4900 2150 50  0001 C CNN
 F 3 "~" H 4900 2150 50  0001 C CNN
@@ -227,7 +227,7 @@ U 1 1 5D4BED00
 P 6250 2200
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED00" Ref="C1104"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED00" Ref="C1204"  Part="1" 
-F 0 "C1104" H 6260 2270 50  0000 L CNN
+F 0 "C1204" H 6260 2270 50  0000 L CNN
 F 1 "C_Small" H 6260 2120 50  0000 L CNN
 F 2 "" H 6250 2200 50  0001 C CNN
 F 3 "~" H 6250 2200 50  0001 C CNN
@@ -240,7 +240,7 @@ U 1 1 5D4BED06
 P 6600 2200
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED06" Ref="C1105"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED06" Ref="C1205"  Part="1" 
-F 0 "C1105" H 6610 2270 50  0000 L CNN
+F 0 "C1205" H 6610 2270 50  0000 L CNN
 F 1 "C_Small" H 6610 2120 50  0000 L CNN
 F 2 "" H 6600 2200 50  0001 C CNN
 F 3 "~" H 6600 2200 50  0001 C CNN
@@ -253,7 +253,7 @@ U 1 1 5D4BED0C
 P 6950 2200
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED0C" Ref="C1106"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED0C" Ref="C1206"  Part="1" 
-F 0 "C1106" H 6960 2270 50  0000 L CNN
+F 0 "C1206" H 6960 2270 50  0000 L CNN
 F 1 "C_Small" H 6960 2120 50  0000 L CNN
 F 2 "" H 6950 2200 50  0001 C CNN
 F 3 "~" H 6950 2200 50  0001 C CNN
@@ -266,7 +266,7 @@ U 1 1 5D4BF277
 P 6950 2400
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BF277" Ref="#PWR01109"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BF277" Ref="#PWR01209"  Part="1" 
-F 0 "#PWR01109" H 6950 2150 50  0001 C CNN
+F 0 "#PWR01209" H 6950 2150 50  0001 C CNN
 F 1 "GND" H 6950 2250 50  0000 C CNN
 F 2 "" H 6950 2400 50  0001 C CNN
 F 3 "" H 6950 2400 50  0001 C CNN
@@ -279,7 +279,7 @@ U 1 1 5D4BF7E8
 P 6600 2400
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BF7E8" Ref="#PWR01108"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BF7E8" Ref="#PWR01208"  Part="1" 
-F 0 "#PWR01108" H 6600 2150 50  0001 C CNN
+F 0 "#PWR01208" H 6600 2150 50  0001 C CNN
 F 1 "GND" H 6600 2250 50  0000 C CNN
 F 2 "" H 6600 2400 50  0001 C CNN
 F 3 "" H 6600 2400 50  0001 C CNN
@@ -292,7 +292,7 @@ U 1 1 5D4BFA67
 P 6250 2400
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BFA67" Ref="#PWR01107"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BFA67" Ref="#PWR01207"  Part="1" 
-F 0 "#PWR01107" H 6250 2150 50  0001 C CNN
+F 0 "#PWR01207" H 6250 2150 50  0001 C CNN
 F 1 "GND" H 6250 2250 50  0000 C CNN
 F 2 "" H 6250 2400 50  0001 C CNN
 F 3 "" H 6250 2400 50  0001 C CNN
@@ -328,7 +328,7 @@ U 1 1 5D4C425B
 P 4900 2350
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4C425B" Ref="#PWR01104"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4C425B" Ref="#PWR01204"  Part="1" 
-F 0 "#PWR01104" H 4900 2100 50  0001 C CNN
+F 0 "#PWR01204" H 4900 2100 50  0001 C CNN
 F 1 "GND" H 4900 2200 50  0000 C CNN
 F 2 "" H 4900 2350 50  0001 C CNN
 F 3 "" H 4900 2350 50  0001 C CNN
@@ -341,7 +341,7 @@ U 1 1 5D4C4261
 P 4550 2350
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4C4261" Ref="#PWR01103"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4C4261" Ref="#PWR01203"  Part="1" 
-F 0 "#PWR01103" H 4550 2100 50  0001 C CNN
+F 0 "#PWR01203" H 4550 2100 50  0001 C CNN
 F 1 "GND" H 4550 2200 50  0000 C CNN
 F 2 "" H 4550 2350 50  0001 C CNN
 F 3 "" H 4550 2350 50  0001 C CNN
@@ -354,7 +354,7 @@ U 1 1 5D4C4267
 P 4200 2350
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4C4267" Ref="#PWR01102"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4C4267" Ref="#PWR01202"  Part="1" 
-F 0 "#PWR01102" H 4200 2100 50  0001 C CNN
+F 0 "#PWR01202" H 4200 2100 50  0001 C CNN
 F 1 "GND" H 4200 2200 50  0000 C CNN
 F 2 "" H 4200 2350 50  0001 C CNN
 F 3 "" H 4200 2350 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/switchable-attenuator.sch-bak b/pcb/discrete/discrete-rf-board/switchable-attenuator.sch-bak
index 02588ce..b74e68b 100644
--- a/pcb/discrete/discrete-rf-board/switchable-attenuator.sch-bak
+++ b/pcb/discrete/discrete-rf-board/switchable-attenuator.sch-bak
@@ -22,7 +22,7 @@ AR Path="/5D4B1FC3" Ref="U?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FC3" Ref="U?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FC3" Ref="U1101"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FC3" Ref="U1201"  Part="1" 
-F 0 "U?" H 4000 3750 50  0000 C CNN
+F 0 "U1201" H 4000 3750 50  0000 C CNN
 F 1 "BGS12PL6E6327XTSA1" H 4400 2850 50  0000 C CNN
 F 2 "" H 3950 3300 50  0001 C CNN
 F 3 "" H 3950 3300 50  0001 C CNN
@@ -30,8 +30,6 @@ F 4 "726-BGS12PL6E6327XTS" H 3400 2850 50  0000 C CNN "Mouser"
 	1    3950 3300
 	1    0    0    -1  
 $EndComp
-Text Notes 2500 3150 0    50   ~ 0
-TODO add SAW BPF here
 $Comp
 L Device:R_Small R?
 U 1 1 5D4B1FCA
@@ -39,7 +37,7 @@ P 4850 3300
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FCA" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FCA" Ref="R1101"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FCA" Ref="R1201"  Part="1" 
-F 0 "R?" H 4880 3320 50  0000 L CNN
+F 0 "R1201" H 4880 3320 50  0000 L CNN
 F 1 "R_Small" H 4880 3260 50  0000 L CNN
 F 2 "" H 4850 3300 50  0001 C CNN
 F 3 "~" H 4850 3300 50  0001 C CNN
@@ -53,7 +51,7 @@ P 5200 3300
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FD0" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD0" Ref="R1103"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD0" Ref="R1203"  Part="1" 
-F 0 "R?" H 5230 3320 50  0000 L CNN
+F 0 "R1203" H 5230 3320 50  0000 L CNN
 F 1 "R_Small" H 5230 3260 50  0000 L CNN
 F 2 "" H 5200 3300 50  0001 C CNN
 F 3 "~" H 5200 3300 50  0001 C CNN
@@ -67,7 +65,7 @@ P 5050 3700
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FD6" Ref="R?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD6" Ref="R1102"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD6" Ref="R1202"  Part="1" 
-F 0 "R?" H 5080 3720 50  0000 L CNN
+F 0 "R1202" H 5080 3720 50  0000 L CNN
 F 1 "R_Small" H 5080 3660 50  0000 L CNN
 F 2 "" H 5050 3700 50  0001 C CNN
 F 3 "~" H 5050 3700 50  0001 C CNN
@@ -83,7 +81,7 @@ P 3950 3900
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FDD" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FDD" Ref="#PWR01101"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FDD" Ref="#PWR01201"  Part="1" 
-F 0 "#PWR?" H 3950 3650 50  0001 C CNN
+F 0 "#PWR01201" H 3950 3650 50  0001 C CNN
 F 1 "GND" H 3950 3750 50  0000 C CNN
 F 2 "" H 3950 3900 50  0001 C CNN
 F 3 "" H 3950 3900 50  0001 C CNN
@@ -101,7 +99,7 @@ P 5050 3900
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FE5" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FE5" Ref="#PWR01105"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FE5" Ref="#PWR01205"  Part="1" 
-F 0 "#PWR?" H 5050 3650 50  0001 C CNN
+F 0 "#PWR01205" H 5050 3650 50  0001 C CNN
 F 1 "GND" H 5050 3750 50  0000 C CNN
 F 2 "" H 5050 3900 50  0001 C CNN
 F 3 "" H 5050 3900 50  0001 C CNN
@@ -128,7 +126,7 @@ P 6000 3900
 AR Path="/5CA6B0AA/5CE74EBE/5D4B2001" Ref="#PWR?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B2001" Ref="#PWR01106"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B2001" Ref="#PWR01206"  Part="1" 
-F 0 "#PWR?" H 6000 3650 50  0001 C CNN
+F 0 "#PWR01206" H 6000 3650 50  0001 C CNN
 F 1 "GND" H 6000 3750 50  0000 C CNN
 F 2 "" H 6000 3900 50  0001 C CNN
 F 3 "" H 6000 3900 50  0001 C CNN
@@ -145,7 +143,7 @@ AR Path="/5D4B1FF8" Ref="U?"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D4B1FF8" Ref="U?"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FF8" Ref="U1102"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FF8" Ref="U1202"  Part="1" 
-F 0 "U?" H 6050 3750 50  0000 C CNN
+F 0 "U1202" H 6050 3750 50  0000 C CNN
 F 1 "BGS12PL6E6327XTSA1" H 6450 2850 50  0000 C CNN
 F 2 "" H 6000 3300 50  0001 C CNN
 F 3 "" H 6000 3300 50  0001 C CNN
@@ -190,7 +188,7 @@ U 1 1 5D4BC42E
 P 4200 2150
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BC42E" Ref="C1101"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BC42E" Ref="C1201"  Part="1" 
-F 0 "C?" H 4210 2220 50  0000 L CNN
+F 0 "C1201" H 4210 2220 50  0000 L CNN
 F 1 "C_Small" H 4210 2070 50  0000 L CNN
 F 2 "" H 4200 2150 50  0001 C CNN
 F 3 "~" H 4200 2150 50  0001 C CNN
@@ -203,7 +201,7 @@ U 1 1 5D4BC853
 P 4550 2150
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BC853" Ref="C1102"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BC853" Ref="C1202"  Part="1" 
-F 0 "C?" H 4560 2220 50  0000 L CNN
+F 0 "C1202" H 4560 2220 50  0000 L CNN
 F 1 "C_Small" H 4560 2070 50  0000 L CNN
 F 2 "" H 4550 2150 50  0001 C CNN
 F 3 "~" H 4550 2150 50  0001 C CNN
@@ -216,7 +214,7 @@ U 1 1 5D4BCC70
 P 4900 2150
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BCC70" Ref="C1103"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BCC70" Ref="C1203"  Part="1" 
-F 0 "C?" H 4910 2220 50  0000 L CNN
+F 0 "C1203" H 4910 2220 50  0000 L CNN
 F 1 "C_Small" H 4910 2070 50  0000 L CNN
 F 2 "" H 4900 2150 50  0001 C CNN
 F 3 "~" H 4900 2150 50  0001 C CNN
@@ -229,7 +227,7 @@ U 1 1 5D4BED00
 P 6250 2200
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED00" Ref="C1104"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED00" Ref="C1204"  Part="1" 
-F 0 "C?" H 6260 2270 50  0000 L CNN
+F 0 "C1204" H 6260 2270 50  0000 L CNN
 F 1 "C_Small" H 6260 2120 50  0000 L CNN
 F 2 "" H 6250 2200 50  0001 C CNN
 F 3 "~" H 6250 2200 50  0001 C CNN
@@ -242,7 +240,7 @@ U 1 1 5D4BED06
 P 6600 2200
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED06" Ref="C1105"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED06" Ref="C1205"  Part="1" 
-F 0 "C?" H 6610 2270 50  0000 L CNN
+F 0 "C1205" H 6610 2270 50  0000 L CNN
 F 1 "C_Small" H 6610 2120 50  0000 L CNN
 F 2 "" H 6600 2200 50  0001 C CNN
 F 3 "~" H 6600 2200 50  0001 C CNN
@@ -255,7 +253,7 @@ U 1 1 5D4BED0C
 P 6950 2200
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BED0C" Ref="C1106"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BED0C" Ref="C1206"  Part="1" 
-F 0 "C?" H 6960 2270 50  0000 L CNN
+F 0 "C1206" H 6960 2270 50  0000 L CNN
 F 1 "C_Small" H 6960 2120 50  0000 L CNN
 F 2 "" H 6950 2200 50  0001 C CNN
 F 3 "~" H 6950 2200 50  0001 C CNN
@@ -268,7 +266,7 @@ U 1 1 5D4BF277
 P 6950 2400
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BF277" Ref="#PWR01109"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BF277" Ref="#PWR01209"  Part="1" 
-F 0 "#PWR?" H 6950 2150 50  0001 C CNN
+F 0 "#PWR01209" H 6950 2150 50  0001 C CNN
 F 1 "GND" H 6950 2250 50  0000 C CNN
 F 2 "" H 6950 2400 50  0001 C CNN
 F 3 "" H 6950 2400 50  0001 C CNN
@@ -281,7 +279,7 @@ U 1 1 5D4BF7E8
 P 6600 2400
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BF7E8" Ref="#PWR01108"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BF7E8" Ref="#PWR01208"  Part="1" 
-F 0 "#PWR?" H 6600 2150 50  0001 C CNN
+F 0 "#PWR01208" H 6600 2150 50  0001 C CNN
 F 1 "GND" H 6600 2250 50  0000 C CNN
 F 2 "" H 6600 2400 50  0001 C CNN
 F 3 "" H 6600 2400 50  0001 C CNN
@@ -294,7 +292,7 @@ U 1 1 5D4BFA67
 P 6250 2400
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4BFA67" Ref="#PWR01107"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4BFA67" Ref="#PWR01207"  Part="1" 
-F 0 "#PWR?" H 6250 2150 50  0001 C CNN
+F 0 "#PWR01207" H 6250 2150 50  0001 C CNN
 F 1 "GND" H 6250 2250 50  0000 C CNN
 F 2 "" H 6250 2400 50  0001 C CNN
 F 3 "" H 6250 2400 50  0001 C CNN
@@ -330,7 +328,7 @@ U 1 1 5D4C425B
 P 4900 2350
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4C425B" Ref="#PWR01104"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4C425B" Ref="#PWR01204"  Part="1" 
-F 0 "#PWR?" H 4900 2100 50  0001 C CNN
+F 0 "#PWR01204" H 4900 2100 50  0001 C CNN
 F 1 "GND" H 4900 2200 50  0000 C CNN
 F 2 "" H 4900 2350 50  0001 C CNN
 F 3 "" H 4900 2350 50  0001 C CNN
@@ -343,7 +341,7 @@ U 1 1 5D4C4261
 P 4550 2350
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4C4261" Ref="#PWR01103"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4C4261" Ref="#PWR01203"  Part="1" 
-F 0 "#PWR?" H 4550 2100 50  0001 C CNN
+F 0 "#PWR01203" H 4550 2100 50  0001 C CNN
 F 1 "GND" H 4550 2200 50  0000 C CNN
 F 2 "" H 4550 2350 50  0001 C CNN
 F 3 "" H 4550 2350 50  0001 C CNN
@@ -356,7 +354,7 @@ U 1 1 5D4C4267
 P 4200 2350
 AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4C4267" Ref="#PWR01102"  Part="1" 
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4C4267" Ref="#PWR01202"  Part="1" 
-F 0 "#PWR?" H 4200 2100 50  0001 C CNN
+F 0 "#PWR01202" H 4200 2100 50  0001 C CNN
 F 1 "GND" H 4200 2200 50  0000 C CNN
 F 2 "" H 4200 2350 50  0001 C CNN
 F 3 "" H 4200 2350 50  0001 C CNN