diff --git a/pcb/discrete/discrete-rf-board/dac.sch b/pcb/discrete/discrete-rf-board/dac.sch
index 54cf3e2..b3f7319 100644
--- a/pcb/discrete/discrete-rf-board/dac.sch
+++ b/pcb/discrete/discrete-rf-board/dac.sch
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
diff --git a/pcb/discrete/discrete-rf-board/dac.sch-bak b/pcb/discrete/discrete-rf-board/dac.sch-bak
index f5efdcb..b3f7319 100644
--- a/pcb/discrete/discrete-rf-board/dac.sch-bak
+++ b/pcb/discrete/discrete-rf-board/dac.sch-bak
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
@@ -50,8 +49,9 @@ AR Path="/5CA6B0B3/5D83265A/5D9933B9" Ref="R53"  Part="1"
 AR Path="/5CA6B0B3/5D9A8CAE/5D9933B9" Ref="R63"  Part="1" 
 F 0 "R53" H 3580 3320 50  0000 L CNN
 F 1 "7.5kR 1%" H 3580 3260 50  0000 L CNN
-F 2 "" H 3550 3300 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 3550 3300 50  0001 C CNN
 F 3 "~" H 3550 3300 50  0001 C CNN
+F 4 "667-ERJ-2RKF7501X" H 3550 3300 50  0001 C CNN "Mouser"
 	1    3550 3300
 	1    0    0    -1  
 $EndComp
@@ -63,8 +63,9 @@ AR Path="/5CA6B0B3/5D83265A/5D993558" Ref="R54"  Part="1"
 AR Path="/5CA6B0B3/5D9A8CAE/5D993558" Ref="R64"  Part="1" 
 F 0 "R54" H 3580 3620 50  0000 L CNN
 F 1 "7.5kR 1%" H 3580 3560 50  0000 L CNN
-F 2 "" H 3550 3600 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 3550 3600 50  0001 C CNN
 F 3 "~" H 3550 3600 50  0001 C CNN
+F 4 "667-ERJ-2RKF7501X" H 3550 3600 50  0001 C CNN "Mouser"
 	1    3550 3600
 	1    0    0    -1  
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/diode_mixer.sch b/pcb/discrete/discrete-rf-board/diode_mixer.sch
index e14bd42..798cf32 100644
--- a/pcb/discrete/discrete-rf-board/diode_mixer.sch
+++ b/pcb/discrete/discrete-rf-board/diode_mixer.sch
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
diff --git a/pcb/discrete/discrete-rf-board/diode_mixer.sch-bak b/pcb/discrete/discrete-rf-board/diode_mixer.sch-bak
index e14bd42..798cf32 100644
--- a/pcb/discrete/discrete-rf-board/diode_mixer.sch-bak
+++ b/pcb/discrete/discrete-rf-board/diode_mixer.sch-bak
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
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 6dbc2da..d099509 100644
--- a/pcb/discrete/discrete-rf-board/discrete-rf-board-cache.lib
+++ b/pcb/discrete/discrete-rf-board/discrete-rf-board-cache.lib
@@ -274,6 +274,7 @@ $FPLIST
  SC?70*
  SC?88*
  SOT?363*
+ SOT?23*
 $ENDFPLIST
 DRAW
 C 50 0 111 0 1 10 N
@@ -302,6 +303,7 @@ $FPLIST
  SC?70*
  SC?88*
  SOT?363*
+ SOT?23*
 $ENDFPLIST
 DRAW
 C 50 0 111 0 1 10 N
@@ -376,23 +378,25 @@ ENDDEF
 #
 # Diode_BAV99
 #
-DEF Diode_BAV99 D 0 40 Y N 2 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "Diode_BAV99" 0 -100 50 H V C CNN
-F2 "Package_TO_SOT_SMD:SOT-23" 0 -150 50 H I C CNN
-F3 "" 0 100 50 H I C CNN
+DEF Diode_BAV99 D 0 20 Y N 1 F N
+F0 "D" 0 200 50 H V C CNN
+F1 "Diode_BAV99" 0 100 50 H V C CNN
+F2 "Package_TO_SOT_SMD:SOT-23" 0 -500 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
  SOT?23*
 $ENDFPLIST
 DRAW
-P 2 0 1 6 -50 50 -50 -50 N
-P 2 0 1 0 50 0 -50 0 N
-P 2 0 1 0 50 50 50 -50 N
-P 3 0 1 0 50 50 -50 0 50 -50 N
-X A 1 150 0 100 L 50 50 1 1 P
-X K 3 -150 0 100 R 50 50 1 1 P
-X K 2 -150 0 100 R 50 50 2 1 P
-X A 3 150 0 100 L 50 50 2 1 P
+C 0 0 10 1 1 0 F
+P 2 0 1 0 -200 0 200 0 N
+P 2 1 1 0 0 0 0 -100 N
+P 3 1 1 8 -50 -50 -50 50 -50 50 N
+P 3 1 1 8 150 50 150 -50 150 -50 N
+P 6 1 1 8 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N
+P 6 1 1 8 50 50 150 0 50 -50 50 50 50 50 50 50 N
+X K 1 -300 0 100 R 50 50 1 1 P
+X A 2 300 0 100 L 50 50 1 1 P
+X K 3 0 -200 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 1abf54c..cc65618 100644
--- a/pcb/discrete/discrete-rf-board/discrete-rf-board.sch
+++ b/pcb/discrete/discrete-rf-board/discrete-rf-board.sch
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr USLetter 11000 8500
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 1abf54c..cc65618 100644
--- a/pcb/discrete/discrete-rf-board/discrete-rf-board.sch-bak
+++ b/pcb/discrete/discrete-rf-board/discrete-rf-board.sch-bak
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr USLetter 11000 8500
diff --git a/pcb/discrete/discrete-rf-board/if_amp.sch b/pcb/discrete/discrete-rf-board/if_amp.sch
index 1a65853..8ac8436 100644
--- a/pcb/discrete/discrete-rf-board/if_amp.sch
+++ b/pcb/discrete/discrete-rf-board/if_amp.sch
@@ -1,10 +1,9 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 12 19
+Sheet 10 19
 Title ""
 Date ""
 Rev ""
@@ -20,7 +19,7 @@ U 1 1 5CC4F99A
 P 2850 2250
 AR Path="/5CA6B0AA/5CC4DFC2/5CC4F99A" Ref="R101"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC4F99A" Ref="R125"  Part="1" 
-F 0 "R125" H 2880 2270 50  0000 L CNN
+F 0 "R101" H 2880 2270 50  0000 L CNN
 F 1 "22R" H 2880 2210 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 2850 2250 50  0001 C CNN
 F 3 "~" H 2850 2250 50  0001 C CNN
@@ -34,7 +33,7 @@ U 1 1 5CC4FF85
 P 2350 3650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC4FF85" Ref="Q16"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC4FF85" Ref="Q19"  Part="1" 
-F 0 "Q19" H 2550 3700 50  0000 L CNN
+F 0 "Q16" H 2550 3700 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 2550 3600 50  0000 L CNN
 F 2 "" H 2550 3750 50  0001 C CNN
 F 3 "~" H 2350 3650 50  0001 C CNN
@@ -47,7 +46,7 @@ U 1 1 5CC50F59
 P 2450 4100
 AR Path="/5CA6B0AA/5CC4DFC2/5CC50F59" Ref="R100"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC50F59" Ref="R124"  Part="1" 
-F 0 "R124" H 2480 4120 50  0000 L CNN
+F 0 "R100" H 2480 4120 50  0000 L CNN
 F 1 "22R" H 2480 4060 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 2450 4100 50  0001 C CNN
 F 3 "~" H 2450 4100 50  0001 C CNN
@@ -61,7 +60,7 @@ U 1 1 5CC5132A
 P 1650 2700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC5132A" Ref="R97"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC5132A" Ref="R121"  Part="1" 
-F 0 "R121" H 1680 2720 50  0000 L CNN
+F 0 "R97" H 1680 2720 50  0000 L CNN
 F 1 "10kR" H 1680 2660 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 1650 2700 50  0001 C CNN
 F 3 "~" H 1650 2700 50  0001 C CNN
@@ -75,7 +74,7 @@ U 1 1 5CC51AB5
 P 1650 3150
 AR Path="/5CA6B0AA/5CC4DFC2/5CC51AB5" Ref="R98"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC51AB5" Ref="R122"  Part="1" 
-F 0 "R122" H 1680 3170 50  0000 L CNN
+F 0 "R98" H 1680 3170 50  0000 L CNN
 F 1 "10kR" H 1680 3110 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 1650 3150 50  0001 C CNN
 F 3 "~" H 1650 3150 50  0001 C CNN
@@ -89,7 +88,7 @@ U 1 1 5CC51E44
 P 3250 3150
 AR Path="/5CA6B0AA/5CC4DFC2/5CC51E44" Ref="R103"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC51E44" Ref="R127"  Part="1" 
-F 0 "R127" H 3280 3170 50  0000 L CNN
+F 0 "R103" H 3280 3170 50  0000 L CNN
 F 1 "10kR" H 3280 3110 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 3250 3150 50  0001 C CNN
 F 3 "~" H 3250 3150 50  0001 C CNN
@@ -103,7 +102,7 @@ U 1 1 5CC52920
 P 3250 2650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC52920" Ref="R102"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC52920" Ref="R126"  Part="1" 
-F 0 "R126" H 3280 2670 50  0000 L CNN
+F 0 "R102" H 3280 2670 50  0000 L CNN
 F 1 "10kR" H 3280 2610 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 3250 2650 50  0001 C CNN
 F 3 "~" H 3250 2650 50  0001 C CNN
@@ -162,7 +161,7 @@ U 1 1 5CC541C5
 P 3250 3350
 AR Path="/5CA6B0AA/5CC4DFC2/5CC541C5" Ref="#PWR0151"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC541C5" Ref="#PWR0174"  Part="1" 
-F 0 "#PWR0174" H 3250 3100 50  0001 C CNN
+F 0 "#PWR0151" H 3250 3100 50  0001 C CNN
 F 1 "GND" H 3250 3200 50  0000 C CNN
 F 2 "" H 3250 3350 50  0001 C CNN
 F 3 "" H 3250 3350 50  0001 C CNN
@@ -175,7 +174,7 @@ U 1 1 5CC543E7
 P 1650 3350
 AR Path="/5CA6B0AA/5CC4DFC2/5CC543E7" Ref="#PWR0147"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC543E7" Ref="#PWR0170"  Part="1" 
-F 0 "#PWR0170" H 1650 3100 50  0001 C CNN
+F 0 "#PWR0147" H 1650 3100 50  0001 C CNN
 F 1 "GND" H 1650 3200 50  0000 C CNN
 F 2 "" H 1650 3350 50  0001 C CNN
 F 3 "" H 1650 3350 50  0001 C CNN
@@ -188,7 +187,7 @@ U 1 1 5CC54945
 P 2450 4300
 AR Path="/5CA6B0AA/5CC4DFC2/5CC54945" Ref="#PWR0148"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC54945" Ref="#PWR0171"  Part="1" 
-F 0 "#PWR0171" H 2450 4050 50  0001 C CNN
+F 0 "#PWR0148" H 2450 4050 50  0001 C CNN
 F 1 "GND" H 2450 4150 50  0000 C CNN
 F 2 "" H 2450 4300 50  0001 C CNN
 F 3 "" H 2450 4300 50  0001 C CNN
@@ -240,7 +239,7 @@ U 1 1 5CC63FED
 P 1300 3900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC63FED" Ref="C117"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC63FED" Ref="C141"  Part="1" 
-F 0 "C141" H 1310 3970 50  0000 L CNN
+F 0 "C117" H 1310 3970 50  0000 L CNN
 F 1 "0.1 uF" H 1310 3820 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 1300 3900 50  0001 C CNN
 F 3 "~" H 1300 3900 50  0001 C CNN
@@ -254,7 +253,7 @@ U 1 1 5CC64E30
 P 1300 4150
 AR Path="/5CA6B0AA/5CC4DFC2/5CC64E30" Ref="#PWR0146"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC64E30" Ref="#PWR0169"  Part="1" 
-F 0 "#PWR0169" H 1300 3900 50  0001 C CNN
+F 0 "#PWR0146" H 1300 3900 50  0001 C CNN
 F 1 "GND" H 1300 4000 50  0000 C CNN
 F 2 "" H 1300 4150 50  0001 C CNN
 F 3 "" H 1300 4150 50  0001 C CNN
@@ -273,7 +272,7 @@ U 1 1 5CC7100E
 P 6150 2000
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7100E" Ref="R106"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7100E" Ref="R130"  Part="1" 
-F 0 "R130" H 6180 2020 50  0000 L CNN
+F 0 "R106" H 6180 2020 50  0000 L CNN
 F 1 "100R" H 6180 1960 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6150 2000 50  0001 C CNN
 F 3 "~" H 6150 2000 50  0001 C CNN
@@ -287,7 +286,7 @@ U 1 1 5CC71014
 P 6950 2000
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71014" Ref="R109"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71014" Ref="R133"  Part="1" 
-F 0 "R133" H 6980 2020 50  0000 L CNN
+F 0 "R109" H 6980 2020 50  0000 L CNN
 F 1 "100R" H 6980 1960 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6950 2000 50  0001 C CNN
 F 3 "~" H 6950 2000 50  0001 C CNN
@@ -301,7 +300,7 @@ U 1 1 5CC71026
 P 5750 2450
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71026" Ref="R104"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71026" Ref="R128"  Part="1" 
-F 0 "R128" H 5780 2470 50  0000 L CNN
+F 0 "R104" H 5780 2470 50  0000 L CNN
 F 1 "10kR" H 5780 2410 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 5750 2450 50  0001 C CNN
 F 3 "~" H 5750 2450 50  0001 C CNN
@@ -315,7 +314,7 @@ U 1 1 5CC7102C
 P 5750 2900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7102C" Ref="R105"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7102C" Ref="R129"  Part="1" 
-F 0 "R129" H 5780 2920 50  0000 L CNN
+F 0 "R105" H 5780 2920 50  0000 L CNN
 F 1 "10kR" H 5780 2860 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 5750 2900 50  0001 C CNN
 F 3 "~" H 5750 2900 50  0001 C CNN
@@ -329,7 +328,7 @@ U 1 1 5CC71032
 P 7350 2900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71032" Ref="R112"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71032" Ref="R136"  Part="1" 
-F 0 "R136" H 7380 2920 50  0000 L CNN
+F 0 "R112" H 7380 2920 50  0000 L CNN
 F 1 "10kR" H 7380 2860 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 7350 2900 50  0001 C CNN
 F 3 "~" H 7350 2900 50  0001 C CNN
@@ -343,7 +342,7 @@ U 1 1 5CC71038
 P 7350 2400
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71038" Ref="R111"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71038" Ref="R135"  Part="1" 
-F 0 "R135" H 7380 2420 50  0000 L CNN
+F 0 "R111" H 7380 2420 50  0000 L CNN
 F 1 "10kR" H 7380 2360 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 7350 2400 50  0001 C CNN
 F 3 "~" H 7350 2400 50  0001 C CNN
@@ -396,7 +395,7 @@ U 1 1 5CC71057
 P 7350 3100
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71057" Ref="#PWR0162"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71057" Ref="#PWR0185"  Part="1" 
-F 0 "#PWR0185" H 7350 2850 50  0001 C CNN
+F 0 "#PWR0162" H 7350 2850 50  0001 C CNN
 F 1 "GND" H 7350 2950 50  0000 C CNN
 F 2 "" H 7350 3100 50  0001 C CNN
 F 3 "" H 7350 3100 50  0001 C CNN
@@ -409,7 +408,7 @@ U 1 1 5CC7105D
 P 5750 3100
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7105D" Ref="#PWR0160"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7105D" Ref="#PWR0183"  Part="1" 
-F 0 "#PWR0183" H 5750 2850 50  0001 C CNN
+F 0 "#PWR0160" H 5750 2850 50  0001 C CNN
 F 1 "GND" H 5750 2950 50  0000 C CNN
 F 2 "" H 5750 3100 50  0001 C CNN
 F 3 "" H 5750 3100 50  0001 C CNN
@@ -446,7 +445,7 @@ U 1 1 5CC78AA9
 P 6550 3700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC78AA9" Ref="R108"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC78AA9" Ref="R132"  Part="1" 
-F 0 "R132" H 6580 3720 50  0000 L CNN
+F 0 "R108" H 6580 3720 50  0000 L CNN
 F 1 "330R" H 6580 3660 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6550 3700 50  0001 C CNN
 F 3 "~" H 6550 3700 50  0001 C CNN
@@ -460,7 +459,7 @@ U 1 1 5CC7911F
 P 6550 3900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7911F" Ref="#PWR0161"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7911F" Ref="#PWR0184"  Part="1" 
-F 0 "#PWR0184" H 6550 3650 50  0001 C CNN
+F 0 "#PWR0161" H 6550 3650 50  0001 C CNN
 F 1 "GND" H 6550 3750 50  0000 C CNN
 F 2 "" H 6550 3900 50  0001 C CNN
 F 3 "" H 6550 3900 50  0001 C CNN
@@ -475,7 +474,7 @@ U 1 1 5CC7FE22
 P 6150 3200
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7FE22" Ref="R107"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7FE22" Ref="R131"  Part="1" 
-F 0 "R131" H 6180 3220 50  0000 L CNN
+F 0 "R107" H 6180 3220 50  0000 L CNN
 F 1 "22R" H 6180 3160 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6150 3200 50  0001 C CNN
 F 3 "~" H 6150 3200 50  0001 C CNN
@@ -489,7 +488,7 @@ U 1 1 5CC80169
 P 6950 3150
 AR Path="/5CA6B0AA/5CC4DFC2/5CC80169" Ref="R110"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC80169" Ref="R134"  Part="1" 
-F 0 "R134" H 6980 3170 50  0000 L CNN
+F 0 "R110" H 6980 3170 50  0000 L CNN
 F 1 "22R" H 6980 3110 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6950 3150 50  0001 C CNN
 F 3 "~" H 6950 3150 50  0001 C CNN
@@ -520,7 +519,7 @@ U 1 1 5CC9409E
 P 4500 2650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9409E" Ref="C125"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9409E" Ref="C149"  Part="1" 
