diff --git a/lib/default/PubSubClient-EspEasy-2.7.12/library.json b/lib/default/PubSubClient-EspEasy-2.7.12/library.json
index 8a36a1c5e..e675ecff3 100644
--- a/lib/default/PubSubClient-EspEasy-2.7.12/library.json
+++ b/lib/default/PubSubClient-EspEasy-2.7.12/library.json
@@ -10,8 +10,5 @@
     "exclude": "tests",
     "examples": "examples/*/*.ino",
     "frameworks": "arduino",
-    "platforms": [
-        "atmelavr",
-        "espressif"
-    ]
+    "platforms": ["espressif8266", "espressif32"]
 }
diff --git a/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/library.properties b/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/library.properties
index 2a8b08e53..89313ddaa 100644
--- a/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/library.properties
+++ b/lib/lib_basic/OneWire-Stickbreaker-20190506-1.1/library.properties
@@ -6,5 +6,5 @@ sentence=Access 1-wire temperature sensors, memory and other chips.
 paragraph= Mod of Paul Stoffregen code to support ESP32
 category=Communication
 url=http://www.pjrc.com/teensy/td_libs_OneWire.html
-architectures=esp32
+architectures=esp8266,esp32
 
diff --git a/lib/lib_basic/TasmotaModbus-1.2.0/library.json b/lib/lib_basic/TasmotaModbus-1.2.0/library.json
index 6de11d0e0..3c28959ea 100644
--- a/lib/lib_basic/TasmotaModbus-1.2.0/library.json
+++ b/lib/lib_basic/TasmotaModbus-1.2.0/library.json
@@ -11,5 +11,5 @@
         "url": "https://github.com/arendst/Tasmota/lib/TasmotaModbus"
     },
     "frameworks": "arduino",
-    "platforms": "espressif8266"
+    "platforms": ["espressif8266", "espressif32"]
 }
diff --git a/lib/lib_basic/TasmotaModbus-1.2.0/library.properties b/lib/lib_basic/TasmotaModbus-1.2.0/library.properties
index 9197e7cfe..7ac182843 100644
--- a/lib/lib_basic/TasmotaModbus-1.2.0/library.properties
+++ b/lib/lib_basic/TasmotaModbus-1.2.0/library.properties
@@ -6,4 +6,4 @@ sentence=Basic modbus wrapper for TasmotaSerial for ESP8266.
 paragraph=
 category=Signal Input/Output
 url=
-architectures=esp8266
+architectures=esp8266,esp32
diff --git a/lib/lib_display/FT5206_Library/library.properties b/lib/lib_display/FT5206_Library/library.properties
index e28709e5c..14b3e2e94 100644
--- a/lib/lib_display/FT5206_Library/library.properties
+++ b/lib/lib_display/FT5206_Library/library.properties
@@ -7,4 +7,3 @@ paragraph=Arduino library for FT5206 chip. Tested with ESP32
 category=Communication
 url=https://github.com/lewisxhe/FT5206_Library
 architectures=*
-architectures=esp32
\ No newline at end of file
diff --git a/lib/lib_display/LiquidCrystal_I2C-1.1.3/library.json b/lib/lib_display/LiquidCrystal_I2C-1.1.3/library.json
index 5a23a3989..1553b6e44 100644
--- a/lib/lib_display/LiquidCrystal_I2C-1.1.3/library.json
+++ b/lib/lib_display/LiquidCrystal_I2C-1.1.3/library.json
@@ -10,6 +10,6 @@
   "frameworks": "arduino",
   "platforms":
   [
-    "atmelavr"
+    "*"
   ]
-}
\ No newline at end of file
+}
diff --git a/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/library.properties b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/library.properties
index 488cfdda2..29a16c0e7 100644
--- a/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/library.properties
+++ b/lib/lib_display/esp-epaper-29-ws-20171230-gemu-1.1/library.properties
@@ -6,4 +6,4 @@ sentence=ESP8266 library for Waveshare e-paper display.
 paragraph=
 category=Display
 url=https://github.com/gemu2015/Sonoff-Tasmota/tree/displays/lib/esp-epaper-29-ws-20171230-gemu-1.0#
