diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini
index 0bce38d41..0ae524a69 100644
--- a/platformio_core_defs.ini
+++ b/platformio_core_defs.ini
@@ -95,18 +95,32 @@ lib_ignore                = ESP32_ping, ESP32WebServer, IRremoteESP8266, Heatpum
 
 ; See for SDK flags: https://github.com/esp8266/Arduino/blob/master/tools/platformio-build.py
 
-[core_2_6_0]
-platform                  = https://github.com/Jason2866/platform-espressif8266.git#core_2_6_0
+;[core_2_6_0]
+;platform                  = https://github.com/Jason2866/platform-espressif8266.git#core_2_6_0
+;build_flags               = ${esp82xx_2_6_x.build_flags} 
+                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
+
+;[core_2_6_1]
+;platform                  = https://github.com/Jason2866/platform-espressif8266.git#core_2_6_1
+;build_flags               = ${esp82xx_2_6_x.build_flags} 
+                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
+
+;[core_2_6_1_sdk3]
+;platform                  = https://github.com/Jason2866/platform-espressif8266.git#core_2_6_1
+;build_flags               = ${esp82xx_2_6_x.build_flags} 
+                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3
+
+[core_2_6_2]
+platform                  = espressif8266@2.3.1
+platform_packages         =
+	framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.6.2
 build_flags               = ${esp82xx_2_6_x.build_flags} 
                             -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
 
-[core_2_6_1]
-platform                  = https://github.com/Jason2866/platform-espressif8266.git#core_2_6_1
-build_flags               = ${esp82xx_2_6_x.build_flags} 
-                            -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
-
-[core_2_6_1_sdk3]
-platform                  = https://github.com/Jason2866/platform-espressif8266.git#core_2_6_1
+[core_2_6_2_sdk3]
+platform                  = espressif8266@2.3.1
+platform_packages         =
+	framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git#2.6.2
 build_flags               = ${esp82xx_2_6_x.build_flags} 
                             -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3
 
diff --git a/platformio_esp82xx_base.ini b/platformio_esp82xx_base.ini
index 9b5359d48..74c80b13c 100644
--- a/platformio_esp82xx_base.ini
+++ b/platformio_esp82xx_base.ini
@@ -6,13 +6,16 @@
 
 [regular_platform]
 build_unflags             =
-build_flags               = ${core_2_6_1.build_flags}
-platform                  = ${core_2_6_1.platform}
+build_flags               = ${core_2_6_2.build_flags} ${common.build_flags}
+platform                  = ${core_2_6_2.platform}
+platform_packages         = ${core_2_6_2.platform_packages}
 
-[core261_sdk3_platform]
+
+[core262_sdk3_platform]
 build_unflags             =
-build_flags               = ${core_2_6_1_sdk3.build_flags}
-platform                  = ${core_2_6_1_sdk3.platform}
+build_flags               = ${core_2_6_2_sdk3.build_flags}
+platform                  = ${core_2_6_2_sdk3.platform}
+platform_packages         = ${core_2_6_2_sdk3.platform_packages}
 
 [beta_platform]
 build_unflags             =
@@ -38,8 +41,10 @@ board                     = esp12e
 
 [normal]
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags}
 
+
 [normal_beta]
 platform                  = ${beta_platform.platform}
 build_flags               = ${beta_platform.build_flags}
@@ -52,6 +57,7 @@ build_flags               = ${beta_platform.build_flags}
 
 [testing]
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags} -DPLUGIN_BUILD_TESTING
 
 [testing_beta]
@@ -66,6 +72,7 @@ build_flags               = ${beta_platform.build_flags} -DPLUGIN_BUILD_TESTING
 
 [dev]
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags} -DPLUGIN_BUILD_DEV
 
 
@@ -75,6 +82,7 @@ build_flags               = ${regular_platform.build_flags} -DPLUGIN_BUILD_DEV
 
 [ir]
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags}
 lib_ignore                = ESP32_ping, ESP32WebServer, SD(esp8266), SDFS
 
diff --git a/platformio_esp82xx_envs.ini b/platformio_esp82xx_envs.ini
index 53e4f27ff..d63059de3 100644
--- a/platformio_esp82xx_envs.ini
+++ b/platformio_esp82xx_envs.ini
@@ -6,6 +6,7 @@
 
 [hard_esp82xx]
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags}
                             -DBUILD_NO_DEBUG
                             -DPLUGIN_BUILD_CUSTOM
@@ -15,6 +16,7 @@ build_flags               = ${regular_platform.build_flags}
 [env:custom_ESP8266_4M1M]
 extends                   = esp8266_4M1M
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags} 
                             ${esp8266_4M1M.build_flags} 
                             -DPLUGIN_BUILD_CUSTOM
@@ -46,6 +48,7 @@ extra_scripts             = pre:pre_custom_esp82xx.py
 [env:custom_ESP8266_4M2M]
 extends                   = esp8266_4M2M
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags}
                             ${esp8266_4M1M.build_flags}
                             -DPLUGIN_BUILD_CUSTOM