-F 0 "C149" H 4510 2720 50  0000 L CNN
+F 0 "C125" H 4510 2720 50  0000 L CNN
 F 1 "0.1 uF" H 4510 2570 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4500 2650 50  0001 C CNN
 F 3 "~" H 4500 2650 50  0001 C CNN
@@ -536,7 +535,7 @@ U 1 1 5CC959FD
 P 8750 2550
 AR Path="/5CA6B0AA/5CC4DFC2/5CC959FD" Ref="C130"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC959FD" Ref="C154"  Part="1" 
-F 0 "C154" H 8760 2620 50  0000 L CNN
+F 0 "C130" H 8760 2620 50  0000 L CNN
 F 1 "0.1 uF" H 8760 2470 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8750 2550 50  0001 C CNN
 F 3 "~" H 8750 2550 50  0001 C CNN
@@ -554,7 +553,7 @@ U 1 1 5CC3C53E
 P 9700 4450
 AR Path="/5CA6B0AA/5CC4DFC2/5CC3C53E" Ref="U10"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC3C53E" Ref="U15"  Part="1" 
-F 0 "U15" H 9700 4800 50  0000 C CNN
+F 0 "U10" H 9700 4800 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 9700 4700 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 9700 4700 50  0001 C CNN
 F 3 "" H 9700 4700 50  0001 C CNN
@@ -568,7 +567,7 @@ U 2 1 5CC40584
 P 2800 6600
 AR Path="/5CA6B0AA/5CC4DFC2/5CC40584" Ref="U8"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC40584" Ref="U13"  Part="2" 
-F 0 "U13" H 2800 6950 50  0000 C CNN
+F 0 "U8" H 2800 6950 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 2800 6850 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 2800 6850 50  0001 C CNN
 F 3 "" H 2800 6850 50  0001 C CNN
@@ -582,7 +581,7 @@ U 1 1 5CC415CE
 P 9700 5650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC415CE" Ref="U11"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC415CE" Ref="U16"  Part="1" 
-F 0 "U16" H 9700 6000 50  0000 C CNN
+F 0 "U11" H 9700 6000 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 9700 5900 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 9700 5900 50  0001 C CNN
 F 3 "" H 9700 5900 50  0001 C CNN
@@ -596,7 +595,7 @@ U 1 1 5CC4409B
 P 8200 2650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC4409B" Ref="U9"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC4409B" Ref="U14"  Part="1" 
-F 0 "U14" H 8200 3000 50  0000 C CNN
+F 0 "U9" H 8200 3000 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 8200 2900 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 8200 2900 50  0001 C CNN
 F 3 "" H 8200 2900 50  0001 C CNN
@@ -610,7 +609,7 @@ U 1 1 5CC46970
 P 5050 2750
 AR Path="/5CA6B0AA/5CC4DFC2/5CC46970" Ref="U8"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC46970" Ref="U13"  Part="1" 
-F 0 "U13" H 5050 3100 50  0000 C CNN
+F 0 "U8" H 5050 3100 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 5050 3000 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 5050 3000 50  0001 C CNN
 F 3 "" H 5050 3000 50  0001 C CNN
@@ -624,7 +623,7 @@ U 2 1 5CC47B5C
 P 3650 6600
 AR Path="/5CA6B0AA/5CC4DFC2/5CC47B5C" Ref="U9"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC47B5C" Ref="U14"  Part="2" 
-F 0 "U14" H 3650 6950 50  0000 C CNN
+F 0 "U9" H 3650 6950 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 3650 6850 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 3650 6850 50  0001 C CNN
 F 3 "" H 3650 6850 50  0001 C CNN
@@ -638,7 +637,7 @@ U 2 1 5CC48C49
 P 4600 6600
 AR Path="/5CA6B0AA/5CC4DFC2/5CC48C49" Ref="U10"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC48C49" Ref="U15"  Part="2" 
-F 0 "U15" H 4600 6950 50  0000 C CNN
+F 0 "U10" H 4600 6950 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 4600 6850 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 4600 6850 50  0001 C CNN
 F 3 "" H 4600 6850 50  0001 C CNN
@@ -652,7 +651,7 @@ U 2 1 5CC49F9F
 P 5350 6600
 AR Path="/5CA6B0AA/5CC4DFC2/5CC49F9F" Ref="U11"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC49F9F" Ref="U16"  Part="2" 
-F 0 "U16" H 5350 6950 50  0000 C CNN
+F 0 "U11" H 5350 6950 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 5350 6850 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 5350 6850 50  0001 C CNN
 F 3 "" H 5350 6850 50  0001 C CNN
@@ -674,7 +673,7 @@ U 1 1 5CC5931A
 P 4550 2850
 AR Path="/5CA6B0AA/5CC4DFC2/5CC5931A" Ref="C126"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC5931A" Ref="C150"  Part="1" 
-F 0 "C150" H 4560 2920 50  0000 L CNN
+F 0 "C126" H 4560 2920 50  0000 L CNN
 F 1 "0.1 uF" H 4560 2770 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4550 2850 50  0001 C CNN
 F 3 "~" H 4550 2850 50  0001 C CNN
@@ -696,7 +695,7 @@ U 1 1 5CC646BF
 P 8850 2750
 AR Path="/5CA6B0AA/5CC4DFC2/5CC646BF" Ref="C131"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC646BF" Ref="C155"  Part="1" 
-F 0 "C155" H 8860 2820 50  0000 L CNN
+F 0 "C131" H 8860 2820 50  0000 L CNN
 F 1 "0.1 uF" H 8860 2670 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8850 2750 50  0001 C CNN
 F 3 "~" H 8850 2750 50  0001 C CNN
@@ -792,7 +791,7 @@ U 1 1 5CC9DCE4
 P 3050 5700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9DCE4" Ref="C119"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9DCE4" Ref="C143"  Part="1" 
-F 0 "C143" H 3060 5770 50  0000 L CNN
+F 0 "C119" H 3060 5770 50  0000 L CNN
 F 1 "0.1 uF" H 3060 5620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3050 5700 50  0001 C CNN
 F 3 "~" H 3050 5700 50  0001 C CNN
@@ -806,7 +805,7 @@ U 1 1 5CC9E1ED
 P 3550 5700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9E1ED" Ref="C120"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9E1ED" Ref="C144"  Part="1" 
-F 0 "C144" H 3560 5770 50  0000 L CNN
+F 0 "C120" H 3560 5770 50  0000 L CNN
 F 1 "0.1 uF" H 3560 5620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3550 5700 50  0001 C CNN
 F 3 "~" H 3550 5700 50  0001 C CNN
@@ -820,7 +819,7 @@ U 1 1 5CC9E6BF
 P 4000 5700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9E6BF" Ref="C122"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9E6BF" Ref="C146"  Part="1" 
-F 0 "C146" H 4010 5770 50  0000 L CNN
+F 0 "C122" H 4010 5770 50  0000 L CNN
 F 1 "0.1 uF" H 4010 5620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4000 5700 50  0001 C CNN
 F 3 "~" H 4000 5700 50  0001 C CNN
@@ -834,7 +833,7 @@ U 1 1 5CC9EAA6
 P 4450 5700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9EAA6" Ref="C124"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9EAA6" Ref="C148"  Part="1" 
-F 0 "C148" H 4460 5770 50  0000 L CNN
+F 0 "C124" H 4460 5770 50  0000 L CNN
 F 1 "0.1 uF" H 4460 5620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4450 5700 50  0001 C CNN
 F 3 "~" H 4450 5700 50  0001 C CNN
@@ -848,7 +847,7 @@ U 1 1 5CC9F407
 P 2500 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9F407" Ref="#PWR0149"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9F407" Ref="#PWR0172"  Part="1" 
-F 0 "#PWR0172" H 2500 6550 50  0001 C CNN
+F 0 "#PWR0149" H 2500 6550 50  0001 C CNN
 F 1 "GND" H 2500 6650 50  0000 C CNN
 F 2 "" H 2500 6800 50  0001 C CNN
 F 3 "" H 2500 6800 50  0001 C CNN
@@ -861,7 +860,7 @@ U 1 1 5CC9FAC5
 P 3350 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9FAC5" Ref="#PWR0152"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9FAC5" Ref="#PWR0175"  Part="1" 
-F 0 "#PWR0175" H 3350 6550 50  0001 C CNN
+F 0 "#PWR0152" H 3350 6550 50  0001 C CNN
 F 1 "GND" H 3350 6650 50  0000 C CNN
 F 2 "" H 3350 6800 50  0001 C CNN
 F 3 "" H 3350 6800 50  0001 C CNN
@@ -874,7 +873,7 @@ U 1 1 5CC9FD6D
 P 4300 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9FD6D" Ref="#PWR0157"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9FD6D" Ref="#PWR0180"  Part="1" 
-F 0 "#PWR0180" H 4300 6550 50  0001 C CNN
+F 0 "#PWR0157" H 4300 6550 50  0001 C CNN
 F 1 "GND" H 4300 6650 50  0000 C CNN
 F 2 "" H 4300 6800 50  0001 C CNN
 F 3 "" H 4300 6800 50  0001 C CNN
@@ -887,7 +886,7 @@ U 1 1 5CCA0195
 P 5050 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0195" Ref="#PWR0159"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0195" Ref="#PWR0182"  Part="1" 
-F 0 "#PWR0182" H 5050 6550 50  0001 C CNN
+F 0 "#PWR0159" H 5050 6550 50  0001 C CNN
 F 1 "GND" H 5050 6650 50  0000 C CNN
 F 2 "" H 5050 6800 50  0001 C CNN
 F 3 "" H 5050 6800 50  0001 C CNN
@@ -900,7 +899,7 @@ U 1 1 5CCA0420
 P 3050 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0420" Ref="#PWR0150"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0420" Ref="#PWR0173"  Part="1" 
-F 0 "#PWR0173" H 3050 5650 50  0001 C CNN
+F 0 "#PWR0150" H 3050 5650 50  0001 C CNN
 F 1 "GND" H 3050 5750 50  0000 C CNN
 F 2 "" H 3050 5900 50  0001 C CNN
 F 3 "" H 3050 5900 50  0001 C CNN
@@ -913,7 +912,7 @@ U 1 1 5CCA07DE
 P 3550 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA07DE" Ref="#PWR0153"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA07DE" Ref="#PWR0176"  Part="1" 
-F 0 "#PWR0176" H 3550 5650 50  0001 C CNN
+F 0 "#PWR0153" H 3550 5650 50  0001 C CNN
 F 1 "GND" H 3550 5750 50  0000 C CNN
 F 2 "" H 3550 5900 50  0001 C CNN
 F 3 "" H 3550 5900 50  0001 C CNN
@@ -926,7 +925,7 @@ U 1 1 5CCA0A90
 P 4000 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0A90" Ref="#PWR0155"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0A90" Ref="#PWR0178"  Part="1" 
-F 0 "#PWR0178" H 4000 5650 50  0001 C CNN
+F 0 "#PWR0155" H 4000 5650 50  0001 C CNN
 F 1 "GND" H 4000 5750 50  0000 C CNN
 F 2 "" H 4000 5900 50  0001 C CNN
 F 3 "" H 4000 5900 50  0001 C CNN
@@ -939,7 +938,7 @@ U 1 1 5CCA0D69
 P 4450 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0D69" Ref="#PWR0158"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0D69" Ref="#PWR0181"  Part="1" 
-F 0 "#PWR0181" H 4450 5650 50  0001 C CNN
+F 0 "#PWR0158" H 4450 5650 50  0001 C CNN
 F 1 "GND" H 4450 5750 50  0000 C CNN
 F 2 "" H 4450 5900 50  0001 C CNN
 F 3 "" H 4450 5900 50  0001 C CNN
@@ -1000,7 +999,7 @@ U 1 1 5CCEE151
 P 5850 2150
 AR Path="/5CA6B0AA/5CC4DFC2/5CCEE151" Ref="TP7"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCEE151" Ref="TP17"  Part="1" 
-F 0 "TP17" H 5850 2420 50  0000 C CNN
+F 0 "TP7" H 5850 2420 50  0000 C CNN
 F 1 "TestPoint" H 5850 2350 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 6050 2150 50  0001 C CNN
 F 3 "~" H 6050 2150 50  0001 C CNN
@@ -1014,7 +1013,7 @@ U 1 1 5CCEEC53
 P 7300 2100
 AR Path="/5CA6B0AA/5CC4DFC2/5CCEEC53" Ref="TP9"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCEEC53" Ref="TP19"  Part="1" 
-F 0 "TP19" H 7300 2370 50  0000 C CNN
+F 0 "TP9" H 7300 2370 50  0000 C CNN
 F 1 "TestPoint" H 7300 2300 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 7500 2100 50  0001 C CNN
 F 3 "~" H 7500 2100 50  0001 C CNN
@@ -1028,7 +1027,7 @@ U 1 1 5CCEF073
 P 6550 3350
 AR Path="/5CA6B0AA/5CC4DFC2/5CCEF073" Ref="TP8"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCEF073" Ref="TP18"  Part="1" 
-F 0 "TP18" H 6550 3620 50  0000 C CNN
+F 0 "TP8" H 6550 3620 50  0000 C CNN
 F 1 "TestPoint" H 6550 3550 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 6750 3350 50  0001 C CNN
 F 3 "~" H 6750 3350 50  0001 C CNN
@@ -1042,7 +1041,7 @@ U 1 1 5CCEF9C3
 P 2050 3300
 AR Path="/5CA6B0AA/5CC4DFC2/5CCEF9C3" Ref="TP2"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCEF9C3" Ref="TP12"  Part="1" 
-F 0 "TP12" H 2050 3570 50  0000 C CNN
+F 0 "TP2" H 2050 3570 50  0000 C CNN
 F 1 "TestPoint" H 2050 3500 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 2250 3300 50  0001 C CNN
 F 3 "~" H 2250 3300 50  0001 C CNN
@@ -1057,7 +1056,7 @@ U 1 1 5CCF05BD
 P 1650 2400
 AR Path="/5CA6B0AA/5CC4DFC2/5CCF05BD" Ref="TP1"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCF05BD" Ref="TP11"  Part="1" 
-F 0 "TP11" H 1650 2670 50  0000 C CNN
+F 0 "TP1" H 1650 2670 50  0000 C CNN
 F 1 "TestPoint" H 1650 2600 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 1850 2400 50  0001 C CNN
 F 3 "~" H 1850 2400 50  0001 C CNN
@@ -1071,7 +1070,7 @@ U 1 1 5CCF0F27
 P 3250 2350
 AR Path="/5CA6B0AA/5CC4DFC2/5CCF0F27" Ref="TP5"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCF0F27" Ref="TP15"  Part="1" 
-F 0 "TP15" H 3250 2620 50  0000 C CNN
+F 0 "TP5" H 3250 2620 50  0000 C CNN
 F 1 "TestPoint" H 3250 2550 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 3450 2350 50  0001 C CNN
 F 3 "~" H 3450 2350 50  0001 C CNN
@@ -1089,7 +1088,7 @@ U 1 1 5CCF9A96
 P 2350 3950
 AR Path="/5CA6B0AA/5CC4DFC2/5CCF9A96" Ref="TP4"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCF9A96" Ref="TP14"  Part="1" 
-F 0 "TP14" H 2350 4220 50  0000 C CNN
+F 0 "TP4" H 2350 4220 50  0000 C CNN
 F 1 "TestPoint" H 2350 4150 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 2550 3950 50  0001 C CNN
 F 3 "~" H 2550 3950 50  0001 C CNN
@@ -1108,7 +1107,7 @@ U 1 1 5CCFE98E
 P 2100 1650
 AR Path="/5CA6B0AA/5CC4DFC2/5CCFE98E" Ref="TP3"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCFE98E" Ref="TP13"  Part="1" 
-F 0 "TP13" H 2100 1920 50  0000 C CNN
+F 0 "TP3" H 2100 1920 50  0000 C CNN
 F 1 "TestPoint" H 2100 1850 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 2300 1650 50  0001 C CNN
 F 3 "~" H 2300 1650 50  0001 C CNN
@@ -1137,7 +1136,7 @@ U 1 1 5CD0C7EE
 P 5500 2900
 AR Path="/5CA6B0AA/5CC4DFC2/5CD0C7EE" Ref="TP6"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CD0C7EE" Ref="TP16"  Part="1" 
-F 0 "TP16" H 5500 3170 50  0000 C CNN
+F 0 "TP6" H 5500 3170 50  0000 C CNN
 F 1 "TestPoint" H 5500 3100 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 5700 2900 50  0001 C CNN
 F 3 "~" H 5700 2900 50  0001 C CNN
@@ -1151,7 +1150,7 @@ U 1 1 5CD0DAA4
 P 7750 2850
 AR Path="/5CA6B0AA/5CC4DFC2/5CD0DAA4" Ref="TP10"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CD0DAA4" Ref="TP20"  Part="1" 
-F 0 "TP20" H 7750 3120 50  0000 C CNN
+F 0 "TP10" H 7750 3120 50  0000 C CNN
 F 1 "TestPoint" H 7750 3050 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 7950 2850 50  0001 C CNN
 F 3 "~" H 7950 2850 50  0001 C CNN
@@ -1177,7 +1176,7 @@ U 1 1 5CC8B3B3
 P 1950 3000
 AR Path="/5CA6B0AA/5CC4DFC2/5CC8B3B3" Ref="Q15"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC8B3B3" Ref="Q18"  Part="1" 
-F 0 "Q18" H 2150 3050 50  0000 L CNN
+F 0 "Q15" H 2150 3050 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 2150 2950 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 2150 3100 50  0001 C CNN
 F 3 "~" H 1950 3000 50  0001 C CNN
@@ -1191,7 +1190,7 @@ U 2 1 5CC8BBB5
 P 2950 2900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC8BBB5" Ref="Q15"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC8BBB5" Ref="Q18"  Part="2" 
-F 0 "Q18" H 3150 2950 50  0000 L CNN
+F 0 "Q15" H 3150 2950 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 3150 2850 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 3150 3000 50  0001 C CNN
 F 3 "~" H 2950 2900 50  0001 C CNN
@@ -1205,7 +1204,7 @@ U 1 1 5CC8C47F
 P 6050 2750
 AR Path="/5CA6B0AA/5CC4DFC2/5CC8C47F" Ref="Q17"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC8C47F" Ref="Q20"  Part="1" 
