diff --git a/platformio.ini b/platformio.ini
index b54b364ac..46a6aaead 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -33,10 +33,13 @@ src_dir = sonoff
 ;env_default = sonoff-TW
 
 [common] ; ************************************************************
-; *** Esp8266 core for Arduino version
-platform = espressif8266@1.5.0  ; v2.3.0
-;platform = espressif8266@1.6.0  ; v2.4.0
-;platform = espressif8266@1.7.0  ; v2.4.1
+  ; *** Esp8266 core for Arduino version 2.3.0
+;platform = espressif8266@1.5.0
+  ; *** Esp8266 core for Arduino version 2.4.0
+platform = espressif8266@1.6.0
+  ; *** Esp8266 core for Arduino version 2.4.1
+;platform = espressif8266@1.7.0
+  ; *** Esp8266 core for Arduino current version
 ;platform = espressif8266
 
 framework = arduino
@@ -56,7 +59,7 @@ build_flags =
 extra_scripts = pio/strip-floats.py
 
 ; *** Serial Monitor options
-monitor_baud = 115200
+monitor_speed = 115200
 
 ; *** Upload Serial reset method for Wemos and NodeMCU
 ;upload_speed = 115200
@@ -81,7 +84,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags}
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_resetmethod = ${common.upload_resetmethod}
 upload_port = ${common.upload_port}
@@ -94,7 +97,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DBE_MINIMAL
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -106,7 +109,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DUSE_CLASSIC
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -118,7 +121,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DUSE_KNX_NO_EMULATION
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -130,7 +133,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DUSE_ALL_SENSORS
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -142,7 +145,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -154,7 +157,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-BR
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -166,7 +169,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-CN
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -178,7 +181,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=cs-CZ
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -190,7 +193,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=de-DE
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -202,7 +205,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=es-AR
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -214,7 +217,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=fr-FR
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -226,7 +229,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=el-GR
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -238,7 +241,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=hu-HU
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -250,7 +253,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=it-IT
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -262,7 +265,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=nl-NL
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -274,7 +277,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -286,7 +289,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -298,7 +301,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}
@@ -310,7 +313,7 @@ board = ${common.board}
 board_flash_mode = ${common.board_flash_mode}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW
-monitor_baud = ${common.monitor_baud}
+monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 upload_port = ${common.upload_port}
 extra_scripts = ${common.extra_scripts}