diff --git a/code/espurna/homeassistant.ino b/code/espurna/homeassistant.ino
index 070fc1ea..5d3b59e0 100644
--- a/code/espurna/homeassistant.ino
+++ b/code/espurna/homeassistant.ino
@@ -255,13 +255,17 @@ void _haInitCommands() {
     settingsRegisterCommand(F("HA.SEND"), [](Embedis* e) {
         setSetting("haEnabled", "1");
         _haConfigure();
-        wsSend(_haWebSocketOnSend);
+        #if WEB_SUPPORT
+            wsSend(_haWebSocketOnSend);
+        #endif
         DEBUG_MSG_P(PSTR("+OK\n"));
     });
     settingsRegisterCommand(F("HA.CLEAR"), [](Embedis* e) {
         setSetting("haEnabled", "0");
         _haConfigure();
-        wsSend(_haWebSocketOnSend);
+        #if WEB_SUPPORT
+            wsSend(_haWebSocketOnSend);
+        #endif
         DEBUG_MSG_P(PSTR("+OK\n"));
     });
 }
diff --git a/code/espurna/settings.ino b/code/espurna/settings.ino
index 9d5767b3..64886b30 100644
--- a/code/espurna/settings.ino
+++ b/code/espurna/settings.ino
@@ -269,11 +269,13 @@ void _settingsInitCommands() {
         DEBUG_MSG_P(PSTR("+OK\n"));
     });
 
-    settingsRegisterCommand(F("RELOAD"), [](Embedis* e) {
-        wsReload();
-        DEBUG_MSG_P(PSTR("+OK\n"));
-    });
-
+    #if WEB_SUPPORT
+        settingsRegisterCommand(F("RELOAD"), [](Embedis* e) {
+            wsReload();
+            DEBUG_MSG_P(PSTR("+OK\n"));
+        });
+    #endif
+    
     settingsRegisterCommand(F("RESET"), [](Embedis* e) {
         DEBUG_MSG_P(PSTR("+OK\n"));
         deferredReset(100, CUSTOM_RESET_TERMINAL);
diff --git a/code/platformio.ini b/code/platformio.ini
index c2dffd53..b34f7b28 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -35,7 +35,7 @@ debug_flags = -DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP
 #    -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY v2 Lower Memory
 #    -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH v2 Higher Bandwidth
 # ------------------------------------------------------------------------------
-build_flags = -g -DMQTT_MAX_PACKET_SIZE=400 ${env.ESPURNA_FLAGS} -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
+build_flags = -g -w -DMQTT_MAX_PACKET_SIZE=400 ${env.ESPURNA_FLAGS} -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
 build_flags_512k = ${common.build_flags} -Wl,-Tesp8266.flash.512k0.ld
 build_flags_1m = ${common.build_flags} -Wl,-Tesp8266.flash.1m0.ld
 
@@ -85,22 +85,22 @@ extra_scripts = extra_scripts.py
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DESPURNA_CORE
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:espurna-core-4MB]
 platform = ${common.platform}
 framework = arduino
 board = d1_mini
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DESPURNA_CORE
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 # ------------------------------------------------------------------------------
@@ -111,7 +111,7 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -D${env.ESPURNA_BOARD}
@@ -124,7 +124,7 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp12e
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -D${env.ESPURNA_BOARD}
@@ -143,7 +143,7 @@ board = esp12e
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DTRAVIS01
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:travis02]
@@ -153,7 +153,7 @@ board = esp12e
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DTRAVIS02
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:travis03]
@@ -163,7 +163,7 @@ board = esp12e
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DTRAVIS03 -DNOWSAUTH -DASYNC_TCP_SSL_ENABLED=1
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 # ------------------------------------------------------------------------------
@@ -178,7 +178,7 @@ lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DWEMOS_D1_MINI_RELAYSHIELD -DDEBUG_FAUXMO=Serial -DNOWSAUTH
 upload_speed = 460800
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:wemos-d1mini-relayshield-ssl]
@@ -189,7 +189,7 @@ lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DWEMOS_D1_MINI_RELAYSHIELD -DDEBUG_FAUXMO=Serial -DNOWSAUTH -DASYNC_TCP_SSL_ENABLED=1
 upload_speed = 460800
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:wemos-d1mini-relayshield-ota]
@@ -212,7 +212,7 @@ lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DNODEMCU_LOLIN -DDEBUG_FAUXMO=Serial -DNOWSAUTH
 upload_speed = 460800
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:nodemcu-lolin-ssl]
@@ -223,7 +223,7 @@ lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DNODEMCU_LOLIN -DDEBUG_FAUXMO=Serial -DNOWSAUTH -DASYNC_TCP_SSL_ENABLED=1
 upload_speed = 460800
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:nodemcu-lolin-ota]
@@ -236,7 +236,7 @@ build_flags = ${common.build_flags} -DNODEMCU_LOLIN -DDEBUG_FAUXMO=Serial -DNOWS
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 # ------------------------------------------------------------------------------
@@ -250,7 +250,7 @@ board = esp12e
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DTINKERMAN_ESPURNA_H06
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:tinkerman-espurna-h06-ota]
@@ -263,7 +263,7 @@ build_flags = ${common.build_flags} -DTINKERMAN_ESPURNA_H06
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:tinkerman-espurna-h08]
@@ -273,7 +273,7 @@ board = esp12e
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DTINKERMAN_ESPURNA_H08
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:tinkerman-espurna-h08-ota]
@@ -286,7 +286,7 @@ build_flags = ${common.build_flags} -DTINKERMAN_ESPURNA_H08
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:tinkerman-espurna-switch]
@@ -296,7 +296,7 @@ board = esp12e
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DTINKERMAN_ESPURNA_SWITCH
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:wemos-d1-tarpunashield]
@@ -306,7 +306,7 @@ board = esp12e
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DWEMOS_D1_TARPUNA_SHIELD
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 # ------------------------------------------------------------------------------
@@ -315,168 +315,168 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_BASIC
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-basic-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_BASIC
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-basic-dht]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_BASIC -DDHT_SUPPORT=1
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-basic-dht-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_BASIC -DDHT_SUPPORT=1
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-basic-dallas]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_BASIC -DDALLAS_SUPPORT=1
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-rf]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_RF
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-rf-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_RF
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-th]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_TH
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-th-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_TH
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-pow]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_POW
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-pow-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_POW
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-pow-r2]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_POW_R2
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-pow-r2-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_POW_R2
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-dual]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_DUAL
@@ -486,7 +486,7 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_DUAL
@@ -499,7 +499,7 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_DUAL_R2
@@ -509,7 +509,7 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_DUAL_R2
@@ -522,250 +522,250 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_4CH
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-4ch-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_4CH
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-4ch-pro]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_4CH_PRO
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-4ch-pro-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_4CH_PRO
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-touch]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_TOUCH
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-touch-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_TOUCH
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-b1]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_B1
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-b1-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_B1
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-t1-1ch]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_T1_1CH
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-t1-1ch-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_T1_1CH
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-t1-2ch]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_T1_2CH
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-t1-2ch-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_T1_2CH
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-t1-3ch]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_T1_3CH
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-t1-3ch-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_T1_3CH
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-led]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_LED
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-led-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_LED
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-rfbridge]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_RFBRIDGE
-monitor_baud = 19200
+monitor_speed = 19200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-rfbridge-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_RFBRIDGE
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 19200
+monitor_speed = 19200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-rfbridge-direct]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_RFBRIDGE -DRFB_DIRECT
-monitor_baud = 19200
+monitor_speed = 19200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-rfbridge-direct-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_RFBRIDGE -DRFB_DIRECT
 upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