-F 0 "Q20" H 6250 2800 50  0000 L CNN
+F 0 "Q17" H 6250 2800 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 6250 2700 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 6250 2850 50  0001 C CNN
 F 3 "~" H 6050 2750 50  0001 C CNN
@@ -1219,7 +1218,7 @@ U 2 1 5CC8CC50
 P 7050 2650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC8CC50" Ref="Q17"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC8CC50" Ref="Q20"  Part="2" 
-F 0 "Q20" H 7250 2700 50  0000 L CNN
+F 0 "Q17" H 7250 2700 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 7250 2600 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 7250 2750 50  0001 C CNN
 F 3 "~" H 7050 2650 50  0001 C CNN
@@ -1233,7 +1232,7 @@ U 1 1 5D57AB5D
 P 3650 1950
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB5D" Ref="C121"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB5D" Ref="C145"  Part="1" 
-F 0 "C145" H 3660 2020 50  0000 L CNN
+F 0 "C121" H 3660 2020 50  0000 L CNN
 F 1 "0.1 uF" H 3660 1870 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3650 1950 50  0001 C CNN
 F 3 "~" H 3650 1950 50  0001 C CNN
@@ -1247,7 +1246,7 @@ U 1 1 5D57AB63
 P 4100 1950
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB63" Ref="C123"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB63" Ref="C147"  Part="1" 
-F 0 "C147" H 4110 2020 50  0000 L CNN
+F 0 "C123" H 4110 2020 50  0000 L CNN
 F 1 "0.1 uF" H 4110 1870 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4100 1950 50  0001 C CNN
 F 3 "~" H 4100 1950 50  0001 C CNN
@@ -1261,7 +1260,7 @@ U 1 1 5D57AB69
 P 3650 2150
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB69" Ref="#PWR0154"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB69" Ref="#PWR0177"  Part="1" 
-F 0 "#PWR0177" H 3650 1900 50  0001 C CNN
+F 0 "#PWR0154" H 3650 1900 50  0001 C CNN
 F 1 "GND" H 3650 2000 50  0000 C CNN
 F 2 "" H 3650 2150 50  0001 C CNN
 F 3 "" H 3650 2150 50  0001 C CNN
@@ -1274,7 +1273,7 @@ U 1 1 5D57AB6F
 P 4100 2150
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB6F" Ref="#PWR0156"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB6F" Ref="#PWR0179"  Part="1" 
-F 0 "#PWR0179" H 4100 1900 50  0001 C CNN
+F 0 "#PWR0156" H 4100 1900 50  0001 C CNN
 F 1 "GND" H 4100 2000 50  0000 C CNN
 F 2 "" H 4100 2150 50  0001 C CNN
 F 3 "" H 4100 2150 50  0001 C CNN
@@ -1298,7 +1297,7 @@ U 1 1 5D580ACE
 P 7850 1700
 AR Path="/5CA6B0AA/5CC4DFC2/5D580ACE" Ref="C128"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580ACE" Ref="C152"  Part="1" 
-F 0 "C152" H 7860 1770 50  0000 L CNN
+F 0 "C128" H 7860 1770 50  0000 L CNN
 F 1 "0.1 uF" H 7860 1620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 7850 1700 50  0001 C CNN
 F 3 "~" H 7850 1700 50  0001 C CNN
@@ -1312,7 +1311,7 @@ U 1 1 5D580AD4
 P 8300 1700
 AR Path="/5CA6B0AA/5CC4DFC2/5D580AD4" Ref="C129"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580AD4" Ref="C153"  Part="1" 
-F 0 "C153" H 8310 1770 50  0000 L CNN
+F 0 "C129" H 8310 1770 50  0000 L CNN
 F 1 "0.1 uF" H 8310 1620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8300 1700 50  0001 C CNN
 F 3 "~" H 8300 1700 50  0001 C CNN
@@ -1326,7 +1325,7 @@ U 1 1 5D580ADA
 P 7850 1900
 AR Path="/5CA6B0AA/5CC4DFC2/5D580ADA" Ref="#PWR0163"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580ADA" Ref="#PWR0186"  Part="1" 
-F 0 "#PWR0186" H 7850 1650 50  0001 C CNN
+F 0 "#PWR0163" H 7850 1650 50  0001 C CNN
 F 1 "GND" H 7850 1750 50  0000 C CNN
 F 2 "" H 7850 1900 50  0001 C CNN
 F 3 "" H 7850 1900 50  0001 C CNN
@@ -1339,7 +1338,7 @@ U 1 1 5D580AE0
 P 8300 1900
 AR Path="/5CA6B0AA/5CC4DFC2/5D580AE0" Ref="#PWR0164"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580AE0" Ref="#PWR0187"  Part="1" 
-F 0 "#PWR0187" H 8300 1650 50  0001 C CNN
+F 0 "#PWR0164" H 8300 1650 50  0001 C CNN
 F 1 "GND" H 8300 1750 50  0000 C CNN
 F 2 "" H 8300 1900 50  0001 C CNN
 F 3 "" H 8300 1900 50  0001 C CNN
@@ -1369,7 +1368,7 @@ U 1 1 5DA03B3D
 P 2500 2450
 AR Path="/5CA6B0AA/5CC4DFC2/5DA03B3D" Ref="C118"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5DA03B3D" Ref="C142"  Part="1" 
-F 0 "C142" H 2510 2520 50  0000 L CNN
+F 0 "C118" H 2510 2520 50  0000 L CNN
 F 1 "2.2 nF" H 2510 2370 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 2500 2450 50  0001 C CNN
 F 3 "~" H 2500 2450 50  0001 C CNN
@@ -1390,7 +1389,7 @@ U 1 1 5DA0FE44
 P 6600 2200
 AR Path="/5CA6B0AA/5CC4DFC2/5DA0FE44" Ref="C127"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5DA0FE44" Ref="C151"  Part="1" 
-F 0 "C151" H 6610 2270 50  0000 L CNN
+F 0 "C127" H 6610 2270 50  0000 L CNN
 F 1 "470 pF" H 6610 2120 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6600 2200 50  0001 C CNN
 F 3 "~" H 6600 2200 50  0001 C CNN
@@ -1419,7 +1418,7 @@ U 1 1 5CC4F475
 P 2050 2250
 AR Path="/5CA6B0AA/5CC4DFC2/5CC4F475" Ref="R99"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC4F475" Ref="R123"  Part="1" 
-F 0 "R123" H 2080 2270 50  0000 L CNN
+F 0 "R99" H 2080 2270 50  0000 L CNN
 F 1 "22R" H 2080 2210 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 2050 2250 50  0001 C CNN
 F 3 "~" H 2050 2250 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/if_amp.sch-bak b/pcb/discrete/discrete-rf-board/if_amp.sch-bak
index 1a65853..8ac8436 100644
--- a/pcb/discrete/discrete-rf-board/if_amp.sch-bak
+++ b/pcb/discrete/discrete-rf-board/if_amp.sch-bak
@@ -1,10 +1,9 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 12 19
+Sheet 10 19
 Title ""
 Date ""
 Rev ""
@@ -20,7 +19,7 @@ U 1 1 5CC4F99A
 P 2850 2250
 AR Path="/5CA6B0AA/5CC4DFC2/5CC4F99A" Ref="R101"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC4F99A" Ref="R125"  Part="1" 
-F 0 "R125" H 2880 2270 50  0000 L CNN
+F 0 "R101" H 2880 2270 50  0000 L CNN
 F 1 "22R" H 2880 2210 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 2850 2250 50  0001 C CNN
 F 3 "~" H 2850 2250 50  0001 C CNN
@@ -34,7 +33,7 @@ U 1 1 5CC4FF85
 P 2350 3650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC4FF85" Ref="Q16"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC4FF85" Ref="Q19"  Part="1" 
-F 0 "Q19" H 2550 3700 50  0000 L CNN
+F 0 "Q16" H 2550 3700 50  0000 L CNN
 F 1 "Q_NPN_BCE" H 2550 3600 50  0000 L CNN
 F 2 "" H 2550 3750 50  0001 C CNN
 F 3 "~" H 2350 3650 50  0001 C CNN
@@ -47,7 +46,7 @@ U 1 1 5CC50F59
 P 2450 4100
 AR Path="/5CA6B0AA/5CC4DFC2/5CC50F59" Ref="R100"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC50F59" Ref="R124"  Part="1" 
-F 0 "R124" H 2480 4120 50  0000 L CNN
+F 0 "R100" H 2480 4120 50  0000 L CNN
 F 1 "22R" H 2480 4060 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 2450 4100 50  0001 C CNN
 F 3 "~" H 2450 4100 50  0001 C CNN
@@ -61,7 +60,7 @@ U 1 1 5CC5132A
 P 1650 2700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC5132A" Ref="R97"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC5132A" Ref="R121"  Part="1" 
-F 0 "R121" H 1680 2720 50  0000 L CNN
+F 0 "R97" H 1680 2720 50  0000 L CNN
 F 1 "10kR" H 1680 2660 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 1650 2700 50  0001 C CNN
 F 3 "~" H 1650 2700 50  0001 C CNN
@@ -75,7 +74,7 @@ U 1 1 5CC51AB5
 P 1650 3150
 AR Path="/5CA6B0AA/5CC4DFC2/5CC51AB5" Ref="R98"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC51AB5" Ref="R122"  Part="1" 
-F 0 "R122" H 1680 3170 50  0000 L CNN
+F 0 "R98" H 1680 3170 50  0000 L CNN
 F 1 "10kR" H 1680 3110 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 1650 3150 50  0001 C CNN
 F 3 "~" H 1650 3150 50  0001 C CNN
@@ -89,7 +88,7 @@ U 1 1 5CC51E44
 P 3250 3150
 AR Path="/5CA6B0AA/5CC4DFC2/5CC51E44" Ref="R103"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC51E44" Ref="R127"  Part="1" 
-F 0 "R127" H 3280 3170 50  0000 L CNN
+F 0 "R103" H 3280 3170 50  0000 L CNN
 F 1 "10kR" H 3280 3110 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 3250 3150 50  0001 C CNN
 F 3 "~" H 3250 3150 50  0001 C CNN
@@ -103,7 +102,7 @@ U 1 1 5CC52920
 P 3250 2650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC52920" Ref="R102"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC52920" Ref="R126"  Part="1" 
-F 0 "R126" H 3280 2670 50  0000 L CNN
+F 0 "R102" H 3280 2670 50  0000 L CNN
 F 1 "10kR" H 3280 2610 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 3250 2650 50  0001 C CNN
 F 3 "~" H 3250 2650 50  0001 C CNN
@@ -162,7 +161,7 @@ U 1 1 5CC541C5
 P 3250 3350
 AR Path="/5CA6B0AA/5CC4DFC2/5CC541C5" Ref="#PWR0151"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC541C5" Ref="#PWR0174"  Part="1" 
-F 0 "#PWR0174" H 3250 3100 50  0001 C CNN
+F 0 "#PWR0151" H 3250 3100 50  0001 C CNN
 F 1 "GND" H 3250 3200 50  0000 C CNN
 F 2 "" H 3250 3350 50  0001 C CNN
 F 3 "" H 3250 3350 50  0001 C CNN
@@ -175,7 +174,7 @@ U 1 1 5CC543E7
 P 1650 3350
 AR Path="/5CA6B0AA/5CC4DFC2/5CC543E7" Ref="#PWR0147"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC543E7" Ref="#PWR0170"  Part="1" 
-F 0 "#PWR0170" H 1650 3100 50  0001 C CNN
+F 0 "#PWR0147" H 1650 3100 50  0001 C CNN
 F 1 "GND" H 1650 3200 50  0000 C CNN
 F 2 "" H 1650 3350 50  0001 C CNN
 F 3 "" H 1650 3350 50  0001 C CNN
@@ -188,7 +187,7 @@ U 1 1 5CC54945
 P 2450 4300
 AR Path="/5CA6B0AA/5CC4DFC2/5CC54945" Ref="#PWR0148"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC54945" Ref="#PWR0171"  Part="1" 
-F 0 "#PWR0171" H 2450 4050 50  0001 C CNN
+F 0 "#PWR0148" H 2450 4050 50  0001 C CNN
 F 1 "GND" H 2450 4150 50  0000 C CNN
 F 2 "" H 2450 4300 50  0001 C CNN
 F 3 "" H 2450 4300 50  0001 C CNN
@@ -240,7 +239,7 @@ U 1 1 5CC63FED
 P 1300 3900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC63FED" Ref="C117"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC63FED" Ref="C141"  Part="1" 
-F 0 "C141" H 1310 3970 50  0000 L CNN
+F 0 "C117" H 1310 3970 50  0000 L CNN
 F 1 "0.1 uF" H 1310 3820 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 1300 3900 50  0001 C CNN
 F 3 "~" H 1300 3900 50  0001 C CNN
@@ -254,7 +253,7 @@ U 1 1 5CC64E30
 P 1300 4150
 AR Path="/5CA6B0AA/5CC4DFC2/5CC64E30" Ref="#PWR0146"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC64E30" Ref="#PWR0169"  Part="1" 
-F 0 "#PWR0169" H 1300 3900 50  0001 C CNN
+F 0 "#PWR0146" H 1300 3900 50  0001 C CNN
 F 1 "GND" H 1300 4000 50  0000 C CNN
 F 2 "" H 1300 4150 50  0001 C CNN
 F 3 "" H 1300 4150 50  0001 C CNN
@@ -273,7 +272,7 @@ U 1 1 5CC7100E
 P 6150 2000
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7100E" Ref="R106"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7100E" Ref="R130"  Part="1" 
-F 0 "R130" H 6180 2020 50  0000 L CNN
+F 0 "R106" H 6180 2020 50  0000 L CNN
 F 1 "100R" H 6180 1960 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6150 2000 50  0001 C CNN
 F 3 "~" H 6150 2000 50  0001 C CNN
@@ -287,7 +286,7 @@ U 1 1 5CC71014
 P 6950 2000
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71014" Ref="R109"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71014" Ref="R133"  Part="1" 
-F 0 "R133" H 6980 2020 50  0000 L CNN
+F 0 "R109" H 6980 2020 50  0000 L CNN
 F 1 "100R" H 6980 1960 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6950 2000 50  0001 C CNN
 F 3 "~" H 6950 2000 50  0001 C CNN
@@ -301,7 +300,7 @@ U 1 1 5CC71026
 P 5750 2450
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71026" Ref="R104"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71026" Ref="R128"  Part="1" 
-F 0 "R128" H 5780 2470 50  0000 L CNN
+F 0 "R104" H 5780 2470 50  0000 L CNN
 F 1 "10kR" H 5780 2410 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 5750 2450 50  0001 C CNN
 F 3 "~" H 5750 2450 50  0001 C CNN
@@ -315,7 +314,7 @@ U 1 1 5CC7102C
 P 5750 2900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7102C" Ref="R105"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7102C" Ref="R129"  Part="1" 
-F 0 "R129" H 5780 2920 50  0000 L CNN
+F 0 "R105" H 5780 2920 50  0000 L CNN
 F 1 "10kR" H 5780 2860 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 5750 2900 50  0001 C CNN
 F 3 "~" H 5750 2900 50  0001 C CNN
@@ -329,7 +328,7 @@ U 1 1 5CC71032
 P 7350 2900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71032" Ref="R112"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71032" Ref="R136"  Part="1" 
-F 0 "R136" H 7380 2920 50  0000 L CNN
+F 0 "R112" H 7380 2920 50  0000 L CNN
 F 1 "10kR" H 7380 2860 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 7350 2900 50  0001 C CNN
 F 3 "~" H 7350 2900 50  0001 C CNN
@@ -343,7 +342,7 @@ U 1 1 5CC71038
 P 7350 2400
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71038" Ref="R111"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71038" Ref="R135"  Part="1" 
-F 0 "R135" H 7380 2420 50  0000 L CNN
+F 0 "R111" H 7380 2420 50  0000 L CNN
 F 1 "10kR" H 7380 2360 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 7350 2400 50  0001 C CNN
 F 3 "~" H 7350 2400 50  0001 C CNN
@@ -396,7 +395,7 @@ U 1 1 5CC71057
 P 7350 3100
 AR Path="/5CA6B0AA/5CC4DFC2/5CC71057" Ref="#PWR0162"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC71057" Ref="#PWR0185"  Part="1" 
-F 0 "#PWR0185" H 7350 2850 50  0001 C CNN
+F 0 "#PWR0162" H 7350 2850 50  0001 C CNN
 F 1 "GND" H 7350 2950 50  0000 C CNN
 F 2 "" H 7350 3100 50  0001 C CNN
 F 3 "" H 7350 3100 50  0001 C CNN
@@ -409,7 +408,7 @@ U 1 1 5CC7105D
 P 5750 3100
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7105D" Ref="#PWR0160"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7105D" Ref="#PWR0183"  Part="1" 
-F 0 "#PWR0183" H 5750 2850 50  0001 C CNN
+F 0 "#PWR0160" H 5750 2850 50  0001 C CNN
 F 1 "GND" H 5750 2950 50  0000 C CNN
 F 2 "" H 5750 3100 50  0001 C CNN
 F 3 "" H 5750 3100 50  0001 C CNN
@@ -446,7 +445,7 @@ U 1 1 5CC78AA9
 P 6550 3700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC78AA9" Ref="R108"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC78AA9" Ref="R132"  Part="1" 
-F 0 "R132" H 6580 3720 50  0000 L CNN
+F 0 "R108" H 6580 3720 50  0000 L CNN
 F 1 "330R" H 6580 3660 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6550 3700 50  0001 C CNN
 F 3 "~" H 6550 3700 50  0001 C CNN
@@ -460,7 +459,7 @@ U 1 1 5CC7911F
 P 6550 3900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7911F" Ref="#PWR0161"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7911F" Ref="#PWR0184"  Part="1" 
-F 0 "#PWR0184" H 6550 3650 50  0001 C CNN
+F 0 "#PWR0161" H 6550 3650 50  0001 C CNN
 F 1 "GND" H 6550 3750 50  0000 C CNN
 F 2 "" H 6550 3900 50  0001 C CNN
 F 3 "" H 6550 3900 50  0001 C CNN
@@ -475,7 +474,7 @@ U 1 1 5CC7FE22
 P 6150 3200
 AR Path="/5CA6B0AA/5CC4DFC2/5CC7FE22" Ref="R107"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC7FE22" Ref="R131"  Part="1" 