-architectures=esp8266
+architectures=*
diff --git a/lib/lib_i2c/BME680_driver-bme680_v3.5.9/library.properties b/lib/lib_i2c/BME680_driver-bme680_v3.5.9/library.properties
index 93954f32d..bf0211d28 100644
--- a/lib/lib_i2c/BME680_driver-bme680_v3.5.9/library.properties
+++ b/lib/lib_i2c/BME680_driver-bme680_v3.5.9/library.properties
@@ -6,4 +6,4 @@ sentence=Sensor driver for BME680 sensor
 paragraph=Sensor driver for BME680 sensor
 category=Sensor
 url=
-architectures=esp8266
+architectures=esp8266,esp32
diff --git a/lib/lib_i2c/I2Cdevlib-Core/.library.json b/lib/lib_i2c/I2Cdevlib-Core/.library.json
index 258acc176..14886c889 100644
--- a/lib/lib_i2c/I2Cdevlib-Core/.library.json
+++ b/lib/lib_i2c/I2Cdevlib-Core/.library.json
@@ -5,7 +5,7 @@
         "type": "git"
     }, 
     "platforms": [
-        "atmelavr"
+        "*"
     ], 
     "frameworks": [
         "arduino"
@@ -28,4 +28,4 @@
     ], 
     "id": 11, 
     "description": "The I2C Device Library (I2Cdevlib) is a collection of uniform and well-documented classes to provide simple and intuitive interfaces to I2C devices."
-}
\ No newline at end of file
+}
diff --git a/lib/lib_i2c/I2Cdevlib-Core/library.json b/lib/lib_i2c/I2Cdevlib-Core/library.json
index d45609604..5a2125b5b 100644
--- a/lib/lib_i2c/I2Cdevlib-Core/library.json
+++ b/lib/lib_i2c/I2Cdevlib-Core/library.json
@@ -9,5 +9,5 @@
     "url": "https://github.com/jrowberg/i2cdevlib.git"
   },
   "frameworks": "arduino",
-  "platforms": "atmelavr"
+  "platforms": "*"
 }
diff --git a/lib/lib_rf/cc1101/library.properties b/lib/lib_rf/cc1101/library.properties
index bfb8a65bc..73e393575 100644
--- a/lib/lib_rf/cc1101/library.properties
+++ b/lib/lib_rf/cc1101/library.properties
@@ -6,4 +6,4 @@ sentence=.
 paragraph=
 category=
 url=
-architectures=esp8266
+architectures=esp8266,esp32
diff --git a/lib/lib_ssl/bearssl-esp8266/library.properties b/lib/lib_ssl/bearssl-esp8266/library.properties
index 1d936cb88..032d4d247 100644
--- a/lib/lib_ssl/bearssl-esp8266/library.properties
+++ b/lib/lib_ssl/bearssl-esp8266/library.properties
@@ -6,4 +6,4 @@ sentence=BearSSL implementation of the SSL/TLS protocol optimized for ESP8266 by
 paragraph=
 category=Other
 url=https://github.com/earlephilhower/bearssl-esp8266.git
-architectures=esp8266
+architectures=esp8266,esp32
diff --git a/lib/libesp32/CORE2_Library/library.properties b/lib/libesp32/CORE2_Library/library.properties
new file mode 100644
index 000000000..09baffd9a
--- /dev/null
+++ b/lib/libesp32/CORE2_Library/library.properties
@@ -0,0 +1,9 @@
+name=M5 Stack Core2 library
+version=1.0
+author=Gerhard Mutz
+maintainer=Gerhard Mutz
+sentence=Allows Tasmota to use Core2
+paragraph=Allows Tasmota to Core2 for esp32
+category=ESP32
+url=
+architectures=*