diff --git a/environments.ini b/environments.ini
index f59658acf3..9796f84034 100644
--- a/environments.ini
+++ b/environments.ini
@@ -7,6 +7,7 @@
 
 [env:rfbridge]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = esp8285
 lib_deps =
   ${com-esp.lib_deps}
@@ -27,6 +28,7 @@ custom_hardware = RFBridge v1
 
 [env:rfbridge-direct]
 platform = espressif8266@^2
+framework = arduino
 board = esp8285
 lib_deps =
   ${com-esp.lib_deps}
@@ -51,7 +53,7 @@ custom_hardware = RFBridge v1
 [env:esp32dev-all-test]
 platform = ${com.esp32_platform}
 board = esp32dev
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -226,7 +228,7 @@ custom_description = RS232 reading of GridFree Sun Inverter
 [env:esp32dev-ir]
 platform = ${com.esp32_platform}
 board = esp32dev
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.irremoteesp}
@@ -255,7 +257,7 @@ custom_description = Regular BLE gateway with adaptive scanning activated, autom
 [env:esp32dev-ble-mqtt-undecoded]
 platform = ${com.esp32_platform}
 board = esp32dev
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -272,7 +274,7 @@ custom_description = BLE gateway with the decoding offloaded to Theengs Gateway
 [env:esp32dev-ble-aws]
 platform = ${com.esp32_platform}
 board = esp32dev
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -296,7 +298,7 @@ custom_description = BLE gateway with AWS integration capability
 [env:esp32feather-ble]
 platform = ${com.esp32_platform}
 board = featheresp32
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -313,7 +315,7 @@ custom_hardware = ESP32 Feather Adafruit
 [env:esp32-lolin32lite-ble]
 platform = ${com.esp32_platform}
 board = lolin32
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -342,7 +344,7 @@ custom_hardware = LOLIN 32 Lite
 [env:esp32-olimex-gtw-ble-eth]
 platform = ${com.esp32_platform}
 board = esp32-gateway
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -360,7 +362,7 @@ custom_hardware = OLIMEX ESP32 Gateway
 [env:esp32-olimex-gtw-ble-poe]
 platform = ${com.esp32_platform}
 board = esp32-poe
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -376,7 +378,7 @@ custom_hardware = OLIMEX ESP32 Gateway with POE
 [env:esp32-olimex-gtw-ble-poe-iso]
 platform = ${com.esp32_platform}
 board = esp32-poe-iso
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -392,7 +394,7 @@ custom_hardware = OLIMEX ESP32 Gateway with POE and ISO
 [env:esp32-wt32-eth01-ble-eth]
 platform = ${com.esp32_platform}
 board = esp32-gateway
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -411,7 +413,7 @@ custom_hardware = WT32
 [env:esp32-olimex-gtw-ble-wifi]
 platform = ${com.esp32_platform}
 board = esp32-gateway
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -429,7 +431,7 @@ custom_hardware = OLIMEX ESP32 Gateway
 [env:esp32-m5stick-ble]
 platform = ${com.esp32_platform}
 board = m5stack-core-esp32
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -452,7 +454,7 @@ custom_hardware = M5Stick Grey
 [env:esp32-m5stack-ble]
 platform = ${com.esp32_platform}
 board = m5stack-core-esp32
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.m5stack}
@@ -476,7 +478,7 @@ custom_hardware = M5Stack Core
 [env:esp32-m5tough-ble]
 platform = ${com.esp32_platform}
 board = m5stack-core-esp32
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.m5tough}
@@ -494,7 +496,7 @@ custom_hardware = M5Tough rugged
 [env:esp32-m5stick-c-ble]
 platform = ${com.esp32_platform}
 board = m5stick-c
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -524,7 +526,7 @@ custom_hardware = M5Stick C
 [env:esp32-m5stick-cp-ble]
 platform = ${com.esp32_platform}
 board = pico32
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -554,7 +556,7 @@ custom_hardware = M5Stick CP
 [env:esp32-m5atom-matrix]
 platform = ${com.esp32_platform}
 board = pico32
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -579,7 +581,7 @@ custom_hardware = M5 ATOM Matrix
 [env:esp32-m5atom-lite]
 platform = ${com.esp32_platform}
 board = pico32
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -604,7 +606,7 @@ custom_hardware = M5 ATOM Lite
 [env:esp32doitv1-aithinker-r01-sx1278]
 platform = ${com.esp32_platform}
 board = esp32doit-devkit-v1
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.rtl_433_ESP}
@@ -684,7 +686,7 @@ upload_flags =
 [env:esp32dev-rtl_433]
 platform = ${com.esp32_platform}
 board = esp32dev
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.rtl_433_ESP}
@@ -724,7 +726,7 @@ custom_description = Gateway using RTL_433_ESP library, need CC1101
 platform = ${com.esp32_platform}
 board = heltec_wifi_lora_32_V2
 ; ~/.platformio/packages/framework-arduinoespressif32/variants/.../pins_arduino.h
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ssd1306}
@@ -752,7 +754,7 @@ custom_description = Gateway using RTL_433_ESP and RadioLib
 platform = ${com.esp32_platform}
 board = heltec_wifi_lora_32_V2
 ; ~/.platformio/packages/framework-arduinoespressif32/variants/.../pins_arduino.h
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ssd1306}
@@ -775,7 +777,7 @@ custom_description = Heltec BLE gateway with adaptive scanning activated, automa
 platform = ${com.esp32_platform}
 board = ttgo-lora32-v21
 ; ~/.platformio/packages/framework-arduinoespressif32/variants/.../pins_arduino.h
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ssd1306}
@@ -804,7 +806,7 @@ custom_hardware = ESP32 LILYGO LoRa32 V2.1
 platform = ${com.esp32_platform}
 board = ttgo-lora32-v21
 ; ~/.platformio/packages/framework-arduinoespressif32/variants/.../pins_arduino.h
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ssd1306}
@@ -827,7 +829,7 @@ custom_hardware = ESP32 LILYGO LoRa32 V2.1
 [env:esp32dev-multi_receiver]
 platform = ${com.esp32_platform}
 board = esp32dev
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.rc-switch}
@@ -856,7 +858,7 @@ custom_description = Multi RF library with the possibility to switch between ESP
 [env:tinypico-ble]
 platform = ${com.esp32_platform}
 board = tinypico
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -919,7 +921,7 @@ custom_hardware = ESP32 LILYGO LoRa32 V2.1
 # https://www.thethingsnetwork.org/forum/t/big-esp32-sx127x-topic-part-3/18436
 platform = ${com.esp32_platform}
 board = ttgo-t-beam
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -976,7 +978,7 @@ custom_hardware = ESP32 HELTEC LORA32
 [env:shelly-plus1]
 platform = ${com.esp32_solo_platform}
 board = esp32-solo1
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -1068,6 +1070,7 @@ board_build.flash_mode = dout
 
 [env:nodemcuv2-fastled-test]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1082,6 +1085,7 @@ board_build.flash_mode = dout
 
 [env:nodemcuv2-2g]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1096,6 +1100,7 @@ custom_description = SMS gateway, need A6/A7 GSM module
 
 [env:nodemcuv2-ir]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1111,6 +1116,7 @@ custom_description = Infrared gateway using IRremoteESP8266
 
 [env:nodemcuv2-rs232]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1125,6 +1131,7 @@ custom_description = RS232 gateway
 
 [env:avatto-bakeey-ir]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = esp01_1m
 board_build.ldscript = eagle.flash.1m64.ld
 lib_deps =