@@ -63,6 +66,7 @@ extra_scripts             = pre:pre_custom_esp82xx.py
 [env:normal_ESP8266_1M]
 extends                   = esp8266_1M
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags}
                             ${esp8266_1M.build_flags}
 
@@ -77,6 +81,7 @@ build_flags               = ${core261_sdk3_platform.build_flags}
 [env:normal_ESP8266_1M_VCC]
 extends                   = esp8266_1M
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags}
                             ${esp8266_1M.build_flags}
                             -D FEATURE_ADC_VCC=true
@@ -86,6 +91,7 @@ build_flags               = ${regular_platform.build_flags}
 [env:normal_ESP8285_1M]
 extends                   = esp8285_1M
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags}
                             ${esp8285_1M.build_flags}
 
@@ -94,6 +100,7 @@ build_flags               = ${regular_platform.build_flags}
 [env:normal_WROOM02_2M]
 extends                   = espWroom2M
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags}
                             ${espWroom2M.build_flags}
 
@@ -102,6 +109,7 @@ build_flags               = ${regular_platform.build_flags}
 [env:normal_WROOM02_2M256]
 extends                   = espWroom2M256
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags}
                             ${espWroom2M256.build_flags}
 
@@ -110,6 +118,7 @@ build_flags               = ${regular_platform.build_flags}
 [env:normal_ESP8266_4M1M]
 extends                   = esp8266_4M1M
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags}
                             ${esp8266_4M1M.build_flags}
 
@@ -117,6 +126,7 @@ build_flags               = ${regular_platform.build_flags}
 [env:normal_ESP8266_16M]
 extends                   = esp8266_16M
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags}
                             ${esp8266_16M.build_flags}
 
@@ -140,12 +150,14 @@ build_flags               = ${core_2_4_2.build_flags}
 [env:minimal_core_261_ESP8266_1M_OTA]
 extends                   = esp8266_1M_OTA
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags} 
                             ${esp8266_1M_OTA.build_flags}
 
 [env:minimal_core_261_ESP8285_1M_OTA]
 extends                   = esp8285_1M_OTA
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags} 
                             ${esp8285_1M_OTA.build_flags}
 
@@ -272,6 +284,7 @@ build_flags               = ${dev.build_flags}
 ;[env:hard_SONOFF_BASIC]
 ;extends                   = esp8266_1M, hard_esp82xx
 ;platform                  = ${hard_esp82xx.platform}
+;platform_packages         = ${hard_esp82xx.platform_packages}
 ;build_flags               = ${hard_esp82xx.build_flags} ${esp8266_1M.build_flags} -D PLUGIN_SET_SONOFF_BASIC
 
 
@@ -279,6 +292,7 @@ build_flags               = ${dev.build_flags}
 ;[env:hard_SONOFF_TH1x]
 ;extends                   = esp8266_1M, hard_esp82xx
 ;platform                  = ${hard_esp82xx.platform}
+;platform_packages         = ${hard_esp82xx.platform_packages}
 ;build_flags               = ${hard_esp82xx.build_flags} ${esp8266_1M.build_flags} -D PLUGIN_SET_SONOFF_TH1x
 
 ; ITEAD / SONOFF POW & POW R2 version --------------------
@@ -299,6 +313,7 @@ build_flags               = ${dev.build_flags}
 [env:hard_SONOFF_POW_4M1M]
 extends                   = esp8266_4M1M, hard_esp82xx
 platform                  = ${hard_esp82xx.platform}
+platform_packages         = ${hard_esp82xx.platform_packages}
 build_flags               = ${hard_esp82xx.build_flags} 
                             ${esp8266_4M1M.build_flags}
                             -D PLUGIN_SET_SONOFF_POW
@@ -309,6 +324,7 @@ build_flags               = ${hard_esp82xx.build_flags}
 [env:hard_other_POW_ESP8285_1M]
 extends                   = esp8266_1M_OTA, hard_esp82xx
 platform                  = ${hard_esp82xx.platform}
+platform_packages         = ${hard_esp82xx.platform_packages}
 build_flags               = ${hard_esp82xx.build_flags} 
                             ${esp8266_1M_OTA.build_flags}
                             -D PLUGIN_SET_SONOFF_POW
@@ -318,6 +334,7 @@ build_flags               = ${hard_esp82xx.build_flags}
 ;[env:hard_SONOFF_S20]
 ;extends                   = esp8266_1M_OTA, hard_esp82xx
 ;platform                  = ${hard_esp82xx.platform}
+;platform_packages         = ${hard_esp82xx.platform_packages}
 ;build_flags               = ${hard_esp82xx.build_flags} ${esp8266_1M_OTA.build_flags} -D PLUGIN_SET_SONOFF_S2x
 
 
