diff --git a/platformio.ini b/platformio.ini
index 3356cd1a3..fa908b971 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -5,7 +5,7 @@
 src_dir = ./wled00
 data_dir = ./wled00/data
 lib_extra_dirs = ./wled00/src
-env_default = nodemcuv2
+; env_default = nodemcuv2
 ; env_default = esp01
 ; env_default = esp01_1m
 ; env_default = d1_mini
@@ -16,8 +16,10 @@ env_default = nodemcuv2
 framework = arduino
 monitor_speed = 115200
 board_build.flash_mode = dout
-upload_speed = 921600
+upload_speed = 115200
+upload_speed_fast = 921600
 build_flags =
+  -w ; supresses all C/C++ warnings
   ; -D VERSION=0.8.4
   ; -D DEBUG
 # TODO replace libs in /lib with managed libs in here if possible.
@@ -36,12 +38,44 @@ lib_deps_external =
   #Timezone@1.2.1
 
 [common:esp8266]
-platform = espressif8266@2.0.4
+# ------------------------------------------------------------------------------
+# PLATFORM:
+#   !! DO NOT confuse platformio's ESP8266 development platform with Arduino core for ESP8266
+#   We use Arduino Core 2.5.0 (platformIO 2.0.4) as default
+#
+#   arduino core 2.3.0 = platformIO 1.5.0
+#   arduino core 2.4.0 = platformIO 1.6.0
+#   arduino core 2.4.1 = platformIO 1.7.3
+#   arduino core 2.4.2 = platformIO 1.8.0
+#   arduino core 2.5.0 = platformIO 2.0.4
+#   arduino core stage = platformIO feature#stage
+# ------------------------------------------------------------------------------
+arduino_core_2_3_0 = espressif8266@1.5.0
+arduino_core_2_4_0 = espressif8266@1.6.0
+arduino_core_2_4_1 = espressif8266@1.7.3
+arduino_core_2_4_2 = espressif8266@1.8.0
+arduino_core_2_5_0 = espressif8266@2.0.4
+arduino_core_stage = https://github.com/platformio/platform-espressif8266.git#feature/stage
+platform = ${common:esp8266.arduino_core_2_5_0}
 build_flags =
   -D PIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
+  -Wl,-Teagle.flash.4m3m.ld  ;;;; Required for core > v2.5.0 or staging version 4MB Flash 3MB SPIFFs
+
+[common:esp8266_1M]
+platform = ${common:esp8266.platform}
+build_flags =
+  -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
+  -Wl,-Teagle.flash.1m512.ld  ;;;; Required for core > v2.5.0 or staging version 1MB Flash 512kB SPIFFs
+  ; -D WLED_DISABLE_MOBILE_UI
+  -D WLED_DISABLE_OTA
+  ; -D WLED_DISABLE_ALEXA
+  -D WLED_DISABLE_BLYNK
+  -D WLED_DISABLE_CRONIXIE
+  -D WLED_DISABLE_HUESYNC
+  -D WLED_DISABLE_INFRARED
 
 [common:esp8266_512k]
-platform = espressif8266@1.7.0
+platform = ${common:esp8266.arduino_core_2_4_0}
 build_flags =
   -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
   ; -D WLED_DISABLE_MOBILE_UI
@@ -53,7 +87,7 @@ build_flags =
   -D WLED_DISABLE_INFRARED
 
 [common:esp32]
-platform = espressif32@1.5.0
+platform = espressif32@1.7.0
 build_flags =
   -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
   -D ARDUINO_ARCH_ESP32
@@ -86,13 +120,13 @@ lib_deps =
 
 [env:esp01_1m]
 board = esp01_1m
-platform = ${common:esp8266.platform}
+platform = ${common:esp8266_1M.platform}
 monitor_speed = ${common.monitor_speed}
 upload_speed = ${common.upload_speed}
 framework = ${common.framework}
 build_flags =
   ${common.build_flags}
-  ${common:esp8266.build_flags}
+  ${common:esp8266_1M.build_flags}
   # disable IR because there is no pin for it
   -D WLED_DISABLE_INFRARED
 lib_deps =
@@ -115,11 +149,13 @@ lib_deps =
 board = esp32dev
 platform = ${common:esp32.platform}
 monitor_speed = ${common.monitor_speed}
-upload_speed = ${common.upload_speed}
+upload_speed = ${common.upload_speed_fast}
 framework = ${common.framework}
 build_flags =
   ${common.build_flags}
   ${common:esp32.build_flags}
 lib_deps =
   ${common.lib_deps_external}
+lib_ignore =
+  IRremoteESP8266
   
\ No newline at end of file