diff --git a/library/rfcom.dcm b/library/rfcom.dcm
index e521e774..362f51d4 100644
--- a/library/rfcom.dcm
+++ b/library/rfcom.dcm
@@ -34,6 +34,18 @@ K 2.4GHz rf transceiver ZigBee 802.15.4
 F http://www.ti.com/lit/gpn/cc2520
 $ENDCMP
 #
+$CMP DCTR-52D
+D IQRF data controlled transceiver, FSK modulation
+K IQRF data controlled transceiver, FSK modulation
+F http://iqrf.org/weben/downloads.php?id=213
+$ENDCMP
+#
+$CMP DCTR-72D
+D IQRF data controlled transceiver, GMSK modulation
+K IQRF data controlled transceiver, GMSK modulation
+F http://iqrf.org/weben/downloads.php?id=337
+$ENDCMP
+#
 $CMP HF-A11-SMT
 D WiFi IEEE802.11b/g/n with Ethernet Module, UART, GPIO
 K WiFi IEEE802.11 b/g/n
@@ -52,6 +64,12 @@ K Low Power RF Transciever
 F http://www.nordicsemi.com/eng/content/download/2730/34105/file/nRF24L01_Product_Specification_v2_0.pdf
 $ENDCMP
 #
+$CMP NRF24L01_Breakout
+D Ultra low power 2.4GHz RF Transceiver, Carrier PCB
+K Low Power RF Transciever breakout carrier
+F http://www.nordicsemi.com/eng/content/download/2730/34105/file/nRF24L01_Product_Specification_v2_0.pdf
+$ENDCMP
+#
 $CMP RN42
 D Class 2 Bluetooth Module with on-board antenna
 K Bluetooth Module
@@ -82,6 +100,18 @@ K IOT SIGFOX
 F https://github.com/Telecom-Design/Documentation_TD_RF_Module/blob/master/TD1208%20Datasheet.pdf
 $ENDCMP
 #
+$CMP TR-52D
+D IQRF common transceiver, FSK modulation
+K IQRF common transceiver, FSK modulation
+F http://iqrf.org/weben/downloads.php?id=213
+$ENDCMP
+#
+$CMP TR-72D
+D IQRF common transceiver, GMSK modulation
+K IQRF common transceiver, GMSK modulation
+F http://iqrf.org/weben/downloads.php?id=337
+$ENDCMP
+#
 $CMP iM880A
 D IMST Long Range Radio Module
 K IOT LoRa
@@ -100,28 +130,4 @@ K Low Power RF Transciever
 F http://www.nordicsemi.com/eng/content/download/2726/34069/file/nRF24L01P_Product_Specification_1_0.pdf
 $ENDCMP
 #
-$CMP TR-52D
-D IQRF common transceiver, FSK modulation
-K IQRF common transceiver, FSK modulation
-F http://iqrf.org/weben/downloads.php?id=213
-$ENDCMP
-#
-$CMP TR-72D
-D IQRF common transceiver, GMSK modulation
-K IQRF common transceiver, GMSK modulation
-F http://iqrf.org/weben/downloads.php?id=337
-$ENDCMP
-#
-$CMP DCTR-52D
-D IQRF data controlled transceiver, FSK modulation
-K IQRF data controlled transceiver, FSK modulation
-F http://iqrf.org/weben/downloads.php?id=213
-$ENDCMP
-#
-$CMP DCTR-72D
-D IQRF data controlled transceiver, GMSK modulation
-K IQRF data controlled transceiver, GMSK modulation
-F http://iqrf.org/weben/downloads.php?id=337
-$ENDCMP
-#
 #End Doc Library
diff --git a/library/rfcom.lib b/library/rfcom.lib
index fd1e06af..de709b5f 100644
--- a/library/rfcom.lib
+++ b/library/rfcom.lib
@@ -57,7 +57,7 @@ ENDDEF
 #
 # BTM112
 #
-DEF BTM112 IC 0 40 Y Y 1 F N
+DEF BTM112 U 0 40 Y Y 1 F N
 F0 "U" -600 1150 50 H V L CNN
 F1 "BTM112" -600 1050 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
