diff --git a/platformio.ini b/platformio.ini
index 4d499844..8fff037d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -79,10 +79,11 @@ lib_deps =
     ;git+https://github.com/andrethomas/TasmotaSlave.git
     ;git+https://github.com/lvgl/lvgl.git
     git+https://github.com/lvgl/lvgl.git#release/v7
-    ;git+https://github.com/lvgl/lvgl.git#797212a3f346e9fdf71aef6f193889357eeae3f0
     ;lvgl/lvgl@^7.11.0                ; from PIO library
-    bodmer/TFT_eSPI@^2.3.73
-    ;git+https://github.com/Bodmer/TFT_eSPI.git
+    git+https://github.com/lvgl/lv_lib_png.git#release/v7
+    ;git+https://github.com/lvgl/lv_lib_bmp.git#release/v7
+    ;git+https://github.com/lvgl/lv_lib_gif.git#release/v7
+    ;git+https://github.com/lvgl/lv_lib_split_jpg.git
     ; ------ Unused / Test libraries
     ;https://github.com/netwizeBE/TFT_eSPI.git
     ;Syslog@^2.0.0       ; Obsoleted
diff --git a/user_setups/darwin_sdl/darwin_sdl_64bits.ini b/user_setups/darwin_sdl/darwin_sdl_64bits.ini
index be0c2381..6555c8c6 100644
--- a/user_setups/darwin_sdl/darwin_sdl_64bits.ini
+++ b/user_setups/darwin_sdl/darwin_sdl_64bits.ini
@@ -15,6 +15,7 @@ build_flags =
   ;-D LV_LVGL_H_INCLUDE_SIMPLE
   ;-D LV_DRV_NO_CONF
   -D LV_MEM_SIZE=262144U           ; 256kB lvgl memory
+  -D LV_VDB_SIZE=131072U           ; 128kB draw buffer
   -D USE_MONITOR
   -D MONITOR_ZOOM=1  ; can be fractional like 1.5 or 2
   -D USE_MOUSE
diff --git a/user_setups/esp32/_esp32.ini b/user_setups/esp32/_esp32.ini
index 88721b74..39be5fb1 100644
--- a/user_setups/esp32/_esp32.ini
+++ b/user_setups/esp32/_esp32.ini
@@ -15,6 +15,7 @@ build_flags =
     ;-D CONFIG_NEWLIB_NANO_FORMAT
 ; -- lvgl build options -----------------------------
     -D LV_MEM_SIZE=49152U           ; 48 kB lvgl memory
+    -D LV_VDB_SIZE=32768U              ; 32kB draw buffer
     -D LV_ATTRIBUTE_FAST_MEM=IRAM_ATTR
     -D LV_ATTRIBUTE_TASK_HANDLER=IRAM_ATTR
     ;-D LV_FS_PC_PATH="//littlefs"   ; this needs to match the vfs mount pount
@@ -53,15 +54,13 @@ lib_ignore =
     lv_drv_fsmc_ili9341
     lv_drivers
     AXP192
-    LittleFS_esp32    ; for v2
+    ;LittleFS_esp32    ; for v2
 
 lib_deps =
-    ;ESP Async WebServer
     ;LittleFS_esp32   ; for v1
-    git+https://github.com/lvgl/lv_lib_png.git#release/v7
-    ;git+https://github.com/lvgl/lv_lib_bmp.git#release/v7
-    ;git+https://github.com/lvgl/lv_lib_gif.git#release/v7
-    ;git+https://github.com/lvgl/lv_lib_split_jpg.git
+    bodmer/TFT_eSPI@^2.3.81
+    ;git+https://github.com/Bodmer/TFT_eSPI.git
+    ;ESP Async WebServer
 
 extra_scripts =
     tools/littlefsbuilder.py
diff --git a/user_setups/esp32s2/_esp32s2.ini b/user_setups/esp32s2/_esp32s2.ini
index 1c05afa1..70022b91 100644
--- a/user_setups/esp32s2/_esp32s2.ini
+++ b/user_setups/esp32s2/_esp32s2.ini
@@ -35,6 +35,7 @@ build_flags =
     ;-D CONFIG_NEWLIB_NANO_FORMAT
 ; -- lvgl build options -----------------------------
     -D LV_MEM_SIZE=20480U              ; 20kB lvgl memory
