diff --git a/CHANGLELOG.md b/CHANGLELOG.md
index 5f96fce5..a108cb78 100644
--- a/CHANGLELOG.md
+++ b/CHANGLELOG.md
@@ -9,23 +9,25 @@
 ### Web UI
 - _Selectable dark/light theme?_
 
-### Fonts
-- Use FreeType fonts from flash
-
 ### Services
 - Add SimpleFTPServer to easily upload and download files to the plate *(one simultanious connection only)*
 
-### Architecture
+### Devices
+- Add support for Wireless-Tag WT-86-32-3ZW1
 
+### Architecture
+- Moved to Tasmota Arduino 2.0.3rc1 with native LittleFS library (thanks @Jason2866)
+- Moved to ESP-IDF 4.4 with fixes for FragAttacks CVEs (thanks @nagyrobi)
+- Add support for ESP32-S2 devices
 
 -->
 
-## v0.6.3
+## v0.6.3-dev
 
 ### Commands
 - Additional `idle` parameters now accept `off`, `short` and `long`
 - Add `sensors` command to trigger the sensors state message
-- Run `/boot.cmd` when the plate is (re)booted and the script exists
+- Run `/boot.cmd` when the plate is (re)booted if the script exists
 - You can now use `pXbY.jsonl` command to update multiple object properties at once (thanks @nagyrobi)
 
 ### Objects
@@ -36,23 +38,22 @@
 
 ### Web UI
 - Updated to modern responsive design *(requires JavaScript)*
-- Add `/api/*/` endpoints for `info/` and `config/*/`
+- Add `/api/info/` and `/api/config/*/` endpoints
 - Allow for a customizible `vars.css`, `style.css`, `script.js` and `edit.htm`
 - Display a message when the configuration is changed and a reboot is needed
 - Add checkbox for backlight inversion to Display settings (thanks @wolffman122)
 - Add checkbox to toggle ANSI codes (thanks @geiseri)
 - Allow firmware upgrade/downgrade in AP mode
 
-### Devices
-- Add support for Wireless-Tag WT-86-32-3ZW1
-
 ### GUI
+- `antiburn` displays random pixels *aka.* white noise
 - Hide cursor during `antiburn` and `idle` if the pointer is enabled
 
 ### MQTT
 -  Remember last `page` id of `jsonl` messages. Multiple messages behave like `jsonl` files (thanks @arovak)
 
 ### Fonts
+- Use TrueType fonts from flash, PSram is *highly* recommended (thanks to @s-hadinger)
 - Custom LVGL binary fonts can be read from flash and loaded into memory, PSram is *highly* recommended
 - Font ID is replaced by `namexx` *(where `xx` is the font size)* but the previous Font IDs still work for backwards compatibility
 - Added build option for Vietnamese character set (thanks @kydang789)
@@ -69,13 +70,10 @@
 - Syslog message format fixes and improvements (thanks @geiseri)
 
 ### Custom component
-- Expose `antiburn` for the CC (thanks @dgomes)
-- Expose the device URL in discovery message
+- Expose `antiburn` and `page` in the CC (thanks @dgomes)
+- Expose the device URL in discovery message and CC
 
 ### Architecture
-- Moved to Tasmota Arduino 2.0.3rc1 with native LittleFS library (thanks @Jason2866)
-- Moved to ESP-IDF 4.4 with fixes for FragAttacks CVEs (thanks @nagyrobi)
-- Add support for ESP32-S2 devices
 - ⚠️ **Breaking:** Removed support for ESP8266!
 
 Updated libraries to ArduinoJson 6.19.4, ArduinoStreamUtils 1.6.2, AceButton 1.9.2, TFT_eSPI 2.4.42, LovyanGFX 0.4.15 and Adafruit STMPE610 1.1.4
diff --git a/user_setups/esp32/_esp32.ini b/user_setups/esp32/_esp32.ini
index ff325498..801fa9f1 100644
--- a/user_setups/esp32/_esp32.ini
+++ b/user_setups/esp32/_esp32.ini
@@ -139,19 +139,19 @@ extra_scripts =
 lib_deps =
 lib_ignore = LittleFS_esp32    ; for v2
 
-[esp32_4mb_v2]
+[esp32_4mb]
 extends = esp32, arduino_esp32_v2
 board_upload.flash_size=4MB
 board_upload.maximum_size = 4194304
 board_build.partitions = user_setups/esp32/partitions_4MB.csv
 
-[esp32_8mb_v2]
+[esp32_8mb]
 extends = esp32, arduino_esp32_v2
 board_upload.flash_size=8MB
 board_upload.maximum_size = 8388608
 board_build.partitions = user_setups/esp32/partitions_8MB.csv
 
-[esp32_16mb_v2]
+[esp32_16mb]
 extends = esp32, arduino_esp32_v2
 board_upload.flash_size = 16MB
 board_upload.maximum_size = 16777216
