diff --git a/platformio.ini b/platformio.ini
index c4560f79e..85362732e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2,8 +2,8 @@
 ; override any settings with your own local ones in pio_local.ini
 
 [platformio]
-default_envs = esp32_4M
-; default_envs = lolin_s3
+; default_envs = esp32_4M
+default_envs = lolin_s3
 ; default_envs = esp32_16M
 ; default_envs = standalone
 
@@ -12,12 +12,8 @@ extra_configs =
   pio_local.ini
 
 [common]
-core_build_flags =
-  -O2
-  -std=gnu++17
-
+core_build_flags = -std=gnu++2a
 core_unbuild_flags = -std=gnu++11
-; core_unbuild_flags =
 
 ; my_build_flags is set in pio_local.ini
 my_build_flags =
@@ -43,9 +39,9 @@ platform = espressif32@6.6.0
 framework = arduino
 board_build.filesystem = littlefs
 build_flags = ${common.build_flags}
-build_unflags = ${common.unbuild_flags}s
+build_unflags = ${common.unbuild_flags}
 extra_scripts =
-  pre:scripts/build_interface.py
+  ; pre:scripts/build_interface.py
   scripts/rename_fw.py
 
 [espressi32_base_tasmota]
@@ -54,8 +50,8 @@ extra_scripts =
 ; platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.01.01/platform-espressif32.zip
 ;  Tasmota Arduino Core 2.0.15 with IPv6 support, based on IDF 4.4.7 / core 2.0.15
 platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.04.00/platform-espressif32.zip
-;  Tasmota Arduino Core 3.0.0-alpha based on IDF v5.1.2
-; platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.02.10/platform-espressif32.zip
+;  Tasmota Arduino Core 3.0.0-rc based on IDF v5.1.3
+; platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.04.14/platform-espressif32.zip
 framework = arduino
 board_build.filesystem = littlefs
 build_flags =
@@ -63,19 +59,15 @@ build_flags =
   -DTASMOTA_SDK
 build_unflags = ${common.unbuild_flags}
 extra_scripts =
-  pre:scripts/build_interface.py
+  ; pre:scripts/build_interface.py
   scripts/rename_fw.py
 
-
-
 [env]
 monitor_speed = 115200
 monitor_filters = direct, esp32_exception_decoder
-
 upload_speed = 921600
 build_type = release
 lib_ldf_mode = chain+
-
 check_tool = cppcheck, clangtidy
 check_severity = high, medium
 check_flags =
@@ -222,7 +214,7 @@ build_flags =
   -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.7.0-dev.0\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
 	-lpthread
   -D__linux__
-  -std=gnu++11 -Og -ggdb
+  -std=gnu++14 -Og -ggdb
 build_src_flags =
   -Wall -Wextra -Werror
   -Wno-unused-parameter -Wno-sign-compare