-F 0 "R131" H 6180 3220 50  0000 L CNN
+F 0 "R107" H 6180 3220 50  0000 L CNN
 F 1 "22R" H 6180 3160 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6150 3200 50  0001 C CNN
 F 3 "~" H 6150 3200 50  0001 C CNN
@@ -489,7 +488,7 @@ U 1 1 5CC80169
 P 6950 3150
 AR Path="/5CA6B0AA/5CC4DFC2/5CC80169" Ref="R110"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC80169" Ref="R134"  Part="1" 
-F 0 "R134" H 6980 3170 50  0000 L CNN
+F 0 "R110" H 6980 3170 50  0000 L CNN
 F 1 "22R" H 6980 3110 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 6950 3150 50  0001 C CNN
 F 3 "~" H 6950 3150 50  0001 C CNN
@@ -520,7 +519,7 @@ U 1 1 5CC9409E
 P 4500 2650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9409E" Ref="C125"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9409E" Ref="C149"  Part="1" 
-F 0 "C149" H 4510 2720 50  0000 L CNN
+F 0 "C125" H 4510 2720 50  0000 L CNN
 F 1 "0.1 uF" H 4510 2570 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4500 2650 50  0001 C CNN
 F 3 "~" H 4500 2650 50  0001 C CNN
@@ -536,7 +535,7 @@ U 1 1 5CC959FD
 P 8750 2550
 AR Path="/5CA6B0AA/5CC4DFC2/5CC959FD" Ref="C130"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC959FD" Ref="C154"  Part="1" 
-F 0 "C154" H 8760 2620 50  0000 L CNN
+F 0 "C130" H 8760 2620 50  0000 L CNN
 F 1 "0.1 uF" H 8760 2470 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8750 2550 50  0001 C CNN
 F 3 "~" H 8750 2550 50  0001 C CNN
@@ -554,7 +553,7 @@ U 1 1 5CC3C53E
 P 9700 4450
 AR Path="/5CA6B0AA/5CC4DFC2/5CC3C53E" Ref="U10"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC3C53E" Ref="U15"  Part="1" 
-F 0 "U15" H 9700 4800 50  0000 C CNN
+F 0 "U10" H 9700 4800 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 9700 4700 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 9700 4700 50  0001 C CNN
 F 3 "" H 9700 4700 50  0001 C CNN
@@ -568,7 +567,7 @@ U 2 1 5CC40584
 P 2800 6600
 AR Path="/5CA6B0AA/5CC4DFC2/5CC40584" Ref="U8"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC40584" Ref="U13"  Part="2" 
-F 0 "U13" H 2800 6950 50  0000 C CNN
+F 0 "U8" H 2800 6950 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 2800 6850 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 2800 6850 50  0001 C CNN
 F 3 "" H 2800 6850 50  0001 C CNN
@@ -582,7 +581,7 @@ U 1 1 5CC415CE
 P 9700 5650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC415CE" Ref="U11"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC415CE" Ref="U16"  Part="1" 
-F 0 "U16" H 9700 6000 50  0000 C CNN
+F 0 "U11" H 9700 6000 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 9700 5900 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 9700 5900 50  0001 C CNN
 F 3 "" H 9700 5900 50  0001 C CNN
@@ -596,7 +595,7 @@ U 1 1 5CC4409B
 P 8200 2650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC4409B" Ref="U9"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC4409B" Ref="U14"  Part="1" 
-F 0 "U14" H 8200 3000 50  0000 C CNN
+F 0 "U9" H 8200 3000 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 8200 2900 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 8200 2900 50  0001 C CNN
 F 3 "" H 8200 2900 50  0001 C CNN
@@ -610,7 +609,7 @@ U 1 1 5CC46970
 P 5050 2750
 AR Path="/5CA6B0AA/5CC4DFC2/5CC46970" Ref="U8"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC46970" Ref="U13"  Part="1" 
-F 0 "U13" H 5050 3100 50  0000 C CNN
+F 0 "U8" H 5050 3100 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 5050 3000 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 5050 3000 50  0001 C CNN
 F 3 "" H 5050 3000 50  0001 C CNN
@@ -624,7 +623,7 @@ U 2 1 5CC47B5C
 P 3650 6600
 AR Path="/5CA6B0AA/5CC4DFC2/5CC47B5C" Ref="U9"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC47B5C" Ref="U14"  Part="2" 
-F 0 "U14" H 3650 6950 50  0000 C CNN
+F 0 "U9" H 3650 6950 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 3650 6850 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 3650 6850 50  0001 C CNN
 F 3 "" H 3650 6850 50  0001 C CNN
@@ -638,7 +637,7 @@ U 2 1 5CC48C49
 P 4600 6600
 AR Path="/5CA6B0AA/5CC4DFC2/5CC48C49" Ref="U10"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC48C49" Ref="U15"  Part="2" 
-F 0 "U15" H 4600 6950 50  0000 C CNN
+F 0 "U10" H 4600 6950 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 4600 6850 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 4600 6850 50  0001 C CNN
 F 3 "" H 4600 6850 50  0001 C CNN
@@ -652,7 +651,7 @@ U 2 1 5CC49F9F
 P 5350 6600
 AR Path="/5CA6B0AA/5CC4DFC2/5CC49F9F" Ref="U11"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC49F9F" Ref="U16"  Part="2" 
-F 0 "U16" H 5350 6950 50  0000 C CNN
+F 0 "U11" H 5350 6950 50  0000 C CNN
 F 1 "NLAS4157DFT2G" H 5350 6850 50  0000 C CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 5350 6850 50  0001 C CNN
 F 3 "" H 5350 6850 50  0001 C CNN
@@ -674,7 +673,7 @@ U 1 1 5CC5931A
 P 4550 2850
 AR Path="/5CA6B0AA/5CC4DFC2/5CC5931A" Ref="C126"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC5931A" Ref="C150"  Part="1" 
-F 0 "C150" H 4560 2920 50  0000 L CNN
+F 0 "C126" H 4560 2920 50  0000 L CNN
 F 1 "0.1 uF" H 4560 2770 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4550 2850 50  0001 C CNN
 F 3 "~" H 4550 2850 50  0001 C CNN
@@ -696,7 +695,7 @@ U 1 1 5CC646BF
 P 8850 2750
 AR Path="/5CA6B0AA/5CC4DFC2/5CC646BF" Ref="C131"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC646BF" Ref="C155"  Part="1" 
-F 0 "C155" H 8860 2820 50  0000 L CNN
+F 0 "C131" H 8860 2820 50  0000 L CNN
 F 1 "0.1 uF" H 8860 2670 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8850 2750 50  0001 C CNN
 F 3 "~" H 8850 2750 50  0001 C CNN
@@ -792,7 +791,7 @@ U 1 1 5CC9DCE4
 P 3050 5700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9DCE4" Ref="C119"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9DCE4" Ref="C143"  Part="1" 
-F 0 "C143" H 3060 5770 50  0000 L CNN
+F 0 "C119" H 3060 5770 50  0000 L CNN
 F 1 "0.1 uF" H 3060 5620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3050 5700 50  0001 C CNN
 F 3 "~" H 3050 5700 50  0001 C CNN
@@ -806,7 +805,7 @@ U 1 1 5CC9E1ED
 P 3550 5700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9E1ED" Ref="C120"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9E1ED" Ref="C144"  Part="1" 
-F 0 "C144" H 3560 5770 50  0000 L CNN
+F 0 "C120" H 3560 5770 50  0000 L CNN
 F 1 "0.1 uF" H 3560 5620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3550 5700 50  0001 C CNN
 F 3 "~" H 3550 5700 50  0001 C CNN
@@ -820,7 +819,7 @@ U 1 1 5CC9E6BF
 P 4000 5700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9E6BF" Ref="C122"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9E6BF" Ref="C146"  Part="1" 
-F 0 "C146" H 4010 5770 50  0000 L CNN
+F 0 "C122" H 4010 5770 50  0000 L CNN
 F 1 "0.1 uF" H 4010 5620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4000 5700 50  0001 C CNN
 F 3 "~" H 4000 5700 50  0001 C CNN
@@ -834,7 +833,7 @@ U 1 1 5CC9EAA6
 P 4450 5700
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9EAA6" Ref="C124"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9EAA6" Ref="C148"  Part="1" 
-F 0 "C148" H 4460 5770 50  0000 L CNN
+F 0 "C124" H 4460 5770 50  0000 L CNN
 F 1 "0.1 uF" H 4460 5620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4450 5700 50  0001 C CNN
 F 3 "~" H 4450 5700 50  0001 C CNN
@@ -848,7 +847,7 @@ U 1 1 5CC9F407
 P 2500 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9F407" Ref="#PWR0149"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9F407" Ref="#PWR0172"  Part="1" 
-F 0 "#PWR0172" H 2500 6550 50  0001 C CNN
+F 0 "#PWR0149" H 2500 6550 50  0001 C CNN
 F 1 "GND" H 2500 6650 50  0000 C CNN
 F 2 "" H 2500 6800 50  0001 C CNN
 F 3 "" H 2500 6800 50  0001 C CNN
@@ -861,7 +860,7 @@ U 1 1 5CC9FAC5
 P 3350 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9FAC5" Ref="#PWR0152"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9FAC5" Ref="#PWR0175"  Part="1" 
-F 0 "#PWR0175" H 3350 6550 50  0001 C CNN
+F 0 "#PWR0152" H 3350 6550 50  0001 C CNN
 F 1 "GND" H 3350 6650 50  0000 C CNN
 F 2 "" H 3350 6800 50  0001 C CNN
 F 3 "" H 3350 6800 50  0001 C CNN
@@ -874,7 +873,7 @@ U 1 1 5CC9FD6D
 P 4300 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CC9FD6D" Ref="#PWR0157"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC9FD6D" Ref="#PWR0180"  Part="1" 
-F 0 "#PWR0180" H 4300 6550 50  0001 C CNN
+F 0 "#PWR0157" H 4300 6550 50  0001 C CNN
 F 1 "GND" H 4300 6650 50  0000 C CNN
 F 2 "" H 4300 6800 50  0001 C CNN
 F 3 "" H 4300 6800 50  0001 C CNN
@@ -887,7 +886,7 @@ U 1 1 5CCA0195
 P 5050 6800
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0195" Ref="#PWR0159"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0195" Ref="#PWR0182"  Part="1" 
-F 0 "#PWR0182" H 5050 6550 50  0001 C CNN
+F 0 "#PWR0159" H 5050 6550 50  0001 C CNN
 F 1 "GND" H 5050 6650 50  0000 C CNN
 F 2 "" H 5050 6800 50  0001 C CNN
 F 3 "" H 5050 6800 50  0001 C CNN
@@ -900,7 +899,7 @@ U 1 1 5CCA0420
 P 3050 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0420" Ref="#PWR0150"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0420" Ref="#PWR0173"  Part="1" 
-F 0 "#PWR0173" H 3050 5650 50  0001 C CNN
+F 0 "#PWR0150" H 3050 5650 50  0001 C CNN
 F 1 "GND" H 3050 5750 50  0000 C CNN
 F 2 "" H 3050 5900 50  0001 C CNN
 F 3 "" H 3050 5900 50  0001 C CNN
@@ -913,7 +912,7 @@ U 1 1 5CCA07DE
 P 3550 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA07DE" Ref="#PWR0153"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA07DE" Ref="#PWR0176"  Part="1" 
-F 0 "#PWR0176" H 3550 5650 50  0001 C CNN
+F 0 "#PWR0153" H 3550 5650 50  0001 C CNN
 F 1 "GND" H 3550 5750 50  0000 C CNN
 F 2 "" H 3550 5900 50  0001 C CNN
 F 3 "" H 3550 5900 50  0001 C CNN
@@ -926,7 +925,7 @@ U 1 1 5CCA0A90
 P 4000 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0A90" Ref="#PWR0155"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0A90" Ref="#PWR0178"  Part="1" 
-F 0 "#PWR0178" H 4000 5650 50  0001 C CNN
+F 0 "#PWR0155" H 4000 5650 50  0001 C CNN
 F 1 "GND" H 4000 5750 50  0000 C CNN
 F 2 "" H 4000 5900 50  0001 C CNN
 F 3 "" H 4000 5900 50  0001 C CNN
@@ -939,7 +938,7 @@ U 1 1 5CCA0D69
 P 4450 5900
 AR Path="/5CA6B0AA/5CC4DFC2/5CCA0D69" Ref="#PWR0158"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCA0D69" Ref="#PWR0181"  Part="1" 
-F 0 "#PWR0181" H 4450 5650 50  0001 C CNN
+F 0 "#PWR0158" H 4450 5650 50  0001 C CNN
 F 1 "GND" H 4450 5750 50  0000 C CNN
 F 2 "" H 4450 5900 50  0001 C CNN
 F 3 "" H 4450 5900 50  0001 C CNN
@@ -1000,7 +999,7 @@ U 1 1 5CCEE151
 P 5850 2150
 AR Path="/5CA6B0AA/5CC4DFC2/5CCEE151" Ref="TP7"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCEE151" Ref="TP17"  Part="1" 
-F 0 "TP17" H 5850 2420 50  0000 C CNN
+F 0 "TP7" H 5850 2420 50  0000 C CNN
 F 1 "TestPoint" H 5850 2350 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 6050 2150 50  0001 C CNN
 F 3 "~" H 6050 2150 50  0001 C CNN
@@ -1014,7 +1013,7 @@ U 1 1 5CCEEC53
 P 7300 2100
 AR Path="/5CA6B0AA/5CC4DFC2/5CCEEC53" Ref="TP9"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCEEC53" Ref="TP19"  Part="1" 
-F 0 "TP19" H 7300 2370 50  0000 C CNN
+F 0 "TP9" H 7300 2370 50  0000 C CNN
 F 1 "TestPoint" H 7300 2300 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 7500 2100 50  0001 C CNN
 F 3 "~" H 7500 2100 50  0001 C CNN
@@ -1028,7 +1027,7 @@ U 1 1 5CCEF073
 P 6550 3350
 AR Path="/5CA6B0AA/5CC4DFC2/5CCEF073" Ref="TP8"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCEF073" Ref="TP18"  Part="1" 
-F 0 "TP18" H 6550 3620 50  0000 C CNN
+F 0 "TP8" H 6550 3620 50  0000 C CNN
 F 1 "TestPoint" H 6550 3550 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 6750 3350 50  0001 C CNN
 F 3 "~" H 6750 3350 50  0001 C CNN
@@ -1042,7 +1041,7 @@ U 1 1 5CCEF9C3
 P 2050 3300
 AR Path="/5CA6B0AA/5CC4DFC2/5CCEF9C3" Ref="TP2"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCEF9C3" Ref="TP12"  Part="1" 
-F 0 "TP12" H 2050 3570 50  0000 C CNN
+F 0 "TP2" H 2050 3570 50  0000 C CNN
 F 1 "TestPoint" H 2050 3500 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 2250 3300 50  0001 C CNN
 F 3 "~" H 2250 3300 50  0001 C CNN
@@ -1057,7 +1056,7 @@ U 1 1 5CCF05BD
 P 1650 2400
 AR Path="/5CA6B0AA/5CC4DFC2/5CCF05BD" Ref="TP1"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCF05BD" Ref="TP11"  Part="1" 
-F 0 "TP11" H 1650 2670 50  0000 C CNN
+F 0 "TP1" H 1650 2670 50  0000 C CNN
 F 1 "TestPoint" H 1650 2600 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 1850 2400 50  0001 C CNN
 F 3 "~" H 1850 2400 50  0001 C CNN
@@ -1071,7 +1070,7 @@ U 1 1 5CCF0F27
 P 3250 2350
 AR Path="/5CA6B0AA/5CC4DFC2/5CCF0F27" Ref="TP5"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCF0F27" Ref="TP15"  Part="1" 
-F 0 "TP15" H 3250 2620 50  0000 C CNN
+F 0 "TP5" H 3250 2620 50  0000 C CNN
 F 1 "TestPoint" H 3250 2550 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 3450 2350 50  0001 C CNN
 F 3 "~" H 3450 2350 50  0001 C CNN
@@ -1089,7 +1088,7 @@ U 1 1 5CCF9A96
 P 2350 3950
 AR Path="/5CA6B0AA/5CC4DFC2/5CCF9A96" Ref="TP4"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCF9A96" Ref="TP14"  Part="1" 
-F 0 "TP14" H 2350 4220 50  0000 C CNN
+F 0 "TP4" H 2350 4220 50  0000 C CNN
 F 1 "TestPoint" H 2350 4150 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 2550 3950 50  0001 C CNN
 F 3 "~" H 2550 3950 50  0001 C CNN
@@ -1108,7 +1107,7 @@ U 1 1 5CCFE98E
 P 2100 1650
 AR Path="/5CA6B0AA/5CC4DFC2/5CCFE98E" Ref="TP3"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CCFE98E" Ref="TP13"  Part="1" 
-F 0 "TP13" H 2100 1920 50  0000 C CNN
+F 0 "TP3" H 2100 1920 50  0000 C CNN
 F 1 "TestPoint" H 2100 1850 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 2300 1650 50  0001 C CNN
 F 3 "~" H 2300 1650 50  0001 C CNN
@@ -1137,7 +1136,7 @@ U 1 1 5CD0C7EE
 P 5500 2900
 AR Path="/5CA6B0AA/5CC4DFC2/5CD0C7EE" Ref="TP6"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CD0C7EE" Ref="TP16"  Part="1" 
-F 0 "TP16" H 5500 3170 50  0000 C CNN
+F 0 "TP6" H 5500 3170 50  0000 C CNN
 F 1 "TestPoint" H 5500 3100 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 5700 2900 50  0001 C CNN
 F 3 "~" H 5700 2900 50  0001 C CNN
@@ -1151,7 +1150,7 @@ U 1 1 5CD0DAA4
 P 7750 2850
 AR Path="/5CA6B0AA/5CC4DFC2/5CD0DAA4" Ref="TP10"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CD0DAA4" Ref="TP20"  Part="1" 
-F 0 "TP20" H 7750 3120 50  0000 C CNN
+F 0 "TP10" H 7750 3120 50  0000 C CNN
 F 1 "TestPoint" H 7750 3050 50  0000 C CNN
 F 2 "TestPoint:TestPoint_Pad_D1.0mm" H 7950 2850 50  0001 C CNN
 F 3 "~" H 7950 2850 50  0001 C CNN
