diff --git a/hardware/ctrl-mchip.sch b/hardware/ctrl-mchip.sch
index cafe31a..9e8fb3e 100644
--- a/hardware/ctrl-mchip.sch
+++ b/hardware/ctrl-mchip.sch
@@ -17,6 +17,8 @@ $Comp
 L Elabdev:ATSAMR34 U1
 U 1 1 5F543EF6
 P 5150 4550
+AR Path="/5F543EF6" Ref="U1"  Part="1" 
+AR Path="/5F53D5B5/5F543EF6" Ref="U1"  Part="1" 
 F 0 "U1" H 6600 6350 50  0000 C CNN
 F 1 "ATSAMR34" H 5150 4550 50  0000 C CNN
 F 2 "Elabdev:TFBGA-64_8x8_6.0x6.0mm_P0.65mm" H 5150 4600 50  0001 C CIN
@@ -53,10 +55,10 @@ POWAMP
 NoConn ~ 1950 5250
 NoConn ~ 1950 5350
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR021
 U 1 1 5F605E47
 P 1450 4250
-F 0 "#PWR?" H 1450 4100 50  0001 C CNN
+F 0 "#PWR021" H 1450 4100 50  0001 C CNN
 F 1 "+3V3" H 1465 4423 50  0000 C CNN
 F 2 "" H 1450 4250 50  0001 C CNN
 F 3 "" H 1450 4250 50  0001 C CNN
@@ -64,32 +66,32 @@ F 3 "" H 1450 4250 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C?
+L Device:C C32
 U 1 1 5F60A467
 P 2000 3600
-F 0 "C?" H 2115 3646 50  0000 L CNN
+F 0 "C32" H 2115 3646 50  0000 L CNN
 F 1 "10pF" H 2115 3555 50  0000 L CNN
-F 2 "" H 2038 3450 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 2038 3450 50  0001 C CNN
 F 3 "~" H 2000 3600 50  0001 C CNN
 	1    2000 3600
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:Crystal Y?
+L Device:Crystal Y1
 U 1 1 5F606FD8
 P 2850 3600
-F 0 "Y?" V 2804 3731 50  0000 L CNN
+F 0 "Y1" V 2804 3731 50  0000 L CNN
 F 1 "Crystal" V 2895 3731 50  0000 L CNN
-F 2 "" H 2850 3600 50  0001 C CNN
+F 2 "Crystal:Crystal_SMD_MicroCrystal_CM9V-T1A-2Pin_1.6x1.0mm" H 2850 3600 50  0001 C CNN
 F 3 "~" H 2850 3600 50  0001 C CNN
 	1    2850 3600
 	0    1    1    0   
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR020
 U 1 1 5F60C4EA
 P 2000 3750
-F 0 "#PWR?" H 2000 3500 50  0001 C CNN
+F 0 "#PWR020" H 2000 3500 50  0001 C CNN
 F 1 "GND" H 2005 3577 50  0000 C CNN
 F 2 "" H 2000 3750 50  0001 C CNN
 F 3 "" H 2000 3750 50  0001 C CNN
@@ -97,10 +99,10 @@ F 3 "" H 2000 3750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Elabdev:TYETBCSANF XC?
+L Elabdev:TYETBCSANF XC1
 U 1 1 5F60E7DB
 P 8650 5650
-F 0 "XC?" H 8306 5696 50  0000 R CNN
+F 0 "XC1" H 8306 5696 50  0000 R CNN
 F 1 "TYETBCSANF" H 8306 5605 50  0000 R CNN
 F 2 "Elabdev:Oscillator_SMD_Taitien_TY-4Pin_2.5x2.0mm" H 9100 5300 50  0001 C CNN
 F 3 "http://www.taitien.com/wp-content/uploads/2015/12/XO-0081_TY.pdf" H 8550 5650 50  0001 C CNN
@@ -110,10 +112,10 @@ $EndComp
 Wire Wire Line
 	6750 5650 8350 5650
 $Comp
-L power:GND #PWR?
+L power:GND #PWR025
 U 1 1 5F6106A9
 P 8650 5950
-F 0 "#PWR?" H 8650 5700 50  0001 C CNN
+F 0 "#PWR025" H 8650 5700 50  0001 C CNN
 F 1 "GND" H 8655 5777 50  0000 C CNN
 F 2 "" H 8650 5950 50  0001 C CNN
 F 3 "" H 8650 5950 50  0001 C CNN
@@ -125,21 +127,21 @@ Wire Wire Line
 Wire Wire Line
 	8650 4050 8650 4750
 $Comp
-L Device:C C?
+L Device:C C34
 U 1 1 5F611282
 P 9050 4900
-F 0 "C?" H 9165 4946 50  0000 L CNN
-F 1 "C" H 9165 4855 50  0000 L CNN
-F 2 "" H 9088 4750 50  0001 C CNN
+F 0 "C34" H 9165 4946 50  0000 L CNN
+F 1 "0,1uF" H 9165 4855 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 9088 4750 50  0001 C CNN
 F 3 "~" H 9050 4900 50  0001 C CNN
 	1    9050 4900
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR023
 U 1 1 5F611982
 P 9050 5050
-F 0 "#PWR?" H 9050 4800 50  0001 C CNN
+F 0 "#PWR023" H 9050 4800 50  0001 C CNN
 F 1 "GND" H 9055 4877 50  0000 C CNN
 F 2 "" H 9050 5050 50  0001 C CNN
 F 3 "" H 9050 5050 50  0001 C CNN
@@ -152,12 +154,12 @@ Connection ~ 8650 4750
 Wire Wire Line
 	8650 4750 8650 5350
 $Comp
-L Device:Ferrite_Bead FB?
+L Device:Ferrite_Bead FB1
 U 1 1 5F613B5F
 P 5050 1100
-F 0 "FB?" H 5187 1146 50  0000 L CNN
+F 0 "FB1" H 5187 1146 50  0000 L CNN
 F 1 "BLM15AG121SN1D" H 5187 1055 50  0000 L CNN
-F 2 "" V 4980 1100 50  0001 C CNN
+F 2 "Inductor_SMD:L_0402_1005Metric" V 4980 1100 50  0001 C CNN
 F 3 "~" H 5050 1100 50  0001 C CNN
 	1    5050 1100
 	1    0    0    -1  
@@ -165,10 +167,10 @@ $EndComp
 Wire Wire Line
 	5050 2750 5050 1550
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR08
 U 1 1 5F6153D1
 P 5050 950
