diff --git a/pio_local.ini_example b/pio_local.ini_example
index ad19dd749..843dc51d2 100644
--- a/pio_local.ini_example
+++ b/pio_local.ini_example
@@ -18,10 +18,10 @@
 my_build_flags =
 
 [platformio]
-; default_envs = s_16M_P ; BBQKees E32V2
+default_envs = s_16M_P ; BBQKees E32V2
 ; default_envs = s3_16M_P ; BBQKees S3
 ; default_envs = s_4M ; BBQKees older S32, 4MB no psram
-default_envs = s_16M ; BBQKees newer S32 V2, 16MB no psram
+; default_envs = s_16M ; BBQKees newer S32 V2, 16MB no psram
 
 [env]
 
@@ -30,10 +30,10 @@ default_envs = s_16M ; BBQKees newer S32 V2, 16MB no psram
 ; monitor_filters = colorize, esp32_exception_decoder
 
 ; uncomment if you want to upload the firmware via OTA (must have upload_protocol = custom)
-; extra_scripts =
-;   pre:scripts/build_interface.py ; builds the WebUI (unless NO_BUILD_WEBUI is set) - comment out if you don't want to build each time
-;   scripts/rename_fw.py ; renames the firmware .bin file - comment out if not needed
-;   scripts/upload.py ; optionally upload the firmware via OTA (must have upload_protocol = custom)
+extra_scripts =
+;  pre:scripts/build_interface.py ; builds the WebUI (unless NO_BUILD_WEBUI is set) - comment out if you don't want to build each time
+ scripts/rename_fw.py ; renames the firmware .bin file - comment out if not needed
+ scripts/upload.py ; optionally upload the firmware via OTA (must have upload_protocol = custom)
 
 ; set the username and password for the admin account (default password is admin)
 custom_username = admin
@@ -47,17 +47,28 @@ custom_password = admin
 ;  upload_protocol = custom
 ;  custom_emsesp_ip = <ip address> or ems-esp.local
 
-; upload_protocol = custom
-; custom_emsesp_ip = 10.10.10.93
+upload_protocol = custom
+; custom_emsesp_ip = 10.10.10.93 ; S3
+custom_emsesp_ip = 192.168.1.223 ; E32V2
+; custom_emsesp_ip = 192.168.1.173 ; S32
+; custom_emsesp_ip = 192.168.1.59 ; S32 (old) 4MB blue board
 
-; example override for lib_deps and using locally built modules
-; lib_deps =
-;   bblanchon/ArduinoJson @ 7.4.2
-;   ESP32Async/AsyncTCP @ 3.4.2
-;   ESP32Async/ESPAsyncWebServer @ 3.7.9
-;   file://${PROJECT_DIR}/../modules/EMS-ESP-Modules
+lib_deps =
+  bblanchon/ArduinoJson @ 7.4.2
+  ESP32Async/AsyncTCP @ 3.4.7
+  ESP32Async/ESPAsyncWebServer @ 3.7.10
+  file://${PROJECT_DIR}/../modules/EMS-ESP-Modules
 ;   ; https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.8
 
+[espressif32_base_16M]
+framework = arduino
+board_build.partitions = partitions/esp32_partition_16M.csv
+board_upload.flash_size = 16MB
+board_build.app_partition_name = app0
+; platform = espressif32@6.11.0 ; Arduino Core v2.0.17 / IDF v4.4.7
+; platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.20/platform-espressif32.zip ; Arduino Core v3.2.0 / ESP-IDF v5.4.1
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.30/platform-espressif32.zip ; Arduino Core 3.3.0, IDF 5.5.0
+
 ; ** debug settings **
 ; to be used with esp-prog/JTAG hardware device like https://docs.espressif.com/projects/esp-dev-kits/en/latest/other/esp-prog/user_guide.html   
 ; pio run -e debug
diff --git a/platformio.ini b/platformio.ini
index 4ccfd5ea1..d92523604 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,8 +22,8 @@ extra_configs =
   pio_local.ini
 
 [common]
-core_build_flags = -std=gnu++17 -O3 -flto=auto -Wno-type-limits -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -Wno-format
-core_unbuild_flags = -std=gnu++11 -std=gnu++14 -fno-lto
+core_build_flags = -std=c++17 -std=gnu++17 -O3 -flto=auto -Wno-type-limits -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -Wno-format
+core_unbuild_flags = -std=gnu++11 -fno-lto
 
 my_build_flags =