diff --git a/README.MD b/README.MD
index 99abd12..67252c7 100644
--- a/README.MD
+++ b/README.MD
@@ -49,6 +49,10 @@ Libraries for KiCad.
 * SE2436
 * NRF24L01(P) with Thermal Pad
 * NSVF4020SG4 RF NPN transistor
+* MAX2644 2.45 GHz LNA +16dB
+* MAX2750 2.4 GHz VCO
+* AD8314 100 - 2700 MHz RF Power Detector and Controller
+* HMC154S8 2.5 GHz RF switch
 
 ## analog
 * UDA1330ATS 16-bit Stereo DAC
diff --git a/schematics/shimatta_rf.dcm b/schematics/shimatta_rf.dcm
index b930b2e..af24b16 100644
--- a/schematics/shimatta_rf.dcm
+++ b/schematics/shimatta_rf.dcm
@@ -1,5 +1,22 @@
 EESchema-DOCLIB  Version 2.0
 #
+$CMP AD8314
+D RF Detector/Controller
+F https://www.analog.com/media/en/technical-documentation/data-sheets/AD8314.pdf
+$ENDCMP
+#
+$CMP HMC154S8
+D LOW DISTORTION T/R SWITCH DC - 2.5 GHZ
+K rf,switch
+F https://www.qsl.net/n9zia/trans/hmc154s8.pdf
+$ENDCMP
+#
+$CMP MAX2644
+D 2.45 GHz LNA
+K lna,rf,amplifier,amp,maxim
+F https://datasheets.maximintegrated.com/en/ds/MAX2644.pdf
+$ENDCMP
+#
 $CMP NRF24L01
 D Ultra low power 2.4GHz RF Transceiver, QFN20 4x4mm
 K Low Power RF Transciever
diff --git a/schematics/shimatta_rf.lib b/schematics/shimatta_rf.lib
index 1e77b58..f14740d 100644
--- a/schematics/shimatta_rf.lib
+++ b/schematics/shimatta_rf.lib
@@ -1,6 +1,26 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# AD8314
+#
+DEF AD8314 U 0 40 Y Y 1 F N
+F0 "U" 50 50 50 H V C CNN
+F1 "AD8314" 500 -250 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+S 0 0 1000 -600 0 0 0 f
+X RFIN 1 -200 -100 200 R 50 50 1 1 I
+X ENBL 2 -200 -250 200 R 50 50 1 1 I
+X VSET 3 -200 -350 200 R 50 50 1 1 I
+X FILTR 4 1200 -100 200 L 50 50 1 1 B
+X COMM 5 1200 -500 200 L 50 50 1 1 W
+X V_UP 6 1200 -200 200 L 50 50 1 1 O
+X V_DN 7 1200 -300 200 L 50 50 1 1 O
+X VPOS 8 -200 -500 200 R 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # BGA420
 #
 DEF BGA420 U 0 40 Y Y 1 F N