-monitor_baud = 19200
+monitor_speed = 19200
 extra_scripts = ${common.extra_scripts}
 
 # ------------------------------------------------------------------------------
@@ -774,148 +774,148 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SLAMPHER
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-slampher-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SLAMPHER
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-s20]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_S20
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-s20-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_S20
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-1ch-inching]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_1CH_INCHING
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-1ch-inching-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_1CH_INCHING
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-motor]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_MOTOR
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-motor-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_MOTOR
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-sv]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_SV
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-sv-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_SV
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-s31]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_S31
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-sonoff-s31-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_S31
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 # ------------------------------------------------------------------------------
@@ -927,7 +927,7 @@ board = esp12e
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DELECTRODRAGON_WIFI_IOT -DDHT_SUPPORT=1
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:electrodragon-wifi-iot-ota]
@@ -940,32 +940,32 @@ build_flags = ${common.build_flags} -DELECTRODRAGON_WIFI_IOT -DDHT_SUPPORT=1
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:workchoice-ecoplug]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DWORKCHOICE_ECOPLUG
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:workchoice-ecoplug-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DWORKCHOICE_ECOPLUG
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:jangoe-wifi-relay-nc]
@@ -975,7 +975,7 @@ board = esp12e
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DJANGOE_WIFI_RELAY_NC
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:jangoe-wifi-relay-nc-ota]
@@ -988,7 +988,7 @@ build_flags = ${common.build_flags} -DJANGOE_WIFI_RELAY_NC
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:jangoe-wifi-relay-no]
@@ -998,7 +998,7 @@ board = esp12e
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DJANGOE_WIFI_RELAY_NO
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:jangoe-wifi-relay-no-ota]
@@ -1011,7 +1011,7 @@ build_flags = ${common.build_flags} -DJANGOE_WIFI_RELAY_NO
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:openenergymonitor-mqtt-relay]
@@ -1021,7 +1021,7 @@ board = esp_wroom_02
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DOPENENERGYMONITOR_MQTT_RELAY -DDALLAS_SUPPORT=1
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:openenergymonitor-mqtt-relay-ota]
@@ -1034,7 +1034,7 @@ build_flags = ${common.build_flags} -DOPENENERGYMONITOR_MQTT_RELAY -DDALLAS_SUPP
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:jorgegarcia-wifi-relays]
@@ -1044,7 +1044,7 @@ board = esp01_1m
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DJORGEGARCIA_WIFI_RELAYS
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:jorgegarcia-wifi-relays-ota]
@@ -1057,331 +1057,331 @@ build_flags = ${common.build_flags_1m} -DJORGEGARCIA_WIFI_RELAYS
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:aithinker-ai-light]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DAITHINKER_AI_LIGHT
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:aithinker-ai-light-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DAITHINKER_AI_LIGHT
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:magichome-led-controller]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DMAGICHOME_LED_CONTROLLER
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:magichome-led-controller-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DMAGICHOME_LED_CONTROLLER
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:magichome-led-controller-20]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DMAGICHOME_LED_CONTROLLER_20
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:magichome-led-controller-20-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DMAGICHOME_LED_CONTROLLER_20
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:huacanxing-h801]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DHUACANXING_H801
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:huacanxing-h801-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DHUACANXING_H801
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:huacanxing-h802]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DHUACANXING_H802
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:huacanxing-h802-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DHUACANXING_H802
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:arilux-al-lc01]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_AL_LC01
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:arilux-al-lc01-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_AL_LC01
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:arilux-al-lc02]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_AL_LC02
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:arilux-al-lc02-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_AL_LC02
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:arilux-al-lc06]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_AL_LC06
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:arilux-al-lc06-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_AL_LC06
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:arilux-al-lc11]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_AL_LC11
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:arilux-al-lc11-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_AL_LC11
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:arilux-e27]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_E27
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:arilux-e27-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_E27
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-bnsz01]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_BNSZ01
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:itead-bnsz01-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DITEAD_BNSZ01
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:wion-50055]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DWION_50055
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:wion-50055-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DWION_50055
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:exs-wifi-relay-v31]
 platform = ${common.platform}
 framework = arduino
 board = esp07
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DEXS_WIFI_RELAY_V31
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:exs-wifi-relay-v31-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp07
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DEXS_WIFI_RELAY_V31
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:wemos-v9261f]
@@ -1392,7 +1392,7 @@ lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DGENERIC_V9261F
 upload_speed = 460800
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:wemos-v9261f-ota]
@@ -1405,32 +1405,32 @@ build_flags = ${common.build_flags} -DGENERIC_V9261F
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:esp01-v9261f]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DGENERIC_V9261F
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:esp01-v9261f-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DGENERIC_V9261F
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:wemos-ech1560]
@@ -1441,7 +1441,7 @@ lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DGENERIC_ECH1560
 upload_speed = 460800
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:wemos-ech1560-ota]
@@ -1454,32 +1454,32 @@ build_flags = ${common.build_flags} -DGENERIC_ECH1560
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:esp01-ech1560]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DGENERIC_ECH1560
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:esp01-ech1560-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DGENERIC_ECH1560
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:mancavemade-esplive]
@@ -1490,7 +1490,7 @@ lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DMANCAVEMADE_ESPLIVE
 upload_speed = 460800
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:mancavemade-esplive-ota]
@@ -1503,132 +1503,132 @@ build_flags = ${common.build_flags} -DMANCAVEMADE_ESPLIVE
 upload_speed = 460800
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:intermittech-quinled]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DINTERMITTECH_QUINLED
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:intermittech-quinled-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DINTERMITTECH_QUINLED
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:xenon-sm-pw702u]
 platform = ${common.platform}
 framework = arduino
 board = esp12e
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DXENON_SM_PW702U
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:xenon-sm-pw702u-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp12e
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DXENON_SM_PW702U
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:authometion-lyt8266]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DAUTHOMETION_LYT8266
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:authometion-lyt8266-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DAUTHOMETION_LYT8266
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:kmc-70011]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DKMC_70011
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:kmc-70011-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DKMC_70011
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:yjzk-switch-2ch]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DYJZK_SWITCH_2CH
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:yjzk-switch-2ch-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DYJZK_SWITCH_2CH
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:generic-8ch]
@@ -1639,25 +1639,25 @@ lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DGENERIC_8CH
 upload_speed = 460800
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:gizwits-witty-cloud]
 platform = ${common.platform}
 framework = arduino
 board = esp12e
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DGIZWITS_WITTY_CLOUD
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:gizwits-witty-cloud-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp12e
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DGIZWITS_WITTY_CLOUD
@@ -1670,18 +1670,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DEUROMATE_WIFI_STECKER_SCHUKO
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:euromate-wifi-stecker-shuko-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DEUROMATE_WIFI_STECKER_SCHUKO
@@ -1694,18 +1694,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DTONBUX_POWERSTRIP02
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:tonbux-powerstrip02-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DTONBUX_POWERSTRIP02
@@ -1718,18 +1718,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DLINGAN_SWA1
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:lingan-swa1-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DLINGAN_SWA1
@@ -1742,43 +1742,43 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DSTM_RELAY
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:stm-relay-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DSTM_RELAY
 upload_speed = 115200
 upload_port = ${common.upload_port}
 upload_flags = ${common.upload_flags}
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:heygo-hy02]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DHEYGO_HY02
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:heygo-hy02-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DHEYGO_HY02
@@ -1791,18 +1791,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DMAXCIO_WUS002S
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:maxcio-wus002s-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DMAXCIO_WUS002S
@@ -1815,18 +1815,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DYIDIAN_XSSSA05
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:yidian-xsssa05-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DYIDIAN_XSSSA05
@@ -1839,18 +1839,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DTONBUX_XSSSA06
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:tonbux-xsssa06-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DTONBUX_XSSSA06
@@ -1863,18 +1863,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp12e
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DGREEN_ESP8266RELAY
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:green-esp8266relay-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp12e
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DGREEN_ESP8266RELAY
@@ -1887,18 +1887,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp12e
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DIKE_ESPIKE
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:ike-espike-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp12e
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DIKE_ESPIKE
@@ -1911,18 +1911,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp12e
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DARNIEX_SWIFITCH
 extra_scripts = ${common.extra_scripts}