-F 0 "#PWR?" H 5050 800 50  0001 C CNN
+F 0 "#PWR08" H 5050 800 50  0001 C CNN
 F 1 "+3V3" H 5065 1123 50  0000 C CNN
 F 2 "" H 5050 950 50  0001 C CNN
 F 3 "" H 5050 950 50  0001 C CNN
@@ -176,21 +178,21 @@ F 3 "" H 5050 950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C?
+L Device:C C19
 U 1 1 5F6159D4
 P 3550 1600
-F 0 "C?" H 3665 1646 50  0000 L CNN
+F 0 "C19" H 3665 1646 50  0000 L CNN
 F 1 "10uF" H 3665 1555 50  0000 L CNN
-F 2 "" H 3588 1450 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 3588 1450 50  0001 C CNN
 F 3 "~" H 3550 1600 50  0001 C CNN
 	1    3550 1600
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR019
 U 1 1 5F61754C
 P 3050 2850
-F 0 "#PWR?" H 3050 2600 50  0001 C CNN
+F 0 "#PWR019" H 3050 2600 50  0001 C CNN
 F 1 "GND" H 3055 2677 50  0000 C CNN
 F 2 "" H 3050 2850 50  0001 C CNN
 F 3 "" H 3050 2850 50  0001 C CNN
@@ -204,12 +206,12 @@ UART_TX
 Text Label 3450 4450 2    50   ~ 0
 UART_RX
 $Comp
-L Device:R R?
+L Device:R R2
 U 1 1 5F621492
 P 2050 4600
-F 0 "R?" H 2120 4646 50  0000 L CNN
+F 0 "R2" H 2120 4646 50  0000 L CNN
 F 1 "100K" H 2120 4555 50  0000 L CNN
-F 2 "" V 1980 4600 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric" V 1980 4600 50  0001 C CNN
 F 3 "~" H 2050 4600 50  0001 C CNN
 	1    2050 4600
 	1    0    0    -1  
@@ -224,10 +226,10 @@ Connection ~ 1450 4350
 Wire Wire Line
 	1450 4350 1450 4250
 $Comp
-L power:GND #PWR?
+L power:GND #PWR027
 U 1 1 5F6260B4
 P 5200 6750
-F 0 "#PWR?" H 5200 6500 50  0001 C CNN
+F 0 "#PWR027" H 5200 6500 50  0001 C CNN
 F 1 "GND" H 5205 6577 50  0000 C CNN
 F 2 "" H 5200 6750 50  0001 C CNN
 F 3 "" H 5200 6750 50  0001 C CNN
@@ -308,23 +310,23 @@ Connection ~ 6000 6550
 Wire Wire Line
 	6000 6550 6200 6550
 $Comp
-L Device:L_Small L?
+L Device:L_Small L10
 U 1 1 5F643B51
 P 4450 2250
-F 0 "L?" V 4650 2150 50  0000 C CNN
+F 0 "L10" V 4650 2150 50  0000 C CNN
 F 1 "LQH3NPN100MJRL" V 4550 2450 50  0000 C CNN
-F 2 "" H 4450 2250 50  0001 C CNN
+F 2 "Inductor_SMD:L_Vishay_IHLP-1212" H 4450 2250 50  0001 C CNN
 F 3 "~" H 4450 2250 50  0001 C CNN
 	1    4450 2250
 	0    -1   -1   0   
 $EndComp
 $Comp
-L Device:C_Small C?
+L Device:C_Small C31
 U 1 1 5F644AA5
 P 3750 2550
-F 0 "C?" H 3842 2596 50  0000 L CNN
+F 0 "C31" H 3842 2596 50  0000 L CNN
 F 1 "0,1uF" H 3842 2505 50  0000 L CNN
-F 2 "" H 3750 2550 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 3750 2550 50  0001 C CNN
 F 3 "~" H 3750 2550 50  0001 C CNN
 	1    3750 2550
 	1    0    0    -1  
@@ -354,10 +356,10 @@ Connection ~ 3050 2650
 Wire Wire Line
 	3050 2650 3050 2850
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR09
 U 1 1 5F67A607
 P 4650 1650
-F 0 "#PWR?" H 4650 1500 50  0001 C CNN
+F 0 "#PWR09" H 4650 1500 50  0001 C CNN
 F 1 "+3V3" H 4665 1823 50  0000 C CNN
 F 2 "" H 4650 1650 50  0001 C CNN
 F 3 "" H 4650 1650 50  0001 C CNN
@@ -390,23 +392,23 @@ Wire Wire Line
 Wire Wire Line
 	5450 1550 5050 1550
 $Comp
-L Device:C_Small C?
+L Device:C_Small C24
 U 1 1 5F6C3BDA
 P 3850 1850
-F 0 "C?" H 3942 1896 50  0000 L CNN
+F 0 "C24" H 3942 1896 50  0000 L CNN
 F 1 "0,1uF" H 3942 1805 50  0000 L CNN
-F 2 "" H 3850 1850 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 3850 1850 50  0001 C CNN
 F 3 "~" H 3850 1850 50  0001 C CNN
 	1    3850 1850
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C?
+L Device:C_Small C25
 U 1 1 5F6C40B2
 P 4250 1850
-F 0 "C?" H 4342 1896 50  0000 L CNN
+F 0 "C25" H 4342 1896 50  0000 L CNN
 F 1 "0,1uF" H 4342 1805 50  0000 L CNN
-F 2 "" H 4250 1850 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 4250 1850 50  0001 C CNN
 F 3 "~" H 4250 1850 50  0001 C CNN
 	1    4250 1850
 	1    0    0    -1  
@@ -427,10 +429,10 @@ Wire Wire Line
 Wire Wire Line
 	5250 2750 5250 2150
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR014
 U 1 1 5F6EC2F2
 P 5250 1950
-F 0 "#PWR?" H 5250 1800 50  0001 C CNN
+F 0 "#PWR014" H 5250 1800 50  0001 C CNN
 F 1 "+3V3" H 5265 2123 50  0000 C CNN
 F 2 "" H 5250 1950 50  0001 C CNN
 F 3 "" H 5250 1950 50  0001 C CNN
@@ -438,21 +440,21 @@ F 3 "" H 5250 1950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C_Small C?
+L Device:C_Small C27
 U 1 1 5F6EF828
 P 5350 2350
-F 0 "C?" H 5442 2396 50  0000 L CNN
+F 0 "C27" H 5442 2396 50  0000 L CNN
 F 1 "0,1uF" H 5442 2305 50  0000 L CNN
-F 2 "" H 5350 2350 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 5350 2350 50  0001 C CNN
 F 3 "~" H 5350 2350 50  0001 C CNN
 	1    5350 2350
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR016
 U 1 1 5F6EFDA6
 P 5350 2450