@@ -1148,6 +1155,7 @@ custom_hardware = Avatto Bakey IR first version, [tutorial](https://1technophile
 
 [env:nodemcuv2-rf]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1163,6 +1171,7 @@ custom_description = The historic RF gateway using RCSwitch library
 
 [env:nodemcuv2-rf-cc1101]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1180,6 +1189,7 @@ custom_description = RF gateway using RCSwitch library with CC1101
 
 [env:nodemcuv2-somfy-cc1101]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1197,6 +1207,7 @@ custom_description = Somfy RF gateway using Somfy Remote library, need CC1101
 
 [env:manual-wifi-test]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1212,6 +1223,7 @@ board_build.flash_mode = dout
 
 [env:nodemcuv2-mqtt-fw-test]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1224,6 +1236,7 @@ board_build.flash_mode = dout
 
 [env:rf-wifi-gateway]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1241,6 +1254,7 @@ custom_hardware = RF Wifi USB stick, [tutorial](https://1technophile.blogspot.co
 
 [env:nodemcuv2-rf2]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1256,6 +1270,7 @@ custom_description = KAKU RF gateway using NewRemoteSwitch library
 
 [env:nodemcuv2-rf2-cc1101]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1273,6 +1288,7 @@ custom_description = KAKU RF gateway using NewRemoteSwitch library, need CC1101
 
 [env:nodemcuv2-pilight]
 platform = espressif8266@^2
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1288,6 +1304,7 @@ custom_description = Gateway using ESPilight without the need of CC1101
 
 [env:nodemcuv2-weatherstation]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = nodemcuv2
 lib_deps =
   ${com-esp.lib_deps}
@@ -1303,6 +1320,7 @@ custom_description = RF gateway using WeatherStationDataRx library
 
 [env:sonoff-basic]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = esp8285
 lib_deps =
   ${com-esp.lib_deps}
@@ -1325,6 +1343,7 @@ custom_hardware = Sonoff Basic R1, R2
 
 [env:sonoff-basic-rfr3]
 platform = ${com.esp8266_platform}
+framework = arduino
 board = esp8285
 lib_deps =
   ${com-esp.lib_deps}
@@ -1350,6 +1369,7 @@ custom_hardware = Sonoff Basic RFR3, [tutorial](https://1technophile.blogspot.co
 
 [env:atmega-all-test]
 platform = ${com.atmelavr_platform}
+framework = arduino
 board = megaatmega2560
 lib_deps =
   ${com-arduino.lib_deps}
@@ -1403,6 +1423,7 @@ build_flags =
 
 [env:uno-rf]
 platform = ${com.atmelavr_platform}
+framework = arduino
 board = uno
 lib_deps =
   ${com-arduino.lib_deps}
@@ -1417,6 +1438,7 @@ custom_description = RF gateway based on RCSwitch
 
 [env:uno-fastled]
 platform = ${com.atmelavr_platform}
+framework = arduino
 board = uno
 lib_deps =
   ${com-arduino.lib_deps}
@@ -1431,7 +1453,7 @@ custom_description = FastLed control
 [env:esp32dev-ble-datatest]
 platform = ${com.esp32_platform}
 board = esp32dev
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -1493,7 +1515,7 @@ custom_hardware = AtomS3U ESP32S3
 [env:esp32c3-dev-m1-ble]
 platform = ${com.esp32_platform}
 board = esp32-c3-devkitm-1
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -1512,7 +1534,7 @@ custom_description = BLE gateway on the C3
 [env:airm2m_core_esp32c3]
 platform = ${com.esp32_platform}
 board = airm2m_core_esp32c3
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -1531,7 +1553,7 @@ custom_hardware = AirM2M ESP32C3-CORE
 [env:esp32c3-dev-c2-ble]
 platform = ${com.esp32_platform}
 board = esp32-c3-devkitm-1
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}
@@ -1562,7 +1584,7 @@ custom_description = BLE gateway on Espressiv ESP32-C3-DevKitC-02 without loggin
 [env:lolin_c3_mini]
 platform = ${com.esp32_platform}
 board = lolin_c3_mini
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 monitor_speed = 115200
 lib_deps =
   ${com-esp32.lib_deps}
@@ -1602,7 +1624,7 @@ build_flags =
 [env:thingpulse-espgateway]
 platform = ${com.esp32_platform}
 board = esp32dev
-board_build.partitions = min_spiffs.csv
+board_build.partitions = partitions/min_spiffs.csv
 lib_deps =
   ${com-esp32.lib_deps}
   ${libraries.ble}