diff --git a/platformio.ini b/platformio.ini
index abb9d364d..d03de291d 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -61,17 +61,10 @@ board                     = esp01_1m
 board_build.flash_mode    = dout
 board_build.ldscript      = eagle.flash.1m.ld
 
-platform                  = ${core_active.platform}
-platform_packages         = ${core_active.platform_packages}
-build_flags               = ${core_active.build_flags}
-
-; *********************************************************************
-; *** Use custom settings from file user_config_override.h
-                            -DUSE_CONFIG_OVERRIDE
-; *********************************************************************
-
-; *** Fix espressif8266@1.7.0 induced undesired all warnings
-build_unflags             = -Wall
+platform                  = ${core.platform}
+platform_packages         = ${core.platform_packages}
+build_unflags             = ${core.build_unflags}
+build_flags               = ${core.build_flags}
 
 board_build.f_cpu         = 80000000L
 board_build.f_flash       = 40000000L
@@ -89,10 +82,17 @@ extra_scripts             = pio/strip-floats.py
                             pio/override_copy.py
 
 [esp_defaults]
+; *** Fix espressif8266@1.7.0 induced undesired all warnings
+build_unflags             = -Wall
 build_flags               = -D_IR_ENABLE_DEFAULT_=false
                             -DDECODE_HASH=true -DDECODE_NEC=true -DSEND_NEC=true
                             -DDECODE_RC5=true -DSEND_RC5=true -DDECODE_RC6=true -DSEND_RC6=true
 ; new mechanism to set the IRremoteESP8266 supported protocols: none except HASH, NEC, RC5, RC6
+; *********************************************************************
+; *** Use custom settings from file user_config_override.h
+                            -DUSE_CONFIG_OVERRIDE
+; *********************************************************************
+
 
 [esp82xx_defaults]
 build_flags               = ${esp_defaults.build_flags}
@@ -121,13 +121,10 @@ build_flags               = -DUSE_IR_REMOTE_FULL
                             -U_IR_ENABLE_DEFAULT_
                             -DDECODE_PRONTO=false -DSEND_PRONTO=false
 
-[core_active]
-platform                  = ${tasmota_core.platform}
-platform_packages         = ${tasmota_core.platform_packages}
-build_flags               = ${tasmota_core.build_flags}
 
-[tasmota_core]
+[core]
 ; *** Esp8266 Arduino core 2.7.1
-platform                  = espressif8266@2.5.2
+platform                  = espressif8266@2.5.3
 platform_packages         = 
+build_unflags             = ${esp_defaults.build_unflags}
 build_flags               = ${esp82xx_defaults.build_flags}
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 2becf05f7..1c8745c50 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -7,8 +7,6 @@
 ;
 ; Please visit documentation for the options and examples
 ; http://docs.platformio.org/en/stable/projectconf.html
-;
-
 
 [platformio]
 extra_configs = platformio_tasmota_env32.ini
@@ -40,10 +38,8 @@ default_envs =
 [common]
 platform                  = ${core_active.platform}
 platform_packages         = ${core_active.platform_packages}
+build_unflags             = ${core_active.build_unflags}
 build_flags               = ${core_active.build_flags}
-; *** Use settings from file user_config_override.h
-                          -DUSE_CONFIG_OVERRIDE
-
 ; *** Optional Debug messages
 ;                            -DDEBUG_TASMOTA_CORE
 ;                            -DDEBUG_TASMOTA_DRIVER
@@ -80,17 +76,22 @@ extra_scripts             = ${scripts_defaults.extra_scripts}
 
 ;platform                  = ${tasmota_stage.platform}
 ;platform_packages         = ${tasmota_stage.platform_packages}
+;build_unflags             = ${tasmota_stage.build_unflags}
 ;build_flags               = ${tasmota_stage.build_flags}
 
 ;platform                  = ${core_stage.platform}
 ;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
-extends                   = tasmota_core
+extends                   = core
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#52b3e5b7b3ccedcede665682f7896b637b64dbf5
+build_unflags             = ${esp_defaults.build_unflags}
+build_flags               = ${esp82xx_defaults.build_flags}
+
 ; *********** Alternative Options, enable only if you know exactly what you do ********
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
@@ -122,9 +123,11 @@ platform_packages         = framework-arduinoespressif8266 @ https://github.com/
 
 [core_stage]
 ; *** Esp8266 core for Arduino version latest development version
-extends                   = tasmota_core
+extends                   = core
 platform_packages         = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
-;
+build_unflags             = ${esp_defaults.build_unflags}
+build_flags               = ${esp82xx_defaults.build_flags}
+
 ; *********** Alternative Options, enable only if you know exactly what you do ********
 ; NONOSDK221
 ;                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221
@@ -157,7 +160,10 @@ platform_packages         = framework-arduinoespressif8266 @ https://github.com/
 
 ; *** Debug version used for PlatformIO Home Project Inspection
 [env:tasmota-debug]
-build_type = debug
+extends                   = core
+build_type                = debug
+build_unflags             = ${esp_defaults.build_unflags}
+build_flags               = ${esp82xx_defaults.build_flags}
 
 
 ; ***        Experimental ESP32 Tasmota version               ***
@@ -172,7 +178,7 @@ 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}
-build_unflags           = ${common.build_unflags}
+build_unflags           = ${esp_defaults.build_unflags}
                           -Wpointer-arith
 monitor_speed           = ${common.monitor_speed}
 upload_port             = ${common.upload_port}