-F 0 "#PWR?" H 5350 2200 50  0001 C CNN
+F 0 "#PWR016" H 5350 2200 50  0001 C CNN
 F 1 "GND" H 5355 2277 50  0000 C CNN
 F 2 "" H 5350 2450 50  0001 C CNN
 F 3 "" H 5350 2450 50  0001 C CNN
@@ -467,12 +469,12 @@ Connection ~ 5250 2150
 Wire Wire Line
 	5250 2150 5250 1950
 $Comp
-L Device:C_Small C?
+L Device:C_Small C30
 U 1 1 5F6F34AF
 P 7450 2450
-F 0 "C?" H 7542 2496 50  0000 L CNN
+F 0 "C30" H 7542 2496 50  0000 L CNN
 F 1 "0,1uF" H 7542 2405 50  0000 L CNN
-F 2 "" H 7450 2450 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 7450 2450 50  0001 C CNN
 F 3 "~" H 7450 2450 50  0001 C CNN
 	1    7450 2450
 	1    0    0    -1  
@@ -482,12 +484,12 @@ Wire Wire Line
 Wire Wire Line
 	7450 2250 7450 2350
 $Comp
-L Device:C_Small C?
+L Device:C_Small C29
 U 1 1 5F700C24
 P 7050 2450
-F 0 "C?" H 7142 2496 50  0000 L CNN
+F 0 "C29" H 7142 2496 50  0000 L CNN
 F 1 "33pF" H 7142 2405 50  0000 L CNN
-F 2 "" H 7050 2450 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 7050 2450 50  0001 C CNN
 F 3 "~" H 7050 2450 50  0001 C CNN
 	1    7050 2450
 	1    0    0    -1  
@@ -500,21 +502,21 @@ Wire Wire Line
 	7050 2650 7450 2650
 Connection ~ 7450 2650
 $Comp
-L Device:C_Small C?
+L Device:C_Small C28
 U 1 1 5F715342
 P 6150 2450
-F 0 "C?" H 6242 2496 50  0000 L CNN
+F 0 "C28" H 6242 2496 50  0000 L CNN
 F 1 "0,1uF" H 6242 2405 50  0000 L CNN
-F 2 "" H 6150 2450 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 6150 2450 50  0001 C CNN
 F 3 "~" H 6150 2450 50  0001 C CNN
 	1    6150 2450
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR017
 U 1 1 5F71534C
 P 6150 2550
-F 0 "#PWR?" H 6150 2300 50  0001 C CNN
+F 0 "#PWR017" H 6150 2300 50  0001 C CNN
 F 1 "GND" H 6155 2377 50  0000 C CNN
 F 2 "" H 6150 2550 50  0001 C CNN
 F 3 "" H 6150 2550 50  0001 C CNN
@@ -528,10 +530,10 @@ Wire Wire Line
 Wire Wire Line
 	7450 2650 7450 2750
 $Comp
-L power:GND #PWR?
+L power:GND #PWR018
 U 1 1 5F6F34B9
 P 7450 2750
-F 0 "#PWR?" H 7450 2500 50  0001 C CNN
+F 0 "#PWR018" H 7450 2500 50  0001 C CNN
 F 1 "GND" H 7455 2577 50  0000 C CNN
 F 2 "" H 7450 2750 50  0001 C CNN
 F 3 "" H 7450 2750 50  0001 C CNN
@@ -539,12 +541,12 @@ F 3 "" H 7450 2750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:C C?
+L Device:C C33
 U 1 1 5F609CF5
 P 2400 3600
-F 0 "C?" H 2515 3646 50  0000 L CNN
+F 0 "C33" H 2515 3646 50  0000 L CNN
 F 1 "10pF" H 2515 3555 50  0000 L CNN
-F 2 "" H 2438 3450 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 2438 3450 50  0001 C CNN
 F 3 "~" H 2400 3600 50  0001 C CNN
 	1    2400 3600
 	1    0    0    -1  
@@ -571,21 +573,21 @@ Connection ~ 2850 3450
 Wire Wire Line
 	2850 3450 2400 3450
 $Comp
-L Connector:Conn_ARM_JTAG_SWD_10 J?
+L Connector:Conn_ARM_JTAG_SWD_10 J1
 U 1 1 5F602977
 P 1450 5150
-F 0 "J?" H 1150 5750 50  0000 R CNN
+F 0 "J1" H 1150 5750 50  0000 R CNN
 F 1 "Conn_ARM_JTAG_SWD_10" V 950 5600 50  0000 R CNN
-F 2 "" H 1450 5150 50  0001 C CNN
+F 2 "Connector:Tag-Connect_TC2050-IDC-NL_2x05_P1.27mm_Vertical" H 1450 5150 50  0001 C CNN
 F 3 "http://infocenter.arm.com/help/topic/com.arm.doc.ddi0314h/DDI0314H_coresight_components_trm.pdf" V 1100 3900 50  0001 C CNN
 	1    1450 5150
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR024
 U 1 1 5F6061AD
 P 1400 5850
-F 0 "#PWR?" H 1400 5600 50  0001 C CNN
+F 0 "#PWR024" H 1400 5600 50  0001 C CNN
 F 1 "GND" H 1405 5677 50  0000 C CNN
 F 2 "" H 1400 5850 50  0001 C CNN
 F 3 "" H 1400 5850 50  0001 C CNN
@@ -606,7 +608,7 @@ Connection ~ 1400 5800
 Wire Wire Line
 	3450 5050 3550 5050
 Wire Wire Line
-	2850 4050 3550 4050
+	2750 4050 2850 4050
 Wire Wire Line
 	3550 4550 3050 4550
 Wire Wire Line
@@ -617,21 +619,21 @@ Wire Wire Line
 	3050 4550 3050 5050
 Connection ~ 5450 1550
 $Comp
-L Device:C_Small C?
+L Device:C_Small C23
 U 1 1 5F7E81D0
 P 7050 1650
-F 0 "C?" H 7142 1696 50  0000 L CNN
+F 0 "C23" H 7142 1696 50  0000 L CNN
 F 1 "4,7pF" H 7142 1605 50  0000 L CNN
-F 2 "" H 7050 1650 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 7050 1650 50  0001 C CNN
 F 3 "~" H 7050 1650 50  0001 C CNN
 	1    7050 1650
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR013
 U 1 1 5F7E81DA
 P 7050 1750
-F 0 "#PWR?" H 7050 1500 50  0001 C CNN
+F 0 "#PWR013" H 7050 1500 50  0001 C CNN
 F 1 "GND" H 7055 1577 50  0000 C CNN
 F 2 "" H 7050 1750 50  0001 C CNN
 F 3 "" H 7050 1750 50  0001 C CNN
