diff --git a/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini b/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
index cd30c5ce..85136cd9 100644
--- a/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
+++ b/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
@@ -5,7 +5,7 @@
 ;***************************************************;
 
 [env:d1-r32-unoshield_ili9341_adc]
-extends = esp32_4mb
+extends = esp32_4mb_v2
 board = esp32dev
 
 build_flags =
@@ -52,12 +52,12 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    ${arduino_esp32_v1.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ; ${tft_espi.lib_deps}
     ${lovyangfx.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
-    ${arduino_esp32_v1.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini b/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
index 31f27fbb..dc16739c 100644
--- a/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
+++ b/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
@@ -5,7 +5,7 @@
 ;***************************************************;
 
 [env:d1-r32-unoshield_ili9486_adc]
-extends = esp32_4mb
+extends = esp32_4mb_v2
 board = esp32dev
 
 build_flags =
@@ -51,12 +51,12 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    ${arduino_esp32_v1.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ; ${tft_espi.lib_deps}
     ${lovyangfx.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
-    ${arduino_esp32_v1.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/d1-r32-waveshare_ili9486.ini b/user_setups/esp32/d1-r32-waveshare_ili9486.ini
index 3c83fdb0..9a64ef0c 100644
--- a/user_setups/esp32/d1-r32-waveshare_ili9486.ini
+++ b/user_setups/esp32/d1-r32-waveshare_ili9486.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:d1-r32-waveshare_ili9486]
-extends = esp32_4mb
+extends = esp32_4mb_v2
 board = wemos_d1_mini32
 
 build_flags =
@@ -40,12 +40,12 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    ${arduino_esp32_v1.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${tft_espi.lib_deps}
     ; ${lovyangfx.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
-    ${arduino_esp32_v1.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion
\ No newline at end of file
diff --git a/user_setups/esp32/esp32-one.ini b/user_setups/esp32/esp32-one.ini
index 34431777..4814efb7 100644
--- a/user_setups/esp32/esp32-one.ini
+++ b/user_setups/esp32/esp32-one.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [esp32one]
-extends = esp32_4mb
+extends = esp32_4mb_v2
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/esp32-touchdown.ini b/user_setups/esp32/esp32-touchdown.ini
index 3ae1b0ea..fb9ed43d 100644
--- a/user_setups/esp32/esp32-touchdown.ini
+++ b/user_setups/esp32/esp32-touchdown.ini
@@ -5,7 +5,7 @@
 ;***************************************************;
 
 [env:esp32-touchdown]
-extends = esp32_4mb
+extends = esp32_4mb_v2
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/lanbon_l8.ini b/user_setups/esp32/lanbon_l8.ini
index f851fdc8..353c4741 100644
--- a/user_setups/esp32/lanbon_l8.ini
+++ b/user_setups/esp32/lanbon_l8.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:lanbon_l8]
-extends = esp32_8mb
+extends = esp32_8mb_v2
 board = esp32dev
 
 build_flags =
@@ -57,7 +57,7 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
-    ${arduino_esp32_v1.lib_deps}
+    ${arduino_esp32_v2.lib_deps}
     ${lovyangfx.lib_deps}
     ;${tft_espi.lib_deps}
     ; FT6336U is 6x faster then FocalTech Library
@@ -67,5 +67,5 @@ lib_deps =
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
-    ${arduino_esp32_v1.lib_ignore}
+    ${arduino_esp32_v2.lib_ignore}
 ;endregion
diff --git a/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini b/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
index 9aca16bc..f6ae2fef 100644
--- a/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
+++ b/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:ttgo-t7-v1.5_ili9341]
-extends = esp32_4mb
+extends = esp32_4mb_v2
 board = esp32dev
 
 build_flags =