diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 73c68c86d..d4dceabb5 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -38,59 +38,59 @@ default_envs =
 
 
 [common]
-platform_packages         = ${core.platform_packages}
-build_unflags             = ${core.build_unflags}
-build_flags               = ${core.build_flags}
+platform_packages           = ${core.platform_packages}
+build_unflags               = ${core.build_unflags}
+build_flags                 = ${core.build_flags}
 ; *** Optional Debug messages
 ;                            -DDEBUG_TASMOTA_CORE
 ;                            -DDEBUG_TASMOTA_DRIVER
 ;                            -DDEBUG_TASMOTA_SENSOR
 
 ; set CPU frequency to 80MHz (default) or 160MHz
-;board_build.f_cpu         = 160000000L
+;board_build.f_cpu           = 160000000L
 
 ; set Flash chip frequency to 40MHz (default), 20MHz, 26Mhz, 80Mhz
-;board_build.f_flash       = 20000000L
-;board_build.f_flash       = 26000000L
-;board_build.f_flash       = 80000000L
+;board_build.f_flash         = 20000000L
+;board_build.f_flash         = 26000000L
+;board_build.f_flash         = 80000000L
 
 ; *** Upload Serial reset method for Wemos and NodeMCU
-upload_port               = COM5
+upload_port                 = COM5
 
-extra_scripts             = ${scripts_defaults.extra_scripts}
-;                            pio/obj-dump.py
+extra_scripts               = ${scripts_defaults.extra_scripts}
+;                              pio/obj-dump.py
 
 ; *** Upload file to OTA server using SCP
-;upload_port               = user@host:/path
-;extra_scripts             = ${scripts_defaults.extra_scripts}
-;                            pio/strip-floats.py
-;                            pio/sftp-uploader.py
+;upload_port                 = user@host:/path
+;extra_scripts               = ${scripts_defaults.extra_scripts}
+;                              pio/strip-floats.py
+;                              pio/sftp-uploader.py
 
 ; *** Upload file to OTA server in folder api/arduino using HTTP
-;upload_port               = domus1:80/api/upload-arduino.php
-;extra_scripts             = ${scripts_defaults.extra_scripts}
-;                            pio/strip-floats.py
-;                            pio/http-uploader.py
+;upload_port                 = domus1:80/api/upload-arduino.php
+;extra_scripts               = ${scripts_defaults.extra_scripts}
+;                              pio/strip-floats.py
+;                              pio/http-uploader.py
 
-lib_extra_dirs             = ${library.lib_extra_dirs}
+lib_extra_dirs              = ${library.lib_extra_dirs}
 
 [core]
 ; Activate only (one set) if you want to override the standard core defined in platformio.ini !!!
 
-;platform_packages         = ${tasmota_stage.platform_packages}
-;build_unflags             = ${tasmota_stage.build_unflags}
-;build_flags               = ${tasmota_stage.build_flags}
+;platform_packages           = ${tasmota_stage.platform_packages}
+;build_unflags               = ${tasmota_stage.build_unflags}
+;build_flags                 = ${tasmota_stage.build_flags}
 
-;platform_packages         = ${core_stage.platform_packages}
-;build_unflags             = ${core_stage.build_unflags}
-;build_flags               = ${core_stage.build_flags}
+;platform_packages           = ${core_stage.platform_packages}
+;build_unflags               = ${core_stage.build_unflags}
+;build_flags                 = ${core_stage.build_flags}
 
 
 [tasmota_stage]
 ; *** Esp8266 core for Arduino version Tasmota stage (PR7231 and Backport PR7514)
-platform_packages         = framework-arduinoespressif8266@https://github.com/Jason2866/Arduino.git#2.7.4.4
-build_unflags             = ${esp_defaults.build_unflags}
-build_flags               = ${esp82xx_defaults.build_flags}
+platform_packages           = framework-arduinoespressif8266@https://github.com/Jason2866/Arduino.git#2.7.4.4
+build_unflags               = ${esp_defaults.build_unflags}
+build_flags                 = ${esp82xx_defaults.build_flags}
 
 ; *********** Alternative Options, enable only if you know exactly what you do ********
 ; NONOSDK221
@@ -118,17 +118,17 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ; VTABLES in IRAM
 ;                            -DVTABLES_IN_IRAM
 ; Exception code in firmware /needs much space!
-;                           -fexceptions
-;                           -lstdc++-exc
+;                            -fexceptions
+;                            -lstdc++-exc
 
 [core_stage]
 ; *** Esp8266 core version. Tasmota stage or Arduino stage version. Built with GCC 10.1 toolchain
-platform_packages         = framework-arduinoespressif8266 @ https://github.com/Jason2866/platform-espressif8266/releases/download/2.9.1/framework-arduinoespressif8266-3.20901.0.tar.gz
+platform_packages           = framework-arduinoespressif8266 @ https://github.com/Jason2866/platform-espressif8266/releases/download/2.9.1/framework-arduinoespressif8266-3.20901.0.tar.gz
                             ;framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
                             toolchain-xtensa @ ~2.100100.0
-build_unflags             = ${esp_defaults.build_unflags}
+build_unflags               = ${esp_defaults.build_unflags}
                             -Wswitch-unreachable
-build_flags               = ${esp82xx_defaults.build_flags}
+build_flags                 = ${esp82xx_defaults.build_flags}
                             -Wno-switch-unreachable
 
 ; *********** Alternative Options, enable only if you know exactly what you do ********
@@ -159,76 +159,76 @@ build_flags               = ${esp82xx_defaults.build_flags}
 ;                           -lstdc++-exc
 
 [common32]