@@ -642,21 +644,21 @@ Connection ~ 6650 1550
 Wire Wire Line
 	6650 1550 7050 1550
 $Comp
-L Device:C_Small C?
+L Device:C_Small C22
 U 1 1 5F7EC846
 P 6650 1650
-F 0 "C?" H 6742 1696 50  0000 L CNN
+F 0 "C22" H 6742 1696 50  0000 L CNN
 F 1 "0,1uF" H 6742 1605 50  0000 L CNN
-F 2 "" H 6650 1650 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 6650 1650 50  0001 C CNN
 F 3 "~" H 6650 1650 50  0001 C CNN
 	1    6650 1650
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR012
 U 1 1 5F7EC850
 P 6650 1750
-F 0 "#PWR?" H 6650 1500 50  0001 C CNN
+F 0 "#PWR012" H 6650 1500 50  0001 C CNN
 F 1 "GND" H 6655 1577 50  0000 C CNN
 F 2 "" H 6650 1750 50  0001 C CNN
 F 3 "" H 6650 1750 50  0001 C CNN
@@ -674,21 +676,21 @@ Connection ~ 7050 2250
 Wire Wire Line
 	7050 2250 7450 2250
 $Comp
-L Device:C_Small C?
+L Device:C_Small C21
 U 1 1 5F80DBCB
 P 6250 1650
-F 0 "C?" H 6342 1696 50  0000 L CNN
+F 0 "C21" H 6342 1696 50  0000 L CNN
 F 1 "0,1uF" H 6342 1605 50  0000 L CNN
-F 2 "" H 6250 1650 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 6250 1650 50  0001 C CNN
 F 3 "~" H 6250 1650 50  0001 C CNN
 	1    6250 1650
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR011
 U 1 1 5F80DBD5
 P 6250 1750
-F 0 "#PWR?" H 6250 1500 50  0001 C CNN
+F 0 "#PWR011" H 6250 1500 50  0001 C CNN
 F 1 "GND" H 6255 1577 50  0000 C CNN
 F 2 "" H 6250 1750 50  0001 C CNN
 F 3 "" H 6250 1750 50  0001 C CNN
@@ -698,21 +700,21 @@ $EndComp
 Wire Wire Line
 	5450 1550 5850 1550
 $Comp
-L Device:C_Small C?
+L Device:C_Small C20
 U 1 1 5F81B8EA
 P 5850 1650
-F 0 "C?" H 5942 1696 50  0000 L CNN
+F 0 "C20" H 5942 1696 50  0000 L CNN
 F 1 "0,1uF" H 5942 1605 50  0000 L CNN
-F 2 "" H 5850 1650 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 5850 1650 50  0001 C CNN
 F 3 "~" H 5850 1650 50  0001 C CNN
 	1    5850 1650
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR010
 U 1 1 5F81B8F4
 P 5850 1750
-F 0 "#PWR?" H 5850 1500 50  0001 C CNN
+F 0 "#PWR010" H 5850 1500 50  0001 C CNN
 F 1 "GND" H 5855 1577 50  0000 C CNN
 F 2 "" H 5850 1750 50  0001 C CNN
 F 3 "" H 5850 1750 50  0001 C CNN
@@ -727,21 +729,21 @@ Wire Wire Line
 Wire Wire Line
 	5550 2050 7850 2050
 $Comp
-L Device:C_Small C?
+L Device:C_Small C26
 U 1 1 5F824E62
 P 7850 2150
-F 0 "C?" H 7942 2196 50  0000 L CNN
+F 0 "C26" H 7942 2196 50  0000 L CNN
 F 1 "0,1uF" H 7942 2105 50  0000 L CNN
-F 2 "" H 7850 2150 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 7850 2150 50  0001 C CNN
 F 3 "~" H 7850 2150 50  0001 C CNN
 	1    7850 2150
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR015
 U 1 1 5F824E6C
 P 7850 2250
-F 0 "#PWR?" H 7850 2000 50  0001 C CNN
+F 0 "#PWR015" H 7850 2000 50  0001 C CNN
 F 1 "GND" H 7855 2077 50  0000 C CNN
 F 2 "" H 7850 2250 50  0001 C CNN
 F 3 "" H 7850 2250 50  0001 C CNN
@@ -761,21 +763,21 @@ NoConn ~ 3550 4850
 NoConn ~ 3550 5250
 NoConn ~ 3550 5350
 $Comp
-L Connector:Conn_01x06_Male J?
+L Connector:Conn_01x06_Male J2
 U 1 1 5F85F9BA
 P 2350 6850
-F 0 "J?" H 2458 7231 50  0000 C CNN
+F 0 "J2" H 2458 7231 50  0000 C CNN
 F 1 "Conn_01x06_Male" H 2458 7140 50  0000 C CNN
-F 2 "" H 2350 6850 50  0001 C CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Horizontal" H 2350 6850 50  0001 C CNN
 F 3 "~" H 2350 6850 50  0001 C CNN
 	1    2350 6850
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR026
 U 1 1 5F86158E
 P 3250 6650
-F 0 "#PWR?" H 3250 6400 50  0001 C CNN
+F 0 "#PWR026" H 3250 6400 50  0001 C CNN
 F 1 "GND" H 3255 6477 50  0000 C CNN
 F 2 "" H 3250 6650 50  0001 C CNN
 F 3 "" H 3250 6650 50  0001 C CNN
@@ -797,12 +799,12 @@ UART_RX
 Text Label 2650 7050 0    50   ~ 0
 UART_TX
 $Comp
-L Connector:TestPoint TP?
+L Connector:TestPoint TP1
 U 1 1 5F88A4F2
 P 2650 6850
-F 0 "TP?" H 2708 6968 50  0000 L CNN
+F 0 "TP1" H 2708 6968 50  0000 L CNN
 F 1 "TestPoint" H 2708 6877 50  0000 L CNN
-F 2 "" H 2850 6850 50  0001 C CNN
+F 2 "TestPoint:TestPoint_THTPad_D2.5mm_Drill1.2mm" H 2850 6850 50  0001 C CNN
 F 3 "~" H 2850 6850 50  0001 C CNN
 	1    2650 6850
 	1    0    0    -1  
@@ -824,21 +826,21 @@ NoConn ~ 6750 5150
 NoConn ~ 6750 5250
 NoConn ~ 6750 5750
 $Comp
-L Switch:SW_SPDT SW?
+L Switch:SW_SPST SW1
 U 1 1 5F8E32A8
