diff --git a/platformio_override_sample.ini b/pio/platformio_override_sample.ini
similarity index 95%
rename from platformio_override_sample.ini
rename to pio/platformio_override_sample.ini
index c0313577e..d94903d0e 100644
--- a/platformio_override_sample.ini
+++ b/pio/platformio_override_sample.ini
@@ -208,16 +208,4 @@ build_flags               = ${esp82xx_defaults.build_flags}
 
 ; *** Debug version used for PlatformIO Home Project Inspection
 [env:tasmota-debug]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
 build_type = debug
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags}
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
diff --git a/pio/tasmota_env.ini b/pio/tasmota_env.ini
new file mode 100644
index 000000000..46e71d7af
--- /dev/null
+++ b/pio/tasmota_env.ini
@@ -0,0 +1,99 @@
+[env]
+platform = ${common.platform}
+framework = ${common.framework}
+board = ${common.board}
+board_build.flash_mode = ${common.board_build.flash_mode}
+board_build.f_cpu = ${common.board_build.f_cpu}
+build_unflags = ${common.build_unflags}
+build_flags = ${common.build_flags}
+monitor_speed = ${common.monitor_speed}
+upload_port = ${common.upload_port}
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
+extra_scripts = ${common.extra_scripts}
+
+[env:tasmota]
+
+[env:tasmota-minimal]
+build_flags = ${common.build_flags} -DFIRMWARE_MINIMAL
+
+[env:tasmota-basic]
+build_flags = ${common.build_flags} -DFIRMWARE_BASIC
+
+[env:tasmota-knx]
+build_flags = ${common.build_flags} -DFIRMWARE_KNX_NO_EMULATION
+
+[env:tasmota-sensors]
+build_flags = ${common.build_flags} -DFIRMWARE_SENSORS
+
+[env:tasmota-display]
+build_flags = ${common.build_flags} -DFIRMWARE_DISPLAYS
+
+[env:tasmota-ir]
+build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR
+
+[env:tasmota-ircustom]
+build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL
+
+[env:tasmota-BG]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG
+
+[env:tasmota-BR]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-BR
+
+[env:tasmota-CN]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-CN
+
+[env:tasmota-CZ]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=cs-CZ
+
+[env:tasmota-DE]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=de-DE
+
+[env:tasmota-ES]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=es-ES
+
+[env:tasmota-FR]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=fr-FR
+
+[env:tasmota-GR]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=el-GR
+
+[env:tasmota-HE]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=he-HE
+
+[env:tasmota-HU]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=hu-HU
+
+[env:tasmota-IT]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=it-IT
+
+[env:tasmota-KO]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=ko-KO
+
+[env:tasmota-NL]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=nl-NL
+
+[env:tasmota-PL]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL
+
+[env:tasmota-PT]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT
+
+[env:tasmota-RU]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU
+
+[env:tasmota-SE]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=sv-SE
+
+[env:tasmota-SK]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=sk-SK
+
+[env:tasmota-TR]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=tr-TR
+
+[env:tasmota-TW]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW
+
+[env:tasmota-UK]
+build_flags = ${common.build_flags} -DMY_LANGUAGE=uk-UK
diff --git a/platformio.ini b/platformio.ini
index 838354a84..5db6b8ed0 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,7 +11,8 @@
 src_dir = tasmota
 build_dir = .pioenvs
 build_cache_dir = .cache
-extra_configs = platformio_override.ini
+extra_configs = pio/tasmota_env.ini
+                pio/platformio_override.ini
 
 ; *** Build/upload environment
 default_envs = 
@@ -46,8 +47,8 @@ default_envs =
 ;                tasmota-TW
 ;                tasmota-UK
 ;
-; *** alternatively can be done in file: platformio_override.ini
-; *** See example: platformio_override_sample.ini
+; *** alternatively can be done in: pio/platformio_override.ini
+; *** See example: platformio_override_sample.ini in folder pio
 ; *********************************************************************
 
 
@@ -63,8 +64,8 @@ build_flags               = ${core_active.build_flags}
 ; *** Uncomment, by deleting ";" in line below, to use custom settings from file user_config_override.h 
 ;                            -DUSE_CONFIG_OVERRIDE
 ;
-; *** alternatively can be done in: platformio_override.ini
-; *** See example: platformio_override_sample.ini
+; *** alternatively can be done in: pio/platformio_override.ini
+; *** See example: platformio_override_sample.ini in folder pio
 ; *********************************************************************
 
 ; *** Fix espressif8266@1.7.0 induced undesired all warnings
@@ -106,410 +107,3 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ; No exception code in firmware
                             -fno-exceptions
                             -lstdc++
-
-
-[env:tasmota]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags}
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-minimal]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DFIRMWARE_MINIMAL
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-basic]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DFIRMWARE_BASIC
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-knx]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DFIRMWARE_KNX_NO_EMULATION
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-sensors]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DFIRMWARE_SENSORS
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-display]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DFIRMWARE_DISPLAYS
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-ir]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-ircustom]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DUSE_IR_REMOTE_FULL
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-BG]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-BR]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-BR
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-CN]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-CN
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-CZ]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=cs-CZ
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-DE]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=de-DE
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-ES]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=es-ES
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-FR]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=fr-FR
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-GR]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=el-GR
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-HE]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=he-HE
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-HU]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=hu-HU
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-IT]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=it-IT
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-KO]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=ko-KO
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-NL]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=nl-NL
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-PL]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-PT]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-RU]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-SE]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=sv-SE
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-SK]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=sk-SK
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-TR]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=tr-TR
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-TW]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}
-
-[env:tasmota-UK]
-platform = ${common.platform}
-framework = ${common.framework}
-board = ${common.board}
-board_build.flash_mode = ${common.board_build.flash_mode}
-board_build.f_cpu = ${common.board_build.f_cpu}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} -DMY_LANGUAGE=uk-UK
-monitor_speed = ${common.monitor_speed}
-upload_port = ${common.upload_port}
-upload_resetmethod = ${common.upload_resetmethod}
-upload_speed = ${common.upload_speed}
-extra_scripts = ${common.extra_scripts}