-platform                = ${core32.platform}
-platform_packages       = ${core32.platform_packages}
-build_unflags           = ${core32.build_unflags}
-build_flags             = ${core32.build_flags}
-board                   = esp32dev
-board_build.ldscript    = esp32_out.ld
-board_build.partitions  = esp32_partition_app1984k_spiffs64k.csv
-board_build.flash_mode  = ${common.board_build.flash_mode}
-board_build.f_flash     = ${common.board_build.f_flash}
-board_build.f_cpu       = ${common.board_build.f_cpu}
-monitor_speed           = ${common.monitor_speed}
-upload_port             = ${common.upload_port}
-upload_resetmethod      = ${common.upload_resetmethod}
-upload_speed            = 921600
-extra_scripts           = ${common.extra_scripts}
-lib_extra_dirs          = ${library.lib_extra_dirs}
-                          ; *** ESP32 lib. ALWAYS needed for ESP32 !!!
-                          lib/libesp32
+platform                    = ${core32.platform}
+platform_packages           = ${core32.platform_packages}
+build_unflags               = ${core32.build_unflags}
+build_flags                 = ${core32.build_flags}
+board                       = esp32dev
+board_build.ldscript        = esp32_out.ld
+board_build.partitions      = esp32_partition_app1984k_spiffs64k.csv
+board_build.flash_mode      = ${common.board_build.flash_mode}
+board_build.f_flash         = ${common.board_build.f_flash}
+board_build.f_cpu           = ${common.board_build.f_cpu}
+monitor_speed               = ${common.monitor_speed}
+upload_port                 = ${common.upload_port}
+upload_resetmethod          = ${common.upload_resetmethod}
+upload_speed                = 921600
+extra_scripts               = ${common.extra_scripts}
+lib_extra_dirs              = ${library.lib_extra_dirs}
+; *** ESP32 lib. ALWAYS needed for ESP32 !!!
+                              lib/libesp32
 [core32]
 ; Activate Stage Core32 by removing ";" in next 4 lines, if you want to override the standard core32
-;platform                = ${core32_stage.platform}
-;platform_packages       = ${core32_stage.platform_packages}
-;build_unflags           = ${core32_stage.build_unflags}
-;build_flags             = ${core32_stage.build_flags}     
+;platform                    = ${core32_stage.platform}
+;platform_packages           = ${core32_stage.platform_packages}
+;build_unflags               = ${core32_stage.build_unflags}
+;build_flags                 = ${core32_stage.build_flags}
 
 
 [core32_stage]
-platform                = espressif32@2.0.0
-platform_packages       = tool-esptoolpy@1.20800.0
-                          framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#f7fb00632e04d74a7890a77fa7dbbb8ae572e866
-build_unflags           = ${esp32_defaults.build_unflags}
-build_flags             = ${esp32_defaults.build_flags}
-                          -D ESP32_STAGE=true
+platform                    = espressif32@2.0.0
+platform_packages           = tool-esptoolpy@1.20800.0
+                              framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#f7fb00632e04d74a7890a77fa7dbbb8ae572e866
+build_unflags               = ${esp32_defaults.build_unflags}
+build_flags                 = ${esp32_defaults.build_flags}
+                              -D ESP32_STAGE=true
 
 [library]
-lib_ldf_mode              = chain+  
-shared_libdeps_dir        = lib
+lib_ldf_mode                = chain+
+shared_libdeps_dir          = lib
 ; *** Library disable / enable for variant Tasmota(32). Disable reduces compile time
 ; *** !!! Disabling needed libs will generate compile errors !!!
 ; *** The resulting firmware will NOT be different if you leave all libs enabled
 ; *** Disabling by putting a ";" in front of the lib name
 ; *** If you dont know what it is all about, do not change
-lib_extra_dirs            = 
+lib_extra_dirs              =
 ; *** Only disabled for Tasmota minimal and Tasmota light. For all other variants needed!
-                            lib/lib_basic
+                              lib/lib_basic
 ; **** I2C devices. Most sensors. Disable only if you dont have ANY I2C device enabled
-                            lib/lib_i2c
+                              lib/lib_i2c
 ; *** Displays. Disable if you dont have any Display activated
-                            lib/lib_display
+                              lib/lib_display
 ; *** Bear SSL and base64. Disable if you dont have SSL or TLS activated
-                            lib/lib_ssl
+                              lib/lib_ssl
 ; *** Audio needs a lot of time to compile. Mostly not used functions. Recommended to disable
-                            lib/lib_audio
+                              lib/lib_audio
 ; *** RF 433 stuff (not RF Bridge). Recommended to disable
-                            lib/lib_rf
+                              lib/lib_rf
 ; *** Mostly not used functions. Recommended to disable
-                            lib/lib_div
+                              lib/lib_div
 
 
 
 ; *** Debug version used for PlatformIO Home Project Inspection
 [env:tasmota-debug]
-build_type              = debug
-build_unflags           = ${esp_defaults.build_unflags}
-build_flags             = ${esp82xx_defaults.build_flags}
-;                       -Wstack-usage=300
+build_type                  = debug
+build_unflags               = ${esp_defaults.build_unflags}
+build_flags                 = ${esp82xx_defaults.build_flags}
+;                              -Wstack-usage=300
 
 [env:tasmota32-debug]
-extends                 = env:tasmota32
-build_type              = debug
-build_unflags           = ${esp32_defaults.build_unflags}
-build_flags             = ${esp32_defaults.build_flags}
-;                       -Wstack-usage=300
+extends                     = env:tasmota32
+build_type                  = debug
+build_unflags               = ${esp32_defaults.build_unflags}
+build_flags                 = ${esp32_defaults.build_flags}
+;                              -Wstack-usage=300