@@ -110,7 +110,7 @@ ENDDEF
 #
 # BTM222
 #
-DEF BTM222 IC 0 40 Y Y 1 F N
+DEF BTM222 U 0 40 Y Y 1 F N
 F0 "U" -800 1150 50 H V L CNN
 F1 "BTM222" -800 1050 50 H V L CNN
 F2 "" 0 0 50 H I C CNN
@@ -179,7 +179,7 @@ ENDDEF
 #
 # CC1000
 #
-DEF CC1000 IC 0 40 Y Y 1 F N
+DEF CC1000 U 0 40 Y Y 1 F N
 F0 "U" -950 700 50 H V L CNN
 F1 "CC1000" -950 600 50 H V L CNN
 F2 "TSSOP-28" -950 -600 50 H I L CIN
@@ -313,7 +313,7 @@ ENDDEF
 #
 # HF-A11-SMT
 #
-DEF HF-A11-SMT IC 0 40 Y Y 1 F N
+DEF HF-A11-SMT U 0 40 Y Y 1 F N
 F0 "U" -600 850 50 H V L CNN
 F1 "HF-A11-SMT" -600 750 50 H V L CNN
 F2 "" 0 -300 50 H I C CNN
@@ -390,18 +390,23 @@ ENDDEF
 #
 # NRF24L01
 #
-DEF NRF24L01 IC 0 40 Y Y 1 F N
-F0 "U" -600 800 50 H V L CNN
-F1 "NRF24L01" -600 700 50 H V L CNN
-F2 "QFN-20" -600 -700 50 H I L CIN
-F3 "" 0 100 50 H I C CNN
+DEF NRF24L01 U 0 40 Y Y 1 F N
+F0 "U" -450 700 50 H V L CNN
+F1 "NRF24L01" 200 700 50 H V L CNN
+F2 "Housings_DFN_QFN:QFN-20-1EP_4x4mm_Pitch0.5mm" 200 800 50 H I L CIN
+F3 "" 0 100 50 H V C CNN
 ALIAS nRF24L01P
 $FPLIST
- QFN*
+ QFN*4x4*0.5mm*
 $ENDFPLIST
 DRAW
+A 0 200 112 1166 -266 0 1 10 N -50 300 100 150
+A 0 201 49 900 -11 0 1 10 N 0 250 50 200
+A 0 201 78 1087 -191 0 1 10 N -25 275 75 175
+C 0 200 25 0 1 10 F
 S -450 650 450 -650 0 1 10 f
 S 450 -550 450 -550 0 1 0 N
+P 2 0 1 10 0 175 0 50 N
 X CE 1 -600 0 150 R 50 50 1 1 I
 X CSN 2 -600 200 150 R 50 50 1 1 I
 X SCK 3 -600 300 150 R 50 50 1 1 I C
@@ -425,6 +430,35 @@ X DVDD 19 -600 -500 150 R 50 50 1 1 w
 ENDDRAW
 ENDDEF
 #
+# NRF24L01_Breakout
+#
+DEF NRF24L01_Breakout U 0 40 Y Y 1 F N
+F0 "U" -350 500 50 H V L CNN
+F1 "NRF24L01_Breakout" 150 500 50 H V L CNN
+F2 "RF_Modules:nRF24L01_Breakout" 150 600 50 H I L CIN
+F3 "" 0 -100 50 H V C CNN
+$FPLIST
+ nRF24L01*Breakout*
+$ENDFPLIST
+DRAW
+A 175 100 112 1166 -266 0 1 10 N 125 200 275 50
+A 175 101 49 900 -11 0 1 10 N 175 150 225 100
+A 175 101 78 1087 -191 0 1 10 N 150 175 250 75
+C 175 100 25 0 1 10 F
+S -350 450 350 -450 0 1 10 f
+S 450 -750 450 -750 0 1 0 N
+P 2 0 1 10 175 75 175 -50 N
+X GND 1 0 -600 150 U 50 50 1 1 W
+X VCC 2 0 600 150 D 50 50 1 1 W
+X CE 3 -500 -200 150 R 50 50 1 1 I
+X ~CSN 4 -500 0 150 R 50 50 1 1 I
+X SCK 5 -500 100 150 R 50 50 1 1 I C
+X MOSI 6 -500 300 150 R 50 50 1 1 I
+X MISO 7 -500 200 150 R 50 50 1 1 O
+X IRQ 8 -500 -300 150 R 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
 # RN42
 #
 DEF RN42 U 0 40 Y Y 1 F N