@@ -1177,7 +1176,7 @@ U 1 1 5CC8B3B3
 P 1950 3000
 AR Path="/5CA6B0AA/5CC4DFC2/5CC8B3B3" Ref="Q15"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC8B3B3" Ref="Q18"  Part="1" 
-F 0 "Q18" H 2150 3050 50  0000 L CNN
+F 0 "Q15" H 2150 3050 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 2150 2950 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 2150 3100 50  0001 C CNN
 F 3 "~" H 1950 3000 50  0001 C CNN
@@ -1191,7 +1190,7 @@ U 2 1 5CC8BBB5
 P 2950 2900
 AR Path="/5CA6B0AA/5CC4DFC2/5CC8BBB5" Ref="Q15"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC8BBB5" Ref="Q18"  Part="2" 
-F 0 "Q18" H 3150 2950 50  0000 L CNN
+F 0 "Q15" H 3150 2950 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 3150 2850 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 3150 3000 50  0001 C CNN
 F 3 "~" H 2950 2900 50  0001 C CNN
@@ -1205,7 +1204,7 @@ U 1 1 5CC8C47F
 P 6050 2750
 AR Path="/5CA6B0AA/5CC4DFC2/5CC8C47F" Ref="Q17"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC8C47F" Ref="Q20"  Part="1" 
-F 0 "Q20" H 6250 2800 50  0000 L CNN
+F 0 "Q17" H 6250 2800 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 6250 2700 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 6250 2850 50  0001 C CNN
 F 3 "~" H 6050 2750 50  0001 C CNN
@@ -1219,7 +1218,7 @@ U 2 1 5CC8CC50
 P 7050 2650
 AR Path="/5CA6B0AA/5CC4DFC2/5CC8CC50" Ref="Q17"  Part="2" 
 AR Path="/5CA6B0AA/5CC9409A/5CC8CC50" Ref="Q20"  Part="2" 
-F 0 "Q20" H 7250 2700 50  0000 L CNN
+F 0 "Q17" H 7250 2700 50  0000 L CNN
 F 1 "NSVT65011MW6T1G" H 7250 2600 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:SOT-363_SC-70-6_Handsoldering" H 7250 2750 50  0001 C CNN
 F 3 "~" H 7050 2650 50  0001 C CNN
@@ -1233,7 +1232,7 @@ U 1 1 5D57AB5D
 P 3650 1950
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB5D" Ref="C121"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB5D" Ref="C145"  Part="1" 
-F 0 "C145" H 3660 2020 50  0000 L CNN
+F 0 "C121" H 3660 2020 50  0000 L CNN
 F 1 "0.1 uF" H 3660 1870 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 3650 1950 50  0001 C CNN
 F 3 "~" H 3650 1950 50  0001 C CNN
@@ -1247,7 +1246,7 @@ U 1 1 5D57AB63
 P 4100 1950
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB63" Ref="C123"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB63" Ref="C147"  Part="1" 
-F 0 "C147" H 4110 2020 50  0000 L CNN
+F 0 "C123" H 4110 2020 50  0000 L CNN
 F 1 "0.1 uF" H 4110 1870 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 4100 1950 50  0001 C CNN
 F 3 "~" H 4100 1950 50  0001 C CNN
@@ -1261,7 +1260,7 @@ U 1 1 5D57AB69
 P 3650 2150
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB69" Ref="#PWR0154"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB69" Ref="#PWR0177"  Part="1" 
-F 0 "#PWR0177" H 3650 1900 50  0001 C CNN
+F 0 "#PWR0154" H 3650 1900 50  0001 C CNN
 F 1 "GND" H 3650 2000 50  0000 C CNN
 F 2 "" H 3650 2150 50  0001 C CNN
 F 3 "" H 3650 2150 50  0001 C CNN
@@ -1274,7 +1273,7 @@ U 1 1 5D57AB6F
 P 4100 2150
 AR Path="/5CA6B0AA/5CC4DFC2/5D57AB6F" Ref="#PWR0156"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D57AB6F" Ref="#PWR0179"  Part="1" 
-F 0 "#PWR0179" H 4100 1900 50  0001 C CNN
+F 0 "#PWR0156" H 4100 1900 50  0001 C CNN
 F 1 "GND" H 4100 2000 50  0000 C CNN
 F 2 "" H 4100 2150 50  0001 C CNN
 F 3 "" H 4100 2150 50  0001 C CNN
@@ -1298,7 +1297,7 @@ U 1 1 5D580ACE
 P 7850 1700
 AR Path="/5CA6B0AA/5CC4DFC2/5D580ACE" Ref="C128"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580ACE" Ref="C152"  Part="1" 
-F 0 "C152" H 7860 1770 50  0000 L CNN
+F 0 "C128" H 7860 1770 50  0000 L CNN
 F 1 "0.1 uF" H 7860 1620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 7850 1700 50  0001 C CNN
 F 3 "~" H 7850 1700 50  0001 C CNN
@@ -1312,7 +1311,7 @@ U 1 1 5D580AD4
 P 8300 1700
 AR Path="/5CA6B0AA/5CC4DFC2/5D580AD4" Ref="C129"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580AD4" Ref="C153"  Part="1" 
-F 0 "C153" H 8310 1770 50  0000 L CNN
+F 0 "C129" H 8310 1770 50  0000 L CNN
 F 1 "0.1 uF" H 8310 1620 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 8300 1700 50  0001 C CNN
 F 3 "~" H 8300 1700 50  0001 C CNN
@@ -1326,7 +1325,7 @@ U 1 1 5D580ADA
 P 7850 1900
 AR Path="/5CA6B0AA/5CC4DFC2/5D580ADA" Ref="#PWR0163"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580ADA" Ref="#PWR0186"  Part="1" 
-F 0 "#PWR0186" H 7850 1650 50  0001 C CNN
+F 0 "#PWR0163" H 7850 1650 50  0001 C CNN
 F 1 "GND" H 7850 1750 50  0000 C CNN
 F 2 "" H 7850 1900 50  0001 C CNN
 F 3 "" H 7850 1900 50  0001 C CNN
@@ -1339,7 +1338,7 @@ U 1 1 5D580AE0
 P 8300 1900
 AR Path="/5CA6B0AA/5CC4DFC2/5D580AE0" Ref="#PWR0164"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5D580AE0" Ref="#PWR0187"  Part="1" 
-F 0 "#PWR0187" H 8300 1650 50  0001 C CNN
+F 0 "#PWR0164" H 8300 1650 50  0001 C CNN
 F 1 "GND" H 8300 1750 50  0000 C CNN
 F 2 "" H 8300 1900 50  0001 C CNN
 F 3 "" H 8300 1900 50  0001 C CNN
@@ -1369,7 +1368,7 @@ U 1 1 5DA03B3D
 P 2500 2450
 AR Path="/5CA6B0AA/5CC4DFC2/5DA03B3D" Ref="C118"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5DA03B3D" Ref="C142"  Part="1" 
-F 0 "C142" H 2510 2520 50  0000 L CNN
+F 0 "C118" H 2510 2520 50  0000 L CNN
 F 1 "2.2 nF" H 2510 2370 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 2500 2450 50  0001 C CNN
 F 3 "~" H 2500 2450 50  0001 C CNN
@@ -1390,7 +1389,7 @@ U 1 1 5DA0FE44
 P 6600 2200
 AR Path="/5CA6B0AA/5CC4DFC2/5DA0FE44" Ref="C127"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5DA0FE44" Ref="C151"  Part="1" 
-F 0 "C151" H 6610 2270 50  0000 L CNN
+F 0 "C127" H 6610 2270 50  0000 L CNN
 F 1 "470 pF" H 6610 2120 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0402_1005Metric" H 6600 2200 50  0001 C CNN
 F 3 "~" H 6600 2200 50  0001 C CNN
@@ -1419,7 +1418,7 @@ U 1 1 5CC4F475
 P 2050 2250
 AR Path="/5CA6B0AA/5CC4DFC2/5CC4F475" Ref="R99"  Part="1" 
 AR Path="/5CA6B0AA/5CC9409A/5CC4F475" Ref="R123"  Part="1" 
-F 0 "R123" H 2080 2270 50  0000 L CNN
+F 0 "R99" H 2080 2270 50  0000 L CNN
 F 1 "22R" H 2080 2210 50  0000 L CNN
 F 2 "Resistor_SMD:R_0402_1005Metric" H 2050 2250 50  0001 C CNN
 F 3 "~" H 2050 2250 50  0001 C CNN
diff --git a/pcb/discrete/discrete-rf-board/lna.sch b/pcb/discrete/discrete-rf-board/lna.sch
index 3cfb5d5..9c50502 100644
--- a/pcb/discrete/discrete-rf-board/lna.sch
+++ b/pcb/discrete/discrete-rf-board/lna.sch
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
diff --git a/pcb/discrete/discrete-rf-board/lna.sch-bak b/pcb/discrete/discrete-rf-board/lna.sch-bak
index 3cfb5d5..9c50502 100644
--- a/pcb/discrete/discrete-rf-board/lna.sch-bak
+++ b/pcb/discrete/discrete-rf-board/lna.sch-bak
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
diff --git a/pcb/discrete/discrete-rf-board/lna_gain_block.sch b/pcb/discrete/discrete-rf-board/lna_gain_block.sch
index b2da13b..718ea1e 100644
--- a/pcb/discrete/discrete-rf-board/lna_gain_block.sch
+++ b/pcb/discrete/discrete-rf-board/lna_gain_block.sch
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
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 b2da13b..718ea1e 100644
--- a/pcb/discrete/discrete-rf-board/lna_gain_block.sch-bak
+++ b/pcb/discrete/discrete-rf-board/lna_gain_block.sch-bak
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
diff --git a/pcb/discrete/discrete-rf-board/lo.sch b/pcb/discrete/discrete-rf-board/lo.sch
index 302906a..051b9b6 100644
--- a/pcb/discrete/discrete-rf-board/lo.sch
+++ b/pcb/discrete/discrete-rf-board/lo.sch
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
diff --git a/pcb/discrete/discrete-rf-board/lo.sch-bak b/pcb/discrete/discrete-rf-board/lo.sch-bak
index 1d309a7..051b9b6 100644
--- a/pcb/discrete/discrete-rf-board/lo.sch-bak
+++ b/pcb/discrete/discrete-rf-board/lo.sch-bak
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
@@ -473,8 +472,9 @@ U 1 1 5CADF1C3
 P 6800 3900
 F 0 "L18" H 6830 3940 50  0000 L CNN
 F 1 "7.5 nH" H 6830 3860 50  0000 L CNN
-F 2 "" H 6800 3900 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 6800 3900 50  0001 C CNN
 F 3 "~" H 6800 3900 50  0001 C CNN
+F 4 "81-LQG15HN7N5J02D" H 6800 3900 50  0001 C CNN "Mouser"
 	1    6800 3900
 	1    0    0    -1  
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/mixer.sch b/pcb/discrete/discrete-rf-board/mixer.sch
index 06d03f1..be3d3d0 100644
--- a/pcb/discrete/discrete-rf-board/mixer.sch
+++ b/pcb/discrete/discrete-rf-board/mixer.sch
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
diff --git a/pcb/discrete/discrete-rf-board/mixer.sch-bak b/pcb/discrete/discrete-rf-board/mixer.sch-bak
index b34e6d0..be3d3d0 100644
--- a/pcb/discrete/discrete-rf-board/mixer.sch-bak
+++ b/pcb/discrete/discrete-rf-board/mixer.sch-bak
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
@@ -1175,8 +1174,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D21806D" Ref="R12"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D21806D" Ref="R26"  Part="1" 
 F 0 "R12" H 2059 1946 50  0000 L CNN
 F 1 "1kR" H 2059 1855 50  0000 L CNN
-F 2 "" H 2000 1900 50  0001 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 2000 1900 50  0001 C CNN
 F 3 "~" H 2000 1900 50  0001 C CNN
+F 4 "71-CRCW06031K00FKEAC" H 2000 1900 50  0001 C CNN "Mouser"
 	1    2000 1900
 	0    1    1    0   
 $EndComp
@@ -1188,8 +1188,9 @@ AR Path="/5CA6B0B3/5CC199E0/5D218880" Ref="R14"  Part="1"
 AR Path="/5CA6B0B3/5CC199E2/5D218880" Ref="R28"  Part="1" 
 F 0 "R14" H 2609 1946 50  0000 L CNN
 F 1 "1kR" H 2609 1855 50  0000 L CNN
-F 2 "" H 2550 1900 50  0001 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 2550 1900 50  0001 C CNN
 F 3 "~" H 2550 1900 50  0001 C CNN
+F 4 "71-CRCW06031K00FKEAC" H 2550 1900 50  0001 C CNN "Mouser"
 	1    2550 1900
 	0    1    1    0   
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/pa.sch b/pcb/discrete/discrete-rf-board/pa.sch
index 9e2106f..e0a7d9b 100644
--- a/pcb/discrete/discrete-rf-board/pa.sch
+++ b/pcb/discrete/discrete-rf-board/pa.sch
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
diff --git a/pcb/discrete/discrete-rf-board/pa.sch-bak b/pcb/discrete/discrete-rf-board/pa.sch-bak
index 60cab0a..e0a7d9b 100644
--- a/pcb/discrete/discrete-rf-board/pa.sch-bak
+++ b/pcb/discrete/discrete-rf-board/pa.sch-bak
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
@@ -27,8 +26,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D4124AC/5D91A8B1" Ref="R?"  Part="1"
 AR Path="/5CA6B0B3/5D830BD7/5D91A8B1" Ref="R45"  Part="1" 
 F 0 "R45" H 6141 3954 50  0000 R CNN
 F 1 "75R" H 6141 4045 50  0000 R CNN
-F 2 "" H 6200 4000 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 6200 4000 50  0001 C CNN
 F 3 "~" H 6200 4000 50  0001 C CNN
+F 4 "71-CRCW040275R0FKEDC" H 6200 4000 50  0001 C CNN "Mouser"
 	1    6200 4000
 	-1   0    0    1   
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/receiver.sch b/pcb/discrete/discrete-rf-board/receiver.sch
index 1cc352a..a0183ba 100644
--- a/pcb/discrete/discrete-rf-board/receiver.sch
+++ b/pcb/discrete/discrete-rf-board/receiver.sch
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
@@ -893,138 +892,90 @@ F 3 "" H 9150 2850 50  0001 C CNN
 $EndComp
 $Comp
 L Diode:BAV99 D1
-U 2 1 5DD008E8
-P 3650 5700
-F 0 "D1" H 3650 5800 50  0000 C CNN
-F 1 "BAV99" H 3650 5600 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 3650 5550 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 3650 5800 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 3650 5700 50  0001 C CNN "Mouser"
-	2    3650 5700
-	0    1    1    0   
-$EndComp
-$Comp
-L Diode:BAV99 D1
 U 1 1 5DD008EE
-P 3650 6200
-F 0 "D1" H 3650 6300 50  0000 C CNN
-F 1 "BAV99" H 3650 6100 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 3650 6050 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 3650 6300 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 3650 6300 50  0001 C CNN "Mouser"
-	1    3650 6200
+P 3350 5950
+AR Path="/5DD008EE" Ref="D1"  Part="1" 
+AR Path="/5CA6B0AA/5DD008EE" Ref="D1"  Part="1" 
+F 0 "D1" H 3350 6050 50  0000 C CNN
+F 1 "BAV99" H 3350 5850 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 3350 5800 50  0001 C CNN
+F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 3350 6050 50  0001 C CNN
+F 4 " 863-BAV99RWT1G" H 3350 6050 50  0001 C CNN "Mouser"
+	1    3350 5950
 	0    1    1    0   
 $EndComp
-Text Label 4000 6450 2    50   ~ 0
+Text Label 3700 6350 2    50   ~ 0
 I_N
 Wire Wire Line
-	3650 5850 3650 6050
+	3350 5550 3350 5650
 Wire Wire Line
-	3650 5450 3650 5550
-Wire Wire Line
-	3650 6450 3650 6350
+	3350 6350 3350 6250
 $Comp
 L Diode:BAV99 D2
 U 1 1 5DD254C5
-P 4000 5700
-F 0 "D2" H 4000 5800 50  0000 C CNN
-F 1 "BAV99" H 4000 5600 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4000 5550 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4000 5800 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 4000 5800 50  0001 C CNN "Mouser"
-	1    4000 5700
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Diode:BAV99 D2
-U 2 1 5DD254CB
-P 4000 6200
-F 0 "D2" H 4000 6300 50  0000 C CNN
-F 1 "BAV99" H 4000 6100 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4000 6050 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4000 6300 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 4000 6300 50  0001 C CNN "Mouser"
-	2    4000 6200
+P 3700 5950
+AR Path="/5DD254C5" Ref="D2"  Part="1" 
+AR Path="/5CA6B0AA/5DD254C5" Ref="D2"  Part="1" 
+F 0 "D2" H 3700 6050 50  0000 C CNN
+F 1 "BAV99" H 3700 5850 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 3700 5800 50  0001 C CNN
+F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 3700 6050 50  0001 C CNN
+F 4 " 863-BAV99RWT1G" H 3700 6050 50  0001 C CNN "Mouser"
+	1    3700 5950
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	4000 6050 4000 5850
+	3700 6350 3700 6250
 Wire Wire Line
-	4000 6450 4000 6350
-Wire Wire Line
-	4000 5450 4000 5550
-$Comp
-L Diode:BAV99 D3
-U 2 1 5DD2A865
-P 4350 5700
-F 0 "D3" H 4350 5800 50  0000 C CNN
-F 1 "BAV99" H 4350 5600 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4350 5550 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4350 5800 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 4350 5800 50  0001 C CNN "Mouser"
-	2    4350 5700
-	0    1    1    0   
-$EndComp
+	3700 5550 3700 5650
 $Comp
 L Diode:BAV99 D3
 U 1 1 5DD2A86B
