diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index a2304e4ac..68aa4a0d6 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -34,110 +34,110 @@ lib_ignore              =
 [env:tasmota]
 
 [env:tasmota-minimal]
-build_flags             = ${common.build_flags} -DFIRMWARE_MINIMAL
+build_flags             = ${env.build_flags} -DFIRMWARE_MINIMAL
 lib_extra_dirs          =
 
 [env:tasmota-lite]
-build_flags             = ${common.build_flags} -DFIRMWARE_LITE
+build_flags             = ${env.build_flags} -DFIRMWARE_LITE
 lib_extra_dirs          =
 
 [env:tasmota-knx]
-build_flags             = ${common.build_flags} -DFIRMWARE_KNX_NO_EMULATION
+build_flags             = ${env.build_flags} -DFIRMWARE_KNX_NO_EMULATION
 lib_extra_dirs          = lib/lib_basic, lib/lib_div
 
 [env:tasmota-sensors]
-build_flags             = ${common.build_flags} -DFIRMWARE_SENSORS
+build_flags             = ${env.build_flags} -DFIRMWARE_SENSORS
 lib_extra_dirs          = lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div
 
 [env:tasmota-display]
-build_flags             = ${common.build_flags} -DFIRMWARE_DISPLAYS
+build_flags             = ${env.build_flags} -DFIRMWARE_DISPLAYS
 lib_extra_dirs          = lib/lib_basic, lib/lib_display
 
 [env:tasmota-ir]
-build_flags             = ${common.build_flags} -DFIRMWARE_IR
+build_flags             = ${env.build_flags} -DFIRMWARE_IR
 lib_extra_dirs          = lib/lib_basic
 
 [env:tasmota-zbbridge]
-build_flags             = ${common.build_flags} -DFIRMWARE_ZBBRIDGE
+build_flags             = ${env.build_flags} -DFIRMWARE_ZBBRIDGE
 board                   = esp8266_zbbridge
 lib_extra_dirs          = lib/lib_ssl
 
 [env:tasmota-zigbee]
-build_flags             = ${common.build_flags} -DUSE_ZIGBEE -DUSE_CCLOADER -DUSE_UFILESYS
+build_flags             = ${env.build_flags} -DUSE_ZIGBEE -DUSE_CCLOADER -DUSE_UFILESYS
 board                   = esp8266_4M2M
 board_build.f_cpu       = 160000000L
 
 [env:tasmota-AF]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=af_AF
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=af_AF
 
 [env:tasmota-BG]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=bg_BG
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=bg_BG
 
 [env:tasmota-BR]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=pt_BR
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=pt_BR
 
 [env:tasmota-CN]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=zh_CN
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=zh_CN
 
 [env:tasmota-CZ]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=cs_CZ
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=cs_CZ
 
 [env:tasmota-DE]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=de_DE
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=de_DE
 
 [env:tasmota-ES]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=es_ES
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=es_ES
 
 [env:tasmota-FR]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=fr_FR
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=fr_FR
 
 [env:tasmota-FY]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=fy_NL
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=fy_NL
 
 [env:tasmota-GR]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=el_GR
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=el_GR
 
 [env:tasmota-HE]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=he_HE
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=he_HE
 
 [env:tasmota-HU]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=hu_HU
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=hu_HU
 
 [env:tasmota-IT]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=it_IT
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=it_IT
 
 [env:tasmota-KO]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=ko_KO
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=ko_KO
 
 [env:tasmota-NL]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=nl_NL
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=nl_NL
 
 [env:tasmota-PL]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=pl_PL
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=pl_PL
 
 [env:tasmota-PT]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=pt_PT
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=pt_PT
 
 [env:tasmota-RO]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=ro_RO
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=ro_RO
 
 [env:tasmota-RU]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=ru_RU
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=ru_RU
 
 [env:tasmota-SE]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=sv_SE
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=sv_SE
 
 [env:tasmota-SK]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=sk_SK
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=sk_SK
 
 [env:tasmota-TR]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=tr_TR
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=tr_TR
 
 [env:tasmota-TW]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=zh_TW
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=zh_TW
 
 [env:tasmota-UK]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=uk_UA
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=uk_UA
 
 [env:tasmota-VN]
-build_flags             = ${common.build_flags} -DMY_LANGUAGE=vi_VN
+build_flags             = ${env.build_flags} -DMY_LANGUAGE=vi_VN
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 41f6bab10..aad8f2935 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -26,163 +26,163 @@ lib_ignore              =
 
 [env:tasmota32]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
 
 [env:tasmota32_8M]
 extends                 = env:tasmota32_base
 board                   = esp32_8M