@@ -594,7 +628,7 @@ ENDDEF
 #
 # SIM900
 #
-DEF SIM900 IC 0 40 Y Y 1 F N
+DEF SIM900 U 0 40 Y Y 1 F N
 F0 "U" -800 1950 50 H V L CNN
 F1 "SIM900" -800 1850 50 H V L CNN
 F2 "" -2050 1150 50 H I C CNN
@@ -730,6 +764,31 @@ X UART-RX 19 -600 -200 100 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# TR-52D
+#
+DEF TR-52D IC 0 50 Y Y 1 F N
+F0 "IC" -1400 450 50 H V L CNN
+F1 "TR-52D" 1400 450 50 H V R CNN
+F2 "Connectors:IQRF_KON-SIM-01" -1400 -550 50 H I L CNN
+F3 "" 1400 -650 50 H I R CNN
+ALIAS TR-72D DCTR-52D DCTR-72D
+$FPLIST
+ IQRF?KON?SIM?01*
+$ENDFPLIST
+DRAW
+S -1400 400 1400 -500 0 1 10 f
+X RA0/AN0/C12IN0 1 -1500 0 100 R 50 50 1 1 B
+X RC2/Vout 2 -1500 -100 100 R 50 50 1 1 B
+X Vin 3 0 500 100 D 50 50 1 1 W
+X GND 4 100 -600 100 U 50 50 1 1 W
+X RA5/RB4/RC6/AN4/AN11/TX/~SS~/C2OUT/CCP3 5 1500 -200 100 L 50 50 1 1 B
+X RC3/SCK/SCL 6 1500 -100 100 L 50 50 1 1 B
+X RC4/SDI/SDA 7 1500 0 100 L 50 50 1 1 B
+X RC5/RC7/RX/SDO 8 1500 100 100 L 50 50 1 1 B
+X GND 9 -100 -600 100 U 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # iM880A
 #
 DEF iM880A U 0 40 Y Y 1 F N
@@ -775,29 +834,4 @@ X P17-IO/ADC 29 1000 -400 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# TR-52D
-#
-DEF TR-52D IC 0 50 Y Y 1 F N
-F0 "U" -1400 450 50 H V L CNN
-F1 "TR-52D" 1400 450 50 H V R CNN
-F2 "Connectors:IQRF_KON-SIM-01" -1400 -550 50 H I L CNN
-F3 "" 1400 -650 50 H I R CNN
-ALIAS TR-72D DCTR-52D DCTR-72D
-$FPLIST
- IQRF?KON?SIM?01*
-$ENDFPLIST
-DRAW
-S -1400 400 1400 -500 0 1 10 f
-X RA0/AN0/C12IN0 1 -1500 0 100 R 50 50 1 1 B
-X RC2/Vout 2 -1500 -100 100 R 50 50 1 1 B
-X Vin 3 0 500 100 D 50 50 1 1 W
-X GND 4 100 -600 100 U 50 50 1 1 W
-X RA5/RB4/RC6/AN4/AN11/TX/~SS~/C2OUT/CCP3 5 1500 -200 100 L 50 50 1 1 B
-X RC3/SCK/SCL 6 1500 -100 100 L 50 50 1 1 B
-X RC4/SDI/SDA 7 1500 0 100 L 50 50 1 1 B
-X RC5/RC7/RX/SDO 8 1500 100 100 L 50 50 1 1 B
-X GND 9 -100 -600 100 U 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
 #End Library