-P 4350 6200
-F 0 "D3" H 4350 6300 50  0000 C CNN
-F 1 "BAV99" H 4350 6100 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4350 6050 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4350 6300 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 4350 6300 50  0001 C CNN "Mouser"
-	1    4350 6200
+P 4350 5950
+AR Path="/5DD2A86B" Ref="D3"  Part="1" 
+AR Path="/5CA6B0AA/5DD2A86B" Ref="D3"  Part="1" 
+F 0 "D3" H 4350 6050 50  0000 C CNN
+F 1 "BAV99" H 4350 5850 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 4350 5800 50  0001 C CNN
+F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4350 6050 50  0001 C CNN
+F 4 " 863-BAV99RWT1G" H 4350 6050 50  0001 C CNN "Mouser"
+	1    4350 5950
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	4350 5850 4350 6050
+	4350 5550 4350 5650
 Wire Wire Line
-	4350 5450 4350 5550
+	4350 6350 4350 6250
 Wire Wire Line
-	4350 6450 4350 6350
-Wire Wire Line
-	4700 5450 4700 5550
-Text Label 4000 5450 2    50   ~ 0
+	4700 5550 4700 5650
+Text Label 3700 5550 2    50   ~ 0
 I_P
-Text Label 4700 5450 2    50   ~ 0
+Text Label 4700 5550 2    50   ~ 0
 Q_P
 Wire Wire Line
-	3650 6450 4000 6450
+	3350 6350 3700 6350
 Wire Wire Line
-	4350 6450 4700 6450
+	4350 6350 4700 6350
 Wire Wire Line
-	3650 5450 4000 5450
+	3350 5550 3700 5550
 Wire Wire Line
-	4350 5450 4700 5450
-Text Label 4700 6450 2    50   ~ 0
+	4350 5550 4700 5550
+Text Label 4700 6350 2    50   ~ 0
 Q_N
 Wire Wire Line
-	4700 6450 4700 6350
-Wire Wire Line
-	4700 6050 4700 5850
-$Comp
-L Diode:BAV99 D4
-U 2 1 5DD36B9C
-P 4700 6200
-F 0 "D4" H 4700 6300 50  0000 C CNN
-F 1 "BAV99" H 4700 6100 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4700 6050 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4700 6300 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 4700 6300 50  0001 C CNN "Mouser"
-	2    4700 6200
-	0    -1   -1   0   
-$EndComp
+	4700 6350 4700 6250
 $Comp
 L Diode:BAV99 D4
 U 1 1 5DD36B96
-P 4700 5700
-F 0 "D4" H 4700 5800 50  0000 C CNN
-F 1 "BAV99" H 4700 5600 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4700 5550 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4700 5800 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 4700 5800 50  0001 C CNN "Mouser"
-	1    4700 5700
+P 4700 5950
+AR Path="/5DD36B96" Ref="D4"  Part="1" 
+AR Path="/5CA6B0AA/5DD36B96" Ref="D4"  Part="1" 
+F 0 "D4" H 4700 6050 50  0000 C CNN
+F 1 "BAV99" H 4700 5850 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 4700 5800 50  0001 C CNN
+F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4700 6050 50  0001 C CNN
+F 4 " 863-BAV99RWT1G" H 4700 6050 50  0001 C CNN "Mouser"
+	1    4700 5950
 	0    -1   -1   0   
 $EndComp
 Text HLabel 950  3900 0    50   Input ~ 0
@@ -1039,7 +990,7 @@ Text HLabel 950  3250 0    50   Input ~ 0
 LNA_5V0
 Wire Wire Line
 	950  3250 1000 3250
-Text Notes 3650 6600 0    50   ~ 0
+Text Notes 3350 6600 0    50   ~ 0
 ~~1.4 pF due to diode parasitics
 Text HLabel 10650 5150 2    50   Input ~ 0
 ADC_GND1
@@ -1140,4 +1091,8 @@ Wire Wire Line
 Connection ~ 4350 3400
 Wire Wire Line
 	4350 3400 4450 3400
+NoConn ~ 4900 5950
+NoConn ~ 4150 5950
+NoConn ~ 3900 5950
+NoConn ~ 3150 5950
 $EndSCHEMATC
diff --git a/pcb/discrete/discrete-rf-board/receiver.sch-bak b/pcb/discrete/discrete-rf-board/receiver.sch-bak
index 013e82e..04c2d7c 100644
--- a/pcb/discrete/discrete-rf-board/receiver.sch-bak
+++ b/pcb/discrete/discrete-rf-board/receiver.sch-bak
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
@@ -197,8 +196,9 @@ U 1 1 5D8B4C1C
 P 2700 2800
 F 0 "R83" H 2730 2820 50  0000 L CNN
 F 1 "50R" H 2730 2760 50  0000 L CNN
-F 2 "" H 2700 2800 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 2700 2800 50  0001 C CNN
 F 3 "~" H 2700 2800 50  0001 C CNN
+F 4 "603-RC0402JR-0750RL" H 2700 2800 50  0001 C CNN "Mouser"
 	1    2700 2800
 	1    0    0    -1  
 $EndComp
@@ -892,138 +892,90 @@ F 3 "" H 9150 2850 50  0001 C CNN
 $EndComp
 $Comp
 L Diode:BAV99 D1
-U 2 1 5DD008E8
-P 3650 5700
-F 0 "D1" H 3650 5800 50  0000 C CNN
-F 1 "BAV99" H 3650 5600 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 3650 5550 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 3650 5800 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 3650 5700 50  0001 C CNN "Mouser"
-	2    3650 5700
-	0    1    1    0   
-$EndComp
-$Comp
-L Diode:BAV99 D1
 U 1 1 5DD008EE
-P 3650 6200
-F 0 "D1" H 3650 6300 50  0000 C CNN
-F 1 "BAV99" H 3650 6100 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 3650 6050 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 3650 6300 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 3650 6300 50  0001 C CNN "Mouser"
-	1    3650 6200
+P 3350 5950
+AR Path="/5DD008EE" Ref="D1"  Part="1" 
+AR Path="/5CA6B0AA/5DD008EE" Ref="D1"  Part="1" 
+F 0 "D1" H 3350 6050 50  0000 C CNN
+F 1 "BAV99" H 3350 5850 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 3350 5800 50  0001 C CNN
+F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 3350 6050 50  0001 C CNN
+F 4 " 863-BAV99RWT1G" H 3350 6050 50  0001 C CNN "Mouser"
+	1    3350 5950
 	0    1    1    0   
 $EndComp
-Text Label 4000 6450 2    50   ~ 0
+Text Label 3700 6350 2    50   ~ 0
 I_N
 Wire Wire Line
-	3650 5850 3650 6050
+	3350 5550 3350 5650
 Wire Wire Line
-	3650 5450 3650 5550
-Wire Wire Line
-	3650 6450 3650 6350
+	3350 6350 3350 6250
 $Comp
 L Diode:BAV99 D2
 U 1 1 5DD254C5
-P 4000 5700
-F 0 "D2" H 4000 5800 50  0000 C CNN
-F 1 "BAV99" H 4000 5600 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4000 5550 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4000 5800 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 4000 5800 50  0001 C CNN "Mouser"
-	1    4000 5700
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Diode:BAV99 D2
-U 2 1 5DD254CB
-P 4000 6200
-F 0 "D2" H 4000 6300 50  0000 C CNN
-F 1 "BAV99" H 4000 6100 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4000 6050 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4000 6300 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 4000 6300 50  0001 C CNN "Mouser"
-	2    4000 6200
+P 3700 5950
+AR Path="/5DD254C5" Ref="D2"  Part="1" 
+AR Path="/5CA6B0AA/5DD254C5" Ref="D2"  Part="1" 
+F 0 "D2" H 3700 6050 50  0000 C CNN
+F 1 "BAV99" H 3700 5850 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 3700 5800 50  0001 C CNN
+F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 3700 6050 50  0001 C CNN
+F 4 " 863-BAV99RWT1G" H 3700 6050 50  0001 C CNN "Mouser"
+	1    3700 5950
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	4000 6050 4000 5850
+	3700 6350 3700 6250
 Wire Wire Line
-	4000 6450 4000 6350
-Wire Wire Line
-	4000 5450 4000 5550
-$Comp
-L Diode:BAV99 D3
-U 2 1 5DD2A865
-P 4350 5700
-F 0 "D3" H 4350 5800 50  0000 C CNN
-F 1 "BAV99" H 4350 5600 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4350 5550 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4350 5800 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 4350 5800 50  0001 C CNN "Mouser"
-	2    4350 5700
-	0    1    1    0   
-$EndComp
+	3700 5550 3700 5650
 $Comp
 L Diode:BAV99 D3
 U 1 1 5DD2A86B
-P 4350 6200
-F 0 "D3" H 4350 6300 50  0000 C CNN
-F 1 "BAV99" H 4350 6100 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4350 6050 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4350 6300 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 4350 6300 50  0001 C CNN "Mouser"
-	1    4350 6200
+P 4350 5950
+AR Path="/5DD2A86B" Ref="D3"  Part="1" 
+AR Path="/5CA6B0AA/5DD2A86B" Ref="D3"  Part="1" 
+F 0 "D3" H 4350 6050 50  0000 C CNN
+F 1 "BAV99" H 4350 5850 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 4350 5800 50  0001 C CNN
+F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4350 6050 50  0001 C CNN
+F 4 " 863-BAV99RWT1G" H 4350 6050 50  0001 C CNN "Mouser"
+	1    4350 5950
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	4350 5850 4350 6050
+	4350 5550 4350 5650
 Wire Wire Line
-	4350 5450 4350 5550
+	4350 6350 4350 6250
 Wire Wire Line
-	4350 6450 4350 6350
-Wire Wire Line
-	4700 5450 4700 5550
-Text Label 4000 5450 2    50   ~ 0
+	4700 5550 4700 5650
+Text Label 3700 5550 2    50   ~ 0
 I_P
-Text Label 4700 5450 2    50   ~ 0
+Text Label 4700 5550 2    50   ~ 0
 Q_P
 Wire Wire Line
-	3650 6450 4000 6450
+	3350 6350 3700 6350
 Wire Wire Line
-	4350 6450 4700 6450
+	4350 6350 4700 6350
 Wire Wire Line
-	3650 5450 4000 5450
+	3350 5550 3700 5550
 Wire Wire Line
-	4350 5450 4700 5450
-Text Label 4700 6450 2    50   ~ 0
+	4350 5550 4700 5550
+Text Label 4700 6350 2    50   ~ 0
 Q_N
 Wire Wire Line
-	4700 6450 4700 6350
-Wire Wire Line
-	4700 6050 4700 5850
-$Comp
-L Diode:BAV99 D4
-U 2 1 5DD36B9C
-P 4700 6200
-F 0 "D4" H 4700 6300 50  0000 C CNN
-F 1 "BAV99" H 4700 6100 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4700 6050 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4700 6300 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 4700 6300 50  0001 C CNN "Mouser"
-	2    4700 6200
-	0    -1   -1   0   
-$EndComp
+	4700 6350 4700 6250
 $Comp
 L Diode:BAV99 D4
 U 1 1 5DD36B96
-P 4700 5700
-F 0 "D4" H 4700 5800 50  0000 C CNN
-F 1 "BAV99" H 4700 5600 50  0000 C CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 4700 5550 50  0001 C CNN
-F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4700 5800 50  0001 C CNN
-F 4 " 863-BAV99RWT1G" H 4700 5800 50  0001 C CNN "Mouser"
-	1    4700 5700
+P 4700 5950
+AR Path="/5DD36B96" Ref="D4"  Part="1" 
+AR Path="/5CA6B0AA/5DD36B96" Ref="D4"  Part="1" 
+F 0 "D4" H 4700 6050 50  0000 C CNN
+F 1 "BAV99" H 4700 5850 50  0000 C CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 4700 5800 50  0001 C CNN
+F 3 "https://assets.nexperia.com/documents/data-sheet/BAV99_SER.pdf" H 4700 6050 50  0001 C CNN
+F 4 " 863-BAV99RWT1G" H 4700 6050 50  0001 C CNN "Mouser"
+	1    4700 5950
 	0    -1   -1   0   
 $EndComp
 Text HLabel 950  3900 0    50   Input ~ 0
@@ -1038,7 +990,7 @@ Text HLabel 950  3250 0    50   Input ~ 0
 LNA_5V0
 Wire Wire Line
 	950  3250 1000 3250
-Text Notes 3650 6600 0    50   ~ 0
+Text Notes 3350 6600 0    50   ~ 0
 ~~1.4 pF due to diode parasitics
 Text HLabel 10650 5150 2    50   Input ~ 0
 ADC_GND1
@@ -1123,8 +1075,9 @@ U 1 1 5DC881F5
 P 4350 3600
 F 0 "R84" H 4380 3620 50  0000 L CNN
 F 1 "51R 0603" H 4380 3560 50  0000 L CNN
-F 2 "" H 4350 3600 50  0001 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric_Pad1.05x0.95mm_HandSolder" H 4350 3600 50  0001 C CNN
 F 3 "~" H 4350 3600 50  0001 C CNN
+F 4 "603-RC0603FR-0751RL" H 4350 3600 50  0001 C CNN "Mouser"
 	1    4350 3600
 	1    0    0    -1  
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/switchable-attenuator.sch b/pcb/discrete/discrete-rf-board/switchable-attenuator.sch
index ff3bc00..6fc79cd 100644
--- a/pcb/discrete/discrete-rf-board/switchable-attenuator.sch
+++ b/pcb/discrete/discrete-rf-board/switchable-attenuator.sch
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
diff --git a/pcb/discrete/discrete-rf-board/switchable-attenuator.sch-bak b/pcb/discrete/discrete-rf-board/switchable-attenuator.sch-bak
index fb3dd2e..6fc79cd 100644
--- a/pcb/discrete/discrete-rf-board/switchable-attenuator.sch-bak
+++ b/pcb/discrete/discrete-rf-board/switchable-attenuator.sch-bak
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
@@ -39,8 +38,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FCA" Ref="R154"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FCA" Ref="R157"  Part="1" 
 F 0 "R154" H 4880 3320 50  0000 L CNN
 F 1 "TBD 0402" H 4880 3260 50  0000 L CNN
-F 2 "" H 4850 3300 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 4850 3300 50  0001 C CNN
 F 3 "~" H 4850 3300 50  0001 C CNN
+F 4 "NoPart" H 4850 3300 50  0001 C CNN "Mouser"
 	1    4850 3300
 	0    1    1    0   
 $EndComp
@@ -53,8 +53,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD0" Ref="R156"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD0" Ref="R159"  Part="1" 
 F 0 "R156" H 5230 3320 50  0000 L CNN
 F 1 "TBD 0402" H 5230 3260 50  0000 L CNN
-F 2 "" H 5200 3300 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 5200 3300 50  0001 C CNN
 F 3 "~" H 5200 3300 50  0001 C CNN
+F 4 "NoPart" H 5200 3300 50  0001 C CNN "Mouser"
 	1    5200 3300
 	0    1    1    0   
 $EndComp
@@ -67,8 +68,9 @@ AR Path="/5CA6B0AA/5CE74EBE/5D4B0AA8/5D4B1FD6" Ref="R155"  Part="1"
 AR Path="/5CA6B0AA/5CE74EBE/5D4C7749/5D4B1FD6" Ref="R158"  Part="1" 
 F 0 "R155" H 5080 3720 50  0000 L CNN
 F 1 "TBD 0402" H 5080 3660 50  0000 L CNN
-F 2 "" H 5050 3700 50  0001 C CNN
+F 2 "Resistor_SMD:R_0402_1005Metric" H 5050 3700 50  0001 C CNN
 F 3 "~" H 5050 3700 50  0001 C CNN
+F 4 "NoPart" H 5050 3700 50  0001 C CNN "Mouser"
 	1    5050 3700
 	-1   0    0    -1  
 $EndComp
diff --git a/pcb/discrete/discrete-rf-board/transmitter.sch b/pcb/discrete/discrete-rf-board/transmitter.sch
index 6222b77..abf8151 100644
--- a/pcb/discrete/discrete-rf-board/transmitter.sch
+++ b/pcb/discrete/discrete-rf-board/transmitter.sch
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
diff --git a/pcb/discrete/discrete-rf-board/transmitter.sch-bak b/pcb/discrete/discrete-rf-board/transmitter.sch-bak
index 6222b77..abf8151 100644
--- a/pcb/discrete/discrete-rf-board/transmitter.sch-bak
+++ b/pcb/discrete/discrete-rf-board/transmitter.sch-bak
@@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:discrete-rf-board-cache
 EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