-P 2850 4250
-F 0 "SW?" V 2804 4398 50  0000 L CNN
-F 1 "SW_SPDT" V 2895 4398 50  0000 L CNN
-F 2 "" H 2850 4250 50  0001 C CNN
-F 3 "~" H 2850 4250 50  0001 C CNN
-	1    2850 4250
+P 2750 4250
+F 0 "SW1" V 2704 4398 50  0000 L CNN
+F 1 "SW_SPST" V 2795 4398 50  0000 L CNN
+F 2 "Button_Switch_SMD:SW_SPST_PTS810" H 2750 4250 50  0001 C CNN
+F 3 "~" H 2750 4250 50  0001 C CNN
+	1    2750 4250
 	0    1    1    0   
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR022
 U 1 1 5F8E35F0
 P 2450 4550
-F 0 "#PWR?" H 2450 4300 50  0001 C CNN
+F 0 "#PWR022" H 2450 4300 50  0001 C CNN
 F 1 "GND" H 2455 4377 50  0000 C CNN
 F 2 "" H 2450 4550 50  0001 C CNN
 F 3 "" H 2450 4550 50  0001 C CNN
@@ -846,27 +848,44 @@ F 3 "" H 2450 4550 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R R?
+L Device:R R1
 U 1 1 5F8FAD6F
 P 2600 4450
-F 0 "R?" V 2393 4450 50  0000 C CNN
+F 0 "R1" V 2393 4450 50  0000 C CNN
 F 1 "330" V 2484 4450 50  0000 C CNN
-F 2 "" V 2530 4450 50  0001 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric" V 2530 4450 50  0001 C CNN
 F 3 "~" H 2600 4450 50  0001 C CNN
 	1    2600 4450
 	0    1    1    0   
 $EndComp
-Wire Wire Line
-	2850 4650 2950 4450
 Wire Wire Line
 	1950 4850 2050 4850
 Wire Wire Line
 	2050 4850 2050 4750
 Wire Wire Line
 	2050 4850 2850 4850
-Wire Wire Line
-	2850 4850 2850 4650
 Connection ~ 2050 4850
 Wire Wire Line
 	2450 4450 2450 4550
+$Comp
+L power:+3V3 #PWR0103
+U 1 1 5F94E0FE
+P 7850 1950
+F 0 "#PWR0103" H 7850 1800 50  0001 C CNN
+F 1 "+3V3" H 7865 2123 50  0000 C CNN
+F 2 "" H 7850 1950 50  0001 C CNN
+F 3 "" H 7850 1950 50  0001 C CNN
+	1    7850 1950
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	7850 2050 7850 1950
+Connection ~ 7850 2050
+Text HLabel 8650 4050 2    50   Output ~ 0
+RFSWPWR
+Wire Wire Line
+	2850 4050 2850 4850
+Connection ~ 2850 4050
+Wire Wire Line
+	2850 4050 3550 4050
 $EndSCHEMATC
diff --git a/hardware/dscomm.sch b/hardware/dscomm.sch
index 5a8bfdd..9daada3 100644
--- a/hardware/dscomm.sch
+++ b/hardware/dscomm.sch
@@ -19,7 +19,7 @@ U 1 1 5F4C4F46
 P 750 6900
 F 0 "FID1" H 835 6946 50  0000 L CNN
 F 1 "Fiducial" H 835 6855 50  0000 L CNN
-F 2 "" H 750 6900 50  0001 C CNN
+F 2 "Fiducial:Fiducial_0.5mm_Mask1.5mm" H 750 6900 50  0001 C CNN
 F 3 "~" H 750 6900 50  0001 C CNN
 	1    750  6900
 	1    0    0    -1  
@@ -30,7 +30,7 @@ U 1 1 5F4C52FB
 P 750 7100
 F 0 "FID2" H 835 7146 50  0000 L CNN
 F 1 "Fiducial" H 835 7055 50  0000 L CNN
-F 2 "" H 750 7100 50  0001 C CNN
+F 2 "Fiducial:Fiducial_0.5mm_Mask1.5mm" H 750 7100 50  0001 C CNN
 F 3 "~" H 750 7100 50  0001 C CNN
 	1    750  7100
 	1    0    0    -1  
@@ -41,7 +41,7 @@ U 1 1 5F4C592E
 P 1550 6700
 F 0 "H1" H 1650 6746 50  0000 L CNN
 F 1 "MountingHole" H 1650 6655 50  0000 L CNN
-F 2 "" H 1550 6700 50  0001 C CNN
+F 2 "Elabdev:Standoff_Keyelco_M3_2488X" H 1550 6700 50  0001 C CNN
 F 3 "~" H 1550 6700 50  0001 C CNN
 	1    1550 6700
 	1    0    0    -1  
@@ -52,7 +52,7 @@ U 1 1 5F4C5CD0
 P 1550 6900
 F 0 "H2" H 1650 6946 50  0000 L CNN
 F 1 "MountingHole" H 1650 6855 50  0000 L CNN
-F 2 "" H 1550 6900 50  0001 C CNN
+F 2 "Elabdev:Standoff_Keyelco_M3_2488X" H 1550 6900 50  0001 C CNN
 F 3 "~" H 1550 6900 50  0001 C CNN
 	1    1550 6900
 	1    0    0    -1  
@@ -63,7 +63,7 @@ U 1 1 5F4C5F8D
 P 1550 7100
 F 0 "H3" H 1650 7146 50  0000 L CNN
 F 1 "MountingHole" H 1650 7055 50  0000 L CNN
-F 2 "" H 1550 7100 50  0001 C CNN
+F 2 "Elabdev:Standoff_Keyelco_M3_2488X" H 1550 7100 50  0001 C CNN
 F 3 "~" H 1550 7100 50  0001 C CNN
 	1    1550 7100
 	1    0    0    -1  
@@ -74,7 +74,7 @@ U 1 1 5F4C6223
 P 1550 7300
 F 0 "H4" H 1650 7346 50  0000 L CNN
 F 1 "MountingHole" H 1650 7255 50  0000 L CNN
-F 2 "" H 1550 7300 50  0001 C CNN
+F 2 "Elabdev:Standoff_Keyelco_M3_2488X" H 1550 7300 50  0001 C CNN
 F 3 "~" H 1550 7300 50  0001 C CNN
 	1    1550 7300
 	1    0    0    -1  
@@ -85,7 +85,7 @@ U 1 1 5F4EEDB8
 P 750 7300
 F 0 "FID3" H 835 7346 50  0000 L CNN
 F 1 "Fiducial" H 835 7255 50  0000 L CNN