@@ -20,6 +40,61 @@ X VCC 4 200 200 200 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# HMC154S8
+#
+DEF HMC154S8 U 0 40 Y Y 1 F N
+F0 "U" 50 50 50 H V C CNN
+F1 "HMC154S8" 400 50 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+T 0 350 -400 50 0 0 0 SW Normal 0 C C
+S 0 0 700 -900 0 1 0 f
+S 250 -300 450 -500 0 1 0 N
+P 2 0 0 0 450 -450 600 -450 N
+P 2 0 0 0 450 -350 600 -350 N
+P 2 0 0 0 600 -450 700 -450 N
+P 2 0 0 0 600 -350 700 -350 N
+P 4 0 0 0 0 -200 250 -200 300 -200 300 -300 N
+P 4 0 0 0 0 -100 300 -100 350 -100 350 -300 N
+P 2 0 1 0 0 -400 250 -400 N
+X A 1 -200 -100 200 R 50 50 1 1 I
+X B 2 -200 -200 200 R 50 50 1 1 I
+X RF 3 -200 -400 200 R 50 50 1 1 B
+X VDD 4 900 -100 200 L 50 50 1 1 U
+X RF1 5 900 -350 200 L 50 50 1 1 B
+X GND 6 250 -1100 200 U 50 50 1 1 W
+X GND 7 350 -1100 200 U 50 50 1 1 W
+X RF2 8 900 -450 200 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# MAX2644
+#
+DEF MAX2644 U 0 40 Y Y 1 F N
+F0 "U" 50 50 50 H V C CNN
+F1 "MAX2644" 600 -50 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+T 0 650 -460 50 0 0 0 "50 Ohm" Normal 0 C C
+T 0 410 -140 50 0 0 0 bias Normal 0 C C
+S 0 0 800 -900 0 1 0 f
+P 4 0 0 0 320 -140 30 -140 30 -100 0 -100 N
+P 2 0 1 0 0 -400 310 -400 N
+P 2 0 1 0 400 -340 400 -180 N
+P 2 0 1 0 800 -400 490 -400 N
+P 5 0 1 0 310 -400 310 -280 490 -400 310 -520 310 -400 F
+P 6 0 1 0 400 -180 320 -180 320 -100 510 -100 510 -180 400 -180 N
+X BIAS 1 -200 -100 200 R 50 50 1 1 U
+X GND 2 -200 -700 200 R 50 50 1 1 W
+X RFIN 3 -200 -400 200 R 50 50 1 1 I
+X VCC 4 -200 -600 200 R 50 50 1 1 W
+X GND 5 -200 -800 200 R 50 50 1 1 W
+X RFOUT 6 1000 -400 200 L 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # MAX2750
 #
 DEF MAX2750 U 0 40 Y Y 1 F N
@@ -135,29 +210,29 @@ F3 "" 0 0 50 H I C CNN
 DRAW
 S 0 0 1050 -2200 0 1 0 f
 X ANT_SEL 1 -200 -1350 200 R 50 50 1 1 I
-X GND 10 1250 -1250 200 L 50 50 1 1 I
+X GND 10 1250 -1250 200 L 50 50 1 1 W
 X CPS 11 -200 -1050 200 R 50 50 1 1 I
-X VCC3 12 1250 -900 200 L 50 50 1 1 I
+X VCC3 12 1250 -900 200 L 50 50 1 1 W
 X DNC 13 1250 -1850 200 L 50 50 1 1 N X
 X DNC 14 1250 -1950 200 L 50 50 1 1 N X
 X DNC 15 1250 -2050 200 L 50 50 1 1 N X
 X DNC 16 1250 -2150 200 L 50 50 1 1 N X
-X GND 17 1250 -1350 200 L 50 50 1 1 I
+X GND 17 1250 -1350 200 L 50 50 1 1 W
 X AUX 18 1250 -350 200 L 50 50 1 1 I
-X ANT2 19 1250 -250 200 L 50 50 1 1 I
+X ANT2 19 1250 -250 200 L 50 50 1 1 B
 X VB 2 -200 -100 200 R 50 50 1 1 I
-X GND 20 1250 -1450 200 L 50 50 1 1 I
-X ANT1 21 1250 -150 200 L 50 50 1 1 I
-X GND 22 1250 -1550 200 L 50 50 1 1 I
+X GND 20 1250 -1450 200 L 50 50 1 1 W
+X ANT1 21 1250 -150 200 L 50 50 1 1 B
+X GND 22 1250 -1550 200 L 50 50 1 1 W
 X NC 23 1250 -1750 200 L 50 50 1 1 N
 X NC 24 1250 -1650 200 L 50 50 1 1 N
 X PAD 25 550 -2400 200 U 50 50 1 1 W
 X TRP 3 -200 -200 200 R 50 50 1 1 I
 X TRN 4 -200 -300 200 R 50 50 1 1 I
 X CRX 5 -200 -1250 200 R 50 50 1 1 I
-X VCC1 6 1250 -700 200 L 50 50 1 1 I
+X VCC1 6 1250 -700 200 L 50 50 1 1 W
 X CSD 7 -200 -950 200 R 50 50 1 1 I
-X VCC2 8 1250 -800 200 L 50 50 1 1 I
+X VCC2 8 1250 -800 200 L 50 50 1 1 W
 X CTX 9 -200 -1150 200 R 50 50 1 1 I
 ENDDRAW
 ENDDEF