diff --git a/pcb/discrete/mixed-rf-board/README.md b/pcb/discrete/mixed-rf-board/README.md
new file mode 100644
index 0000000..6131733
--- /dev/null
+++ b/pcb/discrete/mixed-rf-board/README.md
@@ -0,0 +1,19 @@
+# OSH Park-compatible 2 Layer KiCad Template
+
+This is a KiCad template to simplify making printed circuit boards.  
+
+It comes with all the design rules to meet the 2-layer OSH Park specs and stackup. 
+
+- <a href="http://docs.oshpark.com/services/two-layer/">OSH Park Two Layer Specs</a>
+- <a href="http://docs.oshpark.com/design-tools/kicad">OSH Park KiCad help</a>
+
+### Instructions
+
+1. Open KiCad.
+1. Open Preferences > Configure Paths and note the value of 'KICAD_PTEMPLATES'.
+1. In KiCad, open File > New Project > New Project from Template.
+1. Select the location of your new project. The name of the folder will be the name of your project.
+1. The templates with folders in the 'KICAD_PTEMPLATES' are listed under 'Portable Templates" tab.
+1. Select the template and click 'OK'.
+1. Your project now exists, so you can open EESchema and PCBNew and design as usual.
+
diff --git a/pcb/discrete/mixed-rf-board/mixed-rf-board-cache.lib b/pcb/discrete/mixed-rf-board/mixed-rf-board-cache.lib
new file mode 100644
index 0000000..e933dba
--- /dev/null
+++ b/pcb/discrete/mixed-rf-board/mixed-rf-board-cache.lib
@@ -0,0 +1,4 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+#End Library
diff --git a/pcb/discrete/mixed-rf-board/mixed-rf-board.bak b/pcb/discrete/mixed-rf-board/mixed-rf-board.bak
new file mode 100644
index 0000000..f2476bf
--- /dev/null
+++ b/pcb/discrete/mixed-rf-board/mixed-rf-board.bak
@@ -0,0 +1,17 @@
+EESchema Schematic File Version 2
+LIBS:power
+EELAYER 25 0
+EELAYER END
+$Descr USLetter 11000 8500
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$EndSCHEMATC
diff --git a/pcb/discrete/mixed-rf-board/mixed-rf-board.kicad_pcb b/pcb/discrete/mixed-rf-board/mixed-rf-board.kicad_pcb
new file mode 100644
index 0000000..d1ed45b
--- /dev/null
+++ b/pcb/discrete/mixed-rf-board/mixed-rf-board.kicad_pcb
@@ -0,0 +1,116 @@
+(kicad_pcb (version 20171130) (host pcbnew 5.0.0)
+
+  (general
+    (thickness 1.6)
+    (drawings 1)
+    (tracks 0)
+    (zones 0)
+    (modules 0)
+    (nets 1)
+  )
+
+  (page USLetter)
+  (title_block
+    (title "Project Title")
+  )
+
+  (layers
+    (0 F.Cu signal)
+    (31 B.Cu signal)
+    (34 B.Paste user)
+    (35 F.Paste user)
+    (36 B.SilkS user)
+    (37 F.SilkS user)
+    (38 B.Mask user)
+    (39 F.Mask user)
+    (40 Dwgs.User user)
+    (44 Edge.Cuts user)
+    (46 B.CrtYd user)
+    (47 F.CrtYd user)
+    (48 B.Fab user)
+    (49 F.Fab user)
+  )
+
+  (setup
+    (last_trace_width 0.1524)
+    (user_trace_width 0.1524)
+    (user_trace_width 0.254)
+    (user_trace_width 0.3302)
+    (user_trace_width 0.508)
+    (user_trace_width 0.762)
+    (user_trace_width 1.27)
+    (trace_clearance 0.1524)
+    (zone_clearance 0.508)
+    (zone_45_only no)
+    (trace_min 0.1524)
+    (segment_width 0.1524)
+    (edge_width 0.1524)
+    (via_size 0.6858)
+    (via_drill 0.3302)
+    (via_min_size 0.6858)
+    (via_min_drill 0.3302)
+    (user_via 0.6858 0.3302)
+    (user_via 0.762 0.4064)
+    (user_via 0.8636 0.508)
+    (uvia_size 0.6858)
+    (uvia_drill 0.3302)
+    (uvias_allowed no)
+    (uvia_min_size 0)
+    (uvia_min_drill 0)
+    (pcb_text_width 0.1524)
+    (pcb_text_size 1.016 1.016)
+    (mod_edge_width 0.1524)
+    (mod_text_size 1.016 1.016)
+    (mod_text_width 0.1524)
+    (pad_size 1.524 1.524)
+    (pad_drill 0.762)
+    (pad_to_mask_clearance 0.0508)
+    (solder_mask_min_width 0.1016)
+    (pad_to_paste_clearance -0.0762)
+    (aux_axis_origin 0 0)
+    (visible_elements FFFEDF7D)
+    (pcbplotparams
+      (layerselection 0x310fc_80000001)
+      (usegerberextensions true)
+      (usegerberattributes false)
+      (usegerberadvancedattributes false)
+      (creategerberjobfile false)
+      (excludeedgelayer true)
+      (linewidth 0.100000)
+      (plotframeref false)
+      (viasonmask false)
+      (mode 1)
+      (useauxorigin false)
+      (hpglpennumber 1)
+      (hpglpenspeed 20)
+      (hpglpendiameter 15.000000)
+      (psnegative false)
+      (psa4output false)
+      (plotreference true)
+      (plotvalue true)
+      (plotinvisibletext false)
+      (padsonsilk false)
+      (subtractmaskfromsilk false)
+      (outputformat 1)
+      (mirror false)
+      (drillshape 0)
+      (scaleselection 1)
+      (outputdirectory "gerbers"))
+  )
+
+  (net 0 "")
+
+  (net_class Default "This is the default net class."
+    (clearance 0.1524)
+    (trace_width 0.1524)
+    (via_dia 0.6858)
+    (via_drill 0.3302)
+    (uvia_dia 0.6858)
+    (uvia_drill 0.3302)
+  )
+
+  (gr_text "FABRICATION NOTES\n\n1. THIS IS A 2 LAYER BOARD. \n2. EXTERNAL LAYERS SHALL HAVE 1 OZ COPPER.\n3. MATERIAL: FR4 AND 0.062 INCH +/- 10% THICK.\n4. MANUFACTURE IN ACCORDANCE WITH IPC-6012 CLASS 2\n5. ROHS COMPLIANCE IS NOT REQUIRED.\n6. MASK: BOTH SIDES OF THE BOARD SHALL HAVE \n   SOLDER MASK (ANY COLOR) OVER BARE COPPER. \n7. SILK: BOTH SIDES OF THE BOARD SHALL HAVE \n   WHITE SILKSCREEN. DO NOT PLACE SILK OVER BARE COPPER.\n8. FINISH: HASL/ENIG.\n9. MINIMUM TRACE WIDTH - 0.006 INCH.\n   MINIMUM SPACE - 0.006 INCH.\n   MINIMUM HOLE DIA - 0.013 INCH. \n10. MAX HOLE PLACEMENT TOLERANCE OF +/- 0.003 INCH.\n11. MAX HOLE DIAMETER TOLERANCE OF +/- 0.003 INCH AFTER PLATING." (at 113.4872 93.2688) (layer Dwgs.User)
+    (effects (font (size 2.54 2.54) (thickness 0.254)) (justify left))
+  )
+
+)
diff --git a/pcb/discrete/mixed-rf-board/mixed-rf-board.kicad_pcb-bak b/pcb/discrete/mixed-rf-board/mixed-rf-board.kicad_pcb-bak
new file mode 100644
index 0000000..79b3eab
--- /dev/null
+++ b/pcb/discrete/mixed-rf-board/mixed-rf-board.kicad_pcb-bak
@@ -0,0 +1,116 @@
+(kicad_pcb (version 20171130) (host pcbnew 5.0.0)
+
+  (general
+    (thickness 1.6)
+    (drawings 1)
+    (tracks 0)
+    (zones 0)
+    (modules 0)
+    (nets 1)
+  )
+
+  (page USLetter)
+  (title_block
+    (title "Project Title")
+  )
+
+  (layers
+    (0 F.Cu signal)
+    (31 B.Cu signal)
+    (34 B.Paste user)
+    (35 F.Paste user)
+    (36 B.SilkS user)
+    (37 F.SilkS user)
+    (38 B.Mask user)
+    (39 F.Mask user)
+    (40 Dwgs.User user)
+    (44 Edge.Cuts user)
+    (46 B.CrtYd user)
+    (47 F.CrtYd user)
+    (48 B.Fab user)
+    (49 F.Fab user)
+  )
+
+  (setup
+    (last_trace_width 0.1524)
+    (user_trace_width 0.1524)
+    (user_trace_width 0.254)
+    (user_trace_width 0.3302)
+    (user_trace_width 0.508)
+    (user_trace_width 0.762)
+    (user_trace_width 1.27)
+    (trace_clearance 0.1524)
+    (zone_clearance 0.508)
+    (zone_45_only no)
+    (trace_min 0.1524)
+    (segment_width 0.1524)
+    (edge_width 0.1524)
+    (via_size 0.6858)
+    (via_drill 0.3302)
+    (via_min_size 0.6858)
+    (via_min_drill 0.3302)
+    (user_via 0.6858 0.3302)
+    (user_via 0.762 0.4064)
+    (user_via 0.8636 0.508)
+    (uvia_size 0.6858)
+    (uvia_drill 0.3302)
+    (uvias_allowed no)
+    (uvia_min_size 0)
+    (uvia_min_drill 0)
+    (pcb_text_width 0.1524)
+    (pcb_text_size 1.016 1.016)
+    (mod_edge_width 0.1524)
+    (mod_text_size 1.016 1.016)
+    (mod_text_width 0.1524)
+    (pad_size 1.524 1.524)
+    (pad_drill 0.762)
+    (pad_to_mask_clearance 0.0508)
+    (solder_mask_min_width 0.1016)
+    (pad_to_paste_clearance -0.0762)
+    (aux_axis_origin 0 0)
+    (visible_elements FFFEDF7D)
+    (pcbplotparams
+      (layerselection 0x310fc_80000001)
+      (usegerberextensions true)
+      (usegerberattributes false)
+      (usegerberadvancedattributes false)
+      (creategerberjobfile false)
+      (excludeedgelayer true)
+      (linewidth 0.100000)
+      (plotframeref false)
+      (viasonmask false)
+      (mode 1)
+      (useauxorigin false)
+      (hpglpennumber 1)
+      (hpglpenspeed 20)
+      (hpglpendiameter 15.000000)
+      (psnegative false)
+      (psa4output false)
+      (plotreference true)
+      (plotvalue true)
+      (plotinvisibletext false)
+      (padsonsilk false)
+      (subtractmaskfromsilk false)
+      (outputformat 1)
+      (mirror false)
+      (drillshape 0)
+      (scaleselection 1)
+      (outputdirectory "gerbers"))
+  )
+
+  (net 0 "")
+
+  (net_class Default "This is the default net class."
+    (clearance 0.1524)
+    (trace_width 0.1524)
+    (via_dia 0.6858)
+    (via_drill 0.3302)
+    (uvia_dia 0.6858)
+    (uvia_drill 0.3302)
+  )
+
+  (gr_text "FABRICATION NOTES\n\n1. THIS IS A 2 LAYER BOARD. \n2. EXTERNAL LAYERS SHALL HAVE 1 OZ COPPER.\n3. MATERIAL: FR4 AND 0.062 INCH +/- 10% THICK.\n4. MANUFACTURE IN ACCORDANCE WITH IPC-6012 CLASS 2\n5. MASK: BOTH SIDES OF THE BOARD SHALL HAVE \n   SOLDER MASK (ANY COLOR) OVER BARE COPPER. \n6. SILK: BOTH SIDES OF THE BOARD SHALL HAVE \n   WHITE SILKSCREEN. DO NOT PLACE SILK OVER BARE COPPER.\n7. FINISH: HASL/ENIG.\n8. MINIMUM TRACE WIDTH - 0.006 INCH.\n   MINIMUM SPACE - 0.006 INCH.\n   MINIMUM HOLE DIA - 0.013 INCH. \n10. MAX HOLE PLACEMENT TOLERANCE OF +/- 0.003 INCH.\n11. MAX HOLE DIAMETER TOLERANCE OF +/- 0.003 INCH AFTER PLATING." (at 113.4872 93.2688) (layer Dwgs.User)
+    (effects (font (size 2.54 2.54) (thickness 0.254)) (justify left))
+  )
+
+)
diff --git a/pcb/discrete/mixed-rf-board/mixed-rf-board.pro b/pcb/discrete/mixed-rf-board/mixed-rf-board.pro
new file mode 100644
index 0000000..ff5741b
--- /dev/null
+++ b/pcb/discrete/mixed-rf-board/mixed-rf-board.pro
@@ -0,0 +1,41 @@
+update=Tue 11 Oct 2016 05:25:07 PM PDT
+version=1
+last_client=kicad
+[cvpcb]
+version=1
+NetIExt=net
+[pcbnew]
+version=1
+PageLayoutDescrFile=
+LastNetListRead=
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.016000000000
+PcbTextSizeH=1.016000000000
+PcbTextThickness=0.152400000000
+ModuleTextSizeV=1.016000000000
+ModuleTextSizeH=1.016000000000
+ModuleTextSizeThickness=0.152400000000
+SolderMaskClearance=0.003000000000
+SolderMaskMinWidth=0.004000000000
+DrawSegmentWidth=0.152400000000
+BoardOutlineThickness=0.152400000000
+ModuleOutlineThickness=0.152400000000
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
+[schematic_editor]
+version=1
+PageLayoutDescrFile=
+PlotDirectoryName=
+SubpartIdSeparator=0
+SubpartFirstId=65
+NetFmtName=
+SpiceForceRefPrefix=0
+SpiceUseNetNumbers=0
+LabSize=50
+[general]
+version=1
diff --git a/pcb/discrete/mixed-rf-board/mixed-rf-board.sch b/pcb/discrete/mixed-rf-board/mixed-rf-board.sch
new file mode 100644
index 0000000..5bbaeaf
--- /dev/null
+++ b/pcb/discrete/mixed-rf-board/mixed-rf-board.sch
@@ -0,0 +1,16 @@
+EESchema Schematic File Version 4
+EELAYER 26 0
+EELAYER END
+$Descr USLetter 11000 8500
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$EndSCHEMATC
diff --git a/pcb/discrete/test-mixer/fp-info-cache b/pcb/discrete/test-mixer/fp-info-cache
index 6a5d0c0..eb9c157 100644
--- a/pcb/discrete/test-mixer/fp-info-cache
+++ b/pcb/discrete/test-mixer/fp-info-cache
@@ -1,659 +1,57 @@
-147232368919241
-MountingHole
-MountingHole_2.1mm
-Mounting Hole 2.1mm, no annular
-mounting hole 2.1mm no annular
+12607631572004
+bldc-parts
+Battery_Connector
+
+
+0
+2
+2
+bldc-parts
+Infineon_PG-TDSON-8-33
+
+
+0
+10
+8
+bldc-parts
+Lattice_QFN-48UP
+
+
+0
+49
+49
+bldc-parts
+Maxim_TQFN-28
+
+
+0
+29
+29
+bldc-parts
+Motor_Connector
+
+
+0
+3
+3
+bldc-parts
+TI_RGZ-48
+
+
+0
+49
+49
+bldc-parts
+TT_OARS-XP-4Terminal
+
+
+0
+6
+4
+bldc-parts
+stencil_alignment_pin
+
+
 0
 0
 0