-build_flags             = ${common32.build_flags} -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
 
 [env:tasmota32_16M]
 extends                 = env:tasmota32_base
 board                   = esp32_16M
-build_flags             = ${common32.build_flags} -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
 
 [env:tasmota32solo1]
 extends                 = env:tasmota32_base
 platform_packages       = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/1.0.7/tasmota-arduinoespressif32-solo1-release_v3.3.5.tar.gz
                           platformio/tool-esptoolpy @ ~1.30100
                           platformio/tool-mklittlefs @ ~1.203.200522
-build_flags             = ${common32.build_flags} -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-webcam]
 extends                 = env:tasmota32_base
 board                   = esp32-cam
 board_build.flash_mode  = qio
-build_flags             = ${common32.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -lc-psram-workaround -lm-psram-workaround -DFIRMWARE_WEBCAM
+build_flags             = ${env:tasmota32_base.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -lc-psram-workaround -lm-psram-workaround -DFIRMWARE_WEBCAM
 lib_extra_dirs          = lib/libesp32, lib/lib_basic
 
 [env:tasmota32-odroidgo]
 extends                 = env:tasmota32_base
 board                   = esp32-odroid
 board_build.flash_mode  = qio
-build_flags             = ${common32.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -lc-psram-workaround -lm-psram-workaround -DFIRMWARE_ODROID_GO
+build_flags             = ${env:tasmota32_base.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -lc-psram-workaround -lm-psram-workaround -DFIRMWARE_ODROID_GO
 lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display
 
 [env:tasmota32-core2]
 extends                 = env:tasmota32_base
 board                   = esp32-m5core2
 board_build.flash_mode  = qio
-build_flags             = ${common32.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -lc-psram-workaround -lm-psram-workaround -DFIRMWARE_M5STACK_CORE2
+build_flags             = ${env:tasmota32_base.build_flags} -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -lc-psram-workaround -lm-psram-workaround -DFIRMWARE_M5STACK_CORE2
 lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display, lib/lib_audio
 
 [env:tasmota32-bluetooth]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DFIRMWARE_BLUETOOTH
+build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_BLUETOOTH
 lib_extra_dirs          = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_ssl
 
 [env:tasmota32-display]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DFIRMWARE_DISPLAYS
+build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_DISPLAYS
 lib_extra_dirs          = lib/libesp32, lib/lib_basic, lib/lib_display
 
 [env:tasmota32-lvgl]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DFIRMWARE_LVGL
+build_flags             = ${env:tasmota32_base.build_flags} -DFIRMWARE_LVGL
 board_build.f_cpu       = 160000000L
 lib_extra_dirs          = lib/libesp32, lib/libesp32_lvgl, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display
 
 [env:tasmota32-ir]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR
+build_flags             = ${env:tasmota32_base.build_flags} -DUSE_IR_REMOTE_FULL -DFIRMWARE_IR
 lib_extra_dirs          = lib/libesp32, lib/lib_basic
 
 [env:tasmota32-AF]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=af_AF -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=af_AF -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-BG]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=bg_BG -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=bg_BG -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-BR]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=pt_BR -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=pt_BR -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-CN]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=zh_CN -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=zh_CN -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-CZ]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=cs_CZ -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=cs_CZ -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-DE]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=de_DE -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=de_DE -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-ES]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=es_ES -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=es_ES -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-FR]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=fr_FR -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=fr_FR -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-FY]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=fy_NL -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=fy_NL -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-GR]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=el_GR -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=el_GR -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-HE]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=he_HE -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=he_HE -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-HU]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=hu_HU -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=hu_HU -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-IT]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=it_IT -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=it_IT -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-KO]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=ko_KO -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=ko_KO -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-NL]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=nl_NL -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=nl_NL -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-PL]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=pl_PL -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=pl_PL -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-PT]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=pt_PT -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=pt_PT -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-RO]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=ro_RO -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=ro_RO -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-RU]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=ru_RU -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=ru_RU -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-SE]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=sv_SE -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=sv_SE -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-SK]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=sk_SK -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=sk_SK -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-TR]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=tr_TR -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=tr_TR -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-TW]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=zh_TW -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=zh_TW -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-UK]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=uk_UA -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=uk_UA -DFIRMWARE_TASMOTA32
 
 [env:tasmota32-VN]
 extends                 = env:tasmota32_base
-build_flags             = ${common32.build_flags} -DMY_LANGUAGE=vi_VN -DFIRMWARE_TASMOTA32
+build_flags             = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=vi_VN -DFIRMWARE_TASMOTA32