-F 2 "" H 750 7300 50  0001 C CNN
+F 2 "Fiducial:Fiducial_0.5mm_Mask1.5mm" H 750 7300 50  0001 C CNN
 F 3 "~" H 750 7300 50  0001 C CNN
 	1    750  7300
 	1    0    0    -1  
@@ -96,7 +96,7 @@ U 1 1 5F4EF4FC
 P 750 7500
 F 0 "FID4" H 835 7546 50  0000 L CNN
 F 1 "Fiducial" H 835 7455 50  0000 L CNN
-F 2 "" H 750 7500 50  0001 C CNN
+F 2 "Fiducial:Fiducial_0.5mm_Mask1.5mm" H 750 7500 50  0001 C CNN
 F 3 "~" H 750 7500 50  0001 C CNN
 	1    750  7500
 	1    0    0    -1  
@@ -112,6 +112,7 @@ F4 "HFIN" U R 2500 1550 50
 F5 "HFOUT" U R 2500 1650 50 
 F6 "HPOUT" O R 2500 1750 50 
 F7 "POWAMP" O R 2500 1850 50 
+F8 "RFSWPWR" O R 2500 1950 50 
 $EndSheet
 $Sheet
 S 1300 2450 1200 800 
@@ -182,6 +183,7 @@ F4 "HPOUT" I L 3300 1750 50
 F5 "HFIN" I L 3300 1550 50 
 F6 "POWAMP" I L 3300 1850 50 
 F7 "HFOUT" I L 3300 1650 50 
+F8 "RFSWPWR" I L 3300 1950 50 
 $EndSheet
 Wire Wire Line
 	2500 1350 3300 1350
@@ -195,4 +197,30 @@ Wire Wire Line
 	2500 1750 3300 1750
 Wire Wire Line
 	2500 1850 3300 1850
+Wire Wire Line
+	2500 1950 3300 1950
+$Comp
+L power:+3V3 #PWR0104
+U 1 1 5F95DD9E
+P 2950 7400
+F 0 "#PWR0104" H 2950 7250 50  0001 C CNN
+F 1 "+3V3" H 2965 7573 50  0000 C CNN
+F 2 "" H 2950 7400 50  0001 C CNN
+F 3 "" H 2950 7400 50  0001 C CNN
+	1    2950 7400
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:PWR_FLAG #FLG0102
+U 1 1 5F95E428
+P 3350 7400
+F 0 "#FLG0102" H 3350 7475 50  0001 C CNN
+F 1 "PWR_FLAG" H 3350 7573 50  0000 C CNN
+F 2 "" H 3350 7400 50  0001 C CNN
+F 3 "~" H 3350 7400 50  0001 C CNN
+	1    3350 7400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2950 7400 3350 7400
 $EndSCHEMATC
diff --git a/hardware/libraries/elabdev.lib b/hardware/libraries/elabdev.lib
index 34d07f4..ef1b00f 100644
--- a/hardware/libraries/elabdev.lib
+++ b/hardware/libraries/elabdev.lib
@@ -72,7 +72,7 @@ X PA15 G8 1600 100 100 L 50 50 0 0 B
 X RFI_LF H1 1600 -600 100 L 50 50 0 0 I
 X VR_ANA H2 700 1800 100 D 50 50 0 0 w
 X VBAT_ANA H3 300 1800 100 D 50 50 0 0 W
-X VR_DIG H4 800 1800 100 D 50 50 0 0 w
+X VR_DIG H4 800 1800 100 D 50 50 0 0 W
 X GND_RF H5 1050 -1800 100 U 50 50 0 0 W
 X XTA H6 1600 -1100 100 L 50 50 0 0 I
 X XTB H7 1600 -1200 100 L 50 50 0 0 O
@@ -93,16 +93,16 @@ $ENDFPLIST
 DRAW
 S -500 300 500 -300 0 1 0 f
 X J1 1 600 100 100 L 50 50 0 0 P
-X GND 10 100 -400 100 U 50 50 0 0 w
+X GND 10 100 -400 100 U 50 50 0 0 W
 X RFC 11 -600 -150 100 R 50 50 0 0 P
-X GND 12 200 -400 100 U 50 50 0 0 w
-X GND 2 -200 -400 100 U 50 50 0 0 w
+X GND 12 200 -400 100 U 50 50 0 0 W
+X GND 2 -200 -400 100 U 50 50 0 0 W
 X J3 3 600 -100 100 L 50 50 0 0 P
 X V1 4 -600 200 100 R 50 50 0 0 I
 X V2 5 -600 100 100 R 50 50 0 0 I
 X VDD 6 250 400 100 D 50 50 0 0 W
-X GND 7 -100 -400 100 U 50 50 0 0 w
-X GND 8 0 -400 100 U 50 50 0 0 w
+X GND 7 -100 -400 100 U 50 50 0 0 W
+X GND 8 0 -400 100 U 50 50 0 0 W
 X J2 9 600 0 100 L 50 50 0 0 P
 ENDDRAW
 ENDDEF
diff --git a/hardware/rfsw-mchip.sch b/hardware/rfsw-mchip.sch
index 28165f9..9debb6c 100644
--- a/hardware/rfsw-mchip.sch
+++ b/hardware/rfsw-mchip.sch
@@ -80,7 +80,7 @@ U 1 1 5F5D6D7C
 P 3050 4350
 F 0 "AE1" H 3194 4389 50  0000 L CNN
 F 1 "Antenna_Shield" H 3194 4298 50  0000 L CNN
-F 2 "" H 3050 4450 50  0001 C CNN
+F 2 "Connector_Coaxial:U.FL_Hirose_U.FL-R-SMT-1_Vertical" H 3050 4450 50  0001 C CNN
 F 3 "~" H 3050 4450 50  0001 C CNN
 	1    3050 4350
 	1    0    0    -1  
@@ -90,23 +90,12 @@ Text Notes 2800 4450 1    50   ~ 0
 Text Notes 3000 3200 0    39   ~ 0
 V1  V2  State\n-- -- -----\n 0   0  Shutdown\n 1   0  RFC to J2 (RFI_HF)\n 0   1  RFC to J1 (PA_BOOST)\n 1   1  RFC to J3 (RFO_HF)
 $Comp
-L power:+3V3 #PWR01
-U 1 1 5F5D6D84
-P 4300 2350
-F 0 "#PWR01" H 4300 2200 50  0001 C CNN
-F 1 "+3V3" H 4315 2523 50  0000 C CNN
-F 2 "" H 4300 2350 50  0001 C CNN
-F 3 "" H 4300 2350 50  0001 C CNN
-	1    4300 2350
-	1    0    0    -1  
-$EndComp
-$Comp
 L Device:C C1
 U 1 1 5F5D6D8A
 P 4650 2550
 F 0 "C1" V 4398 2550 50  0000 C CNN
 F 1 "1nF" V 4489 2550 50  0000 C CNN