diff --git a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
index c0ef07ad..e116cddc 100644
--- a/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
+++ b/user_setups/esp32/az-touch-mod-esp32_ili9341.ini
@@ -43,7 +43,7 @@ lib_ignore =
 ;endregion
 
 [env:az-touch-mod-esp32_ili9341_4MB]
-extends = az-touch-mod-esp32_ili9341, esp32_4mb_v2
+extends = az-touch-mod-esp32_ili9341, esp32_4mb
 
 [env:az-touch-mod-esp32_ili9341_8MB]
-extends = az-touch-mod-esp32_ili9341, esp32_8mb_v2
\ No newline at end of file
+extends = az-touch-mod-esp32_ili9341, esp32_8mb
\ No newline at end of file
diff --git a/user_setups/esp32/d1-mini-esp32_ili9341.ini b/user_setups/esp32/d1-mini-esp32_ili9341.ini
index 40698f04..ac4b9d94 100644
--- a/user_setups/esp32/d1-mini-esp32_ili9341.ini
+++ b/user_setups/esp32/d1-mini-esp32_ili9341.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:d1-mini-esp32_ili9341]
-extends = esp32_4mb_v2
+extends = esp32_4mb
 board = wemos_d1_mini32
 
 build_flags =
diff --git a/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini b/user_setups/esp32/d1-r32-unoshield_ili9341_adc.ini
index 85136cd9..bae1d6af 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_v2
+extends = esp32_4mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini b/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
index dc16739c..fce1412c 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_v2
+extends = esp32_4mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/d1-r32-waveshare_ili9486.ini b/user_setups/esp32/d1-r32-waveshare_ili9486.ini
index 9a64ef0c..8d05d54e 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_v2
+extends = esp32_4mb
 board = wemos_d1_mini32
 
 build_flags =
diff --git a/user_setups/esp32/esp32-dev_ili9488.ini b/user_setups/esp32/esp32-dev_ili9488.ini
index 7bead00a..341689ba 100644
--- a/user_setups/esp32/esp32-dev_ili9488.ini
+++ b/user_setups/esp32/esp32-dev_ili9488.ini
@@ -5,7 +5,7 @@
 ;***************************************************;
 
 [env:esp32dev-ili9488]
-extends = esp32_4mb_v2
+extends = esp32_4mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/esp32-dev_ili9488_parallel.ini b/user_setups/esp32/esp32-dev_ili9488_parallel.ini
index 15c1ef23..167a3685 100644
--- a/user_setups/esp32/esp32-dev_ili9488_parallel.ini
+++ b/user_setups/esp32/esp32-dev_ili9488_parallel.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:esp32dev-mrb3511]
-extends = esp32_4mb_v2
+extends = esp32_4mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/esp32-one.ini b/user_setups/esp32/esp32-one.ini
index 4814efb7..34431777 100644
--- a/user_setups/esp32/esp32-one.ini
+++ b/user_setups/esp32/esp32-one.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [esp32one]
-extends = esp32_4mb_v2
+extends = esp32_4mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/esp32-touchdown.ini b/user_setups/esp32/esp32-touchdown.ini
index fb9ed43d..3ae1b0ea 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_v2
+extends = esp32_4mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/esp32cam_st7796.ini b/user_setups/esp32/esp32cam_st7796.ini
index 7f5e173b..7a314fc8 100644
--- a/user_setups/esp32/esp32cam_st7796.ini
+++ b/user_setups/esp32/esp32cam_st7796.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:esp32cam-st7796]
-extends = esp32_4mb_v2
+extends = esp32_4mb
 board = esp32cam
 
 ;ESP32 CAM PINS
diff --git a/user_setups/esp32/freetouchdeck.ini b/user_setups/esp32/freetouchdeck.ini
index 82b83a4f..78f832e1 100644
--- a/user_setups/esp32/freetouchdeck.ini
+++ b/user_setups/esp32/freetouchdeck.ini
@@ -43,15 +43,18 @@ build_flags =
 lib_deps =
     ${env.lib_deps}
     ${esp32.lib_deps}
+    ${arduino_esp32_v1.lib_deps}
     ${tft_espi.lib_deps}
 
 lib_ignore =
     ${env.lib_ignore}
     ${esp32.lib_ignore}
+    ${arduino_esp32_v1.lib_ignore}
 ;endregion
 
+
 [env:freetouchdeck_4MB]
-extends = freetouchdeck, esp32_4mb_v2
+extends = freetouchdeck, esp32_4mb
 
 [env:freetouchdeck_8MB]