-MountingHole
-MountingHole_2.2mm_M2
-Mounting Hole 2.2mm, no annular, M2
-mounting hole 2.2mm no annular m2
-0
-0
-0
-MountingHole
-MountingHole_2.2mm_M2_DIN965
-Mounting Hole 2.2mm, no annular, M2, DIN965
-mounting hole 2.2mm no annular m2 din965
-0
-0
-0
-MountingHole
-MountingHole_2.2mm_M2_DIN965_Pad
-Mounting Hole 2.2mm, M2, DIN965
-mounting hole 2.2mm m2 din965
-0
-1
-1
-MountingHole
-MountingHole_2.2mm_M2_ISO7380
-Mounting Hole 2.2mm, no annular, M2, ISO7380
-mounting hole 2.2mm no annular m2 iso7380
-0
-0
-0
-MountingHole
-MountingHole_2.2mm_M2_ISO7380_Pad
-Mounting Hole 2.2mm, M2, ISO7380
-mounting hole 2.2mm m2 iso7380
-0
-1
-1
-MountingHole
-MountingHole_2.2mm_M2_ISO14580
-Mounting Hole 2.2mm, no annular, M2, ISO14580
-mounting hole 2.2mm no annular m2 iso14580
-0
-0
-0
-MountingHole
-MountingHole_2.2mm_M2_ISO14580_Pad
-Mounting Hole 2.2mm, M2, ISO14580
-mounting hole 2.2mm m2 iso14580
-0
-1
-1
-MountingHole
-MountingHole_2.2mm_M2_Pad
-Mounting Hole 2.2mm, M2
-mounting hole 2.2mm m2
-0
-1
-1
-MountingHole
-MountingHole_2.2mm_M2_Pad_Via
-Mounting Hole 2.2mm, M2
-mounting hole 2.2mm m2
-0
-9
-1
-MountingHole
-MountingHole_2.5mm
-Mounting Hole 2.5mm, no annular
-mounting hole 2.5mm no annular
-0
-0
-0
-MountingHole
-MountingHole_2.5mm_Pad
-Mounting Hole 2.5mm
-mounting hole 2.5mm
-0
-1
-1
-MountingHole
-MountingHole_2.5mm_Pad_Via
-Mounting Hole 2.5mm
-mounting hole 2.5mm
-0
-9
-1
-MountingHole
-MountingHole_2.7mm
-Mounting Hole 2.7mm, no annular
-mounting hole 2.7mm no annular
-0
-0
-0
-MountingHole
-MountingHole_2.7mm_M2.5
-Mounting Hole 2.7mm, no annular, M2.5
-mounting hole 2.7mm no annular m2.5
-0
-0
-0
-MountingHole
-MountingHole_2.7mm_M2.5_DIN965
-Mounting Hole 2.7mm, no annular, M2.5, DIN965
-mounting hole 2.7mm no annular m2.5 din965
-0
-0
-0
-MountingHole
-MountingHole_2.7mm_M2.5_DIN965_Pad
-Mounting Hole 2.7mm, M2.5, DIN965
-mounting hole 2.7mm m2.5 din965
-0
-1
-1
-MountingHole
-MountingHole_2.7mm_M2.5_ISO7380
-Mounting Hole 2.7mm, no annular, M2.5, ISO7380
-mounting hole 2.7mm no annular m2.5 iso7380
-0
-0
-0
-MountingHole
-MountingHole_2.7mm_M2.5_ISO7380_Pad
-Mounting Hole 2.7mm, M2.5, ISO7380
-mounting hole 2.7mm m2.5 iso7380
-0
-1
-1
-MountingHole
-MountingHole_2.7mm_M2.5_ISO14580
-Mounting Hole 2.7mm, no annular, M2.5, ISO14580
-mounting hole 2.7mm no annular m2.5 iso14580
-0
-0
-0
-MountingHole
-MountingHole_2.7mm_M2.5_ISO14580_Pad
-Mounting Hole 2.7mm, M2.5, ISO14580
-mounting hole 2.7mm m2.5 iso14580
-0
-1
-1
-MountingHole
-MountingHole_2.7mm_M2.5_Pad
-Mounting Hole 2.7mm, M2.5
-mounting hole 2.7mm m2.5
-0
-1
-1
-MountingHole
-MountingHole_2.7mm_M2.5_Pad_Via
-Mounting Hole 2.7mm
-mounting hole 2.7mm
-0
-9
-1
-MountingHole
-MountingHole_2.7mm_Pad
-Mounting Hole 2.7mm
-mounting hole 2.7mm
-0
-1
-1
-MountingHole
-MountingHole_2.7mm_Pad_Via
-Mounting Hole 2.7mm
-mounting hole 2.7mm
-0
-9
-1
-MountingHole
-MountingHole_2mm
-Mounting Hole 2mm, no annular
-mounting hole 2mm no annular
-0
-0
-0
-MountingHole
-MountingHole_3.2mm_M3
-Mounting Hole 3.2mm, no annular, M3
-mounting hole 3.2mm no annular m3
-0
-0
-0
-MountingHole
-MountingHole_3.2mm_M3_DIN965
-Mounting Hole 3.2mm, no annular, M3, DIN965
-mounting hole 3.2mm no annular m3 din965
-0
-0
-0
-MountingHole
-MountingHole_3.2mm_M3_DIN965_Pad
-Mounting Hole 3.2mm, M3, DIN965
-mounting hole 3.2mm m3 din965
-0
-1
-1
-MountingHole
-MountingHole_3.2mm_M3_ISO7380
-Mounting Hole 3.2mm, no annular, M3, ISO7380
-mounting hole 3.2mm no annular m3 iso7380
-0
-0
-0
-MountingHole
-MountingHole_3.2mm_M3_ISO7380_Pad
-Mounting Hole 3.2mm, M3, ISO7380
-mounting hole 3.2mm m3 iso7380
-0
-1
-1
-MountingHole
-MountingHole_3.2mm_M3_ISO14580
-Mounting Hole 3.2mm, no annular, M3, ISO14580
-mounting hole 3.2mm no annular m3 iso14580
-0
-0
-0
-MountingHole
-MountingHole_3.2mm_M3_ISO14580_Pad
-Mounting Hole 3.2mm, M3, ISO14580
-mounting hole 3.2mm m3 iso14580
-0
-1
-1
-MountingHole
-MountingHole_3.2mm_M3_Pad
-Mounting Hole 3.2mm, M3
-mounting hole 3.2mm m3
-0
-1
-1
-MountingHole
-MountingHole_3.2mm_M3_Pad_Via
-Mounting Hole 3.2mm, M3
-mounting hole 3.2mm m3
-0
-9
-1
-MountingHole
-MountingHole_3.5mm
-Mounting Hole 3.5mm, no annular
-mounting hole 3.5mm no annular
-0
-0
-0
-MountingHole
-MountingHole_3.5mm_Pad
-Mounting Hole 3.5mm
-mounting hole 3.5mm
-0
-1
-1
-MountingHole
-MountingHole_3.5mm_Pad_Via
-Mounting Hole 3.5mm
-mounting hole 3.5mm
-0
-9
-1
-MountingHole
-MountingHole_3.7mm
-Mounting Hole 3.7mm, no annular
-mounting hole 3.7mm no annular
-0
-0
-0
-MountingHole
-MountingHole_3.7mm_Pad
-Mounting Hole 3.7mm
-mounting hole 3.7mm
-0
-1
-1
-MountingHole
-MountingHole_3.7mm_Pad_Via
-Mounting Hole 3.7mm
-mounting hole 3.7mm
-0
-9
-1
-MountingHole
-MountingHole_3mm
-Mounting Hole 3mm, no annular
-mounting hole 3mm no annular
-0
-0
-0
-MountingHole
-MountingHole_3mm_Pad
-Mounting Hole 3mm
-mounting hole 3mm
-0
-1
-1
-MountingHole
-MountingHole_3mm_Pad_Via
-Mounting Hole 3mm
-mounting hole 3mm
-0
-9
-1
-MountingHole
-MountingHole_4.3mm_M4
-Mounting Hole 4.3mm, no annular, M4
-mounting hole 4.3mm no annular m4
-0
-0
-0
-MountingHole
-MountingHole_4.3mm_M4_DIN965
-Mounting Hole 4.3mm, no annular, M4, DIN965
-mounting hole 4.3mm no annular m4 din965
-0
-0
-0
-MountingHole
-MountingHole_4.3mm_M4_DIN965_Pad
-Mounting Hole 4.3mm, M4, DIN965
-mounting hole 4.3mm m4 din965
-0
-1
-1
-MountingHole
-MountingHole_4.3mm_M4_ISO7380
-Mounting Hole 4.3mm, no annular, M4, ISO7380
-mounting hole 4.3mm no annular m4 iso7380
-0
-0
-0
-MountingHole
-MountingHole_4.3mm_M4_ISO7380_Pad
-Mounting Hole 4.3mm, M4, ISO7380
-mounting hole 4.3mm m4 iso7380
-0
-1
-1
-MountingHole
-MountingHole_4.3mm_M4_ISO14580
-Mounting Hole 4.3mm, no annular, M4, ISO14580
-mounting hole 4.3mm no annular m4 iso14580
-0
-0
-0
-MountingHole
-MountingHole_4.3mm_M4_ISO14580_Pad
-Mounting Hole 4.3mm, M4, ISO14580
-mounting hole 4.3mm m4 iso14580
-0
-1
-1
-MountingHole
-MountingHole_4.3mm_M4_Pad
-Mounting Hole 4.3mm, M4
-mounting hole 4.3mm m4
-0
-1
-1
-MountingHole
-MountingHole_4.3mm_M4_Pad_Via
-Mounting Hole 4.3mm, M4
-mounting hole 4.3mm m4
-0
-9
-1
-MountingHole
-MountingHole_4.3x6.2mm_M4_Pad
-Mounting Hole 4.3x6.2mm, M4
-mounting hole 4.3x6.2mm m4
-0
-1
-1
-MountingHole
-MountingHole_4.3x6.2mm_M4_Pad_Via
-Mounting Hole 4.3x6.2mm, M4
-mounting hole 4.3x6.2mm m4
-0
-17
-1
-MountingHole
-MountingHole_4.5mm
-Mounting Hole 4.5mm, no annular
-mounting hole 4.5mm no annular
-0
-0
-0
-MountingHole
-MountingHole_4.5mm_Pad
-Mounting Hole 4.5mm
-mounting hole 4.5mm
-0
-1
-1
-MountingHole
-MountingHole_4.5mm_Pad_Via
-Mounting Hole 4.5mm
-mounting hole 4.5mm
-0
-9
-1
-MountingHole
-MountingHole_4mm
-Mounting Hole 4mm, no annular
-mounting hole 4mm no annular
-0
-0
-0
-MountingHole
-MountingHole_4mm_Pad
-Mounting Hole 4mm
-mounting hole 4mm
-0
-1
-1
-MountingHole
-MountingHole_4mm_Pad_Via
-Mounting Hole 4mm
-mounting hole 4mm
-0
-9
-1
-MountingHole
-MountingHole_5.3mm_M5
-Mounting Hole 5.3mm, no annular, M5
-mounting hole 5.3mm no annular m5
-0
-0
-0
-MountingHole
-MountingHole_5.3mm_M5_DIN965
-Mounting Hole 5.3mm, no annular, M5, DIN965
-mounting hole 5.3mm no annular m5 din965
-0
-0
-0
-MountingHole
-MountingHole_5.3mm_M5_DIN965_Pad
-Mounting Hole 5.3mm, M5, DIN965
-mounting hole 5.3mm m5 din965
-0
-1
-1
-MountingHole
-MountingHole_5.3mm_M5_ISO7380
-Mounting Hole 5.3mm, no annular, M5, ISO7380
-mounting hole 5.3mm no annular m5 iso7380
-0
-0
-0
-MountingHole
-MountingHole_5.3mm_M5_ISO7380_Pad
-Mounting Hole 5.3mm, M5, ISO7380
-mounting hole 5.3mm m5 iso7380
-0
-1
-1
-MountingHole
-MountingHole_5.3mm_M5_ISO14580
-Mounting Hole 5.3mm, no annular, M5, ISO14580
-mounting hole 5.3mm no annular m5 iso14580
-0
-0
-0
-MountingHole
-MountingHole_5.3mm_M5_ISO14580_Pad
-Mounting Hole 5.3mm, M5, ISO14580
-mounting hole 5.3mm m5 iso14580
-0
-1
-1
-MountingHole
-MountingHole_5.3mm_M5_Pad
-Mounting Hole 5.3mm, M5
-mounting hole 5.3mm m5
-0
-1
-1
-MountingHole
-MountingHole_5.3mm_M5_Pad_Via
-Mounting Hole 5.3mm, M5
-mounting hole 5.3mm m5
-0
-9
-1
-MountingHole
-MountingHole_5.5mm
-Mounting Hole 5.5mm, no annular
-mounting hole 5.5mm no annular
-0
-0
-0
-MountingHole
-MountingHole_5.5mm_Pad
-Mounting Hole 5.5mm
-mounting hole 5.5mm
-0
-1
-1
-MountingHole
-MountingHole_5.5mm_Pad_Via
-Mounting Hole 5.5mm
-mounting hole 5.5mm
-0
-9
-1
-MountingHole
-MountingHole_5mm
-Mounting Hole 5mm, no annular
-mounting hole 5mm no annular
-0
-0
-0
-MountingHole
-MountingHole_5mm_Pad
-Mounting Hole 5mm
-mounting hole 5mm
-0
-1
-1
-MountingHole
-MountingHole_5mm_Pad_Via
-Mounting Hole 5mm
-mounting hole 5mm
-0
-9
-1
-MountingHole
-MountingHole_6.4mm_M6
-Mounting Hole 6.4mm, no annular, M6
-mounting hole 6.4mm no annular m6
-0
-0
-0
-MountingHole
-MountingHole_6.4mm_M6_DIN965
-Mounting Hole 6.4mm, no annular, M6, DIN965
-mounting hole 6.4mm no annular m6 din965
-0
-0
-0
-MountingHole
-MountingHole_6.4mm_M6_DIN965_Pad
-Mounting Hole 6.4mm, M6, DIN965
-mounting hole 6.4mm m6 din965
-0
-1
-1
-MountingHole
-MountingHole_6.4mm_M6_ISO7380
-Mounting Hole 6.4mm, no annular, M6, ISO7380
-mounting hole 6.4mm no annular m6 iso7380
-0
-0
-0
-MountingHole
-MountingHole_6.4mm_M6_ISO7380_Pad
-Mounting Hole 6.4mm, M6, ISO7380
-mounting hole 6.4mm m6 iso7380
-0
-1
-1
-MountingHole
-MountingHole_6.4mm_M6_ISO14580
-Mounting Hole 6.4mm, no annular, M6, ISO14580
-mounting hole 6.4mm no annular m6 iso14580
-0
-0
-0
-MountingHole
-MountingHole_6.4mm_M6_ISO14580_Pad
-Mounting Hole 6.4mm, M6, ISO14580
-mounting hole 6.4mm m6 iso14580
-0
-1
-1
-MountingHole
-MountingHole_6.4mm_M6_Pad
-Mounting Hole 6.4mm, M6
-mounting hole 6.4mm m6
-0
-1
-1
-MountingHole
-MountingHole_6.4mm_M6_Pad_Via
-Mounting Hole 6.4mm, M6
-mounting hole 6.4mm m6
-0
-9
-1
-MountingHole
-MountingHole_6.5mm
-Mounting Hole 6.5mm, no annular
-mounting hole 6.5mm no annular
-0
-0
-0
-MountingHole
-MountingHole_6.5mm_Pad
-Mounting Hole 6.5mm
-mounting hole 6.5mm
-0
-1
-1
-MountingHole
-MountingHole_6.5mm_Pad_Via
-Mounting Hole 6.5mm
-mounting hole 6.5mm
-0
-9
-1
-MountingHole
-MountingHole_6mm
-Mounting Hole 6mm, no annular
-mounting hole 6mm no annular
-0
-0
-0
-MountingHole
-MountingHole_6mm_Pad
-Mounting Hole 6mm
-mounting hole 6mm
-0
-1
-1
-MountingHole
-MountingHole_6mm_Pad_Via
-Mounting Hole 6mm
-mounting hole 6mm
-0
-9
-1
-MountingHole
-MountingHole_8.4mm_M8
-Mounting Hole 8.4mm, no annular, M8
-mounting hole 8.4mm no annular m8
-0
-0
-0
-MountingHole
-MountingHole_8.4mm_M8_Pad
-Mounting Hole 8.4mm, M8
-mounting hole 8.4mm m8
-0
-1
-1
-MountingHole
-MountingHole_8.4mm_M8_Pad_Via
-Mounting Hole 8.4mm, M8
-mounting hole 8.4mm m8
-0
-9
-1
diff --git a/pcb/discrete/test-mixer/test-mixer-fullbom.csv b/pcb/discrete/test-mixer/test-mixer-fullbom.csv
index ca3c7c3..ce920b6 100644
--- a/pcb/discrete/test-mixer/test-mixer-fullbom.csv
+++ b/pcb/discrete/test-mixer/test-mixer-fullbom.csv
@@ -1,30 +1,30 @@
-Reference,Quantity,Identifier,Package,Value,Tolerance,Voltage,Current,Power,PN,Mouser
-"U1","1","","","ADF4360-7BCPZ","","","","","","584-ADF4360-7BCPZR7"
-"U2","1","","","BAT15-099R","","","","","","726-BAT15099RE6327"
-"T2;T1","2","","","HHM17147A1","","","","","","810-HHM17147A1"
-"J3","1","","","SMA","","","","",""," 530-142-0701-801 "
-"L6;L11;L7;L12;C16;L4;L9;L5;L10;C15;R15;R12;R11;R5","14","","","TBD","","","","","","NoPart"
-"J2;J1","2","","","UFL","","","","","","571-2337019-1"
-"L14;L15;L13","3","","","1 uH","","","","","","815-AIML-0402-1R0KT"
-"C14;C17","2","","","3.9 pF","","","","","","81-GJM1555C1H3R9CB1D"
-"L3;L8","2","","","7.5 nH","","","","","","81-LQG15HN7N5J02D"
-"L1;L2","2","","","47 nH","","","","","","81-LQG15HZ47NJ02D"
-"J5;J6","2","","","Conn_01x01","","","","","","NoPart"
-"C18","1","","","27 pF","","","","","","80-C0603C270K5G"
-"C20","1","","","360 pF","","","","","","963-UMK105CH361JVHF"
-"R14","1","","","12k R","","","","","","652-CR0603FX-1202ELF"
-"R13","1","","","27k R","","","","","","603-RC0603FR-1027KL"
-"C19","1","","","12 pF","","","","","","80-C0805C120J1HACTU"
-"C22","1","","","10 uF","","","","","","81-GRM21BC81C106KE5L"
-"R2;R1","2","","","3.3 R","","","","","","652-CR0603-J/-3R3ELF"
-"C1;C2;C3;C4;C10;C11","6","","","100 pF","","","","","","791-RF18N101J500CT"
-"C5;C6;C12;C13;C21","5","","","10 nF","","","","",""," 80-C0402C103K4R7411 "
-"C8;C9;C7","3","","","0.1 uF","","","","","","80-C0402C104M4P"
-"R18","1","","","4k7 R","","","","","","603-AC0402FR-134K7L"
-"L17;L16","2","","","3.9 nH","","","","","","81-LQG15HS3N9C02D"
-"R17;R16;R4;R6;R8;R9;R10","7","","","470 R","","","","","","603-RC0402JR-13470RL"
-"X1","1","","","ECS-5032MV-100-BN-TR","","","","","","520-5032MV-100-BNT"
-"TP1;TP2;TP5;TP3;TP6;TP4;TP7;TP9;TP8","9","","","-","","","","","","NoPart"
-"R3;R7","2","","","0 R","","","","","","71-CRCW04020000Z0EDC"
-"J4","1","","","Conn_01x08","","","","","","NoPart"
-"H1;H2;H3;H4","4","","","MountingHole_Pad","","","","","","NoPart"
+Reference,Quantity,Identifier,Package,Value,Tolerance,Voltage,Current,Power,PN,Mouser
+"U1","1","","","ADF4360-7BCPZ","","","","","","584-ADF4360-7BCPZR7"
+"U2","1","","","BAT15-099R","","","","","","726-BAT15099RE6327"
+"T2;T1","2","","","HHM17147A1","","","","","","810-HHM17147A1"
+"J3","1","","","SMA","","","","",""," 530-142-0701-801 "
+"L6;L11;L7;L12;C16;L4;L9;L5;L10;C15;R15;R12;R11;R5","14","","","TBD","","","","","","NoPart"
+"J2;J1","2","","","UFL","","","","","","571-2337019-1"
+"L14;L15;L13","3","","","1 uH","","","","","","815-AIML-0402-1R0KT"
+"C14;C17","2","","","3.9 pF","","","","","","81-GJM1555C1H3R9CB1D"
+"L3;L8","2","","","7.5 nH","","","","","","81-LQG15HN7N5J02D"
+"L1;L2","2","","","47 nH","","","","","","81-LQG15HZ47NJ02D"
+"J5;J6","2","","","Conn_01x01","","","","","","NoPart"
+"C18","1","","","27 pF","","","","","","80-C0603C270K5G"
+"C20","1","","","360 pF","","","","","","963-UMK105CH361JVHF"
+"R14","1","","","12k R","","","","","","652-CR0603FX-1202ELF"
+"R13","1","","","27k R","","","","","","603-RC0603FR-1027KL"
+"C19","1","","","12 pF","","","","","","80-C0805C120J1HACTU"
+"C22","1","","","10 uF","","","","","","81-GRM21BC81C106KE5L"
+"R2;R1","2","","","3.3 R","","","","","","652-CR0603-J/-3R3ELF"
+"C1;C2;C3;C4;C10;C11","6","","","100 pF","","","","","","791-RF18N101J500CT"
+"C5;C6;C12;C13;C21","5","","","10 nF","","","","",""," 80-C0402C103K4R7411 "
+"C8;C9;C7","3","","","0.1 uF","","","","","","80-C0402C104M4P"
+"R18","1","","","4k7 R","","","","","","603-AC0402FR-134K7L"
+"L17;L16","2","","","3.9 nH","","","","","","81-LQG15HS3N9C02D"
+"R17;R16;R4;R6;R8;R9;R10","7","","","470 R","","","","","","603-RC0402JR-13470RL"
+"X1","1","","","ECS-5032MV-100-BN-TR","","","","","","520-5032MV-100-BNT"
+"TP1;TP2;TP5;TP3;TP6;TP4;TP7;TP9;TP8","9","","","-","","","","","","NoPart"
+"R3;R7","2","","","0 R","","","","","","71-CRCW04020000Z0EDC"
+"J4","1","","","Conn_01x08","","","","","","NoPart"
+"H1;H2;H3;H4","4","","","MountingHole_Pad","","","","","","NoPart"