-F 2 "" H 4688 2400 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 4688 2400 50  0001 C CNN
 F 3 "~" H 4650 2550 50  0001 C CNN
 	1    4650 2550
 	0    1    1    0   
@@ -128,14 +117,14 @@ Wire Wire Line
 	4500 2550 4300 2550
 Connection ~ 4300 2550
 Wire Wire Line
-	4300 2550 4300 2350
+	4300 2550 4000 2550
 $Comp
 L Device:C C8
 U 1 1 5F5D6D9A
 P 5200 3850
 F 0 "C8" V 4948 3850 50  0000 C CNN
 F 1 "47pF" V 5039 3850 50  0000 C CNN
-F 2 "" H 5238 3700 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 5238 3700 50  0001 C CNN
 F 3 "~" H 5200 3850 50  0001 C CNN
 	1    5200 3850
 	0    1    1    0   
@@ -146,7 +135,7 @@ U 1 1 5F5D6DA0
 P 5850 4000
 F 0 "C9" H 5965 4046 50  0000 L CNN
 F 1 "27pF" H 5965 3955 50  0000 L CNN
-F 2 "" H 5888 3850 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 5888 3850 50  0001 C CNN
 F 3 "~" H 5850 4000 50  0001 C CNN
 	1    5850 4000
 	1    0    0    -1  
@@ -157,7 +146,7 @@ U 1 1 5F5D6DA6
 P 7000 3650
 F 0 "L5" V 7190 3650 50  0000 C CNN
 F 1 "10nH" V 7099 3650 50  0000 C CNN
-F 2 "" H 7000 3650 50  0001 C CNN
+F 2 "Inductor_SMD:L_0805_2012Metric" H 7000 3650 50  0001 C CNN
 F 3 "~" H 7000 3650 50  0001 C CNN
 	1    7000 3650
 	0    -1   -1   0   
@@ -185,7 +174,7 @@ U 1 1 5F5D6DB8
 P 5400 5150
 F 0 "L7" V 5590 5150 50  0000 C CNN
 F 1 "10nH" V 5499 5150 50  0000 C CNN
-F 2 "" H 5400 5150 50  0001 C CNN
+F 2 "Inductor_SMD:L_0805_2012Metric" H 5400 5150 50  0001 C CNN
 F 3 "~" H 5400 5150 50  0001 C CNN
 	1    5400 5150
 	0    -1   -1   0   
@@ -202,7 +191,7 @@ U 1 1 5F5D6DC1
 P 6200 5150
 F 0 "L8" V 6390 5150 50  0000 C CNN
 F 1 "10nH" V 6299 5150 50  0000 C CNN
-F 2 "" H 6200 5150 50  0001 C CNN
+F 2 "Inductor_SMD:L_0805_2012Metric" H 6200 5150 50  0001 C CNN
 F 3 "~" H 6200 5150 50  0001 C CNN
 	1    6200 5150
 	0    -1   -1   0   
@@ -213,7 +202,7 @@ U 1 1 5F5D6DC7
 P 6900 5150
 F 0 "L9" V 7090 5150 50  0000 C CNN
 F 1 "11nH" V 6999 5150 50  0000 C CNN
-F 2 "" H 6900 5150 50  0001 C CNN
+F 2 "Inductor_SMD:L_0805_2012Metric" H 6900 5150 50  0001 C CNN
 F 3 "~" H 6900 5150 50  0001 C CNN
 	1    6900 5150
 	0    -1   -1   0   
@@ -224,7 +213,7 @@ U 1 1 5F5D6DCD
 P 7200 5150
 F 0 "C14" V 6948 5150 50  0000 C CNN
 F 1 "22pF" V 7039 5150 50  0000 C CNN
-F 2 "" H 7238 5000 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 7238 5000 50  0001 C CNN
 F 3 "~" H 7200 5150 50  0001 C CNN
 	1    7200 5150
 	0    1    1    0   
@@ -246,7 +235,7 @@ U 1 1 5F5D6DD9
 P 5400 4750
 F 0 "C12" V 5148 4750 50  0000 C CNN
 F 1 "DNP" V 5239 4750 50  0000 C CNN
-F 2 "" H 5438 4600 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 5438 4600 50  0001 C CNN
 F 3 "~" H 5400 4750 50  0001 C CNN
 	1    5400 4750
 	0    1    1    0   
@@ -257,7 +246,7 @@ U 1 1 5F5D6DDF
 P 6200 4750
 F 0 "C13" V 5948 4750 50  0000 C CNN
 F 1 "DNP" V 6039 4750 50  0000 C CNN
-F 2 "" H 6238 4600 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 6238 4600 50  0001 C CNN
 F 3 "~" H 6200 4750 50  0001 C CNN
 	1    6200 4750
 	0    1    1    0   
@@ -289,7 +278,7 @@ U 1 1 5F5D6DF1
 P 5150 5300
 F 0 "C15" H 5265 5346 50  0000 L CNN
 F 1 "3,3pF" H 5265 5255 50  0000 L CNN
-F 2 "" H 5188 5150 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 5188 5150 50  0001 C CNN
 F 3 "~" H 5150 5300 50  0001 C CNN
 	1    5150 5300
 	1    0    0    -1  
@@ -303,7 +292,7 @@ U 1 1 5F5D6DF9
 P 5850 5300
 F 0 "C16" H 5965 5346 50  0000 L CNN
 F 1 "5,6pF" H 5965 5255 50  0000 L CNN
-F 2 "" H 5888 5150 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 5888 5150 50  0001 C CNN
 F 3 "~" H 5850 5300 50  0001 C CNN
 	1    5850 5300
 	1    0    0    -1  
@@ -317,7 +306,7 @@ U 1 1 5F5D6E01
 P 6650 5300
 F 0 "C17" H 6765 5346 50  0000 L CNN
 F 1 "8,2pF" H 6765 5255 50  0000 L CNN
-F 2 "" H 6688 5150 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 6688 5150 50  0001 C CNN
 F 3 "~" H 6650 5300 50  0001 C CNN
 	1    6650 5300
 	1    0    0    -1  
@@ -331,7 +320,7 @@ U 1 1 5F5D6E09
 P 7450 5300
 F 0 "C18" H 7565 5346 50  0000 L CNN
 F 1 "3,9pF" H 7565 5255 50  0000 L CNN