@@ -325,6 +342,7 @@ build_flags               = ${hard_esp82xx.build_flags}
 ;[env:hard_SONOFF_4CH]
 ;extends                   = esp8285_1M_OTA, hard_esp82xx
 ;platform                  = ${hard_esp82xx.platform}
+;platform_packages         = ${hard_esp82xx.platform_packages}
 ;build_flags               = ${hard_esp82xx.build_flags} ${esp8285_1M_OTA.build_flags} -D PLUGIN_SET_SONOFF_4CH
 
 
@@ -333,6 +351,7 @@ build_flags               = ${hard_esp82xx.build_flags}
 ;[env:hard_SONOFF_TOUCH]
 ;extends                   = esp8285_1M_OTA, hard_esp82xx
 ;platform                  = ${hard_esp82xx.platform}
+;platform_packages         = ${hard_esp82xx.platform_packages}
 ;build_flags               = ${hard_esp82xx.build_flags} ${esp8285_1M_OTA.build_flags} -D PLUGIN_SET_SONOFF_TOUCH
 
 
@@ -343,6 +362,7 @@ build_flags               = ${hard_esp82xx.build_flags}
 [env:hard_Shelly_1_2M256]
 extends                   = esp8266_2M256, hard_esp82xx
 platform                  = ${hard_esp82xx.platform}
+platform_packages         = ${hard_esp82xx.platform_packages}
 build_flags               = ${hard_esp82xx.build_flags} 
                             ${esp8266_2M256.build_flags}
                             -D PLUGIN_SET_SHELLY_1
@@ -352,6 +372,7 @@ build_flags               = ${hard_esp82xx.build_flags}
 [env:hard_Ventus_W266]
 extends                   = esp8266_1M, hard_esp82xx
 platform                  = ${hard_esp82xx.platform}
+platform_packages         = ${hard_esp82xx.platform_packages}
 build_flags               = ${hard_esp82xx.build_flags}
                             ${esp8266_1M_OTA.build_flags}
                             -D PLUGIN_SET_VENTUS_W266
diff --git a/platformio_special_envs.ini b/platformio_special_envs.ini
index b0b9a6ab7..0d6893fe0 100644
--- a/platformio_special_envs.ini
+++ b/platformio_special_envs.ini
@@ -12,6 +12,7 @@ build_flags               = ${compiler_warnings.build_flags}
 [env:spec_debug_custom_ESP8266_4M1M]
 extends                   = esp8266_4M1M, debug_pio
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 build_flags               = ${regular_platform.build_flags}
                             ${debug_pio.build_flags}
                             ${esp8266_4M1M.build_flags}
@@ -46,6 +47,7 @@ extra_scripts             = pre:pre_custom_esp32.py
 [env:spec_memanalyze_ESP8266]
 extends                   = esp8266_4M1M
 platform                  = ${regular_platform.platform}
+platform_packages         = ${regular_platform.platform_packages}
 lib_ignore                = ESP32_ping, ESP32WebServer
 build_flags               = ${esp8266_4M1M.build_flags} -DMEMORY_ANALYSIS -DPLUGIN_BUILD_CUSTOM -w -DUSE_NON_STANDARD_24_TASKS -DTASKS_MAX=24
 extra_scripts             = pre:pre_memanalyze.py
diff --git a/pre_custom_esp32.py b/pre_custom_esp32.py
index 9ed8a6777..e900ce4af 100644
--- a/pre_custom_esp32.py
+++ b/pre_custom_esp32.py
@@ -16,9 +16,9 @@ env.Append(CPPDEFINES=[
 #  ("WEBSERVER_RULES_DEBUG", "1")
 ])
 if os.path.isfile('src/Custom.h'):
-  env['CPPDEFINES'].append("USE_CUSTOM_H")
+  env.Append(CPPDEFINES=["USE_CUSTOM_H"])
 else:
-  env['CPPDEFINES'].extend([
+  env.Append(CPPDEFINES=[
     "CONTROLLER_SET_ALL",
     "NOTIFIER_SET_NONE",
     "PLUGIN_SET_ONLY_SWITCH",
diff --git a/pre_custom_esp82xx.py b/pre_custom_esp82xx.py
index 74b70ab83..321bc2093 100644
--- a/pre_custom_esp82xx.py
+++ b/pre_custom_esp82xx.py
@@ -17,9 +17,9 @@ env.Append(CPPDEFINES=[
   # ,("WEBSERVER_RULES_DEBUG", "0")
 ])
 if os.path.isfile('src/Custom.h'):
-  env['CPPDEFINES'].append("USE_CUSTOM_H")
+  env.Append(CPPDEFINES=["USE_CUSTOM_H"])
 else:
-  env['CPPDEFINES'].extend([
+  env.Append(CPPDEFINES=[
     "CONTROLLER_SET_ALL",
     "NOTIFIER_SET_NONE",
     "PLUGIN_SET_ONLY_SWITCH",