-extends = freetouchdeck, esp32_8mb_v2
+extends = freetouchdeck, esp32_8mb
diff --git a/user_setups/esp32/huzzah32-featherwing-24.ini b/user_setups/esp32/huzzah32-featherwing-24.ini
index 536a92ff..5c169042 100644
--- a/user_setups/esp32/huzzah32-featherwing-24.ini
+++ b/user_setups/esp32/huzzah32-featherwing-24.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:huzzah32-featherwing-24]
-extends = esp32_4mb_v2
+extends = esp32_4mb
 board = featheresp32
 
 build_flags =
diff --git a/user_setups/esp32/huzzah32-featherwing-35.ini b/user_setups/esp32/huzzah32-featherwing-35.ini
index 38f120a1..851efe93 100644
--- a/user_setups/esp32/huzzah32-featherwing-35.ini
+++ b/user_setups/esp32/huzzah32-featherwing-35.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:huzzah32-featherwing-35]
-extends = esp32_4mb_v2
+extends = esp32_4mb
 board = featheresp32
 
 build_flags =
diff --git a/user_setups/esp32/lolin-d32-pro_ili9341.ini b/user_setups/esp32/lolin-d32-pro_ili9341.ini
index 411421b7..9edd262e 100644
--- a/user_setups/esp32/lolin-d32-pro_ili9341.ini
+++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini
@@ -8,7 +8,7 @@
 ; !! This board already defines TFT_CS, TFT_DC and TFT_RST !!
 
 [env:lolin-d32-pro_ili9341]
-extends = esp32_16mb_v2
+extends = esp32_16mb
 board = lolin_d32_pro
 
 build_flags =
diff --git a/user_setups/esp32/m5stack_core2.ini b/user_setups/esp32/m5stack_core2.ini
index c80bfd4a..a9e4f44c 100644
--- a/user_setups/esp32/m5stack_core2.ini
+++ b/user_setups/esp32/m5stack_core2.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:m5stack-core2]
-extends = esp32_16mb_v2
+extends = esp32_16mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/makerfabs-tft35-cap.ini b/user_setups/esp32/makerfabs-tft35-cap.ini
index aa2d38cc..4319cf75 100644
--- a/user_setups/esp32/makerfabs-tft35-cap.ini
+++ b/user_setups/esp32/makerfabs-tft35-cap.ini
@@ -5,7 +5,7 @@
 ;***************************************************;
 
 [env:makerfabs-tft35-cap]
-extends = esp32_16mb_v2
+extends = esp32_16mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/nodemcu-32s_st7796.ini b/user_setups/esp32/nodemcu-32s_st7796.ini
index 3fb4c37f..1771e2c0 100644
--- a/user_setups/esp32/nodemcu-32s_st7796.ini
+++ b/user_setups/esp32/nodemcu-32s_st7796.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:nodemcu32s-raspi]
-extends = esp32_4mb_v2
+extends = esp32_4mb
 board = nodemcu-32s
 
 build_flags =
diff --git a/user_setups/esp32/ttgo-esp32-poe_ili9341.ini b/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
index 4568e3df..33e4196a 100644
--- a/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
+++ b/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
@@ -7,7 +7,7 @@
 ;***************************************************;
 
 [env:ttgo_esp32_poe-ili9341]
-extends = esp32_4mb_v2
+extends = esp32_4mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini b/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini
index 98cf362c..1622a844 100644
--- a/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini
+++ b/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:ttgo-lilygo-pi_ili9481]
-extends = esp32_16mb_v2
+extends = esp32_16mb
 board = esp32dev
 
 #platform  = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
diff --git a/user_setups/esp32/ttgo-lilygo-pi_st7796.ini b/user_setups/esp32/ttgo-lilygo-pi_st7796.ini
index a067c37f..3f21d84b 100644
--- a/user_setups/esp32/ttgo-lilygo-pi_st7796.ini
+++ b/user_setups/esp32/ttgo-lilygo-pi_st7796.ini
@@ -6,7 +6,7 @@
 ;***************************************************;
 
 [env:ttgo-lilygo-pi_st7796]
-extends = esp32_16mb_v2
+extends = esp32_16mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini b/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
index f6ae2fef..9aca16bc 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_v2
+extends = esp32_4mb
 board = esp32dev
 
 build_flags =
diff --git a/user_setups/esp32/wt32-sc01.ini b/user_setups/esp32/wt32-sc01.ini
index b6e56c02..db837c12 100644
--- a/user_setups/esp32/wt32-sc01.ini
+++ b/user_setups/esp32/wt32-sc01.ini
@@ -51,7 +51,7 @@ lib_ignore =
 ;endregion
 
 [env:wt32-sc01_4MB]
-extends = wt32-sc01, esp32_4mb_v2
+extends = wt32-sc01, esp32_4mb
 
 [env:wt32-sc01_16MB]
-extends = wt32-sc01, esp32_16mb_v2
+extends = wt32-sc01, esp32_16mb