-F 2 "" H 7488 5150 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 7488 5150 50  0001 C CNN
 F 3 "~" H 7450 5300 50  0001 C CNN
 	1    7450 5300
 	1    0    0    -1  
@@ -369,7 +358,7 @@ U 1 1 5F5D6E20
 P 5400 2950
 F 0 "L1" V 5590 2950 50  0000 C CNN
 F 1 "10nH" V 5499 2950 50  0000 C CNN
-F 2 "" H 5400 2950 50  0001 C CNN
+F 2 "Inductor_SMD:L_0805_2012Metric" H 5400 2950 50  0001 C CNN
 F 3 "~" H 5400 2950 50  0001 C CNN
 	1    5400 2950
 	0    -1   -1   0   
@@ -382,7 +371,7 @@ U 1 1 5F5D6E27
 P 6200 2950
 F 0 "L2" V 6390 2950 50  0000 C CNN
 F 1 "10nH" V 6299 2950 50  0000 C CNN
-F 2 "" H 6200 2950 50  0001 C CNN
+F 2 "Inductor_SMD:L_0805_2012Metric" H 6200 2950 50  0001 C CNN
 F 3 "~" H 6200 2950 50  0001 C CNN
 	1    6200 2950
 	0    -1   -1   0   
@@ -393,7 +382,7 @@ U 1 1 5F5D6E2D
 P 8100 2950
 F 0 "L3" V 8290 2950 50  0000 C CNN
 F 1 "2,2nH" V 8199 2950 50  0000 C CNN
-F 2 "" H 8100 2950 50  0001 C CNN
+F 2 "Inductor_SMD:L_0805_2012Metric" H 8100 2950 50  0001 C CNN
 F 3 "~" H 8100 2950 50  0001 C CNN
 	1    8100 2950
 	0    -1   -1   0   
@@ -404,7 +393,7 @@ U 1 1 5F5D6E33
 P 6900 2950
 F 0 "C3" V 6648 2950 50  0000 C CNN
 F 1 "18pF" V 6739 2950 50  0000 C CNN
-F 2 "" H 6938 2800 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 6938 2800 50  0001 C CNN
 F 3 "~" H 6900 2950 50  0001 C CNN
 	1    6900 2950
 	0    1    1    0   
@@ -424,7 +413,7 @@ U 1 1 5F5D6E3E
 P 5400 2550
 F 0 "C2" V 5148 2550 50  0000 C CNN
 F 1 "DNP" V 5239 2550 50  0000 C CNN
-F 2 "" H 5438 2400 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 5438 2400 50  0001 C CNN
 F 3 "~" H 5400 2550 50  0001 C CNN
 	1    5400 2550
 	0    1    1    0   
@@ -442,7 +431,7 @@ U 1 1 5F5D6E48
 P 5150 3100
 F 0 "C4" H 5265 3146 50  0000 L CNN
 F 1 "3,3pF" H 5265 3055 50  0000 L CNN
-F 2 "" H 5188 2950 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 5188 2950 50  0001 C CNN
 F 3 "~" H 5150 3100 50  0001 C CNN
 	1    5150 3100
 	1    0    0    -1  
@@ -456,7 +445,7 @@ U 1 1 5F5D6E50
 P 5850 3100
 F 0 "C5" H 5965 3146 50  0000 L CNN
 F 1 "5,6pF" H 5965 3055 50  0000 L CNN
-F 2 "" H 5888 2950 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 5888 2950 50  0001 C CNN
 F 3 "~" H 5850 3100 50  0001 C CNN
 	1    5850 3100
 	1    0    0    -1  
@@ -468,7 +457,7 @@ U 1 1 5F5D6E57
 P 6550 3100
 F 0 "C6" H 6665 3146 50  0000 L CNN
 F 1 "3,3pF" H 6665 3055 50  0000 L CNN
-F 2 "" H 6588 2950 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 6588 2950 50  0001 C CNN
 F 3 "~" H 6550 3100 50  0001 C CNN
 	1    6550 3100
 	1    0    0    -1  
@@ -482,7 +471,7 @@ U 1 1 5F5D6E5F
 P 7250 3100
 F 0 "C7" H 7365 3146 50  0000 L CNN
 F 1 "3,9pF" H 7365 3055 50  0000 L CNN
-F 2 "" H 7288 2950 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 7288 2950 50  0001 C CNN
 F 3 "~" H 7250 3100 50  0001 C CNN
 	1    7250 3100
 	1    0    0    -1  
@@ -529,7 +518,7 @@ U 1 1 5F5D6E7A
 P 7750 3300
 F 0 "L4" H 7803 3346 50  0000 L CNN
 F 1 "33nH" H 7803 3255 50  0000 L CNN
-F 2 "" H 7750 3300 50  0001 C CNN
+F 2 "Inductor_SMD:L_0805_2012Metric" H 7750 3300 50  0001 C CNN
 F 3 "~" H 7750 3300 50  0001 C CNN
 	1    7750 3300
 	1    0    0    -1  
@@ -546,7 +535,7 @@ U 1 1 5F5D6E84
 P 7750 4800
 F 0 "L6" H 7803 4846 50  0000 L CNN
 F 1 "33nH" H 7803 4755 50  0000 L CNN
-F 2 "" H 7750 4800 50  0001 C CNN
+F 2 "Inductor_SMD:L_0805_2012Metric" H 7750 4800 50  0001 C CNN
 F 3 "~" H 7750 4800 50  0001 C CNN
 	1    7750 4800
 	1    0    0    -1  
@@ -564,7 +553,7 @@ U 1 1 5F5D6E8E
 P 7350 4200
 F 0 "C11" H 7465 4246 50  0000 L CNN
 F 1 "DNP" H 7465 4155 50  0000 L CNN
-F 2 "" H 7388 4050 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 7388 4050 50  0001 C CNN
 F 3 "~" H 7350 4200 50  0001 C CNN
 	1    7350 4200
 	1    0    0    -1  
@@ -575,7 +564,7 @@ U 1 1 5F5D6E94
 P 6750 4200
 F 0 "C10" H 6865 4246 50  0000 L CNN
 F 1 "4,7nF" H 6865 4155 50  0000 L CNN
-F 2 "" H 6788 4050 50  0001 C CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 6788 4050 50  0001 C CNN
 F 3 "~" H 6750 4200 50  0001 C CNN
 	1    6750 4200
 	1    0    0    -1  
@@ -625,4 +614,6 @@ Wire Wire Line
 Wire Wire Line
 	6550 3650 6850 3650
 Connection ~ 5850 3850
+Text HLabel 4000 2550 0    50   Input ~ 0
+RFSWPWR
 $EndSCHEMATC