-monitor_baud = 115200
+monitor_speed = 115200
 
 [env:arniex-swifitch-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp12e
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DARNIEX_SWIFITCH
@@ -1935,68 +1935,68 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DZHILDE_EU44_W
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:zhilde-eu44-w-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DZHILDE_EU44_W
 upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:luani-hvio]
 platform = ${common.platform}
 framework = arduino
 board = esp07
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DLUANI_HVIO
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:luani-hvio-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp07
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DZLUANI_HVIO
 upload_speed = 115200
 upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:neo-coolcam-power-plug-wifi]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DNEO_COOLCAM_POWER_PLUG_WIFI
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:neo-coolcam-power-plug-wifi-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DNEO_COOLCAM_POWER_PLUG_WIFI
@@ -2009,18 +2009,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DESTINK_WIFI_POWER_STRIP
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:estink-wifi-power-strip-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags} -DESTINK_WIFI_POWER_STRIP
@@ -2037,18 +2037,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_RELAY_V40
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:generic-esp01s-relay-40-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_RELAY_V40
@@ -2061,18 +2061,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_RGBLED_V10
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:generic-esp01s-rgbled-10-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_RGBLED_V10
@@ -2085,18 +2085,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_DHT11_V10
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:generic-esp01s-dht11-10-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_DHT11_V10
@@ -2109,18 +2109,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_DS18B20_V10
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:generic-esp01s-ds18b20-10-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DGENERIC_ESP01S_DS18B20_V10
@@ -2133,18 +2133,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DHELTEC_TOUCHRELAY
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:heltec-touch-relay-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DHELTEC_TOUCHRELAY
@@ -2157,18 +2157,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp12e
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DALLNET_4DUINO_IOT_WLAN_RELAIS
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:allnet-4duino-iot-wlan-relais-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp12e
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DALLNET_4DUINO_IOT_WLAN_RELAIS
@@ -2181,18 +2181,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DTONBUX_MOSQUITO_KILLER
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:tonbux-mosquito-killer-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DTONBUX_MOSQUITO_KILLER
@@ -2205,18 +2205,18 @@ extra_scripts = ${common.extra_scripts}
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DPILOTAK_ESP_DIN_V1
-monitor_baud = 115200
+monitor_speed = 115200
 extra_scripts = ${common.extra_scripts}
 
 [env:pilotak-esp-din-v1-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
-board_flash_mode = dout
+board_build.flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m} -DPILOTAK_ESP_DIN_V1