diff --git a/kicad-symbols/RF_Module.bck b/kicad-symbols/RF_Module.bck
index 30549008..5f3ed79b 100644
--- a/kicad-symbols/RF_Module.bck
+++ b/kicad-symbols/RF_Module.bck
@@ -1,374 +1,3 @@
 EESchema-DOCLIB  Version 2.0
 #
-$CMP ATSAMR21G18-MR210UA_NoRFPads
-D RF Module, ATSAMR21, Zigbee 802.15.4, external antenna, SMD
-K Wireless Zigbee 802.15.4 ATSAMR21G18 AT45DB041E TECC508A
-F http://ww1.microchip.com/downloads/en/devicedoc/atmel-42475-atsamr21g18-mr210ua_datasheet.pdf
-$ENDCMP
-#
-$CMP AX-SIP-SFEU
-D Ultra low power, Sigfox or custom, system in package transceiver, 868Mhz
-K Sigfox SIP 868Mhz
-F https://www.onsemi.com/pub/Collateral/AX-SIP-SFEU-D.PDF
-$ENDCMP
-#
-$CMP AX-SIP-SFEU-API
-D Ultra low power, Sigfox or custom, programmable system in package, 868Mhz
-K Sigfox SIP 868Mhz
-F https://www.onsemi.com/pub/Collateral/AX-SIP-SFEU-D.PDF
-$ENDCMP
-#
-$CMP Ai-Thinker-Ra-01
-D Ai-Thinker Ra-01 410-525 MHz LoRa Module, SPI interface, external antenna
-K Ra-01 LoRa
-F http://wiki.ai-thinker.com/_media/lora/docs/c047ps01a1_ra-01_product_specification_v1.1.pdf
-$ENDCMP
-#
-$CMP Ai-Thinker-Ra-02
-D Ai-Thinker Ra-02 410-525 MHz LoRa Module, SPI interface, U.FL antenna connector
-K Ra-02 LoRa
-F http://wiki.ai-thinker.com/_media/lora/docs/c048ps01a1_ra-02_product_specification_v1.1.pdf
-$ENDCMP
-#
-$CMP CMWX1ZZABZ-078
-D LoRa/SigFox Module, STM32L082 MCU, Murata CMWX1ZZABZ
-K iot lora sigfox
-F https://wireless.murata.com/RFM/data/type_abz.pdf
-$ENDCMP
-#
-$CMP CMWX1ZZABZ-091
-D LoRa/SigFox Module, STM32L072 MCU, Murata CMWX1ZZABZ
-K iot lora sigfox
-F https://wireless.murata.com/RFM/data/type_abz.pdf
-$ENDCMP
-#
-$CMP D52MxxM8
-D D52M Module, nRF52832 SoC, ARM Cortex-M4F, 64kB RAM, 512kB Flash, 1.7-3.6V, M8-35
-K RF Radio ANT Bluetooth BLE D52 nRF52 Garmin Canada Dynastream Nordic
-F https://www.thisisant.com/assets/resources/D00001687_D52_Module_Datasheet.v.2.3_(Garmin).pdf
-$ENDCMP
-#
-$CMP DCTR-52DA
-D IQRF data controlled transceiver with PCB antenna, FSK modulation
-K IQRF data controlled transceiver, PCB antenna, FSK modulation
-F https://iqrf.org/weben/downloads.php?id=213
-$ENDCMP
-#
-$CMP DCTR-52DAT
-D IQRF data controlled transceiver with PCB antenna and thermometer, FSK modulation
-K IQRF data controlled transceiver, PCB antenna, thermometer, FSK modulation
-F https://iqrf.org/weben/downloads.php?id=213
-$ENDCMP
-#
-$CMP DWM1000
-D Ultra wide band RF module With ranging location capabilities
-K DWM1000,Decawave,RF,ranging,UWB
-F https://www.decawave.com/sites/default/files/resources/dwm1000-datasheet-v1.3.pdf
-$ENDCMP
-#
-$CMP DWM1001
-D  Ultra wide band RF module With ranging location capabilities, I2C, UART, SPI, +2.8V to +3.6V VCC
-K DWM1000  DecaWave RF ranging UWB
-F https://www.decawave.com/sites/default/files/dwm1001_datasheet.pdf
-$ENDCMP
-#
-$CMP E18-MS1-PCB
-D Zigbee RF Module
-K Zigbee, RF, 802.15.4
-F http://www.cdebyte.com/en/downpdf.aspx?id=122
-$ENDCMP
-#
-$CMP E73-2G4M04S-52810
-D nRF52810 BLE5 Module
-K BLE5, BLE, nRF52810
-F http://www.cdebyte.com/en/downpdf.aspx?id=243
-$ENDCMP
-#
-$CMP E73-2G4M04S-52832
-D nRF52832 BLE5 Module
-K BLE5, BLE, nRF52832
-F http://www.cdebyte.com/en/downpdf.aspx?id=243
-$ENDCMP
-#
-$CMP ESP-07
-D 802.11 b/g/n Wi-Fi Module
-K 802.11 Wi-Fi
-F http://wiki.ai-thinker.com/_media/esp8266/esp8266_series_modules_user_manual_v1.1.pdf
-$ENDCMP
-#
-$CMP ESP-12E
-D 802.11 b/g/n Wi-Fi Module
-K 802.11 Wi-Fi
-F http://wiki.ai-thinker.com/_media/esp8266/esp8266_series_modules_user_manual_v1.1.pdf
-$ENDCMP
-#
-$CMP ESP-12F
-D 802.11 b/g/n Wi-Fi Module
-K 802.11 Wi-Fi
-F http://wiki.ai-thinker.com/_media/esp8266/esp8266_series_modules_user_manual_v1.1.pdf
-$ENDCMP
-#
-$CMP ESP-WROOM-02
-D Wi-Fi Module, ESP8266EX SoC, 32-bit, 802.11b/g/n, WPA/WPA2, 2.7-3.6V, SMD
-K RF Radio ESP Espressif
-F https://www.espressif.com/sites/default/files/documentation/0c-esp-wroom-02_datasheet_en.pdf
-$ENDCMP
-#
-$CMP ESP32-PICO-D4
-D RF Module, ESP32 SoC, Wi-Fi 802.11b/g/n, Bluetooth, BLE, 32-bit, 2.7-3.6V, external antenna, QFN-48
-K RF Radio BT ESP ESP32 Espressif external antenna
-F https://www.espressif.com/sites/default/files/documentation/esp32-pico-d4_datasheet_en.pdf
-$ENDCMP
-#
-$CMP ESP32-S2
-D ESP32-S2 family is a highly-integrated, low-power, 2.4 GHz Wi-Fi System-on-Chip (SoC) solution
-F https://www.espressif.com/sites/default/files/documentation/esp32-s2_datasheet_en.pdf
-$ENDCMP
-#
-$CMP ESP32-S2-WROVER
-D RF Module, ESP32-D0WDQ6 SoC, Wi-Fi 802.11b/g/n, 32-bit, 2.7-3.6V, onboard antenna, SMD
-K RF Radio ESP ESP32 Espressif onboard PCB antenna
-F https://www.espressif.com/sites/default/files/documentation/esp32-s2-wroom_esp32-s2-wroom-i_datasheet_en.pdf
-$ENDCMP
-#
-$CMP ESP32-S2-WROVER-I
-D RF Module, ESP32-D0WDQ6 SoC, Wi-Fi 802.11b/g/n, 32-bit, 2.7-3.6V, onboard antenna, SMD
-K RF Radio ESP ESP32 Espressif onboard PCB antenna
-F https://www.espressif.com/sites/default/files/documentation/esp32-s2-wroom_esp32-s2-wroom-i_datasheet_en.pdf
-$ENDCMP
-#
-$CMP ESP32-WROOM-32
-D RF Module, ESP32-D0WDQ6 SoC, Wi-Fi 802.11b/g/n, Bluetooth, BLE, 32-bit, 2.7-3.6V, onboard antenna, SMD
-K RF Radio BT ESP ESP32 Espressif onboard PCB antenna
-F https://www.espressif.com/sites/default/files/documentation/esp32-wroom-32_datasheet_en.pdf
-$ENDCMP
-#
-$CMP ESP32-WROOM-32D
-D RF Module, ESP32-D0WD SoC, Wi-Fi 802.11b/g/n, Bluetooth, BLE, 32-bit, 2.7-3.6V, onboard antenna, SMD
-K RF Radio BT ESP ESP32 Espressif onboard PCB antenna
-F https://www.espressif.com/sites/default/files/documentation/esp32-wroom-32d_esp32-wroom-32u_datasheet_en.pdf
-$ENDCMP
-#
-$CMP ESP32-WROOM-32U
-D RF Module, ESP32-D0WD SoC, Wi-Fi 802.11b/g/n, Bluetooth, BLE, 32-bit, 2.7-3.6V, external antenna, SMD
-K RF Radio BT ESP ESP32 Espressif external U.FL antenna
-F https://www.espressif.com/sites/default/files/documentation/esp32-wroom-32d_esp32-wroom-32u_datasheet_en.pdf
-$ENDCMP
-#
-$CMP MDBT50Q-1MV2
-D Multiprotocol BLE/ANT/2.4 GHz/802.15.4 Cortex-M4F SoC, nRF52840 module
-K BLE ANT ZigBee Thread 802.15.4 nRF52840 nordic MDBT50Q
-F https://www.raytac.com/download/index.php?index_id=43
-$ENDCMP
-#
-$CMP MDBT50Q-512K
-D Multiprotocol BLE/ANT/2.4 GHz/802.15.4 Cortex-M4F SoC, nRF52833 module
-K MCU, ARM, BLE, ANT, 2.4GHz, 802.15.4 MDBT50Q
-F https://www.raytac.com/download/index.php?index_id=46
-$ENDCMP
-#
-$CMP MDBT50Q-P1MV2
-D Multiprotocol BLE/ANT/2.4 GHz/802.15.4 Cortex-M4F SoC, nRF52840 module
-K BLE ANT ZigBee Thread 802.15.4 nRF52840 nordic MDBT50Q
-F https://www.raytac.com/download/index.php?index_id=43
-$ENDCMP
-#
-$CMP MDBT50Q-P512K
-D Multiprotocol BLE/ANT/2.4 GHz/802.15.4 Cortex-M4F SoC, nRF52833 module
-K MCU, ARM, BLE, ANT, 2.4GHz, 802.15.4 MDBT50Q
-F https://www.raytac.com/download/index.php?index_id=46
-$ENDCMP
-#
-$CMP MDBT50Q-U1MV2
-D Multiprotocol BLE/ANT/2.4 GHz/802.15.4 Cortex-M4F SoC, nRF52840 module
-K BLE ANT ZigBee Thread 802.15.4 nRF52840 nordic MDBT50Q
-F https://www.raytac.com/download/index.php?index_id=43
-$ENDCMP
-#
-$CMP MDBT50Q-U512K
-D Multiprotocol BLE/ANT/2.4 GHz/802.15.4 Cortex-M4F SoC, nRF52833 module
-K MCU, ARM, BLE, ANT, 2.4GHz, 802.15.4 MDBT50Q
-F https://www.raytac.com/download/index.php?index_id=46
-$ENDCMP
-#
-$CMP MM002
-D NEMEUS Modem dual-mode LoRa/SIGFOX
-K IOT LoRa SIGFOX
-F http://www.nemeus.fr/resources/uploads/2015/04/MM002-xx-EU_datasheet_v0.11.pdf
-$ENDCMP
-#
-$CMP Particle_P1
-D Wi-Fi module, 1MB flash, 128KB RAM
-K Wi-Fi module
-F https://docs.particle.io/datasheets/p1-datasheet/
-$ENDCMP
-#
-$CMP RAK4200
-D LoRa Module, STM32L071,  RAKwireless
-K IoT, LoRa, LoRaWAN, RF
-F https://downloads.rakwireless.com/LoRa/RAK4200/Hardware-Specification/RAK4200_Module_Specifications_V1.4.pdf
-$ENDCMP
-#
-$CMP RAK811-HF-AS923
-D LoRa Module, STM32L151, AS923, RAKwireless
-K IoT LoRa LoRaWAN RF
-F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
-$ENDCMP
-#
-$CMP RAK811-HF-AU915
-D LoRa Module, STM32L151, AU915, RAKwireless
-K IoT LoRa LoRaWAN RF
-F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
-$ENDCMP
-#
-$CMP RAK811-HF-EU868
-D LoRa Module, STM32L151, EU868, RAKwireless
-K IoT LoRa LoRaWAN RF
-F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
-$ENDCMP
-#
-$CMP RAK811-HF-IN865
-D LoRa Module, STM32L151, IN865, RAKwireless
-K IoT LoRa LoRaWAN RF
-F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
-$ENDCMP
-#
-$CMP RAK811-HF-KR920
-D LoRa Module, STM32L151, KR920, RAKwireless
-K IoT LoRa LoRaWAN RF
-F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
-$ENDCMP
-#
-$CMP RAK811-HF-US915
-D LoRa Module, STM32L151, US915, RAKwireless
-K IoT LoRa LoRaWAN RF
-F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
-$ENDCMP
-#
-$CMP RAK811-LF-CN470
-D LoRa Module, STM32L151, CN470, RAKwireless
-K IoT LoRa LoRaWAN RF
-F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
-$ENDCMP
-#
-$CMP RAK811-LF-EU433
-D LoRa Module, STM32L151, EU433, RAKwireless
-K IoT LoRa LoRaWAN RF
-F https://downloads.rakwireless.com/LoRa/RAK811/Hardware_Specification/RAK811_LoRa_Module_Datasheet_V1.4.pdf
-$ENDCMP
-#
-$CMP RFM69HCW
-D Low power ISM Radio Transceiver Module, SPI interface, AES encryption, 434 or 915 MHz, up to 100mW, up to 300 kb/s, SMD-16, DIP-16
-K low power Radio ISM Transceiver Module AES encryption SPI HopeRF
-F https://www.hoperf.com/data/upload/portal/20181127/5bfcb8284d838.pdf
-$ENDCMP
-#
-$CMP RFM69HW
-D ISM Radio Transciever Module, SPI interface
-K Radio, ISM, Transciever, Module, AES
-F https://www.hoperf.com/data/upload/portal/20181127/5bfcbb56f1fd7.pdf
-$ENDCMP
-#
-$CMP RFM69W
-D ISM Radio Transciever Module, SPI interface
-K Radio, ISM, Transciever, Module, AES
-F https://www.hoperf.com/data/upload/portal/20181127/5bfcbe34756e1.pdf
-$ENDCMP
-#
-$CMP RFM95W-868S2
-D Low power long range transceiver module, SPI and parallel interface, 868 MHz, spreading factor 6 to12, bandwith 7.8 to 500kHz, -111 to -148 dBm, SMD-16, DIP-16
-K Low power long range transceiver module
-F https://www.hoperf.com/data/upload/portal/20181127/5bfcbea20e9ef.pdf
-$ENDCMP
-#
-$CMP RFM95W-915S2
-D Low power long range transceiver module, SPI and parallel interface, 915 MHz, spreading factor 6 to12, bandwith 7.8 to 500kHz, -111 to -148 dBm, SMD-16, DIP-16
-K Low power long range transceiver module
-F https://www.hoperf.com/data/upload/portal/20181127/5bfcbea20e9ef.pdf
-$ENDCMP
-#
-$CMP RFM96W-315S2
-D Low power long range transceiver module, SPI and parallel interface, 315 MHz, spreading factor 6 to12, bandwith 7.8 to 500kHz, -111 to -148 dBm, SMD-16, DIP-16
-K Low power long range transceiver module
-F https://www.hoperf.com/data/upload/portal/20181127/5bfcc0ac60235.pdf
-$ENDCMP
-#
-$CMP RFM96W-433S2
-D Low power long range transceiver module, SPI and parallel interface, 433 MHz, spreading factor 6 to12, bandwith 7.8 to 500kHz, -111 to -148 dBm, SMD-16, DIP-16
-K Low power long range transceiver module
-F https://www.hoperf.com/data/upload/portal/20181127/5bfcc0ac60235.pdf
-$ENDCMP
-#
-$CMP RFM97W-868S2
-D Low power long range transceiver module, SPI and parallel interface, 868 MHz, spreading factor 6 to12, bandwith 7.8 to 500kHz, -111 to -139 dBm, SMD-16, DIP-16
-K Low power long range transceiver module
-F https://www.hoperf.com/data/upload/portal/20181127/5bfcbea20e9ef.pdf
-$ENDCMP
-#
-$CMP RFM97W-915S2
-D Low power long range transceiver module, SPI and parallel interface, 915 MHz, spreading factor 6 to12, bandwith 7.8 to 500kHz, -111 to -139 dBm, SMD-16, DIP-16
-K Low power long range transceiver module
-F https://www.hoperf.com/data/upload/portal/20181127/5bfcbea20e9ef.pdf
-$ENDCMP
-#
-$CMP RFM98W-315S2
-D Low power long range transceiver module, SPI and parallel interface, 315 MHz, spreading factor 6 to12, bandwith 7.8 to 500kHz, -111 to -148 dBm, SMD-16, DIP-16
-K Low power long range transceiver module
-F https://www.hoperf.com/data/upload/portal/20181127/5bfcdb5e17543.pdf
-$ENDCMP
-#
-$CMP RFM98W-433S2
-D Low power long range transceiver module, SPI and parallel interface, 433 MHz, spreading factor 6 to12, bandwith 7.8 to 500kHz, -111 to -148 dBm, SMD-16, DIP-16
-K Low power long range transceiver module
-F https://www.hoperf.com/data/upload/portal/20181127/5bfcdb5e17543.pdf
-$ENDCMP
-#
-$CMP TD1205
-D High-Performance, Low-Current SIGFOX™ Gateway And GPS Receiver With Integrated Antennas
-K IOT SIGFOX GPS
-F https://github.com/Telecom-Design/Documentation_TD_RF_Module/blob/master/TD1205%20Datasheet.pdf
-$ENDCMP
-#
-$CMP TD1208
-D High-Performance, Low-Current SIGFOX™ Gateway
-K IOT SIGFOX
-F https://github.com/Telecom-Design/Documentation_TD_RF_Module/blob/master/TD1208%20Datasheet.pdf
-$ENDCMP
-#
-$CMP TR-52DA
-D IQRF common transceiver with PCB antenna, FSK modulation
-K IQRF common transceiver, PCB antenna, FSK modulation
-F https://iqrf.org/weben/downloads.php?id=213
-$ENDCMP
-#
-$CMP TR-52DAT
-D IQRF common transceiver with PCB antenna and thermometer, FSK modulation
-K IQRF common transceiver, PCB antenna, thermometer, FSK modulation
-F https://iqrf.org/weben/downloads.php?id=213
-$ENDCMP
-#
-$CMP TR-72DA
-D IQRF transceiver with PCB antenna, GMSK modulation
-K IQRF transceiver, PCB antenna, GMSK modulation
-F https://iqrf.org/weben/downloads.php?id=337
-$ENDCMP
-#
-$CMP TR-72DAT
-D IQRF transceiver with PCB antenna and thermometer, GMSK modulation
-K IQRF transceiver, PCB antenna, thermometer, GMSK modulation
-F https://iqrf.org/weben/downloads.php?id=337
-$ENDCMP
-#
-$CMP iM880A
-D IMST Long Range Radio Module
-K IOT LoRa
-F http://www.wireless-solutions.de/images/stories/downloads/Radio%20Modules/iM880A/General_Information/iM880A_Datasheet_V1_1.pdf
-$ENDCMP
-#
-$CMP iM880B
-D IMST Long Range Radio Module - LoRa Alliance Certified
-K IOT LoRa
-F http://www.wireless-solutions.de/images/stories/downloads/Radio%20Modules/iM880B/General_Information/iM880B_Datasheet_V1_0.pdf
-$ENDCMP
-#
 #End Doc Library
diff --git a/kicad-symbols/RF_Module.lib b/kicad-symbols/RF_Module.lib
index 299feb96..e6d72fb1 100644
--- a/kicad-symbols/RF_Module.lib
+++ b/kicad-symbols/RF_Module.lib
@@ -715,11 +715,11 @@ X EN 9 -800 1400 100 R 50 50 0 0 I
 ENDDRAW
 ENDDEF
 #
-# RF_Module_ESP32-S2
+# ESP32-S2
 #
-DEF RF_Module_ESP32-S2 U? 0 10 Y Y 1 F N
+DEF ESP32-S2 U? 0 10 Y Y 1 F N
 F0 "U?" 1750 700 60 H V C CNN
-F1 "RF_Module_ESP32-S2" 1700 -3700 60 H V C CNN
+F1 "ESP32-S2" 1700 -3700 60 H V C CNN
 F2 "QFN56_ESP32_7X7_EXP" 1700 -3800 60 H I C CNN
 F3 "" -1150 -700 60 H I C CNN
 F4 "ESP32-S2FN4R2" 0 0 50 H I C CNN "ORDERCODE"