+    -D LV_VDB_SIZE=16384U              ; 16kB draw buffer
     -D LV_ATTRIBUTE_FAST_MEM=IRAM_ATTR
     -D LV_ATTRIBUTE_TASK_HANDLER=IRAM_ATTR
     ;-D LV_FS_PC_PATH="//littlefs"   ; this needs to match the vfs mount pount
@@ -74,18 +75,15 @@ lib_ignore =
     lv_drivers
     AXP192
     bodmer/TFT_eSPI
-    LittleFS_esp32
 
 lib_deps =
-    ESP Async WebServer
-    git+https://github.com/lvgl/lv_lib_png.git#release/v7
-    ;git+https://github.com/lvgl/lv_lib_bmp.git#release/v7
-    ;git+https://github.com/lvgl/lv_lib_gif.git#release/v7
-    ;git+https://github.com/lvgl/lv_lib_split_jpg.git
+    bodmer/TFT_eSPI@^2.3.81
+    ;git+https://github.com/Bodmer/TFT_eSPI.git
+    ;ESP Async WebServer
 
 ps_ram =
     -DBOARD_HAS_PSRAM
-;    -mfix-esp32-psram-cache-issue  ; uses 24kB
+    -mfix-esp32-psram-cache-issue  ; uses 24kB
 
 extra_scripts =
     tools/littlefsbuilder.py
diff --git a/user_setups/linux_sdl/linux_sdl_64bits.ini b/user_setups/linux_sdl/linux_sdl_64bits.ini
index d88ca12b..9c087211 100644
--- a/user_setups/linux_sdl/linux_sdl_64bits.ini
+++ b/user_setups/linux_sdl/linux_sdl_64bits.ini
@@ -14,6 +14,7 @@ build_flags =
   ;-D LV_LVGL_H_INCLUDE_SIMPLE
   ;-D LV_DRV_NO_CONF
   -D LV_MEM_SIZE=262144U           ; 256kB lvgl memory
+  -D LV_VDB_SIZE=131072U           ; 128kB draw buffer
   -D USE_MONITOR
   -D MONITOR_ZOOM=1  ; can be fractional like 1.5 or 2
   -D USE_MOUSE
@@ -64,10 +65,6 @@ lib_deps =
   https://github.com/eclipse/paho.mqtt.c.git
   bblanchon/ArduinoJson@^6.17.2    ; Json(l) parser
   https://github.com/fvanroie/lv_drivers
-  git+https://github.com/lvgl/lv_lib_png.git#release/v7
-  ; git+https://github.com/lvgl/lv_lib_bmp.git#release/v7
-  ; git+https://github.com/lvgl/gif.git#release/v7
-  ; git+https://github.com/fvanroie/lv_lib_split_jpg.git
 
 lib_ignore =
   paho
diff --git a/user_setups/win32/windows_sdl_64bits.ini b/user_setups/win32/windows_sdl_64bits.ini
index d1bcc84b..0c88190f 100644
--- a/user_setups/win32/windows_sdl_64bits.ini
+++ b/user_setups/win32/windows_sdl_64bits.ini
@@ -14,6 +14,7 @@ build_flags =
   ;-D LV_LVGL_H_INCLUDE_SIMPLE
   ;-D LV_DRV_NO_CONF
   -D LV_MEM_SIZE=262144U           ; 256kB lvgl memory
+  -D LV_VDB_SIZE=131072U           ; 128kB draw buffer
   -D USE_MONITOR
   -D MONITOR_ZOOM=1  ; can be fractional like 1.5 or 2
   -D USE_MOUSE
@@ -95,10 +96,6 @@ lib_deps =
   https://github.com/eclipse/paho.mqtt.c.git
   bblanchon/ArduinoJson@^6.17.2    ; Json(l) parser
   https://github.com/fvanroie/lv_drivers
-  git+https://github.com/lvgl/lv_lib_png.git#release/v7
-  ;git+https://github.com/lvgl/lv_lib_bmp.git#release/v7
-  ;git+https://github.com/lvgl/gif.git#release/v7
-  ;git+https://github.com/fvanroie/lv_lib_split_jpg.git
 
 lib_ignore =
   paho